chore: Updated Media3 to the latest alpha

ui: Added a "no songs" screen

Signed-off-by: Gabriel Fontán <[email protected]>

app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStorePage.kt

@@ -20,6 +20,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.bobbyesp.metadator.presentation.components.cards.songs.HorizontalSongCard
 import com.bobbyesp.metadator.presentation.components.cards.songs.VerticalSongCard
 import com.bobbyesp.metadator.presentation.pages.home.LayoutType
+import com.bobbyesp.metadator.presentation.pages.status.EmptyMediaStore
 import com.bobbyesp.model.Song
 import my.nanihadesuka.compose.LazyColumnScrollbar
 import my.nanihadesuka.compose.LazyGridVerticalScrollbar
@@ -42,60 +43,66 @@ fun MediaStorePage(
         Crossfade(
             targetState = desiredLayout, label = "List item transition", animationSpec = tween(200)
         ) { type ->
-            when (type) {
-                LayoutType.Grid -> {
-                    LazyGridVerticalScrollbar(
-                        state = lazyGridState,
-                        thumbColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                        thumbSelectedColor = MaterialTheme.colorScheme.primary,
-                        selectionActionable = ScrollbarSelectionActionable.WhenVisible,
-                    ) {
-                        LazyVerticalGrid(
-                            columns = GridCells.Adaptive(125.dp),
-                            verticalArrangement = Arrangement.spacedBy(6.dp),
-                            horizontalArrangement = Arrangement.spacedBy(6.dp),
-                            contentPadding = PaddingValues(8.dp),
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .background(MaterialTheme.colorScheme.background),
-                            state = lazyGridState
+            if (songs.isEmpty()) {
+                EmptyMediaStore(
+                    modifier = Modifier.fillMaxSize()
+                )
+            } else {
+                when (type) {
+                    LayoutType.Grid -> {
+                        LazyGridVerticalScrollbar(
+                            state = lazyGridState,
+                            thumbColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                            thumbSelectedColor = MaterialTheme.colorScheme.primary,
+                            selectionActionable = ScrollbarSelectionActionable.WhenVisible,
                         ) {
-                            items(count = songs.size,
-                                key = { index -> songs[index].id },
-                                contentType = { index -> songs[index].id.toString() }) { index ->
-                                val song = songs[index]
-                                VerticalSongCard(song = song, modifier = Modifier.animateItem(
-                                    fadeInSpec = null, fadeOutSpec = null
-                                ), onClick = {
-                                    onItemClicked(song)
-                                })
+                            LazyVerticalGrid(
+                                columns = GridCells.Adaptive(125.dp),
+                                verticalArrangement = Arrangement.spacedBy(6.dp),
+                                horizontalArrangement = Arrangement.spacedBy(6.dp),
+                                contentPadding = PaddingValues(8.dp),
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .background(MaterialTheme.colorScheme.background),
+                                state = lazyGridState
+                            ) {
+                                items(count = songs.size,
+                                    key = { index -> songs[index].id },
+                                    contentType = { index -> songs[index].id.toString() }) { index ->
+                                    val song = songs[index]
+                                    VerticalSongCard(song = song, modifier = Modifier.animateItem(
+                                        fadeInSpec = null, fadeOutSpec = null
+                                    ), onClick = {
+                                        onItemClicked(song)
+                                    })
+                                }
                             }
                         }
                     }
-                }
 
-                LayoutType.List -> {
-                    LazyColumnScrollbar(
-                        listState = lazyListState,
-                        thumbColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                        thumbSelectedColor = MaterialTheme.colorScheme.primary,
-                        selectionActionable = ScrollbarSelectionActionable.WhenVisible,
-                    ) {
-                        LazyColumn(
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .background(MaterialTheme.colorScheme.background),
-                            state = lazyListState,
+                    LayoutType.List -> {
+                        LazyColumnScrollbar(
+                            listState = lazyListState,
+                            thumbColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                            thumbSelectedColor = MaterialTheme.colorScheme.primary,
+                            selectionActionable = ScrollbarSelectionActionable.WhenVisible,
                         ) {
-                            items(count = songs.size,
-                                key = { index -> songs[index].id },
-                                contentType = { index -> songs[index].id.toString() }) { index ->
-                                val song = songs[index]
-                                HorizontalSongCard(song = song, modifier = Modifier.animateItem(
-                                    fadeInSpec = null, fadeOutSpec = null
-                                ), onClick = {
-                                    onItemClicked(song)
-                                })
+                            LazyColumn(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .background(MaterialTheme.colorScheme.background),
+                                state = lazyListState,
+                            ) {
+                                items(count = songs.size,
+                                    key = { index -> songs[index].id },
+                                    contentType = { index -> songs[index].id.toString() }) { index ->
+                                    val song = songs[index]
+                                    HorizontalSongCard(song = song, modifier = Modifier.animateItem(
+                                        fadeInSpec = null, fadeOutSpec = null
+                                    ), onClick = {
+                                        onItemClicked(song)
+                                    })
+                                }
                             }
                         }
                     }

app/src/main/java/com/bobbyesp/metadator/presentation/pages/status/EmptyMediaStore.kt

@@ -0,0 +1,75 @@
+package com.bobbyesp.metadator.presentation.pages.status
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.twotone.LibraryMusic
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.bobbyesp.metadator.R
+import com.bobbyesp.metadator.presentation.theme.MetadatorTheme
+
+@Composable
+fun EmptyMediaStore(
+    modifier: Modifier = Modifier
+) {
+    Box(
+        modifier = modifier,
+        contentAlignment = Alignment.Center
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Icon(
+                modifier = Modifier.size(72.dp),
+                imageVector = Icons.TwoTone.LibraryMusic,
+                contentDescription = stringResource(id = R.string.empty_media_store)
+            )
+            HorizontalDivider(modifier = Modifier.fillMaxWidth(0.7f))
+            Text(
+                text = stringResource(id = R.string.empty_media_store),
+                style = MaterialTheme.typography.bodyLarge,
+                fontWeight = FontWeight.SemiBold
+            )
+            Text(
+                text = stringResource(id = R.string.empty_media_store_desc),
+                style = MaterialTheme.typography.bodyMedium,
+                textAlign = TextAlign.Center
+            )
+        }
+    }
+}
+
+@Preview
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Composable
+private fun EmptyMediaStorePrev() {
+    MetadatorTheme {
+        EmptyMediaStore(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.background)
+        )
+    }
+}

app/src/main/res/values-es/strings.xml

@@ -54,4 +54,6 @@
     <string name="music_queue">Cola de música</string>
     <string name="toggle_shuffle">Alternar modo aleatorio</string>
     <string name="toggle_repeat">Alternar modo de repetición</string>
+    <string name="empty_media_store">MediaStore vacío</string>
+    <string name="empty_media_store_desc">Parece que no tienes canciones en tu dispositivo. Vuelve cuando tengas algo que editar!</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -53,5 +53,7 @@
     <string name="music_queue">Music queue</string>
     <string name="toggle_shuffle">Toggle shuffle</string>
     <string name="toggle_repeat">Toggle repeat</string>
+    <string name="empty_media_store">Empty MediaStore</string>
+    <string name="empty_media_store_desc">Seems like you have no songs on your device. Come back when there\'s something to edit!</string>
 
 </resources>

app/utilities/src/main/java/com/bobbyesp/utilities/mediastore/MediaStoreReceiver.kt

@@ -227,9 +227,10 @@ object MediaStoreReceiver {
         }
 
         fun ContentResolver.observeSongs(
+            searchTerm: String? = null,
             filter: MediaStoreFilterType? = null,
         ) = observe(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI).map {
-            getSongs(filterType = filter)
+            getSongs(filterType = filter, searchTerm = searchTerm)
         }
     }
 }

gradle.properties

@@ -21,4 +21,5 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaultConfig.ndk.debugSymbolLevel='FULL'
+android.defaultConfig.ndk.debugSymbolLevel='FULL'
+org.gradle.configuration-cache=true

gradle/libs.versions.toml

@@ -14,7 +14,7 @@ ksp = "1.9.23-1.0.19"
 lyricfier = "1.0"
 splashscreen = "1.0.1"
 material = "1.11.0"
-media3 = "1.3.1"
+media3 = "1.4.0-alpha01"
 leakcanary = "2.13"
 
 #Compose