Move isImeVisible() to CompatUtils

diff --git a/Android.mk b/Android.mk
index 3fd76f5..4267c7e 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,8 @@ LOCAL_SRC_FILES := \
         $(call all-java-files-under, app/src/main/java) \
         $(call all-java-files-under, app/src/androidx86/java) \
         $(call all-java-files-under, app/src/nonlib/java) \
-        $(call all-java-files-under, app/src/nonplaystore/java)
+        $(call all-java-files-under, app/src/nonplaystore/java) \
+        $(call all-java-files-under, app/src/compat-$(PLATFORM_SDK_VERSION)/java)
 
 LOCAL_MANIFEST_FILE := app/src/androidx86/AndroidManifest.xml
 

diff --git a/app/build.gradle b/app/build.gradle
index 65ec8ef..4ba70bf 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,7 +80,7 @@ android {
 
     sourceSets {
         main {
-            java { srcDirs('src/main/java', 'src/playstore/java', 'src/nonlib/java') }
+            java { srcDirs('src/main/java', 'src/playstore/java', 'src/nonlib/java', "src/compat-$COMPILE_SDK_VERSION/java") }
             res { srcDirs('src/main/res', 'src/playstore/res', 'src/nonlib/res') }
             manifest.srcFile 'src/playstore/AndroidManifest.xml'
         }

diff --git a/app/src/compat-28/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-28/java/com/farmerbb/taskbar/util/CompatUtils.java
new file mode 100644 (file)
index 0000000..25be71b
--- /dev/null
+++ b/app/src/compat-28/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -0,0 +1,27 @@
+/* Copyright 2020 Braden Farmer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.farmerbb.taskbar.util;
+
+import android.view.View;
+
+public class CompatUtils {
+
+    private CompatUtils() {}
+
+    public static boolean isImeVisible(View view) {
+        return false;
+    }
+}
\ No newline at end of file

diff --git a/app/src/compat-29/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-29/java/com/farmerbb/taskbar/util/CompatUtils.java
new file mode 100644 (file)
index 0000000..25be71b
--- /dev/null
+++ b/app/src/compat-29/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -0,0 +1,27 @@
+/* Copyright 2020 Braden Farmer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.farmerbb.taskbar.util;
+
+import android.view.View;
+
+public class CompatUtils {
+
+    private CompatUtils() {}
+
+    public static boolean isImeVisible(View view) {
+        return false;
+    }
+}
\ No newline at end of file

diff --git a/app/src/compat-30/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-30/java/com/farmerbb/taskbar/util/CompatUtils.java
new file mode 100644 (file)
index 0000000..347e0c0
--- /dev/null
+++ b/app/src/compat-30/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -0,0 +1,34 @@
+/* Copyright 2020 Braden Farmer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.farmerbb.taskbar.util;
+
+// Utility class meant for compatibility between the Android-x86 version of Taskbar (compiled with SDK 28)
+// and the Play Store version of Taskbar (compiled with SDK 30).
+// TODO Do not make changes to this file without making corresponding changes to the Android-x86 version.
+
+import android.os.Build;
+import android.view.View;
+import android.view.WindowInsets;
+
+public class CompatUtils {
+
+    private CompatUtils() {}
+
+    public static boolean isImeVisible(View view) {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                && view.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
+    }
+}
\ No newline at end of file

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java b/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
index c7272df..de2e63a 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
@@ -15,15 +15,13 @@
 
 package com.farmerbb.taskbar.ui;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.view.View;
-import android.view.WindowInsets;
 
 import com.farmerbb.taskbar.activity.SecondaryHomeActivity;
 import com.farmerbb.taskbar.helper.LauncherHelper;
+import com.farmerbb.taskbar.util.CompatUtils;
 import com.farmerbb.taskbar.util.TaskbarPosition;
 import com.farmerbb.taskbar.util.U;
 
@@ -73,7 +71,7 @@ public abstract class UIController {
         if(U.getCurrentApiVersion() <= 29.0) return;
 
         layout.setOnApplyWindowInsetsListener((v, insets) -> {
-            boolean isImeVisible = isImeVisible(v);
+            boolean isImeVisible = CompatUtils.isImeVisible(v);
             if(isImeVisible != prevImeVisibility) {
                 prevImeVisibility = isImeVisible;
 
@@ -84,9 +82,4 @@ public abstract class UIController {
             return insets;
         });
     }
-
-    @TargetApi(Build.VERSION_CODES.M)
-    private boolean isImeVisible(View view) {
-        return view.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
-    }
 }
\ No newline at end of file

diff --git a/lib/build.gradle b/lib/build.gradle
index 329bca5..ec727fd 100644 (file)
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -43,7 +43,7 @@ android {
 
     sourceSets {
         main {
-            java { srcDirs('../app/src/main/java', '../app/src/lib/java', '../app/src/nonplaystore/java') }
+            java { srcDirs('../app/src/main/java', '../app/src/lib/java', '../app/src/nonplaystore/java', "../app/src/compat-$COMPILE_SDK_VERSION/java") }
             res { srcDirs('../app/src/main/res', '../app/src/lib/res') }
             manifest.srcFile '../app/src/lib/AndroidManifest.xml'
         }