From eefc5573ba667ad7e2de39a008576c7405550b54 Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Sat, 30 Apr 2022 11:19:53 +0700
Subject: [PATCH 1/2] Hide status bar in widgets page

---
 app/build.gradle                                       |  5 +----
 .../features/launcher/LauncherActivity.java            | 10 ++++++++++
 app/src/main/res/values/styles.xml                     |  1 +
 .../e/blisslauncher/buildsrc/Dependencies.kt           |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 44138b180c..6e3f50b9d6 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,7 @@ android {
         applicationId "foundation.e.blisslauncher"
         minSdkVersion Versions.min_sdk
         targetSdkVersion Versions.target_sdk
+        compileSdkVersion 31
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100
         versionName "${versionMajor}.${versionMinor}.${versionPatch}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -72,24 +73,20 @@ android {
         apiNougat {
             dimension "api"
             minSdkVersion 24
-            compileSdkVersion 25
         }
         apiOreo {
             dimension "api"
             minSdkVersion 26
-            compileSdkVersion 28
             targetSdkVersion 28
         }
         apiQ {
             dimension "api"
             minSdkVersion 29
-            compileSdkVersion 29
             targetSdkVersion 29
         }
         apiR {
             dimension "api"
             minSdkVersion 29
-            compileSdkVersion 29
             targetSdkVersion 29
         }
     }
diff --git a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
index 09b30bcc4c..75dcc53283 100755
--- a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
+++ b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
@@ -69,6 +69,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -247,6 +249,8 @@ public class LauncherActivity extends AppCompatActivity implements
     private int mThemeRes = R.style.HomeScreenTheme;
     private LayoutInflater mLightLayoutInflater;
 
+    private WindowInsetsControllerCompat mInsetsController;
+
     public static LauncherActivity getLauncher(Context context) {
         if (context instanceof LauncherActivity) {
             return (LauncherActivity) context;
@@ -333,6 +337,8 @@ public class LauncherActivity extends AppCompatActivity implements
         }
         final ContextThemeWrapper lightContext = new ContextThemeWrapper(this, R.style.HomeScreenTheme);
         mLightLayoutInflater = getLayoutInflater().cloneInContext(lightContext);
+
+        mInsetsController = new WindowInsetsControllerCompat(getWindow(), mLauncherView);
     }
 
     public View getRootView() {
@@ -1236,6 +1242,10 @@ public class LauncherActivity extends AppCompatActivity implements
                             intent.setAction(WeatherUpdateService.ACTION_FORCE_UPDATE);
                             startService(intent);
                         }
+
+                        mInsetsController.hide(WindowInsetsCompat.Type.statusBars());
+                    } else {
+                        mInsetsController.show(WindowInsetsCompat.Type.statusBars());
                     }
 
                     dragDropEnabled = true;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c6eb429904..9b7d84e449 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,6 +17,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:enforceNavigationBarContrast">false</item>
         <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
     <style name="HomeScreenTheme" parent="BaseHomeScreenTheme">
diff --git a/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt b/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt
index 5575c7e471..a7bc6c962c 100644
--- a/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt
+++ b/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt
@@ -49,7 +49,7 @@ object Libs {
     }
 
     object AndroidX {
-        const val appcompat = "androidx.appcompat:appcompat:1.1.0-rc01"
+        const val appcompat = "androidx.appcompat:appcompat:1.4.1"
         const val collection = "androidx.collection:collection-ktx:1.1.0"
         const val palette = "androidx.palette:palette:1.0.0"
         const val recyclerview = "androidx.recyclerview:recyclerview:1.1.0-beta03"
-- 
GitLab


From b85d7422c868575adf94160748a64271d4a7fd32 Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Sun, 1 May 2022 15:45:35 +0700
Subject: [PATCH 2/2] Change compile sdk to 31

---
 app/build.gradle                                                | 1 -
 .../java/foundation/e/blisslauncher/buildsrc/Dependencies.kt    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6e3f50b9d6..5133006d1c 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,7 +28,6 @@ android {
         applicationId "foundation.e.blisslauncher"
         minSdkVersion Versions.min_sdk
         targetSdkVersion Versions.target_sdk
-        compileSdkVersion 31
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100
         versionName "${versionMajor}.${versionMinor}.${versionPatch}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt b/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt
index a7bc6c962c..6160b2b8b7 100644
--- a/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt
+++ b/buildSrc/src/main/java/foundation/e/blisslauncher/buildsrc/Dependencies.kt
@@ -1,7 +1,7 @@
 package foundation.e.blisslauncher.buildsrc
 
 object Versions {
-    const val compile_sdk = 29
+    const val compile_sdk = 31
     const val min_sdk = 24
     const val target_sdk = 29
     const val android_gradle_plugin = "3.5.0"
-- 
GitLab