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

UI: minor color palette changes; emphasize the bottom bar FABs; fix Settings Screen menu item label

This commit is contained in:
Han Yin 2025-09-12 12:07:44 -07:00
parent 2223c54cc6
commit 83abff8a64
9 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/llama.android/app/src/main/java/com/example/llama/MainActivity.kt
View File

@ -577,7 +577,7 @@ fun AppContent(
)
}
// General Settings Screen
// Settings Screen
composable(AppDestinations.SETTINGS_GENERAL_ROUTE) {
SettingsGeneralScreen(
viewModel = settingsViewModel

12
examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/NavigationDrawer.kt
View File

@ -145,19 +145,9 @@ private fun DrawerContent(
}
)
// Spacer(modifier = Modifier.height(24.dp))
// TODO-han.yin: add back once we add more features
// // Settings Group
// Text(
// text = "Settings",
// style = MaterialTheme.typography.labelMedium,
// color = MaterialTheme.colorScheme.onSurfaceVariant,
// modifier = Modifier.padding(start = 8.dp, bottom = 8.dp)
// )
DrawerNavigationItem(
icon = Icons.Default.Settings,
label = "General Settings",
label = "Settings",
isSelected = currentRoute == AppDestinations.SETTINGS_GENERAL_ROUTE,
onClick = { onNavigate { navigationActions.navigateToSettingsGeneral() } }
)

5
examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/bottombar/BenchmarkBottomBar.kt
View File

@ -64,7 +64,10 @@ fun BenchmarkBottomBar(
enter = scaleIn() + fadeIn(),
exit = scaleOut() + fadeOut()
) {
FloatingActionButton(onClick = onShare) {
FloatingActionButton(
onClick = onShare,
containerColor = MaterialTheme.colorScheme.primary,
) {
Icon(
imageVector = Icons.Default.Share,
contentDescription = "Share the benchmark results"

2
examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/bottombar/ConversationBottomBar.kt
View File

@ -32,7 +32,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp
import com.example.llama.APP_NAME
@Composable
fun ConversationBottomBar(
@ -123,6 +122,7 @@ fun ConversationBottomBar(
floatingActionButton = {
FloatingActionButton(
onClick = { if (isReady) { onSendClick() } },
containerColor = MaterialTheme.colorScheme.primary,
) {
if (isReady) {
Icon(

3
examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/bottombar/ModelsBrowsingBottomBar.kt
View File

@ -208,10 +208,11 @@ fun ModelsBrowsingBottomBar(
runActionConfig.onClickRun(it)
}
},
containerColor = MaterialTheme.colorScheme.primary,
) {
Icon(
imageVector = Icons.Default.PlayArrow,
contentDescription = "Run with selected model"
contentDescription = "Run with selected model",
)
}
}

1
examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/bottombar/ModelsManagementBottomBar.kt
View File

@ -193,6 +193,7 @@ fun ModelsManagementBottomBar(
) {
FloatingActionButton(
onClick = { importingConfig.toggleMenu(true) },
containerColor = MaterialTheme.colorScheme.primary,
) {
Icon(
imageVector = Icons.Default.Add,

2
examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/bottombar/ModelsSearchingBottomBar.kt
View File

@ -15,6 +15,7 @@ import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@Composable
@ -55,6 +56,7 @@ fun ModelsSearchingBottomBar(
runActionConfig.onClickRun(it)
}
},
containerColor = MaterialTheme.colorScheme.primary,
) {
Icon(
imageVector = Icons.Default.PlayArrow,

3
examples/llama.android/app/src/main/java/com/example/llama/ui/scaffold/topbar/DefaultTopBar.kt
View File

@ -7,6 +7,7 @@ import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
@ -19,7 +20,7 @@ import androidx.compose.ui.graphics.Color
fun DefaultTopBar(
title: String,
titleColor: Color = Color.Unspecified,
navigationIconTint: Color = Color.Unspecified,
navigationIconTint: Color = LocalContentColor.current,
onNavigateBack: (() -> Unit)? = null,
onQuit: (() -> Unit)? = null,
onMenuOpen: (() -> Unit)? = null

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

@ -10,14 +10,14 @@ val md_theme_light_primaryContainer = Color(0xFFD0DEF6)
val md_theme_light_onPrimaryContainer = Color(0xFF1F2227)
val md_theme_light_inversePrimary = Color(0xFFD0DEF6)
val md_theme_light_secondary = Color(0xFFFCFCFC)
val md_theme_light_onSecondary = Color(0xFF1F2227)
val md_theme_light_secondaryContainer = Color(0xFFDFE1E7)
val md_theme_light_onSecondaryContainer = Color(0xFF1F2227)
val md_theme_light_secondary = Color(0xFFE0BBFF)
val md_theme_light_onSecondary = Color(0xFF1F1A2A)
val md_theme_light_secondaryContainer = Color(0xFFF2DDFF)
val md_theme_light_onSecondaryContainer = Color(0xFF2A183F)
val md_theme_light_tertiary = Color(0xFF5613CD)
val md_theme_light_onTertiary = Color(0xFFFCFCFC)
val md_theme_light_tertiaryContainer = Color(0xFFD7D6F7)
val md_theme_light_tertiary = Color(0xFFFCFC00)
val md_theme_light_onTertiary = Color(0xFF1F2227)
val md_theme_light_tertiaryContainer = Color(0xFFEEEEAA)
val md_theme_light_onTertiaryContainer = Color(0xFF1F2227)
val md_theme_light_background = Color(0xFFFCFCFC)
@ -41,11 +41,11 @@ val md_theme_light_scrim = Color(0xFF000000)
val md_theme_light_surfaceBright = Color(0xFFD0DEF6)
val md_theme_light_surfaceContainer = Color(0xFFDFE1E7)
val md_theme_light_surfaceContainerHigh = Color(0xFFD4D7DF)
val md_theme_light_surfaceContainerHighest = Color(0xFFC6CAD5)
val md_theme_light_surfaceContainerLow = Color(0xFFE9EBEF)
val md_theme_light_surfaceContainerLowest = Color(0xFFF0F2F4)
val md_theme_light_surfaceContainerHighest = Color(0xFFDDE1E8)
val md_theme_light_surfaceContainerHigh = Color(0xFFE5E8ED)
val md_theme_light_surfaceContainer = Color(0xFFEBEDF1)
val md_theme_light_surfaceContainerLow = Color(0xFFF2F4F6)
val md_theme_light_surfaceContainerLowest = Color(0xFFF7F8F9)
val md_theme_light_surfaceDim = Color(0xFFB8BECB)
val md_theme_light_primaryFixed = Color(0xFF0747C9)