Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/pomo/myapplication/MainActivity.kt

app/src/main/java/com/pomo/myapplication/MainActivity.kt

@@ -7,6 +7,8 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.List
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -17,7 +19,6 @@ import androidx.compose.ui.unit.dp
 import androidx.core.app.ActivityCompat
 import com.pomo.myapplication.ui.theme.MotivationalQuotes
 import com.pomo.myapplication.ui.theme.MyApplicationTheme
-import com.pomo.myapplication.ui.theme.ToDoListScreen
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -27,13 +28,11 @@ import kotlinx.coroutines.launch
 class MainActivity : ComponentActivity() {
 
     private val postNotificationsPermission = POST_NOTIFICATIONS
-
     private lateinit var notificationHelper: NotificationHelper
     private var timeLeftForNotification: String? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         notificationHelper = NotificationHelper(this)
 
         setContent {
@@ -83,9 +82,9 @@ class MainActivity : ComponentActivity() {
 
     @Composable
     fun TimerScreen(onToDoListClick: () -> Unit) {
-        var timeLeftInMillis by remember { mutableLongStateOf(25 * 60 * 1000L) }
+        var timeLeftInMillis by remember { mutableStateOf(25 * 60 * 1000L) }
         var timerRunning by remember { mutableStateOf(false) }
-        var customMinutes by remember { mutableIntStateOf(0) }
+        var customMinutes by remember { mutableStateOf(0) }
         val timeFormatted = remember(timeLeftInMillis) {
             val minutes = (timeLeftInMillis / 1000) / 60
             val seconds = (timeLeftInMillis / 1000) % 60
@@ -148,25 +147,26 @@ class MainActivity : ComponentActivity() {
                 showDialog = false
             }
         }
-        // Holen des Motivationsspruchs aus der neuen Datei
-        val motivationalQuote = remember { MotivationalQuotes.getRandomQuote() }
 
+        val motivationalQuote = remember { MotivationalQuotes.getRandomQuote() }
 
+        Box(
+            modifier = Modifier.fillMaxSize()
+        ) {
             Column(
-            modifier = Modifier.fillMaxSize(),
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(bottom = 80.dp), // Padding für den Floating Action Button
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center
             ) {
-
-            // Motivational Quote
                 Text(
                     text = motivationalQuote,
                     style = MaterialTheme.typography.titleLarge,
-                color = Color.DarkGray,
-                modifier = Modifier.padding(10.dp)
+                    color = Color.Gray,
+                    modifier = Modifier.padding(16.dp)
                 )
 
-
                 TimerDisplay(time = timeFormatted)
                 Spacer(modifier = Modifier.height(20.dp))
                 Row {
@@ -249,7 +249,12 @@ class MainActivity : ComponentActivity() {
                 Spacer(modifier = Modifier.height(20.dp))
 
                 Spacer(modifier = Modifier.height(8.dp))
-            Button(onClick = { showDialog = true }) {
+                Button(onClick = { showDialog = true },
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = Color.Magenta,
+                        contentColor = Color.White
+                    )
+                ) {
                     Text(text = "Set Custom Timer")
                 }
 
@@ -261,10 +266,18 @@ class MainActivity : ComponentActivity() {
                         onDismiss = { showDialog = false }
                     )
                 }
+            }
 
-            Spacer(modifier = Modifier.height(20.dp))
-            Button(onClick = onToDoListClick) {
-                Text(text = "Go to To-Do List")
+            FloatingActionButton(
+                onClick = onToDoListClick,
+                modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .padding(16.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Filled.List,
+                    contentDescription = "To-Do List"
+                )
             }
         }
     }
@@ -313,3 +326,4 @@ class MainActivity : ComponentActivity() {
         )
     }
 }
+