From 4435d135fc26a45e5020dad67b009deeee42f566 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 24 Apr 2022 19:58:04 +0200
Subject: [PATCH] adding some widget config UI changes

---
 app/build.gradle                                  |  2 +-
 .../activities/WidgetAnalogueConfigureActivity.kt |  4 ++--
 .../activities/WidgetDigitalConfigureActivity.kt  |  6 +++---
 .../main/res/layout/widget_config_analogue.xml    |  7 +++++--
 app/src/main/res/layout/widget_config_digital.xml | 15 ++++++++++-----
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 59fbb8e9..8ec3964f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:4c42fec8a4'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:24262ac70d'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'com.shawnlin:number-picker:2.4.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt
index d045375d..d1e375af 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetAnalogueConfigureActivity.kt
@@ -105,9 +105,9 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
 
     private fun updateBackgroundColor() {
         mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
-        config_analogue_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
+        config_analogue_bg_color.setFillWithStroke(mBgColor, mBgColor)
         config_analogue_background.applyColorFilter(mBgColor)
-        config_analogue_save.setBackgroundColor(mBgColor)
+        config_analogue_save.background.applyColorFilter(mBgColor)
     }
 
     private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt
index 63e5479e..c5dc6bcd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt
@@ -126,7 +126,7 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
     }
 
     private fun updateTextColor() {
-        config_digital_text_color.setFillWithStroke(mTextColor, Color.BLACK)
+        config_digital_text_color.setFillWithStroke(mTextColor, mTextColor)
         config_digital_save.setTextColor(mTextColor)
         config_digital_time.setTextColor(mTextColor)
         config_digital_date.setTextColor(mTextColor)
@@ -134,9 +134,9 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
 
     private fun updateBackgroundColor() {
         mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
-        config_digital_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
+        config_digital_bg_color.setFillWithStroke(mBgColor, mBgColor)
         config_digital_background.applyColorFilter(mBgColor)
-        config_digital_save.setBackgroundColor(mBgColor)
+        config_digital_save.background.applyColorFilter(mBgColor)
     }
 
     private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
diff --git a/app/src/main/res/layout/widget_config_analogue.xml b/app/src/main/res/layout/widget_config_analogue.xml
index ab917ed0..b0f9ef5a 100644
--- a/app/src/main/res/layout/widget_config_analogue.xml
+++ b/app/src/main/res/layout/widget_config_analogue.xml
@@ -38,7 +38,8 @@
         android:id="@+id/config_analogue_bg_color"
         android:layout_width="@dimen/widget_colorpicker_size"
         android:layout_height="@dimen/widget_colorpicker_size"
-        android:layout_above="@+id/config_analogue_save" />
+        android:layout_above="@+id/config_analogue_save"
+        android:layout_margin="@dimen/tiny_margin" />
 
     <RelativeLayout
         android:id="@+id/config_analogue_seekbar_holder"
@@ -46,8 +47,9 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/config_analogue_bg_color"
         android:layout_alignBottom="@+id/config_analogue_bg_color"
+        android:layout_marginStart="@dimen/medium_margin"
         android:layout_toEndOf="@+id/config_analogue_bg_color"
-        android:background="@android:color/white">
+        android:background="@drawable/widget_config_seekbar_background">
 
         <com.simplemobiletools.commons.views.MySeekBar
             android:id="@+id/config_analogue_bg_seekbar"
@@ -64,6 +66,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
+        android:background="@drawable/widget_config_seekbar_background"
         android:fontFamily="sans-serif-light"
         android:paddingLeft="@dimen/activity_margin"
         android:paddingRight="@dimen/activity_margin"
diff --git a/app/src/main/res/layout/widget_config_digital.xml b/app/src/main/res/layout/widget_config_digital.xml
index 0d7d403f..8d4c7b35 100644
--- a/app/src/main/res/layout/widget_config_digital.xml
+++ b/app/src/main/res/layout/widget_config_digital.xml
@@ -27,13 +27,13 @@
             android:id="@+id/config_digital_time"
             android:layout_width="match_parent"
             android:layout_height="@dimen/widget_digital_time_height"
-            android:gravity="center_horizontal"
             android:format12Hour="h:mm"
             android:format24Hour="k:mm"
+            android:gravity="center_horizontal"
+            android:includeFontPadding="false"
             android:shadowColor="@android:color/black"
             android:shadowDy="1"
             android:shadowRadius="1"
-            android:includeFontPadding="false"
             android:textSize="@dimen/widget_time_text_size_small"
             tools:text="00:00" />
 
@@ -53,7 +53,8 @@
         android:id="@+id/config_digital_bg_color"
         android:layout_width="@dimen/widget_colorpicker_size"
         android:layout_height="@dimen/widget_colorpicker_size"
-        android:layout_above="@+id/config_digital_text_color" />
+        android:layout_above="@+id/config_digital_text_color"
+        android:layout_margin="@dimen/tiny_margin" />
 
     <RelativeLayout
         android:id="@+id/config_digital_seekbar_holder"
@@ -61,8 +62,9 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/config_digital_bg_color"
         android:layout_alignBottom="@+id/config_digital_bg_color"
+        android:layout_marginStart="@dimen/medium_margin"
         android:layout_toEndOf="@+id/config_digital_bg_color"
-        android:background="@android:color/white">
+        android:background="@drawable/widget_config_seekbar_background">
 
         <com.simplemobiletools.commons.views.MySeekBar
             android:id="@+id/config_digital_bg_seekbar"
@@ -71,13 +73,15 @@
             android:layout_centerVertical="true"
             android:paddingLeft="@dimen/activity_margin"
             android:paddingRight="@dimen/activity_margin" />
+
     </RelativeLayout>
 
     <ImageView
         android:id="@+id/config_digital_text_color"
         android:layout_width="@dimen/widget_colorpicker_size"
         android:layout_height="@dimen/widget_colorpicker_size"
-        android:layout_alignParentBottom="true" />
+        android:layout_alignParentBottom="true"
+        android:layout_margin="@dimen/tiny_margin" />
 
     <Button
         android:id="@+id/config_digital_save"
@@ -85,6 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
+        android:background="@drawable/widget_config_seekbar_background"
         android:fontFamily="sans-serif-light"
         android:paddingLeft="@dimen/activity_margin"
         android:paddingRight="@dimen/activity_margin"