feat: completed #32 and #30 and can now ask questions #26

ch3njust1n · May 7, 2023 · 3844767 · 3844767
1 parent 6c591da
commit 3844767
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/android/app/src/main/java/co/rikin/geepee/AppViewModel.kt b/android/app/src/main/java/co/rikin/geepee/AppViewModel.kt
@@ -125,12 +125,12 @@ class AppViewModel(private val speechToText: SpeechToText, private val context:
           Log.d("Debug", context.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).toString())
           logger.logToFile("GeePee", message.content)
           val apiActions = Json.decodeFromString<ApiActions>(message.content)
-          val commands = apiActions.actions.map { action ->
+          val commands = apiActions.actions.mapNotNull { action ->
             when (action.component) {
               "camera" -> {
                 val peripheral: Peripheral = when (action.subcomponent) {
-                  "front" -> Peripheral.FrontCamera
-                  "back" -> Peripheral.BackCamera
+                  "cam-fr" -> Peripheral.FrontCamera
+                  "cam-rr" -> Peripheral.BackCamera
                   else -> throw IllegalArgumentException("Invalid subcomponent value: ${action.subcomponent}")
                 }
 
@@ -154,19 +154,39 @@ class AppViewModel(private val speechToText: SpeechToText, private val context:
                 }
               }
 
+              "unknown" -> {
+                  if (action.ask != null) {
+                      Command.AskCommand(
+                        ask = action.ask,
+                        description = action.action
+                      )
+                  } else {
+                      logger.logToFile("GeePee", "UnsupportedCommand")
+                      Command.UnsupportedCommand
+                  }
+              }
+
               else -> {
                 logger.logToFile("GeePee", "UnsupportedCommand")
                 Command.UnsupportedCommand
+                null
               }
             }
-          }
+          }.filterIsInstance<Command>()
+
+          val firstAskCommand = commands.firstOrNull { it is Command.AskCommand } as? Command.AskCommand
 
           state = state.copy(
             promptQueue = state.promptQueue.toMutableList().apply {
               add(message)
               toList()
             },
-            promptDisplay = state.promptDisplay.dropLast(1),
+            promptDisplay = state.promptDisplay.dropLast(1).toMutableList().apply {
+                if (firstAskCommand != null) {
+                    add(System(firstAskCommand.ask))
+                }
+                toList()
+            },
             commandQueue = commands
           )
         }
@@ -243,6 +263,7 @@ data class ApiAction(
   val component: String,
   val action: String,
   val subcomponent: String? = null,
+  val ask: String? = null,
   @SerialName("package") val appPackage: String? = null,
   @SerialName("parameters") val parameters: ActionParameters? = null,
 )
@@ -265,6 +286,11 @@ sealed class Command(
     override val description: String,
   ) : Command(description)
 
+  data class AskCommand(
+      val ask: String,
+      override val description: String,
+  ) : Command(description)
+
   data class SystemCommand(
     val peripheral: Peripheral,
     override val description: String,

diff --git a/android/app/src/main/java/co/rikin/geepee/MainActivity.kt b/android/app/src/main/java/co/rikin/geepee/MainActivity.kt
@@ -169,6 +169,12 @@ fun App() {
         }
       }
 
+      is Command.AskCommand -> {
+          // Add your logic here to handle the AskCommand
+          logger.logToFile("GeePee", "AskCommand")
+          viewModel.action(AppAction.Advance)
+      }
+
       Command.UnsupportedCommand -> {
         viewModel.action(AppAction.Advance)
       }

diff --git a/android/app/src/main/java/co/rikin/geepee/ui/Initialize.kt b/android/app/src/main/java/co/rikin/geepee/ui/Initialize.kt
@@ -191,7 +191,6 @@ class InitialPrompt(private val context: Context) {
     promptUnknownAction() +
     promptHttpOk()
 
-    logger.logToFile("InitPrompt", initPrompt)
     return initPrompt
   }
 }