Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
63e1bad
add support for normal text find and replace
guanglinn Apr 7, 2025
f8afc54
improve find in selection
guanglinn Apr 9, 2025
f6edfe6
jump nearby occurrence after finding
guanglinn Apr 9, 2025
f3b77fa
fix automatically scroll to the top after finding
guanglinn Apr 9, 2025
15f9aed
clear results after closing
guanglinn Apr 9, 2025
1863367
scroll text view if occurrence is not visible
guanglinn Apr 9, 2025
b485182
add temporary test code
guanglinn Apr 10, 2025
708a803
fix occurrence highlight failure affected by input filter
guanglinn Apr 10, 2025
30c0ea7
improve first time visible position setting
guanglinn Apr 11, 2025
d30103a
fix link continuously be smaller while searching
guanglinn Apr 11, 2025
e9dee6d
improve search fragment colors
guanglinn Apr 11, 2025
f9255cd
improve next & previous actions
guanglinn Apr 11, 2025
db1a142
minor improvements
guanglinn Apr 11, 2025
241f34f
minor improvements for line numbers
guanglinn Apr 12, 2025
508abc0
Merge branch 'master' into search_improvement
guanglinn Apr 15, 2025
e6d6185
improve foreground color of icons for dark theme
guanglinn Apr 15, 2025
b00ef28
add delay to find on search text changed
guanglinn Apr 17, 2025
ebbab81
Merge branch 'master' into search_improvement
gsantner May 9, 2025
6671283
Merge branch 'master' into search_improvement
gsantner May 29, 2025
b1dbb28
Merge branch 'master' into search_improvement
gsantner Jun 12, 2025
fda4f77
Merge branch 'master' into search_improvement
gsantner Jun 13, 2025
ac588c7
Merge branch 'master' into search_improvement
gsantner Jul 11, 2025
d1211b1
Merge branch 'master' into search_improvement
guanglinn Sep 20, 2025
1f5e29d
revert default font size to 16
guanglinn Sep 20, 2025
e44e836
tweaks for showSelection method
guanglinn Sep 20, 2025
ebe0463
revert changes for createSmallBlueLinkSpans method
guanglinn Sep 20, 2025
29de41c
use Markor's highlight API for search and replace
guanglinn Sep 21, 2025
52db389
Merge branch 'master' into search_improvement
guanglinn Sep 21, 2025
950a004
Merge branch 'search_improvement' of https://github.com/guanglinn/mar…
guanglinn Sep 21, 2025
30d504c
revert some code
guanglinn Sep 21, 2025
a0caac3
Merge branch 'master' into search_improvement
gsantner Oct 23, 2025
563ba00
Merge branch 'master' into search_improvement
guanglinn Oct 23, 2025
6a4af8a
Merge branch 'master' into search_improvement
guanglinn Nov 20, 2025
71b0791
Merge branch 'master' into search_improvement
guanglinn Dec 28, 2025
99c447c
.
guanglinn Dec 28, 2025
7c7a3e5
Merge branch 'master' into search_improvement
gsantner Jan 8, 2026
bb5d609
Merge branch 'master' into search_improvement
guanglinn Jan 8, 2026
ea63e91
Tweaks
guanglinn Jan 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package net.gsantner.markor.frontend.search;

public class Occurrence {
public static final int BACKGROUND_COLOR = 0x80FF0000;
public static final int SPECIAL_BACKGROUND_COLOR = 0x80FFA500;
private BackgroundColorSpan backgroundColorSpan;

public int startIndex;
public int endIndex;
public int length;

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);
}
}
}
Loading