From 53fcc2fb81c2bb9c9a516a6644b342afdecd9b8d Mon Sep 17 00:00:00 2001
From: Khaleeq <khaleeq.khan@hotmail.de>
Date: Sun, 11 Aug 2024 16:05:41 +0200
Subject: [PATCH] Update Button colors
---
.../com/pomo/myapplication/MainActivity.kt | 29 ++++++++-----------
.../com/pomo/myapplication/ui/theme/Color.kt | 2 +-
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/pomo/myapplication/MainActivity.kt b/app/src/main/java/com/pomo/myapplication/MainActivity.kt
index 2a18e10..d5906dd 100644
--- a/app/src/main/java/com/pomo/myapplication/MainActivity.kt
+++ b/app/src/main/java/com/pomo/myapplication/MainActivity.kt
@@ -138,6 +138,10 @@ class MainActivity : ComponentActivity() {
timeLeftForNotification = timeFormatted
notificationHelper.showNotification(timeFormatted)
},
+ colors = ButtonDefaults.buttonColors(
+ containerColor = Color(0xFF00AA07),
+ contentColor = Color.White
+ ),
enabled = !timerRunning
) {
Text(text = "Start")
@@ -145,9 +149,13 @@ class MainActivity : ComponentActivity() {
Spacer(modifier = Modifier.width(8.dp))
Button(
onClick = { stopTimer() },
+ colors = ButtonDefaults.buttonColors(
+ containerColor = Color(0xFFD32F2F),
+ contentColor = Color.White
+ ),
enabled = timerRunning
) {
- Text(text = "Stop")
+ Text(text = "Pause")
}
Spacer(modifier = Modifier.width(8.dp))
Button(onClick = { resetTimer() }) {
@@ -159,22 +167,11 @@ class MainActivity : ComponentActivity() {
Spacer(modifier = Modifier.height(20.dp))
Row {
- // Dieser Button wird gelöscht ist nur für Testzwecke da
- Button(
- onClick = { setTimer(1) },
- colors = ButtonDefaults.buttonColors(
- containerColor = Color(0xFF4CAF50), // Grün
- contentColor = Color.White // Weißer Text
- )
- ) {
- Text(text = "1 min")
- }
- // Dieser Button wird gelöscht ist nur für Testzwecke da
Button(
onClick = { setTimer(5) },
colors = ButtonDefaults.buttonColors(
- containerColor = Color(0xFF4CAF50), // Grün
+ containerColor = Color(0xFF6650a4), // Grün
contentColor = Color.White // Weißer Text
)
) {
@@ -182,11 +179,10 @@ class MainActivity : ComponentActivity() {
}
Spacer(modifier = Modifier.width(8.dp))
- // Dieser Button wird gelöscht ist nur für Testzwecke da
Button(
onClick = { setTimer(15) },
colors = ButtonDefaults.buttonColors(
- containerColor = Color(0xFF4CAF50), // Grün
+ containerColor = Color(0xFF6650a4), // Grün
contentColor = Color.White // Weißer Text
)
) {
@@ -194,11 +190,10 @@ class MainActivity : ComponentActivity() {
}
Spacer(modifier = Modifier.width(8.dp))
- // Dieser Button wird gelöscht ist nur für Testzwecke da
Button(
onClick = { setTimer(25) },
colors = ButtonDefaults.buttonColors(
- containerColor = Color(0xFF4CAF50), // Grün
+ containerColor = Color(0xFF6650a4), // Grün
contentColor = Color.White // Weißer Text
)
) {
diff --git a/app/src/main/java/com/pomo/myapplication/ui/theme/Color.kt b/app/src/main/java/com/pomo/myapplication/ui/theme/Color.kt
index 69c95bf..e5d6568 100644
--- a/app/src/main/java/com/pomo/myapplication/ui/theme/Color.kt
+++ b/app/src/main/java/com/pomo/myapplication/ui/theme/Color.kt
@@ -35,7 +35,7 @@ val Pink40 = Color(0xFF7D5260)
val OceanBlue = Color(0xFF2196F3)
val SunshineYellow = Color(0xFFFFC107)
val SunsetOrange = Color(0xFFFF5722)
-val GrassGreen = Color(0xFF4CAF50)
+val GrassGreen = Color(0xFF00AA07)
val CoralRed = Color(0xFFF44336)
val White = Color(0xFFFFFFFF)
val Black = Color(0xFF000000)
--
GitLab