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

nit: polish ModelLoadingScreen UI

This commit is contained in:
Han Yin 2025-04-18 15:38:15 -07:00
parent 1d508f367e
commit f313362ced
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
examples/llama.android/app/src/main/java/com/example/llama/revamp/ui/screens/ModelLoadingScreen.kt
View File

@ -62,8 +62,8 @@ enum class Mode {
CONVERSATION CONVERSATION
} }
enum class SystemPromptTab { enum class SystemPromptTab(val label: String) {
PRESETS, CUSTOM, RECENTS PRESETS("Presets"), CUSTOM("Custom"), RECENTS("Recents")
} }
@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@ -106,9 +106,7 @@ fun ModelLoadingScreen(
} }
// Check if we're in a loading state // Check if we're in a loading state
val isLoading = engineState !is State.Uninitialized && val isLoading = engineState !is State.Initialized && engineState !is State.ModelReady
engineState !is State.Initialized &&
engineState !is State.ModelReady
// Mode selection callbacks // Mode selection callbacks
val handleBenchmarkSelected = { val handleBenchmarkSelected = {
@ -348,9 +346,9 @@ fun ModelLoadingScreen(
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))
Text( Text(
text = when (engineState) { text = when (engineState) {
is State.Initializing, State.Initialized -> "Initializing..."
is State.LoadingModel -> "Loading model..." is State.LoadingModel -> "Loading model..."
is State.ProcessingSystemPrompt -> "Processing system prompt..." is State.ProcessingSystemPrompt -> "Processing system prompt..."
is State.ModelReady -> "Preparing conversation..."
else -> "Processing..." else -> "Processing..."
}, },
style = MaterialTheme.typography.titleMedium style = MaterialTheme.typography.titleMedium
@ -394,15 +392,7 @@ private fun SystemPromptTabSelector(
) )
} }
}, },
label = { label = { Text(tab.label) }
Text(
when (tab) {
SystemPromptTab.PRESETS -> "Presets"
SystemPromptTab.CUSTOM -> "Custom"
SystemPromptTab.RECENTS -> "Recents"
}
)
}
) )
} }
} }