capacitor-dex-editor 0.0.49 → 0.0.51

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

@@ -6,11 +6,17 @@ import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.Editable;
 import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -43,6 +49,20 @@ public class SmaliEditorActivity extends AppCompatActivity {
     private LinearLayout root;
     private View topSpacer;
     private View bottomSpacer;
+    
+    // 搜索面板相关
+    private LinearLayout searchPanel;
+    private EditText searchInput;
+    private EditText replaceInput;
+    private TextView searchResultText;
+    private TextView prevBtn, nextBtn, replaceBtn, replaceAllBtn;
+    private int searchMatchCount = 0;
+    private int currentMatchIndex = 0;
+    private boolean isSearchPanelVisible = false;
+    
+    // 搜索防抖
+    private Handler searchHandler = new Handler(Looper.getMainLooper());
+    private Runnable searchRunnable;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -91,9 +111,14 @@ public class SmaliEditorActivity extends AppCompatActivity {
         editView.setSyntaxLanguageFileName(syntaxFile);
         editView.setEditedMode(!readOnly);
         editView.setTypeface(Typeface.MONOSPACE);
-        editView.setTextSize(14);
+        editView.setTextSize(16);
         root.addView(editView);
 
+        // 搜索面板（初始隐藏）
+        searchPanel = createSearchPanel();
+        searchPanel.setVisibility(View.GONE);
+        root.addView(searchPanel);
+
         // 底部安全区域占位
         bottomSpacer = new View(this);
         bottomSpacer.setBackgroundColor(Color.parseColor("#1E1E1E"));
@@ -168,7 +193,7 @@ public class SmaliEditorActivity extends AppCompatActivity {
 
         // 查找按钮
         ImageButton searchBtn = createIconButton("🔍");
-        searchBtn.setOnClickListener(v -> showSearchDialog());
+        searchBtn.setOnClickListener(v -> toggleSearchPanel());
         toolbar.addView(searchBtn);
 
         // 跳转行号按钮
@@ -217,89 +242,243 @@ public class SmaliEditorActivity extends AppCompatActivity {
     }
 
     private String lastSearchText = "";
-    private String lastReplaceText = "";
-
-    private void showSearchDialog() {
-        LinearLayout layout = new LinearLayout(this);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        layout.setPadding(48, 32, 48, 16);
 
-        // 查找输入框
-        EditText searchInput = new EditText(this);
-        searchInput.setHint("查找内容");
-        searchInput.setText(lastSearchText);
+    // 创建 MT 风格的底部搜索面板
+    private LinearLayout createSearchPanel() {
+        LinearLayout panel = new LinearLayout(this);
+        panel.setOrientation(LinearLayout.VERTICAL);
+        panel.setBackgroundColor(Color.parseColor("#2D2D2D"));
+        panel.setPadding(16, 8, 16, 8);
+
+        // 第一行：搜索输入框 + 结果计数
+        LinearLayout row1 = new LinearLayout(this);
+        row1.setOrientation(LinearLayout.HORIZONTAL);
+        row1.setGravity(Gravity.CENTER_VERTICAL);
+
+        // 搜索输入框
+        searchInput = new EditText(this);
+        searchInput.setHint("查找");
         searchInput.setTextColor(Color.WHITE);
         searchInput.setHintTextColor(Color.GRAY);
-        layout.addView(searchInput);
+        searchInput.setBackgroundResource(R.drawable.round_edittext_bg);
+        searchInput.setPadding(24, 16, 24, 16);
+        searchInput.setSingleLine(true);
+        LinearLayout.LayoutParams searchParams = new LinearLayout.LayoutParams(
+            0, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+        searchParams.setMargins(0, 0, 8, 0);
+        searchInput.setLayoutParams(searchParams);
+        
+        // 实时搜索（带防抖）
+        searchInput.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            @Override
+            public void afterTextChanged(Editable s) {
+                // 移除之前的延迟任务，避免重复触发
+                if (searchRunnable != null) {
+                    searchHandler.removeCallbacks(searchRunnable);
+                }
+                // 延迟300ms再搜索（用户停止输入后再执行）
+                searchRunnable = () -> performSearch();
+                searchHandler.postDelayed(searchRunnable, 300);
+            }
+        });
+        row1.addView(searchInput);
+
+        // 搜索结果计数
+        searchResultText = new TextView(this);
+        searchResultText.setText("0");
+        searchResultText.setTextColor(Color.parseColor("#888888"));
+        searchResultText.setTextSize(14);
+        searchResultText.setPadding(16, 0, 16, 0);
+        row1.addView(searchResultText);
+
+        // 关闭按钮
+        TextView closeBtn = createTextButton("×");
+        closeBtn.setTextSize(24);
+        closeBtn.setOnClickListener(v -> hideSearchPanel());
+        row1.addView(closeBtn);
+
+        panel.addView(row1);
+
+        // 第二行：上一个、下一个、替换、全部
+        LinearLayout row2 = new LinearLayout(this);
+        row2.setOrientation(LinearLayout.HORIZONTAL);
+        row2.setGravity(Gravity.CENTER_VERTICAL);
+        row2.setPadding(0, 8, 0, 0);
+
+        prevBtn = createTextButton("上个");
+        prevBtn.setOnClickListener(v -> findPrevious());
+        prevBtn.setEnabled(false);
+        row2.addView(prevBtn);
+
+        nextBtn = createTextButton("下个");
+        nextBtn.setOnClickListener(v -> findNext());
+        nextBtn.setEnabled(false);
+        row2.addView(nextBtn);
+
+        replaceBtn = createTextButton("替换");
+        replaceBtn.setOnClickListener(v -> replaceCurrent());
+        replaceBtn.setEnabled(false);
+        row2.addView(replaceBtn);
+
+        replaceAllBtn = createTextButton("全部");
+        replaceAllBtn.setOnClickListener(v -> replaceAll());
+        replaceAllBtn.setEnabled(false);
+        row2.addView(replaceAllBtn);
 
         // 替换输入框
-        EditText replaceInput = new EditText(this);
-        replaceInput.setHint("替换为 (可选)");
-        replaceInput.setText(lastReplaceText);
+        replaceInput = new EditText(this);
+        replaceInput.setHint("替换为");
         replaceInput.setTextColor(Color.WHITE);
         replaceInput.setHintTextColor(Color.GRAY);
-        layout.addView(replaceInput);
-
-        // 正则表达式选项
-        CheckBox regexCheckbox = new CheckBox(this);
-        regexCheckbox.setText("使用正则表达式");
-        regexCheckbox.setTextColor(Color.WHITE);
-        layout.addView(regexCheckbox);
-
-        AlertDialog dialog = new AlertDialog.Builder(this)
-            .setTitle("查找与替换")
-            .setView(layout)
-            .setPositiveButton("查找下一个", null)
-            .setNegativeButton("替换", null)
-            .setNeutralButton("全部替换", null)
-            .create();
-
-        dialog.setOnShowListener(d -> {
-            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
-                String text = searchInput.getText().toString();
-                if (!text.isEmpty()) {
-                    lastSearchText = text;
-                    if (regexCheckbox.isChecked()) {
-                        editView.find(text);
-                    } else {
-                        editView.find(java.util.regex.Pattern.quote(text));
-                    }
-                }
-            });
+        replaceInput.setBackgroundResource(R.drawable.round_edittext_bg);
+        replaceInput.setPadding(24, 16, 24, 16);
+        replaceInput.setSingleLine(true);
+        LinearLayout.LayoutParams replaceParams = new LinearLayout.LayoutParams(
+            0, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+        replaceParams.setMargins(8, 0, 0, 0);
+        replaceInput.setLayoutParams(replaceParams);
+        row2.addView(replaceInput);
+
+        panel.addView(row2);
+
+        return panel;
+    }
 
-            dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> {
-                String text = searchInput.getText().toString();
-                String replace = replaceInput.getText().toString();
-                if (!text.isEmpty()) {
-                    lastSearchText = text;
-                    lastReplaceText = replace;
-                    if (regexCheckbox.isChecked()) {
-                        editView.find(text);
-                    } else {
-                        editView.find(java.util.regex.Pattern.quote(text));
-                    }
-                    editView.replaceFirst(replace);
-                }
-            });
+    private TextView createTextButton(String text) {
+        TextView btn = new TextView(this);
+        btn.setText(text);
+        btn.setTextColor(Color.parseColor("#63B5F7"));
+        btn.setTextSize(14);
+        btn.setPadding(24, 12, 24, 12);
+        btn.setClickable(true);
+        btn.setFocusable(true);
+        return btn;
+    }
 
-            dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
-                String text = searchInput.getText().toString();
-                String replace = replaceInput.getText().toString();
-                if (!text.isEmpty()) {
-                    lastSearchText = text;
-                    lastReplaceText = replace;
-                    if (regexCheckbox.isChecked()) {
-                        editView.find(text);
-                    } else {
-                        editView.find(java.util.regex.Pattern.quote(text));
-                    }
-                    editView.replaceAll(replace);
-                    Toast.makeText(this, "已替换所有匹配项", Toast.LENGTH_SHORT).show();
-                }
-            });
-        });
+    private void toggleSearchPanel() {
+        if (isSearchPanelVisible) {
+            hideSearchPanel();
+        } else {
+            showSearchPanel();
+        }
+    }
+
+    private void showSearchPanel() {
+        searchPanel.setVisibility(View.VISIBLE);
+        isSearchPanelVisible = true;
+        searchInput.requestFocus();
+        // 显示键盘
+        InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+        imm.showSoftInput(searchInput, InputMethodManager.SHOW_IMPLICIT);
+        
+        // 如果有之前的搜索内容，重新搜索
+        if (!lastSearchText.isEmpty()) {
+            searchInput.setText(lastSearchText);
+            searchInput.setSelection(lastSearchText.length());
+        }
+    }
+
+    private void hideSearchPanel() {
+        searchPanel.setVisibility(View.GONE);
+        isSearchPanelVisible = false;
+        // 隐藏键盘
+        InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(searchInput.getWindowToken(), 0);
+        // 清除高亮
+        editView.find("");
+        editView.postInvalidate();
+    }
+
+    private void performSearch() {
+        String text = searchInput.getText().toString();
+        lastSearchText = text;
+        
+        if (text.isEmpty()) {
+            searchMatchCount = 0;
+            currentMatchIndex = 0;
+            searchResultText.setText("0/0");
+            editView.find("");
+            updateSearchButtonsState();
+            return;
+        }
+        
+        // 执行搜索（使用普通文本，非正则）
+        editView.find(java.util.regex.Pattern.quote(text));
+        
+        // 获取匹配数量
+        searchMatchCount = editView.getMatchCount();
+        currentMatchIndex = 0;
+        
+        if (searchMatchCount > 0) {
+            // 跳转到第一个匹配
+            editView.next();
+            currentMatchIndex = 1;
+            searchResultText.setText(currentMatchIndex + "/" + searchMatchCount);
+        } else {
+            searchResultText.setText("0/0");
+        }
+        updateSearchButtonsState();
+    }
 
-        dialog.show();
+    private void findNext() {
+        if (searchMatchCount > 0) {
+            editView.next();
+            currentMatchIndex++;
+            if (currentMatchIndex > searchMatchCount) {
+                currentMatchIndex = 1;
+            }
+            searchResultText.setText(currentMatchIndex + "/" + searchMatchCount);
+        }
+    }
+
+    private void findPrevious() {
+        if (searchMatchCount > 0) {
+            editView.previous();
+            currentMatchIndex--;
+            if (currentMatchIndex < 1) {
+                currentMatchIndex = searchMatchCount;
+            }
+            searchResultText.setText(currentMatchIndex + "/" + searchMatchCount);
+        }
+    }
+
+    private void replaceCurrent() {
+        if (searchMatchCount > 0 && !readOnly) {
+            String replacement = replaceInput.getText().toString();
+            editView.replaceFirst(replacement);
+            Toast.makeText(this, "已替换当前匹配项", Toast.LENGTH_SHORT).show();
+            performSearch(); // 重新搜索更新计数
+        }
+    }
+
+    private void replaceAll() {
+        if (searchMatchCount > 0 && !readOnly) {
+            String replacement = replaceInput.getText().toString();
+            int count = searchMatchCount;
+            editView.replaceAll(replacement);
+            Toast.makeText(this, "已替换 " + count + " 处", Toast.LENGTH_SHORT).show();
+            performSearch(); // 重新搜索更新计数
+        }
+    }
+
+    private void updateSearchButtonsState() {
+        boolean isEnabled = !searchInput.getText().toString().isEmpty() && searchMatchCount > 0;
+        prevBtn.setEnabled(isEnabled);
+        nextBtn.setEnabled(isEnabled);
+        replaceBtn.setEnabled(isEnabled && !readOnly);
+        replaceAllBtn.setEnabled(isEnabled && !readOnly);
+        
+        // 更新按钮颜色
+        int enabledColor = Color.parseColor("#63B5F7");
+        int disabledColor = Color.parseColor("#555555");
+        prevBtn.setTextColor(isEnabled ? enabledColor : disabledColor);
+        nextBtn.setTextColor(isEnabled ? enabledColor : disabledColor);
+        replaceBtn.setTextColor((isEnabled && !readOnly) ? enabledColor : disabledColor);
+        replaceAllBtn.setTextColor((isEnabled && !readOnly) ? enabledColor : disabledColor);
     }
 
     private void showGotoLineDialog() {

package/android/src/main/java/com/aetherlink/dexeditor/editor/EditView.java

@@ -286,10 +286,10 @@ public class EditView extends View {
         // Initialize magnifier
         mMagnifier = new Magnifier(this);
 
-        // Reduce cursor width and make it responsive
+        // Cursor width responsive to screen density
         int density = (int) getResources().getDisplayMetrics().density;
-        mCursorWidth = Math.max(2, density); // Minimum 2px, scales with density
-        if (mCursorWidth > 5) mCursorWidth = 5; // Max 4px
+        mCursorWidth = Math.max(4, density * 2); // Minimum 4px, scales with density
+        if (mCursorWidth > 8) mCursorWidth = 8; // Max 8px for visibility
 
         // handle left - scale down selection handles
         mTextSelectHandleLeftRes = context.getDrawable(R.drawable.abc_text_select_handle_left_mtrl);
@@ -1753,11 +1753,22 @@ public class EditView extends View {
         if (!mReplaceList.isEmpty())
             mReplaceList.clear();
 
+        if (regex == null || regex.isEmpty()) {
+            postInvalidate();
+            return;
+        }
+
         Matcher matcher = Pattern.compile(regex).matcher(mGapBuffer.toString());
 
         while (matcher.find()) {
             mReplaceList.add(new Pair<Integer, Integer>(matcher.start(), matcher.end()));
         }
+        postInvalidate();
+    }
+
+    // Get number of matches
+    public int getMatchCount() {
+        return mReplaceList.size();
     }
 
     // Replace first match

package/android/src/main/res/drawable/round_edittext_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#3D3D3D"/>
+    <corners android:radius="8dp"/>
+</shape>

package/package.json

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