diff --git a/app/build.gradle b/app/build.gradle
index 2f84a62f..925b4b98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
}
dependencies {
- implementation 'com.github.SimpleMobileTools:Simple-Commons:7f288cc10b'
+ implementation 'com.github.SimpleMobileTools:Simple-Commons:971e86fcd2'
implementation 'com.facebook.stetho:stetho:1.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.shawnlin:number-picker:2.4.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
index b090099a..18ce7198 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
@@ -115,7 +115,6 @@ class MainActivity : SimpleActivity() {
.build()
}
-
override fun onPause() {
super.onPause()
storeStateVariables()
@@ -229,22 +228,22 @@ class MainActivity : SimpleActivity() {
main_tabs_holder.onTabSelectionChanged(
tabUnselectedAction = {
- updateBottomTabItemColors(it.customView, false)
+ updateBottomTabItemColors(it.customView, false, getDeselectedTabDrawableIds()[it.position])
},
tabSelectedAction = {
view_pager.currentItem = it.position
- updateBottomTabItemColors(it.customView, true)
+ updateBottomTabItemColors(it.customView, true, getSelectedTabDrawableIds()[it.position])
}
)
}
private fun setupTabColors() {
val activeView = main_tabs_holder.getTabAt(view_pager.currentItem)?.customView
- updateBottomTabItemColors(activeView, true)
+ updateBottomTabItemColors(activeView, true, getSelectedTabDrawableIds()[view_pager.currentItem])
getInactiveTabIndexes(view_pager.currentItem).forEach { index ->
val inactiveView = main_tabs_holder.getTabAt(index)?.customView
- updateBottomTabItemColors(inactiveView, false)
+ updateBottomTabItemColors(inactiveView, false, getDeselectedTabDrawableIds()[index])
}
main_tabs_holder.getTabAt(view_pager.currentItem)?.select()
@@ -255,6 +254,20 @@ class MainActivity : SimpleActivity() {
private fun getInactiveTabIndexes(activeIndex: Int) = arrayListOf(0, 1, 2, 3).filter { it != activeIndex }
+ private fun getSelectedTabDrawableIds() = arrayOf(
+ R.drawable.ic_clock_filled_vector,
+ R.drawable.ic_alarm_filled_vector,
+ R.drawable.ic_stopwatch_filled_vector,
+ R.drawable.ic_hourglass_filled_vector
+ )
+
+ private fun getDeselectedTabDrawableIds() = arrayOf(
+ R.drawable.ic_clock_vector,
+ R.drawable.ic_alarm_vector,
+ R.drawable.ic_stopwatch_vector,
+ R.drawable.ic_hourglass_vector
+ )
+
private fun launchSettings() {
startActivity(Intent(applicationContext, SettingsActivity::class.java))
}
diff --git a/app/src/main/res/drawable/ic_alarm_filled_vector.xml b/app/src/main/res/drawable/ic_alarm_filled_vector.xml
new file mode 100644
index 00000000..b6e9e1cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alarm_filled_vector.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_alarm_off_vector.xml b/app/src/main/res/drawable/ic_alarm_off_vector.xml
index 3ed91869..3a4b95ca 100644
--- a/app/src/main/res/drawable/ic_alarm_off_vector.xml
+++ b/app/src/main/res/drawable/ic_alarm_off_vector.xml
@@ -1,3 +1,3 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_alarm_vector.xml b/app/src/main/res/drawable/ic_alarm_vector.xml
index c02d78ba..42d515d3 100644
--- a/app/src/main/res/drawable/ic_alarm_vector.xml
+++ b/app/src/main/res/drawable/ic_alarm_vector.xml
@@ -1,3 +1,3 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_clock_small.xml b/app/src/main/res/drawable/ic_clock_small.xml
new file mode 100644
index 00000000..eb194770
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clock_small.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_hourglass_filled_vector.xml b/app/src/main/res/drawable/ic_hourglass_filled_vector.xml
new file mode 100644
index 00000000..bf9a4573
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hourglass_filled_vector.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_hourglass_small.xml b/app/src/main/res/drawable/ic_hourglass_small.xml
new file mode 100644
index 00000000..8ae9dc35
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hourglass_small.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_hourglass_vector.xml b/app/src/main/res/drawable/ic_hourglass_vector.xml
index ac07e40b..00487ff7 100644
--- a/app/src/main/res/drawable/ic_hourglass_vector.xml
+++ b/app/src/main/res/drawable/ic_hourglass_vector.xml
@@ -1,3 +1,3 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_stopwatch_filled_vector.xml b/app/src/main/res/drawable/ic_stopwatch_filled_vector.xml
new file mode 100644
index 00000000..52383240
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stopwatch_filled_vector.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_stopwatch_vector.xml b/app/src/main/res/drawable/ic_stopwatch_vector.xml
index f35f4d5a..1d8285af 100644
--- a/app/src/main/res/drawable/ic_stopwatch_vector.xml
+++ b/app/src/main/res/drawable/ic_stopwatch_vector.xml
@@ -1,4 +1,3 @@
-
-
-
+
+
diff --git a/app/src/main/res/layout/dialog_edit_timer.xml b/app/src/main/res/layout/dialog_edit_timer.xml
index 4ba967e2..ea502d93 100644
--- a/app/src/main/res/layout/dialog_edit_timer.xml
+++ b/app/src/main/res/layout/dialog_edit_timer.xml
@@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
- android:drawableLeft="@drawable/ic_hourglass_vector"
+ android:drawableLeft="@drawable/ic_hourglass_small"
android:drawablePadding="@dimen/normal_margin"
android:padding="@dimen/activity_margin"
android:textSize="@dimen/bigger_text_size"
diff --git a/app/src/main/res/layout/fragment_clock.xml b/app/src/main/res/layout/fragment_clock.xml
index f695a583..ed0b85b0 100644
--- a/app/src/main/res/layout/fragment_clock.xml
+++ b/app/src/main/res/layout/fragment_clock.xml
@@ -40,7 +40,7 @@
android:layout_below="@+id/clock_date"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/medium_margin"
- android:drawableLeft="@drawable/ic_alarm_vector"
+ android:drawableLeft="@drawable/ic_clock_small"
android:drawablePadding="@dimen/small_margin"
android:gravity="center_horizontal"
android:textSize="@dimen/big_text_size"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1bf8ee37..f5f512fc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,6 +10,7 @@
68dp
50dp
56dp
+ 24dp
70sp
60sp