chore: UI and locale improvements

TriDefender · TriDefender · commit 6430160880a4 · 2026-06-06T21:20:36.000Z
Asthetic stuff and placing stuff better to look better, core functions not touched
diff --git a/app/src/main/java/tridefender/llama/snapdragon/ui/launcher/AllConfigScreen.kt b/app/src/main/java/tridefender/llama/snapdragon/ui/launcher/AllConfigScreen.kt
@@ -11,6 +11,8 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
@@ -311,8 +313,12 @@ fun ModelSection(
                     contentDescription = null,
                     modifier = Modifier.size(18.dp)
                 )
-                Spacer(modifier = Modifier.width(6.dp))
-                Text(stringResource(R.string.hf_model_picker))
+                Spacer(modifier = Modifier.width(4.dp))
+                Text(
+                    text = stringResource(R.string.hf_model_picker),
+                    maxLines = 1,
+                    overflow = TextOverflow.Clip
+                )
             }
             Row(verticalAlignment = Alignment.CenterVertically) {
                 TextButton(onClick = onManageModels) {
@@ -321,17 +327,25 @@ fun ModelSection(
                         contentDescription = null,
                         modifier = Modifier.size(18.dp)
                     )
-                    Spacer(modifier = Modifier.width(6.dp))
-                    Text(stringResource(R.string.manage_models))
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Text(
+                        text = stringResource(R.string.manage_models),
+                        maxLines = 1,
+                        overflow = TextOverflow.Clip
+                    )
                 }
                 TextButton(onClick = onBrowseClick) {
                     Icon(
                         Icons.Default.Folder,
                         contentDescription = null,
                         modifier = Modifier.size(18.dp)
                     )
-                    Spacer(modifier = Modifier.width(6.dp))
-                    Text(stringResource(R.string.browse))
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Text(
+                        text = stringResource(R.string.browse_model),
+                        maxLines = 1,
+                        overflow = TextOverflow.Clip
+                    )
                 }
             }
         }
@@ -865,24 +879,15 @@ private fun HuggingFaceModelPickerDialog(
                 ) {
                     if (state.selectedRepoId == null) {
                         items(state.searchResults) { repo ->
-                            ListItem(
-                                headlineContent = {
-                                    Text(repo.modelId, maxLines = 1, overflow = TextOverflow.Ellipsis)
-                                },
-                                supportingContent = {
-                                    Text(
-                                        stringResource(
-                                            R.string.hf_model_stats,
-                                            repo.downloads ?: 0,
-                                            repo.likes ?: 0
-                                        )
-                                    )
-                                },
-                                trailingContent = {
-                                    TextButton(onClick = { onRepoSelect(repo.modelId) }) {
-                                        Text(stringResource(R.string.select))
-                                    }
-                                }
+                            HfPickerCard(
+                                title = repo.modelId,
+                                subtitle = stringResource(
+                                    R.string.hf_model_stats,
+                                    repo.downloads ?: 0,
+                                    repo.likes ?: 0
+                                ),
+                                enabled = state.downloadFileName == null,
+                                onClick = { onRepoSelect(repo.modelId) }
                             )
                         }
                     } else {
@@ -892,21 +897,11 @@ private fun HuggingFaceModelPickerDialog(
                             }
                         }
                         items(state.files) { file ->
-                            ListItem(
-                                headlineContent = {
-                                    Text(file.fileName, maxLines = 1, overflow = TextOverflow.Ellipsis)
-                                },
-                                supportingContent = {
-                                    Text(file.sizeBytes?.let { formatBytes(it) } ?: stringResource(R.string.unknown_size))
-                                },
-                                trailingContent = {
-                                    TextButton(
-                                        onClick = { onDownload(file) },
-                                        enabled = state.downloadFileName == null
-                                    ) {
-                                        Text(stringResource(R.string.download))
-                                    }
-                                }
+                            HfPickerCard(
+                                title = file.fileName,
+                                subtitle = file.sizeBytes?.let { formatBytes(it) },
+                                enabled = state.downloadFileName == null,
+                                onClick = { onDownload(file) }
                             )
                         }
                     }
@@ -930,6 +925,47 @@ private fun HuggingFaceModelPickerDialog(
     )
 }
 
+@Composable
+private fun HfPickerCard(
+    title: String,
+    subtitle: String?,
+    enabled: Boolean,
+    onClick: () -> Unit
+) {
+    Surface(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(enabled = enabled, onClick = onClick),
+        shape = RoundedCornerShape(12.dp),
+        color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.72f)
+    ) {
+        Column(
+            modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp),
+            verticalArrangement = Arrangement.spacedBy(6.dp)
+        ) {
+            Text(
+                text = title,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .horizontalScroll(rememberScrollState()),
+                maxLines = 1,
+                softWrap = false,
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.SemiBold
+            )
+            subtitle?.let {
+                Text(
+                    text = it,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+        }
+    }
+}
+
 @Composable
 fun ConfigSectionCard(
     title: String,
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -143,18 +143,18 @@
     <string name="some_features_may_not_work">Certaines fonctions peuvent ne pas fonctionner correctement.</string>
     <string name="model_config">Configuration du modele</string>
     <string name="tap_to_select_model_file">Touchez pour choisir un fichier modele</string>
-    <string name="hf_model_picker">Selecteur de modeles HF</string>
-    <string name="hf_search_hint">Rechercher des modeles GGUF sur Hugging Face</string>
+    <string name="hf_model_picker">Decouvrir</string>
+    <string name="hf_search_hint">Nom du modele</string>
     <string name="hf_model_stats">%1$d telechargements - %2$d likes</string>
     <string name="hf_back_to_results">Retour aux resultats</string>
     <string name="downloading_model">Telechargement de %1$s...</string>
-    <string name="manage_models">Gerer les modeles</string>
+    <string name="manage_models">Gerer</string>
+    <string name="browse_model">Parcourir</string>
     <string name="model_cache_folder">Dossier cache des modeles</string>
     <string name="rename_model">Renommer le modele</string>
     <string name="delete_model">Supprimer le modele</string>
     <string name="delete_model_message">Supprimer \'%1$s\' du cache des modeles ? Cette action est irreversible.</string>
     <string name="model_name">Nom du modele</string>
-    <string name="unknown_size">Taille inconnue</string>
     <string name="selected_model_with_size">Selectionne - %1$s</string>
     <string name="no_cached_models">Aucun modele GGUF en cache. Parcourez pour en importer un.</string>
     <string name="cached_models_count">%1$d modele(s) GGUF en cache</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -143,18 +143,18 @@
     <string name="some_features_may_not_work">一部の機能が正しく動作しない可能性があります。</string>
     <string name="model_config">モデル設定</string>
     <string name="tap_to_select_model_file">タップしてモデルファイルを選択</string>
-    <string name="hf_model_picker">HF モデルピッカー</string>
-    <string name="hf_search_hint">Hugging Face の GGUF モデルを検索</string>
+    <string name="hf_model_picker">検索</string>
+    <string name="hf_search_hint">モデル名</string>
     <string name="hf_model_stats">%1$d ダウンロード - %2$d likes</string>
     <string name="hf_back_to_results">結果に戻る</string>
     <string name="downloading_model">%1$s をダウンロード中...</string>
-    <string name="manage_models">モデル管理</string>
+    <string name="manage_models">管理</string>
+    <string name="browse_model">参照</string>
     <string name="model_cache_folder">モデルキャッシュフォルダー</string>
     <string name="rename_model">モデル名を変更</string>
     <string name="delete_model">モデルを削除</string>
     <string name="delete_model_message">モデルキャッシュから \'%1$s\' を削除しますか？この操作は元に戻せません。</string>
     <string name="model_name">モデル名</string>
-    <string name="unknown_size">サイズ不明</string>
     <string name="selected_model_with_size">選択中 - %1$s</string>
     <string name="no_cached_models">キャッシュ済み GGUF モデルはまだありません。参照してインポートしてください。</string>
     <string name="cached_models_count">キャッシュ済み GGUF モデル: %1$d</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -143,18 +143,18 @@
     <string name="some_features_may_not_work">Некоторые функции могут работать некорректно.</string>
     <string name="model_config">Настройка модели</string>
     <string name="tap_to_select_model_file">Нажмите, чтобы выбрать файл модели</string>
-    <string name="hf_model_picker">Выбор HF-модели</string>
-    <string name="hf_search_hint">Искать GGUF-модели на Hugging Face</string>
+    <string name="hf_model_picker">Поиск</string>
+    <string name="hf_search_hint">Имя модели</string>
     <string name="hf_model_stats">%1$d скачиваний - %2$d лайков</string>
     <string name="hf_back_to_results">Назад к результатам</string>
     <string name="downloading_model">Скачивание %1$s...</string>
-    <string name="manage_models">Управление моделями</string>
+    <string name="manage_models">Правка</string>
+    <string name="browse_model">Обзор</string>
     <string name="model_cache_folder">Папка кэша моделей</string>
     <string name="rename_model">Переименовать модель</string>
     <string name="delete_model">Удалить модель</string>
     <string name="delete_model_message">Удалить \'%1$s\' из кэша моделей? Это действие нельзя отменить.</string>
     <string name="model_name">Имя модели</string>
-    <string name="unknown_size">Размер неизвестен</string>
     <string name="selected_model_with_size">Выбрано - %1$s</string>
     <string name="no_cached_models">В кэше пока нет GGUF-моделей. Импортируйте модель через обзор файлов.</string>
     <string name="cached_models_count">GGUF-моделей в кэше: %1$d</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -159,18 +159,18 @@
     <string name="some_features_may_not_work">某些功能可能无法正常工作。</string>
     <string name="model_config">模型配置</string>
     <string name="tap_to_select_model_file">点击选择模型文件</string>
-    <string name="hf_model_picker">HF 模型选择器</string>
-    <string name="hf_search_hint">搜索 Hugging Face GGUF 模型</string>
+    <string name="hf_model_picker">搜索</string>
+    <string name="hf_search_hint">模型名称</string>
     <string name="hf_model_stats">%1$d 次下载 - %2$d 个赞</string>
     <string name="hf_back_to_results">返回结果</string>
     <string name="downloading_model">正在下载 %1$s...</string>
-    <string name="manage_models">管理模型</string>
+    <string name="manage_models">管理</string>
+    <string name="browse_model">浏览</string>
     <string name="model_cache_folder">模型缓存文件夹</string>
     <string name="rename_model">重命名模型</string>
     <string name="delete_model">删除模型</string>
     <string name="delete_model_message">从模型缓存中删除“%1$s”？此操作无法撤销。</string>
     <string name="model_name">模型名称</string>
-    <string name="unknown_size">大小未知</string>
     <string name="selected_model_with_size">已选择 - %1$s</string>
     <string name="no_cached_models">还没有缓存的 GGUF 模型。浏览并导入一个模型。</string>
     <string name="cached_models_count">已缓存 %1$d 个 GGUF 模型</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -169,18 +169,18 @@
     <!-- Main config -->
     <string name="model_config">Model Configuration</string>
     <string name="tap_to_select_model_file">Tap to select a model file</string>
-    <string name="hf_model_picker">HF Model Picker</string>
-    <string name="hf_search_hint">Search Hugging Face GGUF models</string>
+    <string name="hf_model_picker">Search</string>
+    <string name="hf_search_hint">Model name</string>
     <string name="hf_model_stats">%1$d downloads - %2$d likes</string>
     <string name="hf_back_to_results">Back to results</string>
     <string name="downloading_model">Downloading %1$s...</string>
-    <string name="manage_models">Manage Models</string>
+    <string name="manage_models">Manage</string>
+    <string name="browse_model">Browse</string>
     <string name="model_cache_folder">Model cache folder</string>
     <string name="rename_model">Rename Model</string>
     <string name="delete_model">Delete Model</string>
     <string name="delete_model_message">Delete \'%1$s\' from the model cache? This cannot be undone.</string>
     <string name="model_name">Model name</string>
-    <string name="unknown_size">Unknown size</string>
     <string name="selected_model_with_size">Selected - %1$s</string>
     <string name="no_cached_models">No cached GGUF models yet. Browse to import one.</string>
     <string name="cached_models_count">%1$d cached GGUF model(s)</string>
