diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt index 9f0fb22356..ff4bcc7b9c 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/SecondaryButton.kt @@ -39,7 +39,7 @@ fun SecondaryButton( colorFilter = ColorFilter.tint(colorPalette.text), modifier = Modifier .align(Alignment.Center) - .size(18.dp) + .size(24.dp) ) } } diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt index a614243c21..8d6765a5cb 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt @@ -200,7 +200,7 @@ fun PlaylistItem( Box( modifier = centeredModifier .clip(thumbnailShape) - .background(color = colorPalette.background1) + .background(color = colorPalette.background4) .requiredSize(thumbnailSizeDp) ) { thumbnailContent( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumSongs.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumSongs.kt index f94b45a9c0..63718c5334 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumSongs.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumSongs.kt @@ -88,7 +88,7 @@ fun AlbumSongs( Column(horizontalAlignment = Alignment.CenterHorizontally) { headerContent { SecondaryButton( - iconId = R.drawable.addqueue, + iconId = R.drawable.enqueue_new, enabled = songs.isNotEmpty(), onClick = { binder?.player?.enqueue(songs.map(Song::asMediaItem)) } ) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistLocalSongs.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistLocalSongs.kt index 4bf7918dbd..4b273cb827 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistLocalSongs.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistLocalSongs.kt @@ -83,7 +83,7 @@ fun ArtistLocalSongs( Column(horizontalAlignment = Alignment.CenterHorizontally) { headerContent { SecondaryButton( - iconId = R.drawable.addqueue, + iconId = R.drawable.enqueue_new, enabled = !songs.isNullOrEmpty(), onClick = { binder?.player?.enqueue(songs!!.map(Song::asMediaItem)) } ) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistSongs.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistSongs.kt index aa1a41d78e..6e423810ea 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistSongs.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistSongs.kt @@ -149,7 +149,7 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) { spacer = 0 ) SecondaryButton( - iconId = R.drawable.addqueue, + iconId = R.drawable.enqueue_new, enabled = songs.isNotEmpty(), onClick = { binder?.player?.enqueue(songs.map(Song::asMediaItem)) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt index 97c323bf8d..b467b9648f 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt @@ -129,7 +129,7 @@ fun HomeScreen(onPlaylistUrl: (String) -> Unit) { Item(2, stringResource(R.string.playlists), R.drawable.playlist) Item(3, stringResource(R.string.artists), R.drawable.person) Item(4, stringResource(R.string.albums), R.drawable.disc) - //Item(5, "Statistics", R.drawable.query_stats) + Item(5, "Statistics", R.drawable.query_stats) //Item(6, "Settings", R.drawable.equalizer) } ) { currentTabIndex -> @@ -161,14 +161,14 @@ fun HomeScreen(onPlaylistUrl: (String) -> Unit) { onAlbumClick = { albumRoute(it.id) }, onSearchClick = { searchRoute("") } ) -/* + 5 -> HomeStatistics( onStatisticsType = { statisticsTypeRoute(it)}, onBuiltInPlaylist = { builtInPlaylistRoute(it) }, onPlaylistClick = { localPlaylistRoute(it.id) }, onSearchClick = { searchRoute("") } ) -*/ + //6 -> settingsRoute() } } diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt index 525be971fc..15d4e1e359 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt @@ -156,7 +156,7 @@ fun LocalPlaylistSongs( .padding(bottom = 8.dp) ) { SecondaryButton( - iconId = R.drawable.addqueue, + iconId = R.drawable.enqueue_new, enabled = playlistWithSongs?.songs?.isNotEmpty() == true, onClick = { playlistWithSongs?.songs diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt index 3d26d3bfbb..8b9bdd0474 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/ColorPalette.kt @@ -17,6 +17,7 @@ data class ColorPalette( val background1: Color, val background2: Color, val background3: Color, + val background4: Color, val accent: Color, val onAccent: Color, val red: Color = Color(0xffbf4040), @@ -60,6 +61,7 @@ val DefaultDarkColorPalette = ColorPalette( background1 = Color(0xff1f2029), background2 = Color(0xff2b2d3b), background3 = Color(0xff495057), + background4 = Color(0xff333333), text = Color(0xffe1e1e2), textSecondary = Color(0xffa3a4a6), textDisabled = Color(0xff6f6f73), @@ -74,6 +76,7 @@ val DefaultLightColorPalette = ColorPalette( background1 = Color(0xfff8f8fc), background2 = Color(0xffeaeaf5), background3 = Color(0xffeaeafd), + background4 = Color(0xffeaeafd), text = Color(0xff212121), textSecondary = Color(0xff656566), textDisabled = Color(0xff9d9d9d), @@ -87,13 +90,15 @@ val PureBlackColorPalette = DefaultDarkColorPalette.copy( background0 = Color.Black, background1 = Color.Black, background2 = Color.Black, + ) val ModernBlackColorPalette = DefaultDarkColorPalette.copy( background0 = Color.Black, background1 = Color.Black, background2 = Color.Black, - background3 = DefaultDarkColorPalette.accent + background3 = DefaultDarkColorPalette.accent, + ) diff --git a/app/src/main/res/drawable-nodpi/enqueue_new.xml b/app/src/main/res/drawable-nodpi/enqueue_new.xml new file mode 100644 index 0000000000..758ff24ecc --- /dev/null +++ b/app/src/main/res/drawable-nodpi/enqueue_new.xml @@ -0,0 +1,31 @@ + + + + + +