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

Added restart of app when first setup isn't done

Browse Source 
when going back via phone feature, user sees the empty timetable
This commit is contained in:
matthias
2024-06-09 23:46:58 +02:00
parent d36cadeb18
commit 7bdcb7e3fb
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,10 +189,19 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
IconButton( IconButton(
onClick = { onClick = {
activity.finish() activity.finish()
if (setupDone) {
val intent = Intent(activity, StundenplanActivity::class.java) val intent = Intent(activity, StundenplanActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(activity, intent, null) 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(
imageVector = Icons.Filled.ArrowBack, imageVector = Icons.Filled.ArrowBack,
@@ -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()
if (setupDone) {
//Reopen of activity so values will be updated //Reopen of activity so values will be updated
val intent = Intent(activity, StundenplanActivity::class.java) val intent = Intent(activity, StundenplanActivity::class.java)
//Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice //Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(activity, intent, null) 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)