Stundenplan commit for meeting
Setup most definitely done Display still has some issues
This commit is contained in:
@@ -2,9 +2,11 @@ package com.schoolapp.cleverclass
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.drawable.Icon
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
@@ -13,6 +15,7 @@ import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.ArrowBack
|
||||
import androidx.compose.material.icons.outlined.Edit
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
@@ -29,15 +32,17 @@ import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.core.content.ContextCompat.startActivity
|
||||
import com.schoolapp.cleverclass.LessonStoreManager.getLessons
|
||||
import com.schoolapp.cleverclass.ui.theme.CleverClassTheme
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
private val listOfDays = listOf("mon", "tue", "wed", "thu", "fri", "sat", "sun")
|
||||
private val listOfDays = listOf("Mo", "Di", "Mi", "Do", "Fr")
|
||||
private val lessonGrabberIndex = 0
|
||||
|
||||
class StundenplanActivity : ComponentActivity() {
|
||||
@@ -89,6 +94,21 @@ fun StundenplanContent(activity: ComponentActivity){
|
||||
)
|
||||
}
|
||||
},
|
||||
actions ={
|
||||
IconButton(onClick = {
|
||||
val intent = Intent(activity, TimeTableSetupActivity::class.java).apply {
|
||||
putExtra(TimeTableSetupActivity.TYPE_KEY, "TimeSetup")
|
||||
}
|
||||
startActivity(activity, intent, null)
|
||||
}) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Edit,
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(28.dp),
|
||||
tint = MaterialTheme.colorScheme.onPrimaryContainer
|
||||
)
|
||||
}
|
||||
},
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
@@ -101,9 +121,9 @@ fun StundenplanContent(activity: ComponentActivity){
|
||||
}
|
||||
|
||||
data class LessonData(
|
||||
val subject: String,
|
||||
val teacher: String,
|
||||
val room: String
|
||||
var subject: String,
|
||||
var teacher: String,
|
||||
var room: String
|
||||
)
|
||||
|
||||
@Composable
|
||||
@@ -116,8 +136,8 @@ fun Day(day: String) {
|
||||
lessons = savedLessons.toMutableList()
|
||||
}
|
||||
}
|
||||
lessons.forEach() {
|
||||
Lesson(subject = it.subject, teacher = it.teacher, room = it.room)
|
||||
lessons.forEach() {lessonData ->
|
||||
Lesson(subject = lessonData.subject, teacher = lessonData.teacher, room = lessonData.room)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -128,7 +148,8 @@ fun Lesson(subject: String, teacher: String, room: String) {
|
||||
.size(200.dp, 100.dp)
|
||||
.padding(3.dp)
|
||||
) {
|
||||
Text(modifier = Modifier.align(Alignment.Center),
|
||||
Text(
|
||||
modifier = Modifier.align(Alignment.Center),
|
||||
text = "$subject\n@$room\n/w$teacher")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user