Add text input

dan-blank · dan-blank · commit 2edc80acae20 · 2025-06-28T17:31:09.000+02:00
diff --git a/android/app/src/main/kotlin/com/example/flutter_alarm_manager_poc/activity/AlarmActivity.kt b/android/app/src/main/kotlin/com/example/flutter_alarm_manager_poc/activity/AlarmActivity.kt
@@ -1,16 +1,12 @@
 package com.example.flutter_alarm_manager_poc.activity
 
 import android.os.Bundle
-import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import com.example.flutter_alarm_manager_poc.alarmNotificationService.AlarmNotificationService
 import com.example.flutter_alarm_manager_poc.alarmNotificationService.AlarmNotificationServiceImpl
-import com.example.flutter_alarm_manager_poc.alarmScheduler.AlarmScheduler
-import com.example.flutter_alarm_manager_poc.alarmScheduler.AlarmSchedulerImpl
-import com.example.flutter_alarm_manager_poc.model.AlarmItem
 import com.example.flutter_alarm_manager_poc.screens.AlarmScreen
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.FlutterEngineCache
@@ -24,15 +20,13 @@ class AlarmActivity : ComponentActivity() {
     private var flutterEngine: FlutterEngine? = null
     private var isNewEngineCreated = false // create new engine when app is closed and use existing when app is resumed state
     private lateinit var alarmNotificationService: AlarmNotificationService
-    private lateinit var alarmScheduler: AlarmScheduler
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         actionBar?.hide()
 
         val alarmId = intent.getIntExtra("ALARM_ID", -1)
 
-
         alarmNotificationService = AlarmNotificationServiceImpl(this)
 
         // Check if a cached engine is available
@@ -58,8 +52,12 @@ class AlarmActivity : ComponentActivity() {
             MaterialTheme {
                 Surface(color = MaterialTheme.colorScheme.onSurface) {
                     AlarmScreen(
-                        onAccept = { q1, q2 ->
-                            val answerData = mapOf("feeling" to q1, "sleepQuality" to q2)
+                        onAccept = { q1, q2, additionalText ->
+                            val answerData = mapOf(
+                                "feeling" to q1,
+                                "sleepQuality" to q2,
+                                "additionalInfo" to additionalText
+                            )
                             val payload = mapOf("status" to "answered", "data" to answerData)
                             channel.invokeMethod("questionnaireFinished", payload)
                             alarmNotificationService.cancelNotification(alarmId)
diff --git a/android/app/src/main/kotlin/com/example/flutter_alarm_manager_poc/screens/AlarmScreen.kt b/android/app/src/main/kotlin/com/example/flutter_alarm_manager_poc/screens/AlarmScreen.kt
@@ -1,11 +1,5 @@
 package com.example.flutter_alarm_manager_poc.screens
 
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateDpAsState
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.repeatable
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -14,23 +8,20 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Snooze
-import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.RadioButtonDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -39,38 +30,34 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
 import com.example.flutter_alarm_manager_poc.utils.convertMillisToDate
 import com.example.flutter_alarm_manager_poc.utils.convertMillisToTime
-import org.w3c.dom.Text
 
 @Composable
 fun AlarmScreen(
-    onAccept: (Int, Int) -> Unit,
+    onAccept: (Int, Int, String) -> Unit,
     onDecline: () -> Unit,
     onSnooze: () -> Unit
 ) {
     var question1Selection by remember { mutableStateOf<Int?>(null) }
     var question2Selection by remember { mutableStateOf<Int?>(null) }
+    var additionalText by remember { mutableStateOf("") }
 
-    // Exit condition 1: Answering all questions automatically triggers the accept action.
+    // Reinstated Exit Condition 1: Answering all questions automatically triggers the accept action.
     LaunchedEffect(question1Selection, question2Selection) {
         // Storing in local variables for stability within the coroutine scope
         val q1 = question1Selection
         val q2 = question2Selection
 
-        // If both questions have been answered, trigger the accept action.
+        // If both questions have been answered, trigger the accept action, including any text.
         if (q1 != null && q2 != null) {
-            onAccept(q1, q2)
+            onAccept(q1, q2, additionalText)
         }
     }
 
@@ -113,6 +100,26 @@ fun AlarmScreen(
                 selectedOption = question2Selection,
                 onOptionSelected = { question2Selection = it }
             )
+            OutlinedTextField(
+                value = additionalText,
+                onValueChange = { additionalText = it },
+                label = { Text("Additional information (optional)") },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 8.dp),
+                colors = TextFieldDefaults.colors(
+                    focusedTextColor = Color.White,
+                    unfocusedTextColor = Color.White,
+                    cursorColor = Color.White,
+                    focusedContainerColor = Color.Transparent,
+                    unfocusedContainerColor = Color.Transparent,
+                    focusedIndicatorColor = Color.White,
+                    unfocusedIndicatorColor = Color.Gray,
+                    focusedLabelColor = Color.White,
+                    unfocusedLabelColor = Color.Gray,
+                ),
+                maxLines = 3
+            )
         }
 
         Row(
@@ -156,12 +163,11 @@ fun ButtonAction(
             Icon(
                 imageVector = icon,
                 contentDescription = text,
-                tint = Color(0xFF8A2BE2), // This makes the icon white
+                tint = Color(0xFF8A2BE2),
                 modifier = Modifier
                     .size(40.dp)
-                    .align(Alignment.Center) // Adjust the size of the icon as needed
+                    .align(Alignment.Center)
             )
-
         }
         Text(
             modifier = Modifier.padding(top = 8.dp),
diff --git a/lib/hive/models/alarm_action.dart b/lib/hive/models/alarm_action.dart
@@ -13,5 +13,5 @@ class AlarmAction {
   final int timestamp;
 
   @HiveField(2)
-  final Map<String, int>? answers;
+  final Map<String, dynamic>? answers;
 }
diff --git a/lib/hive/models/alarm_action.g.dart b/lib/hive/models/alarm_action.g.dart
diff --git a/lib/hive/service/database_service.dart b/lib/hive/service/database_service.dart
@@ -35,7 +35,7 @@ class DatabaseService {
 
   // Add an alarm action to the Hive box
   Future<void> storeAlarmAction(AlarmActionType actionType,
-      {Map<String, int>? answers}) async {
+      {Map<String, dynamic>? answers}) async {
     try {
       await _alarmBox.add(
         AlarmAction(
diff --git a/lib/utils/alarm_method_channel.dart b/lib/utils/alarm_method_channel.dart
@@ -56,8 +56,10 @@ class AlarmMethodChannel {
         if (status != null) {
           // 1. Store the user's action (side-effect).
           final answerData = args['data'] as Map<dynamic, dynamic>?;
-          final answers = answerData
-              ?.map((key, value) => MapEntry(key.toString(), value as int));
+
+          // [FIX] Remove the cast 'as int'. This now correctly creates a Map<String, dynamic>
+          final answers =
+              answerData?.map((key, value) => MapEntry(key.toString(), value));
 
           final AlarmActionType actionType;
           final QuestionnaireResult result;

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ class AlarmAction {`
`13`	`13`	`final int timestamp;`
`14`	`14`
`15`	`15`	`@HiveField(2)`
`16`		`- final Map<String, int>? answers;`
	`16`	`+ final Map<String, dynamic>? answers;`
`17`	`17`	`}`