"#22 styling of task overview"

app/src/main/java/be/ugent/sel/studeez/StudeezApp.kt

@@ -158,7 +158,8 @@ fun StudeezNavGraph(
 
         composable(StudeezDestinations.TASKS_SCREEN) {
             TaskRoute(
-                viewModel = hiltViewModel()
+                goBack = goBack,
+                viewModel = hiltViewModel(),
             )
         }
 

app/src/main/java/be/ugent/sel/studeez/common/composable/SubjectEntry.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Card
 import androidx.compose.material.Icon
@@ -31,6 +30,7 @@ import be.ugent.sel.studeez.data.local.models.timer_functional.HoursMinutesSecon
 @Composable
 fun SubjectEntry(
     subject: Subject,
+    onViewSubject: () -> Unit,
 ) {
     Card(
         modifier = Modifier
@@ -40,12 +40,13 @@ fun SubjectEntry(
         Row(
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically,
-//            modifier = Modifier.fillMaxWidth(),
         ) {
             Row(
                 horizontalArrangement = Arrangement.spacedBy(8.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.padding(start = 10.dp).weight(3f)
+                modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(3f)
             ) {
                 Box(
                     modifier = Modifier
@@ -61,8 +62,6 @@ fun SubjectEntry(
                         fontWeight = FontWeight.Bold,
                         overflow = TextOverflow.Ellipsis,
                         maxLines = 1,
-//                        modifier = Modifier.fillMaxWidth(),
-//                        modifier = Modifier.width(200.dp)
                     )
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(10.dp),
@@ -78,16 +77,18 @@ fun SubjectEntry(
                             Icon(
                                 imageVector = Icons.Default.List, contentDescription = "tasks"
                             )
-                            Text(text = "4/9")
+                            Text(text = subject.tasks.size.toString())
                         }
                     }
                 }
             }
             StealthButton(
                 text = R.string.view_task,
-                modifier = Modifier.padding(start = 10.dp, end = 5.dp).weight(1f)
+                modifier = Modifier
+                    .padding(start = 10.dp, end = 5.dp)
+                    .weight(1f)
             ) {
-
+                onViewSubject()
             }
         }
     }
@@ -98,10 +99,9 @@ fun SubjectEntry(
 fun SubjectEntryPreview() {
     SubjectEntry(
         subject = Subject(
-            name = "Test Subject longgggggggggggggggggggggggggggggggggggggggg",
+            name = "Test Subject",
-//            name = "Test Subject",
             argb_color = 0xFFF44336,
             time = 60
-        )
+        ),
-    )
+    ) {}
 }

app/src/main/java/be/ugent/sel/studeez/domain/TaskDAO.kt

@@ -1,11 +1,12 @@
 package be.ugent.sel.studeez.domain
 
+import be.ugent.sel.studeez.data.local.models.task.Subject
 import be.ugent.sel.studeez.data.local.models.task.Task
 import kotlinx.coroutines.flow.Flow
 
 interface TaskDAO {
 
-    fun getTasks(): Flow<List<Task>>
+    fun getTasks(subject: Subject): Flow<List<Task>>
 
     fun saveTask(newTask: Task)
 

app/src/main/java/be/ugent/sel/studeez/domain/implementation/FireBaseTaskDAO.kt

@@ -1,18 +1,31 @@
 package be.ugent.sel.studeez.domain.implementation
 
+import be.ugent.sel.studeez.data.local.models.task.Subject
 import be.ugent.sel.studeez.data.local.models.task.Task
 import be.ugent.sel.studeez.domain.AccountDAO
 import be.ugent.sel.studeez.domain.TaskDAO
 import com.google.firebase.firestore.FirebaseFirestore
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
 
 class FireBaseTaskDAO @Inject constructor(
     private val firestore: FirebaseFirestore,
     private val auth: AccountDAO,
 ) : TaskDAO {
-    override fun getTasks(): Flow<List<Task>> {
+    override fun getTasks(subject: Subject): Flow<List<Task>> {
-        TODO("Not yet implemented")
+        return flowOf(
+            listOf(
+                Task(
+                    name = "Test Task",
+                    completed = false,
+                ),
+                Task(
+                    name = "Test Task 2",
+                    completed = true,
+                )
+            )
+        )
     }
 
     override fun saveTask(newTask: Task) {

app/src/main/java/be/ugent/sel/studeez/screens/tasks/SubjectScreen.kt

@@ -31,7 +31,9 @@ fun SubjectRoute(
         drawerActions = drawerActions,
         navigationBarActions = navigationBarActions,
         addSubject = { viewModel.addSubject() },
-    ) { viewModel.getSubjects() }
+        getSubjects = viewModel::getSubjects,
+        onViewSubject = { viewModel.onViewSubject(Subject(), open) },
+    )
 }
 
 @Composable
@@ -40,6 +42,7 @@ fun SubjectScreen(
     navigationBarActions: NavigationBarActions,
     addSubject: () -> Unit,
     getSubjects: () -> Flow<List<Subject>>,
+    onViewSubject: () -> Unit,
 ) {
     PrimaryScreenTemplate(
         title = resources().getString(R.string.tasks),
@@ -66,7 +69,10 @@ fun SubjectScreen(
 //                    }
 //                }
                 items(subjects.value) {
-                    SubjectEntry(subject = it)
+                    SubjectEntry(
+                        subject = it,
+                        onViewSubject = onViewSubject,
+                    )
                 }
             }
             NewTaskSubjectButton(onClick = addSubject, R.string.new_subject)
@@ -80,6 +86,8 @@ fun SubjectScreenPreview() {
     SubjectScreen(
         drawerActions = DrawerActions({}, {}, {}, {}, {}),
         navigationBarActions = NavigationBarActions({ false }, {}, {}, {}, {}),
-        {},
+        addSubject = {},
-    ) { flowOf() }
+        getSubjects = { flowOf() },
+        onViewSubject = {},
+    )
 }

app/src/main/java/be/ugent/sel/studeez/screens/tasks/SubjectViewModel.kt

@@ -3,6 +3,7 @@ package be.ugent.sel.studeez.screens.tasks
 import be.ugent.sel.studeez.data.local.models.task.Subject
 import be.ugent.sel.studeez.domain.LogService
 import be.ugent.sel.studeez.domain.SubjectDAO
+import be.ugent.sel.studeez.navigation.StudeezDestinations
 import be.ugent.sel.studeez.screens.StudeezViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
@@ -27,4 +28,8 @@ class SubjectViewModel @Inject constructor(
     fun getSubjects(): Flow<List<Subject>> {
         return subjectDAO.getSubjects()
     }
+
+    fun onViewSubject(subject: Subject, open: (String) -> Unit) {
+        open(StudeezDestinations.TASKS_SCREEN)
+    }
 }

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

@@ -1,34 +1,115 @@
 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.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Edit
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 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.BasicButton
+import be.ugent.sel.studeez.common.composable.NewTaskSubjectButton
+import be.ugent.sel.studeez.common.composable.SecondaryScreenTemplate
+import be.ugent.sel.studeez.common.ext.basicButton
+import be.ugent.sel.studeez.data.local.models.task.Subject
 import be.ugent.sel.studeez.data.local.models.task.Task
+import be.ugent.sel.studeez.resources
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
+data class TaskActions(
+    val addTask: () -> Unit,
+    val getSubject: () -> Subject,
+    val getTasks: () -> Flow<List<Task>>,
+    val deleteSubject: () -> Unit,
+)
+
+fun getTaskActions(viewModel: TaskViewModel): TaskActions {
+    return TaskActions(
+        addTask = viewModel::addTask,
+        getTasks = viewModel::getTasks,
+        getSubject = { Subject(name = "Test Subject") },
+        deleteSubject = {},
+    )
+}
+
 @Composable
 fun TaskRoute(
+    goBack: () -> Unit,
     viewModel: TaskViewModel,
 ) {
     TaskScreen(
-        addTask = viewModel::addTask,
+        goBack = goBack,
-        getTasks = viewModel::getTasks,
+        taskActions = getTaskActions(viewModel = viewModel),
     )
 }
 
 @Composable
 fun TaskScreen(
-    addTask: () -> Unit,
+    goBack: () -> Unit,
-    getTasks: () -> Flow<List<Task>>,
+    taskActions: TaskActions,
 ) {
+    SecondaryScreenTemplate(
+        title = taskActions.getSubject().name,
+        popUp = goBack,
+        barAction = { EditAction {} } // TODO implement
+    ) {
+        val tasks = taskActions.getTasks().collectAsState(initial = emptyList())
+        Column(
+            modifier = Modifier.padding(top = 5.dp)
+        ) {
+            LazyColumn {
+                items(tasks.value) {
+                    Text(text = it.name)
+                }
+            }
+            NewTaskSubjectButton(onClick = taskActions.addTask, R.string.new_task)
+            BasicButton(
+                text = R.string.delete_subject,
+                modifier = Modifier.basicButton(),
+                colors = ButtonDefaults.buttonColors(
+                    backgroundColor = Color.Red,
+                    contentColor = Color.White,
+                ),
+                onClick = taskActions.deleteSubject,
+            )
+        }
+    }
+}
 
+@Composable
+fun EditAction(
+    onClick: () -> Unit
+) {
+    IconButton(onClick = onClick) {
+        Icon(
+            imageVector = Icons.Default.Edit,
+            contentDescription = resources().getString(R.string.edit_task)
+        )
+
+    }
 }
 
 @Preview
 @Composable
 fun TaskScreenPreview() {
     TaskScreen(
-        addTask = {},
+        goBack = {},
-        getTasks = { flowOf() }
+        taskActions = TaskActions(
+            {},
+            { Subject(name = "Test Subject") },
+            { flowOf() },
+            {},
+        )
     )
 }

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

@@ -1,5 +1,6 @@
 package be.ugent.sel.studeez.screens.tasks
 
+import be.ugent.sel.studeez.data.local.models.task.Subject
 import be.ugent.sel.studeez.data.local.models.task.Task
 import be.ugent.sel.studeez.domain.LogService
 import be.ugent.sel.studeez.domain.TaskDAO
@@ -19,15 +20,6 @@ class TaskViewModel @Inject constructor(
     }
 
     fun getTasks() : Flow<List<Task>> {
-        return flowOf(listOf(
+        return taskDAO.getTasks(Subject())
-            Task(
-                name = "Test Task",
-                completed = false,
-            ),
-            Task(
-                name = "Test Task 2",
-                completed = true,
-            )
-        ))
     }
 }

app/src/main/res/values/strings.xml

@@ -45,6 +45,8 @@
     <string name="new_subject">New Subject</string>
     <string name="new_task">New Task</string>
     <string name="view_task">View</string>
+    <string name="edit_task">Edit Task</string>
+    <string name="delete_subject">Delete Subject</string>
 
     <!-- Sessions -->
     <string name="sessions">Sessions</string>