Skip to content

Commit 0b07a93

Browse files
ashb155ashb155
committed
- formatting fixes
1 parent 7562207 commit 0b07a93

2 files changed

Lines changed: 54 additions & 49 deletions

File tree

‎app/src/main/java/be/scri/ui/screens/tutorial/TutorialContent.kt‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ package be.scri.ui.screens.tutorial
88
* through a specific Scribe feature.
99
*/
1010
object TutorialContent {
11-
12-
private fun getLanguageName(languageCode: String): String {
13-
return when (languageCode) {
11+
private fun getLanguageName(languageCode: String): String =
12+
when (languageCode) {
1413
"en" -> "English"
1514
"es" -> "Spanish"
1615
"fr" -> "French"
@@ -20,35 +19,36 @@ object TutorialContent {
2019
"sv" -> "Swedish"
2120
else -> "German"
2221
}
23-
}
2422

2523
/**
2624
* Chapter 1: Noun Annotation.
2725
* Teaches users about gender tags that appear when typing nouns.
2826
*/
2927
fun getNounAnnotationSteps(languageCode: String): List<TutorialStep> {
3028
val language = getLanguageName(languageCode)
31-
val (fatherWord, fatherTag, fatherGender) = when (languageCode) {
32-
"en" -> Triple("father", "M", "Masculine")
33-
"es" -> Triple("padre", "M", "Masculino")
34-
"fr" -> Triple("père", "M", "Masculin")
35-
"it" -> Triple("padre", "M", "Maschile")
36-
"pt" -> Triple("pai", "M", "Masculino")
37-
"ru" -> Triple("отец", "M", "Мужской")
38-
"sv" -> Triple("far", "C", "Common")
39-
else -> Triple("Vater", "M", "Maskulin")
40-
}
29+
val (fatherWord, fatherTag, fatherGender) =
30+
when (languageCode) {
31+
"en" -> Triple("father", "M", "Masculine")
32+
"es" -> Triple("padre", "M", "Masculino")
33+
"fr" -> Triple("père", "M", "Masculin")
34+
"it" -> Triple("padre", "M", "Maschile")
35+
"pt" -> Triple("pai", "M", "Masculino")
36+
"ru" -> Triple("отец", "M", "Мужской")
37+
"sv" -> Triple("far", "C", "Common")
38+
else -> Triple("Vater", "M", "Maskulin")
39+
}
4140

42-
val (motherWord, motherTag, motherGender) = when (languageCode) {
43-
"en" -> Triple("mother", "F", "Feminine")
44-
"es" -> Triple("madre", "F", "Femenino")
45-
"fr" -> Triple("mère", "F", "Féminin")
46-
"it" -> Triple("madre", "F", "Femminile")
47-
"pt" -> Triple("mãe", "F", "Feminino")
48-
"ru" -> Triple("мать", "F", "Женский")
49-
"sv" -> Triple("mor", "C", "Common")
50-
else -> Triple("Mutter", "F", "Feminin")
51-
}
41+
val (motherWord, motherTag, motherGender) =
42+
when (languageCode) {
43+
"en" -> Triple("mother", "F", "Feminine")
44+
"es" -> Triple("madre", "F", "Femenino")
45+
"fr" -> Triple("mère", "F", "Féminin")
46+
"it" -> Triple("madre", "F", "Femminile")
47+
"pt" -> Triple("mãe", "F", "Feminino")
48+
"ru" -> Triple("мать", "F", "Женский")
49+
"sv" -> Triple("mor", "C", "Common")
50+
else -> Triple("Mutter", "F", "Feminin")
51+
}
5252

5353
return listOf(
5454
TutorialStep(
@@ -74,7 +74,7 @@ object TutorialContent {
7474
* Chapter 2: Word Translation.
7575
* Teaches users how to use the Translate command via the Scribe key.
7676
*/
77-
fun wordTranslationSteps(languageCode: String): List<TutorialStep>{
77+
fun wordTranslationSteps(languageCode: String): List<TutorialStep> {
7878
val language = getLanguageName(languageCode)
7979
return listOf(
8080
TutorialStep(
@@ -86,9 +86,10 @@ object TutorialContent {
8686
hint = "If your second language is not $language, change the language in your keyboard.",
8787
requiresValidation = false,
8888
),
89-
)}
89+
)
90+
}
9091

91-
fun verbConjugationSteps(languageCode: String) : List<TutorialStep>{
92+
fun verbConjugationSteps(languageCode: String): List<TutorialStep> {
9293
val language = getLanguageName(languageCode)
9394
return listOf(
9495
TutorialStep(
@@ -101,9 +102,10 @@ object TutorialContent {
101102
hint = "If your second language is not $language, change the language in your keyboard.",
102103
requiresValidation = false,
103104
),
104-
)}
105+
)
106+
}
105107

106-
fun nounPluralsSteps (languageCode: String) : List<TutorialStep> {
108+
fun nounPluralsSteps(languageCode: String): List<TutorialStep> {
107109
val language = getLanguageName(languageCode)
108110
return listOf(
109111
TutorialStep(
@@ -116,7 +118,8 @@ object TutorialContent {
116118
hint = "If your second language is not $language, change the language in your keyboard.",
117119
requiresValidation = false,
118120
),
119-
)}
121+
)
122+
}
120123

121124
/** Returns all chapters as a list of pairs (title, steps). */
122125
fun getAllChapters(languageCode: String = "de"): List<Pair<String, List<TutorialStep>>> =

‎app/src/main/java/be/scri/ui/screens/tutorial/TutorialNavigator.kt‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,24 @@ import android.content.BroadcastReceiver
66
import android.content.Context
77
import android.content.Intent
88
import android.content.IntentFilter
9+
import android.provider.Settings
910
import androidx.activity.compose.BackHandler
1011
import androidx.compose.runtime.Composable
12+
import androidx.compose.runtime.DisposableEffect
1113
import androidx.compose.runtime.getValue
1214
import androidx.compose.runtime.mutableIntStateOf
1315
import androidx.compose.runtime.mutableStateOf
1416
import androidx.compose.runtime.remember
1517
import androidx.compose.runtime.setValue
1618
import androidx.compose.ui.Modifier
17-
import android.provider.Settings
18-
import androidx.compose.runtime.DisposableEffect
1919
import androidx.compose.ui.platform.LocalContext
2020

21-
22-
23-
2421
private fun getCurrentScribeLanguage(context: Context): String {
25-
val currentImeId = Settings.Secure.getString(
26-
context.contentResolver,
27-
Settings.Secure.DEFAULT_INPUT_METHOD
28-
) ?: ""
22+
val currentImeId =
23+
Settings.Secure.getString(
24+
context.contentResolver,
25+
Settings.Secure.DEFAULT_INPUT_METHOD,
26+
) ?: ""
2927

3028
return when {
3129
currentImeId.contains("EnglishKeyboardIME") -> "en"
@@ -63,28 +61,32 @@ fun TutorialNavigator(
6361
}
6462

6563
DisposableEffect(context) {
66-
val receiver = object : BroadcastReceiver() {
67-
override fun onReceive(context: Context, intent: Intent) {
68-
if (intent.action == Intent.ACTION_INPUT_METHOD_CHANGED) {
69-
activeLanguageCode = getCurrentScribeLanguage(context)
64+
val receiver =
65+
object : BroadcastReceiver() {
66+
override fun onReceive(
67+
context: Context,
68+
intent: Intent,
69+
) {
70+
if (intent.action == Intent.ACTION_INPUT_METHOD_CHANGED) {
71+
activeLanguageCode = getCurrentScribeLanguage(context)
72+
}
7073
}
7174
}
72-
}
7375

7476
context.registerReceiver(
7577
receiver,
76-
IntentFilter(Intent.ACTION_INPUT_METHOD_CHANGED)
78+
IntentFilter(Intent.ACTION_INPUT_METHOD_CHANGED),
7779
)
7880

7981
onDispose {
8082
context.unregisterReceiver(receiver)
8183
}
8284
}
8385

84-
85-
val allChapters = remember(activeLanguageCode) {
86-
TutorialContent.getAllChapters(activeLanguageCode)
87-
}
86+
val allChapters =
87+
remember(activeLanguageCode) {
88+
TutorialContent.getAllChapters(activeLanguageCode)
89+
}
8890

8991
BackHandler {
9092
if (currentScreen == "home") {

0 commit comments

Comments
 (0)