Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 519d31b9 authored by stefan-niedermann's avatar stefan-niedermann Committed by Niedermann IT-Dienstleistungen
Browse files

#550 In-note-search doesn't jump to occurrence of searchstring 

- Keep coloring and occurrences when switching between edit and preview mode
parent 51ca3f05

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public class NoteEditFragment extends SearchableBaseNoteFragment { 


    @Override

    protected Layout getLayout() {

        editContent.onPreDraw();

        return editContent.getLayout();

    }

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ public class NotePreviewFragment extends SearchableBaseNoteFragment { 


    @Override

    protected Layout getLayout() {

        noteContent.onPreDraw();

        return noteContent.getLayout();

    }

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

+4 −6
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment { 
        if (savedInstanceState != null) {

            searchQuery = savedInstanceState.getString("searchQuery", "");

            currentOccurrence = savedInstanceState.getInt("currentOccurrence", 1);

            // TODO if search is open

            if (searchView != null && !TextUtils.isEmpty(searchView.getQuery().toString())) {

                colorWithText(searchQuery);

                jumpToOccurrence();

            }

        }

    }
@@ -74,6 +69,9 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment { 
                        searchQuery = "";

                        hideSearchFabs();

                    } else {

                        jumpToOccurrence();

                        colorWithText(searchQuery);

                        occurrenceCount = countOccurrences(getContent(), searchQuery);

                        showSearchFabs();

                    }
@@ -111,7 +109,6 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment { 
            @Override

            public boolean onQueryTextChange(String newText) {

                searchQuery = newText;

                colorWithText(newText);

                occurrenceCount = countOccurrences(getContent(), searchQuery);

                if (occurrenceCount > 1) {

                    showSearchFabs();
@@ -120,6 +117,7 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment { 
                }

                currentOccurrence = 1;

                jumpToOccurrence();

                colorWithText(searchQuery);

                return true;

            }

        });