Stundenplan most definitely finished
Added Commenting to StundenplanActivity and TimeTableSetupActivity
This commit is contained in:
matthias
@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
@@ -29,21 +30,30 @@ import androidx.compose.foundation.text.selection.TextSelectionColors
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.ArrowBack
|
||||
import androidx.compose.material.icons.outlined.Delete
|
||||
import androidx.compose.material.icons.outlined.Edit
|
||||
import androidx.compose.material.icons.outlined.Info
|
||||
import androidx.compose.material.ripple.LocalRippleTheme
|
||||
import androidx.compose.material.ripple.RippleAlpha
|
||||
import androidx.compose.material.ripple.RippleTheme
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Checkbox
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.FilledTonalButton
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedButton
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Tab
|
||||
import androidx.compose.material3.TabRow
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.CompositionLocalProvider
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
@@ -53,32 +63,22 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.schoolapp.cleverclass.ui.theme.CleverClassTheme
|
||||
import com.schoolapp.cleverclass.ui.theme.InputPrimaryColor
|
||||
import com.schoolapp.cleverclass.ui.theme.InputSecondaryColor
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.material.icons.outlined.Edit
|
||||
import androidx.compose.material.ripple.LocalRippleTheme
|
||||
import androidx.compose.material.ripple.RippleAlpha
|
||||
import androidx.compose.material.ripple.RippleTheme
|
||||
import androidx.compose.material3.FilledTonalButton
|
||||
import androidx.compose.material3.OutlinedButton
|
||||
import java.util.Locale
|
||||
import androidx.compose.material3.Checkbox
|
||||
import androidx.compose.material3.Tab
|
||||
import androidx.compose.material3.TabRow
|
||||
import androidx.compose.runtime.CompositionLocalProvider
|
||||
import androidx.core.content.ContextCompat.startActivity
|
||||
import com.schoolapp.cleverclass.LessonStoreManager.getLessons
|
||||
import com.schoolapp.cleverclass.LessonStoreManager.saveLessons
|
||||
import com.schoolapp.cleverclass.ui.theme.CleverClassTheme
|
||||
import com.schoolapp.cleverclass.ui.theme.InputPrimaryColor
|
||||
import com.schoolapp.cleverclass.ui.theme.InputSecondaryColor
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import java.util.Locale
|
||||
|
||||
private lateinit var activityType : String
|
||||
private lateinit var activityState : String
|
||||
private val listOfDays = listOf("Mo", "Di", "Mi", "Do", "Fr")
|
||||
|
||||
//Custom ripple to remove effect when touching tabs
|
||||
private class CustomRippleTheme : RippleTheme {
|
||||
@Composable
|
||||
override fun defaultColor(): Color = Color.Unspecified
|
||||
@@ -100,11 +100,13 @@ class TimeTableSetupActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
//Defines setup type --> Time vs. Day
|
||||
activityType = intent.getStringExtra(TYPE_KEY).toString()
|
||||
//Defines curent day of week
|
||||
activityState = intent.getStringExtra(STATE_KEY).toString()
|
||||
|
||||
//Load lessons of defined day from activityState
|
||||
var lessons = listOf<LessonData>()
|
||||
|
||||
if (activityType == "DaySetup") {
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
getLessons(this@TimeTableSetupActivity, listOfDays[activityState.toInt()]).collect { savedLessons ->
|
||||
@@ -131,6 +133,7 @@ class TimeTableSetupActivity : ComponentActivity() {
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<LessonData>){
|
||||
//One-time definition of the inputField colorscheme
|
||||
val inputFieldColors = TextFieldDefaults.outlinedTextFieldColors(
|
||||
textColor = MaterialTheme.colorScheme.onPrimaryContainer,
|
||||
containerColor = MaterialTheme.colorScheme.secondaryContainer,
|
||||
@@ -143,32 +146,36 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
unfocusedBorderColor = Color.Transparent
|
||||
)
|
||||
|
||||
//Declaration of most sharedPreferences-stored data
|
||||
val sharedPreferences = activity.getSharedPreferences("TimeTable", Context.MODE_PRIVATE)
|
||||
val editor = sharedPreferences.edit()
|
||||
|
||||
//Length of one lesson
|
||||
var lessonLength by remember {
|
||||
mutableStateOf(sharedPreferences.getInt("lessonLength", 0).toString())
|
||||
}
|
||||
|
||||
//Number of breaks on one day
|
||||
var breakAmnt by remember {
|
||||
mutableStateOf(sharedPreferences.getInt("breakAmnt", 0).toString())
|
||||
}
|
||||
|
||||
//Beginning time of the first lesson (Format: hh.mm)
|
||||
var firstLesson by remember {
|
||||
mutableStateOf(sharedPreferences.getFloat("firstLesson", 0.0f))
|
||||
}
|
||||
|
||||
//Value to determine whether the first setup will be loaded again
|
||||
var setupDone by remember {
|
||||
mutableStateOf(sharedPreferences.getBoolean("setupDone", false))
|
||||
}
|
||||
|
||||
//AlertDialog
|
||||
var showInfo by remember {
|
||||
mutableStateOf(false)
|
||||
}
|
||||
var showDeleteConfirmation by remember {
|
||||
mutableStateOf(false)
|
||||
}
|
||||
|
||||
//Variable for loaded lessons from onCreate()
|
||||
var lessons by remember {
|
||||
mutableStateOf(loadedLessons)
|
||||
}
|
||||
@@ -179,7 +186,14 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.primaryContainer),
|
||||
title = { Text(text = "") },
|
||||
navigationIcon = {
|
||||
IconButton(onClick = { activity.finish() }) {
|
||||
IconButton(
|
||||
onClick = {
|
||||
activity.finish()
|
||||
val intent = Intent(activity, StundenplanActivity::class.java)
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
||||
startActivity(activity, intent, null)
|
||||
}
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.ArrowBack,
|
||||
contentDescription = null,
|
||||
@@ -197,6 +211,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
.fillMaxHeight()
|
||||
.verticalScroll(rememberScrollState())
|
||||
) {
|
||||
//Background
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.primaryContainer,
|
||||
shape = RoundedCornerShape(20),
|
||||
@@ -205,6 +220,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally,
|
||||
modifier = Modifier.padding(16.dp)
|
||||
) {
|
||||
//Title
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(
|
||||
text = "Stundenplan Setup",
|
||||
@@ -215,6 +231,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
|
||||
//Info Button --> AlertDialog
|
||||
IconButton(onClick = { showInfo = !showInfo }) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Info,
|
||||
@@ -222,20 +239,13 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
tint = MaterialTheme.colorScheme.onPrimaryContainer
|
||||
)
|
||||
}
|
||||
if (activityType == "Settings")
|
||||
IconButton(onClick = { showDeleteConfirmation = !showDeleteConfirmation }) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Delete,
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(28.dp),
|
||||
tint = MaterialTheme.colorScheme.onPrimaryContainer
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
//Setup for basic time data (lesson/break length etc.)
|
||||
if (activityType == "TimeSetup") {
|
||||
//Time input begin of first lesson
|
||||
Text(
|
||||
text = "Beginn der 1. Stunde",
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
@@ -268,6 +278,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
//Duration of one lesson
|
||||
OutlinedTextField(
|
||||
value = lessonLength,
|
||||
onValueChange = { lessonLength = it },
|
||||
@@ -282,6 +293,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
//Input amount of breaks
|
||||
OutlinedTextField(
|
||||
value = breakAmnt,
|
||||
onValueChange = { breakAmnt = it},
|
||||
@@ -294,17 +306,20 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword)
|
||||
)
|
||||
|
||||
//Input of length and start time for each break
|
||||
if (breakAmnt != "") {
|
||||
//declaration of sharedPreferences for break data
|
||||
for (i in 0 until breakAmnt.toInt()) {
|
||||
var currentBrakeStartTime by remember{
|
||||
mutableStateOf(sharedPreferences.getFloat("Brake${i}StartTime", 0.0f))
|
||||
var currentBreakStartTime by remember{
|
||||
mutableStateOf(sharedPreferences.getFloat("break${i}StartTime", 0.0f))
|
||||
}
|
||||
var currentBrakeLength by remember{
|
||||
mutableStateOf(sharedPreferences.getInt("Brake${i}Length", 0).toString())
|
||||
var currentBreakLength by remember{
|
||||
mutableStateOf(sharedPreferences.getInt("break${i}Length", 0).toString())
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
//Input start time (break)
|
||||
Text(
|
||||
text = "Startzeit der ${i + 1}. Pause:",
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
@@ -316,8 +331,8 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
val mHour = c.get(Calendar.HOUR_OF_DAY)
|
||||
val mMinute = c.get(Calendar.MINUTE)
|
||||
val timePickerDialog = TimePickerDialog(activity, TimePickerDialog.OnTimeSetListener(function = { view, h, m ->
|
||||
currentBrakeStartTime = h.toFloat() + (m.toFloat() / 100)
|
||||
editor.putFloat("Brake${i}StartTime", currentBrakeStartTime)
|
||||
currentBreakStartTime = h.toFloat() + (m.toFloat() / 100)
|
||||
editor.putFloat("break${i}StartTime", currentBreakStartTime)
|
||||
}), mHour, mMinute, true)
|
||||
timePickerDialog.show()
|
||||
},
|
||||
@@ -329,7 +344,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
val decimalFormat = DecimalFormat("00.00", symbols)
|
||||
|
||||
Text(
|
||||
text = decimalFormat.format(currentBrakeStartTime) + " Uhr ",
|
||||
text = decimalFormat.format(currentBreakStartTime) + " Uhr ",
|
||||
color = MaterialTheme.colorScheme.onPrimaryContainer,
|
||||
style = MaterialTheme.typography.labelMedium
|
||||
)
|
||||
@@ -339,11 +354,14 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
|
||||
Spacer(modifier = Modifier.height(5.dp))
|
||||
|
||||
//Input duration (break)
|
||||
OutlinedTextField(
|
||||
value = currentBrakeLength,
|
||||
value = currentBreakLength,
|
||||
onValueChange = {
|
||||
currentBrakeLength = it
|
||||
editor.putInt("Brake${i}Length", currentBrakeLength.toInt())},
|
||||
currentBreakLength = it
|
||||
if (currentBreakLength != "") {
|
||||
editor.putInt("break${i}Length", currentBreakLength.toInt())
|
||||
}},
|
||||
label = { Text(text = "Länge der ${i + 1}. Pause in min") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
@@ -358,9 +376,18 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
Spacer(modifier = Modifier.height(10.dp))
|
||||
|
||||
Row {
|
||||
//Go back to StundenplanActivity
|
||||
FilledTonalButton(
|
||||
onClick = {
|
||||
editor.putInt("lessonLength", lessonLength.toInt())
|
||||
editor.putInt("breakAmnt", breakAmnt.toInt())
|
||||
editor.apply()
|
||||
activity.finish()
|
||||
//Reopen of activity so values will be updated
|
||||
val intent = Intent(activity, StundenplanActivity::class.java)
|
||||
//Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
||||
startActivity(activity, intent, null)
|
||||
},
|
||||
modifier = Modifier
|
||||
.padding(5.dp)
|
||||
@@ -377,6 +404,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
.width(5.dp)
|
||||
)
|
||||
|
||||
//Move on to DaySetup
|
||||
Button(
|
||||
onClick = {
|
||||
editor.putInt("lessonLength", lessonLength.toInt())
|
||||
@@ -385,6 +413,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
activity.finish()
|
||||
val intent = Intent(activity, TimeTableSetupActivity::class.java).apply {
|
||||
putExtra(TimeTableSetupActivity.TYPE_KEY, "DaySetup")
|
||||
//State 0 for indexing days (0..4)
|
||||
putExtra(TimeTableSetupActivity.STATE_KEY, "0")
|
||||
}
|
||||
startActivity(activity, intent, null)
|
||||
@@ -400,15 +429,20 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//DaySetup for information on the lessons (teacher, subject, amount per day, etc.)
|
||||
else if (activityType == "DaySetup") {
|
||||
var state by remember {
|
||||
//State that defines the current day (e.g. for LessonData or the Tab highlighting)
|
||||
val state by remember {
|
||||
mutableStateOf(activityState.toInt())
|
||||
}
|
||||
|
||||
//SharedPreferences for the amount of hours of each day (indexed by state --> 0..4)
|
||||
var currentLessonAmount by remember {
|
||||
mutableStateOf(sharedPreferences.getInt("lessonAmount${listOfDays[state]}", 0).toString())
|
||||
}
|
||||
|
||||
//TabRow with Tabs to visualize the days; no onClick fun and thus the custom ripple theme
|
||||
CompositionLocalProvider(LocalRippleTheme provides CustomRippleTheme()) {
|
||||
TabRow(selectedTabIndex = state,
|
||||
containerColor = MaterialTheme.colorScheme.primaryContainer) {
|
||||
@@ -429,6 +463,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
//Input of the amount of lessons on the current day
|
||||
OutlinedTextField(
|
||||
value = currentLessonAmount,
|
||||
onValueChange = {
|
||||
@@ -449,70 +484,88 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword)
|
||||
)
|
||||
|
||||
//Creation of TextField for further input for the lessons themselves + saveUsage into DataStore --> saveLessonUsage(...)
|
||||
if (currentLessonAmount != "") {
|
||||
for (i in lessons.size until currentLessonAmount.toInt()) {
|
||||
lessons = lessons + LessonData("", "", "")
|
||||
}
|
||||
while (currentLessonAmount.toInt() < lessons.size) {
|
||||
lessons = lessons.drop(1)
|
||||
}
|
||||
lessons.forEachIndexed() { index, lessonData ->
|
||||
var currentSubject by remember {
|
||||
mutableStateOf(lessonData.subject)
|
||||
if (currentLessonAmount != "0") {
|
||||
//Creation/Removal of the current amount of LessonData object depending pn currentLessonAmount
|
||||
for (i in lessons.size until currentLessonAmount.toInt()) {
|
||||
lessons = lessons + LessonData("", "", "")
|
||||
}
|
||||
var currentTeacher by remember {
|
||||
mutableStateOf(lessonData.teacher)
|
||||
while (currentLessonAmount.toInt() < lessons.size) {
|
||||
lessons = lessons.drop(1)
|
||||
}
|
||||
var currentRoom by remember {
|
||||
mutableStateOf(lessonData.room)
|
||||
|
||||
lessons.forEachIndexed() { index, lessonData ->
|
||||
//Input variables
|
||||
var currentSubject by remember {
|
||||
mutableStateOf(lessonData.subject)
|
||||
}
|
||||
var currentTeacher by remember {
|
||||
mutableStateOf(lessonData.teacher)
|
||||
}
|
||||
var currentRoom by remember {
|
||||
mutableStateOf(lessonData.room)
|
||||
}
|
||||
|
||||
//Input of the subject of the current lesson
|
||||
OutlinedTextField(
|
||||
value = currentSubject,
|
||||
onValueChange = {
|
||||
currentSubject = it
|
||||
lessonData.subject = it
|
||||
saveLessonsUsage(activity, lessons, state)
|
||||
},
|
||||
label = { Text(text = "Fach der ${index + 1}. Stunde") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
shape = RoundedCornerShape(20),
|
||||
textStyle = MaterialTheme.typography.labelMedium,
|
||||
colors = inputFieldColors,
|
||||
)
|
||||
|
||||
//Input of the room of the current lesson
|
||||
OutlinedTextField(
|
||||
value = currentRoom,
|
||||
onValueChange = {
|
||||
currentRoom = it
|
||||
lessonData.room = it
|
||||
saveLessonsUsage(activity, lessons, state)
|
||||
},
|
||||
label = { Text(text = "Raum der ${index + 1}. Stunde") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
shape = RoundedCornerShape(20),
|
||||
textStyle = MaterialTheme.typography.labelMedium,
|
||||
colors = inputFieldColors,
|
||||
)
|
||||
|
||||
//Input of the teacher of the current lesson
|
||||
OutlinedTextField(
|
||||
value = currentTeacher,
|
||||
onValueChange = {
|
||||
currentTeacher = it
|
||||
lessonData.teacher = it
|
||||
saveLessonsUsage(activity, lessons, state)
|
||||
},
|
||||
label = { Text(text = "Lehrer der ${index + 1}. Stunde") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
shape = RoundedCornerShape(20),
|
||||
textStyle = MaterialTheme.typography.labelMedium,
|
||||
colors = inputFieldColors,
|
||||
)
|
||||
}
|
||||
OutlinedTextField(
|
||||
value = currentSubject,
|
||||
onValueChange = {
|
||||
currentSubject = it
|
||||
lessonData.subject = it
|
||||
saveLessonsUsage(activity, lessons, state)
|
||||
},
|
||||
label = { Text(text = "Fach der ${index + 1}. Stunde") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
shape = RoundedCornerShape(20),
|
||||
textStyle = MaterialTheme.typography.labelMedium,
|
||||
colors = inputFieldColors,
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = currentTeacher,
|
||||
onValueChange = {
|
||||
currentTeacher = it
|
||||
lessonData.teacher = it
|
||||
saveLessonsUsage(activity, lessons, state)
|
||||
},
|
||||
label = { Text(text = "Lehrer der ${index + 1}. Stunde") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
shape = RoundedCornerShape(20),
|
||||
textStyle = MaterialTheme.typography.labelMedium,
|
||||
colors = inputFieldColors,
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = currentRoom,
|
||||
onValueChange = {
|
||||
currentRoom = it
|
||||
lessonData.room = it
|
||||
saveLessonsUsage(activity, lessons, state)
|
||||
},
|
||||
label = { Text(text = "Raum der ${index + 1}. Stunde") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true,
|
||||
shape = RoundedCornerShape(20),
|
||||
textStyle = MaterialTheme.typography.labelMedium,
|
||||
colors = inputFieldColors,
|
||||
)
|
||||
}
|
||||
//save an empty list into DataStore currentLessonAmount == 0
|
||||
else {
|
||||
saveLessonsUsage(activity, emptyList(), state)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
//Checkbox on the friday page (state == 4) to prevent setup from automatically openening next time
|
||||
if (state == 4) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
@@ -531,16 +584,19 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
}
|
||||
}
|
||||
|
||||
//Go back
|
||||
Row {
|
||||
FilledTonalButton(
|
||||
onClick = {
|
||||
activity.finish()
|
||||
//To TimeSetup
|
||||
if (state == 0) {
|
||||
val intent = Intent(activity, TimeTableSetupActivity::class.java).apply {
|
||||
putExtra(TimeTableSetupActivity.TYPE_KEY, "TimeSetup")
|
||||
}
|
||||
startActivity(activity, intent, null)
|
||||
}
|
||||
//To the day before (STATE_KEY -= 1)
|
||||
else {
|
||||
val intent = Intent(activity, TimeTableSetupActivity::class.java).apply {
|
||||
putExtra(TimeTableSetupActivity.TYPE_KEY, "DaySetup")
|
||||
@@ -565,9 +621,11 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
.width(5.dp)
|
||||
)
|
||||
|
||||
//Go forwards
|
||||
Button(
|
||||
onClick = {
|
||||
activity.finish()
|
||||
//To next day (STATE_KEY += 1)
|
||||
if (state != 4) {
|
||||
val intent = Intent(activity, TimeTableSetupActivity::class.java).apply {
|
||||
putExtra(TimeTableSetupActivity.TYPE_KEY, "DaySetup")
|
||||
@@ -575,8 +633,14 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
}
|
||||
startActivity(activity, intent, null)
|
||||
}
|
||||
//To Stundenplan
|
||||
else {
|
||||
editor.putBoolean("setupDone", setupDone)
|
||||
//Reopen of activity so values will be updated
|
||||
val intent = Intent(activity, StundenplanActivity::class.java)
|
||||
//Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
||||
startActivity(activity, intent, null)
|
||||
}
|
||||
editor.apply()
|
||||
},
|
||||
@@ -596,6 +660,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
}
|
||||
}
|
||||
|
||||
//AlertDialog to inform the user of the possibility of changing all inputs later
|
||||
if (showInfo) {
|
||||
AlertDialog(
|
||||
onDismissRequest = { showInfo = false },
|
||||
@@ -618,53 +683,9 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
||||
.padding(5.dp)
|
||||
)
|
||||
}
|
||||
|
||||
if (showDeleteConfirmation) {
|
||||
AlertDialog(
|
||||
onDismissRequest = { showDeleteConfirmation = false },
|
||||
text = {
|
||||
Text(
|
||||
text = "Möchten Sie wirklich die Anmeldedaten löschen?",
|
||||
color = MaterialTheme.colorScheme.onPrimaryContainer,
|
||||
style = MaterialTheme.typography.labelMedium
|
||||
)
|
||||
},
|
||||
confirmButton = {
|
||||
Row(modifier = Modifier.fillMaxWidth()){
|
||||
Text(
|
||||
text = "Bestätigen",
|
||||
color = MaterialTheme.colorScheme.secondary,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
modifier = Modifier.clickable {
|
||||
editor.putString("maxLessons", "")
|
||||
editor.apply()
|
||||
showDeleteConfirmation = false
|
||||
activity.finish()
|
||||
}
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
|
||||
Text(
|
||||
text = "Abbrechen",
|
||||
color = MaterialTheme.colorScheme.secondary,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
modifier = Modifier.clickable { showDeleteConfirmation = false }
|
||||
)
|
||||
}
|
||||
},
|
||||
containerColor = MaterialTheme.colorScheme.primaryContainer
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun TestButton(text: String, onClick: ()-> Unit){
|
||||
Button(onClick = onClick,) {
|
||||
Text(text = text)
|
||||
}
|
||||
}
|
||||
|
||||
//Function that implements the save of List<LessonData>
|
||||
fun saveLessonsUsage(context: Context, lessons: List<LessonData>, int: Int) {
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
saveLessons(context, lessons, listOfDays[int])
|
||||
|
||||
Reference in New Issue
Block a user