happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: update Arm color palette from Philip.Watson3

This commit is contained in:
Han Yin 2025-09-02 08:20:34 -07:00
parent 8268d70518
commit 2b70887725
3 changed files with 52 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/llama.android/app/src/main/java/com/example/llama/ui/screens/SettingsGeneralScreen.kt
View File

@ -100,6 +100,7 @@ fun SettingsGeneralScreen(
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) { ) {
SegmentedButton( SegmentedButton(
modifier = Modifier.weight(3f),
selected = colorThemeMode == UserPreferences.COLOR_THEME_MODE_ARM, selected = colorThemeMode == UserPreferences.COLOR_THEME_MODE_ARM,
onClick = { viewModel.setColorThemeMode(UserPreferences.COLOR_THEME_MODE_ARM) }, onClick = { viewModel.setColorThemeMode(UserPreferences.COLOR_THEME_MODE_ARM) },
shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2) shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2)
@ -108,11 +109,12 @@ fun SettingsGeneralScreen(
} }
SegmentedButton( SegmentedButton(
modifier = Modifier.weight(4f),
selected = colorThemeMode == UserPreferences.COLOR_THEME_MODE_MATERIAL, selected = colorThemeMode == UserPreferences.COLOR_THEME_MODE_MATERIAL,
onClick = { viewModel.setColorThemeMode(UserPreferences.COLOR_THEME_MODE_MATERIAL) }, onClick = { viewModel.setColorThemeMode(UserPreferences.COLOR_THEME_MODE_MATERIAL) },
shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2) shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2)
) { ) {
Text("Material") Text("Material Design")
} }
} }

109
examples/llama.android/app/src/main/java/com/example/llama/ui/theme/Color.kt
View File

@ -1,151 +1,124 @@
package com.example.llama.ui.theme package com.example.llama.ui.theme
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
// --- Light Theme Colors --- // --- Light Theme Colors ---
val md_theme_light_primary = Color(0xFF0747C9) val md_theme_light_primary = Color(0xFF0747C9)
val md_theme_light_onPrimary = Color(0xFFCFCFCF) val md_theme_light_onPrimary = Color(0xFFFCFCFC)
val md_theme_light_primaryContainer = Color(0xFFD0DEF6) val md_theme_light_primaryContainer = Color(0xFFD0DEF6)
val md_theme_light_onPrimaryContainer = Color(0xFF1F2227) val md_theme_light_onPrimaryContainer = Color(0xFF1F2227)
val md_theme_light_inversePrimary = Color(0xFFD0DEF6) val md_theme_light_inversePrimary = Color(0xFFD0DEF6)
// NOT-USED: val md_theme_light_primaryDim = Color(0xFF031E59)
// NOT-USED: val md_theme_light_onPrimaryDim = Color(0xFFCFCFCF)
val md_theme_light_secondary = Color(0xFFCFCFCF) val md_theme_light_secondary = Color(0xFFFCFCFC)
val md_theme_light_onSecondary = Color(0xFF1F2227) val md_theme_light_onSecondary = Color(0xFF1F2227)
val md_theme_light_secondaryContainer = Color(0xFFDFE1E7) val md_theme_light_secondaryContainer = Color(0xFFDFE1E7)
val md_theme_light_onSecondaryContainer = Color(0xFF1F2227) val md_theme_light_onSecondaryContainer = Color(0xFF1F2227)
// NOT-USED: val md_theme_light_secondaryDim = Color(0xFF93B7F8)
// NOT-USED: val md_theme_light_onSecondaryDim = Color(0xFF1F2227)
val md_theme_light_tertiary = Color(0xFF5613CD) val md_theme_light_tertiary = Color(0xFF5613CD)
val md_theme_light_onTertiary = Color(0xFFCFCFCF) val md_theme_light_onTertiary = Color(0xFFFCFCFC)
val md_theme_light_tertiaryContainer = Color(0xFFD7D6F7) val md_theme_light_tertiaryContainer = Color(0xFFD7D6F7)
val md_theme_light_onTertiaryContainer = Color(0xFF1F2227) val md_theme_light_onTertiaryContainer = Color(0xFF1F2227)
// NOT-USED: val md_theme_light_tertiaryDim = Color(0xFF220857)
// NOT-USED: val md_theme_light_onTertiaryDim = Color(0xFFCFCFCF)
val md_theme_light_background = Color(0xFFCFCFCF) val md_theme_light_background = Color(0xFFFCFCFC)
val md_theme_light_onBackground = Color(0xFF1F2227) val md_theme_light_onBackground = Color(0xFF1F2227)
val md_theme_light_surface = Color(0xFFCFCFCF) val md_theme_light_surface = Color(0xFFFCFCFC)
val md_theme_light_onSurface = Color(0xFF1F2227) val md_theme_light_onSurface = Color(0xFF1F2227)
val md_theme_light_surfaceVariant = Color(0xFFD0DEF6) val md_theme_light_surfaceVariant = Color(0xFFD0DEF6)
val md_theme_light_onSurfaceVariant = Color(0xFF1F2227) val md_theme_light_onSurfaceVariant = Color(0xFF1F2227)
val md_theme_light_surfaceTint = Color(0xFFDFE1E7) val md_theme_light_surfaceTint = Color(0xFFDFE1E7)
val md_theme_light_inverseSurface = Color(0xFF737A8B) val md_theme_light_inverseSurface = Color(0xFF737A8B)
val md_theme_light_inverseOnSurface = Color(0xFFCFCFCF) val md_theme_light_inverseOnSurface = Color(0xFFFCFCFC)
val md_theme_light_error = Color(0xFF8F0D11) val md_theme_light_error = Color(0xFF8F0D11)
val md_theme_light_onError = Color(0xFFCFCFCF) val md_theme_light_onError = Color(0xFFFCFCFC)
val md_theme_light_errorContainer = Color(0xFFF5C8C3) val md_theme_light_errorContainer = Color(0xFFF5C8C3)
val md_theme_light_onErrorContainer = Color(0xFF1F2227) val md_theme_light_onErrorContainer = Color(0xFF1F2227)
// NOT-USED: val md_theme_light_errorDim = Color(0xFF390506)
// NOT-USED: val md_theme_light_onErrorDim = Color(0xFFCFCFCF)
val md_theme_light_outline = Color(0xFFDFE1E7) val md_theme_light_outline = Color(0xFF40454F)
val md_theme_light_outlineVariant = Color(0xFF9BA1B2) val md_theme_light_outlineVariant = Color(0xFF8A92A5)
val md_theme_light_scrim = Color(0xFF000000) val md_theme_light_scrim = Color(0xFF000000)
// NOT-USED: val md_theme_light_shadow = Color(0x99030304)
// TODO: md_theme_light_surfaceBright val md_theme_light_surfaceBright = Color(0xFFD0DEF6)
val md_theme_light_surfaceContainer = Color(0xFFF0F2F4) val md_theme_light_surfaceContainer = Color(0xFFDFE1E7)
// NOT-USED: val md_theme_light_onSurfaceContainer = Color(0xFF1F2227) val md_theme_light_surfaceContainerHigh = Color(0xFFD4D7DF)
val md_theme_light_surfaceContainerHigh = Color(0xFFDFE1E7) val md_theme_light_surfaceContainerHighest = Color(0xFFC6CAD5)
// NOT-USED: val md_theme_light_onSurfaceContainerHigh = Color(0xFF1F2227)
// TODO: md_theme_light_surfaceContainerHighest
val md_theme_light_surfaceContainerLow = Color(0xFFE9EBEF) val md_theme_light_surfaceContainerLow = Color(0xFFE9EBEF)
// NOT-USED: val md_theme_light_onSurfaceContainerLow = Color(0xFF1F2227) val md_theme_light_surfaceContainerLowest = Color(0xFFF0F2F4)
// TODO: md_theme_light_surfaceContainerLowest val md_theme_light_surfaceDim = Color(0xFFB8BECB)
// TODO: md_theme_light_surfaceDim
val md_theme_light_primaryFixed = Color(0xFF0747C9) val md_theme_light_primaryFixed = Color(0xFF0747C9)
val md_theme_light_primaryFixedDim = Color(0xFF04359B) val md_theme_light_primaryFixedDim = Color(0xFF04359B)
val md_theme_light_onPrimaryFixed = Color(0xFFCFCFCF) val md_theme_light_onPrimaryFixed = Color(0xFFFCFCFC)
val md_theme_light_onPrimaryFixedVariant = Color(0xFF2F333B) val md_theme_light_onPrimaryFixedVariant = Color(0xFF2F333B)
val md_theme_light_secondaryFixed = Color(0xFFCFCFCF) val md_theme_light_secondaryFixed = Color(0xFFFCFCFC)
val md_theme_light_secondaryFixedDim = Color(0xFFE9EBEF) val md_theme_light_secondaryFixedDim = Color(0xFFE9EBEF)
val md_theme_light_onSecondaryFixed = Color(0xFF1F2227) val md_theme_light_onSecondaryFixed = Color(0xFF1F2227)
val md_theme_light_onSecondaryFixedVariant = Color(0xFF2F333B) val md_theme_light_onSecondaryFixedVariant = Color(0xFF2F333B)
val md_theme_light_tertiaryFixed = Color(0xFF5613CD) val md_theme_light_tertiaryFixed = Color(0xFF5613CD)
val md_theme_light_tertiaryFixedDim = Color(0xFF220857) val md_theme_light_tertiaryFixedDim = Color(0xFF220857)
val md_theme_light_onTertiaryFixed = Color(0xFFCFCFCF) val md_theme_light_onTertiaryFixed = Color(0xFFFCFCFC)
val md_theme_light_onTertiaryFixedVariant = Color(0xFFDFE1E7) val md_theme_light_onTertiaryFixedVariant = Color(0xFFDFE1E7)
// --- Dark Theme Colors --- // --- Dark Theme Colors ---
val md_theme_dark_primary = Color(0xFF0747C9) val md_theme_dark_primary = Color(0xFF0747C9)
val md_theme_dark_onPrimary = Color(0xFFCFCFCF) val md_theme_dark_onPrimary = Color(0xFFFCFCFC)
val md_theme_dark_primaryContainer = Color(0xFF020D2B) val md_theme_dark_primaryContainer = Color(0xFF020D2B)
val md_theme_dark_onPrimaryContainer = Color(0xFFCFCFCF) val md_theme_dark_onPrimaryContainer = Color(0xFFFCFCFC)
val md_theme_dark_inversePrimary = Color(0xFF020D2B) val md_theme_dark_inversePrimary = Color(0xFF020D2B)
// NOT-USED: val md_theme_dark_primaryDim = Color(0xFF031E59)
// NOT-USED: val md_theme_dark_onPrimaryDim = Color(0xFFCFCFCF)
val md_theme_dark_secondary = Color(0xFF1F2227) val md_theme_dark_secondary = Color(0xFF1F2227)
val md_theme_dark_onSecondary = Color(0xFFCFCFCF) val md_theme_dark_onSecondary = Color(0xFFFCFCFC)
val md_theme_dark_secondaryContainer = Color(0xFF2F333B) val md_theme_dark_secondaryContainer = Color(0xFF2F333B)
val md_theme_dark_onSecondaryContainer = Color(0xFFCFCFCF) val md_theme_dark_onSecondaryContainer = Color(0xFFFCFCFC)
// NOT-USED: val md_theme_dark_secondaryDim = Color(0xFF031E59)
// NOT-USED: val md_theme_dark_onSecondaryDim = Color(0xFFCFCFCF)
val md_theme_dark_tertiary = Color(0xFF5613CD) val md_theme_dark_tertiary = Color(0xFF5613CD)
val md_theme_dark_onTertiary = Color(0xFFCFCFCF) val md_theme_dark_onTertiary = Color(0xFFFCFCFC)
val md_theme_dark_tertiaryContainer = Color(0xFF0F0429) val md_theme_dark_tertiaryContainer = Color(0xFF0F0429)
val md_theme_dark_onTertiaryContainer = Color(0xFFCFCFCF) val md_theme_dark_onTertiaryContainer = Color(0xFFFCFCFC)
// NOT-USED: val md_theme_dark_tertiaryDim = Color(0xFF220857)
// NOT-USED: val md_theme_dark_onTertiaryDim = Color(0xFFCFCFCF)
val md_theme_dark_background = Color(0xFF0F1216) val md_theme_dark_background = Color(0xFF0F1216)
val md_theme_dark_onBackground = Color(0xFFCFCFCF) val md_theme_dark_onBackground = Color(0xFFFCFCFC)
val md_theme_dark_surface = Color(0xFF0F1216) val md_theme_dark_surface = Color(0xFF0F1216)
val md_theme_dark_onSurface = Color(0xFFCFCFCF) val md_theme_dark_onSurface = Color(0xFFFCFCFC)
val md_theme_dark_surfaceVariant = Color(0xFF020D2B) val md_theme_dark_surfaceVariant = Color(0xFF020D2B)
val md_theme_dark_onSurfaceVariant = Color(0xFFCFCFCF) val md_theme_dark_onSurfaceVariant = Color(0xFFFCFCFC)
val md_theme_dark_surfaceTint = Color(0xFF2F333B) val md_theme_dark_surfaceTint = Color(0xFF2F333B)
val md_theme_dark_inverseSurface = Color(0xFF8A92A5) val md_theme_dark_inverseSurface = Color(0xFF8A92A5)
val md_theme_dark_inverseOnSurface = Color(0xFFCFCFCF) val md_theme_dark_inverseOnSurface = Color(0xFFFCFCFC)
val md_theme_dark_error = Color(0xFF8F0D11) val md_theme_dark_error = Color(0xFF8F0D11)
val md_theme_dark_onError = Color(0xFFCFCFCF) val md_theme_dark_onError = Color(0xFFFCFCFC)
val md_theme_dark_errorContainer = Color(0xFF180203) val md_theme_dark_errorContainer = Color(0xFF180203)
val md_theme_dark_onErrorContainer = Color(0xFFCFCFCF) val md_theme_dark_onErrorContainer = Color(0xFFFCFCFC)
// NOT-USED: val md_theme_dark_errorDim = Color(0xFF390506)
// NOT-USED: val md_theme_dark_onErrorDim = Color(0xFFCFCFCF)
val md_theme_dark_outline = Color(0xFF40454F) val md_theme_dark_outline = Color(0xFFDFE1E7)
val md_theme_dark_outlineVariant = Color(0xFF8A92A5) val md_theme_dark_outlineVariant = Color(0xFF9BA1B2)
val md_theme_dark_scrim = Color(0xFF000000) val md_theme_dark_scrim = Color(0xFF000000)
// NOT-USED: val md_theme_dark_shadow = Color(0xFF2F333B)
// TODO: md_theme_dark_surfaceBright val md_theme_dark_surfaceBright = Color(0xFF020D2B)
val md_theme_dark_surfaceContainer = Color(0xFF030304) val md_theme_dark_surfaceContainer = Color(0xFF2F333B)
// NOT-USED: val md_theme_dark_onSurfaceContainer = Color(0xFFFCFCFC)
val md_theme_dark_surfaceContainerLow = Color(0xFF1F2227) val md_theme_dark_surfaceContainerLow = Color(0xFF1F2227)
// NOT-USED: val md_theme_dark_onSurfaceContainerLow = Color(0xFFFCFCFC) val md_theme_dark_surfaceContainerHighest = Color(0xFF505562)
// TODO: md_theme_dark_surfaceContainerHighest val md_theme_dark_surfaceContainerHigh = Color(0xFF40454F)
val md_theme_dark_surfaceContainerHigh = Color(0xFF2F333B) val md_theme_dark_surfaceContainerLowest = Color(0xFF0F1216)
// NOT-USED: val md_theme_dark_onSurfaceContainerHigh = Color(0xFFCFCFCF) val md_theme_dark_surfaceDim = Color(0xFF626977)
// TODO: md_theme_dark_surfaceContainerLowest
// TODO: md_theme_dark_surfaceDim
val md_theme_dark_primaryFixed = Color(0xFF0747C9) val md_theme_dark_primaryFixed = Color(0xFF0747C9)
val md_theme_dark_primaryFixedDim = Color(0xFF04359B) val md_theme_dark_primaryFixedDim = Color(0xFF04359B)
val md_theme_dark_onPrimaryFixed = Color(0xFFCFCFCF) val md_theme_dark_onPrimaryFixed = Color(0xFFFCFCFC)
val md_theme_dark_onPrimaryFixedVariant = Color(0xFFDFE1E7) val md_theme_dark_onPrimaryFixedVariant = Color(0xFFDFE1E7)
val md_theme_dark_secondaryFixed = Color(0xFF1F2227) val md_theme_dark_secondaryFixed = Color(0xFF1F2227)
val md_theme_dark_secondaryFixedDim = Color(0xFF40454F) val md_theme_dark_secondaryFixedDim = Color(0xFF40454F)
val md_theme_dark_onSecondaryFixed = Color(0xFFCFCFCF) val md_theme_dark_onSecondaryFixed = Color(0xFFFCFCFC)
val md_theme_dark_onSecondaryFixedVariant = Color(0xFFDFE1E7) val md_theme_dark_onSecondaryFixedVariant = Color(0xFFDFE1E7)
val md_theme_dark_tertiaryFixed = Color(0xFF5613CD) val md_theme_dark_tertiaryFixed = Color(0xFF5613CD)
val md_theme_dark_tertiaryFixedDim = Color(0xFF220857) val md_theme_dark_tertiaryFixedDim = Color(0xFF220857)
val md_theme_dark_onTertiaryFixed = Color(0xFFCFCFCF) val md_theme_dark_onTertiaryFixed = Color(0xFFFCFCFC)
val md_theme_dark_onTertiaryFixedVariant = Color(0xFFDFE1E7) val md_theme_dark_onTertiaryFixedVariant = Color(0xFFDFE1E7)

16
examples/llama.android/app/src/main/java/com/example/llama/ui/theme/Theme.kt
View File

@ -56,13 +56,13 @@ internal val armLightColorScheme: ColorScheme = lightColorScheme(
outlineVariant = md_theme_light_outlineVariant, outlineVariant = md_theme_light_outlineVariant,
scrim = md_theme_light_scrim, scrim = md_theme_light_scrim,
// TODO: surfaceBright = md_theme_light_surfaceBright, surfaceBright = md_theme_light_surfaceBright,
surfaceContainer = md_theme_light_surfaceContainer, surfaceContainer = md_theme_light_surfaceContainer,
surfaceContainerHigh = md_theme_light_surfaceContainerHigh, surfaceContainerHigh = md_theme_light_surfaceContainerHigh,
// TODO: surfaceContainerHighest = md_theme_light_surfaceContainerHighest, surfaceContainerHighest = md_theme_light_surfaceContainerHighest,
surfaceContainerLow = md_theme_light_surfaceContainerLow, surfaceContainerLow = md_theme_light_surfaceContainerLow,
// TODO: surfaceContainerLowest = md_theme_light_surfaceContainerLowest, surfaceContainerLowest = md_theme_light_surfaceContainerLowest,
// TODO: surfaceDim = md_theme_light_surfaceDim, surfaceDim = md_theme_light_surfaceDim,
primaryFixed = md_theme_light_primaryFixed, primaryFixed = md_theme_light_primaryFixed,
primaryFixedDim = md_theme_light_primaryFixedDim, primaryFixedDim = md_theme_light_primaryFixedDim,
@ -117,13 +117,13 @@ internal val armDarkColorScheme: ColorScheme = darkColorScheme(
outlineVariant = md_theme_dark_outlineVariant, outlineVariant = md_theme_dark_outlineVariant,
scrim = md_theme_dark_scrim, scrim = md_theme_dark_scrim,
// TODO: surfaceBright = md_theme_dark_surfaceBright, surfaceBright = md_theme_dark_surfaceBright,
surfaceContainer = md_theme_dark_surfaceContainer, surfaceContainer = md_theme_dark_surfaceContainer,
surfaceContainerHigh = md_theme_dark_surfaceContainerHigh, surfaceContainerHigh = md_theme_dark_surfaceContainerHigh,
// TODO: surfaceContainerHighest = md_theme_dark_surfaceContainerHighest, surfaceContainerHighest = md_theme_dark_surfaceContainerHighest,
surfaceContainerLow = md_theme_dark_surfaceContainerLow, surfaceContainerLow = md_theme_dark_surfaceContainerLow,
// TODO: surfaceContainerLowest = md_theme_dark_surfaceContainerLowest, surfaceContainerLowest = md_theme_dark_surfaceContainerLowest,
// TODO: surfaceDim = md_theme_dark_surfaceDim, surfaceDim = md_theme_dark_surfaceDim,
primaryFixed = md_theme_dark_primaryFixed, primaryFixed = md_theme_dark_primaryFixed,
primaryFixedDim = md_theme_dark_primaryFixedDim, primaryFixedDim = md_theme_dark_primaryFixedDim,