From 6de400753cfbeeacc87dca48fe1082410cd54580 Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 03:39:25 -0700
Subject: [PATCH 1/9] Rounded and larger button treatment

---
 .../res/drawable/btn_duration_default.xml     | 13 +++
 .../res/drawable/btn_duration_disabled.xml    | 13 +++
 .../res/drawable/btn_duration_pressed.xml     | 13 +++
 .../res/drawable/btn_duration_selector.xml    |  7 ++
 .../main/res/drawable/btn_restart_default.xml | 13 +++
 .../res/drawable/btn_restart_disabled.xml     | 13 +++
 .../main/res/drawable/btn_restart_pressed.xml | 13 +++
 .../res/drawable/btn_restart_selector.xml     |  7 ++
 .../main/res/drawable/btn_start_default.xml   | 13 +++
 .../main/res/drawable/btn_start_disabled.xml  | 13 +++
 .../main/res/drawable/btn_start_pressed.xml   | 13 +++
 .../main/res/drawable/btn_start_selector.xml  |  7 ++
 .../main/res/drawable/btn_stop_default.xml    | 13 +++
 .../main/res/drawable/btn_stop_disabled.xml   | 13 +++
 .../main/res/drawable/btn_stop_pressed.xml    | 13 +++
 .../main/res/drawable/btn_stop_selector.xml   |  7 ++
 .../main/res/drawable/ic_refresh_square.xml   | 11 +++
 app/src/main/res/drawable/ic_stop_square.xml  | 11 +++
 app/src/main/res/layout/activity_main.xml     | 33 ++++---
 app/src/main/res/layout/dialog_countdown.xml  | 92 ++++++++++++-------
 goal_prompt.txt                               | 88 ++++++++++++++++++
 21 files changed, 374 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/res/drawable/btn_duration_default.xml
 create mode 100644 app/src/main/res/drawable/btn_duration_disabled.xml
 create mode 100644 app/src/main/res/drawable/btn_duration_pressed.xml
 create mode 100644 app/src/main/res/drawable/btn_duration_selector.xml
 create mode 100644 app/src/main/res/drawable/btn_restart_default.xml
 create mode 100644 app/src/main/res/drawable/btn_restart_disabled.xml
 create mode 100644 app/src/main/res/drawable/btn_restart_pressed.xml
 create mode 100644 app/src/main/res/drawable/btn_restart_selector.xml
 create mode 100644 app/src/main/res/drawable/btn_start_default.xml
 create mode 100644 app/src/main/res/drawable/btn_start_disabled.xml
 create mode 100644 app/src/main/res/drawable/btn_start_pressed.xml
 create mode 100644 app/src/main/res/drawable/btn_start_selector.xml
 create mode 100644 app/src/main/res/drawable/btn_stop_default.xml
 create mode 100644 app/src/main/res/drawable/btn_stop_disabled.xml
 create mode 100644 app/src/main/res/drawable/btn_stop_pressed.xml
 create mode 100644 app/src/main/res/drawable/btn_stop_selector.xml
 create mode 100644 app/src/main/res/drawable/ic_refresh_square.xml
 create mode 100644 app/src/main/res/drawable/ic_stop_square.xml
 create mode 100644 goal_prompt.txt

diff --git a/app/src/main/res/drawable/btn_duration_default.xml b/app/src/main/res/drawable/btn_duration_default.xml
new file mode 100644
index 0000000..688f830
--- /dev/null
+++ b/app/src/main/res/drawable/btn_duration_default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#81C784"
+        android:endColor="#4CAF50"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#A5D6A7" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_duration_disabled.xml b/app/src/main/res/drawable/btn_duration_disabled.xml
new file mode 100644
index 0000000..0926acf
--- /dev/null
+++ b/app/src/main/res/drawable/btn_duration_disabled.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#C8E6C9"
+        android:endColor="#A5D6A7"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#E8F5E9" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_duration_pressed.xml b/app/src/main/res/drawable/btn_duration_pressed.xml
new file mode 100644
index 0000000..e8a9cdb
--- /dev/null
+++ b/app/src/main/res/drawable/btn_duration_pressed.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#66BB6A"
+        android:endColor="#388E3C"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#81C784" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_duration_selector.xml b/app/src/main/res/drawable/btn_duration_selector.xml
new file mode 100644
index 0000000..d1ca3c1
--- /dev/null
+++ b/app/src/main/res/drawable/btn_duration_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/btn_duration_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/btn_duration_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_duration_pressed" android:state_activated="true" />
+    <item android:drawable="@drawable/btn_duration_default" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_restart_default.xml b/app/src/main/res/drawable/btn_restart_default.xml
new file mode 100644
index 0000000..ddb0683
--- /dev/null
+++ b/app/src/main/res/drawable/btn_restart_default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#42A5F5"
+        android:endColor="#1565C0"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#90CAF9" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_restart_disabled.xml b/app/src/main/res/drawable/btn_restart_disabled.xml
new file mode 100644
index 0000000..65f568e
--- /dev/null
+++ b/app/src/main/res/drawable/btn_restart_disabled.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#90CAF9"
+        android:endColor="#64B5F6"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#BBDEFB" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_restart_pressed.xml b/app/src/main/res/drawable/btn_restart_pressed.xml
new file mode 100644
index 0000000..8e8b1d2
--- /dev/null
+++ b/app/src/main/res/drawable/btn_restart_pressed.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#1E88E5"
+        android:endColor="#0D47A1"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#42A5F5" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_restart_selector.xml b/app/src/main/res/drawable/btn_restart_selector.xml
new file mode 100644
index 0000000..fe1fc1f
--- /dev/null
+++ b/app/src/main/res/drawable/btn_restart_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/btn_restart_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/btn_restart_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_restart_pressed" android:state_activated="true" />
+    <item android:drawable="@drawable/btn_restart_default" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_start_default.xml b/app/src/main/res/drawable/btn_start_default.xml
new file mode 100644
index 0000000..75da366
--- /dev/null
+++ b/app/src/main/res/drawable/btn_start_default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#4CAF50"
+        android:endColor="#2E7D32"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#66BB6A" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_start_disabled.xml b/app/src/main/res/drawable/btn_start_disabled.xml
new file mode 100644
index 0000000..115d0f3
--- /dev/null
+++ b/app/src/main/res/drawable/btn_start_disabled.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#A5D6A7"
+        android:endColor="#81C784"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#C8E6C9" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_start_pressed.xml b/app/src/main/res/drawable/btn_start_pressed.xml
new file mode 100644
index 0000000..0b55851
--- /dev/null
+++ b/app/src/main/res/drawable/btn_start_pressed.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#388E3C"
+        android:endColor="#1B5E20"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#4CAF50" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_start_selector.xml b/app/src/main/res/drawable/btn_start_selector.xml
new file mode 100644
index 0000000..2f1e1fe
--- /dev/null
+++ b/app/src/main/res/drawable/btn_start_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/btn_start_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/btn_start_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_start_pressed" android:state_activated="true" />
+    <item android:drawable="@drawable/btn_start_default" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_stop_default.xml b/app/src/main/res/drawable/btn_stop_default.xml
new file mode 100644
index 0000000..3539165
--- /dev/null
+++ b/app/src/main/res/drawable/btn_stop_default.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#EF5350"
+        android:endColor="#C62828"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#EF9A9A" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_stop_disabled.xml b/app/src/main/res/drawable/btn_stop_disabled.xml
new file mode 100644
index 0000000..81f3883
--- /dev/null
+++ b/app/src/main/res/drawable/btn_stop_disabled.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#EF9A9A"
+        android:endColor="#E57373"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#FFCDD2" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_stop_pressed.xml b/app/src/main/res/drawable/btn_stop_pressed.xml
new file mode 100644
index 0000000..c9cb0db
--- /dev/null
+++ b/app/src/main/res/drawable/btn_stop_pressed.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:width="120dp" android:height="120dp" />
+    <gradient
+        android:angle="270"
+        android:startColor="#E53935"
+        android:endColor="#B71C1C"
+        android:type="linear" />
+    <stroke
+        android:width="3dp"
+        android:color="#EF5350" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_stop_selector.xml b/app/src/main/res/drawable/btn_stop_selector.xml
new file mode 100644
index 0000000..1b56174
--- /dev/null
+++ b/app/src/main/res/drawable/btn_stop_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/btn_stop_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/btn_stop_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_stop_pressed" android:state_activated="true" />
+    <item android:drawable="@drawable/btn_stop_default" />
+</selector>
diff --git a/app/src/main/res/drawable/ic_refresh_square.xml b/app/src/main/res/drawable/ic_refresh_square.xml
new file mode 100644
index 0000000..fad7ca3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh_square.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4L17.65,6.35z"
+        android:strokeWidth="0" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_stop_square.xml b/app/src/main/res/drawable/ic_stop_square.xml
new file mode 100644
index 0000000..556ce06
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stop_square.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M6,6h12v12H6z"
+        android:strokeWidth="0" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6f117ca..d8f87f2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -110,15 +110,22 @@
                         </LinearLayout>
                     </LinearLayout>
 
-                    <com.google.android.material.button.MaterialButton
+                    <Button
                         android:id="@+id/btnDurationLabel"
-                        style="@style/Widget.Material3.Button.OutlinedButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="120dp"
+                        android:layout_height="120dp"
                         android:layout_marginTop="32dp"
+                        android:background="@drawable/btn_duration_selector"
                         android:text="@string/start_timer"
                         android:drawableEnd="@drawable/ic_keyboard_arrow_down"
-                        app:cornerRadius="20dp" />
+                        android:drawablePadding="8dp"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="16dp"
+                        android:textColor="#FFFFFF"
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        android:gravity="center"
+                        android:includeFontPadding="false" />
 
                     <HorizontalScrollView
                         android:id="@+id/hsvDurationOptions"
@@ -165,15 +172,19 @@
                         </com.google.android.material.chip.ChipGroup>
                     </HorizontalScrollView>
 
-                    <com.google.android.material.button.MaterialButton
+                    <Button
                         android:id="@+id/btnStart"
-                        style="@style/Widget.Material3.Button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="120dp"
+                        android:layout_height="120dp"
                         android:layout_marginTop="16dp"
+                        android:background="@drawable/btn_start_selector"
+                        android:drawableTop="@drawable/ic_play_arrow"
+                        android:gravity="center"
+                        android:padding="16dp"
                         android:text="@string/start_timer"
-                        app:cornerRadius="20dp"
-                        app:icon="@drawable/ic_play_arrow" />
+                        android:textColor="#FFFFFF"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
 
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/dialog_countdown.xml b/app/src/main/res/layout/dialog_countdown.xml
index 0f64242..e16df30 100644
--- a/app/src/main/res/layout/dialog_countdown.xml
+++ b/app/src/main/res/layout/dialog_countdown.xml
@@ -5,47 +5,71 @@
     android:layout_height="match_parent"
     android:background="#80000000">
 
+    <com.example.countdowntimer.CountdownCanvasView
+        android:id="@+id/cvCountdown"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/buttonRow"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/buttonRow"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="48dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <Button
+            android:id="@+id/btnStop"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/btn_stop_selector"
+            android:drawableTop="@drawable/ic_stop_square"
+            android:gravity="center"
+            android:padding="16dp"
+            android:text="Stop"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/btnRestart"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginStart="16dp"
+            android:background="@drawable/btn_restart_selector"
+            android:drawableTop="@drawable/ic_refresh_square"
+            android:gravity="center"
+            android:padding="16dp"
+            android:text="Restart"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
 
     <Button
         android:id="@+id/btnDismiss"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:background="@drawable/btn_duration_selector"
+        android:gravity="center"
+        android:padding="16dp"
         android:text="Dismiss"
+        android:textColor="#FFFFFF"
+        android:textSize="14sp"
+        android:textStyle="bold"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.example.countdowntimer.CountdownCanvasView
-        android:id="@+id/cvCountdown"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/btnStop"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_margin="16dp" />
-
-    <Button
-        android:id="@+id/btnStop"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Stop"
-        android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/btnRestart"
-        app:layout_constraintHorizontal_chainStyle="spread" />
-
-    <Button
-        android:id="@+id/btnRestart"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Restart"
-        android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/btnStop"
-        app:layout_constraintEnd_toEndOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/goal_prompt.txt b/goal_prompt.txt
new file mode 100644
index 0000000..35a21ef
--- /dev/null
+++ b/goal_prompt.txt
@@ -0,0 +1,88 @@
+# Goal: Redesign all buttons into bold, square, visually striking interactive elements
+
+## Objective
+Replace every basic/rectangular button in the app with larger, square-aspect-ratio buttons that have eye-catching visual design. The goal is to transform the UI from a generic Material 3 look into a distinctive, personality-rich interface that matches the playful "BONG HIT TIMER" brand.
+
+## Current State
+The app uses 4 visible buttons across 2 screens:
+
+**MainActivity (home screen):**
+- `btnDurationLabel` — outlined button showing selected duration (e.g. "10s") with a dropdown arrow. Uses `Widget.Material3.Button.OutlinedButton` with 20dp corners.
+- `btnStart` — filled button labeled "Start Timer" with a play icon. Uses `Widget.Material3.Button` with 20dp corners.
+
+**CountdownDialog (timer screen):**
+- `btnStop` — plain Android `Button` labeled "Stop" (default styling, small)
+- `btnRestart` — plain Android `Button` labeled "Restart" (default styling, small)
+- `btnDismiss` — plain Android `Button` labeled "Dismiss" (currently gone, shows after timer completes)
+
+## Design Requirements
+
+### 1. Square Aspect Ratio
+- Change all buttons from `wrap_content` rectangles to a fixed square size (e.g., `120dp` x `120dp` or `100dp` x `100dp`)
+- Use `app:layout_constraintDimensionRatio="1:1"` where dynamic sizing is needed
+- Buttons should feel substantial and tappable, not compact
+
+### 2. Visual Interest — Each button should have its own personality
+Create custom drawable backgrounds for each button type. Design ideas (pick the best approach):
+
+- **Circular/spherical buttons** — Buttons that look like physical 3D balls or pucks. Use gradient fills with highlights/shadows to create a convex "pressable" look.
+- **Neon/glow effect** — Since the app is a bong hit timer, a subtle neon glow that pulses or intensifies during countdown would be thematically appropriate.
+- **Retro/gaming arcade style** — Bold colors, thick borders, pressed/active states that simulate physical button depression.
+- **Gradient + icon centering** — For the timer screen, center the stop/restart icons prominently in the square buttons with bold gradient backgrounds.
+
+### 3. Interactive States
+Every button must have rich feedback:
+- **Pressed/active state** — noticeable visual change (shrink, darker shade, or inner glow)
+- **Default state** — visually engaging with gradients, shadows, or subtle animations
+- **Disabled state** — reduced opacity but still recognizable
+
+### 4. Icon Integration
+Square buttons are perfect for icon-first design:
+- **Stop button** — large centered pause/stop icon
+- **Restart button** — large centered refresh/replay icon
+- **Start button** — center the play icon, consider removing the text label since the icon is universal
+- **Duration label** — consider a pill-shaped or circular chip that pulses when tapped
+
+### 5. Color Palette
+Stay within the existing green theme (`#2E7D32` primary, `#4C6842` secondary, `#E8F5E9`/`#C8E6C9` gradient) but push it further:
+- Use the primary green for the start/positive actions
+- A red/coral accent for stop
+- A neutral or blue for restart/duration selection
+- Consider gradient transitions within each button (e.g., green to darker green top-to-bottom for a 3D effect)
+
+### 6. Shadow & Elevation
+- Add drop shadows to all buttons for depth (use `app:strokeWidth="0dp"` and custom `rippleColor` for Material buttons)
+- Create a `btn_square_default.xml` and `btn_square_pressed.xml` in `res/drawable/` for each button type
+- The pressed state should visually simulate "pressing in" (reduced shadow, lighter/darker fill)
+
+## Technical Implementation
+
+### New drawable files to create (in `res/drawable/`):
+- `btn_start_square.xml` — gradient + shadow drawable for start button
+- `btn_start_square_pressed.xml` — pressed state variant
+- `btn_stop_square.xml` — gradient + shadow drawable for stop button
+- `btn_stop_square_pressed.xml` — pressed state variant
+- `btn_restart_square.xml` — gradient + shadow drawable for restart button
+- `btn_restart_square_pressed.xml` — pressed state variant
+- `btn_duration_chip.xml` — drawable for duration selector
+
+### Layout changes needed:
+- `activity_main.xml`:
+  - `btnDurationLabel`: change to square dimensions, wrap text/icon in center, apply new drawable
+  - `btnStart`: change to square, center play icon, apply new drawable
+- `dialog_countdown.xml`:
+  - `btnStop`: change from `Button` to `com.google.android.material.button.MaterialButton`, set square dimensions, apply drawable
+  - `btnRestart`: same treatment
+  - `btnDismiss`: same treatment, keep as gone by default
+  - Adjust the ConstraintLayout chain to accommodate square buttons (may need a horizontal chain with proper spacing)
+
+### Code changes needed:
+- `CountdownDialog.kt`: Set button backgrounds programmatically if needed, ensure clickable/pressable states work
+- No changes to button click logic — only visual overhaul
+
+## Constraints
+- Use only Material 3 components already in the dependency (`com.google.android.material:material:1.11.0`)
+- Traditional XML layouts — no Compose
+- Minimum SDK 24 — no API 30+ features
+- Keep the app's existing green aesthetic but make it bolder
+- Maintain accessibility (minimum 48dp touch target, sufficient contrast)
-- 
2.54.0


From 92952a2cf2bc8c2a418e64f9139ec21503bc298c Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 08:50:44 -0700
Subject: [PATCH 2/9] Convert timeout selector button from oval to rectangular
 pill shape

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 app/src/main/res/drawable/btn_duration_default.xml  | 4 ++--
 app/src/main/res/drawable/btn_duration_disabled.xml | 4 ++--
 app/src/main/res/drawable/btn_duration_pressed.xml  | 4 ++--
 app/src/main/res/layout/activity_main.xml           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/drawable/btn_duration_default.xml b/app/src/main/res/drawable/btn_duration_default.xml
index 688f830..2b6aa9a 100644
--- a/app/src/main/res/drawable/btn_duration_default.xml
+++ b/app/src/main/res/drawable/btn_duration_default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size android:width="120dp" android:height="120dp" />
+    android:shape="rectangle">
+    <corners android:radius="40dp" />
     <gradient
         android:angle="270"
         android:startColor="#81C784"
diff --git a/app/src/main/res/drawable/btn_duration_disabled.xml b/app/src/main/res/drawable/btn_duration_disabled.xml
index 0926acf..fba660c 100644
--- a/app/src/main/res/drawable/btn_duration_disabled.xml
+++ b/app/src/main/res/drawable/btn_duration_disabled.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size android:width="120dp" android:height="120dp" />
+    android:shape="rectangle">
+    <corners android:radius="40dp" />
     <gradient
         android:angle="270"
         android:startColor="#C8E6C9"
diff --git a/app/src/main/res/drawable/btn_duration_pressed.xml b/app/src/main/res/drawable/btn_duration_pressed.xml
index e8a9cdb..959a18a 100644
--- a/app/src/main/res/drawable/btn_duration_pressed.xml
+++ b/app/src/main/res/drawable/btn_duration_pressed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size android:width="120dp" android:height="120dp" />
+    android:shape="rectangle">
+    <corners android:radius="40dp" />
     <gradient
         android:angle="270"
         android:startColor="#66BB6A"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d8f87f2..3af0a7e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -112,8 +112,8 @@
 
                     <Button
                         android:id="@+id/btnDurationLabel"
-                        android:layout_width="120dp"
-                        android:layout_height="120dp"
+                        android:layout_width="180dp"
+                        android:layout_height="80dp"
                         android:layout_marginTop="32dp"
                         android:background="@drawable/btn_duration_selector"
                         android:text="@string/start_timer"
-- 
2.54.0


From 13786f6c8e115207456d5808fefc4206f85ecb78 Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 11:04:35 -0700
Subject: [PATCH 3/9] Make dropdown arrow white for better visibility on green
 button

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 app/src/main/res/drawable/ic_keyboard_arrow_down.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
index 39a4ecb..b3cfeec 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#6750A4"
+        android:fillColor="#FFFFFF"
         android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6z"/>
 </vector>
-- 
2.54.0


From 0738fc466ef83a70902422061569b9c872c08a81 Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 11:12:58 -0700
Subject: [PATCH 4/9] Make chip selection color green to match app theme

Add colorPrimaryContainer and set it to the green shade used throughout the app.
This fixes the purplish checked state on Material3 suggestion chips.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 app/src/main/res/values/themes.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a36146a..e152348 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,12 +1,14 @@
 <resources>
     <style name="Theme.CountdownTimer" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
         <item name="colorSecondary">@color/md_theme_light_secondary</item>
         <item name="android:statusBarColor">@color/color_gradient_start</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
     <color name="md_theme_light_primary">#2E7D32</color>
+    <color name="md_theme_light_primaryContainer">#81C784</color>
     <color name="md_theme_light_secondary">#4C6842</color>
     <color name="md_theme_light_surface">#F1F8E9</color>
 </resources>
-- 
2.54.0


From b20208fb40d4d6a1342cd66ffdeb94c639b2578f Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 11:24:10 -0700
Subject: [PATCH 5/9] Make chip selection background green to match app theme

Add custom chip_duration_bg selector drawable (green when checked,
light gray when unchecked) and wire it through a ChipDuration chipStyle
in the theme. This overrides Material3's default purple checked state.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 app/src/main/res/drawable/chip_duration_bg.xml | 15 +++++++++++++++
 app/src/main/res/values/themes.xml             |  7 +++++++
 2 files changed, 22 insertions(+)
 create mode 100644 app/src/main/res/drawable/chip_duration_bg.xml

diff --git a/app/src/main/res/drawable/chip_duration_bg.xml b/app/src/main/res/drawable/chip_duration_bg.xml
new file mode 100644
index 0000000..ef1cfb0
--- /dev/null
+++ b/app/src/main/res/drawable/chip_duration_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="12dp" />
+            <solid android:color="#81C784" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="12dp" />
+            <solid android:color="#F5F5F5" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a36146a..b277b59 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,12 +1,19 @@
 <resources>
     <style name="Theme.CountdownTimer" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
         <item name="colorSecondary">@color/md_theme_light_secondary</item>
         <item name="android:statusBarColor">@color/color_gradient_start</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="chipStyle">@style/ChipDuration</item>
+    </style>
+
+    <style name="ChipDuration" parent="Widget.Material3.Chip.Suggestion.Elevated">
+        <item name="chipBackground">@drawable/chip_duration_bg</item>
     </style>
 
     <color name="md_theme_light_primary">#2E7D32</color>
+    <color name="md_theme_light_primaryContainer">#81C784</color>
     <color name="md_theme_light_secondary">#4C6842</color>
     <color name="md_theme_light_surface">#F1F8E9</color>
 </resources>
-- 
2.54.0


From df9d92f11635cb50fcb3fd6ba51a8efbe1a8a85e Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 11:40:32 -0700
Subject: [PATCH 6/9] Fix chip selection color green with correct color
 selector approach

- Replace broken chipBackground theme style with a color state-list
  selector (res/color/chip_duration_bg.xml) using chipBackgroundColor
  attribute directly on each Chip
- Green (#81C784) when checked, light gray (#E8E8E8) when unchecked
- Add minWidth="56dp" to give chips proper width

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 app/src/main/res/color/chip_duration_bg.xml    |  5 +++++
 app/src/main/res/drawable/chip_duration_bg.xml | 15 ---------------
 app/src/main/res/layout/activity_main.xml      |  8 ++++++++
 app/src/main/res/values/themes.xml             |  5 -----
 4 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/color/chip_duration_bg.xml
 delete mode 100644 app/src/main/res/drawable/chip_duration_bg.xml

diff --git a/app/src/main/res/color/chip_duration_bg.xml b/app/src/main/res/color/chip_duration_bg.xml
new file mode 100644
index 0000000..bdc80ea
--- /dev/null
+++ b/app/src/main/res/color/chip_duration_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="#81C784" />
+    <item android:color="#E8E8E8" />
+</selector>
diff --git a/app/src/main/res/drawable/chip_duration_bg.xml b/app/src/main/res/drawable/chip_duration_bg.xml
deleted file mode 100644
index ef1cfb0..0000000
--- a/app/src/main/res/drawable/chip_duration_bg.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <corners android:radius="12dp" />
-            <solid android:color="#81C784" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="12dp" />
-            <solid android:color="#F5F5F5" />
-        </shape>
-    </item>
-</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3af0a7e..50595d1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -146,6 +146,8 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="5s" />
 
                             <com.google.android.material.chip.Chip
@@ -153,7 +155,9 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
                                 android:checked="true"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="10s" />
 
                             <com.google.android.material.chip.Chip
@@ -161,6 +165,8 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="15s" />
 
                             <com.google.android.material.chip.Chip
@@ -168,6 +174,8 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="30s" />
                         </com.google.android.material.chip.ChipGroup>
                     </HorizontalScrollView>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b277b59..e152348 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,11 +5,6 @@
         <item name="colorSecondary">@color/md_theme_light_secondary</item>
         <item name="android:statusBarColor">@color/color_gradient_start</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="chipStyle">@style/ChipDuration</item>
-    </style>
-
-    <style name="ChipDuration" parent="Widget.Material3.Chip.Suggestion.Elevated">
-        <item name="chipBackground">@drawable/chip_duration_bg</item>
     </style>
 
     <color name="md_theme_light_primary">#2E7D32</color>
-- 
2.54.0


From 51c7fa146461d3ff001add6a0719cdb0982290ca Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 11:52:50 -0700
Subject: [PATCH 7/9] Theme timer ring colors green instead of hardcoded purple

CountdownCanvasView ring progress and track now use themed color
resources (md_color_ring_progress/md_color_ring_track) instead of
hardcoded Material3 purple, so they stay green in both light and dark mode.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../java/com/example/countdowntimer/CountdownCanvasView.kt    | 4 ++--
 app/src/main/res/values-night/colors.xml                      | 2 ++
 app/src/main/res/values-night/themes.xml                      | 1 +
 app/src/main/res/values/colors.xml                            | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt b/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt
index 23c9373..05d82fd 100644
--- a/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt
+++ b/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt
@@ -24,12 +24,12 @@ class CountdownCanvasView @JvmOverloads constructor(
         isFakeBoldText = false
     }
     private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        color = Color.parseColor("#6750A4")
+        color = ContextCompat.getColor(context, R.color.md_color_ring_progress)
         style = Paint.Style.STROKE
         strokeWidth = 16f
     }
     private val ringBgPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        color = Color.parseColor("#D0BCFF")
+        color = ContextCompat.getColor(context, R.color.md_color_ring_track)
         style = Paint.Style.STROKE
         strokeWidth = 16f
     }
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 685ae9d..ea1197c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,4 +2,6 @@
 <resources>
     <color name="color_gradient_start">#1B3A1B</color>
     <color name="color_gradient_end">#0D1F0D</color>
+    <color name="md_color_ring_progress">#A5D6A7</color>
+    <color name="md_color_ring_track">#2E7D32</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 7c0969e..795bd9b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="md_theme_dark_primary">#A5D6A7</color>
+    <color name="md_theme_dark_primaryContainer">#2E7D32</color>
     <color name="md_theme_dark_secondary">#869F7C</color>
 
     <style name="Theme.CountdownTimer" parent="Theme.Material3.DayNight.NoActionBar">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7d02a2b..8543e91 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,6 @@
     <color name="color_gradient_start">#E8F5E9</color>
     <color name="color_gradient_end">#C8E6C9</color>
     <color name="color_icon_tint">#2E7D32</color>
+    <color name="md_color_ring_progress">#2E7D32</color>
+    <color name="md_color_ring_track">#81C784</color>
 </resources>
-- 
2.54.0


From 6ba2f2cfdfac14a77ab7ad02152183432c67de0c Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 12:31:28 -0700
Subject: [PATCH 8/9] fixes beeping to 3.2.1 cycle

---
 .../java/com/example/countdowntimer/CountdownDialog.kt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
index fc7391c..4932b68 100644
--- a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
+++ b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
@@ -61,14 +61,10 @@ class CountdownDialog(
                 val progress = millisUntilFinished.toFloat() / durationMillis
                 cvCountdown.setProgress(progress)
 
-                if (millisUntilFinished >= durationMillis) {
-                    cvCountdown.setText(context.getString(R.string.countdown_text))
-                } else {
-                    val secondsLeft = (millisUntilFinished / 1000).toInt() + 1
-                    cvCountdown.setText(secondsLeft.toString())
-                }
+                val secondsLeft = (millisUntilFinished / 1000).toInt() + 1
+                cvCountdown.setText(secondsLeft.toString())
 
-                if (millisUntilFinished <= 3000 && millisUntilFinished > 1000) {
+                if (secondsLeft >= 1 && secondsLeft <= 3) {
                     playTone(ToneGenerator.TONE_PROP_BEEP)
                     if (prefs.getBoolean("vibration", true)) {
                         vibrator?.vibrate(50)
-- 
2.54.0


From eaaeb7fa35a57e00f3107b35da54fe1ede20f3dc Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Tue, 26 May 2026 13:24:08 -0700
Subject: [PATCH 9/9] fixes buttons on countdown screen

---
 .../example/countdowntimer/CountdownDialog.kt |  4 +-
 app/src/main/res/layout/dialog_countdown.xml  | 40 +++++++++++--------
 app/src/main/res/values/strings.xml           |  2 +
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
index 4932b68..9283278 100644
--- a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
+++ b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
@@ -18,8 +18,8 @@ class CountdownDialog(
     private val prefs: SharedPreferences
 ) : Dialog(context) {
     private lateinit var cvCountdown: CountdownCanvasView
-    private lateinit var btnStop: Button
-    private lateinit var btnRestart: Button
+    private lateinit var btnStop: View
+    private lateinit var btnRestart: View
     private lateinit var btnDismiss: Button
     private var timer: CountDownTimer? = null
     private var toneGenerator: ToneGenerator? = null
diff --git a/app/src/main/res/layout/dialog_countdown.xml b/app/src/main/res/layout/dialog_countdown.xml
index e16df30..0abdf12 100644
--- a/app/src/main/res/layout/dialog_countdown.xml
+++ b/app/src/main/res/layout/dialog_countdown.xml
@@ -26,33 +26,41 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <Button
+        <FrameLayout
             android:id="@+id/btnStop"
             android:layout_width="100dp"
             android:layout_height="100dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/btn_stop_selector"
-            android:drawableTop="@drawable/ic_stop_square"
-            android:gravity="center"
-            android:padding="16dp"
-            android:text="Stop"
-            android:textColor="#FFFFFF"
-            android:textSize="14sp"
-            android:textStyle="bold" />
+            android:clickable="true"
+            android:focusable="true">
 
-        <Button
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/stop_timer"
+                android:src="@drawable/ic_stop_square" />
+
+        </FrameLayout>
+
+        <FrameLayout
             android:id="@+id/btnRestart"
             android:layout_width="100dp"
             android:layout_height="100dp"
             android:layout_marginStart="16dp"
             android:background="@drawable/btn_restart_selector"
-            android:drawableTop="@drawable/ic_refresh_square"
-            android:gravity="center"
-            android:padding="16dp"
-            android:text="Restart"
-            android:textColor="#FFFFFF"
-            android:textSize="14sp"
-            android:textStyle="bold" />
+            android:clickable="true"
+            android:focusable="true">
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/restart_timer"
+                android:src="@drawable/ic_refresh_square" />
+
+        </FrameLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2f4538c..d950ade 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,4 +11,6 @@
     <string name="settings">Settings</string>
     <string name="vibration">Vibration</string>
     <string name="sounds">Sounds</string>
+    <string name="stop_timer">Stop Timer</string>
+    <string name="restart_timer">Restart Timer</string>
 </resources>
-- 
2.54.0