Enhancing FeedbackScreen with Performance Metrics

app/src/androidTest/java/com/github/se/orator/ui/overview/FeedbackScreenTest.kt

@@ -1,6 +1,7 @@
 package com.github.se.orator.ui.overview
 
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertTextContains
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
@@ -145,6 +146,45 @@ class FeedbackScreenTest {
         .assertIsDisplayed()
   }
 
+  @Test
+  fun performanceMetricsTitlesAreDisplayed() = runTest {
+    // Mock chatGPTService to return a ChatResponse with feedback message
+    `when`(chatGPTService.getChatCompletion(any()))
+        .thenReturn(
+            ChatResponse(
+                "id",
+                "object",
+                0,
+                "model",
+                listOf(Choice(0, Message("assistant", "Great job! Keep it up."), null)),
+                Usage(0, 0, 0)))
+
+    // Initialize ChatViewModel
+    chatViewModel = ChatViewModel(chatGPTService, apiLinkViewModel)
+
+    // Generate feedback with the mocked response
+    chatViewModel.generateFeedback()
+
+    // Advance coroutine until idle
+    advanceUntilIdle()
+
+    // Set the content with FeedbackScreen
+    composeTestRule.setContent {
+      FeedbackScreen(
+          chatViewModel = chatViewModel,
+          userProfileViewModel = userProfileViewModel,
+          apiLinkViewModel = apiLinkViewModel,
+          navigationActions = navigationActions)
+    }
+
+    // Assert that the performance metrics title is displayed
+    composeTestRule
+        .onNodeWithTag("performanceMetricsTitle")
+        .assertExists()
+        .assertIsDisplayed()
+        .assertTextContains("Your Performance Metrics:")
+  }
+
   @Test
   fun clickingTheTryAgainButtonRedirectsToHomeScreen() = runTest {
     chatViewModel = ChatViewModel(chatGPTService, apiLinkViewModel)

app/src/main/java/com/github/se/orator/model/chatGPT/ChatViewModel.kt

@@ -193,9 +193,7 @@ class ChatViewModel(
         }
 
     val systemMessage = Message(role = "system", content = systemMessageContent)
-
     val userStartMessage = Message(role = "user", content = "I'm ready to begin the session.")
-
     _chatMessages.value = listOf(systemMessage, userStartMessage)
 
     getNextGPTResponse()

app/src/main/java/com/github/se/orator/ui/overview/ChatScreen.kt

@@ -71,13 +71,16 @@ fun ChatScreen(
   // Collect the loading state from the view model as a state.
   val isLoading by chatViewModel.isLoading.collectAsState()
 
+  // Filter out system messages for display purposes only
+  val displayMessages = chatMessages.filter { it.role != "system" }
+
   // Remember the list state for the LazyColumn to manage scrolling position.
   val listState = rememberLazyListState()
 
   // Side effect to auto-scroll to the last message when a new message is added.
-  LaunchedEffect(chatMessages.size) {
-    if (chatMessages.isNotEmpty()) {
-      listState.animateScrollToItem(chatMessages.size - 1)
+  LaunchedEffect(displayMessages.size) {
+    if (displayMessages.isNotEmpty()) {
+      listState.animateScrollToItem(displayMessages.size - 1)
     }
   }
 
@@ -139,7 +142,7 @@ fun ChatScreen(
                                 .testTag(
                                     "chat_messages_list")) // Dynamically add chat message items.
                     {
-                          items(chatMessages) { message -> ChatMessageItem(message) }
+                          items(displayMessages) { message -> ChatMessageItem(message) }
                         }
 
                     // Display a loading indicator when a message is being processed.

app/src/main/java/com/github/se/orator/ui/overview/FeedbackScreen.kt

@@ -26,14 +26,6 @@ import com.github.se.orator.ui.network.Message
 import com.github.se.orator.ui.theme.AppDimensions
 import com.github.se.orator.ui.theme.AppTypography
 
-/**
- * Composable function to display the feedback screen.
- *
- * @param chatViewModel The view model for chat interactions.
- * @param userProfileViewModel The view model for user profiles.
- * @param apiLinkViewModel The view model for API links.
- * @param navigationActions The actions used for navigation.
- */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun FeedbackScreen(
@@ -42,14 +34,15 @@ fun FeedbackScreen(
     apiLinkViewModel: ApiLinkViewModel,
     navigationActions: NavigationActions
 ) {
-  // State variables for feedback message, decision, loading status, and error message.
   var feedbackMessage by remember { mutableStateOf<String?>(null) }
   var decisionResult by remember { mutableStateOf<ChatViewModel.DecisionResult?>(null) }
   var isLoading by remember { mutableStateOf(true) }
   var errorMessage by remember { mutableStateOf<String?>(null) }
 
   val practiceContext by apiLinkViewModel.practiceContext.collectAsState()
   val userProfile by userProfileViewModel.userProfile.collectAsState()
+  val talkTimePercentageMean = userProfile?.statistics?.talkTimePercMean
+  val talkTimeSecondsMean = userProfile?.statistics?.talkTimeSecMean
 
   val sessionType =
       when (practiceContext) {
@@ -59,7 +52,6 @@ fun FeedbackScreen(
         else -> null
       }
 
-  // Retrieve the number of successful sessions
   val successfulSessionsCount =
       sessionType?.let { userProfile?.statistics?.successfulSessions?.get(it.name) ?: 0 } ?: 0
 
@@ -68,8 +60,6 @@ fun FeedbackScreen(
       feedbackMessage = chatViewModel.generateFeedback()
       feedbackMessage?.let {
         decisionResult = parseDecisionFromFeedback(it, sessionType)
-
-        // Update user statistics based on the decision and session type
         if (decisionResult != null && sessionType != null) {
           userProfileViewModel.updateSessionResult(
               isSuccess = decisionResult!!.isSuccess, sessionType = sessionType)
@@ -155,7 +145,6 @@ fun FeedbackScreen(
                                 .weight(1f)
                                 .verticalScroll(rememberScrollState())
                                 .testTag("feedbackMessage")) {
-                          // Display the decision prominently.
                           decisionResult?.message?.let { decisionText ->
                             Text(
                                 text = decisionText,
@@ -170,29 +159,49 @@ fun FeedbackScreen(
                           Text(
                               text =
                                   "You have successfully completed $successfulSessionsCount ${
-                                when (sessionType) {
-                                    SessionType.SPEECH -> "speeches"
-                                    SessionType.INTERVIEW -> "interviews"
-                                    SessionType.NEGOTIATION -> "negotiations"
-                                    else -> "sessions"
-                                }
-                            } so far!",
+                                        when (sessionType) {
+                                            SessionType.SPEECH -> "speeches"
+                                            SessionType.INTERVIEW -> "interviews"
+                                            SessionType.NEGOTIATION -> "negotiations"
+                                            else -> "sessions"
+                                        }
+                                    } so far!",
                               style = AppTypography.bodyLargeStyle,
                               modifier =
                                   Modifier.align(Alignment.CenterHorizontally)
                                       .padding(AppDimensions.paddingMedium)
                                       .testTag("successfulSessionsText"),
                               color = MaterialTheme.colorScheme.tertiary)
-                          // Display the detailed feedback message.
                           ChatMessageItem(
                               message = Message(content = feedbackMessage!!, role = "assistant"))
+
+                          Text(
+                              text = "Your Performance Metrics:",
+                              style = AppTypography.mediumTitleStyle,
+                              modifier =
+                                  Modifier.padding(AppDimensions.paddingMedium)
+                                      .testTag("performanceMetricsTitle"))
+
+                          // Display Talk Time Seconds
+                          MetricDisplayItem(
+                              title = "Talk Time (Seconds)",
+                              value = talkTimeSecondsMean?.let { "%.2f".format(it) } ?: "No data",
+                              testTag = "talkTimeSeconds")
+
+                          // Display Talk Time Percentage
+                          MetricDisplayItem(
+                              title = "Talk Time (Percentage)",
+                              value =
+                                  talkTimePercentageMean?.let { "%.2f%%".format(it) } ?: "No data",
+                              testTag = "talkTimePercentage")
                         }
                   }
                   else -> {
                     Text(
                         text = "No feedback available.",
                         style = AppTypography.bodyLargeStyle,
-                        color = MaterialTheme.colorScheme.secondary)
+                        color = MaterialTheme.colorScheme.secondary,
+                        modifier = Modifier.testTag("feedbackNoMessage"))
                   }
                 }
 
@@ -224,10 +233,41 @@ fun FeedbackScreen(
 }
 
 /**
- * Function to parse the decision from the feedback message.
+ * A reusable composable function to display a performance metric.
+ *
+ * @param title The title of the metric, typically describing what the metric represents. Example:
+ *   "Talk Time (Seconds)" or "Talk Time (Percentage)".
+ * @param value The value of the metric, formatted as a string for display. Example: "120.00" or
+ *   "75.50%".
+ * @param testTag A test tag assigned to the composable for UI testing purposes.
+ *
+ * Functionality:
+ * - Displays a metric with its title and value in a column layout.
+ * - Applies consistent padding and styling to ensure visual alignment with other UI components.
+ * - Includes a test tag for accessibility and testing frameworks.
+ *
+ * Usage: Call this function with appropriate parameters to render a performance metric anywhere in
+ * the UI.
+ */
+@Composable
+fun MetricDisplayItem(title: String, value: String, testTag: String) {
+  Column(modifier = Modifier.fillMaxWidth().padding(AppDimensions.paddingSmall).testTag(testTag)) {
+    Text(
+        text = title,
+        style = AppTypography.smallTitleStyle,
+        modifier = Modifier.padding(bottom = AppDimensions.paddingSmall))
+    Text(
+        text = value,
+        style = AppTypography.smallTitleStyle,
+        modifier = Modifier.padding(bottom = AppDimensions.paddingSmall))
+  }
+}
+
+/**
+ * Parses the decision from the feedback message.
  *
  * @param feedback The feedback message.
- * @param sessionType The type of session.
+ * @param sessionType The session type.
  * @return The decision result.
  */
 private fun parseDecisionFromFeedback(