From 970a424a7c426f05cc5d317c16a9a1777ad6f842 Mon Sep 17 00:00:00 2001 From: Nishant Mishra Date: Mon, 15 Sep 2025 19:42:20 +0530 Subject: [PATCH] feat: Update navigation bar icons --- app/src/main/java/org/nsh07/pomodoro/MainActivity.kt | 4 ++-- .../nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt | 4 ++-- app/src/main/res/drawable/hourglass.xml | 10 ---------- app/src/main/res/drawable/hourglass_filled.xml | 10 ---------- app/src/main/res/drawable/timer_filled.xml | 9 +++++++++ app/src/main/res/drawable/timer_outlined.xml | 9 +++++++++ 6 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 app/src/main/res/drawable/hourglass.xml delete mode 100644 app/src/main/res/drawable/hourglass_filled.xml create mode 100644 app/src/main/res/drawable/timer_filled.xml create mode 100644 app/src/main/res/drawable/timer_outlined.xml diff --git a/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt b/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt index c6e55b6..94d8900 100644 --- a/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt +++ b/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt @@ -55,8 +55,8 @@ class MainActivity : ComponentActivity() { val screens = listOf( NavItem( Screen.Timer, - R.drawable.hourglass, - R.drawable.hourglass_filled, + R.drawable.timer_outlined, + R.drawable.timer_filled, "Timer" ), NavItem( diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt index b3683fe..37334df 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt @@ -138,14 +138,14 @@ private fun SettingsScreen( checked = alarmEnabled, icon = R.drawable.alarm_on, label = "Alarm", - description = "Ring your system alarm sound when a timer completes", + description = "Ring alarm when a timer completes", onClick = onAlarmEnabledChange ), SettingsSwitchItem( checked = vibrateEnabled, icon = R.drawable.mobile_vibrate, label = "Vibrate", - description = "Vibrate in a repeating pattern when a timer completes", + description = "Vibrate when a timer completes", onClick = onVibrateEnabledChange ) ) diff --git a/app/src/main/res/drawable/hourglass.xml b/app/src/main/res/drawable/hourglass.xml deleted file mode 100644 index a9fdbda..0000000 --- a/app/src/main/res/drawable/hourglass.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/hourglass_filled.xml b/app/src/main/res/drawable/hourglass_filled.xml deleted file mode 100644 index 7e80e61..0000000 --- a/app/src/main/res/drawable/hourglass_filled.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/timer_filled.xml b/app/src/main/res/drawable/timer_filled.xml new file mode 100644 index 0000000..9cfe048 --- /dev/null +++ b/app/src/main/res/drawable/timer_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/timer_outlined.xml b/app/src/main/res/drawable/timer_outlined.xml new file mode 100644 index 0000000..17b99fb --- /dev/null +++ b/app/src/main/res/drawable/timer_outlined.xml @@ -0,0 +1,9 @@ + + +