From f2a6a58c054cc3479ef2c2fcbd82475167f3f2ac Mon Sep 17 00:00:00 2001 From: jonasgaudian <43753916+jonasgaudian@users.noreply.github.com> Date: Tue, 17 Feb 2026 22:36:12 +0100 Subject: [PATCH] update application themes, remove Perplexity API provider, and implement dynamic daily goal check --- .../model/communication/ApiManager.kt | 5 +- .../model/communication/ApiProvider.kt | 11 --- .../model/repository/VocabularyRepository.kt | 2 +- .../eu/gaudian/translator/ui/theme/Theme.kt | 27 +++--- .../ui/theme/themes/CitrusSplashTheme.kt | 85 ------------------- .../ui/theme/themes/CrimsonTheme.kt | 85 ------------------- .../ui/theme/themes/ElectricVioletTheme.kt | 85 +++++++++++++++++++ .../ui/theme/themes/LavenderDreamTheme.kt | 85 +++++++++++++++++++ .../ui/theme/themes/MossStoneTheme.kt | 85 +++++++++++++++++++ .../ui/theme/themes/NeonPulseTheme.kt | 85 +++++++++++++++++++ .../ui/theme/themes/SageGardenTheme.kt | 85 +++++++++++++++++++ .../translator/ui/theme/themes/SakuraTheme.kt | 85 ------------------- .../translator/ui/theme/themes/SpaceOpera.kt | 85 ------------------- .../translator/ui/theme/themes/Synthwave.kt | 85 ------------------- .../ui/theme/themes/TerracottaEarthTheme.kt | 85 +++++++++++++++++++ .../ui/theme/themes/ThemeTwilight.kt | 85 ------------------- 16 files changed, 524 insertions(+), 541 deletions(-) delete mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/CitrusSplashTheme.kt delete mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/CrimsonTheme.kt create mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/ElectricVioletTheme.kt create mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/LavenderDreamTheme.kt create mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/MossStoneTheme.kt create mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/NeonPulseTheme.kt create mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/SageGardenTheme.kt delete mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/SakuraTheme.kt delete mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/SpaceOpera.kt delete mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/Synthwave.kt create mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/TerracottaEarthTheme.kt delete mode 100644 app/src/main/java/eu/gaudian/translator/ui/theme/themes/ThemeTwilight.kt diff --git a/app/src/main/java/eu/gaudian/translator/model/communication/ApiManager.kt b/app/src/main/java/eu/gaudian/translator/model/communication/ApiManager.kt index 581d3fc..a5b364f 100644 --- a/app/src/main/java/eu/gaudian/translator/model/communication/ApiManager.kt +++ b/app/src/main/java/eu/gaudian/translator/model/communication/ApiManager.kt @@ -228,10 +228,7 @@ class ApiManager(private val context: Context) { val allowNoKey = provider.isCustom || isLocalHost val effectiveKey = if (key.isNotEmpty()) key else if (allowNoKey) "" else key - // Perplexity does not support listing models via /v1/models; fail fast with a clear message - if (provider.key.equals("perplexity", ignoreCase = true)) { - return Pair(emptyList(), "Perplexity does not support fetching modeles.") //TODO this must be transalted! - } + return withContext(Dispatchers.IO) { try { diff --git a/app/src/main/java/eu/gaudian/translator/model/communication/ApiProvider.kt b/app/src/main/java/eu/gaudian/translator/model/communication/ApiProvider.kt index 217d5cc..1ea2edd 100644 --- a/app/src/main/java/eu/gaudian/translator/model/communication/ApiProvider.kt +++ b/app/src/main/java/eu/gaudian/translator/model/communication/ApiProvider.kt @@ -115,17 +115,6 @@ data class ApiProvider( LanguageModel("llama-3.1-8b-instant", "Llama 3.1 8B", "groq", "Powerful Llama 3 model running at extreme speed."), ) ), - ApiProvider( - key = "perplexity", - displayName = "Perplexity", - baseUrl = "https://api.perplexity.ai/", - endpoint = "chat/completions", - websiteUrl = "https://www.perplexity.ai/", - models = listOf( - LanguageModel("sonar", "Sonar Small Online", "perplexity", "A faster online model for quick, up-to-date answers."), // default - LanguageModel("sonar-pro", "Sonar Pro", "perplexity", "Advanced search-focused model for richer context and longer answers."), - ) - ), ApiProvider( key = "xai", displayName = "xAI Grok", diff --git a/app/src/main/java/eu/gaudian/translator/model/repository/VocabularyRepository.kt b/app/src/main/java/eu/gaudian/translator/model/repository/VocabularyRepository.kt index 563b17d..efe54b2 100644 --- a/app/src/main/java/eu/gaudian/translator/model/repository/VocabularyRepository.kt +++ b/app/src/main/java/eu/gaudian/translator/model/repository/VocabularyRepository.kt @@ -636,7 +636,7 @@ class VocabularyRepository private constructor(context: Context) { suspend fun isTargetMetForDate(date: LocalDate): Boolean { val dailyCorrectCount = getDailyCorrectCount(date) - val target = 10 // TODO: Replace with settingsRepository.dailyGoal.flow.first() + val target = settingsRepository.dailyGoal.flow.first() return dailyCorrectCount >= target } diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/Theme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/Theme.kt index e5bf845..5bedb1a 100644 --- a/app/src/main/java/eu/gaudian/translator/ui/theme/Theme.kt +++ b/app/src/main/java/eu/gaudian/translator/ui/theme/Theme.kt @@ -5,22 +5,22 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.ui.graphics.Color import eu.gaudian.translator.ui.theme.themes.AutumnSpiceTheme -import eu.gaudian.translator.ui.theme.themes.CitrusSplashTheme import eu.gaudian.translator.ui.theme.themes.CoffeeTheme -import eu.gaudian.translator.ui.theme.themes.CrimsonTheme import eu.gaudian.translator.ui.theme.themes.CyberpunkTheme import eu.gaudian.translator.ui.theme.themes.DebugTheme import eu.gaudian.translator.ui.theme.themes.DefaultTheme +import eu.gaudian.translator.ui.theme.themes.ElectricVioletTheme import eu.gaudian.translator.ui.theme.themes.ForestTheme +import eu.gaudian.translator.ui.theme.themes.LavenderDreamTheme +import eu.gaudian.translator.ui.theme.themes.MossStoneTheme +import eu.gaudian.translator.ui.theme.themes.NeonPulseTheme import eu.gaudian.translator.ui.theme.themes.NordTheme import eu.gaudian.translator.ui.theme.themes.OceanicCalmTheme import eu.gaudian.translator.ui.theme.themes.PixelTheme -import eu.gaudian.translator.ui.theme.themes.SakuraTheme +import eu.gaudian.translator.ui.theme.themes.SageGardenTheme import eu.gaudian.translator.ui.theme.themes.SlateAndStoneTheme -import eu.gaudian.translator.ui.theme.themes.SpaceTheme -import eu.gaudian.translator.ui.theme.themes.SynthwaveTheme import eu.gaudian.translator.ui.theme.themes.TealTheme -import eu.gaudian.translator.ui.theme.themes.TwilightSerenityTheme +import eu.gaudian.translator.ui.theme.themes.TerracottaEarthTheme /** * A data class to hold the core colors for a theme variation (light or dark). @@ -97,26 +97,23 @@ data class AppTheme( val AllThemes = listOf( - DefaultTheme, PixelTheme, - CrimsonTheme, - SakuraTheme, AutumnSpiceTheme, TealTheme, ForestTheme, CoffeeTheme, - CitrusSplashTheme, OceanicCalmTheme, SlateAndStoneTheme, NordTheme, - TwilightSerenityTheme, - SpaceTheme, CyberpunkTheme, - SynthwaveTheme, DebugTheme, - - + LavenderDreamTheme, + SageGardenTheme, + MossStoneTheme, + ElectricVioletTheme, + NeonPulseTheme, + TerracottaEarthTheme, ) /** diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/CitrusSplashTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/CitrusSplashTheme.kt deleted file mode 100644 index 1e5b539..0000000 --- a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/CitrusSplashTheme.kt +++ /dev/null @@ -1,85 +0,0 @@ -@file:Suppress("HardCodedStringLiteral") - -package eu.gaudian.translator.ui.theme.themes - -import androidx.compose.ui.graphics.Color -import eu.gaudian.translator.ui.theme.AppTheme -import eu.gaudian.translator.ui.theme.ThemeColorSet - -val CitrusSplashTheme = AppTheme( - name = "Citrus Splash", - lightColors = ThemeColorSet( - primary = Color(0xFFF57F17), // Vibrant Orange (Primary) - secondary = Color(0xFFFBC02D), // Sunny Yellow (Secondary) - tertiary = Color(0xFF7CB342), // Lime Green (Tertiary) - primaryContainer = Color(0xFFFFEBC0), - secondaryContainer = Color(0xFFFFF3AD), - tertiaryContainer = Color(0xFFDDEEBF), - onPrimary = Color(0xFFFFFFFF), - onSecondary = Color(0xFF000000), - onTertiary = Color(0xFFFFFFFF), - onPrimaryContainer = Color(0xFF2C1600), - onSecondaryContainer = Color(0xFF221B00), - onTertiaryContainer = Color(0xFF131F00), - error = Color(0xFFB00020), - onError = Color(0xFFFFFFFF), - errorContainer = Color(0xFFFDE7E9), - onErrorContainer = Color(0xFF4A000B), - background = Color(0xFFFFFDF7), // Warm, off-white background - onBackground = Color(0xFF201A17), // Dark, warm text - surface = Color(0xFFFFFFFF), // Crisp white surface - onSurface = Color(0xFF201A17), - surfaceVariant = Color(0xFFF3EFE9), - onSurfaceVariant = Color(0xFF49453F), - outline = Color(0xFF7A756F), - outlineVariant = Color(0xFFCCC5BD), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFF352F2B), - inverseOnSurface = Color(0xFFFBEFE8), - inversePrimary = Color(0xFFFFB86C), - surfaceDim = Color(0xFFE2D8D2), - surfaceBright = Color(0xFFFFFDF7), - surfaceContainerLowest = Color(0xFFFFFFFF), - surfaceContainerLow = Color(0xFFFBF2EC), - surfaceContainer = Color(0xFFF5EDE6), - surfaceContainerHigh = Color(0xFFF0E7E1), - surfaceContainerHighest = Color(0xFFEAE2DC) - ), - darkColors = ThemeColorSet( - primary = Color(0xFFFFB86C), // Lighter orange for dark mode - secondary = Color(0xFFEAC248), // Lighter yellow - tertiary = Color(0xFFB8CF83), // Lighter lime - primaryContainer = Color(0xFF5A4121), - secondaryContainer = Color(0xFF564600), - tertiaryContainer = Color(0xFF404D20), - onPrimary = Color(0xFF4A2A00), - onSecondary = Color(0xFF3A3000), - onTertiary = Color(0xFF2B350A), - onPrimaryContainer = Color(0xFFFFDEB5), - onSecondaryContainer = Color(0xFFFFEAAA), - onTertiaryContainer = Color(0xFFD4EC9C), - error = Color(0xFFCF6679), - onError = Color(0xFF000000), - errorContainer = Color(0xFF93000A), - onErrorContainer = Color(0xFFFFDAD6), - background = Color(0xFF1F1A17), // Deep, warm brown/gray - onBackground = Color(0xFFEAE2DC), // Light, warm text - surface = Color(0xFF2A2421), // Slightly lighter warm surface - onSurface = Color(0xFFEAE2DC), - surfaceVariant = Color(0xFF443F3A), - onSurfaceVariant = Color(0xFFC9C6C0), - outline = Color(0xFF938F8A), - outlineVariant = Color(0xFF49453F), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFFEAE2DC), - inverseOnSurface = Color(0xFF201A17), - inversePrimary = Color(0xFFF57F17), - surfaceDim = Color(0xFF1F1A17), - surfaceBright = Color(0xFF48403A), - surfaceContainerLowest = Color(0xFF16120F), - surfaceContainerLow = Color(0xFF1F1A17), - surfaceContainer = Color(0xFF241E1B), - surfaceContainerHigh = Color(0xFF2E2925), - surfaceContainerHighest = Color(0xFF39332F), - ) -) \ No newline at end of file diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/CrimsonTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/CrimsonTheme.kt deleted file mode 100644 index fa34afa..0000000 --- a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/CrimsonTheme.kt +++ /dev/null @@ -1,85 +0,0 @@ -@file:Suppress("HardCodedStringLiteral") - -package eu.gaudian.translator.ui.theme.themes - -import androidx.compose.ui.graphics.Color -import eu.gaudian.translator.ui.theme.AppTheme -import eu.gaudian.translator.ui.theme.ThemeColorSet - -val CrimsonTheme = AppTheme( - name = "Crimson", - lightColors = ThemeColorSet( - primary = Color(0xFFA03F3F), - secondary = Color(0xFF775656), - tertiary = Color(0xFF755A2F), - primaryContainer = Color(0xFFFFDAD9), - secondaryContainer = Color(0xFFFFDAD9), - tertiaryContainer = Color(0xFFFFDEAD), - onPrimary = Color(0xFFFFFFFF), - onSecondary = Color(0xFFFFFFFF), - onTertiary = Color(0xFFFFFFFF), - onPrimaryContainer = Color(0xFF410004), - onSecondaryContainer = Color(0xFF2C1515), - onTertiaryContainer = Color(0xFF281900), - error = Color(0xFFBA1A1A), - onError = Color(0xFFFFFFFF), - errorContainer = Color(0xFFFFDAD6), - onErrorContainer = Color(0xFF410002), - background = Color(0xFFFCFCFC), - onBackground = Color(0xFF201A1A), - surface = Color(0xFFFCFCFC), - onSurface = Color(0xFF201A1A), - surfaceVariant = Color(0xFFF4DDDD), - onSurfaceVariant = Color(0xFF524343), - outline = Color(0xFF857373), - outlineVariant = Color(0xFFD7C1C1), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFF362F2F), - inverseOnSurface = Color(0xFFFBEDED), - inversePrimary = Color(0xFFFFB3B3), - surfaceDim = Color(0xFFE3D7D7), - surfaceBright = Color(0xFFFCFCFC), - surfaceContainerLowest = Color(0xFFFFFFFF), - surfaceContainerLow = Color(0xFFF7F0F0), - surfaceContainer = Color(0xFFF1EAEB), - surfaceContainerHigh = Color(0xFFEBE4E5), - surfaceContainerHighest = Color(0xFFE5DFDF) - ), - darkColors = ThemeColorSet( - primary = Color(0xFFFFB3B3), - secondary = Color(0xFFE6BDBC), - tertiary = Color(0xFFE5C18D), - primaryContainer = Color(0xFF812829), - secondaryContainer = Color(0xFF5D3F3F), - tertiaryContainer = Color(0xFF5B431A), - onPrimary = Color(0xFF611216), - onSecondary = Color(0xFF442929), - onTertiary = Color(0xFF412D05), - onPrimaryContainer = Color(0xFFFFDAD9), - onSecondaryContainer = Color(0xFFFFDAD9), - onTertiaryContainer = Color(0xFFFFDEAD), - error = Color(0xFFFFB4AB), - onError = Color(0xFF690005), - errorContainer = Color(0xFF93000A), - onErrorContainer = Color(0xFFFFDAD6), - background = Color(0xFF201A1A), - onBackground = Color(0xFFEBE0E0), - surface = Color(0xFF201A1A), - onSurface = Color(0xFFEBE0E0), - surfaceVariant = Color(0xFF524343), - onSurfaceVariant = Color(0xFFD7C1C1), - outline = Color(0xFFA08C8C), - outlineVariant = Color(0xFF524343), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFFEBE0E0), - inverseOnSurface = Color(0xFF362F2F), - inversePrimary = Color(0xFFA03F3F), - surfaceDim = Color(0xFF171212), - surfaceBright = Color(0xFF3E3737), - surfaceContainerLowest = Color(0xFF120D0D), - surfaceContainerLow = Color(0xFF251E1E), - surfaceContainer = Color(0xFF2A2222), - surfaceContainerHigh = Color(0xFF342C2C), - surfaceContainerHighest = Color(0xFF3F3737), - ) -) \ No newline at end of file diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/ElectricVioletTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/ElectricVioletTheme.kt new file mode 100644 index 0000000..1946fed --- /dev/null +++ b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/ElectricVioletTheme.kt @@ -0,0 +1,85 @@ +@file:Suppress("HardCodedStringLiteral") + +package eu.gaudian.translator.ui.theme.themes + +import androidx.compose.ui.graphics.Color +import eu.gaudian.translator.ui.theme.AppTheme +import eu.gaudian.translator.ui.theme.ThemeColorSet + +val ElectricVioletTheme = AppTheme( + name = "Electric Violet", + lightColors = ThemeColorSet( + primary = Color(0xFF7B2CBF), + secondary = Color(0xFF9D4EDD), + tertiary = Color(0xFFC77DFF), + primaryContainer = Color(0xFFE8D4FF), + secondaryContainer = Color(0xFFF0D4FF), + tertiaryContainer = Color(0xFFFFD4FF), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color(0xFF3D0066), + onPrimaryContainer = Color(0xFF2E0060), + onSecondaryContainer = Color(0xFF3D0066), + onTertiaryContainer = Color(0xFF4D007A), + error = Color(0xFFBA1A1A), + onError = Color.White, + errorContainer = Color(0xFFFFDAD6), + onErrorContainer = Color(0xFF410002), + background = Color(0xFFFEFDFF), + onBackground = Color(0xFF1C1B20), + surface = Color(0xFFFEFDFF), + onSurface = Color(0xFF1C1B20), + surfaceVariant = Color(0xFFE7DEF0), + onSurfaceVariant = Color(0xFF4F444B), + outline = Color(0xFF80737A), + outlineVariant = Color(0xFFD3C2CA), + scrim = Color.Black, + inverseSurface = Color(0xFF343035), + inverseOnSurface = Color(0xFFF9EFF6), + inversePrimary = Color(0xFFE0B0FF), + surfaceDim = Color(0xFFE0D8E0), + surfaceBright = Color(0xFFFEFDFF), + surfaceContainerLowest = Color.White, + surfaceContainerLow = Color(0xFFF9F2FA), + surfaceContainer = Color(0xFFF3ECF4), + surfaceContainerHigh = Color(0xFFEDE7EE), + surfaceContainerHighest = Color(0xFFE7E1E9) + ), + darkColors = ThemeColorSet( + primary = Color(0xFFE0B0FF), + secondary = Color(0xFFC590E0), + tertiary = Color(0xFFE0A0FF), + primaryContainer = Color(0xFF5A2D8A), + secondaryContainer = Color(0xFF6A3A7A), + tertiaryContainer = Color(0xFF5A3A7A), + onPrimary = Color(0xFF3D1A6A), + onSecondary = Color(0xFF3D2A5A), + onTertiary = Color(0xFF3D2A6A), + onPrimaryContainer = Color(0xFFE8D4FF), + onSecondaryContainer = Color(0xFFF0D4FF), + onTertiaryContainer = Color(0xFFFFD4FF), + error = Color(0xFFFFB4AB), + onError = Color(0xFF690005), + errorContainer = Color(0xFF93000A), + onErrorContainer = Color(0xFFFFDAD6), + background = Color(0xFF1C1B20), + onBackground = Color(0xFFE6E1E9), + surface = Color(0xFF1C1B20), + onSurface = Color(0xFFE6E1E9), + surfaceVariant = Color(0xFF4F444B), + onSurfaceVariant = Color(0xFFD3C2CA), + outline = Color(0xFF9C8D96), + outlineVariant = Color(0xFF4F444B), + scrim = Color.Black, + inverseSurface = Color(0xFFE6E1E9), + inverseOnSurface = Color(0xFF343035), + inversePrimary = Color(0xFF7B2CBF), + surfaceDim = Color(0xFF141217), + surfaceBright = Color(0xFF3B373E), + surfaceContainerLowest = Color(0xFF0E0D12), + surfaceContainerLow = Color(0xFF1C1B20), + surfaceContainer = Color(0xFF201F24), + surfaceContainerHigh = Color(0xFF2B292F), + surfaceContainerHighest = Color(0xFF36343A) + ) +) diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/LavenderDreamTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/LavenderDreamTheme.kt new file mode 100644 index 0000000..71b27a4 --- /dev/null +++ b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/LavenderDreamTheme.kt @@ -0,0 +1,85 @@ +@file:Suppress("HardCodedStringLiteral") + +package eu.gaudian.translator.ui.theme.themes + +import androidx.compose.ui.graphics.Color +import eu.gaudian.translator.ui.theme.AppTheme +import eu.gaudian.translator.ui.theme.ThemeColorSet + +val LavenderDreamTheme = AppTheme( + name = "Lavender Dream", + lightColors = ThemeColorSet( + primary = Color(0xFF6B5B95), // Deep Lavender + secondary = Color(0xFF8874A3), // Soft Purple + tertiary = Color(0xFFBFA6C8), // Pale Lavender + primaryContainer = Color(0xFFE8DEFF), + secondaryContainer = Color(0xFFF3E8FF), + tertiaryContainer = Color(0xFFFFE8FF), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color(0xFF3D2E4D), + onPrimaryContainer = Color(0xFF251A4A), + onSecondaryContainer = Color(0xFF2D1F4A), + onTertiaryContainer = Color(0xFF3D2E4D), + error = Color(0xFFBA1A1A), + onError = Color.White, + errorContainer = Color(0xFFFFDAD6), + onErrorContainer = Color(0xFF410002), + background = Color(0xFFFDFBFF), + onBackground = Color(0xFF1C1B20), + surface = Color(0xFFFDFBFF), + onSurface = Color(0xFF1C1B20), + surfaceVariant = Color(0xFFE7E0EB), + onSurfaceVariant = Color(0xFF49454E), + outline = Color(0xFF7A757F), + outlineVariant = Color(0xFFCBC4CF), + scrim = Color.Black, + inverseSurface = Color(0xFF313035), + inverseOnSurface = Color(0xFFF3EFF6), + inversePrimary = Color(0xFFCBB8FF), + surfaceDim = Color(0xFFDED9E0), + surfaceBright = Color(0xFFFDFBFF), + surfaceContainerLowest = Color.White, + surfaceContainerLow = Color(0xFFF8F2FA), + surfaceContainer = Color(0xFFF2ECF4), + surfaceContainerHigh = Color(0xFFECE7EF), + surfaceContainerHighest = Color(0xFFE6E1E9) + ), + darkColors = ThemeColorSet( + primary = Color(0xFFCBB8FF), // Soft Lavender + secondary = Color(0xFFD4C4E8), // Light Purple + tertiary = Color(0xFFE0D0F0), // Very Pale Purple + primaryContainer = Color(0xFF52437A), + secondaryContainer = Color(0xFF5D4A73), + tertiaryContainer = Color(0xFF4A3D5C), + onPrimary = Color(0xFF3B2E6A), + onSecondary = Color(0xFF3D2A54), + onTertiary = Color(0xFF3D2A54), + onPrimaryContainer = Color(0xFFE8DEFF), + onSecondaryContainer = Color(0xFFF3E8FF), + onTertiaryContainer = Color(0xFFFFE8FF), + error = Color(0xFFFFB4AB), + onError = Color(0xFF690005), + errorContainer = Color(0xFF93000A), + onErrorContainer = Color(0xFFFFDAD6), + background = Color(0xFF1C1B20), + onBackground = Color(0xFFE6E1E9), + surface = Color(0xFF1C1B20), + onSurface = Color(0xFFE6E1E9), + surfaceVariant = Color(0xFF49454E), + onSurfaceVariant = Color(0xFFCBC4CF), + outline = Color(0xFF948F99), + outlineVariant = Color(0xFF49454E), + scrim = Color.Black, + inverseSurface = Color(0xFFE6E1E9), + inverseOnSurface = Color(0xFF313035), + inversePrimary = Color(0xFF6B5B95), + surfaceDim = Color(0xFF141317), + surfaceBright = Color(0xFF3A383E), + surfaceContainerLowest = Color(0xFF0F0E12), + surfaceContainerLow = Color(0xFF1C1B20), + surfaceContainer = Color(0xFF201F24), + surfaceContainerHigh = Color(0xFF2B292F), + surfaceContainerHighest = Color(0xFF36343A) + ) +) diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/MossStoneTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/MossStoneTheme.kt new file mode 100644 index 0000000..3ad3b8b --- /dev/null +++ b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/MossStoneTheme.kt @@ -0,0 +1,85 @@ +@file:Suppress("HardCodedStringLiteral") + +package eu.gaudian.translator.ui.theme.themes + +import androidx.compose.ui.graphics.Color +import eu.gaudian.translator.ui.theme.AppTheme +import eu.gaudian.translator.ui.theme.ThemeColorSet + +val MossStoneTheme = AppTheme( + name = "Moss & Stone", + lightColors = ThemeColorSet( + primary = Color(0xFF4A6356), // Deep Moss + secondary = Color(0xFF6B6B6B), // Stone Gray + tertiary = Color(0xFF8B9A7C), // Sage Olive + primaryContainer = Color(0xFFC8D8CE), + secondaryContainer = Color(0xFFE0E0E0), + tertiaryContainer = Color(0xFFE8EFE0), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color(0xFF1D2D1A), + onPrimaryContainer = Color(0xFF0D1F15), + onSecondaryContainer = Color(0xFF1F1F1F), + onTertiaryContainer = Color(0xFF2D3A20), + error = Color(0xFFBA1A1A), + onError = Color.White, + errorContainer = Color(0xFFFFDAD6), + onErrorContainer = Color(0xFF410002), + background = Color(0xFFF8F9F6), + onBackground = Color(0xFF1A1C1A), + surface = Color(0xFFF8F9F6), + onSurface = Color(0xFF1A1C1A), + surfaceVariant = Color(0xFFD4D9D2), + onSurfaceVariant = Color(0xFF41483D), + outline = Color(0xFF71786D), + outlineVariant = Color(0xFFC1C8C1), + scrim = Color.Black, + inverseSurface = Color(0xFF2F312D), + inverseOnSurface = Color(0xFFF0F1ED), + inversePrimary = Color(0xFFB1CCB8), + surfaceDim = Color(0xFFD8DAD4), + surfaceBright = Color(0xFFF8F9F6), + surfaceContainerLowest = Color.White, + surfaceContainerLow = Color(0xFFF2F4F0), + surfaceContainer = Color(0xFFECEFEA), + surfaceContainerHigh = Color(0xFFE6E9E4), + surfaceContainerHighest = Color(0xFFE0E3DE) + ), + darkColors = ThemeColorSet( + primary = Color(0xFFB1CCB8), // Soft Moss + secondary = Color(0xFFB8B8B8), // Light Stone + tertiary = Color(0xFFD4E0C0), // Light Olive + primaryContainer = Color(0xFF354B3F), + secondaryContainer = Color(0xFF404040), + tertiaryContainer = Color(0xFF4A5235), + onPrimary = Color(0xFF0D1F15), + onSecondary = Color(0xFF1F1F1F), + onTertiary = Color(0xFF2D3A20), + onPrimaryContainer = Color(0xFFC8D8CE), + onSecondaryContainer = Color(0xFFE0E0E0), + onTertiaryContainer = Color(0xFFE8EFE0), + error = Color(0xFFFFB4AB), + onError = Color(0xFF690005), + errorContainer = Color(0xFF93000A), + onErrorContainer = Color(0xFFFFDAD6), + background = Color(0xFF1A1C1A), + onBackground = Color(0xFFE0E3DE), + surface = Color(0xFF1A1C1A), + onSurface = Color(0xFFE0E3DE), + surfaceVariant = Color(0xFF41483D), + onSurfaceVariant = Color(0xFFC1C8C1), + outline = Color(0xFF8B9187), + outlineVariant = Color(0xFF41483D), + scrim = Color.Black, + inverseSurface = Color(0xFFE0E3DE), + inverseOnSurface = Color(0xFF2F312D), + inversePrimary = Color(0xFF4A6356), + surfaceDim = Color(0xFF121411), + surfaceBright = Color(0xFF383A36), + surfaceContainerLowest = Color(0xFF0D0F0E), + surfaceContainerLow = Color(0xFF1A1C1A), + surfaceContainer = Color(0xFF1E201D), + surfaceContainerHigh = Color(0xFF282B27), + surfaceContainerHighest = Color(0xFF333631) + ) +) diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/NeonPulseTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/NeonPulseTheme.kt new file mode 100644 index 0000000..9b7fb9a --- /dev/null +++ b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/NeonPulseTheme.kt @@ -0,0 +1,85 @@ +@file:Suppress("HardCodedStringLiteral") + +package eu.gaudian.translator.ui.theme.themes + +import androidx.compose.ui.graphics.Color +import eu.gaudian.translator.ui.theme.AppTheme +import eu.gaudian.translator.ui.theme.ThemeColorSet + +val NeonPulseTheme = AppTheme( + name = "Neon Pulse", + lightColors = ThemeColorSet( + primary = Color(0xFFE91E63), // Hot Pink + secondary = Color(0xFF00BCD4), // Cyan + tertiary = Color(0xFFFFEB3B), // Bright Yellow + primaryContainer = Color(0xFFFFD6E0), + secondaryContainer = Color(0xFFB2EBF2), + tertiaryContainer = Color(0xFFFFF9C4), + onPrimary = Color.White, + onSecondary = Color(0xFF003640), + onTertiary = Color(0xFF3F3D00), + onPrimaryContainer = Color(0xFF3E001A), + onSecondaryContainer = Color(0xFF001F26), + onTertiaryContainer = Color(0xFF3D3D00), + error = Color(0xFFBA1A1A), + onError = Color.White, + errorContainer = Color(0xFFFFDAD6), + onErrorContainer = Color(0xFF410002), + background = Color(0xFFFFFBFF), + onBackground = Color(0xFF1C1B20), + surface = Color(0xFFFFFBFF), + onSurface = Color(0xFF1C1B20), + surfaceVariant = Color(0xFFF3DDE6), + onSurfaceVariant = Color(0xFF50434B), + outline = Color(0xFF84737A), + outlineVariant = Color(0xFFD8C2C9), + scrim = Color.Black, + inverseSurface = Color(0xFF343035), + inverseOnSurface = Color(0xFFF9EFF3), + inversePrimary = Color(0xFFFFB1C8), + surfaceDim = Color(0xFFE2D6DB), + surfaceBright = Color(0xFFFFFBFF), + surfaceContainerLowest = Color.White, + surfaceContainerLow = Color(0xFFFCF0F4), + surfaceContainer = Color(0xFFF6E9EE), + surfaceContainerHigh = Color(0xFFF1E3E8), + surfaceContainerHighest = Color(0xFFEBDEE3) + ), + darkColors = ThemeColorSet( + primary = Color(0xFFFFB1C8), // Soft Pink + secondary = Color(0xFF7FDBE6), // Soft Cyan + tertiary = Color(0xFFFFF176), // Soft Yellow + primaryContainer = Color(0xFFC2185B), + secondaryContainer = Color(0xFF00838F), + tertiaryContainer = Color(0xFF5A5A00), + onPrimary = Color(0xFF5E002A), + onSecondary = Color(0xFF00363D), + onTertiary = Color(0xFF3D3D00), + onPrimaryContainer = Color(0xFFFFD6E0), + onSecondaryContainer = Color(0xFFB2EBF2), + onTertiaryContainer = Color(0xFFFFF9C4), + error = Color(0xFFFFB4AB), + onError = Color(0xFF690005), + errorContainer = Color(0xFF93000A), + onErrorContainer = Color(0xFFFFDAD6), + background = Color(0xFF1C1B20), + onBackground = Color(0xFFE6E1E6), + surface = Color(0xFF1C1B20), + onSurface = Color(0xFFE6E1E6), + surfaceVariant = Color(0xFF50434B), + onSurfaceVariant = Color(0xFFD8C2C9), + outline = Color(0xFFA08C95), + outlineVariant = Color(0xFF50434B), + scrim = Color.Black, + inverseSurface = Color(0xFFE6E1E6), + inverseOnSurface = Color(0xFF343035), + inversePrimary = Color(0xFFE91E63), + surfaceDim = Color(0xFF141217), + surfaceBright = Color(0xFF3B373D), + surfaceContainerLowest = Color(0xFF0E0D12), + surfaceContainerLow = Color(0xFF1C1B20), + surfaceContainer = Color(0xFF201F24), + surfaceContainerHigh = Color(0xFF2B292F), + surfaceContainerHighest = Color(0xFF36343A) + ) +) diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SageGardenTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SageGardenTheme.kt new file mode 100644 index 0000000..ebb8350 --- /dev/null +++ b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SageGardenTheme.kt @@ -0,0 +1,85 @@ +@file:Suppress("HardCodedStringLiteral") + +package eu.gaudian.translator.ui.theme.themes + +import androidx.compose.ui.graphics.Color +import eu.gaudian.translator.ui.theme.AppTheme +import eu.gaudian.translator.ui.theme.ThemeColorSet + +val SageGardenTheme = AppTheme( + name = "Sage Garden", + lightColors = ThemeColorSet( + primary = Color(0xFF5C7A5C), // Sage Green + secondary = Color(0xFF8B7355), // Warm Brown + tertiary = Color(0xFF6B8E6B), // Moss Green + primaryContainer = Color(0xFFD4E8D4), + secondaryContainer = Color(0xFFE8DDD0), + tertiaryContainer = Color(0xFFE0F0E0), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onPrimaryContainer = Color(0xFF1A3D1A), + onSecondaryContainer = Color(0xFF2C1F0D), + onTertiaryContainer = Color(0xFF1F3D1F), + error = Color(0xFFBA1A1A), + onError = Color.White, + errorContainer = Color(0xFFFFDAD6), + onErrorContainer = Color(0xFF410002), + background = Color(0xFFFAFDF7), + onBackground = Color(0xFF1A1C19), + surface = Color(0xFFFAFDF7), + onSurface = Color(0xFF1A1C19), + surfaceVariant = Color(0xFFDCE4D7), + onSurfaceVariant = Color(0xFF41483F), + outline = Color(0xFF71786E), + outlineVariant = Color(0xFFC1C8BC), + scrim = Color.Black, + inverseSurface = Color(0xFF2F312D), + inverseOnSurface = Color(0xFFF0F1EB), + inversePrimary = Color(0xFFC4DBC4), + surfaceDim = Color(0xFFDADAD5), + surfaceBright = Color(0xFFFAFDF7), + surfaceContainerLowest = Color.White, + surfaceContainerLow = Color(0xFFF4F7F0), + surfaceContainer = Color(0xFFEEF1EA), + surfaceContainerHigh = Color(0xFFE8EBE4), + surfaceContainerHighest = Color(0xFFE2E5DE) + ), + darkColors = ThemeColorSet( + primary = Color(0xFFC4DBC4), // Soft Sage + secondary = Color(0xFFD4C4B0), // Warm Beige + tertiary = Color(0xFFB8D4B8), // Light Moss + primaryContainer = Color(0xFF445F45), + secondaryContainer = Color(0xFF5C4A3A), + tertiaryContainer = Color(0xFF3D5C3D), + onPrimary = Color(0xFF1D3D1D), + onSecondary = Color(0xFF3D2A1A), + onTertiary = Color(0xFF1D3D1D), + onPrimaryContainer = Color(0xFFD4E8D4), + onSecondaryContainer = Color(0xFFE8DDD0), + onTertiaryContainer = Color(0xFFE0F0E0), + error = Color(0xFFFFB4AB), + onError = Color(0xFF690005), + errorContainer = Color(0xFF93000A), + onErrorContainer = Color(0xFFFFDAD6), + background = Color(0xFF1A1C19), + onBackground = Color(0xFFE2E5DE), + surface = Color(0xFF1A1C19), + onSurface = Color(0xFFE2E5DE), + surfaceVariant = Color(0xFF41483F), + onSurfaceVariant = Color(0xFFC1C8BC), + outline = Color(0xFF8B9187), + outlineVariant = Color(0xFF41483F), + scrim = Color.Black, + inverseSurface = Color(0xFFE2E5DE), + inverseOnSurface = Color(0xFF2F312D), + inversePrimary = Color(0xFF5C7A5C), + surfaceDim = Color(0xFF121411), + surfaceBright = Color(0xFF383A36), + surfaceContainerLowest = Color(0xFF0F110E), + surfaceContainerLow = Color(0xFF1A1C19), + surfaceContainer = Color(0xFF1E201D), + surfaceContainerHigh = Color(0xFF282B27), + surfaceContainerHighest = Color(0xFF333631) + ) +) diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SakuraTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SakuraTheme.kt deleted file mode 100644 index cfedec2..0000000 --- a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SakuraTheme.kt +++ /dev/null @@ -1,85 +0,0 @@ -@file:Suppress("HardCodedStringLiteral") - -package eu.gaudian.translator.ui.theme.themes - -import androidx.compose.ui.graphics.Color -import eu.gaudian.translator.ui.theme.AppTheme -import eu.gaudian.translator.ui.theme.ThemeColorSet - -val SakuraTheme = AppTheme( - name = "Blossom Pink", - lightColors = ThemeColorSet( - primary = Color(0xFFB94565), - secondary = Color(0xFF755960), - tertiary = Color(0xFF805537), - primaryContainer = Color(0xFFFFD9DF), - secondaryContainer = Color(0xFFFFD9E2), - tertiaryContainer = Color(0xFFFFDCC2), - onPrimary = Color(0xFFFFFFFF), - onSecondary = Color(0xFFFFFFFF), - onTertiary = Color(0xFFFFFFFF), - onPrimaryContainer = Color(0xFF40001F), - onSecondaryContainer = Color(0xFF2B171D), - onTertiaryContainer = Color(0xFF311300), - error = Color(0xFFBA1A1A), - onError = Color(0xFFFFFFFF), - errorContainer = Color(0xFFFFDAD6), - onErrorContainer = Color(0xFF410002), - background = Color(0xFFFFF8F7), - onBackground = Color(0xFF221A1C), - surface = Color(0xFFFFF8F7), - onSurface = Color(0xFF221A1C), - surfaceVariant = Color(0xFFF2DEE1), - onSurfaceVariant = Color(0xFF514346), - outline = Color(0xFF837376), - outlineVariant = Color(0xFFD5C2C5), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFF382E30), - inverseOnSurface = Color(0xFFFDEDEF), - inversePrimary = Color(0xFFE3B9C2), - surfaceDim = Color(0xFFE8D6D8), - surfaceBright = Color(0xFFFFF8F7), - surfaceContainerLowest = Color(0xFFFFFFFF), - surfaceContainerLow = Color(0xFFFFF0F1), - surfaceContainer = Color(0xFFFCEAEF), - surfaceContainerHigh = Color(0xFFF6E4E9), - surfaceContainerHighest = Color(0xFFF1DEE4) - ), - darkColors = ThemeColorSet( - primary = Color(0xFFE3B9C2), - secondary = Color(0xFFE3BDC6), - tertiary = Color(0xFFF3BC95), - primaryContainer = Color(0xFF982C4D), - secondaryContainer = Color(0xFF5C4148), - tertiaryContainer = Color(0xFF653F22), - onPrimary = Color(0xFF581535), - onSecondary = Color(0xFF422C32), - onTertiary = Color(0xFF4A280D), - onPrimaryContainer = Color(0xFFFFD9DF), - onSecondaryContainer = Color(0xFFFFD9E2), - onTertiaryContainer = Color(0xFFFFDCC2), - error = Color(0xFFFFB4AB), - onError = Color(0xFF690005), - errorContainer = Color(0xFF93000A), - onErrorContainer = Color(0xFFFFDAD6), - background = Color(0xFF221A1C), - onBackground = Color(0xFFF1DEE4), - surface = Color(0xFF221A1C), - onSurface = Color(0xFFF1DEE4), - surfaceVariant = Color(0xFF514346), - onSurfaceVariant = Color(0xFFD5C2C5), - outline = Color(0xFF9D8C8F), - outlineVariant = Color(0xFF514346), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFFF1DEE4), - inverseOnSurface = Color(0xFF221A1C), - inversePrimary = Color(0xFFB94565), - surfaceDim = Color(0xFF191214), - surfaceBright = Color(0xFF41373A), - surfaceContainerLowest = Color(0xFF140D0F), - surfaceContainerLow = Color(0xFF221A1C), - surfaceContainer = Color(0xFF261E20), - surfaceContainerHigh = Color(0xFF31282A), - surfaceContainerHighest = Color(0xFF3C3335) - ) -) \ No newline at end of file diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SpaceOpera.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SpaceOpera.kt deleted file mode 100644 index 6dc960d..0000000 --- a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/SpaceOpera.kt +++ /dev/null @@ -1,85 +0,0 @@ -@file:Suppress("HardCodedStringLiteral") - -package eu.gaudian.translator.ui.theme.themes - -import androidx.compose.ui.graphics.Color -import eu.gaudian.translator.ui.theme.AppTheme -import eu.gaudian.translator.ui.theme.ThemeColorSet - -val SpaceTheme = AppTheme( - name = "Space Opera", - lightColors = ThemeColorSet( - primary = Color(0xFF3399FF), // Hologram Blue - secondary = Color(0xFFFFA500), // Engine Glow Orange - tertiary = Color(0xFFE0E0E0), - primaryContainer = Color(0xFFD7E8FF), - secondaryContainer = Color(0xFFFFECCF), - tertiaryContainer = Color(0xFFF0F0F0), - onPrimary = Color(0xFFFFFFFF), - onSecondary = Color(0xFF000000), - onTertiary = Color(0xFF000000), - onPrimaryContainer = Color(0xFF001D35), - onSecondaryContainer = Color(0xFF271A00), - onTertiaryContainer = Color(0xFF1F1F1F), - error = Color(0xFFBA1A1A), - onError = Color(0xFFFFFFFF), - errorContainer = Color(0xFFFFDAD6), - onErrorContainer = Color(0xFF410002), - background = Color(0xFFF8F9FA), // Cockpit White - onBackground = Color(0xFF181C20), - surface = Color(0xFFF8F9FA), - onSurface = Color(0xFF181C20), - surfaceVariant = Color(0xFFDEE3EB), - onSurfaceVariant = Color(0xFF42474E), - outline = Color(0xFF72787E), - outlineVariant = Color(0xFFC2C7CE), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFF2D3135), - inverseOnSurface = Color(0xFFF0F2F5), - inversePrimary = Color(0xFFADC6FF), - surfaceDim = Color(0xFFD9DADD), - surfaceBright = Color(0xFFF8F9FA), - surfaceContainerLowest = Color(0xFFFFFFFF), - surfaceContainerLow = Color(0xFFF2F3F5), - surfaceContainer = Color(0xFFECEEF0), - surfaceContainerHigh = Color(0xFFE6E8EA), - surfaceContainerHighest = Color(0xFFE1E3E5) - ), - darkColors = ThemeColorSet( - primary = Color(0xFFADC6FF), // Nebula Blue - secondary = Color(0xFFFFB74D), // Thruster Orange - tertiary = Color(0xFFE0E0E0), // Starlight - primaryContainer = Color(0xFF004488), - secondaryContainer = Color(0xFF664200), - tertiaryContainer = Color(0xFF424242), - onPrimary = Color(0xFF002F54), - onSecondary = Color(0xFF3F2800), - onTertiary = Color(0xFF000000), - onPrimaryContainer = Color(0xFFD7E8FF), - onSecondaryContainer = Color(0xFFFFDDBF), - onTertiaryContainer = Color(0xFFFAFAFA), - error = Color(0xFFFFB4AB), - onError = Color(0xFF690005), - errorContainer = Color(0xFF93000A), - onErrorContainer = Color(0xFFFFDAD6), - background = Color(0xFF101418), // Deep Space - onBackground = Color(0xFFE2E2E6), - surface = Color(0xFF101418), - onSurface = Color(0xFFE2E2E6), - surfaceVariant = Color(0xFF42474E), - onSurfaceVariant = Color(0xFFC2C7CE), - outline = Color(0xFF8C9198), - outlineVariant = Color(0xFF42474E), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFFE2E2E6), - inverseOnSurface = Color(0xFF181C20), - inversePrimary = Color(0xFF3399FF), - surfaceDim = Color(0xFF101418), - surfaceBright = Color(0xFF363A3F), - surfaceContainerLowest = Color(0xFF0B0F13), - surfaceContainerLow = Color(0xFF181C20), - surfaceContainer = Color(0xFF1C2024), - surfaceContainerHigh = Color(0xFF272B2F), - surfaceContainerHighest = Color(0xFF32363A) - ) -) \ No newline at end of file diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/Synthwave.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/Synthwave.kt deleted file mode 100644 index e74b931..0000000 --- a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/Synthwave.kt +++ /dev/null @@ -1,85 +0,0 @@ -@file:Suppress("HardCodedStringLiteral") - -package eu.gaudian.translator.ui.theme.themes - -import androidx.compose.ui.graphics.Color -import eu.gaudian.translator.ui.theme.AppTheme -import eu.gaudian.translator.ui.theme.ThemeColorSet - -val SynthwaveTheme = AppTheme( - name = "Synthwave '84", - lightColors = ThemeColorSet( - primary = Color(0xFFC50083), // Darker Magenta for light theme contrast - secondary = Color(0xFF006874), // Darker Teal - tertiary = Color(0xFF7A5900), - primaryContainer = Color(0xFFFFD8EC), - secondaryContainer = Color(0xFFB3F0FF), - tertiaryContainer = Color(0xFFFFE26E), - onPrimary = Color(0xFFFFFFFF), - onSecondary = Color(0xFFFFFFFF), - onTertiary = Color(0xFFFFFFFF), - onPrimaryContainer = Color(0xFF40002A), - onSecondaryContainer = Color(0xFF001F24), - onTertiaryContainer = Color(0xFF261A00), - error = Color(0xFFBA1A1A), - onError = Color(0xFFFFFFFF), - errorContainer = Color(0xFFFFDAD6), - onErrorContainer = Color(0xFF410002), - background = Color(0xFFFDF7FF), // A very light lavender/off-white - onBackground = Color(0xFF1F1A21), // Dark Purple for text - surface = Color(0xFFFDF7FF), - onSurface = Color(0xFF1F1A21), - surfaceVariant = Color(0xFFE8E0F3), - onSurfaceVariant = Color(0xFF49454E), - outline = Color(0xFF7A757E), - outlineVariant = Color(0xFFCBC4CE), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFF342F36), - inverseOnSurface = Color(0xFFF5EFF7), - inversePrimary = Color(0xFFF475CB), // The vibrant pink from dark theme - surfaceDim = Color(0xFFE0D8E2), - surfaceBright = Color(0xFFFDF7FF), - surfaceContainerLowest = Color(0xFFFFFFFF), - surfaceContainerLow = Color(0xFFF7F1FA), - surfaceContainer = Color(0xFFF1EBF4), - surfaceContainerHigh = Color(0xFFECE5EE), - surfaceContainerHighest = Color(0xFFE6E0E9) - ), - darkColors = ThemeColorSet( - primary = Color(0xFFF475CB), // Vibrant Magenta - secondary = Color(0xFF6AD9E8), // Electric Cyan - tertiary = Color(0xFFFFD400), // Sunset Yellow - primaryContainer = Color(0xFF660044), - secondaryContainer = Color(0xFF005A66), - tertiaryContainer = Color(0xFF665500), - onPrimary = Color(0xFF50003A), - onSecondary = Color(0xFF00363D), - onTertiary = Color(0xFF352D00), - onPrimaryContainer = Color(0xFFFFD8EC), - onSecondaryContainer = Color(0xFFB3F0FF), - onTertiaryContainer = Color(0xFFFFE26E), - error = Color(0xFFFFB4AB), - onError = Color(0xFF690005), - errorContainer = Color(0xFF93000A), - onErrorContainer = Color(0xFFFFDAD6), - background = Color(0xFF1A103C), // Deep Indigo - onBackground = Color(0xFFE0E5FF), // Pale Lavender Text - surface = Color(0xFF1A103C), - onSurface = Color(0xFFE0E5FF), - surfaceVariant = Color(0xFF49454E), - onSurfaceVariant = Color(0xFFCBC4CE), - outline = Color(0xFF948F99), - outlineVariant = Color(0xFF49454E), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFFE6E0E9), - inverseOnSurface = Color(0xFF342F36), - inversePrimary = Color(0xFFC50083), - surfaceDim = Color(0xFF151218), - surfaceBright = Color(0xFF3C383E), - surfaceContainerLowest = Color(0xFF100D13), - surfaceContainerLow = Color(0xFF1F1A21), - surfaceContainer = Color(0xFF231E25), - surfaceContainerHigh = Color(0xFF2E292F), - surfaceContainerHighest = Color(0xFF39333A) - ) -) \ No newline at end of file diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/TerracottaEarthTheme.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/TerracottaEarthTheme.kt new file mode 100644 index 0000000..2f723b0 --- /dev/null +++ b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/TerracottaEarthTheme.kt @@ -0,0 +1,85 @@ +@file:Suppress("HardCodedStringLiteral") + +package eu.gaudian.translator.ui.theme.themes + +import androidx.compose.ui.graphics.Color +import eu.gaudian.translator.ui.theme.AppTheme +import eu.gaudian.translator.ui.theme.ThemeColorSet + +val TerracottaEarthTheme = AppTheme( + name = "Terracotta Earth", + lightColors = ThemeColorSet( + primary = Color(0xFFB85C38), // Terracotta + secondary = Color(0xFF8B7355), // Warm Sand + tertiary = Color(0xFF6B8E6B), // Muted Olive + primaryContainer = Color(0xFFFFDCC8), + secondaryContainer = Color(0xFFEDE0D0), + tertiaryContainer = Color(0xFFE0F0E0), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onPrimaryContainer = Color(0xFF3D1700), + onSecondaryContainer = Color(0xFF2C1F0D), + onTertiaryContainer = Color(0xFF1F3D1F), + error = Color(0xFFBA1A1A), + onError = Color.White, + errorContainer = Color(0xFFFFDAD6), + onErrorContainer = Color(0xFF410002), + background = Color(0xFFFFFBF8), + onBackground = Color(0xFF231917), + surface = Color(0xFFFFFBF8), + onSurface = Color(0xFF231917), + surfaceVariant = Color(0xFFF5E0D8), + onSurfaceVariant = Color(0xFF53433F), + outline = Color(0xFF85736E), + outlineVariant = Color(0xFFD8C2BB), + scrim = Color.Black, + inverseSurface = Color(0xFF382E2B), + inverseOnSurface = Color(0xFFFFEDE8), + inversePrimary = Color(0xFFFFB599), + surfaceDim = Color(0xFFE8D6D1), + surfaceBright = Color(0xFFFFFBF8), + surfaceContainerLowest = Color.White, + surfaceContainerLow = Color(0xFFFFF1ED), + surfaceContainer = Color(0xFFFBEBE7), + surfaceContainerHigh = Color(0xFFF5E5E1), + surfaceContainerHighest = Color(0xFFF0E0DB) + ), + darkColors = ThemeColorSet( + primary = Color(0xFFFFB599), // Soft Peach + secondary = Color(0xFFD4C4B0), // Warm Beige + tertiary = Color(0xFFB8D4B8), // Soft Olive + primaryContainer = Color(0xFF8B4020), + secondaryContainer = Color(0xFF5C4A3A), + tertiaryContainer = Color(0xFF3D5C3D), + onPrimary = Color(0xFF5D2A00), + onSecondary = Color(0xFF3D2A1A), + onTertiary = Color(0xFF1D3D1D), + onPrimaryContainer = Color(0xFFFFDCC8), + onSecondaryContainer = Color(0xFFEDE0D0), + onTertiaryContainer = Color(0xFFE0F0E0), + error = Color(0xFFFFB4AB), + onError = Color(0xFF690005), + errorContainer = Color(0xFF93000A), + onErrorContainer = Color(0xFFFFDAD6), + background = Color(0xFF1A110F), + onBackground = Color(0xFFF0E0DB), + surface = Color(0xFF1A110F), + onSurface = Color(0xFFF0E0DB), + surfaceVariant = Color(0xFF53433F), + onSurfaceVariant = Color(0xFFD8C2BB), + outline = Color(0xFFA08C87), + outlineVariant = Color(0xFF53433F), + scrim = Color.Black, + inverseSurface = Color(0xFFF0E0DB), + inverseOnSurface = Color(0xFF382E2B), + inversePrimary = Color(0xFFB85C38), + surfaceDim = Color(0xFF1A110F), + surfaceBright = Color(0xFF423734), + surfaceContainerLowest = Color(0xFF140C0A), + surfaceContainerLow = Color(0xFF231917), + surfaceContainer = Color(0xFF271D1B), + surfaceContainerHigh = Color(0xFF322825), + surfaceContainerHighest = Color(0xFF3D322F) + ) +) diff --git a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/ThemeTwilight.kt b/app/src/main/java/eu/gaudian/translator/ui/theme/themes/ThemeTwilight.kt deleted file mode 100644 index 446d0d5..0000000 --- a/app/src/main/java/eu/gaudian/translator/ui/theme/themes/ThemeTwilight.kt +++ /dev/null @@ -1,85 +0,0 @@ -@file:Suppress("HardCodedStringLiteral") - -package eu.gaudian.translator.ui.theme.themes - -import androidx.compose.ui.graphics.Color -import eu.gaudian.translator.ui.theme.AppTheme -import eu.gaudian.translator.ui.theme.ThemeColorSet - -val TwilightSerenityTheme = AppTheme( - name = "Twilight Serenity", - lightColors = ThemeColorSet( - primary = Color(0xFF5A52A5), - secondary = Color(0xFF9A4555), - tertiary = Color(0xFF7A5900), - primaryContainer = Color(0xFFE2DFFF), - secondaryContainer = Color(0xFFFFD9DD), - tertiaryContainer = Color(0xFFFFDF9E), - onPrimary = Color(0xFFFFFFFF), - onSecondary = Color(0xFFFFFFFF), - onTertiary = Color(0xFFFFFFFF), - onPrimaryContainer = Color(0xFF16035F), - onSecondaryContainer = Color(0xFF400014), - onTertiaryContainer = Color(0xFF261A00), - error = Color(0xFFBA1A1A), - onError = Color(0xFFFFFFFF), - errorContainer = Color(0xFFFFDAD6), - onErrorContainer = Color(0xFF410002), - background = Color(0xFFFEFBFF), - onBackground = Color(0xFF1C1B20), - surface = Color(0xFFFEFBFF), - onSurface = Color(0xFF1C1B20), - surfaceVariant = Color(0xFFE5E0EC), - onSurfaceVariant = Color(0xFF47454E), - outline = Color(0xFF78757F), - outlineVariant = Color(0xFFC8C4CF), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFF313035), - inverseOnSurface = Color(0xFFF3EFF6), - inversePrimary = Color(0xFFC1C1FF), - surfaceDim = Color(0xFFDED9E0), - surfaceBright = Color(0xFFFEFBFF), - surfaceContainerLowest = Color(0xFFFFFFFF), - surfaceContainerLow = Color(0xFFF8F2FA), - surfaceContainer = Color(0xFFF2ECF4), - surfaceContainerHigh = Color(0xFFECE7EF), - surfaceContainerHighest = Color(0xFFE6E1E9) - ), - darkColors = ThemeColorSet( - primary = Color(0xFFC1C1FF), - secondary = Color(0xFFFFB1BB), - tertiary = Color(0xFFF5BF48), - primaryContainer = Color(0xFF413A8C), - secondaryContainer = Color(0xFF7C2B3E), - tertiaryContainer = Color(0xFF5C4300), - onPrimary = Color(0xFF2C2275), - onSecondary = Color(0xFF5F1328), - onTertiary = Color(0xFF402D00), - onPrimaryContainer = Color(0xFFE2DFFF), - onSecondaryContainer = Color(0xFFFFD9DD), - onTertiaryContainer = Color(0xFFFFDF9E), - error = Color(0xFFFFB4AB), - onError = Color(0xFF690005), - errorContainer = Color(0xFF93000A), - onErrorContainer = Color(0xFFFFDAD6), - background = Color(0xFF1C1B20), - onBackground = Color(0xFFE6E1E9), - surface = Color(0xFF1C1B20), - onSurface = Color(0xFFE6E1E9), - surfaceVariant = Color(0xFF47454E), - onSurfaceVariant = Color(0xFFC8C4CF), - outline = Color(0xFF928F99), - outlineVariant = Color(0xFF47454E), - scrim = Color(0xFF000000), - inverseSurface = Color(0xFFE6E1E9), - inverseOnSurface = Color(0xFF313035), - inversePrimary = Color(0xFF5A52A5), - surfaceDim = Color(0xFF141317), - surfaceBright = Color(0xFF3A383E), - surfaceContainerLowest = Color(0xFF0F0E12), - surfaceContainerLow = Color(0xFF1C1B20), - surfaceContainer = Color(0xFF201F24), - surfaceContainerHigh = Color(0xFF2B292F), - surfaceContainerHighest = Color(0xFF36343A) - ) -) \ No newline at end of file