tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

#21 begin styling subject

Browse source
This commit is contained in:
brreynie 2023-05-01 15:15:54 +02:00
parent 4bbc3af4b2
commit c33aad5496
5 changed files with 65 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/be/ugent/sel/studeez/screens/tasks/TaskScreen.kt
View file

@ -1,11 +1,15 @@
package be.ugent.sel.studeez.screens.tasks
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.Divider
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import be.ugent.sel.studeez.R
import be.ugent.sel.studeez.common.composable.NewTaskSubjectButton
import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
@ -47,8 +51,18 @@ fun TaskScreen(
val subjects = getSubjects().collectAsState(initial = emptyList())
Column {
LazyColumn {
items(subjects.value) {
SubjectEntry(subject = it)
if (subjects.value.isNotEmpty()) {
item {
SubjectEntry(subject = subjects.value[0])
}
}
if (subjects.value.size > 1) {
items(subjects.value.subList(1, subjects.value.lastIndex + 1)) {
Column {
Divider(modifier = Modifier.padding(10.dp, 0.dp))
SubjectEntry(subject = it)
}
}
}
}
NewTaskSubjectButton(onClick = addSubject, R.string.new_subject)
@ -56,7 +70,6 @@ fun TaskScreen(
}
}
@Preview
@Composable
fun TaskScreenPreview() {

2
app/src/main/java/be/ugent/sel/studeez/screens/tasks/TaskViewModel.kt
View file

@ -19,7 +19,7 @@ class TaskViewModel @Inject constructor(
name = "Test Subject",
tasks = listOf(),
time = 0,
color = 0,
argb_color = 0xFFF44336,
)
)
}