From f6de1fb34082b8f828ef0bbd8bf59d6a03f921c9 Mon Sep 17 00:00:00 2001 From: Suhas Dissanayake Date: Mon, 8 Jan 2024 18:52:26 +0530 Subject: [PATCH] style: fix placeholder illustration --- .../ui/components/IllustratedMessageScreen.kt | 6 +-- .../vibeyou/ui/screens/music/MusicScreen.kt | 5 +- .../vibeyou/ui/screens/search/AlbumScreen.kt | 13 ++++-- .../vibeyou/ui/screens/search/ArtistScreen.kt | 2 +- .../ui/screens/search/LocalSearchScreen.kt | 8 +++- .../vibeyou/ui/screens/search/SearchScreen.kt | 8 +++- app/src/main/res/drawable/sad_mellow.xml | 46 ------------------- 7 files changed, 27 insertions(+), 61 deletions(-) delete mode 100644 app/src/main/res/drawable/sad_mellow.xml diff --git a/app/src/main/java/app/suhasdissa/vibeyou/ui/components/IllustratedMessageScreen.kt b/app/src/main/java/app/suhasdissa/vibeyou/ui/components/IllustratedMessageScreen.kt index b07ce6c0..e953e129 100644 --- a/app/src/main/java/app/suhasdissa/vibeyou/ui/components/IllustratedMessageScreen.kt +++ b/app/src/main/java/app/suhasdissa/vibeyou/ui/components/IllustratedMessageScreen.kt @@ -55,13 +55,13 @@ fun IllustratedMessageScreen( modifier = Modifier.size(350.dp), painter = painterResource(id = R.drawable.blob), contentDescription = null, - colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.errorContainer) + colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.secondaryContainer) ) Image( modifier = Modifier.size(250.dp), painter = painterResource(id = image), contentDescription = null, - colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onErrorContainer) + colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondaryContainer) ) } action() @@ -72,7 +72,7 @@ fun IllustratedMessageScreen( @Preview(showBackground = true) private fun IllustratedMsgScreenPreview() { IllustratedMessageScreen( - image = R.drawable.sad_mellow, + image = R.drawable.ic_launcher_monochrome, message = R.string.something_went_wrong ) } diff --git a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/music/MusicScreen.kt b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/music/MusicScreen.kt index dedf232e..011acd88 100644 --- a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/music/MusicScreen.kt +++ b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/music/MusicScreen.kt @@ -18,10 +18,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import androidx.lifecycle.viewmodel.compose.viewModel import app.suhasdissa.vibeyou.Destination import app.suhasdissa.vibeyou.R -import app.suhasdissa.vibeyou.backend.viewmodel.PlaylistViewModel import app.suhasdissa.vibeyou.ui.screens.playlists.PlaylistsScreen import app.suhasdissa.vibeyou.ui.screens.songs.SongsScreen import kotlinx.coroutines.launch @@ -29,8 +27,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalFoundationApi::class) @Composable fun MusicScreen( - onNavigate: (Destination) -> Unit, - playlistViewModel: PlaylistViewModel = viewModel(factory = PlaylistViewModel.Factory) + onNavigate: (Destination) -> Unit ) { val pagerState = rememberPagerState { 3 } val scope = rememberCoroutineScope() diff --git a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/AlbumScreen.kt b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/AlbumScreen.kt index febd16e6..5d7a51c3 100644 --- a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/AlbumScreen.kt +++ b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/AlbumScreen.kt @@ -58,7 +58,7 @@ fun AlbumScreen( MiniPlayerScaffold { when (state) { AlbumInfoState.Error -> IllustratedMessageScreen( - image = R.drawable.sad_mellow, + image = R.drawable.ic_launcher_monochrome, message = R.string.something_went_wrong ) @@ -74,7 +74,10 @@ fun AlbumScreen( ) { item { Column( - Modifier.fillMaxWidth().padding(8.dp).padding(bottom = 8.dp), + Modifier + .fillMaxWidth() + .padding(8.dp) + .padding(bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(8.dp), horizontalAlignment = Alignment.CenterHorizontally ) { @@ -89,7 +92,11 @@ fun AlbumScreen( contentScale = ContentScale.Crop, error = painterResource(id = R.drawable.music_placeholder) ) - Column(Modifier.fillMaxWidth().padding(8.dp)) { + Column( + Modifier + .fillMaxWidth() + .padding(8.dp) + ) { Text( text = state.album.title, style = MaterialTheme.typography.titleLarge diff --git a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/ArtistScreen.kt b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/ArtistScreen.kt index b33514fa..0fd60be7 100644 --- a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/ArtistScreen.kt +++ b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/ArtistScreen.kt @@ -36,7 +36,7 @@ fun ArtistScreen( }) { when (state) { ArtistInfoState.Error -> IllustratedMessageScreen( - image = R.drawable.sad_mellow, + image = R.drawable.ic_launcher_monochrome, message = R.string.something_went_wrong ) diff --git a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/LocalSearchScreen.kt b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/LocalSearchScreen.kt index 6837af45..0a664a63 100644 --- a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/LocalSearchScreen.kt +++ b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/LocalSearchScreen.kt @@ -128,7 +128,11 @@ fun LocalSearchScreen( localSearchViewModel.setSearchHistory() } val scroll = rememberScrollState() - Column(Modifier.verticalScroll(scroll).padding(horizontal = 8.dp)) { + Column( + Modifier + .verticalScroll(scroll) + .padding(horizontal = 8.dp) + ) { if (localSearchViewModel.songSearchSuggestion.isNotEmpty()) { Text( text = stringResource(R.string.songs), @@ -180,7 +184,7 @@ fun LocalSearchScreen( is SearchState.Error -> { IllustratedMessageScreen( - image = R.drawable.sad_mellow, + image = R.drawable.ic_launcher_monochrome, message = R.string.something_went_wrong ) } diff --git a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/SearchScreen.kt b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/SearchScreen.kt index 6d5dbecc..daccd73f 100644 --- a/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/SearchScreen.kt +++ b/app/src/main/java/app/suhasdissa/vibeyou/ui/screens/search/SearchScreen.kt @@ -130,7 +130,11 @@ fun SearchScreen( pipedSearchViewModel.setSearchHistory() } val scroll = rememberScrollState() - Column(Modifier.verticalScroll(scroll).padding(horizontal = 8.dp)) { + Column( + Modifier + .verticalScroll(scroll) + .padding(horizontal = 8.dp) + ) { if (pipedSearchViewModel.suggestions.isNotEmpty()) { pipedSearchViewModel.suggestions.forEach { ListItem( @@ -201,7 +205,7 @@ fun SearchScreen( is SearchState.Error -> { IllustratedMessageScreen( - image = R.drawable.sad_mellow, + image = R.drawable.ic_launcher_monochrome, message = R.string.something_went_wrong, action = { TextButton( diff --git a/app/src/main/res/drawable/sad_mellow.xml b/app/src/main/res/drawable/sad_mellow.xml deleted file mode 100644 index f1bef591..00000000 --- a/app/src/main/res/drawable/sad_mellow.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - -