From aaba48051a5075dfb7807b6d526cdacf8fadbe0a Mon Sep 17 00:00:00 2001
From: Daocon <134820492+Daocon@users.noreply.github.com>
Date: Sat, 7 Dec 2024 16:03:51 +0700
Subject: [PATCH] =?UTF-8?q?feat(feat/language):=20th=C3=AAm=20=C4=91a=20ng?=
 =?UTF-8?q?=C3=B4n=20ng=E1=BB=AF=20m=E1=BB=99t=20s=E1=BB=91=20m=C3=A0n=20c?=
 =?UTF-8?q?=C3=B2n=20thi=E1=BA=BFu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/auth/welcome/WelcomeScreen.kt       |  8 +++++---
 .../quickmem/presentation/component/LearningBars.kt  | 12 +++++++-----
 app/src/main/res/values-vi/strings.xml               |  5 ++++-
 app/src/main/res/values/strings.xml                  |  4 ++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/auth/welcome/WelcomeScreen.kt b/app/src/main/java/com/pwhs/quickmem/presentation/auth/welcome/WelcomeScreen.kt
index 1b092504..eec716cd 100644
--- a/app/src/main/java/com/pwhs/quickmem/presentation/auth/welcome/WelcomeScreen.kt
+++ b/app/src/main/java/com/pwhs/quickmem/presentation/auth/welcome/WelcomeScreen.kt
@@ -186,6 +186,8 @@ private fun WelCome(
 
             item {
                 val color = colorScheme.onSurface
+                val textPart1 = stringResource(R.string.txt_all_the_tools_for_learning_success)
+                val textPart2 = stringResource(R.string.txt_in_one_app)
                 Text(
                     buildAnnotatedString {
                         withStyle(
@@ -201,13 +203,13 @@ private fun WelCome(
                                     fontWeight = FontWeight.Black
                                 )
                             ) {
-                                append("All the tools for \nlearning success.\n")
+                                append(textPart1)
                                 withStyle(
                                     style = SpanStyle(
                                         color = premiumColor,
                                     )
                                 ) {
-                                    append("In one app.")
+                                    append(textPart2)
                                 }
                             }
                         }
@@ -233,7 +235,7 @@ private fun WelCome(
                     textColor = colorScheme.primary
                 )
             }
-            
+
             item {
                 Spacer(modifier = Modifier.padding(20.dp))
             }
diff --git a/app/src/main/java/com/pwhs/quickmem/presentation/component/LearningBars.kt b/app/src/main/java/com/pwhs/quickmem/presentation/component/LearningBars.kt
index f0c13836..8d6b0887 100644
--- a/app/src/main/java/com/pwhs/quickmem/presentation/component/LearningBars.kt
+++ b/app/src/main/java/com/pwhs/quickmem/presentation/component/LearningBars.kt
@@ -13,9 +13,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.pwhs.quickmem.R
 import com.pwhs.quickmem.domain.model.study_time.StudyTimeModel
 import ir.ehsannarmani.compose_charts.ColumnChart
 import ir.ehsannarmani.compose_charts.models.Bars
@@ -41,7 +43,7 @@ fun LearningBars(
                 .padding(16.dp),
             data = listOf(
                 Bars(
-                    label = "Flip",
+                    label = stringResource(R.string.txt_flip),
                     values = listOf(
                         Bars.Data(
                             value = (studyTime?.flip?.toDouble() ?: 0.0) / 1000,
@@ -55,7 +57,7 @@ fun LearningBars(
                     )
                 ),
                 Bars(
-                    label = "Quiz",
+                    label = stringResource(R.string.txt_quiz),
                     values = listOf(
                         Bars.Data(
                             value = (studyTime?.quiz?.toDouble() ?: 0.0) / 1000,
@@ -69,7 +71,7 @@ fun LearningBars(
                     )
                 ),
                 Bars(
-                    label = "True/False",
+                    label = stringResource(R.string.txt_true_false),
                     values = listOf(
                         Bars.Data(
                             value = (studyTime?.trueFalse?.toDouble() ?: 0.0) / 1000,
@@ -83,7 +85,7 @@ fun LearningBars(
                     )
                 ),
                 Bars(
-                    label = "Write",
+                    label = stringResource(R.string.txt_write),
                     values = listOf(
                         Bars.Data(
                             value = (studyTime?.write?.toDouble() ?: 0.0) / 1000,
@@ -154,7 +156,7 @@ fun LearningBars(
         )
         Spacer(modifier = Modifier.padding(vertical = 20.dp))
         Text(
-            text = "Time spent on each learning type",
+            text = stringResource(R.string.txt_time_spent_on_each_learning_type),
             style = typography.titleMedium.copy(
                 fontWeight = FontWeight.Bold
             )
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 1e6b7d5c..6682a37c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -456,5 +456,8 @@
     <string name="txt_set_inappropriate">Nội dung không phù hợp</string>
     <string name="txt_set_cheating">Bộ học liệu này đang được sử dụng để gian lận</string>
     <string name="txt_set_ip_violation">Bộ học liệu này vi phạm quyền sở hữu trí tuệ của tôi</string>
-
+    <string name="txt_flip">Lật</string>
+    <string name="txt_time_spent_on_each_learning_type">Thời gian dành cho mỗi kiểu học</string>
+    <string name="txt_in_one_app">Trong một ứng dụng.</string>
+    <string name="txt_all_the_tools_for_learning_success">Tất cả các công cụ để\nthành công trong học tập.\n</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 21bf144e..34ed86aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -459,4 +459,8 @@
     <string name="txt_set_inappropriate">It is inappropriate</string>
     <string name="txt_set_cheating">It is being used to cheat</string>
     <string name="txt_set_ip_violation">It violates my intellectual property rights</string>
+    <string name="txt_flip">Flip</string>
+    <string name="txt_time_spent_on_each_learning_type">Time spent on each learning type</string>
+    <string name="txt_in_one_app">In one app.</string>
+    <string name="txt_all_the_tools_for_learning_success">All the tools for \nlearning success.\n</string>
 </resources>
\ No newline at end of file