Add trackers count in global app menu (#351)

Hamza417 · Jul 8, 2024 · b64b1ea · b64b1ea
1 parent 56e16b5
commit b64b1ea
Show file tree

Hide file tree

Showing 20 changed files with 105 additions and 66 deletions.
diff --git a/app/src/main/assets/html/changelogs.html b/app/src/main/assets/html/changelogs.html
@@ -23,6 +23,7 @@ <h4>User Interface</h4>
     <li>Addition to <i>Trackers</i> framework to show tracker icon next to app with trackers
         throughout the app.
     </li>
+    <li>Added trackers count in global <b>App Menu</b>.</li>
 </ul>
 
 

diff --git a/app/src/main/java/app/simple/inure/adapters/home/AdapterDisabled.kt b/app/src/main/java/app/simple/inure/adapters/home/AdapterDisabled.kt
@@ -14,7 +14,7 @@ import app.simple.inure.decorations.views.AppIconImageView
 import app.simple.inure.glide.modules.GlideApp
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.InfoStripUtils.setAppInfo
 import app.simple.inure.util.RecyclerViewUtils
 
@@ -49,7 +49,7 @@ class AdapterDisabled : RecyclerView.Adapter<VerticalListViewHolder>() {
             holder.name.text = apps[position].applicationInfo.name
             holder.packageId.text = apps[position].packageName
 
-            holder.name.setInfoStates(apps[position])
+            holder.name.setAppVisualStates(apps[position])
             holder.date.setAppInfo(apps[position])
 
             holder.container.setOnClickListener {

diff --git a/app/src/main/java/app/simple/inure/adapters/home/AdapterFOSS.kt b/app/src/main/java/app/simple/inure/adapters/home/AdapterFOSS.kt
@@ -15,7 +15,7 @@ import app.simple.inure.decorations.views.AppIconImageView
 import app.simple.inure.glide.modules.GlideApp
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.FileUtils.toFile
 import app.simple.inure.util.RecyclerViewUtils
 
@@ -49,7 +49,7 @@ class AdapterFOSS : RecyclerView.Adapter<VerticalListViewHolder>() {
             holder.icon.loadAppIcon(apps[position].packageName, apps[position].applicationInfo.enabled, apps[position].applicationInfo.sourceDir.toFile())
             holder.name.text = apps[position].applicationInfo.name
             holder.packageId.text = apps[position].packageName
-            holder.name.setInfoStates(apps[position])
+            holder.name.setAppVisualStates(apps[position])
             holder.date.text = FOSSParser.getPackageLicense(apps[position]) ?: holder.itemView.context.getString(R.string.not_available)
             holder.date.setWarningIcon(FOSSParser.isUserDefinedFOSS(apps[position].packageName))
 

diff --git a/app/src/main/java/app/simple/inure/adapters/home/AdapterMostUsed.kt b/app/src/main/java/app/simple/inure/adapters/home/AdapterMostUsed.kt
@@ -14,7 +14,7 @@ import app.simple.inure.glide.modules.GlideApp
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
 import app.simple.inure.models.PackageStats
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.RecyclerViewUtils
 import java.util.concurrent.TimeUnit.MILLISECONDS
 
@@ -48,7 +48,7 @@ class AdapterMostUsed : RecyclerView.Adapter<VerticalListViewHolder>() {
             holder.icon.loadAppIcon(apps[position].packageInfo!!.packageName, apps[position].packageInfo!!.applicationInfo.enabled)
             holder.name.text = apps[position].packageInfo?.applicationInfo!!.name
             holder.packageId.text = apps[position].packageInfo?.packageName
-            holder.name.setInfoStates(apps[position].packageInfo!!)
+            holder.name.setAppVisualStates(apps[position].packageInfo!!)
 
             with(apps[position].totalTimeUsed) {
                 holder.date.apply {

diff --git a/app/src/main/java/app/simple/inure/adapters/home/AdapterRecentlyInstalled.kt b/app/src/main/java/app/simple/inure/adapters/home/AdapterRecentlyInstalled.kt
@@ -14,7 +14,7 @@ import app.simple.inure.decorations.views.AppIconImageView
 import app.simple.inure.glide.modules.GlideApp
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.InfoStripUtils.setRecentlyInstalledInfo
 import app.simple.inure.util.RecyclerViewUtils
 
@@ -48,7 +48,7 @@ class AdapterRecentlyInstalled : RecyclerView.Adapter<VerticalListViewHolder>()
             holder.icon.loadAppIcon(apps[position].packageName, apps[position].applicationInfo.enabled)
             holder.name.text = apps[position].applicationInfo.name
             holder.packageId.text = apps[position].packageName
-            holder.name.setInfoStates(apps[position])
+            holder.name.setAppVisualStates(apps[position])
             holder.date.setRecentlyInstalledInfo(apps[position])
 
             holder.container.setOnClickListener {

diff --git a/app/src/main/java/app/simple/inure/adapters/home/AdapterRecentlyUpdated.kt b/app/src/main/java/app/simple/inure/adapters/home/AdapterRecentlyUpdated.kt
@@ -14,7 +14,7 @@ import app.simple.inure.decorations.views.AppIconImageView
 import app.simple.inure.glide.modules.GlideApp
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.InfoStripUtils.setRecentlyUpdatedInfo
 import app.simple.inure.util.RecyclerViewUtils
 
@@ -48,7 +48,7 @@ class AdapterRecentlyUpdated : RecyclerView.Adapter<VerticalListViewHolder>() {
             holder.icon.loadAppIcon(apps[position].packageName, apps[position].applicationInfo.enabled)
             holder.name.text = apps[position].applicationInfo.name
             holder.packageId.text = apps[position].packageName
-            holder.name.setInfoStates(apps[position])
+            holder.name.setAppVisualStates(apps[position])
             holder.date.setRecentlyUpdatedInfo(apps[position])
 
             holder.container.setOnClickListener {

diff --git a/app/src/main/java/app/simple/inure/adapters/home/AdapterUninstalled.kt b/app/src/main/java/app/simple/inure/adapters/home/AdapterUninstalled.kt
@@ -14,7 +14,7 @@ import app.simple.inure.decorations.views.AppIconImageView
 import app.simple.inure.glide.modules.GlideApp
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.FileUtils.toFileOrNull
 import app.simple.inure.util.InfoStripUtils.setUninstalledAppInfo
 import app.simple.inure.util.RecyclerViewUtils
@@ -49,7 +49,7 @@ class AdapterUninstalled : RecyclerView.Adapter<VerticalListViewHolder>() {
             holder.icon.loadAppIcon(apps[position].packageName, apps[position].applicationInfo.enabled, apps[position].applicationInfo.sourceDir.toFileOrNull())
             holder.name.text = apps[position].applicationInfo.name
             holder.packageId.text = apps[position].packageName
-            holder.name.setInfoStates(apps[position])
+            holder.name.setAppVisualStates(apps[position])
 
             holder.date.setUninstalledAppInfo(apps[position])
 

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterApps.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterApps.kt
@@ -18,7 +18,7 @@ import app.simple.inure.glide.modules.GlideApp
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
 import app.simple.inure.preferences.AppsPreferences
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.ConditionUtils.invert
 import app.simple.inure.util.FileUtils.toFileOrNull
 import app.simple.inure.util.InfoStripUtils.setAppInfo
@@ -68,7 +68,7 @@ class AdapterApps(private val apps: ArrayList<PackageInfo>) : RecyclerView.Adapt
                 holder.icon.loadAppIcon(apps[position].packageName, false, apps[position].applicationInfo.sourceDir.toFileOrNull())
             }
 
-            holder.name.setInfoStates(apps[position])
+            holder.name.setAppVisualStates(apps[position])
 
             holder.info.setAppInfo(apps[position])
 

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterBatch.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterBatch.kt
@@ -19,7 +19,7 @@ import app.simple.inure.models.BatchPackageInfo
 import app.simple.inure.models.Tag
 import app.simple.inure.preferences.BatchPreferences
 import app.simple.inure.preferences.FormattingPreferences
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.ArrayUtils.move
 import app.simple.inure.util.ConditionUtils.invert
 import app.simple.inure.util.DateUtils
@@ -72,7 +72,7 @@ class AdapterBatch(var apps: ArrayList<BatchPackageInfo>, var headerEnabled: Boo
             holder.name.text = apps[position].packageInfo.applicationInfo.name
             holder.packageId.text = apps[position].packageInfo.packageName
 
-            holder.name.setInfoStates(apps[position].packageInfo)
+            holder.name.setAppVisualStates(apps[position].packageInfo)
             holder.checkBox.setChecked(apps[position].isSelected, false)
 
             if (highlight) {

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterBatteryOptimization.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterBatteryOptimization.kt
@@ -16,7 +16,7 @@ import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
 import app.simple.inure.models.BatteryOptimizationModel
 import app.simple.inure.preferences.BatteryOptimizationPreferences
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.ConditionUtils.invert
 import app.simple.inure.util.LocaleUtils
 import app.simple.inure.util.RecyclerViewUtils
@@ -60,7 +60,7 @@ class AdapterBatteryOptimization(private val apps: ArrayList<BatteryOptimization
             holder.name.text = apps[position].packageInfo.applicationInfo.name
             holder.packageId.text = apps[position].packageInfo.packageName
 
-            holder.name.setInfoStates(apps[position].packageInfo)
+            holder.name.setAppVisualStates(apps[position].packageInfo)
 
             holder.data.text = with(StringBuilder()) {
                 append(holder.getString(getAppType(apps[position].type)))

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterBootManager.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterBootManager.kt
@@ -16,7 +16,7 @@ import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
 import app.simple.inure.models.BootManagerModel
 import app.simple.inure.preferences.BootManagerPreferences
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.ConditionUtils.invert
 import app.simple.inure.util.LocaleUtils
 import app.simple.inure.util.RecyclerViewUtils
@@ -57,7 +57,7 @@ class AdapterBootManager(private val components: ArrayList<BootManagerModel>) :
             holder.icon.loadAppIcon(components[position].packageInfo.packageName, components[position].isEnabled)
             holder.name.text = components[position].packageInfo.applicationInfo.name
             holder.packageId.text = components[position].packageInfo.packageName
-            holder.name.setInfoStates(components[position].packageInfo)
+            holder.name.setAppVisualStates(components[position].packageInfo)
 
             holder.data.text = with(StringBuilder()) {
                 append(holder.context.getString(R.string.total, components[position].enabledComponents.size + components[position].disabledComponents.size))

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterDeepSearch.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterDeepSearch.kt
@@ -17,7 +17,7 @@ import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.models.Search
 import app.simple.inure.preferences.SearchPreferences
 import app.simple.inure.util.AdapterUtils
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.InfoStripUtils.setAppInfo
 
 class AdapterDeepSearch(private var deepSearchInfo: ArrayList<Search>, private var searchKeyword: String = "") : RecyclerView.Adapter<AdapterDeepSearch.Holder>() {
@@ -37,7 +37,7 @@ class AdapterDeepSearch(private var deepSearchInfo: ArrayList<Search>, private v
         holder.name.text = deepSearchInfo[position].packageInfo.applicationInfo.name
         holder.packageId.text = deepSearchInfo[position].packageInfo.packageName
 
-        holder.name.setInfoStates(deepSearchInfo[position].packageInfo)
+        holder.name.setAppVisualStates(deepSearchInfo[position].packageInfo)
         holder.info.setAppInfo(deepSearchInfo[position].packageInfo)
         holder.setDeepInfo(deepSearchInfo[position])
 

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterNotes.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterNotes.kt
@@ -19,7 +19,7 @@ import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
 import app.simple.inure.models.NotesPackageInfo
 import app.simple.inure.preferences.NotesPreferences
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.DateUtils
 import app.simple.inure.util.RecyclerViewUtils
 
@@ -64,7 +64,7 @@ class AdapterNotes(var notes: ArrayList<NotesPackageInfo>) : RecyclerView.Adapte
             holder.packageId.text = notes[position].packageInfo.packageName
             holder.note.text = notes[position].note.subSequence(0, notes[position].note.length.coerceAtMost(1000))
 
-            holder.name.setInfoStates(notes[position].packageInfo)
+            holder.name.setAppVisualStates(notes[position].packageInfo)
 
             if (areNotesExpanded) {
                 holder.note.maxLines = 60

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterSearch.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterSearch.kt
@@ -16,7 +16,7 @@ import app.simple.inure.interfaces.adapters.AdapterCallbacks
 import app.simple.inure.models.Search
 import app.simple.inure.preferences.SearchPreferences
 import app.simple.inure.util.AdapterUtils
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.FileUtils.toFileOrNull
 import app.simple.inure.util.InfoStripUtils.setAppInfo
 
@@ -40,7 +40,7 @@ class AdapterSearch(private var apps: ArrayList<Search>, private var searchKeywo
         holder.name.text = apps[position].packageInfo.applicationInfo.name
         holder.packageId.text = apps[position].packageInfo.packageName
 
-        holder.name.setInfoStates(apps[position].packageInfo)
+        holder.name.setAppVisualStates(apps[position].packageInfo)
         holder.info.setAppInfo(apps[position].packageInfo)
 
         holder.container.setOnClickListener {

diff --git a/app/src/main/java/app/simple/inure/adapters/ui/AdapterUsageStats.kt b/app/src/main/java/app/simple/inure/adapters/ui/AdapterUsageStats.kt
@@ -17,7 +17,7 @@ import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.interfaces.adapters.AdapterCallbacks
 import app.simple.inure.models.PackageStats
 import app.simple.inure.preferences.StatisticsPreferences
-import app.simple.inure.util.AdapterUtils.setInfoStates
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.ConditionUtils.invert
 import app.simple.inure.util.FileSizeHelper.toSize
 import app.simple.inure.util.LocaleUtils
@@ -76,7 +76,7 @@ class AdapterUsageStats(private val apps: ArrayList<PackageStats>) : RecyclerVie
                 appendFlag(apps[position].wifiData?.rx?.toSize())
             }
 
-            holder.name.setInfoStates(apps[position].packageInfo!!)
+            holder.name.setAppVisualStates(apps[position].packageInfo!!)
 
             with(apps[position].totalTimeUsed) {
                 holder.time.apply {

diff --git a/app/src/main/java/app/simple/inure/dialogs/app/AppMenu.kt b/app/src/main/java/app/simple/inure/dialogs/app/AppMenu.kt
@@ -24,6 +24,7 @@ import app.simple.inure.decorations.views.AppIconImageView
 import app.simple.inure.dialogs.action.Send.Companion.showSend
 import app.simple.inure.dialogs.foss.MarkFoss.Companion.showMarkFossDialog
 import app.simple.inure.extensions.fragments.ScopedDialogFragment
+import app.simple.inure.factories.panels.PackageInfoFactory
 import app.simple.inure.glide.util.ImageLoader.loadAppIcon
 import app.simple.inure.preferences.BehaviourPreferences
 import app.simple.inure.preferences.DevelopmentPreferences
@@ -41,13 +42,15 @@ import app.simple.inure.ui.viewers.Trackers
 import app.simple.inure.ui.viewers.UsageStatisticsGraph
 import app.simple.inure.ui.viewers.XML
 import app.simple.inure.ui.viewers.XMLWebView
+import app.simple.inure.util.AdapterUtils.setAppVisualStates
 import app.simple.inure.util.ConditionUtils.invert
 import app.simple.inure.util.ConditionUtils.isNotZero
-import app.simple.inure.util.InfoStripUtils.setAppInfo
+import app.simple.inure.util.InfoStripUtils.getAppInfo
 import app.simple.inure.util.StatusBarHeight
 import app.simple.inure.util.ViewUtils
 import app.simple.inure.util.ViewUtils.gone
 import app.simple.inure.util.ViewUtils.visibility
+import app.simple.inure.viewmodels.panels.AppInfoViewModel
 import app.simple.inure.viewmodels.panels.HomeViewModel
 import app.simple.inure.viewmodels.panels.QuickAppsViewModel
 import kotlinx.coroutines.Dispatchers
@@ -82,6 +85,7 @@ class AppMenu : ScopedDialogFragment() {
 
     private lateinit var quickAppsViewModel: QuickAppsViewModel
     private lateinit var homeViewModel: HomeViewModel
+    private lateinit var appInfoViewModel: AppInfoViewModel
     private var isAlreadyInQuickApp = false
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -111,9 +115,10 @@ class AppMenu : ScopedDialogFragment() {
         toQuickApp = view.findViewById(R.id.to_quick_app)
         markAsFOSS = view.findViewById(R.id.to_foss)
 
+        val packageInfoFactory = PackageInfoFactory(packageInfo)
         quickAppsViewModel = ViewModelProvider(requireActivity())[QuickAppsViewModel::class.java]
         homeViewModel = ViewModelProvider(requireActivity())[HomeViewModel::class.java]
-        details.setAppInfo(packageInfo)
+        appInfoViewModel = ViewModelProvider(this, packageInfoFactory)[AppInfoViewModel::class.java]
 
         return view
     }
@@ -154,6 +159,7 @@ class AppMenu : ScopedDialogFragment() {
 
         SearchPreferences.setSearchKeywordMode(requireArguments().getString(BundleConstants.keywords).isNullOrEmpty().invert())
         icon.loadAppIcon(packageInfo.packageName, packageInfo.applicationInfo.enabled)
+        name.setAppVisualStates(packageInfo)
         markAsFOSS.visibility(FOSSParser.isEmbeddedFOSS(packageInfo).invert())
 
         name.apply {
@@ -319,6 +325,21 @@ class AppMenu : ScopedDialogFragment() {
                 }
             }
         }
+
+        appInfoViewModel.getTrackers().observe(viewLifecycleOwner) {
+            val details = requireContext().getAppInfo(packageInfo)
+
+            if (details.isEmpty()) {
+                details.append(getString(R.string.trackers_count, it))
+            } else {
+                details.append(" | ")
+                details.append(getString(R.string.trackers_count, it))
+            }
+
+            this.details.alpha = 0F
+            this.details.text = details
+            this.details.animate().alpha(1F).start()
+        }
     }
 
     override fun onDestroy() {