Annual refactor

services/badges/src/main/java/de/mm20/launcher2/badges/providers/AppShortcutBadgeProvider.kt

@@ -4,10 +4,8 @@ import android.content.Context
 import android.content.pm.PackageManager
 import de.mm20.launcher2.badges.Badge
 import de.mm20.launcher2.graphics.BadgeDrawable
-import de.mm20.launcher2.search.data.LauncherShortcut
-import de.mm20.launcher2.search.data.LegacyShortcut
+import de.mm20.launcher2.search.AppShortcut
 import de.mm20.launcher2.search.Searchable
-import de.mm20.launcher2.search.data.UnavailableShortcut
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
@@ -17,53 +15,37 @@ class AppShortcutBadgeProvider(
     private val context: Context
 ) : BadgeProvider {
     override fun getBadge(searchable: Searchable): Flow<Badge?> = channelFlow {
-        if (searchable is LauncherShortcut) {
-            val componentName = searchable.launcherShortcut.activity
-            if (componentName == null) {
+        if (searchable is AppShortcut) {
+            val componentName = searchable.componentName
+            val packageName = searchable.packageName
+            if (componentName != null) {
+                withContext(Dispatchers.IO) {
+                    val icon = try {
+                        context.packageManager.getActivityIcon(
+                            componentName
+                        )
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        return@withContext
+                    }
+                    val badge = Badge(icon = BadgeDrawable(context, icon))
+                    send(badge)
+                }
+            } else if (packageName != null) {
+                withContext(Dispatchers.IO) {
+                    val icon = try {
+                        context.packageManager.getApplicationIcon(
+                            packageName
+                        )
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        return@withContext
+                    }
+                    val badge = Badge(icon = BadgeDrawable(context, icon))
+                    send(badge)
+                }
+            } else {
                 send(null)
                 return@channelFlow
             }
-            withContext(Dispatchers.IO) {
-                val icon = try {
-                    context.packageManager.getActivityIcon(
-                        componentName
-                    )
-                } catch (e: PackageManager.NameNotFoundException) {
-                    return@withContext
-                }
-                val badge = Badge(icon = BadgeDrawable(context, icon))
-                send(badge)
-            }
-        } else if (searchable is LegacyShortcut) {
-            val packageName = searchable.packageName
-            if (packageName == null) {
-                send(null)
-                return@channelFlow
-            }
-            withContext(Dispatchers.IO) {
-                val icon = try {
-                    context.packageManager.getApplicationIcon(
-                        packageName
-                    )
-                } catch (e: PackageManager.NameNotFoundException) {
-                    return@withContext
-                }
-                val badge = Badge(icon = BadgeDrawable(context, icon))
-                send(badge)
-            }
-        } else if (searchable is UnavailableShortcut) {
-            val packageName = searchable.packageName
-            withContext(Dispatchers.IO) {
-                val icon = try {
-                    context.packageManager.getApplicationIcon(
-                        packageName
-                    )
-                } catch (e: PackageManager.NameNotFoundException) {
-                    return@withContext
-                }
-                val badge = Badge(icon = BadgeDrawable(context, icon))
-                send(badge)
-            }
         } else {
             send(null)
         }

services/badges/src/main/java/de/mm20/launcher2/badges/providers/CloudBadgeProvider.kt

@@ -1,7 +1,7 @@
 package de.mm20.launcher2.badges.providers
 
 import de.mm20.launcher2.badges.Badge
-import de.mm20.launcher2.search.data.File
+import de.mm20.launcher2.search.File
 import de.mm20.launcher2.search.Searchable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow

services/badges/src/main/java/de/mm20/launcher2/badges/providers/NotificationBadgeProvider.kt

@@ -3,7 +3,7 @@ package de.mm20.launcher2.badges.providers
 import de.mm20.launcher2.badges.Badge
 import de.mm20.launcher2.notifications.NotificationRepository
 import de.mm20.launcher2.search.Searchable
-import de.mm20.launcher2.search.data.LauncherApp
+import de.mm20.launcher2.search.Application
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.collectLatest
@@ -15,8 +15,8 @@ class NotificationBadgeProvider : BadgeProvider, KoinComponent {
     private val notificationRepository: NotificationRepository by inject()
 
     override fun getBadge(searchable: Searchable): Flow<Badge?> = channelFlow {
-        if (searchable is LauncherApp) {
-            val packageName = searchable.`package`
+        if (searchable is Application) {
+            val packageName = searchable.componentName.packageName
             notificationRepository.notifications.map {
                 it.filter { it.packageName == packageName }
             }.collectLatest {

services/badges/src/main/java/de/mm20/launcher2/badges/providers/SuspendedAppsBadgeProvider.kt

@@ -1,33 +1,18 @@
 package de.mm20.launcher2.badges.providers
 
-import de.mm20.launcher2.applications.AppRepository
 import de.mm20.launcher2.badges.Badge
 import de.mm20.launcher2.badges.R
+import de.mm20.launcher2.search.Application
 import de.mm20.launcher2.search.Searchable
-import de.mm20.launcher2.search.data.LauncherApp
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.collectLatest
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 
 class SuspendedAppsBadgeProvider : BadgeProvider, KoinComponent {
-    private val appRepository: AppRepository by inject()
 
     override fun getBadge(searchable: Searchable): Flow<Badge?> = channelFlow {
-        if (searchable is LauncherApp) {
-            val packageName = searchable.`package`
-            appRepository.getSuspendedPackages().collectLatest {
-                if (it.contains(packageName)) {
-                    send(
-                        Badge(
-                            iconRes = R.drawable.ic_badge_suspended
-                        )
-                    )
-                } else {
-                    send(null)
-                }
-            }
+        if (searchable is Application && searchable.isSuspended) {
+            send(Badge(iconRes = R.drawable.ic_badge_suspended))
         } else {
             send(null)
         }

services/badges/src/main/java/de/mm20/launcher2/badges/providers/WorkProfileBadgeProvider.kt

@@ -2,15 +2,16 @@ package de.mm20.launcher2.badges.providers
 
 import de.mm20.launcher2.badges.Badge
 import de.mm20.launcher2.badges.R
-import de.mm20.launcher2.search.data.LauncherApp
-import de.mm20.launcher2.search.data.LauncherShortcut
+import de.mm20.launcher2.search.AppProfile
+import de.mm20.launcher2.search.AppShortcut
+import de.mm20.launcher2.search.Application
 import de.mm20.launcher2.search.Searchable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
 class WorkProfileBadgeProvider : BadgeProvider {
     override fun getBadge(searchable: Searchable): Flow<Badge?> = flow {
-        if (searchable is LauncherApp && !searchable.isMainProfile || searchable is LauncherShortcut && !searchable.isMainProfile) {
+        if (searchable is Application && searchable.profile == AppProfile.Work || searchable is AppShortcut && searchable.profile == AppProfile.Work) {
             emit(
                 Badge(
                     iconRes = R.drawable.ic_badge_workprofile