add save chnages to UI

app/src/main/java/com/example/myapplication/UI_Components/BottomNavigationBar.kt

@@ -20,12 +20,6 @@ fun BottomNavigationBar(selectedNavigation: NavigationType, onClick: (selectedNa
             selected = selectedNavigation == NavigationType.Home,
             onClick = { onClick(NavigationType.Home) }
         )
-        NavigationBarItem(
-            icon = { Icon(Icons.Filled.PlayArrow, contentDescription = "Timer") },
-            label = { Text("Timer") },
-            selected = selectedNavigation == NavigationType.Timer,
-            onClick = { onClick(NavigationType.Timer) }
-        )
         NavigationBarItem(
             icon = { Icon(Icons.Filled.Settings, contentDescription = "Settings") },
             label = { Text("Settings") },

app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskDialog.kt

@@ -27,15 +27,17 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 
 @Composable
-fun TaskDialog(taskDate: String = "", taskName: String = "") {
-    var showDialog by remember { mutableStateOf(false) }
+fun TaskDialog(taskDate: String = "", taskName: String = "", showDialogDissmis: () -> Unit) {
     var taskDate by remember { mutableStateOf(taskDate) }
     var taskName by remember { mutableStateOf(taskName) }
     var taskFormularError by remember { mutableStateOf(false) }
 
-    if (showDialog) {
     AlertDialog(
-            onDismissRequest = { showDialog = false },
+        onDismissRequest = {
+            taskDate = ""
+            taskName = ""
+            showDialogDissmis()
+        },
         containerColor = color_FFFFFF,
         title = { Text(text = "Task Formluar:") },
         text = {
@@ -71,14 +73,16 @@ fun TaskDialog(taskDate: String = "", taskName: String = "") {
         dismissButton = { Button(modifier = Modifier.padding(0.dp,0.dp, 40.dp, 0.dp).width(90.dp),onClick = {
             taskDate = ""
             taskName = ""
-                showDialog = false
+            showDialogDissmis()
         }) {
             Text(text = "cancle")
         } },
 
         confirmButton = { Button(modifier = Modifier.padding(0.dp,0.dp, 20.dp, 0.dp).width(90.dp),onClick = { if(isValidDate(taskDate)) {
             /*TODO: Save in Database*/
-                showDialog = false
+            taskDate = ""
+            taskName = ""
+            showDialogDissmis()
         } else {
             taskFormularError = true
         }}) {
@@ -86,7 +90,6 @@ fun TaskDialog(taskDate: String = "", taskName: String = "") {
         } },
     )
 }
-}
 
 fun isValidDate(dateString: String): Boolean {
     try {

app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskInfo.kt

@@ -12,29 +12,23 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.example.myapplication.UI_Components.Home.Task
 import com.example.myapplication.ui.theme.color_FFFFFF
 
 @Composable
-fun TaskInfoDialog() {
-    var showDialog by remember { mutableStateOf(false) }
-
-    if (showDialog) {
-        AlertDialog(onDismissRequest = { showDialog = false }, containerColor = color_FFFFFF,
+fun TaskInfoDialog(currentTaskDate: String, currentTaskName: String,showDialogDissmis: () -> Unit) {
+    AlertDialog(onDismissRequest = { showDialogDissmis() }, containerColor = color_FFFFFF,
         title = { Text(text = "Task Info:") } ,
         text = {
                Column(modifier = Modifier.fillMaxWidth()) {
                    Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
                        Text(text = "Name:", fontSize = 15.sp, modifier = Modifier.width(50.dp), textAlign = TextAlign.Start)
-                           Text(text = "Hausaufgaben", fontSize = 15.sp, modifier = Modifier.width(180.dp), textAlign = TextAlign.Start)
+                       Text(text = currentTaskName, fontSize = 15.sp, modifier = Modifier.width(180.dp), textAlign = TextAlign.Start)
                    }
 
                    Spacer(modifier = Modifier
@@ -43,7 +37,7 @@ fun TaskInfoDialog() {
 
                    Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
                        Text(text = "Datum:", fontSize = 15.sp, modifier = Modifier.width(50.dp), textAlign = TextAlign.Start)
-                           Text(text = "19.09.2000", fontSize = 15.sp,modifier = Modifier.width(180.dp), textAlign = TextAlign.Start)
+                       Text(text = currentTaskDate, fontSize = 15.sp,modifier = Modifier.width(180.dp), textAlign = TextAlign.Start)
                    }
 
                    Spacer(modifier = Modifier
@@ -59,8 +53,7 @@ fun TaskInfoDialog() {
         confirmButton = {
         Button(modifier = Modifier
             .padding(0.dp, 0.dp, 10.dp, 0.dp)
-                .width(90.dp), onClick = { showDialog = false }) {
+            .width(90.dp), onClick = { showDialogDissmis() }) {
         Text(text = "Close")
     } })
 }
-}
\ No newline at end of file

app/src/main/java/com/example/myapplication/UI_Components/Home/HomeScreen.kt

 package com.example.myapplication.UI_Components.Home
 
+import android.app.TaskInfo
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -7,68 +9,134 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 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 androidx.compose.ui.unit.sp
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material3.Button
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CheckboxDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import com.example.myapplication.UI_Components.Dialogs.TaskDialog
+import com.example.myapplication.UI_Components.Dialogs.TaskInfoDialog
+import com.example.myapplication.UI_Components.Title
 
 
 // Home-Screen mit Listen für offene und erledigte Aufgaben
 @Composable
-fun HomeScreen() {
+fun HomeScreen(onClickStartSession: () -> Unit) {
+    var openTask by remember { mutableStateOf(getOpenTasks()) }
+    var completedTask by remember { mutableStateOf(getCompletedTasks()) }
+    var changesEnabled by remember { mutableStateOf(false) }
+    var showNewTaskDialog by remember { mutableStateOf(false) }
+    var showInfoDialog by remember { mutableStateOf(false) }
+    var currentTask by remember { mutableStateOf(Task()) }
+
+    if(showNewTaskDialog) {
+        TaskDialog(currentTask.date, currentTask.name) { showNewTaskDialog = false }
+    }
+    else if(showInfoDialog) {
+        TaskInfoDialog(currentTask.date, currentTask.name) { showInfoDialog = false }
+    }
     Column(
         modifier = Modifier
             .fillMaxSize()
             .padding(16.dp)
     ) {
-        Text("Offene Aufgaben:", fontSize = 24.sp, fontWeight = FontWeight.Bold)
-        Spacer(modifier = Modifier.height(8.dp))
-        TaskList(tasks = getOpenTasks(), onTaskCompleted = { /* TODO: Aufgabe als erledigt markieren */ })
+        Title(titel = "Offene Aufgaen", showButton = true, onClickShowButton = {
+            currentTask.date = ""
+            currentTask.name = ""
+            showNewTaskDialog = true
+        })
+        TaskList(tasks = openTask,
+            onTaskCompleted = {
+                it.isCompleted = true
+                openTask -= it
+                completedTask += it
+                changesEnabled = true
+            },
+            onDeleteTask = {
+                openTask -= it
+                changesEnabled = true
+            },
+            onShowDialog = {
+                currentTask.date = it.date
+                currentTask.name = it.name
+                showNewTaskDialog = true
+            })
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Title(titel = "Erledigte Aufgaben")
+        TaskList(tasks = completedTask,
+            onTaskCompleted = {
+                it.isCompleted = false
+                completedTask -= it
+                openTask += it
+                changesEnabled = true
+            },
+            onDeleteTask = {
+                completedTask -= it
+                changesEnabled = true
+            },
+            onShowDialog = {
+                currentTask.date = it.date
+                currentTask.name = it.name
+                showInfoDialog = true
+            })
 
         Spacer(modifier = Modifier.height(16.dp))
 
-        Text("Erledigte Aufgaben:", fontSize = 24.sp, fontWeight = FontWeight.Bold)
-        Spacer(modifier = Modifier.height(8.dp))
-        TaskList(tasks = getCompletedTasks(), onTaskCompleted = { /* TODO: Aufgabe bearbeiten */ })
+        Row (verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            Button(onClick = { openTask = getOpenTasks(); completedTask = getCompletedTasks(); changesEnabled = false }, enabled = changesEnabled){
+                Text(text = "Cancle")
+            }
+            Button(onClick = { /*TODO*/ }, enabled = changesEnabled) {
+                Text(text = "Save your changes")
+            }
+        }
+
+        Spacer(modifier = Modifier.weight(1f))
+
+        Button(onClick = { onClickStartSession() }, modifier = Modifier.fillMaxWidth()) {
+            Text(text = "Start Session")
         }
     }
 
+}
+
 // Listendarstellung für Aufgaben
 @Composable
-fun TaskList(tasks: List<Task>, onTaskCompleted: (Task) -> Unit) {
+fun TaskList(tasks: List<Task>, onTaskCompleted: (Task) -> Unit, onDeleteTask: (Task) -> Unit, onShowDialog: (Task) -> Unit) {
     LazyColumn {
         items(tasks) { task ->
-            TaskItem(task = task, onTaskCompleted = onTaskCompleted)
+            TaskItem(task = task, onTaskCompleted = onTaskCompleted, onDeleteTask= onDeleteTask, onShowDialog = onShowDialog)
         }
     }
 }
 
 // Ein einzelnes Element in der Liste der Aufgaben
 @Composable
-fun TaskItem(task: Task, onTaskCompleted: (Task) -> Unit) {
+fun TaskItem(task: Task, onTaskCompleted: (Task) -> Unit, onDeleteTask: (Task) -> Unit, onShowDialog: (Task) -> Unit) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
             .padding(vertical = 8.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Column(modifier = Modifier.weight(1f)) {
+        Column(modifier = Modifier
+            .weight(1f)
+            .clickable { onShowDialog(task) }) {
             Text(task.date)
             Text(task.name)
         }
-        IconButton(onClick = { /* TODO: Aufgabe bearbeiten */ }) {
-            Icon(Icons.Default.Edit, contentDescription = null, tint = Color(0xFF7E57C2))
+        IconButton(onClick = { onDeleteTask(task) }) {
+            Icon(Icons.Default.Delete, contentDescription = null, tint = Color(0xFF7E57C2))
         }
         Checkbox(
             checked = task.isCompleted,
@@ -81,19 +149,12 @@ fun TaskItem(task: Task, onTaskCompleted: (Task) -> Unit) {
 }
 
 // Datenklasse für Aufgaben
-data class Task(val date: String, val name: String, val isCompleted: Boolean)
-
-// Beispiel für Preview in Android Studio
-@Preview(showBackground = true)
-@Composable
-fun DefaultPreview() {
-    HomeScreen()
-}
+data class Task(var date: String = "", var name: String = "", var isCompleted: Boolean = false)
 
 // Beispiel-Daten für offene Aufgaben
 fun getOpenTasks(): List<Task> {
     return listOf(
-        Task("Heute", "Hausaufgaben", false),
+        Task("01.02.2033", "Hausaufgaben", false),
         Task("01.02.2024", "Hausaufgaben", false),
         Task("01.03.2024", "Hausaufgaben", false)
     )

app/src/main/java/com/example/myapplication/UI_Components/Settings/Settings.kt

 package com.example.myapplication.UI_Components.Settings
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.example.myapplication.UI_Components.Title
@@ -13,19 +22,61 @@ import com.example.myapplication.ui.theme.color_0066FF
 
 @Composable
 fun Settings() {
+    val initialSettingsTimerState = SettingsTimer()
+    var newSettingsTimerState by remember { mutableStateOf(initialSettingsTimerState) }
+    var changesEnabled by remember { mutableStateOf(false) }
+
     Column(Modifier.padding(15.dp, 10.dp)) {
         Title(titel = "Promodoro-Timer")
-        SettingsDropdown(titel = "Dauer der Promodoro-Einheit", listOfDropdownItem = listOf("25 Minuten", "15 Minuten", "10 Minuten", "5 Minuten"))
-        SettingsDropdown(titel = "kurze Pause", listOfDropdownItem = listOf("15 Minuten", "10 Minuten", "5 Minuten"))
-        SettingsDropdown(titel = "lange Pause", listOfDropdownItem = listOf("25 Minuten", "20 Minuten", "15 Minuten", "10 Minuten"))
-        SettingsDropdown(titel = "lange Pause nach", listOfDropdownItem = listOf("2 Einheiten", "4 Einheiten", "6 Einheiten", "8 Einheiten"))
+        SettingsDropdown(
+            titel = "Dauer der Promodoro-Einheit",
+            content = newSettingsTimerState.dauer,
+            listOfDropdownItem = listOf("25 Minuten", "15 Minuten", "10 Minuten", "5 Minuten")
+        ) {
+            newSettingsTimerState = newSettingsTimerState.copy(dauer = it)
+            changesEnabled = true
+        }
+
+        SettingsDropdown(
+            titel = "kurze Pause",
+            content = newSettingsTimerState.kurzePause,
+            listOfDropdownItem = listOf("15 Minuten", "10 Minuten", "5 Minuten")
+        ) {
+            newSettingsTimerState = newSettingsTimerState.copy(kurzePause = it)
+            changesEnabled = true
+        }
+
+        SettingsDropdown(
+            titel = "lange Pause",
+            content = newSettingsTimerState.langePause,
+            listOfDropdownItem = listOf("25 Minuten", "20 Minuten", "15 Minuten", "10 Minuten")
+        ) {
+            newSettingsTimerState = newSettingsTimerState.copy(langePause = it)
+            changesEnabled = true
+        }
+
+        SettingsDropdown(
+            titel = "lange Pause nach",
+            content = newSettingsTimerState.langePauseNachEinheiten,
+            listOfDropdownItem = listOf("2 Einheiten", "4 Einheiten", "6 Einheiten", "8 Einheiten")
+        ) {
+            newSettingsTimerState = newSettingsTimerState.copy(langePauseNachEinheiten = it)
+            changesEnabled = true
+        }
 
         Spacer(modifier = Modifier
             .fillMaxWidth()
             .height(50.dp))
 
         Title(titel = "Ringtone")
-        SettingsDropdown(titel = "Musik", listOfDropdownItem = listOf("glock", "dock", "click"))
+        SettingsDropdown(
+            titel = "Musik",
+            content = newSettingsTimerState.musik,
+            listOfDropdownItem = listOf("glock", "dock", "click")
+        ) {
+            newSettingsTimerState = newSettingsTimerState.copy(musik = it)
+            changesEnabled = true
+        }
 
         Spacer(modifier = Modifier
             .fillMaxWidth()
@@ -35,5 +86,28 @@ fun Settings() {
         SettingsInfo(titel = "Developed by", content = "Emirhan, Kaan, Zara")
         SettingsInfo(titel = "Download in", content = "Android")
         SettingsInfo(titel = "Support", content = "email@support-timer.com", color = color_0066FF)
+
+        Spacer(modifier = Modifier.height(20.dp))
+
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Button(
+                onClick = {
+                    newSettingsTimerState = initialSettingsTimerState
+                    changesEnabled = false
+                },
+                enabled = changesEnabled
+            ) {
+                Text(text = "Cancel")
+            }
+            Button(onClick = { /*TODO: Save changes logic */ }, enabled = changesEnabled) {
+                Text(text = "Save your changes")
             }
         }
+    }
+}
+
+data class SettingsTimer(var dauer: String = "25 Minuten", var kurzePause: String = "15 Minuten", var langePause: String = "25 Minuten", var langePauseNachEinheiten: String = "4 Einheiten",var musik: String = "glock")

app/src/main/java/com/example/myapplication/UI_Components/Settings/SettingsDropdown.kt

@@ -27,9 +27,8 @@ import androidx.compose.ui.unit.dp
 import com.example.myapplication.ui.theme.color_D9D9D9
 
 @Composable
-fun SettingsDropdown(titel: String,listOfDropdownItem: List<String>){
+fun SettingsDropdown(titel: String, content: String,listOfDropdownItem: List<String>, onSelectedTimeChange: (time: String) -> Unit){
     var expanded by remember { mutableStateOf(false) }
-    var selectedTime by remember { mutableStateOf(listOfDropdownItem[0]) }
 
     Row (
         Modifier
@@ -42,7 +41,7 @@ fun SettingsDropdown(titel: String,listOfDropdownItem: List<String>){
                 .clickable { expanded = true }
                 .border(BorderStroke(1.dp, color_D9D9D9)),horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically){
                 Text(
-                    text = selectedTime,
+                    text = content,
                     textAlign = TextAlign.Center,
                     modifier = Modifier
                         .padding(5.dp)
@@ -57,7 +56,7 @@ fun SettingsDropdown(titel: String,listOfDropdownItem: List<String>){
             ) {
                 listOfDropdownItem.forEach { time ->
                     DropdownMenuItem(text = { Text(text = time, modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center) }, onClick = {
-                        selectedTime = time;
+                        onSelectedTimeChange(time)
                         expanded = false
                     })
                 }

app/src/main/java/com/example/myapplication/UI_Components/Timer/TimerScreen.kt

@@ -4,6 +4,10 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+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
@@ -12,12 +16,19 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.example.myapplication.UI_Components.Home.Task
+import com.example.myapplication.UI_Components.Title
 
 @Composable
-fun TimerScreen() {
+fun TimerScreen(onClickEndSession: () -> Unit) {
     // Platzhalter für Aufgaben und deren Status
-    val tasks = listOf("Hausaufgaben", "Hausaufgaben", "Hausaufgaben", "Hausaufgaben")
-    val completedTasks = listOf(false, false, true, true)
+    val tasks: List<Task> = listOf<Task>(
+        Task("", "Hausaufgaben", false),
+        Task("", "Hausaufgaben", false),
+        Task("", "Hausaufgaben", true),
+        Task("", "Hausaufgaben", true)
+    )
+
 
     Column(
         modifier = Modifier
@@ -35,15 +46,12 @@ fun TimerScreen() {
             TimerDisplay(timeLeft = 1500) // Fester Wert für die Zeit
         }
 
-        // Aufgabenüberschrift
-        Text(
-            text = "Heutige Aufgaben:",
-            style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
-            modifier = Modifier.padding(vertical = 8.dp)
-        )
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Title(titel = "Heutige Aufgaben")
 
         // Liste der Aufgaben
-        TaskList(tasks = tasks, completedTasks = completedTasks)
+        TaskList(tasks = tasks)
 
         // Platzhalter, um die Buttons nach unten zu schieben
         Spacer(modifier = Modifier.weight(1f))
@@ -56,22 +64,22 @@ fun TimerScreen() {
             horizontalArrangement = Arrangement.SpaceBetween
         ) {
             Button(
-                onClick = { /* Kein Klick-Handler */ },
+                onClick = { /* TODO: Pause Timer */ },
                 modifier = Modifier.weight(1f),
                 colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF7F56D9))
             ) {
                 Icon(imageVector = Icons.Default.PlayArrow, contentDescription = null, tint = Color.White)
-                Text(text = "Start", color = Color.White, modifier = Modifier.padding(start = 8.dp))
+                Text(text = "Pause", color = Color.White, modifier = Modifier.padding(start = 8.dp))
             }
 
             Spacer(modifier = Modifier.width(8.dp))
 
             Button(
-                onClick = { /* Kein Klick-Handler */ },
+                onClick = { onClickEndSession() /*TODO SAVE DATABASE*/ },
                 modifier = Modifier.weight(1f),
                 colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFFF5678))
             ) {
-                Text(text = "End", color = Color.White)
+                Text(text = "End Session", color = Color.White)
             }
         }
     }
@@ -97,9 +105,10 @@ fun TimerDisplay(timeLeft: Int) {
 }
 
 @Composable
-fun TaskList(tasks: List<String>, completedTasks: List<Boolean>) {
+fun TaskList(tasks: List<Task>) {
+    var timerState by remember { mutableStateOf(tasks) }
     Column {
-        tasks.forEachIndexed { index, task ->
+        timerState.forEachIndexed() { index, task ->
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -107,24 +116,22 @@ fun TaskList(tasks: List<String>, completedTasks: List<Boolean>) {
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
-                    text = task,
+                    text = task.name,
                     style = MaterialTheme.typography.bodyLarge.copy(
-                        textDecoration = if (completedTasks[index]) TextDecoration.LineThrough else null,
-                        color = if (completedTasks[index]) Color.Gray else Color.Black
+                        textDecoration = if (task.isCompleted) TextDecoration.LineThrough else null,
+                        color = if (task.isCompleted) Color.Gray else Color.Black
                     ),
                     modifier = Modifier.weight(1f)
                 )
                 Checkbox(
-                    checked = completedTasks[index],
-                    onCheckedChange = { /* Keine Aktion bei Klick */ }
-                )
+                    checked = task.isCompleted,
+                    onCheckedChange = {
+                        timerState = timerState.toMutableList().apply {
+                            this[index] = this[index].copy(isCompleted = !this[index].isCompleted)
                         }
                     }
+                )
+            }
         }
     }
-
-@Preview(showBackground = true)
-@Composable
-fun TimerScreenPreview() {
-    TimerScreen()
 }

app/src/main/java/com/example/myapplication/UI_Components/Titel.kt

 package com.example.myapplication.UI_Components
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.example.myapplication.UI_Components.Dialogs.TaskDialog
 import com.example.myapplication.ui.theme.color_D9D9D9
 
 @Composable
-fun Title(titel: String) {
+fun Title(titel: String, showButton: Boolean = false, onClickShowButton: () -> Unit = {}) {
     Column {
-        Row {
+        Row (verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
             Text("$titel:", fontSize = 20.sp)
+            if (showButton) {
+                Button(onClick = { onClickShowButton() }) {
+                    Text(text = "New Task")
                 }
-        Spacer(Modifier.padding(0.dp, 5.dp).fillMaxWidth().height(3.dp).background(color_D9D9D9))
+            }
+        }
+        Spacer(
+            Modifier
+                .padding(0.dp, 5.dp)
+                .fillMaxWidth()
+                .height(3.dp)
+                .background(color_D9D9D9))
     }
 }
\ No newline at end of file

app/src/main/java/com/example/myapplication/UI_Components/main_app.kt

@@ -23,8 +23,10 @@ fun main_app() {
 
     Scaffold(
         bottomBar = {
+            if (selectedNavigation != NavigationType.Timer) {
                 BottomNavigationBar(selectedNavigation) { selectedNavigation = it }
             }
+        }
     ) { paddingValues ->
         Column (
             Modifier
@@ -34,8 +36,8 @@ fun main_app() {
         {
             when(selectedNavigation) {
                 NavigationType.Settings -> Settings()
-                NavigationType.Timer -> TimerScreen()
-                NavigationType.Home -> HomeScreen()
+                NavigationType.Timer -> TimerScreen() { selectedNavigation = NavigationType.Home }
+                NavigationType.Home -> HomeScreen() { selectedNavigation = NavigationType.Timer }
             }
 
         }