Skip to content

Native Android client for Spotify, built with Jetpack Compose

Merge branch 'pr-15'

kota-zo36d558dbda75
diff --cc base/app/src/main/java/com/music/spotui/data/preferences/SettingsPref.kt
index fdcc9a11,54215617..96840260
--- a/base/app/src/main/java/com/music/spotui/data/preferences/SettingsPref.kt
+++ b/base/app/src/main/java/com/music/spotui/data/preferences/SettingsPref.kt
@@@ -18,18 -16,6 +18,18 @@@ fun setLyricsExtraSources(c: Context, v
private fun prefs(c: Context) = c.getSharedPreferences(PREF, Context.MODE_PRIVATE)
- /** The bottom bar: solid black, or fading into the list (the default). Read by the bar as state. */
++/** The bottom bar: solid black (the default), or fading into the list. Read by the bar as state. */
+object SolidNavBar {
+ private const val KEY = "solid_nav_bar"
- var on by androidx.compose.runtime.mutableStateOf(prefs(com.music.spotui.di.Graph.app).getBoolean(KEY, false))
++ var on by androidx.compose.runtime.mutableStateOf(prefs(com.music.spotui.di.Graph.app).getBoolean(KEY, true))
+ private set
+
+ fun set(c: Context, value: Boolean) {
+ on = value
+ prefs(c).edit().putBoolean(KEY, value).apply()
+ }
+}
+
/** Library layout: false = rows (default), true = Spotify-style 3-column grid. */
fun isLibraryGridView(c: Context): Boolean = prefs(c).getBoolean(KEY_LIBRARY_GRID, false)
fun setLibraryGridView(c: Context, v: Boolean) = prefs(c).edit().putBoolean(KEY_LIBRARY_GRID, v).apply()
diff --cc base/app/src/main/java/com/music/spotui/ui/navigation/MainBottomNavigation.kt
index dbb9fa04,d491b8e1..2c98e691
--- a/base/app/src/main/java/com/music/spotui/ui/navigation/MainBottomNavigation.kt
+++ b/base/app/src/main/java/com/music/spotui/ui/navigation/MainBottomNavigation.kt
@@@ -76,11 -75,7 +76,11 @@@ fun MainBottomNavigation(navController
contentAlignment = Alignment.BottomCenter,
modifier = Modifier
.fillMaxWidth()
- // Settings, Display: a solid black bar, or the fade that lets the list show through.
- .background(Color.Black)
++ // Settings, Display: solid black (the default, from #15), or the fade over the list.
+ .then(
+ if (com.music.spotui.data.preferences.SolidNavBar.on) Modifier.background(Color.Black)
+ else Modifier.background(Brush.verticalGradient(colors = listOf(Color.Transparent, Color.Black), startY = 0f))
+ )
) {
Column(modifier = Modifier.navigationBarsPadding()) {