Couple more fixes

[android-x86/packages-apps-Taskbar.git] / app / src / main / java / com / farmerbb / taskbar / ui / UIController.java

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..2d700e3 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,16 @@
 
 package com.farmerbb.taskbar.ui;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
+import android.provider.Settings;
 import android.view.View;
-import android.view.WindowInsets;
 
+import com.farmerbb.taskbar.BuildConfig;
+import com.farmerbb.taskbar.R;
 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;
 
@@ -70,23 +71,32 @@ public abstract class UIController {
     }
 
     protected void applyMarginFix(UIHost host, View layout, ViewParams params) {
-        if(U.getCurrentApiVersion() <= 29.0) return;
+        if(U.getCurrentApiVersion() <= 29.0 || !(host instanceof SecondaryHomeActivity))
+            return;
 
         layout.setOnApplyWindowInsetsListener((v, insets) -> {
-            boolean isImeVisible = isImeVisible(v);
+            boolean isImeVisible = CompatUtils.isImeVisible(v);
             if(isImeVisible != prevImeVisibility) {
                 prevImeVisibility = isImeVisible;
 
-                ViewParams newParams = isImeVisible ? params.noBottomMargin() : params;
+                ViewParams newParams = isImeVisible ? params.updateBottomMargin(0) : params;
                 host.updateViewLayout(layout, newParams);
+
+                if(isImeFixDisabled() && !U.isLibrary(context)) {
+                    SharedPreferences pref = U.getSharedPreferences(context);
+                    if(!pref.getBoolean(PREF_DESKTOP_MODE_IME_FIX, false)) {
+                        pref.edit().putBoolean(PREF_DESKTOP_MODE_IME_FIX, true).apply();
+                        U.showToastLong(context, R.string.tb_desktop_mode_ime_fix_toast);
+                    }
+                }
             }
 
             return insets;
         });
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
-    private boolean isImeVisible(View view) {
-        return view.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
+    protected boolean isImeFixDisabled() {
+        String ime = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+        return !ime.startsWith(BuildConfig.BASE_APPLICATION_ID) && !ime.startsWith("com.farmerbb.secondscreen");
     }
 }
\ No newline at end of file