Merge branch 'master' of https://git-ce.rwth-aachen.de/moxdlab/moco2024/pomodoro_team_7

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

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

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -24,6 +25,7 @@ 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.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.pomo.myapplication.ui.theme.MyApplicationTheme
@@ -151,24 +153,48 @@ class MainActivity : ComponentActivity() {
                     Text(text = "Reset")
                 }
             }
-
             Spacer(modifier = Modifier.height(20.dp))
             Row {
 
                 // Dieser Button wird gelöscht ist nur für Testzwecke da
-                Button(onClick = { setTimer(1) }) {
+                Button(
+                    onClick = { setTimer(1) },
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = Color(0xFF4CAF50), // Grün
+                        contentColor = Color.White // Weißer Text
+                    )
+                ) {
                     Text(text = "1 min")
                 }
 
-                Button(onClick = { setTimer(5) }) {
+
+                Button(
+                    onClick = { setTimer(5) },
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = Color(0xFFD0BCFF), // Grün
+                        contentColor = Color.White // Weißer Text
+                    )
+                ) {
                     Text(text = "5 min")
                 }
                 Spacer(modifier = Modifier.width(8.dp))
-                Button(onClick = { setTimer(15) }) {
+                Button(
+                    onClick = { setTimer(15) },
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = Color(0xFF6650a4), // Grün
+                        contentColor = Color.White // Weißer Text
+                    )
+                ) {
                     Text(text = "15 min")
                 }
                 Spacer(modifier = Modifier.width(8.dp))
-                Button(onClick = { setTimer(25) }) {
+                Button(
+                    onClick = { setTimer(25) },
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = Color(0xFFEF9A9A), // Grün
+                        contentColor = Color.White // Weißer Text
+                    )
+                ) {
                     Text(text = "25 min")
                 }
             }