From 807bf5d4c19b9c81fcbc73bbf7114a71af35c372 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 20 May 2022 15:18:53 +0200
Subject: [PATCH] use orange widget colors by default

---
 app/build.gradle                                           | 2 +-
 .../activities/WidgetBrightDisplayConfigureActivity.kt     | 7 +------
 .../flashlight/activities/WidgetTorchConfigureActivity.kt  | 7 +------
 app/src/main/res/layout/widget_bright_display.xml          | 3 +--
 app/src/main/res/layout/widget_torch.xml                   | 3 +--
 app/src/main/res/values/integers.xml                       | 4 ++++
 6 files changed, 9 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/values/integers.xml

diff --git a/app/build.gradle b/app/build.gradle
index 14a2274..3396307 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:e5a4973e6a'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:745f169a48'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
index 8885ac8..a762560 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.widget.SeekBar
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR
 import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
 import com.simplemobiletools.flashlight.R
 import com.simplemobiletools.flashlight.extensions.config
@@ -44,11 +43,7 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
 
     private fun initVariables() {
         mWidgetColor = config.widgetBgColor
-        mWidgetAlpha = if (mWidgetColor == DEFAULT_WIDGET_BG_COLOR) {
-            1f
-        } else {
-            Color.alpha(mWidgetColor) / 255.toFloat()
-        }
+        mWidgetAlpha = Color.alpha(mWidgetColor) / 255.toFloat()
 
         mWidgetColorWithoutTransparency = Color.rgb(Color.red(mWidgetColor), Color.green(mWidgetColor), Color.blue(mWidgetColor))
         config_widget_seekbar.setOnSeekBarChangeListener(seekbarChangeListener)
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
index 868d34e..a6f665c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.widget.SeekBar
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR
 import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
 import com.simplemobiletools.flashlight.R
 import com.simplemobiletools.flashlight.extensions.config
@@ -45,11 +44,7 @@ class WidgetTorchConfigureActivity : SimpleActivity() {
 
     private fun initVariables() {
         mWidgetColor = config.widgetBgColor
-        mWidgetAlpha = if (mWidgetColor == DEFAULT_WIDGET_BG_COLOR) {
-            1f
-        } else {
-            Color.alpha(mWidgetColor) / 255.toFloat()
-        }
+        mWidgetAlpha = Color.alpha(mWidgetColor) / 255.toFloat()
 
         mWidgetColorWithoutTransparency = Color.rgb(Color.red(mWidgetColor), Color.green(mWidgetColor), Color.blue(mWidgetColor))
         config_widget_seekbar.setOnSeekBarChangeListener(seekbarChangeListener)
diff --git a/app/src/main/res/layout/widget_bright_display.xml b/app/src/main/res/layout/widget_bright_display.xml
index 5be026d..c63a619 100644
--- a/app/src/main/res/layout/widget_bright_display.xml
+++ b/app/src/main/res/layout/widget_bright_display.xml
@@ -2,5 +2,4 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/bright_display_btn"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="5dp" />
+    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/widget_torch.xml b/app/src/main/res/layout/widget_torch.xml
index 17b746c..bfc332b 100644
--- a/app/src/main/res/layout/widget_torch.xml
+++ b/app/src/main/res/layout/widget_torch.xml
@@ -2,5 +2,4 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/flashlight_btn"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="5dp" />
+    android:layout_height="wrap_content" />
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>