Add standard text find and replace

app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 /*#######################################################
  *
  *   Maintained 2017-2025 by Gregor Santner <gsantner AT mailbox DOT org>
@@ -11,13 +12,11 @@
 
 <!-- Do NOT run auto format on this file -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="jelly_bean">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
@@ -41,6 +40,7 @@
         android:name=".ApplicationObject"
         android:allowBackup="true"
         android:appCategory="productivity"
+        android:dataExtractionRules="@xml/full_backup_rules"
         android:fullBackupContent="@xml/full_backup_rules"
         android:icon="@drawable/ic_launcher"
         android:isGame="false"
@@ -187,7 +187,6 @@
         <activity
             android:name=".activity.DocumentActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:launchMode="standard"
             android:maxRecents="5"
             android:theme="@style/AppTheme.Unified.StartupFlash"
@@ -1094,10 +1093,10 @@
 
         <activity-alias
             android:name="AliasDocumentProcessText"
-            android:label="@string/app_name"
+            android:enabled="false"
             android:exported="true"
-            android:targetActivity=".activity.DocumentActivity"
-            android:enabled="false">
+            android:label="@string/app_name"
+            android:targetActivity=".activity.DocumentActivity">
 
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />

app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java

@@ -154,7 +154,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
             return;
         }
 
-        _lineNumbersView.setup(_hlEditor);
+        _lineNumbersView.setEditText(_hlEditor);
         _lineNumbersView.setLineNumbersEnabled(_appSettings.getDocumentLineNumbersEnabled(_document.path));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && _appSettings.getSetWebViewFulldrawing()) {
@@ -266,19 +266,24 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
 
     @Override
     protected void onFragmentFirstTimeVisible() {
+        _hlEditor.recomputeHighlighting(); // Run before setting scroll position
+        int line = -1;
+        int startPosition = _appSettings.getLastEditPosition(_document.path, 0);
+
         final Bundle args = getArguments();
-        int startPos = _appSettings.getLastEditPosition(_document.path, _hlEditor.length());
-        if (args != null && args.containsKey(Document.EXTRA_FILE_LINE_NUMBER)) {
-            final int lno = args.getInt(Document.EXTRA_FILE_LINE_NUMBER);
-            if (lno >= 0) {
-                startPos = TextViewUtils.getIndexFromLineOffset(_hlEditor.getText(), lno, 0);
-            } else {
-                startPos = _hlEditor.length();
+        if (args != null) {
+            if (args.containsKey(Document.EXTRA_FILE_LINE_NUMBER)) {
+                line = args.getInt(Document.EXTRA_FILE_LINE_NUMBER);
             }
         }
 
-        _hlEditor.recomputeHighlighting(); // Run before setting scroll position
-        TextViewUtils.setSelectionAndShow(_hlEditor, startPos);
+        if (line > -1) {
+            TextViewUtils.getIndexFromLineOffset(_hlEditor.getText(), line, 0);
+            TextViewUtils.setSelectionAndShow(_hlEditor, startPosition);
+        } else {
+            final int scrollY = _appSettings.getLastEditScrollY(_document.path, 0);
+            _verticalScrollView.setScrollY(scrollY);
+        }
 
         _hlEditor.post(() -> _hlEditor.animate().alpha(1).setDuration(500).start());
     }
@@ -300,7 +305,7 @@ public void onPause() {
         _appSettings.addRecentFile(_document.file);
         _appSettings.setDocumentPreviewState(_document.path, _isPreviewVisible);
         _appSettings.setLastEditPosition(_document.path, TextViewUtils.getSelection(_hlEditor)[0]);
-
+        _appSettings.setLastEditScrollY(_document.path, _verticalScrollView.getScrollY());
         if (_document.path.equals(_appSettings.getTodoFile().getAbsolutePath())) {
             TodoWidgetProvider.updateTodoWidgets();
         }

app/src/main/java/net/gsantner/markor/activity/MainActivity.java

@@ -406,6 +406,9 @@ private void restoreDefaultToolbar() {
 
     public void onViewPagerPageSelected(final int pos) {
         _bottomNav.getMenu().getItem(pos).setChecked(true);
+        // Close search dialog fragment
+        View view = findViewById(R.id.closeImageButton);
+        if (view != null) view.callOnClick();
 
         if (pos == tabIdToPos(R.id.nav_notebook)) {
             _fab.show();

app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java

@@ -33,13 +33,15 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.TooltipCompat;
+import androidx.fragment.app.FragmentActivity;
 
 import net.gsantner.markor.ApplicationObject;
 import net.gsantner.markor.R;
 import net.gsantner.markor.activity.DocumentActivity;
 import net.gsantner.markor.frontend.AttachLinkOrFileDialog;
 import net.gsantner.markor.frontend.DatetimeFormatDialog;
 import net.gsantner.markor.frontend.MarkorDialogFactory;
+import net.gsantner.markor.frontend.search.SearchDialogFragment;
 import net.gsantner.markor.frontend.textview.HighlightingEditor;
 import net.gsantner.markor.frontend.textview.TextViewUtils;
 import net.gsantner.markor.model.AppSettings;
@@ -103,9 +105,12 @@ public boolean onActionLongClick(final @StringRes int action) {
         return runCommonLongPressAction(action);
     }
 
+    private SearchDialogFragment _searchDialogFragment;
+
     // Override to implement custom search action
     public boolean onSearch() {
-        MarkorDialogFactory.showSearchDialog(_activity, _hlEditor);
+        // MarkorDialogFactory.showSearchDialog(_activity, _hlEditor);
+        _searchDialogFragment.show();
         return true;
     }
 
@@ -582,6 +587,7 @@ public ActionButtonBase setUiReferences(@Nullable final Activity activity, @Null
         _hlEditor = hlEditor;
         _webView = webview;
         _cu = new MarkorContextUtils(_activity);
+        _searchDialogFragment = SearchDialogFragment.newInstance(R.id.topReplacementLayout, (FragmentActivity) _activity, _hlEditor);
         return this;
     }
 

app/src/main/java/net/gsantner/markor/format/markdown/MarkdownSyntaxHighlighter.java

@@ -36,7 +36,7 @@ public class MarkdownSyntaxHighlighter extends SyntaxHighlighterBase {
     private static final int MD_COLOR_LINK = 0xff1ea3fe;
     private static final int MD_COLOR_LIST = 0xffdaa521;
     private static final int MD_COLOR_QUOTE = 0xff88b04c;
-    private static final int MD_COLOR_CODEBLOCK = 0x2bafafaf;
+    private static final int MD_COLOR_CODEBLOCK = 0x60afafaf;
 
     public MarkdownSyntaxHighlighter(AppSettings as) {
         super(as);

app/src/main/java/net/gsantner/markor/frontend/search/Occurrence.java

@@ -0,0 +1,58 @@
+package net.gsantner.markor.frontend.search;
+
+public class Occurrence {
+    public static final int BACKGROUND_COLOR = 0x90FF0000;
+    public static final int SPECIAL_BACKGROUND_COLOR = 0x90FFA500;
+    private BackgroundColorSpan backgroundColorSpan;
+
+    private int startIndex;
+    private int endIndex;
+
+    public BackgroundColorSpan createBackgroundColorSpan() {
+        this.backgroundColorSpan = new BackgroundColorSpan(BACKGROUND_COLOR);
+        return this.backgroundColorSpan;
+    }
+
+    public BackgroundColorSpan createSpecialBackgroundColorSpan() {
+        this.backgroundColorSpan = new BackgroundColorSpan(SPECIAL_BACKGROUND_COLOR);
+        return this.backgroundColorSpan;
+    }
+
+    public BackgroundColorSpan getBackgroundColorSpan() {
+        return this.backgroundColorSpan;
+    }
+
+    public static class BackgroundColorSpan extends android.text.style.BackgroundColorSpan {
+        public BackgroundColorSpan(int color) {
+            super(color);
+        }
+    }
+
+    public int getStartIndex() {
+        return startIndex;
+    }
+
+    public int getEndIndex() {
+        return endIndex;
+    }
+
+    public int getLength() {
+        return this.endIndex - this.startIndex;
+    }
+
+    public void setStartIndex(int startIndex) {
+        this.startIndex = startIndex;
+    }
+
+    public void setEndIndex(int endIndex) {
+        this.endIndex = endIndex;
+    }
+
+    public void offsetStartIndex(int offset) {
+        this.startIndex += offset;
+    }
+
+    public void offsetEndIndex(int offset) {
+        this.endIndex += offset;
+    }
+}