Skip to content

Commit

Permalink
Improve showing selection and related functions, by @harshad1 (PR #1658)
Browse files Browse the repository at this point in the history
  • Loading branch information
@harshad1
harshad1 authored Apr 14, 2022
1 parent efb9f6a commit 0db38d5
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 45 deletions.
10 changes: 6 additions & 4 deletions app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
}
}

if (_hlEditor.indexesValid(startPos)) {
_hlEditor.setCursor(startPos);
}
StringUtils.setSelectionAndShow(_hlEditor, startPos);
}

@Override
Expand Down Expand Up @@ -356,6 +354,7 @@ public void loadDocument() {
_hlEditor.withAutoFormatDisabled(() -> _hlEditor.setText(content));

_hlEditor.setSelection(sel[0], sel[1]);
StringUtils.showSelection(_hlEditor);
}

checkTextChangeState();
Expand Down Expand Up @@ -630,6 +629,8 @@ private void setHorizontalScrollMode(final boolean wrap) {
final boolean isCurrentlyWrap = _hsView == null || (_hlEditor.getParent() == _primaryScrollView);
if (context != null && _hlEditor != null && isCurrentlyWrap != wrap) {

final int[] sel = StringUtils.getSelection(_hlEditor);

_primaryScrollView.removeAllViews();
if (_hsView != null) {
_hsView.removeAllViews();
Expand All @@ -647,7 +648,8 @@ private void setHorizontalScrollMode(final boolean wrap) {
_primaryScrollView.addView(_hlEditor);
}

StringUtils.showSelection(_hlEditor);
// Run after layout() of immediate parent completes
(wrap ? _primaryScrollView : _hsView).post(() -> StringUtils.setSelectionAndShow(_hlEditor, sel[0], sel[1]));
}
}

Expand Down
16 changes: 1 addition & 15 deletions app/src/main/java/net/gsantner/markor/ui/hleditor/HighlightingEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,7 @@ public void setHighlightingEnabled(final boolean enable) {


public boolean indexesValid(int... indexes) {
int len = length();
for (int index : indexes) {
if (index < 0 || index > len) {
return false;
}
}
return true;
return StringUtils.inRange(0, length(), indexes);
}

@Override
Expand Down Expand Up @@ -330,14 +324,6 @@ protected void onSelectionChanged(int selStart, int selEnd) {
}
}

public void setCursor(final int index) {
if (!hasFocus()) {
requestFocus();
}
post(() -> StringUtils.showSelection(this, index, index));
post(() ->setSelection(index));
}

public void setAccessibilityEnabled(final boolean enabled) {
_accessibilityEnabled = enabled;
}
Expand Down
57 changes: 31 additions & 26 deletions app/src/main/java/net/gsantner/opoc/util/StringUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import android.graphics.Rect;
import android.text.Layout;
import android.text.TextUtils;
import android.util.Base64;
import android.widget.EditText;
import android.widget.TextView;
Expand All @@ -32,15 +31,17 @@ private StringUtils() {
}

public static boolean isValidIndex(final CharSequence s, final int... indices) {
if (s != null && indices.length > 0) {
for (final int i : indices) {
if (i < 0 || i >= s.length()) {
return false;
}
return s != null && inRange(0, s.length() - 1, indices);
}

// Checks if all values are in [min, max] _inclusive_
public static boolean inRange(final int min, final int max, final int... values) {
for (final int i : values) {
if (i < min || i > max) {
return false;
}
return true;
}
return false;
return true;
}

public static int getLineStart(CharSequence s, int start) {
Expand Down Expand Up @@ -326,8 +327,7 @@ public static void selectLines(final EditText edit, final List<Integer> position
final CharSequence text = edit.getText();
if (positions.size() == 1) { // Case 1 index
final int posn = StringUtils.getIndexFromLineOffset(text, positions.get(0), 0);
showSelection(edit, posn, posn);
edit.setSelection(posn);
setSelectionAndShow(edit, posn);
} else if (positions.size() > 1) {
final TreeSet<Integer> pSet = new TreeSet<>(positions);
final int selStart, selEnd;
Expand All @@ -342,13 +342,12 @@ public static void selectLines(final EditText edit, final List<Integer> position
(pSet.contains(i) ? sel : unsel).add(lines[i]);
}
sel.addAll(unsel);
final String newText = TextUtils.join("\n", sel);
final String newText = android.text.TextUtils.join("\n", sel);
edit.setText(newText);
selStart = 0;
selEnd = StringUtils.getIndexFromLineOffset(newText, positions.size() - 1, 0);
}
showSelection(edit, selStart, selEnd);
edit.setSelection(selStart, selEnd);
setSelectionAndShow(edit, selStart, selEnd);
}
}

Expand Down Expand Up @@ -399,24 +398,30 @@ public static void showSelection(final TextView text, final int start, final int
// Region in X - as handling RTL, text alignment, and centred text etc is
// a huge pain (see TextView.bringPointIntoView), we use a very simple solution.
// ------------------------------------------------------------

final int endLeft = (int) layout.getPrimaryHorizontal(_end);
final int startLeft = (int) layout.getPrimaryHorizontal(_start);
region.left = Math.min(startLeft, endLeft);
region.right = Math.max(startLeft, endLeft);

if (region.left == region.right) {
// make sure rect width > 0
region.right += 1;
} else if (region.width() > viewSize.width()) {
// Make sure selStart is in rect if possible
region.left = startLeft;
region.right = region.left + viewSize.width();
}
final int halfWidth = viewSize.width() / 2;
// Push the start to the middle of the screen
region.left = startLeft - halfWidth;
region.right = startLeft + halfWidth;

// Call in post to try to make sure we run after any pending actions
text.post(() -> text.requestRectangleOnScreen(region));
}

public static void setSelectionAndShow(final EditText edit, final int start, final int... end) {
final int _end = end != null && end.length > 0 ? end[0] : start;
if (inRange(0, edit.length(), start, _end)) {
edit.post(() -> {
if (!edit.hasFocus()) {
edit.requestFocus();
}

edit.setSelection(start, _end);
edit.post(() -> showSelection(edit, start, _end));
});
}
}

// Search for matching pairs of backticks
// interpolate contents of backtick pair as SimpleDateFormat
public static String interpolateEscapedDateTime(final String snip) {
Expand Down

0 comments on commit 0db38d5

Please sign in to comment.