Merge pull request #62 from swingmx/artist-info

swingmx · Jan 3, 2025 · 2d280df · 2d280df
2 parents eec4843 + a0802bf
commit 2d280df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...re/album/src/main/java/com/android/swingmusic/album/presentation/screen/AllAlbumScreen.kt b/...re/album/src/main/java/com/android/swingmusic/album/presentation/screen/AllAlbumScreen.kt
@@ -241,6 +241,10 @@ private fun AllAlbums(
                                 }
                             )
                         }
+
+                        item(span = { GridItemSpan(allAlbumsUiState.gridCount) }) {
+                            Spacer(modifier = Modifier.height(200.dp))
+                        }
                     }
 
                     loadingState?.let {

diff --git a/...e/artist/src/main/java/com/android/swingmusic/artist/presentation/screen/ArtistsScreen.kt b/...e/artist/src/main/java/com/android/swingmusic/artist/presentation/screen/ArtistsScreen.kt
@@ -238,6 +238,10 @@ private fun Artists(
                                 }
                             )
                         }
+
+                        item(span = { GridItemSpan(artistsUiState.gridCount) }) {
+                            Spacer(modifier = Modifier.height(200.dp))
+                        }
                     }
 
                     loadingState?.let {

diff --git a/...older/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt b/...older/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt
@@ -276,7 +276,7 @@ private fun FoldersAndTracks(
                                 if (index == foldersAndTracksState.foldersAndTracks.folders.lastIndex &&
                                     foldersAndTracksState.foldersAndTracks.tracks.isEmpty()
                                 ) {
-                                    Spacer(modifier = Modifier.height(150.dp))
+                                    Spacer(modifier = Modifier.height(200.dp))
                                 }
                             }
 
@@ -287,7 +287,7 @@ private fun FoldersAndTracks(
                             ) { index, track ->
                                 TrackItem(
                                     track = track,
-                                    showMenuIcon = true, // TODO: set true after fixing AlbumInfo bug
+                                    showMenuIcon = true,
                                     isCurrentTrack = track.trackHash == currentTrackHash,
                                     playbackState = playbackState,
                                     baseUrl = baseUrl,
@@ -303,7 +303,7 @@ private fun FoldersAndTracks(
                                 )
 
                                 if (index == foldersAndTracksState.foldersAndTracks.tracks.lastIndex) {
-                                    Spacer(modifier = Modifier.height(150.dp))
+                                    Spacer(modifier = Modifier.height(200.dp))
                                 }
                             }
                         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -241,6 +241,10 @@ private fun AllAlbums( @@
                                     }
                                 )
                             }
+                            item(span = { GridItemSpan(allAlbumsUiState.gridCount) }) {
+                                Spacer(modifier = Modifier.height(200.dp))
+                            }
                         }
                         loadingState?.let {
@@ Expand Down @@