Refactor badges and notifications, migrate badge settings

applications/build.gradle.kts

@@ -47,7 +47,6 @@ dependencies {
     implementation(project(":base"))
     implementation(project(":preferences"))
     implementation(project(":ktx"))
-    implementation(project(":badges"))
     implementation(project(":hiddenitems"))
     implementation(project(":compat"))
 

applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt

@@ -9,9 +9,8 @@ import android.content.pm.PackageInstaller
 import android.content.pm.ShortcutInfo
 import android.os.Process
 import android.os.UserHandle
+import android.os.UserManager
 import android.util.Log
-import de.mm20.launcher2.badges.Badge
-import de.mm20.launcher2.badges.BadgeProvider
 import de.mm20.launcher2.hiddenitems.HiddenItemsRepository
 import de.mm20.launcher2.preferences.LauncherPreferences
 import de.mm20.launcher2.search.data.AppInstallation
@@ -23,12 +22,12 @@ import kotlinx.coroutines.withContext
 
 interface AppRepository {
     fun search(query: String): Flow<List<Application>>
+    fun getSuspendedPackages(): Flow<List<String>>
 }
 
 class AppRepositoryImpl(
     private val context: Context,
     hiddenItemsRepository: HiddenItemsRepository,
-    private val badgeProvider: BadgeProvider
 ) : AppRepository {
 
     private val launcherApps =
@@ -37,6 +36,7 @@ class AppRepositoryImpl(
     private val installedApps = MutableStateFlow<List<Application>>(emptyList())
     private val installations = MutableStateFlow<MutableList<AppInstallation>>(mutableListOf())
     private val hiddenItems = hiddenItemsRepository.hiddenItemsKeys
+    private val suspendedPackages = MutableStateFlow<List<String>>(emptyList())
 
 
     private val profiles: List<UserHandle> =
@@ -101,12 +101,8 @@ class AppRepositoryImpl(
 
             override fun onPackagesSuspended(packageNames: Array<out String>?, user: UserHandle?) {
                 super.onPackagesSuspended(packageNames, user)
-                packageNames?.forEach {
-                    badgeProvider.setBadge(
-                        "app://$it",
-                        Badge(iconRes = R.drawable.ic_badge_suspended)
-                    )
-                }
+                packageNames ?: return
+                suspendedPackages.value = suspendedPackages.value + packageNames
             }
 
             override fun onPackagesUnsuspended(
@@ -114,9 +110,8 @@ class AppRepositoryImpl(
                 user: UserHandle?
             ) {
                 super.onPackagesUnsuspended(packageNames, user)
-                packageNames?.forEach {
-                    badgeProvider.removeBadge("app://$it")
-                }
+                packageNames ?: return
+                suspendedPackages.value = suspendedPackages.value.filter { packageNames.contains(it) }
             }
 
         })
@@ -130,15 +125,6 @@ class AppRepositoryImpl(
         packageInstaller.registerSessionCallback(object : PackageInstaller.SessionCallback() {
             override fun onProgressChanged(sessionId: Int, progress: Float) {
                 val session = packageInstaller.getSessionInfo(sessionId) ?: return
-                val pkg = session.appPackageName ?: return
-                if (!installingPackages.containsKey(sessionId)) {
-                    val key = "app://$pkg"
-                    val badge = badgeProvider.getBadge(key)?.also { it.progress = null }
-                        ?: Badge()
-                    badgeProvider.setBadge(key, badge)
-                    return
-                }
-                badgeProvider.updateBadge("app://$pkg", Badge(progress = progress))
             }
 
             override fun onActiveChanged(sessionId: Int, active: Boolean) {
@@ -149,10 +135,6 @@ class AppRepositoryImpl(
             override fun onFinished(sessionId: Int, success: Boolean) {
                 val pkg = installingPackages[sessionId]
                 installingPackages.remove(sessionId)
-                val key = "app://$pkg"
-                val badge = badgeProvider.getBadge(key)?.apply { progress = null }
-                    ?: Badge()
-                badgeProvider.setBadge(key, badge)
                 val inst = installations.value
                 inst.removeAll {
                     it.session.sessionId == sessionId
@@ -172,7 +154,7 @@ class AppRepositoryImpl(
             override fun onCreated(sessionId: Int) {
                 val session = packageInstaller.getSessionInfo(sessionId) ?: return
                 installingPackages[sessionId] = session.appPackageName ?: return
-                if (installedApps.value?.any { it.`package` == session.appPackageName } == true) return
+                if (installedApps.value.any { it.`package` == session.appPackageName }) return
                 if (session.appLabel.isNullOrBlank() || !session.isActive) return
                 val appInstallation = AppInstallation(session)
                 val inst = installations.value ?: mutableListOf()
@@ -182,6 +164,11 @@ class AppRepositoryImpl(
         })
     }
 
+
+    override fun getSuspendedPackages(): Flow<List<String>> {
+        return suspendedPackages
+    }
+
     private fun getApplications(packageName: String): List<Application> {
         if (packageName == context.packageName) return emptyList()
 

applications/src/main/java/de/mm20/launcher2/applications/Module.kt

@@ -5,5 +5,5 @@ import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
 val applicationsModule = module {
-    single<AppRepository> { AppRepositoryImpl(androidContext(), get(), get()) }
+    single<AppRepository> { AppRepositoryImpl(androidContext(), get()) }
 }

applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt

@@ -10,13 +10,11 @@ import android.os.Process
 import android.os.UserManager
 import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
-import de.mm20.launcher2.badges.BadgeProvider
 import de.mm20.launcher2.ktx.jsonObjectOf
 import de.mm20.launcher2.search.SearchableDeserializer
 import de.mm20.launcher2.search.SearchableSerializer
 import org.json.JSONObject
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 
 class LauncherAppSerializer : SearchableSerializer {
     override fun serialize(searchable: Searchable): String {
@@ -71,7 +69,6 @@ class AppShortcutDeserializer(
 
     @RequiresApi(Build.VERSION_CODES.N_MR1)
     override fun deserialize(serialized: String): Searchable? {
-        val badgeProvider: BadgeProvider by inject()
         val launcherApps = context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
         if (!launcherApps.hasShortcutHostPermission()) return null
         else {
@@ -104,11 +101,6 @@ class AppShortcutDeserializer(
                 return null
             } else {
                 val activity = shortcuts[0].activity
-                if (activity != null) {
-                    badgeProvider.addAppShortcutBadge(
-                        activity
-                    )
-                }
                 return AppShortcut(
                     context = context,
                     launcherShortcut = shortcuts[0],

applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt

@@ -12,19 +12,12 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import de.mm20.launcher2.applications.R
-import de.mm20.launcher2.badges.Badge
-import de.mm20.launcher2.badges.BadgeProvider
-import de.mm20.launcher2.graphics.BadgeDrawable
 import de.mm20.launcher2.icons.LauncherIcon
 import de.mm20.launcher2.ktx.getSerialNumber
 import de.mm20.launcher2.ktx.isAtLeastApiLevel
-import de.mm20.launcher2.ktx.jsonObjectOf
 import de.mm20.launcher2.preferences.LauncherPreferences
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.json.JSONObject
 import java.lang.IllegalStateException
 
 @RequiresApi(Build.VERSION_CODES.N_MR1)