Messing with colors.

This commit is contained in:
2026-08-30 18:01:36 +09:00
parent 0fba9434e6
commit fdbae309cf
5 changed files with 15 additions and 11 deletions
@@ -373,8 +373,8 @@ fun DashboardScreen(
) {
ActionCircle(
text = stringResource(R.string.send_action),
containerColor = MaterialTheme.colorScheme.secondary,
contentColor = MaterialTheme.colorScheme.onSecondary,
containerColor = MaterialTheme.colorScheme.tertiary,
contentColor = MaterialTheme.colorScheme.onTertiary,
onClick = onSend,
)
ActionCircle(
@@ -385,8 +385,8 @@ fun DashboardScreen(
)
ActionCircle(
text = stringResource(R.string.receive_action),
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
containerColor = MaterialTheme.colorScheme.tertiary,
contentColor = MaterialTheme.colorScheme.onTertiary,
onClick = onReceive,
)
}
@@ -3,14 +3,16 @@ package swiss.qpq.gajumobile.ui.theme
import androidx.compose.ui.graphics.Color
// Arboreal Dark Palette (Gajumaru Theme)
val GajuDarkBackground = Color(0xFF1B1C17) // Dark bark/olive
val GajuDarkSurface = Color(0xFF23251D)
val GajuDarkSurfaceVariant = Color(0xFF181A12)
val GajuDarkBackground = Color(0xFF0A0B08) // Deepest bark black
val GajuDarkSurface = Color(0xFF161812)
val GajuDarkSurfaceVariant = Color(0xFF12140D) // Subtle shading for frames
val GajuDarkPrimary = Color(0xFF81C784) // Fresh leaf green
val GajuDarkSecondary = Color(0xFFA1887F) // Light bark brown
val GajuDarkTertiary = Color(0xFFBDB7AB) // Light ash beige
val GajuDarkAccent = Color(0xFFD4E157) // Moss yellow-green
val GajuDarkOnPrimary = Color(0xFF003300)
val GajuDarkOnSecondary = Color(0xFF3E2723)
val GajuDarkOnTertiary = Color(0xFF1B1C17)
val GajuDarkOnBackground = Color(0xFFE3E3DC)
val GajuDarkOnSurface = Color(0xFFE3E3DC)
val GajuDarkOnSurfaceVariant = Color(0xFFC7C7BC)
@@ -21,8 +23,10 @@ val GajuLightSurface = Color(0xFFF1F1EA)
val GajuLightSurfaceVariant = Color(0xFFE3E3DC)
val GajuLightPrimary = Color(0xFF2E7D32) // Forest green
val GajuLightSecondary = Color(0xFF5D4037) // Deep wood brown
val GajuLightTertiary = Color(0xFF8E867A) // Stone ash beige
val GajuLightOnPrimary = Color(0xFFFFFFFF)
val GajuLightOnSecondary = Color(0xFFFFFFFF)
val GajuLightOnTertiary = Color(0xFF1B1C17)
val GajuLightOnBackground = Color(0xFF1B1C17)
val GajuLightOnSurface = Color(0xFF1B1C17)
val GajuLightOnSurfaceVariant = Color(0xFF46483C)
@@ -13,12 +13,13 @@ import androidx.core.view.WindowCompat
private val ArborealDarkColorScheme = darkColorScheme(
primary = GajuDarkPrimary,
secondary = GajuDarkSecondary,
tertiary = GajuDarkAccent,
tertiary = GajuDarkTertiary,
background = GajuDarkBackground,
surface = GajuDarkSurface,
surfaceVariant = GajuDarkSurfaceVariant,
onPrimary = GajuDarkOnPrimary,
onSecondary = GajuDarkOnSecondary,
onTertiary = GajuDarkOnTertiary,
onBackground = GajuDarkOnBackground,
onSurface = GajuDarkOnSurface,
onSurfaceVariant = GajuDarkOnSurfaceVariant,
@@ -27,11 +28,13 @@ private val ArborealDarkColorScheme = darkColorScheme(
private val ArborealLightColorScheme = lightColorScheme(
primary = GajuLightPrimary,
secondary = GajuLightSecondary,
tertiary = GajuLightTertiary,
background = GajuLightBackground,
surface = GajuLightSurface,
surfaceVariant = GajuLightSurfaceVariant,
onPrimary = GajuLightOnPrimary,
onSecondary = GajuLightOnSecondary,
onTertiary = GajuLightOnTertiary,
onBackground = GajuLightOnBackground,
onSurface = GajuLightOnSurface,
onSurfaceVariant = GajuLightOnSurfaceVariant,
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.GajuMobile" parent="android:Theme.Material.NoActionBar" />
<style name="Theme.App.Starting" parent="Theme.SplashScreen">
<item name="windowSplashScreenAnimatedIcon">@drawable/gajumobile_colored_splash</item>
<item name="windowSplashScreenBackground">@color/splash_background</item>
-2
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.GajuMobile" parent="android:Theme.Material.Light.NoActionBar" />
<style name="Theme.App.Starting" parent="Theme.SplashScreen">
<item name="windowSplashScreenAnimatedIcon">@drawable/gajumobile_colored_splash</item>
<item name="windowSplashScreenBackground">@color/splash_background</item>