refactor of some little things

BobbyESP · Nov 21, 2024 · b641d93 · b641d93
1 parent 45d2f3e
commit b641d93
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStorePage.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStorePage.kt
@@ -58,12 +58,12 @@ fun MediaStorePage(
                 ) { onReloadMediaStore() }
 
                 is ResourceState.Success -> {
-                    if (songsList.data!!.isEmpty()) {
+                    val dataSongsList = songsList.data!!
+                    if (dataSongsList.isEmpty()) {
                         EmptyMediaStore(
                             modifier = Modifier.fillMaxSize()
                         )
                     } else {
-                        val dataSongsList = songsList.data!!
                         when (type) {
                             LayoutType.Grid -> {
                                 LazyVerticalGridScrollbar(
@@ -118,7 +118,7 @@ fun MediaStorePage(
                                         items(
                                             count = dataSongsList.size,
                                             key = { index -> dataSongsList[index].id },
-                                            contentType = { index -> dataSongsList[index].id.toString() }) { index ->
+                                            contentType = { _ -> "songItem" }) { index ->
                                             val song = dataSongsList[index]
                                             HorizontalSongCard(
                                                 song = song,

diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStorePageViewModel.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStorePageViewModel.kt
@@ -12,11 +12,10 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.koin.core.component.KoinComponent
 
 class MediaStorePageViewModel(
     context: Context
-) : KoinComponent, ViewModel() {
+) : ViewModel() {
     private val _songs: MutableStateFlow<ResourceState<List<Song>>> =
         MutableStateFlow(ResourceState.Loading())
     val songs = _songs.asStateFlow()
@@ -39,9 +38,7 @@ class MediaStorePageViewModel(
 
     fun onEvent(event: Events) {
         when (event) {
-            is Events.StartObservingMediaStore -> {
-                songsCollection()
-            }
+            is Events.StartObservingMediaStore -> songsCollection()
 
             is Events.ReloadMediaStore -> reloadMediaStore()
         }