diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/AndroidSettingsCatalog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/AndroidSettingsCatalog.kt
index 411e97acf3..56b5263afc 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/AndroidSettingsCatalog.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/AndroidSettingsCatalog.kt
@@ -76,6 +76,11 @@ object AndroidSettingsCatalog : SettingsCatalog {
setting = AppearanceSettings.PureBlack,
title = StringKey.PREF_PURE_BLACK_TITLE,
summary = StringKey.PREF_PURE_BLACK_SUMMARY
+ ),
+ SettingItem.Switch(
+ setting = AppearanceSettings.CompactMode,
+ title = StringKey.PREF_COMPACT_MODE_TITLE,
+ summary = StringKey.PREF_COMPACT_MODE_SUMMARY
)
)
),
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/text/UiTextResources.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/text/UiTextResources.kt
index cb647e013e..02d7d2fdeb 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/text/UiTextResources.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/text/UiTextResources.kt
@@ -97,6 +97,8 @@ val StringKey.resId: Int
StringKey.PREF_COLOUR_FROM_ARTWORK_SUMMARY -> R.string.pref_colour_from_artwork_summary
StringKey.PREF_PURE_BLACK_TITLE -> R.string.pref_pure_black_title
StringKey.PREF_PURE_BLACK_SUMMARY -> R.string.pref_pure_black_summary
+ StringKey.PREF_COMPACT_MODE_TITLE -> R.string.pref_compact_mode_title
+ StringKey.PREF_COMPACT_MODE_SUMMARY -> R.string.pref_compact_mode_summary
StringKey.PREF_CATEGORY_TITLE_WIDGETS -> R.string.pref_category_title_widgets
StringKey.PREF_WIDGET_OPACITY_TITLE -> R.string.pref_widget_opacity_title
StringKey.PREF_NAVIGATION_TITLE -> R.string.pref_navigation_title
diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt
index 33cc847231..9b8156076e 100644
--- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt
+++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt
@@ -3,11 +3,13 @@ package com.simplecityapps.shuttle.ui.theme
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.ui.graphics.Color
import androidx.lifecycle.ViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewModelScope
+import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode
import com.simplecityapps.shuttle.designsystem.theme.S2Accent
import com.simplecityapps.shuttle.designsystem.theme.S2Theme
import com.simplecityapps.shuttle.settings.Accent
@@ -29,7 +31,8 @@ data class AppThemeState(
val theme: ThemeMode = ThemeMode.DayNight,
val accent: Accent = Accent.Default,
val dynamicColour: Boolean = false,
- val pureBlack: Boolean = false
+ val pureBlack: Boolean = false,
+ val compactMode: Boolean = false
)
/** The Appearance settings the Compose theme follows, live, so a change in Settings restyles the app without a restart. */
@@ -44,6 +47,7 @@ class AppThemeViewModel @Inject constructor(
observeSetting(AppearanceSettings.AccentColour),
observeSetting(AppearanceSettings.DynamicColour),
observeSetting(AppearanceSettings.PureBlack),
+ observeSetting(AppearanceSettings.CompactMode),
::AppThemeState
).stateIn(
scope = viewModelScope,
@@ -52,7 +56,8 @@ class AppThemeViewModel @Inject constructor(
theme = readSetting(AppearanceSettings.Theme),
accent = readSetting(AppearanceSettings.AccentColour),
dynamicColour = readSetting(AppearanceSettings.DynamicColour),
- pureBlack = readSetting(AppearanceSettings.PureBlack)
+ pureBlack = readSetting(AppearanceSettings.PureBlack),
+ compactMode = readSetting(AppearanceSettings.CompactMode)
)
)
}
@@ -81,17 +86,19 @@ fun S2AppTheme(
// Always the same call, so toggling pure black recolours the content instead of moving it to a new
// composition branch, which would drop its saved state (the shell's back stacks among it).
val colorScheme = MaterialTheme.colorScheme
- MaterialTheme(
- colorScheme = if (darkTheme && state.pureBlack) {
- colorScheme.copy(background = Color.Black, surface = Color.Black, surfaceContainerLowest = Color.Black)
- } else {
- colorScheme
- },
- motionScheme = MaterialTheme.motionScheme,
- shapes = MaterialTheme.shapes,
- typography = MaterialTheme.typography,
- content = content
- )
+ CompositionLocalProvider(LocalCompactMode provides state.compactMode) {
+ MaterialTheme(
+ colorScheme = if (darkTheme && state.pureBlack) {
+ colorScheme.copy(background = Color.Black, surface = Color.Black, surfaceContainerLowest = Color.Black)
+ } else {
+ colorScheme
+ },
+ motionScheme = MaterialTheme.motionScheme,
+ shapes = MaterialTheme.shapes,
+ typography = MaterialTheme.typography,
+ content = content
+ )
+ }
}
}
diff --git a/android/app/src/main/res/values/strings_settings.xml b/android/app/src/main/res/values/strings_settings.xml
index 6ac38be711..acad8982d8 100644
--- a/android/app/src/main/res/values/strings_settings.xml
+++ b/android/app/src/main/res/values/strings_settings.xml
@@ -165,6 +165,10 @@
Pure black
Black backgrounds in dark theme, for AMOLED screens
+
+ Compact mode
+
+ Smaller rows, artwork and headers across Home, Library and Settings
Dynamic colour
diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt
index adae0d409f..cae763c002 100644
--- a/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt
+++ b/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt
@@ -50,6 +50,7 @@ class SettingKeysTest {
"AppearanceSettings.ColourFromArtwork: pref_theme_colour_from_artwork = true",
"AppearanceSettings.ShowHomeOnLaunch: pref_show_home_on_launch = false",
"AppearanceSettings.WidgetBackgroundOpacity: widget_background_opacity = 100",
+ "AppearanceSettings.CompactMode: pref_compact_mode = false",
"ArtworkSettings.WifiOnly: artwork_wifi_only = true",
"ArtworkSettings.LocalOnly: artwork_local_only = false",
"ArtworkSettings.MediaSessionArtwork: media_session_artwork = true",
diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreenTest.kt
index c21d37d454..8281f2b2be 100644
--- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreenTest.kt
+++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreenTest.kt
@@ -109,6 +109,7 @@ class SettingsScreenTest {
robot.assertDisplayed("Dark")
robot.assertSwitchOn("Pure black")
+ robot.assertSwitchOff("Compact mode")
robot.assertSwitchOff("Show Home on launch")
}
diff --git a/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt b/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt
index 88a4d0c3a5..0e10bfd6d1 100644
--- a/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt
+++ b/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt
@@ -38,6 +38,7 @@ class AppearanceSettings @Inject constructor(
val colourFromArtwork = store.preference(ColourFromArtwork)
val showHomeOnLaunch = store.preference(ShowHomeOnLaunch)
val widgetBackgroundOpacity = store.preference(WidgetBackgroundOpacity)
+ val compactMode = store.preference(CompactMode)
companion object {
val Theme = Setting.enumOrdinalString("pref_theme", ThemeMode.DayNight, ThemeMode.entries)
@@ -59,5 +60,8 @@ class AppearanceSettings @Inject constructor(
/** A percentage. The key predates the Glance widgets, so old values carry over. */
val WidgetBackgroundOpacity = Setting.int("widget_background_opacity", 100)
+
+ /** Tighter rows, smaller artwork and shorter headers across Home, Library and Settings. Off by default. */
+ val CompactMode = Setting.boolean("pref_compact_mode", false)
}
}
diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt
new file mode 100644
index 0000000000..a78d3e880b
--- /dev/null
+++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt
@@ -0,0 +1,11 @@
+package com.simplecityapps.shuttle.designsystem.theme
+
+import androidx.compose.runtime.compositionLocalOf
+
+/**
+ * Whether the UI lays out compact: smaller rows, artwork and headers across Home, Library and
+ * Settings. Off by default; the Appearance setting flips it live, and every reader below
+ * recomposes on change. Density only — it never changes icons, placeholders or navigation shape;
+ * those stay separate design decisions.
+ */
+val LocalCompactMode = compositionLocalOf { false }
diff --git a/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/text/StringKey.kt b/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/text/StringKey.kt
index 6b7d15cad5..a7d1c63d9d 100644
--- a/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/text/StringKey.kt
+++ b/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/text/StringKey.kt
@@ -77,6 +77,8 @@ enum class StringKey {
PREF_COLOUR_FROM_ARTWORK_SUMMARY,
PREF_PURE_BLACK_TITLE,
PREF_PURE_BLACK_SUMMARY,
+ PREF_COMPACT_MODE_TITLE,
+ PREF_COMPACT_MODE_SUMMARY,
PREF_CATEGORY_TITLE_WIDGETS,
PREF_WIDGET_OPACITY_TITLE,
PREF_NAVIGATION_TITLE,
diff --git a/ios/S2/en.lproj/Localizable.strings b/ios/S2/en.lproj/Localizable.strings
index c50024df40..f7155bf390 100644
--- a/ios/S2/en.lproj/Localizable.strings
+++ b/ios/S2/en.lproj/Localizable.strings
@@ -66,6 +66,8 @@
"pref_colour_from_artwork_summary" = "Tint the player with colours from the album art";
"pref_pure_black_title" = "Pure black";
"pref_pure_black_summary" = "Black backgrounds in dark theme, for AMOLED screens";
+"pref_compact_mode_title" = "Compact mode";
+"pref_compact_mode_summary" = "Smaller rows, artwork and headers across Home, Library and Settings";
"pref_category_title_widgets" = "Widgets";
"pref_widget_opacity_title" = "Background opacity";
"pref_navigation_title" = "Navigation";
diff --git a/shared/src/iosTest/kotlin/com/simplecityapps/shuttle/shared/settings/IosSettingsCatalogTest.kt b/shared/src/iosTest/kotlin/com/simplecityapps/shuttle/shared/settings/IosSettingsCatalogTest.kt
index 509dda9647..246e4d5316 100644
--- a/shared/src/iosTest/kotlin/com/simplecityapps/shuttle/shared/settings/IosSettingsCatalogTest.kt
+++ b/shared/src/iosTest/kotlin/com/simplecityapps/shuttle/shared/settings/IosSettingsCatalogTest.kt
@@ -63,6 +63,7 @@ class IosSettingsCatalogTest {
AppearanceSettings.Theme.key,
AppearanceSettings.DynamicColour.key,
AppearanceSettings.AccentColour.key,
+ AppearanceSettings.CompactMode.key,
AppearanceSettings.WidgetBackgroundOpacity.key,
PlaybackSettings.UsbDacDirectOutput.key,
ArtworkSettings.WifiOnly.key,