Merge 341e33d into 789ce96

Signa-Lingua · Jun 20, 2024 · 7a0355e · 7a0355e
2 parents 789ce96 + 341e33d
commit 7a0355e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/app/src/main/java/com/singa/asl/ui/components/InputAlertDialog.kt b/app/src/main/java/com/singa/asl/ui/components/InputAlertDialog.kt
@@ -45,6 +45,7 @@ fun PopupInputAlertDialog(
                 } else {
                     OutlinedTextField(
                         value = value,
+                        modifier = Modifier.fillMaxWidth(),
                         placeholder = { Text(text = "Enter title", color = Color.Gray) },
                         onValueChange = {
                             onValueChange(it)

diff --git a/app/src/main/java/com/singa/asl/ui/components/MySendInput.kt b/app/src/main/java/com/singa/asl/ui/components/MySendInput.kt
@@ -41,7 +41,7 @@ fun MySendInput(
         enabled = !isLoading,
         modifier = modifier
             .fillMaxWidth(
-                if (!isFocused) 0.65f else 1f
+               if (!isFocused) 0.65f else 1f
             )
             .onFocusChanged {
                 setInputFocus(it.isFocused)

diff --git a/app/src/main/java/com/singa/asl/ui/screen/welcome/WelcomeScreen.kt b/app/src/main/java/com/singa/asl/ui/screen/welcome/WelcomeScreen.kt
@@ -21,9 +21,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+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
 import com.singa.asl.R
 import com.singa.asl.ui.theme.Color1
 import com.singa.asl.ui.theme.Color5
@@ -84,22 +86,24 @@ fun WelcomeContent(
             Text(
                 text = "Welcome",
                 style = MaterialTheme.typography.bodyLarge,
-                color = Color.Black
+                color = Color.Black,
+                fontSize = 20.sp,
+                fontWeight = FontWeight.Black
             )
 
             Spacer(
                 modifier = Modifier.fillMaxHeight(0.02f)
             )
 
             Text(
-                text = "Login or Guest account to take apps, take part in challenge, and more.",
+                text = "Login or Guest account",
                 style = MaterialTheme.typography.bodyMedium,
                 color = Color.Black,
                 textAlign = TextAlign.Center
             )
 
             Spacer(
-                modifier = Modifier.fillMaxHeight(0.1f)
+                modifier = Modifier.height(8.dp)
             )
 
             Button(

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,9 +3,11 @@
     <string name="onboarding_1_title">Welcome to SINGA</string>
     <string name="onboarding_1_desc">Learn American Sign Language with ease</string>
     <string name="onboarding_2_title">Learn at your own pace</string>
-    <string name="onboarding_2_desc">Learn ASL at your own pace with our interactive lessons</string>
-    <string name="onboarding_3_title">Practice makes perfect</string>
-    <string name="onboarding_3_desc">Practice your ASL skills with our interactive quizzes</string>
+    <string name="onboarding_2_desc">Learn ASL at your own pace with our transcript feature</string>
+    <string name="onboarding_3_title">Realtime Recognizer</string>
+    <string name="onboarding_3_desc">
+    Learn ASL with our realtime recognizer, which will help you to learn ASL faster
+    </string>
     <string name="get_started">Get Started</string>
     <string name="board">Let\'s embark together on a journey to overcome challenges, enriching communication for all</string>
     <string name="articles_tittle">Google to pay 700 million in case of cancer</string>