Fix

Author: kirklandsign

llm/android/LlamaDemo/app/src/androidTest/java/com/example/executorchllamademo/UIWorkflowTest.kt

@@ -106,18 +106,10 @@ class UIWorkflowTest {
             return
         }
 
-        // Click Clear Chat History button
+        // Click Clear Chat History button (clears immediately, no confirmation dialog)
         try {
             composeTestRule.onNodeWithText("Clear Chat History").performClick()
             composeTestRule.waitForIdle()
-
-            // Wait for confirmation dialog and click Yes
-            composeTestRule.waitUntil(timeoutMillis = 2000) {
-                composeTestRule.onAllNodesWithText("Delete Chat History")
-                    .fetchSemanticsNodes().isNotEmpty()
-            }
-            composeTestRule.onNodeWithText("Yes").performClick()
-            composeTestRule.waitForIdle()
             Log.i(TAG, "Chat history cleared")
         } catch (e: Exception) {
             Log.d(TAG, "Could not clear chat history: ${e.message}")

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/screens/SettingsScreen.kt

@@ -327,7 +327,7 @@ fun SettingsScreen(
 
             // Clear Chat button
             Button(
-                onClick = { viewModel.showClearChatDialog = true },
+                onClick = { viewModel.confirmClearChat() },
                 modifier = Modifier.fillMaxWidth(),
                 colors = ButtonDefaults.buttonColors(containerColor = BtnEnabled),
                 shape = RoundedCornerShape(8.dp)
@@ -347,7 +347,6 @@ fun SettingsScreen(
     DataPathDialog(viewModel)
     ModelTypeDialog(viewModel)
     LoadModelDialog(viewModel, onLoadModel, onBackPressed)
-    ClearChatDialog(viewModel)
     ResetSystemPromptDialog(viewModel)
     ResetUserPromptDialog(viewModel)
     InvalidPromptDialog(viewModel)
@@ -574,38 +573,6 @@ private fun LoadModelDialog(
     }
 }
 
-@Composable
-private fun ClearChatDialog(viewModel: SettingsViewModel) {
-    if (viewModel.showClearChatDialog) {
-        AlertDialog(
-            onDismissRequest = { viewModel.showClearChatDialog = false },
-            icon = {
-                Icon(
-                    imageVector = Icons.Filled.Warning,
-                    contentDescription = null
-                )
-            },
-            title = { Text("Delete Chat History") },
-            text = { Text("Do you really want to delete chat history?") },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        viewModel.confirmClearChat()
-                        viewModel.showClearChatDialog = false
-                    }
-                ) {
-                    Text("Yes")
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { viewModel.showClearChatDialog = false }) {
-                    Text("No")
-                }
-            }
-        )
-    }
-}
-
 @Composable
 private fun ResetSystemPromptDialog(viewModel: SettingsViewModel) {
     if (viewModel.showResetSystemPromptDialog) {

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt

@@ -66,7 +66,6 @@ class ChatViewModel(application: Application) : AndroidViewModel(application), L
     val selectedImages: List<Uri> = _selectedImages
 
     // Dialog states
-    var showSelectModelDialog by mutableStateOf(false)
     var showModelLoadErrorDialog by mutableStateOf(false)
     var modelLoadError by mutableStateOf("")
 
@@ -103,13 +102,15 @@ class ChatViewModel(application: Application) : AndroidViewModel(application), L
         demoSharedPreferences.addMessages(_messages.toList())
     }
 
+    private val systemPromptMessage = "To get started, select your desired model and tokenizer from the top right corner"
+
     fun checkAndLoadSettings() {
         val gson = Gson()
         val settingsFieldsJSON = demoSharedPreferences.getSettings()
         if (settingsFieldsJSON.isNotEmpty()) {
             val updatedSettingsFields = gson.fromJson(settingsFieldsJSON, SettingsFields::class.java)
             if (updatedSettingsFields == null) {
-                showSelectModelDialog = true
+                addSystemMessage(systemPromptMessage)
                 return
             }
             val isUpdated = currentSettingsFields != updatedSettingsFields
@@ -130,19 +131,19 @@ class ChatViewModel(application: Application) : AndroidViewModel(application), L
                     updatedSettingsFields.saveLoadModelAction(false)
                     demoSharedPreferences.addSettings(updatedSettingsFields)
                 } else if (module == null) {
-                    showSelectModelDialog = true
+                    addSystemMessage(systemPromptMessage)
                 }
             } else {
                 // Settings unchanged, but still update media capabilities for current settings
                 setBackendMode(updatedSettingsFields.backendType)
                 val modelPath = updatedSettingsFields.modelFilePath
                 val tokenizerPath = updatedSettingsFields.tokenizerFilePath
                 if (modelPath.isEmpty() || tokenizerPath.isEmpty()) {
-                    showSelectModelDialog = true
+                    addSystemMessage(systemPromptMessage)
                 }
             }
         } else if (module == null) {
-            showSelectModelDialog = true
+            addSystemMessage(systemPromptMessage)
         }
     }
 
@@ -463,10 +464,6 @@ class ChatViewModel(application: Application) : AndroidViewModel(application), L
         }
     }
 
-    fun dismissSelectModelDialog() {
-        showSelectModelDialog = false
-    }
-
     fun dismissModelLoadErrorDialog() {
         showModelLoadErrorDialog = false
     }

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/SettingsViewModel.kt

@@ -35,7 +35,6 @@ class SettingsViewModel : ViewModel() {
     var showDataPathDialog by mutableStateOf(false)
     var showModelTypeDialog by mutableStateOf(false)
     var showLoadModelDialog by mutableStateOf(false)
-    var showClearChatDialog by mutableStateOf(false)
     var showResetSystemPromptDialog by mutableStateOf(false)
     var showResetUserPromptDialog by mutableStateOf(false)
     var showInvalidPromptDialog by mutableStateOf(false)