We back)

elimu-ai · Mar 31, 2024 · caa764d · caa764d
1 parent 8046569
commit caa764d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/app/src/main/kotlin/ai/elimu/soga/feature/chat/ChatScreen.kt b/app/src/main/kotlin/ai/elimu/soga/feature/chat/ChatScreen.kt
@@ -40,10 +40,16 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import ai.elimu.soga.GenerativeViewModelFactory
 import ai.elimu.soga.R
+import ai.elimu.soga.ui.theme.Gold80
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.StrokeCap
 import kotlinx.coroutines.launch
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
@@ -57,6 +63,15 @@ internal fun ChatRoute(
     val coroutineScope = rememberCoroutineScope()
 
     Scaffold(
+        topBar = {
+            LinearProgressIndicator(
+                progress = chatViewModel.pointCounter,
+                modifier = Modifier.height(30.dp).fillMaxWidth().padding(10.dp,0.dp),
+                color = Gold80,
+                trackColor = Color.Black,
+                strokeCap = StrokeCap.Round,
+            )
+        },
         bottomBar = {
             MessageInput(
                 onSendMessage = { inputText ->
@@ -208,7 +223,7 @@ fun MessageInput(
                     .fillMaxWidth()
                     .weight(0.15f)
             ) {
-               Icon(
+                Icon(
                     Icons.Default.Send,
                     contentDescription = stringResource(R.string.action_send),
                     modifier = Modifier

diff --git a/app/src/main/kotlin/ai/elimu/soga/feature/chat/ChatViewModel.kt b/app/src/main/kotlin/ai/elimu/soga/feature/chat/ChatViewModel.kt
@@ -46,6 +46,8 @@ class ChatViewModel(
             )
         )
 
+
+
         viewModelScope.launch {
             try {
                 val response = chat.sendMessage(userMessage)
@@ -60,7 +62,7 @@ class ChatViewModel(
                             isPending = false
                         )
                     )
-                    if (modelResponse.contains("hhvhv") || modelResponse.contains("there") || modelResponse.contains("Correct")) { pointCounter += 0.1f }
+                    if (modelResponse.contains("\uD83C\uDF1F") || modelResponse.contains("correct") || modelResponse.contains("Correct")) { pointCounter += 0.1f }
                 }
             } catch (e: Exception) {
                 _uiState.value.replaceLastPendingMessage()

diff --git a/app/src/main/kotlin/ai/elimu/soga/ui/theme/Color.kt b/app/src/main/kotlin/ai/elimu/soga/ui/theme/Color.kt
@@ -9,3 +9,5 @@ val Pink80 = Color(0xFFEFB8C8)
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
 val Pink40 = Color(0xFF7D5260)
+
+val Gold80 = Color(0xFFFFC94A)