From 10c6a8eb95a60ac4aefbb369a4ae2661a836472d Mon Sep 17 00:00:00 2001 From: pi Date: Sat, 6 Dec 2025 22:44:14 +0100 Subject: [PATCH] =?UTF-8?q?farben=20ge=C3=A4ndert,=20default=20werte=20fad?= =?UTF-8?q?e=20on=20und=2020=20minuten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/example/hairdryer/MainActivity.kt | 12 ++++++------ app/src/main/res/layout/activity_main.xml | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/hairdryer/MainActivity.kt b/app/src/main/java/com/example/hairdryer/MainActivity.kt index a883c25..14cf494 100644 --- a/app/src/main/java/com/example/hairdryer/MainActivity.kt +++ b/app/src/main/java/com/example/hairdryer/MainActivity.kt @@ -19,7 +19,7 @@ class MainActivity : Activity() { private var streamId = 0 private val handler = Handler() private var isPlaying = false - private var fadeEnabled = false + private var fadeEnabled = true private var totalMillis: Long = 0 private var startTime: Long = 0 private var fadeRunnable: Runnable? = null @@ -46,7 +46,7 @@ class MainActivity : Activity() { soundId = soundPool.load(this, R.raw.sound, 1) - updateUI(status, volumeBar, "Bereit", Color.LTGRAY, 1f) + updateUI(status, volumeBar, "Bereit", Color.GREEN, 1f) fadeToggle.setOnClickListener { fadeEnabled = !fadeEnabled fadeToggle.text = "Fade-Out: " + if (fadeEnabled) "ON" else "OFF" @@ -107,7 +107,7 @@ class MainActivity : Activity() { } } else { // unendlich - updateUI(status, volumeBar, "Läuft: ∞", Color.GREEN, 1f) + updateUI(status, volumeBar, "Stopp: ∞", Color.RED, 1f) volumeBar.progress = 100 } } @@ -115,8 +115,8 @@ class MainActivity : Activity() { private fun updateCountdown(remainingSec: Int, status: TextView) { val minutes = remainingSec / 60 val seconds = remainingSec % 60 - status.text = String.format("Läuft: %02d:%02d", minutes, seconds) - status.setBackgroundColor(Color.GREEN) + status.text = String.format("Stopp: %02d:%02d", minutes, seconds) + status.setBackgroundColor(Color.RED) status.setTextColor(Color.BLACK) } @@ -127,7 +127,7 @@ class MainActivity : Activity() { } handler.removeCallbacks(countdownRunnable ?: Runnable {}) handler.removeCallbacks(fadeRunnable ?: Runnable {}) - updateUI(status, volumeBar, "Gestoppt", Color.RED, 0f) + updateUI(status, volumeBar, "Start", Color.GREEN, 0f) volumeBar.progress = 0 } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d2ae2db..ed37522 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,7 +21,7 @@ android:layout_height="50dp" />