From aa953babfd0bba96a4a4da0a5771bcab63aa43e9 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 20 May 2022 21:54:02 +0200
Subject: [PATCH] adding some widget config related ui improvements

---
 .../WidgetRecordDisplayConfigureActivity.kt   | 11 ++++---
 .../layout/widget_record_display_config.xml   | 31 +++++++++++--------
 app/src/main/res/values/integers.xml          |  4 +++
 3 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/values/integers.xml

diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/WidgetRecordDisplayConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/WidgetRecordDisplayConfigureActivity.kt
index a74b78b..ed3bb9f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/WidgetRecordDisplayConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/WidgetRecordDisplayConfigureActivity.kt
@@ -7,9 +7,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.widget.SeekBar
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
-import com.simplemobiletools.commons.extensions.adjustAlpha
-import com.simplemobiletools.commons.extensions.applyColorFilter
-import com.simplemobiletools.commons.extensions.setFillWithStroke
+import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
 import com.simplemobiletools.voicerecorder.R
 import com.simplemobiletools.voicerecorder.extensions.config
@@ -38,10 +36,13 @@ class WidgetRecordDisplayConfigureActivity : SimpleActivity() {
 
         config_save.setOnClickListener { saveConfig() }
         config_widget_color.setOnClickListener { pickBackgroundColor() }
+
+        val primaryColor = getProperPrimaryColor()
+        config_widget_seekbar.setColors(getProperTextColor(), primaryColor, primaryColor)
     }
 
     private fun initVariables() {
-        mWidgetColor = resources.getColor(R.color.color_primary)
+        mWidgetColor = config.widgetBgColor
         mWidgetAlpha = Color.alpha(mWidgetColor) / 255.toFloat()
 
         mWidgetColorWithoutTransparency = Color.rgb(Color.red(mWidgetColor), Color.green(mWidgetColor), Color.blue(mWidgetColor))
@@ -79,7 +80,7 @@ class WidgetRecordDisplayConfigureActivity : SimpleActivity() {
 
     private fun updateColors() {
         mWidgetColor = mWidgetColorWithoutTransparency.adjustAlpha(mWidgetAlpha)
-        config_widget_color.setFillWithStroke(mWidgetColor, Color.BLACK)
+        config_widget_color.setFillWithStroke(mWidgetColor, mWidgetColor)
         config_image.background.mutate().applyColorFilter(mWidgetColor)
     }
 
diff --git a/app/src/main/res/layout/widget_record_display_config.xml b/app/src/main/res/layout/widget_record_display_config.xml
index edb7e2c..ae01761 100644
--- a/app/src/main/res/layout/widget_record_display_config.xml
+++ b/app/src/main/res/layout/widget_record_display_config.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/config_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_centerHorizontal="true"
-    android:layout_margin="@dimen/activity_margin"
-    android:paddingBottom="@dimen/activity_margin">
+    android:layout_margin="@dimen/activity_margin">
 
     <RelativeLayout
+        android:id="@+id/config_wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/config_widget_color"
@@ -24,7 +25,8 @@
         android:id="@+id/config_widget_color"
         android:layout_width="@dimen/widget_colorpicker_size"
         android:layout_height="@dimen/widget_colorpicker_size"
-        android:layout_above="@+id/config_save" />
+        android:layout_above="@+id/config_save"
+        android:layout_margin="@dimen/tiny_margin" />
 
     <RelativeLayout
         android:id="@+id/config_widget_seekbar_holder"
@@ -32,30 +34,33 @@
         android:layout_height="match_parent"
         android:layout_alignTop="@+id/config_widget_color"
         android:layout_alignBottom="@+id/config_widget_color"
-        android:layout_toRightOf="@+id/config_widget_color"
-        android:background="@android:color/white">
+        android:layout_marginStart="@dimen/medium_margin"
+        android:layout_toEndOf="@+id/config_widget_color"
+        android:background="@drawable/widget_config_seekbar_background">
 
-        <SeekBar
+        <com.simplemobiletools.commons.views.MySeekBar
             android:id="@+id/config_widget_seekbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin" />
+            android:paddingStart="@dimen/activity_margin"
+            android:paddingEnd="@dimen/activity_margin" />
     </RelativeLayout>
 
     <Button
         android:id="@+id/config_save"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:background="@color/gradient_grey_start"
+        android:layout_marginTop="@dimen/small_margin"
+        android:background="@drawable/widget_config_seekbar_background"
         android:fontFamily="sans-serif-light"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin"
         android:text="@string/ok"
-        android:textColor="@color/color_primary"
+        android:textColor="@color/dark_grey"
+        android:textFontWeight="400"
         android:textSize="@dimen/big_text_size" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
new file mode 100644
index 0000000..5b8ac01
--- /dev/null
+++ b/app/src/main/res/values/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="default_widget_bg_color">-571114496</integer>        <!-- #DDF57C00 -->
+</resources>