From 692ae8753855df9ee9a0dfe6933bcbc691204b74 Mon Sep 17 00:00:00 2001 From: Michael Usher Date: Sun, 25 Aug 2024 21:49:53 +1000 Subject: [PATCH] Add theme switcher and a simple black and white theme --- .../java/com/readrops/app/MainActivity.kt | 10 +- .../app/more/preferences/PreferencesScreen.kt | 13 +- .../preferences/PreferencesScreenModel.kt | 6 +- .../java/com/readrops/app/util/Preferences.kt | 14 +- .../java/com/readrops/app/util/theme/Color.kt | 133 ++++++++------- .../java/com/readrops/app/util/theme/Theme.kt | 151 +++++++++--------- app/src/main/res/values-de/strings.xml | 5 +- app/src/main/res/values-es/strings.xml | 3 + app/src/main/res/values-fr/strings.xml | 3 + app/src/main/res/values-in/strings.xml | 3 + app/src/main/res/values-it/strings.xml | 3 + app/src/main/res/values-nb-rNO/strings.xml | 3 + app/src/main/res/values-nl/strings.xml | 4 + app/src/main/res/values-pt-rBR/strings.xml | 3 + app/src/main/res/values/strings.xml | 4 +- 15 files changed, 194 insertions(+), 164 deletions(-) diff --git a/app/src/main/java/com/readrops/app/MainActivity.kt b/app/src/main/java/com/readrops/app/MainActivity.kt index d153e55a..a4c9ccd8 100644 --- a/app/src/main/java/com/readrops/app/MainActivity.kt +++ b/app/src/main/java/com/readrops/app/MainActivity.kt @@ -55,8 +55,8 @@ class MainActivity : ComponentActivity(), KoinComponent { val initialUseDarkTheme = runBlocking { useDarkTheme(preferences.theme.flow.first(), darkFlag) } - val initialUseAltColours = runBlocking { - preferences.themeUseAlt.flow.first() + val initialColourScheme = runBlocking { + preferences.theme.flow.first() } setContent { @@ -64,12 +64,12 @@ class MainActivity : ComponentActivity(), KoinComponent { val useDarkTheme by preferences.theme.flow .map { mode -> useDarkTheme(mode, darkFlag) } .collectAsState(initial = initialUseDarkTheme) - val useAltColours by preferences.themeUseAlt.flow - .collectAsState(initial = initialUseAltColours) + val themeColourScheme by preferences.themeColourScheme.flow + .collectAsState(initial = initialColourScheme) ReadropsTheme( useDarkTheme = useDarkTheme, - useAltColours = useAltColours + themeColourScheme = themeColourScheme ) { val navigationBarElevation = NavigationBarDefaults.Elevation diff --git a/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt b/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt index 6bc2f565..5bd1e6a9 100644 --- a/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt +++ b/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt @@ -99,10 +99,15 @@ class PreferencesScreen : AndroidScreen() { onValueChange = {} ) - SwitchPreferenceWidget( - preference = loadedState.themeUseAlt.second, - isChecked = loadedState.themeUseAlt.first, - title = stringResource(id = R.string.use_alternate_theme_colours) + ListPreferenceWidget( + preference = loadedState.themeColourScheme.second, + selectedKey = loadedState.themeColourScheme.first, + entries = mapOf( + "readrops" to stringResource(id = R.string.theme_readrops), + "blackwhite" to stringResource(id = R.string.theme_blackwhite), + ), + title = stringResource(id = R.string.theme_color_scheme), + onValueChange = {} ) ListPreferenceWidget( diff --git a/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreenModel.kt b/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreenModel.kt index 248fb278..d488a430 100644 --- a/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreenModel.kt +++ b/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreenModel.kt @@ -26,7 +26,7 @@ class PreferencesScreenModel( preferences.hideReadFeeds.flow, preferences.openLinksWith.flow, preferences.timelineItemSize.flow, - preferences.themeUseAlt.flow + preferences.themeColourScheme.flow ) combine( @@ -39,7 +39,7 @@ class PreferencesScreenModel( hideReadFeeds = (list[3] as Boolean) to preferences.hideReadFeeds, openLinksWith = (list[4] as String) to preferences.openLinksWith, timelineItemSize = (list[5] as String) to preferences.timelineItemSize, - themeUseAlt = (list[6] as Boolean) to preferences.themeUseAlt + themeColourScheme = (list[6] as String) to preferences.themeColourScheme ) }.collect { theme -> mutableState.update { theme } @@ -60,7 +60,7 @@ sealed class PreferencesScreenState { val hideReadFeeds: PreferenceState, val openLinksWith: PreferenceState, val timelineItemSize: PreferenceState, - val themeUseAlt: PreferenceState + val themeColourScheme: PreferenceState ) : PreferencesScreenState() } \ No newline at end of file diff --git a/app/src/main/java/com/readrops/app/util/Preferences.kt b/app/src/main/java/com/readrops/app/util/Preferences.kt index f29edf65..1d432955 100644 --- a/app/src/main/java/com/readrops/app/util/Preferences.kt +++ b/app/src/main/java/com/readrops/app/util/Preferences.kt @@ -26,15 +26,15 @@ class Preferences( ) { val theme = Preference( - dataStore = dataStore, - key = stringPreferencesKey("theme"), - default = "system" - ) + dataStore = dataStore, + key = stringPreferencesKey("theme"), + default = "system" + ) - val themeUseAlt = Preference( + val themeColourScheme = Preference( dataStore = dataStore, - key = booleanPreferencesKey("theme_use_alt"), - default = false + key = stringPreferencesKey("theme_color_scheme"), + default = "readrops" ) val backgroundSynchronization = Preference( diff --git a/app/src/main/java/com/readrops/app/util/theme/Color.kt b/app/src/main/java/com/readrops/app/util/theme/Color.kt index 012cd6a0..30d0e56d 100644 --- a/app/src/main/java/com/readrops/app/util/theme/Color.kt +++ b/app/src/main/java/com/readrops/app/util/theme/Color.kt @@ -2,6 +2,7 @@ package com.readrops.app.util.theme import androidx.compose.ui.graphics.Color +// Material Design Light val md_theme_light_primary = Color(0xFF0062A2) val md_theme_light_onPrimary = Color(0xFFFFFFFF) val md_theme_light_primaryContainer = Color(0xFFD1E4FF) @@ -33,6 +34,7 @@ val md_theme_light_surfaceTint = Color(0xFF0062A2) val md_theme_light_outlineVariant = Color(0xFFC3C7CF) val md_theme_light_scrim = Color(0xFF000000) +// Material Design Dark val md_theme_dark_primary = Color(0xFF9DCAFF) val md_theme_dark_onPrimary = Color(0xFF003257) val md_theme_dark_primaryContainer = Color(0xFF00497C) @@ -64,75 +66,68 @@ val md_theme_dark_surfaceTint = Color(0xFF9DCAFF) val md_theme_dark_outlineVariant = Color(0xFF42474E) val md_theme_dark_scrim = Color(0xFF000000) -val md_alt_theme_light_primary = Color(0xFF0062A2) -val md_alt_theme_light_onPrimary = Color(0xFFFFFFFF) -val md_alt_theme_light_primaryContainer = Color(0xFFD1E4FF) -val md_alt_theme_light_onPrimaryContainer = Color(0xFF001D35) -val md_alt_theme_light_secondary = Color(0xFFA43D00) -val md_alt_theme_light_onSecondary = Color(0xFFFFFFFF) -val md_alt_theme_light_secondaryContainer = Color(0xFFFFDBCD) -val md_alt_theme_light_onSecondaryContainer = Color(0xFF360F00) -val md_alt_theme_light_tertiary = Color(0xFF006D3D) -val md_alt_theme_light_onTertiary = Color(0xFFFFFFFF) -val md_alt_theme_light_tertiaryContainer = Color(0xFF97F7B7) -val md_alt_theme_light_onTertiaryContainer = Color(0xFF00210F) -val md_alt_theme_light_error = Color(0xFFBA1A1A) -val md_alt_theme_light_errorContainer = Color(0xFFFFDAD6) -val md_alt_theme_light_onError = Color(0xFFFFFFFF) -val md_alt_theme_light_onErrorContainer = Color(0xFF410002) -val md_alt_theme_light_background = Color(0xFFF8FDFF) -val md_alt_theme_light_onBackground = Color(0xFF001F25) -val md_alt_theme_light_surface = Color(0xFFF8FDFF) -val md_alt_theme_light_onSurface = Color(0xFF001F25) -//val md_alt_theme_light_surfaceVariant = Color(0xFFDFE2EB) -val md_alt_theme_light_surfaceVariant = Color(0xFFF8FDFF) -val md_alt_theme_light_onSurfaceVariant = Color(0xFF42474E) -val md_alt_theme_light_outline = Color(0xFF73777F) -val md_alt_theme_light_inverseOnSurface = Color(0xFFD6F6FF) -val md_alt_theme_light_inverseSurface = Color(0xFF00363F) -val md_alt_theme_light_inversePrimary = Color(0xFF9DCAFF) -val md_alt_theme_light_shadow = Color(0xFF000000) -val md_alt_theme_light_surfaceTint = Color(0xFF0062A2) -val md_alt_theme_light_outlineVariant = Color(0xFFC3C7CF) -val md_alt_theme_light_scrim = Color(0xFF000000) +// Black & White Light +val bw_theme_light_primary = Color(0xFF000000) +val bw_theme_light_onPrimary = Color(0xFFFFFFFF) +val bw_theme_light_primaryContainer = Color(0xFF262626) +val bw_theme_light_onPrimaryContainer = Color(0xFFB1B1B1) +val bw_theme_light_secondary = Color(0xFF5E5E5E) +val bw_theme_light_onSecondary = Color(0xFFFFFFFF) +val bw_theme_light_secondaryContainer = Color(0xFFE6E6E6) +val bw_theme_light_onSecondaryContainer = Color(0xFF4A4A4A) +val bw_theme_light_tertiary = Color(0xFF000000) +val bw_theme_light_onTertiary = Color(0xFFFFFFFF) +val bw_theme_light_tertiaryContainer = Color(0xFF262626) +val bw_theme_light_onTertiaryContainer = Color(0xFFB1B1B1) +val bw_theme_light_error = Color(0xFF5E5E5E) +val bw_theme_light_onError = Color(0xFFFFFFFF) +val bw_theme_light_errorContainer = Color(0xFFE6E6E6) +val bw_theme_light_onErrorContainer = Color(0xFF000000) +val bw_theme_light_background = Color(0xFFF9F9F9) +val bw_theme_light_onBackground = Color(0xFF1B1B1B) +val bw_theme_light_surface = Color(0xFFF9F9F9) +val bw_theme_light_onSurface = Color(0xFF1B1B1B) +val bw_theme_light_surfaceVariant = Color(0xFFFFFFFF) +val bw_theme_light_onSurfaceVariant = Color(0xFF4C4546) +val bw_theme_light_outline = Color(0xFF7E7576) +val bw_theme_light_inverseOnSurface = Color(0xFFF1F1F1) +val bw_theme_light_inverseSurface = Color(0xFF303030) +val bw_theme_light_inversePrimary = Color(0xFFC6C6C6) +val bw_theme_light_shadow = Color(0xFF4C4546) +val bw_theme_light_surfaceTint = Color(0xFFF3F3F3) +val bw_theme_light_outlineVariant = Color(0xFFF3F3F3) +val bw_theme_light_scrim = Color(0xFF000000) -val md_alt_theme_dark_primary = Color(0xFFFFB597) -//val md_alt_theme_dark_primary = Color(0xFF9DCAFF) -val md_alt_theme_dark_onPrimary = Color(0xFF003257) // -//val md_alt_theme_dark_primaryContainer = Color(0xFF00497C) -val md_alt_theme_dark_primaryContainer = Color(0xFF7D2D00) -val md_alt_theme_dark_onPrimaryContainer = Color(0xFFD1E4FF) -val md_alt_theme_dark_secondary = Color(0xFFFFB597) -val md_alt_theme_dark_onSecondary = Color(0xFF581D00) -val md_alt_theme_dark_secondaryContainer = Color(0xFF7D2D00) -val md_alt_theme_dark_onSecondaryContainer = Color(0xFFFFDBCD) -val md_alt_theme_dark_tertiary = Color(0xFF7BDA9C) -val md_alt_theme_dark_onTertiary = Color(0xFF00391D) -val md_alt_theme_dark_tertiaryContainer = Color(0xFF00522C) -val md_alt_theme_dark_onTertiaryContainer = Color(0xFF97F7B7) -val md_alt_theme_dark_error = Color(0xFFFFB4AB) -val md_alt_theme_dark_errorContainer = Color(0xFF93000A) -val md_alt_theme_dark_onError = Color(0xFF690005) -val md_alt_theme_dark_onErrorContainer = Color(0xFFFFDAD6) -// val md_alt_theme_dark_background = Color(0xFF001F25) -val md_alt_theme_dark_background = Color(0xFF000000) -//val md_alt_theme_dark_onBackground = Color(0xFFA6EEFF) -val md_alt_theme_dark_onBackground = Color(0xFFFFFFFF) -// val md_alt_theme_dark_surface = Color(0xFF001F25) -val md_alt_theme_dark_surface = Color(0xFF000000) -//val md_alt_theme_dark_onSurface = Color(0xFFA6EEFF) -val md_alt_theme_dark_onSurface = Color(0xFFFFFFFF) -//val md_alt_theme_dark_surfaceVariant = Color(0xFF42474E) -val md_alt_theme_dark_surfaceVariant = Color(0xFF000000) -val md_alt_theme_dark_onSurfaceVariant = Color(0xFFC3C7CF) -val md_alt_theme_dark_outline = Color(0xFF8D9199) -val md_alt_theme_dark_inverseOnSurface = Color(0xFF001F25) // -val md_alt_theme_dark_inverseSurface = Color(0xFFA6EEFF) -//val md_alt_theme_dark_inversePrimary = Color(0xFF0062A2) -val md_alt_theme_dark_inversePrimary = Color(0xFF7D2D00) -val md_alt_theme_dark_shadow = Color(0xFF000000) -val md_alt_theme_dark_surfaceTint = Color(0xFF9DCAFF) -val md_alt_theme_dark_outlineVariant = Color(0xFF42474E) -val md_alt_theme_dark_scrim = Color(0xFF000000) +// Black & White Dark +val bw_theme_dark_primary = Color(0xFFC6C6C6) +val bw_theme_dark_onPrimary = Color(0xFF303030) +val bw_theme_dark_onPrimaryContainer = Color(0xFF969696) +val bw_theme_dark_primaryContainer = Color(0xFF000000) +val bw_theme_dark_secondary = Color(0xFFC6C6C6) +val bw_theme_dark_onSecondary = Color(0xFF303030) +val bw_theme_dark_secondaryContainer = Color(0xFF3D3D3D) +val bw_theme_dark_onSecondaryContainer = Color(0xFFD1D1D1) +val bw_theme_dark_tertiary = Color(0xFFC6C6C6) +val bw_theme_dark_onTertiary = Color(0xFF303030) +val bw_theme_dark_tertiaryContainer = Color(0xFF000000) +val bw_theme_dark_onTertiaryContainer = Color(0xFFFFFFFF) +val bw_theme_dark_error = Color(0xFF5E5E5E) +val bw_theme_dark_onError = Color(0xFF000000) +val bw_theme_dark_errorContainer = Color(0xFF0A0A0A) +val bw_theme_dark_onErrorContainer = Color(0xFFFFFFFF) +val bw_theme_dark_background = Color(0xFF131313) +val bw_theme_dark_onBackground = Color(0xFFFFFFFF) +val bw_theme_dark_surface = Color(0xFF131313) +val bw_theme_dark_onSurface = Color(0xFFE2E2E2) +val bw_theme_dark_surfaceVariant = Color(0xFF131313) +val bw_theme_dark_onSurfaceVariant = Color(0xFFCFC4C5) +val bw_theme_dark_outline = Color(0xFF988E90) +val bw_theme_dark_inverseSurface = Color(0xFFE2E2E2) +val bw_theme_dark_inverseOnSurface = Color(0xFF303030) +val bw_theme_dark_inversePrimary = Color(0xFFFFFFFF) +val bw_theme_dark_shadow = Color(0xFF4C4546) +val bw_theme_dark_surfaceTint = Color(0xFF0A0A0A) +val bw_theme_dark_outlineVariant = Color(0xFF4C4546) +val bw_theme_dark_scrim = Color(0xFF000000) val seed = Color(0xFF0072BC) diff --git a/app/src/main/java/com/readrops/app/util/theme/Theme.kt b/app/src/main/java/com/readrops/app/util/theme/Theme.kt index cba752fb..f72b8005 100644 --- a/app/src/main/java/com/readrops/app/util/theme/Theme.kt +++ b/app/src/main/java/com/readrops/app/util/theme/Theme.kt @@ -5,7 +5,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable - +import com.readrops.app.R private val LightColors = lightColorScheme( primary = md_theme_light_primary, @@ -72,88 +72,91 @@ private val DarkColors = darkColorScheme( scrim = md_theme_dark_scrim, ) -private val LightAltColors = lightColorScheme( - primary = md_alt_theme_light_primary, - onPrimary = md_alt_theme_light_onPrimary, - primaryContainer = md_alt_theme_light_primaryContainer, - onPrimaryContainer = md_alt_theme_light_onPrimaryContainer, - secondary = md_alt_theme_light_secondary, - onSecondary = md_alt_theme_light_onSecondary, - secondaryContainer = md_alt_theme_light_secondaryContainer, - onSecondaryContainer = md_alt_theme_light_onSecondaryContainer, - tertiary = md_alt_theme_light_tertiary, - onTertiary = md_alt_theme_light_onTertiary, - tertiaryContainer = md_alt_theme_light_tertiaryContainer, - onTertiaryContainer = md_alt_theme_light_onTertiaryContainer, - error = md_alt_theme_light_error, - errorContainer = md_alt_theme_light_errorContainer, - onError = md_alt_theme_light_onError, - onErrorContainer = md_alt_theme_light_onErrorContainer, - background = md_alt_theme_light_background, - onBackground = md_alt_theme_light_onBackground, - surface = md_alt_theme_light_surface, - onSurface = md_alt_theme_light_onSurface, - surfaceVariant = md_alt_theme_light_surfaceVariant, - onSurfaceVariant = md_alt_theme_light_onSurfaceVariant, - outline = md_alt_theme_light_outline, - inverseOnSurface = md_alt_theme_light_inverseOnSurface, - inverseSurface = md_alt_theme_light_inverseSurface, - inversePrimary = md_alt_theme_light_inversePrimary, - surfaceTint = md_alt_theme_light_surfaceTint, - outlineVariant = md_alt_theme_light_outlineVariant, - scrim = md_alt_theme_light_scrim, +private val BlackWhiteLightColors = lightColorScheme( + primary = bw_theme_light_primary, + onPrimary = bw_theme_light_onPrimary, + primaryContainer = bw_theme_light_primaryContainer, + onPrimaryContainer = bw_theme_light_onPrimaryContainer, + secondary = bw_theme_light_secondary, + onSecondary = bw_theme_light_onSecondary, + secondaryContainer = bw_theme_light_secondaryContainer, + onSecondaryContainer = bw_theme_light_onSecondaryContainer, + tertiary = bw_theme_light_tertiary, + onTertiary = bw_theme_light_onTertiary, + tertiaryContainer = bw_theme_light_tertiaryContainer, + onTertiaryContainer = bw_theme_light_onTertiaryContainer, + error = bw_theme_light_error, + errorContainer = bw_theme_light_errorContainer, + onError = bw_theme_light_onError, + onErrorContainer = bw_theme_light_onErrorContainer, + background = bw_theme_light_background, + onBackground = bw_theme_light_onBackground, + surface = bw_theme_light_surface, + onSurface = bw_theme_light_onSurface, + surfaceVariant = bw_theme_light_surfaceVariant, + onSurfaceVariant = bw_theme_light_onSurfaceVariant, + outline = bw_theme_light_outline, + inverseOnSurface = bw_theme_light_inverseOnSurface, + inverseSurface = bw_theme_light_inverseSurface, + inversePrimary = bw_theme_light_inversePrimary, + surfaceTint = bw_theme_light_surfaceTint, + outlineVariant = bw_theme_light_outlineVariant, + scrim = bw_theme_light_scrim, ) - -private val DarkAltColors = darkColorScheme( - primary = md_alt_theme_dark_primary, - onPrimary = md_alt_theme_dark_onPrimary, - primaryContainer = md_alt_theme_dark_primaryContainer, - onPrimaryContainer = md_alt_theme_dark_onPrimaryContainer, - secondary = md_alt_theme_dark_secondary, - onSecondary = md_alt_theme_dark_onSecondary, - secondaryContainer = md_alt_theme_dark_secondaryContainer, - onSecondaryContainer = md_alt_theme_dark_onSecondaryContainer, - tertiary = md_alt_theme_dark_tertiary, - onTertiary = md_alt_theme_dark_onTertiary, - tertiaryContainer = md_alt_theme_dark_tertiaryContainer, - onTertiaryContainer = md_alt_theme_dark_onTertiaryContainer, - error = md_alt_theme_dark_error, - errorContainer = md_alt_theme_dark_errorContainer, - onError = md_alt_theme_dark_onError, - onErrorContainer = md_alt_theme_dark_onErrorContainer, - background = md_alt_theme_dark_background, - onBackground = md_alt_theme_dark_onBackground, - surface = md_alt_theme_dark_surface, - onSurface = md_alt_theme_dark_onSurface, - surfaceVariant = md_alt_theme_dark_surfaceVariant, - onSurfaceVariant = md_alt_theme_dark_onSurfaceVariant, - outline = md_alt_theme_dark_outline, - inverseOnSurface = md_alt_theme_dark_inverseOnSurface, - inverseSurface = md_alt_theme_dark_inverseSurface, - inversePrimary = md_alt_theme_dark_inversePrimary, - surfaceTint = md_alt_theme_dark_surfaceTint, - outlineVariant = md_alt_theme_dark_outlineVariant, - scrim = md_alt_theme_dark_scrim, +private val BlackWhiteDarkColors = lightColorScheme( + primary = bw_theme_dark_primary, + onPrimary = bw_theme_dark_onPrimary, + primaryContainer = bw_theme_dark_primaryContainer, + onPrimaryContainer = bw_theme_dark_onPrimaryContainer, + secondary = bw_theme_dark_secondary, + onSecondary = bw_theme_dark_onSecondary, + secondaryContainer = bw_theme_dark_secondaryContainer, + onSecondaryContainer = bw_theme_dark_onSecondaryContainer, + tertiary = bw_theme_dark_tertiary, + onTertiary = bw_theme_dark_onTertiary, + tertiaryContainer = bw_theme_dark_tertiaryContainer, + onTertiaryContainer = bw_theme_dark_onTertiaryContainer, + error = bw_theme_dark_error, + errorContainer = bw_theme_dark_errorContainer, + onError = bw_theme_dark_onError, + onErrorContainer = bw_theme_dark_onErrorContainer, + background = bw_theme_dark_background, + onBackground = bw_theme_dark_onBackground, + surface = bw_theme_dark_surface, + onSurface = bw_theme_dark_onSurface, + surfaceVariant = bw_theme_dark_surfaceVariant, + onSurfaceVariant = bw_theme_dark_onSurfaceVariant, + outline = bw_theme_dark_outline, + inverseOnSurface = bw_theme_dark_inverseOnSurface, + inverseSurface = bw_theme_dark_inverseSurface, + inversePrimary = bw_theme_dark_inversePrimary, + surfaceTint = bw_theme_dark_surfaceTint, + outlineVariant = bw_theme_dark_outlineVariant, + scrim = bw_theme_dark_scrim, ) @Composable fun ReadropsTheme( useDarkTheme: Boolean = isSystemInDarkTheme(), - useAltColours: Boolean = true, + themeColourScheme: String = "readrops", content: @Composable () -> Unit ) { - val colors = if (!useAltColours) { - if (!useDarkTheme) { - LightColors - } else { - DarkColors - } - } else { - if (!useDarkTheme) { - LightAltColors - } else { - DarkAltColors + + + val colors = when(themeColourScheme) { + "blackwhite" -> { + if (!useDarkTheme) { + BlackWhiteLightColors + } else { + BlackWhiteDarkColors + } + } else -> { + if (!useDarkTheme) { + LightColors + } else { + DarkColors + } } } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c0a4469c..9930fea3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -28,7 +28,10 @@ Exportieren von Feeds und Ordnern Dunkel Hell - Farbschema + Thema + Farbschema + Readrops + Black White Bild teilen Bild herunterladen Bildoptionen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6abac13d..e87c4bad 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -112,6 +112,9 @@ Descargar imagen Compartir imagen Tema + Bandera + Readrops + Black White 1 hora 6 horas Para que se muestren las notificaciones es necesario que la sincronización automática esté activada. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 99fcf567..5f899b81 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -107,6 +107,9 @@ Télécharger l\'image Partager l\'image Thème + Schéma de couleurs + Readrops + Black White Clair Sombre Export des flux et dossiers diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 0ab0d5d1..79ae7ec9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -107,6 +107,9 @@ Unduh gambar Bagikan gambar Tema + Skema Warna + Readrops + Black White Terang Gelap Ekspor feed dan folder diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7a5f00d6..89772868 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -30,6 +30,9 @@ Scuro Chiaro Tema + Combinazione di colori + Readrops + Black White Condividi l\'immagine Scarica l\'immagine Opzioni dell\'immagine diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 1a7951c4..5f83720d 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -6,6 +6,9 @@ Mørk Lys Drakt + Fargevalg + Readrops + Black White Del bilde Last ned bilde Bildevalg diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 7055fdb5..fbf38fce 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -35,4 +35,8 @@ Feed verwijderen? Laden Geen map + Thema + Kleurenschema + Readrops + Black White \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 25ee1fb5..43181f8d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -57,6 +57,9 @@ Baixar a imagem Compartilhar a imagem Tema + Esquema de cores + Readrops + Black White Claro Escuro Exportar Feeds e pastas diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 057babb2..155031a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -111,6 +111,9 @@ Download image Share image Theme + Color Scheme + Readrops + Black White Light Dark Export feeds and folders @@ -147,7 +150,6 @@ system Hide feeds without new items Mark items read on scroll - Use alternate theme colours New articles Filters