From eb1061c790e8873f35314a5f3e25bc6ce7978da1 Mon Sep 17 00:00:00 2001
From: HuyVo117 <nhathuy1172005@gmail.com>
Date: Mon, 21 Apr 2025 23:41:38 +0700
Subject: [PATCH 1/5] check file

---
 .idea/deploymentTargetSelector.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index f03ca71..1b1ba47 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-04-11T05:06:14.353029367Z">
+        <DropdownSelection timestamp="2025-04-19T05:55:38.419329200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/jun/.android/avd/Pixel_4a.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R5CRA1FSCZM" />
             </handle>
           </Target>
         </DropdownSelection>
@@ -18,6 +18,14 @@
       </SelectionState>
       <SelectionState runConfigName="HomeScreenPreview">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-04-19T06:13:32.603009200Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R5CRA1FSCZM" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
       <SelectionState runConfigName="GameScreenPreview">
         <option name="selectionMode" value="DROPDOWN" />

From 3300dfea97cc052cfcf997f58f04053168485bde Mon Sep 17 00:00:00 2001
From: HuyVo117 <nhathuy1172005@gmail.com>
Date: Mon, 21 Apr 2025 23:52:40 +0700
Subject: [PATCH 2/5] feat: add new selection states for preview screens and
 improve layout responsiveness

---
 .../example/deepsea/ui/components/TopBar.kt   | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt b/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt
index 4b8506c..2d7a623 100644
--- a/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt
+++ b/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt
@@ -65,7 +65,6 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
     systemUiController.setStatusBarColor(animatedColor)
     systemUiController.setNavigationBarColor(Color.White)
 
-
     Box(
         modifier = Modifier
             .zIndex(10f)
@@ -84,28 +83,33 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(top = 20.dp, bottom = 16.dp),
+                verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 BarIcon(R.drawable.flag_japan)
-                if (showStreakDialog.value) {
-                    AlertDialog(
-                        onDismissRequest = { showStreakDialog.value = false },
-                        confirmButton = {},
-                        title = { Text("Streak Calendar") },
-                        text = {
-                            StreakCalendar()
-                        }
+
+                Row(
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    BarIcon(
+                        icon = R.drawable.ic_fire,
+                        text = "1",
+                        onClick = { showStreakDialog.value = true }
                     )
+                    BarIcon(R.drawable.ic_gem, "505")
+                    BarIcon(R.drawable.ic_heart, "5")
                 }
+            }
 
-                BarIcon(
-                    icon = R.drawable.ic_fire,
-                    text = "1",
-                    onClick = { showStreakDialog.value = true }
+            if (showStreakDialog.value) {
+                AlertDialog(
+                    onDismissRequest = { showStreakDialog.value = false },
+                    confirmButton = {},
+                    title = { Text("Streak Calendar") },
+                    text = {
+                        StreakCalendar()
+                    }
                 )
-
-                BarIcon(R.drawable.ic_gem, "505")
-                BarIcon(R.drawable.ic_heart, "5")
             }
 
             Box {
@@ -122,7 +126,10 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
                 Icon(
                     imageVector = Icons.Default.KeyboardArrowUp,
                     tint = Color.White,
-                    contentDescription = "up"
+                    contentDescription = "up",
+                    modifier = Modifier
+                        .align(Alignment.TopEnd)
+                        .padding(end = 8.dp)
                 )
             }
         }
@@ -130,6 +137,7 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
 }
 
 
+
 @Composable
 fun BarIcon(@DrawableRes icon: Int, text: String? = null, saturation: Float = 1f, onClick: (() -> Unit)? = null) {
     Row(

From 505755080345c6b55fd6600545099f9bc8f0616e Mon Sep 17 00:00:00 2001
From: HuyVo117 <nhathuy1172005@gmail.com>
Date: Tue, 22 Apr 2025 23:58:00 +0700
Subject: [PATCH 3/5] Add AI

---
 app/build.gradle.kts                          |   5 +
 app/src/main/AndroidManifest.xml              |   4 +
 .../AI_assistant/VoiceAssistantScreen.kt      | 270 ++++++++++++++++++
 .../java/com/example/deepsea/ui/DeepSeaApp.kt |   7 +
 .../com/example/deepsea/ui/MainActivity.kt    |   3 +
 .../example/deepsea/ui/components/Button.kt   |   1 +
 .../example/deepsea/ui/components/TopBar.kt   |  45 ++-
 .../example/deepsea/ui/screens/HomeScreen.kt  |  29 +-
 .../res/layout/activity_voice_assistant.xml   |  29 ++
 9 files changed, 364 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/com/example/deepsea/AI_assistant/VoiceAssistantScreen.kt
 create mode 100644 app/src/main/res/layout/activity_voice_assistant.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e3217b8..d146522 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,6 +60,8 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
 
+
+    implementation("com.android.volley:volley:1.2.1")
     implementation("androidx.navigation:navigation-compose:2.8.9")
 
     // Retrofit
@@ -79,4 +81,7 @@ dependencies {
 
     implementation("com.google.accompanist:accompanist-systemuicontroller:0.36.0")
 
+    implementation("androidx.compose.material:material-icons-extended:1.6.0")
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5544ae9..27b2de0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <application
         android:enableOnBackInvokedCallback="true"
         android:allowBackup="true"
@@ -19,10 +21,12 @@
         android:theme="@style/Theme.DeepSea"
         tools:targetApi="31">
         <activity
+
             android:name=".ui.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.DeepSea">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/example/deepsea/AI_assistant/VoiceAssistantScreen.kt b/app/src/main/java/com/example/deepsea/AI_assistant/VoiceAssistantScreen.kt
new file mode 100644
index 0000000..60498f9
--- /dev/null
+++ b/app/src/main/java/com/example/deepsea/AI_assistant/VoiceAssistantScreen.kt
@@ -0,0 +1,270 @@
+package com.example.deepsea.AI_assistant
+
+import android.Manifest
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.speech.RecognitionListener
+import android.speech.RecognizerIntent
+import android.speech.SpeechRecognizer
+import android.speech.tts.TextToSpeech
+import android.util.Log
+import androidx.activity.ComponentActivity
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.Request
+import com.android.volley.toolbox.JsonObjectRequest
+import com.android.volley.toolbox.Volley
+import org.json.JSONArray
+import org.json.JSONObject
+import java.util.*
+
+private const val TAG = "VoiceAssistant"
+
+@Composable
+fun VoiceAssistantScreen() {
+    val context = LocalContext.current
+    var outputText by remember { mutableStateOf("Ask me anything and I'll try to help!") }
+    var inputText by remember { mutableStateOf("") }
+    var isListening by remember { mutableStateOf(false) }
+    var isProcessing by remember { mutableStateOf(false) }
+
+
+    val apiKey = "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"
+    val endpoint = "https://api.openai.com/v1/chat/completions"
+
+    // Initialize TextToSpeech
+    val isTtsReady = remember { mutableStateOf(false) }
+
+    val textToSpeech = remember {
+        TextToSpeech(context) { status ->
+            if (status != TextToSpeech.ERROR) {
+                isTtsReady.value = true
+            }
+        }
+    }
+
+    // Initialize SpeechRecognizer
+    val recognizerIntent = remember {
+        RecognizerIntent.getVoiceDetailsIntent(context).apply {
+            putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+        }
+    }
+
+    val speechRecognizer = remember {
+        SpeechRecognizer.createSpeechRecognizer(context).apply {
+            setRecognitionListener(object : RecognitionListener {
+                override fun onResults(bundle: Bundle) {
+                    val matches = bundle.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
+                    matches?.let {
+                        if (it.isNotEmpty()) {
+                            val query = it[0]
+                            inputText = query
+                            callChatGPT(
+                                context = context,
+                                input = query,
+                                apiKey = apiKey,
+                                endpoint = endpoint,
+                                onStart = { isProcessing = true },
+                                onResponse = { response ->
+                                    outputText = response
+                                    isProcessing = false
+                                    if (!textToSpeech.isSpeaking) {
+                                        textToSpeech.speak(response, TextToSpeech.QUEUE_FLUSH, null, null)
+                                    }
+                                },
+                                onError = { error ->
+                                    outputText = "Error: $error"
+                                    isProcessing = false
+                                }
+                            )
+                        }
+                    }
+                }
+
+                // Required implementations for RecognitionListener
+                override fun onReadyForSpeech(bundle: Bundle) {}
+                override fun onBeginningOfSpeech() {}
+                override fun onRmsChanged(v: Float) {}
+                override fun onBufferReceived(bytes: ByteArray) {}
+                override fun onEndOfSpeech() { isListening = false }
+                override fun onError(i: Int) { isListening = false }
+                override fun onPartialResults(bundle: Bundle) {}
+                override fun onEvent(i: Int, bundle: Bundle) {}
+            })
+        }
+    }
+
+    // Request permissions
+    LaunchedEffect(Unit) {
+        if (ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO)
+            != PackageManager.PERMISSION_GRANTED
+        ) {
+            ActivityCompat.requestPermissions(
+                context as ComponentActivity,
+                arrayOf(Manifest.permission.RECORD_AUDIO),
+                PackageManager.PERMISSION_GRANTED
+            )
+        }
+    }
+
+    // Clean up resources when the screen is closed
+    DisposableEffect(Unit) {
+        onDispose {
+            textToSpeech.stop()
+            textToSpeech.shutdown()
+            speechRecognizer.destroy()
+        }
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        Text(
+            text = "AI Voice Assistant",
+            fontSize = 24.sp,
+            modifier = Modifier.fillMaxWidth(),
+            textAlign = TextAlign.Center
+        )
+
+        // Input display
+        TextField(
+            value = inputText,
+            onValueChange = { inputText = it },
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(80.dp),
+            label = { Text("Your question") },
+            readOnly = true
+        )
+
+        // Output display
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f)
+                .clip(RoundedCornerShape(8.dp))
+                .background(MaterialTheme.colorScheme.surfaceVariant)
+                .padding(16.dp)
+        ) {
+            if (isProcessing) {
+                CircularProgressIndicator(
+                    modifier = Modifier.align(Alignment.Center)
+                )
+            } else {
+                Text(
+                    text = outputText,
+                    fontSize = 16.sp,
+                    modifier = Modifier
+                        .fillMaxSize()
+                )
+            }
+        }
+
+        // Control button
+        Button(
+            onClick = {
+                if (textToSpeech.isSpeaking) {
+                    textToSpeech.stop()
+                } else if (!isListening) {
+                    isListening = true
+                    speechRecognizer.startListening(recognizerIntent)
+                } else {
+                    speechRecognizer.stopListening()
+                    isListening = false
+                }
+            },
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(56.dp),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = if (isListening) MaterialTheme.colorScheme.error
+                else MaterialTheme.colorScheme.primary
+            )
+        ) {
+            Text(
+                text = when {
+                    textToSpeech.isSpeaking -> "Stop Speaking"
+                    isListening -> "Stop Listening"
+                    else -> "Start Voice Assistant"
+                }
+            )
+        }
+    }
+}
+
+private fun callChatGPT(
+    context: android.content.Context,
+    input: String,
+    apiKey: String,
+    endpoint: String,
+    onStart: () -> Unit,
+    onResponse: (String) -> Unit,
+    onError: (String) -> Unit
+) {
+    onStart()
+    Log.d(TAG, "Calling ChatGPT with: $input")
+
+    val jsonObject = JSONObject().apply {
+        put("model", "gpt-3.5-turbo")
+        put("messages", JSONArray().apply {
+            put(JSONObject().apply {
+                put("role", "user")
+                put("content", input)
+            })
+        })
+    }
+
+    val jsonRequest = object : JsonObjectRequest(
+        Method.POST, endpoint, jsonObject,
+        { response ->
+            try {
+                val output = response.getJSONArray("choices")
+                    .getJSONObject(0)
+                    .getJSONObject("message")
+                    .getString("content")
+                Log.d(TAG, "Response received: $output")
+                onResponse(output)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error parsing response: ${e.message}")
+                onError("Failed to parse response: ${e.message}")
+            }
+        },
+        { error ->
+            Log.e(TAG, "Error: ${error.message}")
+            onError("Network error: ${error.message ?: "Unknown error"}")
+        }
+    ) {
+        override fun getHeaders(): Map<String, String> {
+            return mapOf(
+                "Authorization" to "Bearer $apiKey",
+                "Content-Type" to "application/json"
+            )
+        }
+    }
+
+    // Set timeout
+    jsonRequest.retryPolicy = DefaultRetryPolicy(
+        60000,
+        DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
+        DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
+    )
+
+    // Add to queue
+    Volley.newRequestQueue(context).add(jsonRequest)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/deepsea/ui/DeepSeaApp.kt b/app/src/main/java/com/example/deepsea/ui/DeepSeaApp.kt
index eb625d4..1e16701 100644
--- a/app/src/main/java/com/example/deepsea/ui/DeepSeaApp.kt
+++ b/app/src/main/java/com/example/deepsea/ui/DeepSeaApp.kt
@@ -49,6 +49,7 @@ import android.util.Log
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.remember
 import androidx.navigation.compose.rememberNavController
+import com.example.deepsea.AI_assistant.VoiceAssistantScreen
 import com.example.deepsea.data.model.Language
 import com.example.deepsea.ui.components.UnitData
 import com.example.deepsea.ui.profile.ProfilePage
@@ -60,6 +61,8 @@ import com.example.deepsea.ui.screens.PathSelectionPage
 import com.example.deepsea.ui.screens.SurveySelectionPage
 import com.example.deepsea.ui.theme.FeatherGreen
 
+
+
 @OptIn(ExperimentalSharedTransitionApi::class)
 @Preview
 @Composable
@@ -197,6 +200,7 @@ fun MainContainer(
                                 "Favorites" -> nestedNavController.navController.navigate("favorites_route")
                                 "Settings" -> nestedNavController.navController.navigate("settings_route")
                                 "Help" -> nestedNavController.navController.navigate("help_route")
+                                "Voice Assistant" -> nestedNavController.navController.navigate("home/voice_assistant")
                             }
                         }
                     )
@@ -238,6 +242,9 @@ fun MainContainer(
                 composable("learn-selection") {
                     LanguageSelectionPage(nestedNavController.navController)
                 }
+                composable("home/voice_assistant") {
+                    VoiceAssistantScreen()
+                }
 
 
 
diff --git a/app/src/main/java/com/example/deepsea/ui/MainActivity.kt b/app/src/main/java/com/example/deepsea/ui/MainActivity.kt
index 9d0714c..5424295 100644
--- a/app/src/main/java/com/example/deepsea/ui/MainActivity.kt
+++ b/app/src/main/java/com/example/deepsea/ui/MainActivity.kt
@@ -1,5 +1,6 @@
 package com.example.deepsea.ui
 
+import android.content.pm.PackageManager
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -11,6 +12,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.core.app.ActivityCompat
 import com.example.deepsea.ui.screens.LoginPage
 import com.example.deepsea.ui.theme.DeepSeaTheme
 
@@ -21,5 +23,6 @@ class MainActivity : ComponentActivity() {
         setContent {
             DeepSeaApp()
         }
+
     }
 }
diff --git a/app/src/main/java/com/example/deepsea/ui/components/Button.kt b/app/src/main/java/com/example/deepsea/ui/components/Button.kt
index a6eaa0f..8bee734 100644
--- a/app/src/main/java/com/example/deepsea/ui/components/Button.kt
+++ b/app/src/main/java/com/example/deepsea/ui/components/Button.kt
@@ -212,6 +212,7 @@ fun DeepSeaFAButton(
                     "Favorites" to Icons.Default.Favorite,
                     "Settings" to Icons.Default.Settings,
                     "Help" to Icons.Default.Info
+
                 )
             } else {
                 iconOptions
diff --git a/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt b/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt
index 2d7a623..11e5dc0 100644
--- a/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt
+++ b/app/src/main/java/com/example/deepsea/ui/components/TopBar.kt
@@ -65,6 +65,7 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
     systemUiController.setStatusBarColor(animatedColor)
     systemUiController.setNavigationBarColor(Color.White)
 
+
     Box(
         modifier = Modifier
             .zIndex(10f)
@@ -83,33 +84,28 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(top = 20.dp, bottom = 16.dp),
-                verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 BarIcon(R.drawable.flag_japan)
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    BarIcon(
-                        icon = R.drawable.ic_fire,
-                        text = "1",
-                        onClick = { showStreakDialog.value = true }
+                if (showStreakDialog.value) {
+                    AlertDialog(
+                        onDismissRequest = { showStreakDialog.value = false },
+                        confirmButton = {},
+                        title = { Text("Streak Calendar") },
+                        text = {
+                            StreakCalendar()
+                        }
                     )
-                    BarIcon(R.drawable.ic_gem, "505")
-                    BarIcon(R.drawable.ic_heart, "5")
                 }
-            }
 
-            if (showStreakDialog.value) {
-                AlertDialog(
-                    onDismissRequest = { showStreakDialog.value = false },
-                    confirmButton = {},
-                    title = { Text("Streak Calendar") },
-                    text = {
-                        StreakCalendar()
-                    }
+                BarIcon(
+                    icon = R.drawable.ic_fire,
+                    text = "1",
+                    onClick = { showStreakDialog.value = true }
                 )
+
+                BarIcon(R.drawable.ic_gem, "505")
+                BarIcon(R.drawable.ic_heart, "5")
             }
 
             Box {
@@ -126,10 +122,7 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
                 Icon(
                     imageVector = Icons.Default.KeyboardArrowUp,
                     tint = Color.White,
-                    contentDescription = "up",
-                    modifier = Modifier
-                        .align(Alignment.TopEnd)
-                        .padding(end = 8.dp)
+                    contentDescription = "up"
                 )
             }
         }
@@ -137,7 +130,6 @@ fun TopBar(units: List<UnitData> = listOf(UnitData()), visibleUnitIndex: Int = 0
 }
 
 
-
 @Composable
 fun BarIcon(@DrawableRes icon: Int, text: String? = null, saturation: Float = 1f, onClick: (() -> Unit)? = null) {
     Row(
@@ -202,5 +194,4 @@ fun StreakCalendar() {
             }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt b/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt
index 15ef5ea..f476fd9 100644
--- a/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt
+++ b/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt
@@ -11,15 +11,19 @@ import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 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.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -53,6 +57,10 @@ import com.example.deepsea.ui.theme.FeatherGreen
 import com.example.deepsea.ui.theme.Gray
 import com.example.deepsea.ui.theme.Polar
 import kotlinx.coroutines.launch
+import androidx.compose.material.icons.filled.Mic
+
+
+
 
 /**
  * Extension function to add composable with composition local to NavGraphBuilder
@@ -143,7 +151,8 @@ fun HomeScreen(units: List<UnitData> = emptyList(), navController: NavController
     StarDialog(
         isDialogShown = isDialogShown,
         isDialogInteractive = isDialogInteractive,
-        dialogTransition = dialogTransition
+        dialogTransition = dialogTransition,
+        navController = navController
     )
 }
 
@@ -186,7 +195,8 @@ private fun handleStarTap(
 fun StarDialog(
     isDialogShown: Boolean,
     isDialogInteractive: Boolean,
-    dialogTransition: Float
+    dialogTransition: Float,
+    navController: NavController
 ) {
     Box(
         modifier = Modifier.fillMaxSize(),
@@ -232,6 +242,21 @@ fun StarDialog(
                 color = if (isDialogInteractive) Color.White else Color.DarkGray.copy(0.3f)
             )
 
+            Button(
+                onClick = { navController.navigate("home/voice_assistant") },
+                modifier = Modifier
+                    .padding(16.dp)
+                    .align(Alignment.CenterHorizontally)
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    Icon(Icons.Filled.Mic, contentDescription = "Voice")
+                    Text("Voice Assistant")
+                }
+            }
+
             // Action button
             Button(
                 modifier = Modifier.fillMaxWidth(),
diff --git a/app/src/main/res/layout/activity_voice_assistant.xml b/app/src/main/res/layout/activity_voice_assistant.xml
new file mode 100644
index 0000000..6bb95a6
--- /dev/null
+++ b/app/src/main/res/layout/activity_voice_assistant.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Output"
+        android:textSize="18sp"
+        android:padding="8dp" />
+
+    <EditText
+        android:id="@+id/editText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Input"
+        android:padding="8dp" />
+
+    <Button
+        android:id="@+id/buttonAssist"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Start Assistant"
+        android:onClick="buttonAssist" />
+</LinearLayout>
\ No newline at end of file

From 839606dc3096a3f2ad28037b43329e02bf388f94 Mon Sep 17 00:00:00 2001
From: HuyVo117 <nhathuy1172005@gmail.com>
Date: Thu, 24 Apr 2025 23:04:12 +0700
Subject: [PATCH 4/5] add bottombar to the homescreen

---
 .../main/java/com/example/deepsea/ui/screens/HomeScreen.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt b/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt
index 7994302..47534bc 100644
--- a/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt
+++ b/app/src/main/java/com/example/deepsea/ui/screens/HomeScreen.kt
@@ -57,7 +57,6 @@ import com.example.deepsea.ui.theme.FeatherGreen
 import com.example.deepsea.ui.theme.Gray
 import com.example.deepsea.ui.theme.Polar
 import kotlinx.coroutines.launch
-import androidx.compose.material.icons.filled.Mic
 
 
 
@@ -112,6 +111,9 @@ fun HomeScreen(units: List<UnitData> = emptyList(), navController: NavController
                 units = units,
                 visibleUnitIndex = visibleHeadingIndex,
             )
+        },
+        bottomBar = {
+            DeepSeaBottomBar(navController=navController)
         }
     ) {
         // Content area with scrolling units

From f8b3e5afc0ac2b897abd53e5878bc083433a4be8 Mon Sep 17 00:00:00 2001
From: HuyVo117 <nhathuy1172005@gmail.com>
Date: Tue, 29 Apr 2025 12:32:38 +0700
Subject: [PATCH 5/5] Preview Learningpage

---
 .../example/deepsea/ui/screens/LearnScreen.kt | 165 +++++++++++++++++-
 1 file changed, 156 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/example/deepsea/ui/screens/LearnScreen.kt b/app/src/main/java/com/example/deepsea/ui/screens/LearnScreen.kt
index a5eef46..0c10282 100644
--- a/app/src/main/java/com/example/deepsea/ui/screens/LearnScreen.kt
+++ b/app/src/main/java/com/example/deepsea/ui/screens/LearnScreen.kt
@@ -1,28 +1,175 @@
 package com.example.deepsea.ui.screens
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 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.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.ArrowLeft
+import androidx.compose.material.icons.filled.ArrowRight
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 
 @Composable
-fun LearnPage() {
+fun QuizImageScreen() {
     Column(
-        modifier = Modifier.fillMaxSize(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color(0xFF1E1E3F)), // Màu nền tối giống trong ảnh
+        horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text("Welcome to learn page")
+        // Phần trên cùng: Khung bao bọc mũi tên quay lại và "Single Player"
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(50.dp)
+                .background(Color(0xFF2A2A5A)) // Thanh tiêu đề màu tối hơn
+                .padding(horizontal = 8.dp),
+            contentAlignment = Alignment.CenterStart
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Start
+            ) {
+                // Nút mũi tên quay lại
+                IconButton(
+                    onClick = { /* Xử lý quay lại */ },
+                    modifier = Modifier.size(40.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.ArrowBack,
+                        contentDescription = "Back",
+                        tint = Color.White
+                    )
+                }
+
+                // Khung "Single Player"
+                Box(
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(Color(0xFF3A3A6A))
+                        .padding(horizontal = 12.dp, vertical = 4.dp)
+                ) {
+                    Text(
+                        text = "Single Player",
+                        color = Color.White,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+                }
+            }
+        }
+
+        // Phần câu hỏi: Khung bao bọc "Question 1/10" và hai mũi tên
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(40.dp)
+                .background(Color(0xFF2A2A5A))
+                .padding(horizontal = 8.dp),
+            contentAlignment = Alignment.Center
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                // Khung "Question 1/10"
+                Box(
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(Color(0xFF3A3A6A))
+                        .padding(horizontal = 12.dp, vertical = 4.dp)
+                ) {
+                    Text(
+                        text = "Question 1/10",
+                        color = Color.White,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+                }
+
+                // Hai nút mũi tên trái/phải
+                Row {
+                    IconButton(
+                        onClick = { /* Xử lý mũi tên trái */ },
+                        modifier = Modifier.size(30.dp)
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.ArrowLeft,
+                            contentDescription = "Previous",
+                            tint = Color.White
+                        )
+                    }
+                    IconButton(
+                        onClick = { /* Xử lý mũi tên phải */ },
+                        modifier = Modifier.size(30.dp)
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.ArrowRight,
+                            contentDescription = "Next",
+                            tint = Color.White
+                        )
+                    }
+                }
+            }
+        }
+
+        // Phần hình ảnh chính giữa
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(0.5f)
+                .padding(16.dp),
+            contentAlignment = Alignment.Center
+        ) {
+            // Placeholder cho hình ảnh
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(300.dp)
+                    .background(Color.Gray)
+            ) {
+                Text(
+                    text = "Image Placeholder",
+                    color = Color.White,
+                    modifier = Modifier.align(Alignment.Center),
+                    textAlign = TextAlign.Center
+                )
+            }
+        }
+
+        // Phần dưới cùng (giữ nguyên)
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(100.dp)
+                .background(Color(0xFF1E1E3F))
+        )
     }
 }
 
-
-@Preview
+@Preview(showBackground = true, apiLevel = 35)
 @Composable
-fun LearnScreenPreview(){
-    LearnPage()
+fun QuizImageScreenPreview() {
+    QuizImageScreen()
 }
\ No newline at end of file