A cross platform Audiobookshelf client for Android and iOS
Dart
Add appearance options to flatten the background, set a custom app color, and adjust the background glow
Barnabasb31d2ad7ce64
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex d3c60b11..93d39abc 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -476,6 +476,15 @@"colorSourceWallpaperDescription": "App colors follow your system wallpaper","colorSourceWallpaper": "Wallpaper","colorSourceNowPlaying": "Now Playing",+ "colorSourceDynamic": "Dynamic",+ "colorSourceManual": "Manual",+ "colorSourceManualDescription": "Use a fixed app color you choose below",+ "colorSourceCustom": "Custom",+ "useColorEverywhereLabel": "Use this color everywhere",+ "useColorEverywhereSubtitle": "Also color book detail pages and the player card with your set color instead of each book's cover",+ "flatBackgroundLabel": "Flat background",+ "flatBackgroundSubtitle": "Remove the background gradient. Pure black in dark mode for OLED screens.",+ "backgroundIntensityLabel": "Background intensity","startScreenLabel": "Start screen","startScreenSubtitle": "Which tab to open when the app launches","startScreenHome": "Home",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex d6c584d5..8f2e0155 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -1822,6 +1822,60 @@ abstract class AppLocalizations {/// **'Now Playing'**String get colorSourceNowPlaying;+ /// No description provided for @colorSourceDynamic.+ ///+ /// In en, this message translates to:+ /// **'Dynamic'**+ String get colorSourceDynamic;++ /// No description provided for @colorSourceManual.+ ///+ /// In en, this message translates to:+ /// **'Manual'**+ String get colorSourceManual;++ /// No description provided for @colorSourceManualDescription.+ ///+ /// In en, this message translates to:+ /// **'Use a fixed app color you choose below'**+ String get colorSourceManualDescription;++ /// No description provided for @colorSourceCustom.+ ///+ /// In en, this message translates to:+ /// **'Custom'**+ String get colorSourceCustom;++ /// No description provided for @useColorEverywhereLabel.+ ///+ /// In en, this message translates to:+ /// **'Use this color everywhere'**+ String get useColorEverywhereLabel;++ /// No description provided for @useColorEverywhereSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Also color book detail pages and the player card with your set color instead of each book\'s cover'**+ String get useColorEverywhereSubtitle;++ /// No description provided for @flatBackgroundLabel.+ ///+ /// In en, this message translates to:+ /// **'Flat background'**+ String get flatBackgroundLabel;++ /// No description provided for @flatBackgroundSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Remove the background gradient. Pure black in dark mode for OLED screens.'**+ String get flatBackgroundSubtitle;++ /// No description provided for @backgroundIntensityLabel.+ ///+ /// In en, this message translates to:+ /// **'Background intensity'**+ String get backgroundIntensityLabel;+/// No description provided for @startScreenLabel.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 5b4e4826..f5e15117 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -948,6 +948,36 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Wiedergabe';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Startbildschirm';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex b5af2212..5bad1f13 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -943,6 +943,36 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 79e2d1ca..0b65e2b9 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -943,6 +943,36 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex bea4e9d4..80c48236 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -943,6 +943,36 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex e23ada9d..e3094d8f 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -945,6 +945,36 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 85ad2b45..79ed31bf 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -943,6 +943,36 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 89a480ca..64e01e5a 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -943,6 +943,36 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 41a620d5..feeb22e0 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -943,6 +943,36 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex e2cb8699..7520bb80 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -943,6 +943,36 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 26c7df8f..81ef045b 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -943,6 +943,36 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Start screen';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 77cdd6be..48cf1125 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -944,6 +944,36 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get colorSourceNowPlaying => 'Now Playing';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => 'Начальный экран';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 55d5bf51..cb26dc3e 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -929,6 +929,36 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get colorSourceNowPlaying => '正在播放';+ @override+ String get colorSourceDynamic => 'Dynamic';++ @override+ String get colorSourceManual => 'Manual';++ @override+ String get colorSourceManualDescription =>+ 'Use a fixed app color you choose below';++ @override+ String get colorSourceCustom => 'Custom';++ @override+ String get useColorEverywhereLabel => 'Use this color everywhere';++ @override+ String get useColorEverywhereSubtitle =>+ 'Also color book detail pages and the player card with your set color instead of each book\'s cover';++ @override+ String get flatBackgroundLabel => 'Flat background';++ @override+ String get flatBackgroundSubtitle =>+ 'Remove the background gradient. Pure black in dark mode for OLED screens.';++ @override+ String get backgroundIntensityLabel => 'Background intensity';+@overrideString get startScreenLabel => '启动画面';diff --git a/lib/main.dart b/lib/main.dartindex 38021d84..c9d9146f 100644--- a/lib/main.dart+++ b/lib/main.dart@@ -40,8 +40,40 @@ import 'widgets/absorb_wave_icon.dart';/// Global notifier so any widget (e.g. settings) can change the theme instantly.final ValueNotifier<ThemeMode> themeNotifier = ValueNotifier(ThemeMode.dark);-/// Whether OLED (pure black) dark theme is active.-final ValueNotifier<bool> oledNotifier = ValueNotifier(false);+/// Whether the flat (no-gradient) background is active. In dark mode this also+/// switches surfaces to pure black (OLED); in light mode to clean flat white.+final ValueNotifier<bool> flatNotifier = ValueNotifier(false);++/// App color source: 'dynamic' tints the app to the playing book cover,+/// 'manual' pins it to [manualSeedNotifier].+final ValueNotifier<String> colorSourceNotifier = ValueNotifier('dynamic');++/// Fixed seed color used when [colorSourceNotifier] is 'manual'.+final ValueNotifier<Color> manualSeedNotifier = ValueNotifier(const Color(0xFF7C6FBF));++/// Top alpha of the primary-tinted background gradient (0 = flat). Read by+/// screens that paint the gradient so the intensity slider applies everywhere.+final ValueNotifier<double> gradientIntensityNotifier = ValueNotifier(0.06);++/// When true (and color source is manual), the fixed app color is also used on+/// per-book surfaces (detail sheets, the absorbing card background) instead of+/// each book's own cover color.+final ValueNotifier<bool> useColorEverywhereNotifier = ValueNotifier(false);++/// Builds a ColorScheme whose primary accent is exactly [seed] rather than the+/// lighter, desaturated tone Material's seed mapping would pick (which turns a+/// chosen red into pink). Used for the manual app color so swatches read true.+ColorScheme manualColorScheme(Color seed, Brightness brightness) {+ final base = ColorScheme.fromSeed(+ seedColor: seed,+ brightness: brightness,+ dynamicSchemeVariant: DynamicSchemeVariant.vibrant,+ );+ final onSeed = ThemeData.estimateBrightnessForColor(seed) == Brightness.dark+ ? Colors.white+ : Colors.black;+ return base.copyWith(primary: seed, onPrimary: onSeed);+}/// Whether to disable the fade animation when switching bottom nav tabs.final ValueNotifier<bool> snappyTransitionsNotifier = ValueNotifier(false);@@ -101,9 +133,16 @@ ThemeMode parseThemeMode(String value) {void applyThemeMode(String value) {themeNotifier.value = parseThemeMode(value);- oledNotifier.value = value == 'oled';+ // Legacy 'oled' is now expressed as dark + flat background.+ if (value == 'oled') flatNotifier.value = true;}+void applyFlatBackground(bool value) => flatNotifier.value = value;+void applyColorSource(String value) => colorSourceNotifier.value = value;+void applyManualSeed(int argb) => manualSeedNotifier.value = Color(argb);+void applyGradientIntensity(double value) => gradientIntensityNotifier.value = value;+void applyUseColorEverywhere(bool value) => useColorEverywhereNotifier.value = value;+void main() async {HttpOverrides.global = _CertOverrides();final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();@@ -127,8 +166,19 @@ void main() async {// Load saved theme preference so we render the correct theme immediatelytry {- final savedTheme = await PlayerSettings.getThemeMode();+ var savedTheme = await PlayerSettings.getThemeMode();+ // Migrate legacy OLED mode to dark + flat background.+ if (savedTheme == 'oled') {+ await PlayerSettings.setThemeMode('dark');+ await PlayerSettings.setFlatBackground(true);+ savedTheme = 'dark';+ }applyThemeMode(savedTheme);+ flatNotifier.value = await PlayerSettings.getFlatBackground();+ colorSourceNotifier.value = await PlayerSettings.getColorSource();+ manualSeedNotifier.value = Color(await PlayerSettings.getManualSeedColor());+ gradientIntensityNotifier.value = await PlayerSettings.getGradientIntensity();+ useColorEverywhereNotifier.value = await PlayerSettings.getUseColorEverywhere();final savedLang = await PlayerSettings.getLanguage();if (savedLang.isNotEmpty) localeNotifier.value = Locale(savedLang);snappyTransitionsNotifier.value = await PlayerSettings.getSnappyTransitions();@@ -189,21 +239,25 @@ class AbsorbApp extends StatelessWidget {@overrideWidget build(BuildContext context) {- return ValueListenableBuilder<ThemeMode>(- valueListenable: themeNotifier,- builder: (context, currentMode, _) {- return ValueListenableBuilder<bool>(- valueListenable: oledNotifier,- builder: (context, isOled, _) {- return ValueListenableBuilder<Locale?>(- valueListenable: localeNotifier,- builder: (context, overrideLocale, _) {- return ValueListenableBuilder<ColorScheme?>(- valueListenable: coverSchemeNotifier,- builder: (context, coverScheme, _) {- return ValueListenableBuilder<bool>(- valueListenable: classicWordingNotifier,- builder: (context, _, __) {+ return ListenableBuilder(+ listenable: Listenable.merge([+ themeNotifier,+ flatNotifier,+ localeNotifier,+ coverSchemeNotifier,+ classicWordingNotifier,+ colorSourceNotifier,+ manualSeedNotifier,+ gradientIntensityNotifier,+ useColorEverywhereNotifier,+ ]),+ builder: (context, _) {+ final currentMode = themeNotifier.value;+ final isFlat = flatNotifier.value;+ final overrideLocale = localeNotifier.value;+ final coverScheme = coverSchemeNotifier.value;+ final isManual = colorSourceNotifier.value == 'manual';+// Set system chrome to match active themefinal isDark = currentMode == ThemeMode.dark ||(currentMode == ThemeMode.system &&@@ -212,33 +266,63 @@ class AbsorbApp extends StatelessWidget {SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(statusBarColor: Colors.transparent,statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,- systemNavigationBarColor: isDark ? Colors.black : const Color(0xFFF5F5F5),+ systemNavigationBarColor: isDark+ ? Colors.black+ : (isFlat ? Colors.white : const Color(0xFFF5F5F5)),systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,));const defaultSeed = Color(0xFF7C6FBF); // deep muted purple- final seedColor = coverScheme?.primary ?? defaultSeed;-- ColorScheme darkScheme = ColorScheme.fromSeed(- seedColor: seedColor,- brightness: Brightness.dark,+ final seedColor = isManual+ ? manualSeedNotifier.value+ : (coverScheme?.primary ?? defaultSeed);++ // Manual presets use the vibrant variant so the app color closely+ // matches the chosen swatch. Flat mode also goes vibrant: with the+ // gradient glow gone, the accent color is the only place color shows,+ // so it needs to pop. Dynamic + non-flat keeps the softer default.+ final variant = (isManual || isFlat)+ ? DynamicSchemeVariant.vibrant+ : DynamicSchemeVariant.tonalSpot;++ ColorScheme darkScheme = isManual+ ? manualColorScheme(seedColor, Brightness.dark)+ : ColorScheme.fromSeed(+ seedColor: seedColor,+ brightness: Brightness.dark,+ dynamicSchemeVariant: variant,+ );++ // Keep dark surfaces neutral so cards/sheets match the scaffold and+ // app bars; the seed color shows through the gradient glow and accents,+ // not tinted surfaces (tinted dark surfaces read as muddy/mismatched).+ // Flat goes pure black so OLED pixels turn fully off.+ darkScheme = darkScheme.copyWith(+ surface: isFlat ? Colors.black : const Color(0xFF0E0E0E),+ surfaceContainerLowest: isFlat ? Colors.black : const Color(0xFF0A0A0A),+ surfaceContainerLow: isFlat ? Colors.black : const Color(0xFF141414),+ surfaceContainer: isFlat ? const Color(0xFF050505) : const Color(0xFF181818),+ surfaceContainerHigh: isFlat ? const Color(0xFF0A0A0A) : const Color(0xFF1E1E1E),+ surfaceContainerHighest: isFlat ? const Color(0xFF0F0F0F) : const Color(0xFF242424),);- // OLED: pure black surfaces so OLED pixels turn fully off- if (isOled) {- darkScheme = darkScheme.copyWith(- surface: Colors.black,- surfaceContainerLowest: Colors.black,- surfaceContainerLow: Colors.black,- surfaceContainer: const Color(0xFF050505),- surfaceContainerHigh: const Color(0xFF0A0A0A),- surfaceContainerHighest: const Color(0xFF0F0F0F),- );- }-- final lightScheme = ColorScheme.fromSeed(- seedColor: seedColor,- brightness: Brightness.light,+ ColorScheme lightScheme = isManual+ ? manualColorScheme(seedColor, Brightness.light)+ : ColorScheme.fromSeed(+ seedColor: seedColor,+ brightness: Brightness.light,+ dynamicSchemeVariant: variant,+ );++ // Same idea in light: neutral surfaces, color from the glow + accents.+ // Flat goes clean white.+ lightScheme = lightScheme.copyWith(+ surface: isFlat ? Colors.white : const Color(0xFFF6F6F6),+ surfaceContainerLowest: Colors.white,+ surfaceContainerLow: isFlat ? Colors.white : const Color(0xFFF1F1F1),+ surfaceContainer: isFlat ? const Color(0xFFF7F7F7) : const Color(0xFFECECEC),+ surfaceContainerHigh: isFlat ? const Color(0xFFF2F2F2) : const Color(0xFFE6E6E6),+ surfaceContainerHighest: isFlat ? const Color(0xFFEDEDED) : const Color(0xFFE0E0E0),);const pageTransition = PageTransitionsTheme(@@ -325,7 +409,7 @@ class AbsorbApp extends StatelessWidget {darkTheme: ThemeData(useMaterial3: true,colorScheme: darkScheme,- scaffoldBackgroundColor: isOled ? Colors.black : const Color(0xFF0E0E0E),+ scaffoldBackgroundColor: isFlat ? Colors.black : const Color(0xFF0E0E0E),cardTheme: CardThemeData(color: darkScheme.surfaceContainerHigh,elevation: 0,@@ -334,7 +418,7 @@ class AbsorbApp extends StatelessWidget {),),navigationBarTheme: NavigationBarThemeData(- backgroundColor: isOled ? Colors.black : const Color(0xFF0E0E0E),+ backgroundColor: isFlat ? Colors.black : const Color(0xFF0E0E0E),indicatorColor: darkScheme.primary.withValues(alpha: 0.15),labelTextStyle: WidgetStatePropertyAll(TextStyle(@@ -345,7 +429,7 @@ class AbsorbApp extends StatelessWidget {),),appBarTheme: AppBarTheme(- backgroundColor: isOled ? Colors.black : const Color(0xFF0E0E0E),+ backgroundColor: isFlat ? Colors.black : const Color(0xFF0E0E0E),surfaceTintColor: Colors.transparent,scrolledUnderElevation: 0,),@@ -361,7 +445,7 @@ class AbsorbApp extends StatelessWidget {),),bottomSheetTheme: BottomSheetThemeData(- backgroundColor: isOled ? Colors.black : const Color(0xFF1A1A1A),+ backgroundColor: isFlat ? Colors.black : const Color(0xFF1A1A1A),shape: RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(24)),),@@ -379,14 +463,6 @@ class AbsorbApp extends StatelessWidget {),home: const AuthGate(),);- },- );- },- );- },- );- },- );},);}@@ -443,8 +519,18 @@ class _AuthGateState extends State<AuthGate> {await ScopedPrefs.migrateToScope();// Reload settings that were read in main() before scope was active- final scopedTheme = await PlayerSettings.getThemeMode();+ var scopedTheme = await PlayerSettings.getThemeMode();+ if (scopedTheme == 'oled') {+ await PlayerSettings.setThemeMode('dark');+ await PlayerSettings.setFlatBackground(true);+ scopedTheme = 'dark';+ }applyThemeMode(scopedTheme);+ flatNotifier.value = await PlayerSettings.getFlatBackground();+ colorSourceNotifier.value = await PlayerSettings.getColorSource();+ manualSeedNotifier.value = Color(await PlayerSettings.getManualSeedColor());+ gradientIntensityNotifier.value = await PlayerSettings.getGradientIntensity();+ useColorEverywhereNotifier.value = await PlayerSettings.getUseColorEverywhere();snappyTransitionsNotifier.value = await PlayerSettings.getSnappyTransitions();classicWordingNotifier.value = await PlayerSettings.getClassicWording();PlayerSettings.showExplicitBadge = await PlayerSettings.getShowExplicitBadge();diff --git a/lib/screens/absorbing_screen.dart b/lib/screens/absorbing_screen.dartindex 79e555c6..a88fd746 100644--- a/lib/screens/absorbing_screen.dart+++ b/lib/screens/absorbing_screen.dart@@ -9,7 +9,7 @@ import '../services/chromecast_service.dart';import '../services/download_service.dart';import '../services/scoped_prefs.dart';import '../widgets/absorb_page_header.dart';-import '../main.dart' show oledNotifier, rootNavigatorKey;+import '../main.dart' show flatNotifier, gradientIntensityNotifier, rootNavigatorKey;import '../widgets/absorbing_card.dart';import '../widgets/offline_status_icon.dart';import '../widgets/overlay_toast.dart';@@ -614,13 +614,13 @@ class _AbsorbingScreenState extends State<AbsorbingScreen> {return Scaffold(backgroundColor: scaffoldBg,body: Container(- decoration: oledNotifier.value ? null : BoxDecoration(+ decoration: flatNotifier.value ? null : BoxDecoration(gradient: LinearGradient(begin: Alignment.topCenter,end: Alignment.bottomCenter,stops: const [0.0, 0.22, 0.72, 1.0],colors: [- cs.primary.withValues(alpha: 0.06),+ cs.primary.withValues(alpha: gradientIntensityNotifier.value),cs.surface,lowerFade,scaffoldBg,diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dartindex 63102a61..c6a5b0f2 100644--- a/lib/screens/home_screen.dart+++ b/lib/screens/home_screen.dart@@ -16,7 +16,7 @@ import '../widgets/shimmer.dart';import '../widgets/book_detail_sheet.dart';import '../widgets/card_buttons.dart';import '../widgets/episode_list_sheet.dart';-import '../main.dart' show oledNotifier;+import '../main.dart' show flatNotifier, gradientIntensityNotifier;import '../widgets/home_customize_sheet.dart';import '../widgets/playlist_detail_sheet.dart';import '../widgets/collection_detail_sheet.dart';@@ -305,13 +305,13 @@ class HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateMireturn Scaffold(backgroundColor: scaffoldBg,body: Container(- decoration: oledNotifier.value ? null : BoxDecoration(+ decoration: flatNotifier.value ? null : BoxDecoration(gradient: LinearGradient(begin: Alignment.topCenter,end: Alignment.bottomCenter,stops: const [0.0, 0.22, 0.72, 1.0],colors: [- cs.primary.withValues(alpha: 0.06),+ cs.primary.withValues(alpha: gradientIntensityNotifier.value),cs.surface,lowerFade,scaffoldBg,diff --git a/lib/screens/library_screen.dart b/lib/screens/library_screen.dartindex 816a9495..3b87f4de 100644--- a/lib/screens/library_screen.dart+++ b/lib/screens/library_screen.dart@@ -13,7 +13,7 @@ import '../services/download_service.dart';import '../services/audio_player_service.dart';import '../widgets/absorb_page_header.dart';import '../widgets/library_search_results.dart';-import '../main.dart' show oledNotifier;+import '../main.dart' show flatNotifier, gradientIntensityNotifier;import '../widgets/library_sort_filter_sheet.dart';import '../widgets/library_books_tab.dart';import '../widgets/library_series_tab.dart';@@ -1522,7 +1522,7 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMibackgroundColor: scaffoldBg,body: Stack(children: [- if (!oledNotifier.value)+ if (!flatNotifier.value)OverflowBox(maxHeight: MediaQuery.of(context).size.height,alignment: Alignment.topCenter,@@ -1536,7 +1536,7 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiend: Alignment.bottomCenter,stops: const [0.0, 0.22, 0.72, 1.0],colors: [- cs.primary.withValues(alpha: 0.06),+ cs.primary.withValues(alpha: gradientIntensityNotifier.value),cs.surface,lowerFade,scaffoldBg,@@ -1661,8 +1661,8 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMilib.selectedLibrary?['name'] as String? ?? l.libraryFallback;final topInset = MediaQuery.of(context).padding.top;final screenH = MediaQuery.of(context).size.height;- final headerBackground = oledNotifier.value- ? const ColoredBox(color: Colors.black)+ final headerBackground = flatNotifier.value+ ? ColoredBox(color: scaffoldBg): ClipRect(child: OverflowBox(maxHeight: screenH,@@ -1681,7 +1681,7 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiend: Alignment.bottomCenter,stops: const [0.0, 0.22, 0.72, 1.0],colors: [- cs.primary.withValues(alpha: 0.06),+ cs.primary.withValues(alpha: gradientIntensityNotifier.value),cs.surface,lowerFade,scaffoldBg,diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dartindex 9639789e..be70f66f 100644--- a/lib/screens/login_screen.dart+++ b/lib/screens/login_screen.dart@@ -15,7 +15,7 @@ import '../services/user_account_service.dart';import '../widgets/absorb_wave_icon.dart';import '../widgets/overlay_toast.dart';import '../services/audio_player_service.dart';-import '../main.dart' show applyTrustAllCerts, oledNotifier;+import '../main.dart' show applyTrustAllCerts, flatNotifier;import '../l10n/app_localizations.dart';import '../services/wording.dart';@@ -347,7 +347,7 @@ class _LoginScreenState extends State<LoginScreen>return Scaffold(resizeToAvoidBottomInset: true,body: Container(- decoration: oledNotifier.value ? null : BoxDecoration(+ decoration: flatNotifier.value ? null : BoxDecoration(gradient: LinearGradient(begin: Alignment.topLeft,end: Alignment.bottomRight,diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 975b03fd..5f88dbfd 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -25,9 +25,11 @@ import '../widgets/update_dialog.dart';import '../screens/admin_screen.dart';import '../screens/downloads_screen.dart';import '../screens/bookmarks_screen.dart';-import '../main.dart' show applyThemeMode, applyTrustAllCerts, localeNotifier, oledNotifier, snappyTransitionsNotifier;+import '../main.dart' show applyThemeMode, applyTrustAllCerts, applyFlatBackground, applyColorSource, applyManualSeed, applyGradientIntensity, applyUseColorEverywhere, localeNotifier, flatNotifier, gradientIntensityNotifier, snappyTransitionsNotifier;import '../services/wording.dart';import '../widgets/absorb_page_header.dart';+import '../widgets/theme_presets.dart';+import '../widgets/color_wheel_picker.dart';import '../widgets/absorb_slider.dart';import '../widgets/collapsible_section.dart';import '../widgets/overlay_toast.dart';@@ -114,6 +116,11 @@ class _SettingsScreenState extends State<SettingsScreen> {String _cardBackground = 'blurred';double _progressTextScale = 1.0;String _themeMode = 'dark';+ bool _flatBackground = false;+ String _colorSource = 'dynamic';+ int _manualSeed = 0xFF7C6FBF;+ double _gradientIntensity = 0.06;+ bool _useColorEverywhere = false;String _language = '';int _startScreen = 2;String _statsGoalType = 'off';@@ -260,6 +267,107 @@ class _SettingsScreenState extends State<SettingsScreen> {PlayerSettings.notifySettingsChanged();}+ void _setManualColor(int argb) {+ setState(() => _manualSeed = argb);+ PlayerSettings.setManualSeedColor(argb);+ applyManualSeed(argb);+ }++ Widget _buildColorSwatches(ColorScheme cs) {+ final l = AppLocalizations.of(context)!;+ return Wrap(+ spacing: 12,+ runSpacing: 12,+ children: [+ for (final preset in kThemePresets)+ _swatch(+ color: preset.color,+ selected: _manualSeed == preset.color.toARGB32(),+ tooltip: preset.name,+ onTap: () => _setManualColor(preset.color.toARGB32()),+ ),+ // Custom color wheel entry+ Tooltip(+ message: l.colorSourceCustom,+ child: InkWell(+ onTap: () => _showCustomColorDialog(),+ customBorder: const CircleBorder(),+ child: Container(+ width: 40,+ height: 40,+ decoration: BoxDecoration(+ shape: BoxShape.circle,+ gradient: const SweepGradient(colors: [+ Color(0xFFFF0000), Color(0xFFFFFF00), Color(0xFF00FF00),+ Color(0xFF00FFFF), Color(0xFF0000FF), Color(0xFFFF00FF), Color(0xFFFF0000),+ ]),+ border: Border.all(color: cs.outlineVariant),+ ),+ child: Icon(Icons.add_rounded, size: 20, color: Colors.white.withValues(alpha: 0.9)),+ ),+ ),+ ),+ ],+ );+ }++ Widget _swatch({required Color color, required bool selected, required String tooltip, required VoidCallback onTap}) {+ final cs = Theme.of(context).colorScheme;+ return Tooltip(+ message: tooltip,+ child: InkWell(+ onTap: onTap,+ customBorder: const CircleBorder(),+ child: Container(+ width: 40,+ height: 40,+ decoration: BoxDecoration(+ color: color,+ shape: BoxShape.circle,+ border: Border.all(+ color: selected ? cs.onSurface : cs.outlineVariant,+ width: selected ? 3 : 1,+ ),+ ),+ child: selected+ ? Icon(Icons.check_rounded, size: 20,+ color: ThemeData.estimateBrightnessForColor(color) == Brightness.dark ? Colors.white : Colors.black)+ : null,+ ),+ ),+ );+ }++ Future<void> _showCustomColorDialog() async {+ var picked = Color(_manualSeed);+ final l = AppLocalizations.of(context)!;+ await showDialog<void>(+ context: context,+ builder: (ctx) {+ return AlertDialog(+ title: Text(l.colorSourceCustom),+ content: SizedBox(+ width: 300,+ child: ColorWheelPicker(+ initialColor: picked,+ onChanged: (c) => picked = c,+ ),+ ),+ actions: [+ TextButton(onPressed: () => Navigator.pop(ctx), child: Text(l.cancel)),+ FilledButton(+ onPressed: () {+ _setManualColor(picked.withValues(alpha: 1.0).toARGB32());+ Navigator.pop(ctx);+ },+ child: Text(l.save),+ ),+ ],+ );+ },+ );+ }+Widget _statsStepperRow(ColorScheme cs, TextTheme tt, String label, String value,{VoidCallback? onMinus, VoidCallback? onPlus, VoidCallback? onTapValue}) {return Row(children: [@@ -527,6 +635,11 @@ class _SettingsScreenState extends State<SettingsScreen> {]);final s = results[0] as AutoRewindSettings;final progressScale = results.last as double;+ final flatBackground = await PlayerSettings.getFlatBackground();+ final colorSource = await PlayerSettings.getColorSource();+ final manualSeed = await PlayerSettings.getManualSeedColor();+ final gradientIntensity = await PlayerSettings.getGradientIntensity();+ final useColorEverywhere = await PlayerSettings.getUseColorEverywhere();final statsGoalType = await PlayerSettings.getStatsGoalType();final statsGoalMinutes = await PlayerSettings.getStatsGoalMinutes();final statsBookGoal = await PlayerSettings.getStatsBookGoal();@@ -621,7 +734,12 @@ class _SettingsScreenState extends State<SettingsScreen> {_fullScreenPlayer = fullScreen;_snappyTransitions = snappyTrans;_classicWording = classicWording;- _themeMode = theme;+ _themeMode = theme == 'oled' ? 'dark' : theme;+ _flatBackground = flatBackground;+ _colorSource = colorSource == 'manual' ? 'manual' : 'dynamic';+ _manualSeed = manualSeed;+ _gradientIntensity = gradientIntensity;+ _useColorEverywhere = useColorEverywhere;_downloadLocationLabel = dlLabel;_totalDownloadSizeBytes = dlSize;if (deviceStorage != null) {@@ -820,13 +938,13 @@ class _SettingsScreenState extends State<SettingsScreen> {return Scaffold(body: Container(- decoration: oledNotifier.value ? null : BoxDecoration(+ decoration: flatNotifier.value ? null : BoxDecoration(gradient: LinearGradient(begin: Alignment.topCenter,end: Alignment.bottomCenter,stops: const [0.0, 0.35, 1.0],colors: [- cs.primary.withValues(alpha: 0.10),+ cs.primary.withValues(alpha: gradientIntensityNotifier.value),Theme.of(context).scaffoldBackgroundColor,Theme.of(context).scaffoldBackgroundColor,],@@ -854,10 +972,10 @@ class _SettingsScreenState extends State<SettingsScreen> {child: Container(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),decoration: BoxDecoration(- gradient: oledNotifier.value ? null : LinearGradient(+ gradient: flatNotifier.value ? null : LinearGradient(colors: [cs.primaryContainer, cs.tertiaryContainer],),- color: oledNotifier.value ? cs.surfaceContainerHigh : null,+ color: flatNotifier.value ? cs.surfaceContainerHigh : null,borderRadius: BorderRadius.circular(16),),child: Row(@@ -1019,7 +1137,6 @@ class _SettingsScreenState extends State<SettingsScreen> {showSelectedIcon: false,segments: [ButtonSegment(value: 'dark', label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.themeDark, maxLines: 1))),- ButtonSegment(value: 'oled', label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.themeOled, maxLines: 1))),ButtonSegment(value: 'light', label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.themeLight, maxLines: 1))),ButtonSegment(value: 'system', label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.themeAuto, maxLines: 1))),],@@ -1035,6 +1152,82 @@ class _SettingsScreenState extends State<SettingsScreen> {),),),+ SwitchListTile.adaptive(+ contentPadding: EdgeInsets.zero,+ title: Text(l.flatBackgroundLabel, style: tt.bodyLarge),+ subtitle: Text(l.flatBackgroundSubtitle, style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ value: _flatBackground,+ onChanged: _loaded ? (v) {+ setState(() => _flatBackground = v);+ PlayerSettings.setFlatBackground(v);+ applyFlatBackground(v);+ } : null,+ ),+ if (!_flatBackground) ...[+ const SizedBox(height: 4),+ Text(l.backgroundIntensityLabel, style: tt.bodyMedium),+ Slider(+ value: _gradientIntensity.clamp(0.0, 0.45),+ min: 0.0,+ max: 0.45,+ onChanged: _loaded ? (v) {+ setState(() => _gradientIntensity = v);+ applyGradientIntensity(v);+ } : null,+ onChangeEnd: (v) => PlayerSettings.setGradientIntensity(v),+ ),+ ],+ ],+ ),+ ),+ const Divider(height: 1, indent: 16, endIndent: 16),+ Padding(+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 16),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Text(l.colorSourceLabel, style: tt.titleSmall),+ const SizedBox(height: 12),+ SizedBox(+ width: double.infinity,+ child: SegmentedButton<String>(+ showSelectedIcon: false,+ segments: [+ ButtonSegment(value: 'dynamic', label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.colorSourceDynamic, maxLines: 1))),+ ButtonSegment(value: 'manual', label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.colorSourceManual, maxLines: 1))),+ ],+ selected: {_colorSource},+ onSelectionChanged: _loaded ? (selected) {+ final src = selected.first;+ setState(() => _colorSource = src);+ PlayerSettings.setColorSource(src);+ applyColorSource(src);+ } : null,+ style: const ButtonStyle(+ visualDensity: VisualDensity.compact,+ ),+ ),+ ),+ const SizedBox(height: 6),+ Text(+ _colorSource == 'manual' ? l.colorSourceManualDescription : l.colorSourceCoverDescription,+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant),+ ),+ if (_colorSource == 'manual') ...[+ const SizedBox(height: 14),+ _buildColorSwatches(cs),+ SwitchListTile.adaptive(+ contentPadding: EdgeInsets.zero,+ title: Text(l.useColorEverywhereLabel, style: tt.bodyLarge),+ subtitle: Text(l.useColorEverywhereSubtitle, style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ value: _useColorEverywhere,+ onChanged: _loaded ? (v) {+ setState(() => _useColorEverywhere = v);+ PlayerSettings.setUseColorEverywhere(v);+ applyUseColorEverywhere(v);+ } : null,+ ),+ ],],),),@@ -3448,10 +3641,16 @@ class _SettingsScreenState extends State<SettingsScreen> {await BackupService.importSettings(data);// Apply theme immediately- final theme = data['settings']?['themeMode'] as String?;+ final settings = data['settings'] as Map<String, dynamic>?;+ final theme = settings?['themeMode'] as String?;if (theme != null) {applyThemeMode(theme);}+ if (settings?['flatBackground'] is bool) applyFlatBackground(settings!['flatBackground'] as bool);+ if (settings?['colorSource'] is String) applyColorSource(settings!['colorSource'] as String);+ if (settings?['manualSeedColor'] is int) applyManualSeed(settings!['manualSeedColor'] as int);+ if (settings?['gradientIntensity'] is num) applyGradientIntensity((settings!['gradientIntensity'] as num).toDouble());+ if (settings?['useColorEverywhere'] is bool) applyUseColorEverywhere(settings!['useColorEverywhere'] as bool);// Refresh UIawait _loadSettings();diff --git a/lib/screens/stats_screen.dart b/lib/screens/stats_screen.dartindex e015d4c7..62bd0621 100644--- a/lib/screens/stats_screen.dart+++ b/lib/screens/stats_screen.dart@@ -13,7 +13,7 @@ import '../widgets/stats_charts.dart';import '../widgets/absorb_wave_icon.dart';import '../widgets/card_buttons.dart';import '../widgets/overlay_toast.dart';-import '../main.dart' show oledNotifier;+import '../main.dart' show flatNotifier, gradientIntensityNotifier;import 'app_shell.dart';import '../l10n/app_localizations.dart';@@ -321,13 +321,13 @@ class _StatsScreenState extends State<StatsScreen>return Scaffold(backgroundColor: Theme.of(context).scaffoldBackgroundColor,body: Container(- decoration: oledNotifier.value ? null : BoxDecoration(+ decoration: flatNotifier.value ? null : BoxDecoration(gradient: LinearGradient(begin: Alignment.topCenter,end: Alignment.bottomCenter,stops: const [0.0, 0.22, 0.72, 1.0],colors: [- cs.primary.withValues(alpha: 0.06),+ cs.primary.withValues(alpha: gradientIntensityNotifier.value),cs.surface,Color.lerp(cs.surface, Theme.of(context).scaffoldBackgroundColor, 0.55) ?? Theme.of(context).scaffoldBackgroundColor,Theme.of(context).scaffoldBackgroundColor,@@ -863,7 +863,7 @@ class _StatsScreenState extends State<StatsScreen>padding: const EdgeInsets.symmetric(vertical: 28, horizontal: 20),decoration: BoxDecoration(borderRadius: BorderRadius.circular(20),- gradient: oledNotifier.value ? null : LinearGradient(+ gradient: flatNotifier.value ? null : LinearGradient(begin: Alignment.topCenter,end: Alignment.bottomCenter,colors: [@@ -871,7 +871,7 @@ class _StatsScreenState extends State<StatsScreen>cs.primary.withValues(alpha: 0.02),],),- border: Border.all(color: cs.primary.withValues(alpha: oledNotifier.value ? 0.08 : 0.15)),+ border: Border.all(color: cs.primary.withValues(alpha: flatNotifier.value ? 0.08 : 0.15)),),child: Column(children: [Text(l.statsTotalListeningTime,diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex 28faec87..72245b9a 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -54,6 +54,10 @@ class BackupService {'mergeAbsorbingLibraries': await PlayerSettings.getMergeAbsorbingLibraries(),'maxConcurrentDownloads': await PlayerSettings.getMaxConcurrentDownloads(),'colorSource': await PlayerSettings.getColorSource(),+ 'flatBackground': await PlayerSettings.getFlatBackground(),+ 'manualSeedColor': await PlayerSettings.getManualSeedColor(),+ 'gradientIntensity': await PlayerSettings.getGradientIntensity(),+ 'useColorEverywhere': await PlayerSettings.getUseColorEverywhere(),'snappyTransitions': await PlayerSettings.getSnappyTransitions(),'bookmarkSort': await PlayerSettings.getBookmarkSort(),'autoDownloadOnStream': await PlayerSettings.getAutoDownloadOnStream(),@@ -403,6 +407,10 @@ class BackupService {if (s['mergeAbsorbingLibraries'] != null) PlayerSettings.setMergeAbsorbingLibraries(s['mergeAbsorbingLibraries'] as bool);if (s['maxConcurrentDownloads'] != null) PlayerSettings.setMaxConcurrentDownloads(s['maxConcurrentDownloads'] as int);if (s['colorSource'] != null) PlayerSettings.setColorSource(s['colorSource'] as String);+ if (s['flatBackground'] != null) PlayerSettings.setFlatBackground(s['flatBackground'] as bool);+ if (s['manualSeedColor'] != null) PlayerSettings.setManualSeedColor(s['manualSeedColor'] as int);+ if (s['gradientIntensity'] != null) PlayerSettings.setGradientIntensity((s['gradientIntensity'] as num).toDouble());+ if (s['useColorEverywhere'] != null) PlayerSettings.setUseColorEverywhere(s['useColorEverywhere'] as bool);if (s['snappyTransitions'] != null) PlayerSettings.setSnappyTransitions(s['snappyTransitions'] as bool);if (s['bookmarkSort'] != null) PlayerSettings.setBookmarkSort(s['bookmarkSort'] as String);if (s['autoDownloadOnStream'] != null) PlayerSettings.setAutoDownloadOnStream(s['autoDownloadOnStream'] as bool);diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dartindex 61966be9..e4b0fe8c 100644--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@ -606,9 +606,30 @@ class PlayerSettings {await prefs.setString('language', value);}- static Future<String> getColorSource() => _get('colorSource', 'default');+ /// App color source: 'dynamic' follows the playing book cover (default),+ /// 'manual' pins the app to [getManualSeedColor]. (Legacy values fall through+ /// to dynamic since only 'manual' is special-cased.)+ static Future<String> getColorSource() => _get('colorSource', 'dynamic');static Future<void> setColorSource(String value) => _set('colorSource', value);+ /// Whether the background gradient is removed (flat). In dark mode this also+ /// switches surfaces to pure black (OLED); in light mode to flat white.+ static Future<bool> getFlatBackground() => _get('flatBackground', false);+ static Future<void> setFlatBackground(bool v) => _set('flatBackground', v);++ /// Seed color (ARGB int) used when [getColorSource] is 'manual'.+ static Future<int> getManualSeedColor() => _get('manualSeedColor', 0xFF7C6FBF);+ static Future<void> setManualSeedColor(int v) => _set('manualSeedColor', v);++ /// Strength of the primary-tinted background gradient (top alpha, 0 = flat).+ static Future<double> getGradientIntensity() => _get('gradientIntensity', 0.06);+ static Future<void> setGradientIntensity(double v) => _set('gradientIntensity', v);++ /// When manual color is on, also apply it to per-book surfaces (detail sheets,+ /// absorbing card background) instead of each book's cover color.+ static Future<bool> getUseColorEverywhere() => _get('useColorEverywhere', false);+ static Future<void> setUseColorEverywhere(bool v) => _set('useColorEverywhere', v);+/// Default start screen tab index: 0=Home, 1=Library, 2=Absorbing, 3=Stats, 4=Settingsstatic Future<int> getStartScreen() => _get('startScreen', 2);static Future<void> setStartScreen(int value) => _set('startScreen', value);diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dartindex 67a83220..f2983141 100644--- a/lib/widgets/absorbing_card.dart+++ b/lib/widgets/absorbing_card.dart@@ -17,6 +17,7 @@ import 'card_playback_controls.dart';import 'card_buttons.dart';import '../services/chromecast_service.dart';import 'expanded_card.dart';+import '../main.dart' show colorSourceNotifier, useColorEverywhereNotifier, manualSeedNotifier, manualColorScheme;class AbsorbingCard extends StatefulWidget {final Map<String, dynamic> item;@@ -28,8 +29,16 @@ class AbsorbingCard extends StatefulWidget {}class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClientMixin {- ColorScheme? _coverScheme;+ ColorScheme? _rawCoverScheme;Brightness? _coverBrightness; // brightness used to generate _coverScheme++ /// Cover-derived scheme, unless a manual app color is set to apply everywhere.+ ColorScheme? get _coverScheme {+ if (colorSourceNotifier.value == 'manual' && useColorEverywhereNotifier.value) {+ return manualColorScheme(manualSeedNotifier.value, Theme.of(context).brightness);+ }+ return _rawCoverScheme;+ }ImageProvider? _coverProvider; // cached for re-deriving on theme changebool _isStarting = false;List<dynamic>? _fetchedChapters;@@ -300,7 +309,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClifinal oldId = oldWidget.item['id'] as String? ?? '';if (oldId != _itemId) {// Item changed — reset all stale state- _coverScheme = null;+ _rawCoverScheme = null;_coverBrightness = null;_coverProvider = null;_blurredCover?.dispose();@@ -353,13 +362,13 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClifinal provider = _coverProvider;if (provider == null) return;final brightness = Theme.of(context).brightness;- if (_coverScheme != null && _coverBrightness == brightness) return;+ if (_rawCoverScheme != null && _coverBrightness == brightness) return;_coverBrightness = brightness;ColorScheme.fromImageProvider(provider: provider, brightness: brightness).then((s) {if (mounted) {WidgetsBinding.instance.addPostFrameCallback((_) {- if (mounted) setState(() => _coverScheme = s);+ if (mounted) setState(() => _rawCoverScheme = s);});}})diff --git a/lib/widgets/book_detail_sheet.dart b/lib/widgets/book_detail_sheet.dartindex 7e6eeb15..ffc74942 100644--- a/lib/widgets/book_detail_sheet.dart+++ b/lib/widgets/book_detail_sheet.dart@@ -28,7 +28,7 @@ import '../services/download_service.dart';import '../services/progress_sync_service.dart';import '../services/metadata_override_service.dart';import '../services/scoped_prefs.dart';-import '../main.dart' show rootNavigatorKey;+import '../main.dart' show rootNavigatorKey, colorSourceNotifier, useColorEverywhereNotifier, manualSeedNotifier, manualColorScheme;import '../screens/app_shell.dart';import '../screens/book_edit_screen.dart';import 'author_books_sheet.dart';@@ -102,9 +102,18 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {bool _authorsExpanded = false;bool _narratorsExpanded = false;bool _squareCovers = false;- ColorScheme? _coverScheme;+ ColorScheme? _rawCoverScheme;String? _coverSchemeUrl; // URL the current scheme was derived from+ /// The cover-derived scheme, unless the user has chosen a manual app color+ /// and opted to use it everywhere - then book pages wear that color too.+ ColorScheme? get _coverScheme {+ if (colorSourceNotifier.value == 'manual' && useColorEverywhereNotifier.value) {+ return manualColorScheme(manualSeedNotifier.value, Theme.of(context).brightness);+ }+ return _rawCoverScheme;+ }+@override void initState() {super.initState();// Quick-actions sheet seeds from the tile's item map so it paints instantly@@ -285,14 +294,14 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {debugPrint('[BookDetail] PaletteGenerator ok in ${DateTime.now().difference(t0).inMilliseconds}ms');final seedColor = accentFromCoverPalette(palette);if (seedColor == null || !mounted) return;- setState(() => _coverScheme = ColorScheme.fromSeed(+ setState(() => _rawCoverScheme = ColorScheme.fromSeed(seedColor: seedColor, brightness: brightness));}).catchError((e) {debugPrint('[BookDetail] PaletteGenerator error after ${DateTime.now().difference(t0).inMilliseconds}ms: $e');if (!mounted) return;setState(() {_coverSchemeUrl = null;- _coverScheme = ColorScheme.fromSeed(+ _rawCoverScheme = ColorScheme.fromSeed(seedColor: Theme.of(context).colorScheme.primary,brightness: brightness,);diff --git a/lib/widgets/color_wheel_picker.dart b/lib/widgets/color_wheel_picker.dartnew file mode 100644index 00000000..c098ebe9--- /dev/null+++ b/lib/widgets/color_wheel_picker.dart@@ -0,0 +1,109 @@+import 'dart:math' as math;+import 'package:flutter/material.dart';++/// A circular HSV color picker: hue around the wheel, saturation from center to+/// edge, with a brightness (value) slider underneath.+class ColorWheelPicker extends StatefulWidget {+ final Color initialColor;+ final ValueChanged<Color> onChanged;+ const ColorWheelPicker({super.key, required this.initialColor, required this.onChanged});++ @override+ State<ColorWheelPicker> createState() => _ColorWheelPickerState();+}++class _ColorWheelPickerState extends State<ColorWheelPicker> {+ late HSVColor _hsv;++ @override+ void initState() {+ super.initState();+ _hsv = HSVColor.fromColor(widget.initialColor);+ // A pure-black seed would hide the whole wheel; start it bright instead.+ if (_hsv.value == 0) _hsv = _hsv.withValue(1.0);+ }++ void _pickFromWheel(Offset localPos, Size size) {+ final center = Offset(size.width / 2, size.height / 2);+ final radius = math.min(size.width, size.height) / 2;+ final v = localPos - center;+ final sat = (v.distance / radius).clamp(0.0, 1.0);+ var angle = math.atan2(v.dy, v.dx);+ if (angle < 0) angle += 2 * math.pi;+ final hue = angle / (2 * math.pi) * 360.0;+ setState(() => _hsv = _hsv.withHue(hue).withSaturation(sat));+ widget.onChanged(_hsv.toColor());+ }++ @override+ Widget build(BuildContext context) {+ return Column(mainAxisSize: MainAxisSize.min, children: [+ AspectRatio(+ aspectRatio: 1,+ child: LayoutBuilder(builder: (context, constraints) {+ final size = Size(constraints.maxWidth, constraints.maxHeight);+ return GestureDetector(+ onPanDown: (d) => _pickFromWheel(d.localPosition, size),+ onPanUpdate: (d) => _pickFromWheel(d.localPosition, size),+ child: CustomPaint(painter: _WheelPainter(_hsv)),+ );+ }),+ ),+ const SizedBox(height: 12),+ Row(children: [+ const Icon(Icons.brightness_6_rounded, size: 18),+ const SizedBox(width: 8),+ Expanded(+ child: SliderTheme(+ data: SliderTheme.of(context).copyWith(thumbColor: _hsv.toColor()),+ child: Slider(+ value: _hsv.value,+ onChanged: (v) {+ setState(() => _hsv = _hsv.withValue(v));+ widget.onChanged(_hsv.toColor());+ },+ ),+ ),+ ),+ ]),+ ]);+ }+}++class _WheelPainter extends CustomPainter {+ final HSVColor hsv;+ _WheelPainter(this.hsv);++ static const _hueColors = [+ Color(0xFFFF0000), Color(0xFFFFFF00), Color(0xFF00FF00),+ Color(0xFF00FFFF), Color(0xFF0000FF), Color(0xFFFF00FF), Color(0xFFFF0000),+ ];++ @override+ void paint(Canvas canvas, Size size) {+ final center = size.center(Offset.zero);+ final radius = math.min(size.width, size.height) / 2;+ final rect = Rect.fromCircle(center: center, radius: radius);++ // Hue around the circle+ canvas.drawCircle(center, radius,+ Paint()..shader = const SweepGradient(colors: _hueColors).createShader(rect));+ // Saturation: white at the center fading out toward the rim+ canvas.drawCircle(center, radius,+ Paint()..shader = RadialGradient(colors: [Colors.white, Colors.white.withValues(alpha: 0)]).createShader(rect));+ // Brightness: darken the whole wheel as value drops+ if (hsv.value < 1) {+ canvas.drawCircle(center, radius, Paint()..color = Colors.black.withValues(alpha: 1 - hsv.value));+ }++ // Selection thumb+ final angle = hsv.hue / 360.0 * 2 * math.pi;+ final pos = center + Offset(math.cos(angle), math.sin(angle)) * (hsv.saturation * radius);+ canvas.drawCircle(pos, 11, Paint()..color = Colors.white);+ canvas.drawCircle(pos, 11, Paint()..color = Colors.black54..style = PaintingStyle.stroke..strokeWidth = 2);+ canvas.drawCircle(pos, 8, Paint()..color = hsv.toColor());+ }++ @override+ bool shouldRepaint(_WheelPainter old) => old.hsv != hsv;+}diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dartindex ac03bd77..49d7ccdc 100644--- a/lib/widgets/expanded_card.dart+++ b/lib/widgets/expanded_card.dart@@ -14,6 +14,7 @@ import 'absorbing_shared.dart';import 'card_progress_bar.dart';import 'card_playback_controls.dart';import 'card_buttons.dart';+import '../main.dart' show colorSourceNotifier, useColorEverywhereNotifier, manualSeedNotifier, manualColorScheme;// ─── Custom route: slide-up + fade ────────────────────────────@@ -69,8 +70,16 @@ class ExpandedCard extends StatefulWidget {}class _ExpandedCardState extends State<ExpandedCard> {- ColorScheme? _coverScheme;+ ColorScheme? _rawCoverScheme;Brightness? _coverBrightness;++ /// Cover-derived scheme, unless a manual app color is set to apply everywhere.+ ColorScheme? get _coverScheme {+ if (colorSourceNotifier.value == 'manual' && useColorEverywhereNotifier.value) {+ return manualColorScheme(manualSeedNotifier.value, Theme.of(context).brightness);+ }+ return _rawCoverScheme;+ }ImageProvider? _coverProvider;ui.Image? _blurredCover;List<dynamic>? _fetchedChapters;@@ -166,7 +175,7 @@ class _ExpandedCardState extends State<ExpandedCard> {void initState() {super.initState();_item = widget.item;- _coverScheme = widget.initialCoverScheme;+ _rawCoverScheme = widget.initialCoverScheme;_cardBackground = widget.initialCardBackground;_fetchedChapters = widget.initialChapters;_currentItemId = widget.player.currentItemId;@@ -334,7 +343,7 @@ class _ExpandedCardState extends State<ExpandedCard> {setState(() {_item = newItem!;- _coverScheme = null;+ _rawCoverScheme = null;_coverBrightness = null;_coverProvider = null;_fetchedChapters = null;@@ -444,7 +453,7 @@ class _ExpandedCardState extends State<ExpandedCard> {/// Resolve the cover image to derive [_coverScheme] without building the blur/// (used by the gradient / off backgrounds, which never paint the cover).void _deriveCoverScheme() {- if (_coverScheme != null || _coverProvider != null) return;+ if (_rawCoverScheme != null || _coverProvider != null) return;final url = _coverUrl;if (url == null) return;final ImageProvider provider;@@ -460,13 +469,13 @@ class _ExpandedCardState extends State<ExpandedCard> {final provider = _coverProvider;if (provider == null) return;final brightness = Theme.of(context).brightness;- if (_coverScheme != null && _coverBrightness == brightness) return;+ if (_rawCoverScheme != null && _coverBrightness == brightness) return;_coverBrightness = brightness;ColorScheme.fromImageProvider(provider: provider, brightness: brightness).then((s) {if (mounted) {WidgetsBinding.instance.addPostFrameCallback((_) {- if (mounted) setState(() => _coverScheme = s);+ if (mounted) setState(() => _rawCoverScheme = s);});}})@@ -525,7 +534,7 @@ class _ExpandedCardState extends State<ExpandedCard> {}// Also derive cover scheme if needed- if (_coverScheme == null) _onCoverLoaded(provider);+ if (_rawCoverScheme == null) _onCoverLoaded(provider);} catch (_) {}}diff --git a/lib/widgets/theme_presets.dart b/lib/widgets/theme_presets.dartnew file mode 100644index 00000000..36e60a21--- /dev/null+++ b/lib/widgets/theme_presets.dart@@ -0,0 +1,26 @@+import 'package:flutter/material.dart';++/// A named manual app-color preset. Names are intentionally English-only+/// constants (an "absorption across domains" theme), not localized.+class ThemePreset {+ final String id;+ final String name;+ final Color color;+ const ThemePreset(this.id, this.name, this.color);+}++/// The fixed color presets offered in Manual color mode. The dynamic+/// (cover-driven) option is handled separately, so it is not in this list.+const List<ThemePreset> kThemePresets = [+ ThemePreset('wavelength', 'Wavelength', Color(0xFF4DB6AC)),+ ThemePreset('soak', 'Soak', Color(0xFF2E6FB0)),+ ThemePreset('inkwell', 'Inkwell', Color(0xFF3D4A8C)),+ ThemePreset('tincture', 'Tincture', Color(0xFF7C6FBF)),+ ThemePreset('saturate', 'Saturate', Color(0xFFC8487E)),+ ThemePreset('steeped', 'Steeped', Color(0xFFB07A3C)),+ ThemePreset('eventHorizon', 'Event Horizon', Color(0xFFF97316)),+ ThemePreset('redshift', 'Redshift', Color(0xFFCC4436)),+ ThemePreset('osmosis', 'Osmosis', Color(0xFF2A9D8F)),+ ThemePreset('chlorophyll', 'Chlorophyll', Color(0xFF4CAF50)),+ ThemePreset('adsorb', 'Adsorb', Color(0xFF3A3A3A)),+];