Răsfoiți Sursa

app: replace androidx with just normal android classes so we dont need to bundle androidx jar

jkds 7 luni în urmă
părinte
comite
6e23e98d26

+ 1 - 1
bin/app/java/MainActivity.java

@@ -47,7 +47,7 @@ main.inpcon.setListener(new Listener() {
     }
 
     @Override
-    public void onImeInsetsChanged(androidx.core.graphics.Insets insets) {
+    public void onImeInsetsChanged(android.graphics.Insets insets) {
         // Called when IME insets change (e.g., keyboard height changes)
         // Optional: can be used for dynamic layout adjustment
     }

+ 6 - 9
bin/app/java/textinput/InputConnection.java

@@ -37,10 +37,8 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.ExtractedText;
 import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputMethodManager;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowCompat;
-import androidx.core.view.WindowInsetsCompat;
+import android.graphics.Insets;
+import android.view.WindowInsets;
 
 import textinput.GameTextInput.Pair;
 
@@ -115,7 +113,6 @@ public class InputConnection extends BaseInputConnection implements View.OnKeyLi
       this.mEditable = (Editable) (new SpannableStringBuilder());
     }
     // Listen for insets changes
-    WindowCompat.setDecorFitsSystemWindows(((Activity) targetView.getContext()).getWindow(), false);
     targetView.setOnKeyListener(this);
     // Apply EditorInfo settings
     this.setEditorInfo(settings.mEditorInfo);
@@ -560,13 +557,13 @@ public class InputConnection extends BaseInputConnection implements View.OnKeyLi
       return Insets.NONE;
     }
 
-    WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(this.targetView);
+    WindowInsets insets = this.targetView.getRootWindowInsets();
 
     if (insets == null) {
       return Insets.NONE;
     }
 
-    return insets.getInsets(WindowInsetsCompat.Type.ime());
+    return insets.getInsets(WindowInsets.Type.ime());
   }
 
   /**
@@ -579,13 +576,13 @@ public class InputConnection extends BaseInputConnection implements View.OnKeyLi
       return false;
     }
 
-    WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(this.targetView);
+    WindowInsets insets = this.targetView.getRootWindowInsets();
 
     if (insets == null) {
       return false;
     }
 
-    return insets.isVisible(WindowInsetsCompat.Type.ime());
+    return insets.isVisible(WindowInsets.Type.ime());
   }
 
   /**

+ 1 - 1
bin/app/java/textinput/Listener.java

@@ -15,7 +15,7 @@
  */
 package textinput;
 
-import androidx.core.graphics.Insets;
+import android.graphics.Insets;
 
 /**
  * Listener interface for text, selection and composing region changes.

+ 0 - 7
bin/app/quad.toml

@@ -8,10 +8,3 @@ java_files = [
     "java/textinput/Settings.java",
     "java/textinput/GameTextInput.java"
 ]
-comptime_jar_files = [
-    "android-libs/androidx/core-1.9.0.jar"
-]
-runtime_jar_files = [
-    "android-libs/androidx/core-1.9.0.jar"
-]
-