mat.mey/CleverClass
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mat.mey:1056dc39bf4b442625e9ad32ba9ef6ecb5fa16c9
Branches Tags
mat.mey:master
...
compare: mat.mey:7bdcb7e3fba7fcbe576ce3a612f01c3a7e94a724
Branches Tags
mat.mey:master

2 Commits
1056dc39bf ... 7bdcb7e3fb

Author SHA1 Message Date
matthias
7bdcb7e3fb Added restart of app when first setup isn't done 
when going back via phone feature, user sees the empty timetable
 2024-06-09 23:46:58 +02:00
matthias
d36cadeb18 Fixed typo 2024-06-09 23:45:32 +02:00
2 changed files with 27 additions and 9 deletions
Expand all files Collapse all files

2
app/src/main/java/com/schoolapp/cleverclass/StundenplanActivity.kt
View File

@@ -239,7 +239,7 @@ fun StundenplanContent(activity: ComponentActivity, loadedLessons: List<List<Les
text = { text = {
Text( Text(
text = "Die Breite der Spalten ist auf eine bestimmte Größe festgelegt.\n\n" + text = "Die Breite der Spalten ist auf eine bestimmte Größe festgelegt.\n\n" +
"Zu lange eingaben können horizontal gescrollt werden.", "Zu lange Eingaben können horizontal gescrollt werden.",
color = MaterialTheme.colorScheme.onPrimaryContainer, color = MaterialTheme.colorScheme.onPrimaryContainer,
style = MaterialTheme.typography.labelMedium) style = MaterialTheme.typography.labelMedium)
}, },

34
app/src/main/java/com/schoolapp/cleverclass/TimeTableSetupActivity.kt
View File

@@ -189,9 +189,18 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
IconButton( IconButton(
onClick = { onClick = {
activity.finish() activity.finish()
val intent = Intent(activity, StundenplanActivity::class.java) if (setupDone) {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) val intent = Intent(activity, StundenplanActivity::class.java)
startActivity(activity, intent, null) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(activity, intent, null)
}
else {
val intent = Intent(activity, MainActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(activity, intent, null)
}
} }
) { ) {
Icon( Icon(
@@ -383,11 +392,20 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
editor.putInt("breakAmnt", breakAmnt.toInt()) editor.putInt("breakAmnt", breakAmnt.toInt())
editor.apply() editor.apply()
activity.finish() activity.finish()
//Reopen of activity so values will be updated if (setupDone) {
val intent = Intent(activity, StundenplanActivity::class.java) //Reopen of activity so values will be updated
//Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice val intent = Intent(activity, StundenplanActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) //Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice
startActivity(activity, intent, null) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(activity, intent, null)
}
else {
val intent = Intent(activity, MainActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(activity, intent, null)
}
}, },
modifier = Modifier modifier = Modifier
.padding(5.dp) .padding(5.dp)