mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-25 14:15:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Try to reduce complexity

Browse source
This commit is contained in:
Christoph Loy 2020-03-06 22:10:53 +01:00 committed by Niedermann IT-Dienstleistungen
parent 0967678b40
commit 60c1e05552
1 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/it/niedermann/owncloud/notes/android/fragment/SearchableBaseNoteFragment.java
View file

@ -172,38 +172,30 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment {
Layout layout = getLayout();
if (layout == null) {
Log.w(TAG, "getLayout() is null");
return;
}
if (getContent() == null || getContent().isEmpty()) {
Log.w(TAG, "getContent() returned " + getContent());
return;
}
if (searchQuery == null || searchQuery.isEmpty()) {
// No search term
return;
}
if (currentOccurrence < 1) {
} else if (getContent() == null || getContent().isEmpty()) {
Log.w(TAG, "getContent is null or empty");
} else if (currentOccurrence < 1) {
// if currentOccurrence is lower than 1, jump to last occurrence
currentOccurrence = occurrenceCount;
jumpToOccurrence();
return;
}
String currentContent = getContent().toLowerCase();
int indexOfNewText = indexOfNth(currentContent, searchQuery.toLowerCase(), 0, currentOccurrence);
if (indexOfNewText <= 0) {
// Search term is not n times in text
// Go back to first search result
if (currentOccurrence != 1) {
currentOccurrence = 1;
jumpToOccurrence();
} else if (searchQuery != null && !searchQuery.isEmpty()) {
String currentContent = getContent().toLowerCase();
int indexOfNewText = indexOfNth(currentContent, searchQuery.toLowerCase(), 0, currentOccurrence);
if (indexOfNewText <= 0) {
// Search term is not n times in text
// Go back to first search result
if (currentOccurrence != 1) {
currentOccurrence = 1;
jumpToOccurrence();
}
return;
}
return;
}
String textUntilFirstOccurrence = currentContent.substring(0, indexOfNewText);
int numberLine = layout.getLineForOffset(textUntilFirstOccurrence.length());
String textUntilFirstOccurrence = currentContent.substring(0, indexOfNewText);
int numberLine = layout.getLineForOffset(textUntilFirstOccurrence.length());
if (numberLine >= 0) {
getScrollView().smoothScrollTo(0, layout.getLineTop(numberLine));
if (numberLine >= 0) {
getScrollView().smoothScrollTo(0, layout.getLineTop(numberLine));
}
}
}