Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2020-06-13 11:32:45 +0300
committerStefan Niedermann <info@niedermann.it>2020-06-13 11:32:45 +0300
commit377dcee2bd7e15645a2cbe2fe7371f14e87a9013 (patch)
tree95c7b365d88c4cf79bdd193d83b4caa75dec5197 /app/src
parentf6540b286fab8734f7184037e193eaa381d86853 (diff)
Create constant for EXCERPT_LINE_SEPARATOR to replace magic string " "
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java3
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java4
2 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java
index 984de175..6f840fb1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java
@@ -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);
}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java
index bd83ce5c..26127b44 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java
@@ -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 "";
}