Skip to content

Commit fa8b8f1

Browse files
committed
- formatting fixes
1 parent 2e48680 commit fa8b8f1

6 files changed

Lines changed: 14 additions & 15 deletions

File tree

app/src/main/java/be/scri/App.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ import be.scri.ui.screens.download.DataDownloadViewModel
4949
import be.scri.ui.screens.download.DownloadActions
5050
import be.scri.ui.screens.download.DownloadDataScreen
5151
import be.scri.ui.screens.settings.SettingsScreen
52+
import be.scri.ui.screens.tutorial.TutorialNavigator
5253
import be.scri.ui.theme.ScribeTheme
5354
import kotlinx.coroutines.CoroutineScope
5455
import kotlinx.coroutines.launch
55-
import be.scri.ui.screens.tutorial.TutorialNavigator
5656

5757
/**
5858
* The root composable function that sets up the app's theme, navigation, and screen layout.
@@ -184,7 +184,7 @@ fun ScribeApp(
184184
pagerState.scrollToPage(aboutIndex)
185185
}
186186
}
187-
}
187+
},
188188
)
189189
HintDialog(
190190
pagerState = pagerState,
@@ -283,8 +283,8 @@ fun ScribeApp(
283283
TutorialNavigator(
284284
onTutorialExit = {
285285
navController.popBackStack()
286-
},
287-
modifier = Modifier.padding(innerPadding)
286+
},
287+
modifier = Modifier.padding(innerPadding),
288288
)
289289
}
290290

app/src/main/java/be/scri/ui/screens/about/AboutUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ object AboutUtil {
284284
onRateScribeClick: () -> Unit,
285285
onMailClick: () -> Unit,
286286
onResetHintsClick: () -> Unit,
287-
onTutorialClick : () -> Unit,
287+
onTutorialClick: () -> Unit,
288288
context: Context,
289289
isConjugateApp: Boolean = false,
290290
): ScribeItemList =

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ fun TutorialHomeScreen(
8989
color = MaterialTheme.colorScheme.onBackground,
9090
fontSize = 16.sp,
9191
)
92-
93-
9492
}
9593
Spacer(modifier = Modifier.height(24.dp))
9694

@@ -104,17 +102,16 @@ fun TutorialHomeScreen(
104102

105103
Spacer(modifier = Modifier.height(16.dp))
106104

107-
108-
109105
// Intro text
110106
Card(
111107
shape = RoundedCornerShape(12.dp),
112108
colors = CardDefaults.cardColors(containerColor = cardBackground),
113109
modifier = Modifier.fillMaxWidth(),
114110
) {
115111
Text(
116-
text = "This quick tutorial will show you how to use Scribe to support writing in your second language. " +
117-
"\nMake sure you select the desired Scribe keyboard by pressing \uD83C\uDF10 when typing.",
112+
text =
113+
"This quick tutorial will show you how to use Scribe to support writing in your second language. " +
114+
"\nMake sure you select the desired Scribe keyboard by pressing \uD83C\uDF10 when typing.",
118115
color = textColor,
119116
fontSize = 14.sp,
120117
modifier = Modifier.padding(16.dp),

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ import androidx.compose.ui.Modifier
1919
* @param onTutorialExit Callback when the user exits the tutorial (back to About tab).
2020
*/
2121
@Composable
22-
fun TutorialNavigator(onTutorialExit: () -> Unit,
23-
modifier: Modifier = Modifier) {
22+
fun TutorialNavigator(
23+
onTutorialExit: () -> Unit,
24+
modifier: Modifier = Modifier,
25+
) {
2426
var currentScreen by remember { mutableStateOf("home") }
2527
var currentChapterIndex by remember { mutableIntStateOf(0) }
2628
var currentStepIndex by remember { mutableIntStateOf(0) }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ fun TutorialStepScreen(
199199
) {
200200
Row(
201201
verticalAlignment = Alignment.CenterVertically,
202-
modifier = Modifier.clickable { onBackPress() }.padding(8.dp)
202+
modifier = Modifier.clickable { onBackPress() }.padding(8.dp),
203203
) {
204204
Icon(
205205
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowLeft,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fun WrongKeyboardScreen(
9191
) {
9292
Row(
9393
verticalAlignment = Alignment.CenterVertically,
94-
modifier = Modifier.clickable { onBackPress() }.padding(8.dp)
94+
modifier = Modifier.clickable { onBackPress() }.padding(8.dp),
9595
) {
9696
Icon(
9797
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowLeft,

0 commit comments

Comments
 (0)