From 7c3e477939d58e633cd0d65ca4036b9716660503 Mon Sep 17 00:00:00 2001 From: Han Yin Date: Fri, 11 Jul 2025 12:28:23 -0700 Subject: [PATCH] UI: polish model management screen's error dialog --- .../llama/ui/screens/ModelsManagementScreen.kt | 14 ++++++++++---- .../llama/viewmodel/ModelsManagementViewModel.kt | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/examples/llama.android/app/src/main/java/com/example/llama/ui/screens/ModelsManagementScreen.kt b/examples/llama.android/app/src/main/java/com/example/llama/ui/screens/ModelsManagementScreen.kt index 362df6d6a6..6e1de7f2b5 100644 --- a/examples/llama.android/app/src/main/java/com/example/llama/ui/screens/ModelsManagementScreen.kt +++ b/examples/llama.android/app/src/main/java/com/example/llama/ui/screens/ModelsManagementScreen.kt @@ -19,11 +19,11 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Attribution import androidx.compose.material.icons.filled.Download +import androidx.compose.material.icons.filled.Error import androidx.compose.material.icons.filled.Favorite import androidx.compose.material.icons.filled.FolderOpen import androidx.compose.material.icons.filled.Today import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.Checkbox @@ -666,10 +666,16 @@ private fun ErrorDialog( ) { AlertDialog( onDismissRequest = onDismiss, - title = { Text(title) }, - text = { Text(message) }, + text = { + InfoView( + modifier = Modifier.fillMaxWidth(), + title = title, + icon = Icons.Default.Error, + message = message, + ) + }, confirmButton = { - Button(onClick = onDismiss) { + TextButton(onClick = onDismiss) { Text("OK") } } diff --git a/examples/llama.android/app/src/main/java/com/example/llama/viewmodel/ModelsManagementViewModel.kt b/examples/llama.android/app/src/main/java/com/example/llama/viewmodel/ModelsManagementViewModel.kt index 927fb18d9d..19014b3148 100644 --- a/examples/llama.android/app/src/main/java/com/example/llama/viewmodel/ModelsManagementViewModel.kt +++ b/examples/llama.android/app/src/main/java/com/example/llama/viewmodel/ModelsManagementViewModel.kt @@ -262,10 +262,10 @@ class ModelsManagementViewModel @Inject constructor( _managementState.value = Download.Error(message = "No internet connection") } catch (_: SocketTimeoutException) { _managementState.value = Download.Error(message = "Connection timed out") - } catch (e: IOException) { - _managementState.value = Download.Error(message = "Network error: ${e.message}") } catch (_: FileNotFoundException) { _managementState.emit(Download.Error(message = "No eligible models")) + } catch (e: IOException) { + _managementState.value = Download.Error(message = "Network error: ${e.message}") } catch (e: Exception) { _managementState.emit(Download.Error(message = e.message ?: "Unknown error")) }