lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename BadgeRepository -> BadgeService

Browse Source
This commit is contained in:
MM20 2023-04-10 23:00:07 +02:00
parent ed70097c38
commit e5a6043fe6
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
View File

@ -4,7 +4,7 @@ import android.content.Context
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.compose.ui.geometry.Rect import androidx.compose.ui.geometry.Rect
import androidx.core.app.ActivityOptionsCompat 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.data.customattrs.CustomAttributesRepository
import de.mm20.launcher2.searchable.SearchableRepository import de.mm20.launcher2.searchable.SearchableRepository
import de.mm20.launcher2.icons.IconRepository import de.mm20.launcher2.icons.IconRepository
@ -22,7 +22,7 @@ abstract class SearchableItemVM(
) : KoinComponent { ) : KoinComponent {
protected val favoritesService: FavoritesService by inject() protected val favoritesService: FavoritesService by inject()
protected val searchableRepository: SearchableRepository 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 iconRepository: IconRepository by inject()
protected val customAttributesRepository: CustomAttributesRepository by inject() protected val customAttributesRepository: CustomAttributesRepository by inject()
@ -44,7 +44,7 @@ abstract class SearchableItemVM(
searchableRepository.update(searchable, hidden = false) searchableRepository.update(searchable, hidden = false)
} }
val badge = badgeRepository.getBadge(searchable) val badge = badgeService.getBadge(searchable)
fun getIcon(size: Int): Flow<LauncherIcon> { fun getIcon(size: Int): Flow<LauncherIcon> {
return iconRepository.getIcon(searchable, size) return iconRepository.getIcon(searchable, size)

7
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt
View File

@ -11,9 +11,8 @@ import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import de.mm20.launcher2.appshortcuts.AppShortcutRepository import de.mm20.launcher2.appshortcuts.AppShortcutRepository
import de.mm20.launcher2.badges.Badge 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.data.customattrs.CustomAttributesRepository
import de.mm20.launcher2.searchable.SearchableRepository
import de.mm20.launcher2.icons.IconRepository import de.mm20.launcher2.icons.IconRepository
import de.mm20.launcher2.icons.LauncherIcon import de.mm20.launcher2.icons.LauncherIcon
import de.mm20.launcher2.ktx.normalize import de.mm20.launcher2.ktx.normalize
@ -38,7 +37,7 @@ class EditFavoritesSheetVM : ViewModel(), KoinComponent {
private val favoritesService: FavoritesService by inject() private val favoritesService: FavoritesService by inject()
private val shortcutRepository: AppShortcutRepository by inject() private val shortcutRepository: AppShortcutRepository by inject()
private val iconRepository: IconRepository 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 customAttributesRepository: CustomAttributesRepository by inject()
private val permissionsManager: PermissionsManager by inject() private val permissionsManager: PermissionsManager by inject()
private val dataStore: LauncherDataStore by inject() private val dataStore: LauncherDataStore by inject()
@ -186,7 +185,7 @@ class EditFavoritesSheetVM : ViewModel(), KoinComponent {
} }
fun getBadge(searchable: Searchable): Flow<Badge?> { fun getBadge(searchable: Searchable): Flow<Badge?> {
return badgeRepository.getBadge(searchable) return badgeService.getBadge(searchable)
} }
fun pickShortcut(section: FavoritesSheetSection) { fun pickShortcut(section: FavoritesSheetSection) {

4
services/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt → services/badges/src/main/java/de/mm20/launcher2/badges/BadgeService.kt
View File

@ -9,11 +9,11 @@ import kotlinx.coroutines.flow.*
import org.koin.core.component.KoinComponent import org.koin.core.component.KoinComponent
import org.koin.core.component.inject import org.koin.core.component.inject
interface BadgeRepository { interface BadgeService {
fun getBadge(searchable: Searchable): Flow<Badge?> fun getBadge(searchable: Searchable): Flow<Badge?>
} }
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 dataStore: LauncherDataStore by inject()
private val scope = CoroutineScope(Job() + Dispatchers.Default) private val scope = CoroutineScope(Job() + Dispatchers.Default)

2
services/badges/src/main/java/de/mm20/launcher2/badges/Module.kt
View File

@ -4,5 +4,5 @@ import org.koin.android.ext.koin.androidContext
import org.koin.dsl.module import org.koin.dsl.module
val badgesModule = module { val badgesModule = module {
single<BadgeRepository> { BadgeRepositoryImpl(androidContext()) } single<BadgeService> { BadgeServiceImpl(androidContext()) }
} }