From cc156d415249f801738dcdb04b2a57417ad4a598 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 20 Dec 2022 23:32:13 +0100
Subject: [PATCH] remove the toolbar at widget config screens

---
 .../WidgetBrightDisplayConfigureActivity.kt     |  5 ++++-
 .../activities/WidgetTorchConfigureActivity.kt  |  5 ++++-
 .../res/layout/widget_bright_display_config.xml | 16 ----------------
 app/src/main/res/layout/widget_torch_config.xml | 17 +----------------
 4 files changed, 9 insertions(+), 34 deletions(-)

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 fb59f4a..ca1c186 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
@@ -58,7 +58,6 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
     override fun onResume() {
         super.onResume()
         window.decorView.setBackgroundColor(0)
-        setupToolbar(config_bright_display_toolbar)
 
         if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
             mFeatureLockedDialog?.dismissDialog()
@@ -67,6 +66,10 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
 
     private fun initVariables() {
         mWidgetColor = config.widgetBgColor
+        if (mWidgetColor == resources.getInteger(R.integer.default_widget_bg_color) && config.isUsingSystemTheme) {
+            mWidgetColor = resources.getColor(R.color.you_primary_color, theme)
+        }
+
         mWidgetAlpha = Color.alpha(mWidgetColor) / 255.toFloat()
 
         mWidgetColorWithoutTransparency = Color.rgb(Color.red(mWidgetColor), Color.green(mWidgetColor), Color.blue(mWidgetColor))
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 7c89a84..ace2914 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
@@ -59,7 +59,6 @@ class WidgetTorchConfigureActivity : SimpleActivity() {
     override fun onResume() {
         super.onResume()
         window.decorView.setBackgroundColor(0)
-        setupToolbar(config_torch_toolbar)
 
         if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
             mFeatureLockedDialog?.dismissDialog()
@@ -68,6 +67,10 @@ class WidgetTorchConfigureActivity : SimpleActivity() {
 
     private fun initVariables() {
         mWidgetColor = config.widgetBgColor
+        if (mWidgetColor == resources.getInteger(R.integer.default_widget_bg_color) && config.isUsingSystemTheme) {
+            mWidgetColor = resources.getColor(R.color.you_primary_color, theme)
+        }
+
         mWidgetAlpha = Color.alpha(mWidgetColor) / 255.toFloat()
 
         mWidgetColorWithoutTransparency = Color.rgb(Color.red(mWidgetColor), Color.green(mWidgetColor), Color.blue(mWidgetColor))
diff --git a/app/src/main/res/layout/widget_bright_display_config.xml b/app/src/main/res/layout/widget_bright_display_config.xml
index 5fbe12c..0f5c581 100644
--- a/app/src/main/res/layout/widget_bright_display_config.xml
+++ b/app/src/main/res/layout/widget_bright_display_config.xml
@@ -1,25 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/config_bright_display_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/config_bright_display_app_bar_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/config_bright_display_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/color_primary"
-            app:title="@string/app_launcher_name"
-            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
     <RelativeLayout
         android:id="@+id/config_bright_display_holder"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/widget_torch_config.xml b/app/src/main/res/layout/widget_torch_config.xml
index 7dcfcc5..4fffe5c 100644
--- a/app/src/main/res/layout/widget_torch_config.xml
+++ b/app/src/main/res/layout/widget_torch_config.xml
@@ -1,25 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/config_torch_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/config_torch_app_bar_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/config_torch_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/color_primary"
-            app:title="@string/app_launcher_name"
-            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
     <RelativeLayout
         android:id="@+id/config_torch_holder"
         android:layout_width="match_parent"
@@ -40,6 +24,7 @@
                 android:layout_width="@dimen/main_button_size"
                 android:layout_height="@dimen/main_button_size"
                 android:background="@drawable/ic_flashlight" />
+
         </RelativeLayout>
 
         <ImageView