Merge remote-tracking branch 'origin/beta' into beta

# Conflicts: # app/build.gradle.kts # app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/navbar/GestureNavbarManager.java
DHD2280 · May 5, 2024 · 6334523 · 6334523
2 parents 17a373c + 1208829
commit 6334523
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 28 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,8 +17,9 @@ android {
         applicationId = "it.dhd.oxygencustomizer"
         minSdk = 33
         targetSdk = 34
-        versionCode = 4
-        versionName = "1.1.0"
+        versionCode = 9
+        versionName = "beta-9"
+        setProperty("archivesBaseName", "OxygenCustomizer.apk")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -120,7 +121,7 @@ dependencies {
 
     // Preference
     implementation("androidx.preference:preference:1.2.1")
-    implementation("org.apache.commons:commons-text:1.11.0")
+    implementation("org.apache.commons:commons-text:${rootProject.extra["commonsTextVersion"]}")
     // SwipeRefreshLayout
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
     // ColorPicker
@@ -152,5 +153,5 @@ dependencies {
 }
 
 tasks.register("printVersionName") {
-    println(android.defaultConfig.versionName?.replace("-(Stable|Beta)".toRegex(), ""))
+    println(android.defaultConfig.versionName)
 }
diff --git a/.../main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/navbar/GestureNavbarManager.java b/.../main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/navbar/GestureNavbarManager.java
@@ -274,36 +274,24 @@ private boolean notWithinInsets(float x, float y, Point mDisplaySize, float mBot
         }
 
 
-        float topLeft = 1f, bottomLeft = 0f, topRight = 1f, bottomRight = 0f;
-        if (backGestureHeightFractionLeft.size() == 2) {
-            topLeft = backGestureHeightFractionLeft.get(1) / 100f;
-            bottomLeft = backGestureHeightFractionLeft.get(0) / 100f;
-        } else {
-            topLeft = backGestureHeightFractionLeft.get(0) / 100f;
-            bottomLeft = 0;
-        }
-
-        if (backGestureHeightFractionRight.size() == 2) {
-            topRight = backGestureHeightFractionRight.get(1) / 100f;
-            bottomRight = backGestureHeightFractionRight.get(0) / 100f;
-        } else {
-            topRight = backGestureHeightFractionRight.get(0) / 100f;
-            bottomRight = 0;
-        }
+        float topLeft = backGestureHeightFractionLeft.get(1) / 100f;
+        float topRight = backGestureHeightFractionRight.get(1) / 100f;
+        float bottomLeft = backGestureHeightFractionLeft.size() == 2 ? backGestureHeightFractionLeft.get(0) / 100f : 0 / 100f;
+        float bottomRight = backGestureHeightFractionRight.size() == 2 ? backGestureHeightFractionRight.get(0) / 100f : 0 / 100f;
 
         return isLeftSide ?
-                y <= (mDisplaySize.y
+                y < (mDisplaySize.y
                         - mBottomGestureHeight
-                        - mDisplaySize.y * topLeft)
-                        || y >= (mDisplaySize.y
+                        - Math.round(mDisplaySize.y * topLeft))
+                        || y > (mDisplaySize.y
                         - mBottomGestureHeight
-                        - mDisplaySize.y * bottomLeft) :
-                y <= (mDisplaySize.y
+                        - Math.round(mDisplaySize.y * bottomLeft)) :
+                y < (mDisplaySize.y
                         - mBottomGestureHeight
-                        - mDisplaySize.y * topRight)
-                        && y >= (mDisplaySize.y
+                        - Math.round(mDisplaySize.y * topRight))
+                        || y > (mDisplaySize.y
                         - mBottomGestureHeight
-                        - mDisplaySize.y * bottomRight);
+                        - Math.round(mDisplaySize.y * bottomRight));
 
         /*int mEdgeHeight = isLeftSide ?
                 Math.round(mDisplaySize.y * backGestureHeightFractionLeft) :