capacitor-dex-editor 0.0.42 → 0.0.44

package/android/src/main/java/com/aetherlink/dexeditor/DexEditorPluginPlugin.java

@@ -12,8 +12,11 @@ import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.ActivityCallback;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
+import androidx.activity.result.ActivityResult;
+
 import org.json.JSONObject;
 
 /**
@@ -24,10 +27,8 @@ import org.json.JSONObject;
 public class DexEditorPluginPlugin extends Plugin {
 
     private static final String TAG = "DexEditorPlugin";
-    private static final int REQUEST_SMALI_EDITOR = 1001;
     private final DexManager dexManager = new DexManager();
     private final ApkManager apkManager = new ApkManager();
-    private PluginCall pendingEditorCall;
 
     @Override
     public void load() {
@@ -583,8 +584,6 @@ public class DexEditorPluginPlugin extends Plugin {
         String className = call.getString("className", "");
         boolean readOnly = call.getBoolean("readOnly", false);
 
-        pendingEditorCall = call;
-
         Intent intent = new Intent(getContext(), SmaliEditorActivity.class);
         intent.putExtra(SmaliEditorActivity.EXTRA_CONTENT, content);
         intent.putExtra(SmaliEditorActivity.EXTRA_TITLE, title);
@@ -594,13 +593,16 @@ public class DexEditorPluginPlugin extends Plugin {
         startActivityForResult(call, intent, "handleEditorResult");
     }
 
-    @Override
-    protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
-        super.handleOnActivityResult(requestCode, resultCode, data);
-
-        if (pendingEditorCall != null) {
-            JSObject result = new JSObject();
-            if (resultCode == Activity.RESULT_OK && data != null) {
+    @ActivityCallback
+    private void handleEditorResult(PluginCall call, ActivityResult activityResult) {
+        if (call == null) {
+            return;
+        }
+        
+        JSObject result = new JSObject();
+        if (activityResult.getResultCode() == Activity.RESULT_OK) {
+            Intent data = activityResult.getData();
+            if (data != null) {
                 result.put("success", true);
                 result.put("content", data.getStringExtra(SmaliEditorActivity.RESULT_CONTENT));
                 result.put("modified", data.getBooleanExtra(SmaliEditorActivity.RESULT_MODIFIED, false));
@@ -608,8 +610,10 @@ public class DexEditorPluginPlugin extends Plugin {
                 result.put("success", false);
                 result.put("cancelled", true);
             }
-            pendingEditorCall.resolve(result);
-            pendingEditorCall = null;
+        } else {
+            result.put("success", false);
+            result.put("cancelled", true);
         }
+        call.resolve(result);
     }
 }

package/android/src/main/java/com/aetherlink/dexeditor/SmaliEditorActivity.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +16,11 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.aetherlink.dexeditor.editor.EditView;
 
 public class SmaliEditorActivity extends Activity {
@@ -29,17 +35,28 @@ public class SmaliEditorActivity extends Activity {
     private EditView editView;
     private String originalContent;
     private boolean readOnly = false;
+    private LinearLayout root;
+    private View topSpacer;
+    private View bottomSpacer;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        // 全屏
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        getWindow().setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        );
+        // Edge-to-Edge 模式
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().setNavigationBarColor(Color.TRANSPARENT);
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            getWindow().setDecorFitsSystemWindows(false);
+        } else {
+            getWindow().getDecorView().setSystemUiVisibility(
+                View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+                View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+            );
+        }
 
         // 获取参数
         Intent intent = getIntent();
@@ -52,10 +69,16 @@ public class SmaliEditorActivity extends Activity {
         if (title == null) title = "Smali Editor";
 
         // 创建布局
-        LinearLayout root = new LinearLayout(this);
+        root = new LinearLayout(this);
         root.setOrientation(LinearLayout.VERTICAL);
         root.setBackgroundColor(Color.parseColor("#1E1E1E"));
 
+        // 顶部安全区域占位
+        topSpacer = new View(this);
+        topSpacer.setBackgroundColor(Color.parseColor("#2D2D2D"));
+        root.addView(topSpacer, new LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, 0));
+
         // 工具栏
         LinearLayout toolbar = createToolbar(title, className);
         root.addView(toolbar);
@@ -63,17 +86,39 @@ public class SmaliEditorActivity extends Activity {
         // 编辑器
         editView = new EditView(this);
         editView.setLayoutParams(new LinearLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
+            ViewGroup.LayoutParams.MATCH_PARENT, 0, 1
         ));
         editView.setText(originalContent);
         editView.setSyntaxLanguageFileName("smali.json");
         editView.setEditedMode(!readOnly);
         editView.setTypeface(Typeface.MONOSPACE);
         editView.setTextSize(14);
-        
         root.addView(editView);
+
+        // 底部安全区域占位
+        bottomSpacer = new View(this);
+        bottomSpacer.setBackgroundColor(Color.parseColor("#1E1E1E"));
+        root.addView(bottomSpacer, new LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT, 0));
+
         setContentView(root);
+
+        // 处理安全区域
+        ViewCompat.setOnApplyWindowInsetsListener(root, (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            
+            // 更新顶部占位高度
+            ViewGroup.LayoutParams topParams = topSpacer.getLayoutParams();
+            topParams.height = insets.top;
+            topSpacer.setLayoutParams(topParams);
+            
+            // 更新底部占位高度
+            ViewGroup.LayoutParams bottomParams = bottomSpacer.getLayoutParams();
+            bottomParams.height = insets.bottom;
+            bottomSpacer.setLayoutParams(bottomParams);
+            
+            return WindowInsetsCompat.CONSUMED;
+        });
     }
 
     private LinearLayout createToolbar(String title, String className) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-dex-editor",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "Capacitor-plugin-for-editing-DEX-files-in-APK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",