Merge pull request #290 from hushenghao/master

jahirfiquitiva · Feb 13, 2022 · 143de0d · 143de0d
2 parents 6b4c93f + 0c4c4f7
commit 143de0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/src/main/res/values/home_setup.xml b/app/src/main/res/values/home_setup.xml
@@ -33,17 +33,21 @@
  <string-array name="home_list_titles">
  <item>IconShowcase</item>
  <item>An App</item>
+ <item>An App</item>
  </string-array>
  <string-array name="home_list_descriptions">
  <item>It is the old version of this awesome dashboard</item>
  <item>This is an app</item>
+ <item>This is market url</item>
  </string-array>
  <string-array name="home_list_icons">
  <item>ic_na_launcher</item>
  <item>ic_na_launcher</item>
+ <item>ic_na_launcher</item>
  </string-array>
  <string-array name="home_list_links">
  <item>https://github.com/jahirfiquitiva/Blueprint</item>
  <item>https://play.google.com/store/apps/details?id=com.android.settings</item>
+ <item>market://details?id=com.example.package</item>
  </string-array>
 </resources>
diff --git a/library/src/main/kotlin/dev/jahir/blueprint/data/viewmodels/HomeViewModel.kt b/library/src/main/kotlin/dev/jahir/blueprint/data/viewmodels/HomeViewModel.kt
@@ -2,6 +2,7 @@ package dev.jahir.blueprint.data.viewmodels
 
 import android.app.Application
 import android.content.Intent
+import android.net.Uri
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.MutableLiveData
@@ -63,19 +64,21 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
  titles.mapIndexed { i, s -> DefHomeItem(s, descriptions[i], icons[i], urls[i]) }
  .distinctBy { it.url }
  .map {
- val isAnApp =
- it.url.lower().startsWith(PLAY_STORE_LINK_PREFIX) ||
- it.url.lower().startsWith("market://details?id=")
+ val isMarketUrl = it.url.lower().startsWith("market://details?id=")
+ val isAnApp = isMarketUrl || it.url.lower().startsWith(PLAY_STORE_LINK_PREFIX)
  var isInstalled = false
  var intent: Intent? = null
  if (isAnApp) {
+ val packageName = it.url.substring(it.url.lastIndexOf("=") + 1)
  try {
- val packageName = it.url.substring(it.url.lastIndexOf("=") + 1)
  isInstalled = context.isAppInstalled(packageName)
  intent =
  context.packageManager.getLaunchIntentForPackage(packageName)
  } catch (e: Exception) {
  }
+ if (intent == null && isMarketUrl) {
+ intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName"))
+ }
  }
  val openIcon = if (isAnApp)
  if (isInstalled) R.drawable.ic_open_app else R.drawable.ic_download