diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt index 7a6e5f7f..640a9d20 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.appcompat.app.AppCompatActivity import androidx.compose.ui.geometry.Rect import androidx.core.app.ActivityOptionsCompat -import de.mm20.launcher2.badges.BadgeRepository +import de.mm20.launcher2.badges.BadgeService import de.mm20.launcher2.data.customattrs.CustomAttributesRepository import de.mm20.launcher2.searchable.SearchableRepository import de.mm20.launcher2.icons.IconRepository @@ -22,7 +22,7 @@ abstract class SearchableItemVM( ) : KoinComponent { protected val favoritesService: FavoritesService by inject() protected val searchableRepository: SearchableRepository by inject() - protected val badgeRepository: BadgeRepository by inject() + protected val badgeService: BadgeService by inject() protected val iconRepository: IconRepository by inject() protected val customAttributesRepository: CustomAttributesRepository by inject() @@ -44,7 +44,7 @@ abstract class SearchableItemVM( searchableRepository.update(searchable, hidden = false) } - val badge = badgeRepository.getBadge(searchable) + val badge = badgeService.getBadge(searchable) fun getIcon(size: Int): Flow { return iconRepository.getIcon(searchable, size) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt index af83472c..827e49bd 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt @@ -11,9 +11,8 @@ import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import de.mm20.launcher2.appshortcuts.AppShortcutRepository import de.mm20.launcher2.badges.Badge -import de.mm20.launcher2.badges.BadgeRepository +import de.mm20.launcher2.badges.BadgeService import de.mm20.launcher2.data.customattrs.CustomAttributesRepository -import de.mm20.launcher2.searchable.SearchableRepository import de.mm20.launcher2.icons.IconRepository import de.mm20.launcher2.icons.LauncherIcon import de.mm20.launcher2.ktx.normalize @@ -38,7 +37,7 @@ class EditFavoritesSheetVM : ViewModel(), KoinComponent { private val favoritesService: FavoritesService by inject() private val shortcutRepository: AppShortcutRepository by inject() private val iconRepository: IconRepository by inject() - private val badgeRepository: BadgeRepository by inject() + private val badgeService: BadgeService by inject() private val customAttributesRepository: CustomAttributesRepository by inject() private val permissionsManager: PermissionsManager by inject() private val dataStore: LauncherDataStore by inject() @@ -186,7 +185,7 @@ class EditFavoritesSheetVM : ViewModel(), KoinComponent { } fun getBadge(searchable: Searchable): Flow { - return badgeRepository.getBadge(searchable) + return badgeService.getBadge(searchable) } fun pickShortcut(section: FavoritesSheetSection) { diff --git a/services/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/BadgeService.kt similarity index 96% rename from services/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/BadgeService.kt index d7606789..44d2aab4 100644 --- a/services/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt +++ b/services/badges/src/main/java/de/mm20/launcher2/badges/BadgeService.kt @@ -9,11 +9,11 @@ import kotlinx.coroutines.flow.* import org.koin.core.component.KoinComponent import org.koin.core.component.inject -interface BadgeRepository { +interface BadgeService { fun getBadge(searchable: Searchable): Flow } -internal class BadgeRepositoryImpl(private val context: Context) : BadgeRepository, KoinComponent { +internal class BadgeServiceImpl(private val context: Context) : BadgeService, KoinComponent { private val dataStore: LauncherDataStore by inject() private val scope = CoroutineScope(Job() + Dispatchers.Default) diff --git a/services/badges/src/main/java/de/mm20/launcher2/badges/Module.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/Module.kt index a73cb800..5f354faf 100644 --- a/services/badges/src/main/java/de/mm20/launcher2/badges/Module.kt +++ b/services/badges/src/main/java/de/mm20/launcher2/badges/Module.kt @@ -4,5 +4,5 @@ import org.koin.android.ext.koin.androidContext import org.koin.dsl.module val badgesModule = module { - single { BadgeRepositoryImpl(androidContext()) } + single { BadgeServiceImpl(androidContext()) } } \ No newline at end of file