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

Commit 377dcee2 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Create constant for EXCERPT_LINE_SEPARATOR to replace magic string " "

parent f6540b28

app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridBinding 
import static android.view.View.GONE;

import static android.view.View.INVISIBLE;

import static android.view.View.VISIBLE;

import static it.niedermann.owncloud.notes.util.NoteUtil.EXCERPT_LINE_SEPARATOR;



public class NoteViewGridHolder extends NoteViewHolder {

    @NonNull
@@ -43,7 +44,7 @@ public class NoteViewGridHolder extends NoteViewHolder { 
        binding.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? INVISIBLE : VISIBLE);

        bindFavorite(binding.noteFavorite, note.isFavorite());

        bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), mainColor);

        bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt().replace("   ", "\n"), mainColor);

        bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt().replace(EXCERPT_LINE_SEPARATOR, "\n"), mainColor);

        binding.noteExcerpt.setVisibility(TextUtils.isEmpty(note.getExcerpt()) ? GONE : VISIBLE);

    }

app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ public class NoteUtil { 
    private static final Pattern pSpace1 = Pattern.compile("^\\s+", Pattern.MULTILINE);

    private static final Pattern pSpace2 = Pattern.compile("\\s+$", Pattern.MULTILINE);



    public static final String EXCERPT_LINE_SEPARATOR = "   ";



    private NoteUtil() {



    }
@@ -87,7 +89,7 @@ public class NoteUtil { 
    @NonNull

    public static String generateNoteExcerpt(@NonNull String content) {

        if (content.contains("\n"))

            return truncateString(removeMarkDown(content.replaceFirst("^.*\n", "")), 200).replace("\n", "   ");

            return truncateString(removeMarkDown(content.replaceFirst("^.*\n", "")), 200).replace("\n", EXCERPT_LINE_SEPARATOR);

        else

            return "";

    }