From f2f81dfa89c545ceac520827792a3adaa2f5562f Mon Sep 17 00:00:00 2001
From: Yasan Ghaffarian <y.ghafarian@dariahamrah.ir>
Date: Sun, 12 Jun 2022 18:53:41 +0430
Subject: [PATCH] Add "Allow Overlap" to preferences

Co-authored-by: Daria Hamrah Paytakht <info@dariarnd.ir>
---
 lawnchair/res/values/config.xml                             | 1 +
 lawnchair/res/values/strings.xml                            | 1 +
 .../src/app/lawnchair/preferences2/PreferenceManager2.kt    | 6 ++++++
 .../app/lawnchair/ui/preferences/HomeScreenPreferences.kt   | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml
index bffd563ec2..32ca9ea9e2 100644
--- a/lawnchair/res/values/config.xml
+++ b/lawnchair/res/values/config.xml
@@ -53,6 +53,7 @@
     <bool name="config_default_themed_hotseat_qsb">false</bool>
     <bool name="config_default_dock_search_bar_force_website">false</bool>
     <bool name="config_default_rounded_widgets">true</bool>
+    <bool name="config_default_allow_widget_overlap">false</bool>
     <bool name="config_default_show_status_bar">true</bool>
     <bool name="config_default_show_top_shadow">true</bool>
     <bool name="config_default_lock_home_screen">false</bool>
diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index b13b5d1267..8179dc47b9 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -170,6 +170,7 @@
     <string name="hide_from_drawer">Hide from App Drawer</string>
     <string name="action_lens">Lens</string>
     <string name="force_rounded_widgets">Rounded Corners</string>
+    <string name="allow_widget_overlap">Allow Overlap</string>
     <string name="suggestion_pref_screen_title">Suggestions</string>
     <string name="n_percent">%1$d%%</string>
     <string name="label">Label</string>
diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
index 392fc9051e..ac66ac5465 100644
--- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
+++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
@@ -132,6 +132,12 @@ class PreferenceManager2(private val context: Context) : PreferenceManager {
         onSet = { reloadHelper.reloadGrid() },
     )
 
+    val allowWidgetOverlap = preference(
+        key = booleanPreferencesKey(name = "allow_widget_overlap"),
+        defaultValue = context.resources.getBoolean(R.bool.config_default_allow_widget_overlap),
+        onSet = { reloadHelper.reloadGrid() },
+    )
+
     val showStatusBar = preference(
         key = booleanPreferencesKey(name = "show_status_bar"),
         defaultValue = context.resources.getBoolean(R.bool.config_default_show_status_bar),
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
index 05cb7e55a0..e7a2d9c144 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
@@ -154,6 +154,10 @@ fun HomeScreenPreferences() {
                 adapter = prefs2.roundedWidgets.getAdapter(),
                 label = stringResource(id = R.string.force_rounded_widgets),
             )
+            SwitchPreference(
+                adapter = prefs2.allowWidgetOverlap.getAdapter(),
+                label = stringResource(id = R.string.allow_widget_overlap),
+            )
         }
     }
 }