mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-22 21:06:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Cui-Yusong/nextcloud-notes into Cui-Yusong-master

Browse source
This commit is contained in:
Stefan Niedermann 2021-05-14 16:30:54 +02:00
commit 5d4c022e17
2 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
markdown/src/androidTest/java/it/niedermann/android/markdown/MarkdownUtilTest.java
View file

@ -705,11 +705,11 @@ public class MarkdownUtilTest extends TestCase {
assertEquals("FooTestBar", MarkdownUtil.removeMarkdown("Foo*Test*Bar"));
assertEquals("FooTestBar", MarkdownUtil.removeMarkdown("Foo**Test**Bar"));
assertEquals("FooTestBar", MarkdownUtil.removeMarkdown("Foo***Test***Bar"));
assertEquals("FooTest*Bar", MarkdownUtil.removeMarkdown("Foo*Test**Bar"));
assertEquals("Foo*Test**Bar", MarkdownUtil.removeMarkdown("Foo*Test**Bar"));
assertEquals("Foo*TestBar", MarkdownUtil.removeMarkdown("Foo***Test**Bar"));
assertEquals("FooTestBar", MarkdownUtil.removeMarkdown("Foo_Test_Bar"));
assertEquals("FooTestBar", MarkdownUtil.removeMarkdown("Foo__Test__Bar"));
assertEquals("FooTestBar", MarkdownUtil.removeMarkdown("Foo___Test___Bar"));
assertEquals("Foo_Test_Bar", MarkdownUtil.removeMarkdown("Foo_Test_Bar"));
assertEquals("Foo__Test__Bar", MarkdownUtil.removeMarkdown("Foo__Test__Bar"));
assertEquals("Foo___Test___Bar", MarkdownUtil.removeMarkdown("Foo___Test___Bar"));
assertEquals("Foo\nHeader\nBar", MarkdownUtil.removeMarkdown("Foo\n# Header\nBar"));
assertEquals("Foo\nHeader\nBar", MarkdownUtil.removeMarkdown("Foo\n### Header\nBar"));
assertEquals("Foo\nHeader\nBar", MarkdownUtil.removeMarkdown("Foo\n# Header #\nBar"));
@ -721,13 +721,15 @@ public class MarkdownUtilTest extends TestCase {
assertEquals("Foo\nAufzählung\nBar", MarkdownUtil.removeMarkdown("Foo\n* Aufzählung\nBar"));
assertEquals("Foo\nAufzählung\nBar", MarkdownUtil.removeMarkdown("Foo\n+ Aufzählung\nBar"));
assertEquals("Foo\nAufzählung\nBar", MarkdownUtil.removeMarkdown("Foo\n- Aufzählung\nBar"));
assertEquals("Foo\nAufzählung\nBar", MarkdownUtil.removeMarkdown("Foo\n - Aufzählung\nBar"));
assertEquals("Foo\n- Aufzählung\nBar", MarkdownUtil.removeMarkdown("Foo\n - Aufzählung\nBar"));
assertEquals("Foo\nAufzählung *\nBar", MarkdownUtil.removeMarkdown("Foo\n* Aufzählung *\nBar"));
assertEquals("Title", MarkdownUtil.removeMarkdown("# Title"));
assertEquals("Aufzählung", MarkdownUtil.removeMarkdown("* Aufzählung"));
// assertEquals("Foo Link Bar", MarkdownUtil.removeMarkdown("Foo [Link](https://example.com) Bar"));
assertFalse(MarkdownUtil.removeMarkdown("- [ ] Test").contains("- [ ]"));
assertTrue(MarkdownUtil.removeMarkdown("- [ ] Test").endsWith("Test"));
assertEquals("", MarkdownUtil.removeMarkdown(null));
assertEquals("", MarkdownUtil.removeMarkdown(""));
// https://github.com/stefan-niedermann/nextcloud-notes/issues/1104
assertEquals("2021-03-24 - Example text", MarkdownUtil.removeMarkdown("2021-03-24 - Example text"));

32
markdown/src/main/java/it/niedermann/android/markdown/MarkdownUtil.java
View file

@ -39,13 +39,6 @@ public class MarkdownUtil {
private final static Parser parser = Parser.builder().build();
private final static HtmlRenderer renderer = HtmlRenderer.builder().softbreak("<br>").build();
private static final Pattern PATTERN_LISTS = Pattern.compile("^\\s*[*+-]\\s+", Pattern.MULTILINE);
private static final Pattern PATTERN_HEADINGS = Pattern.compile("^#+\\s+(.*?)\\s*#*$", Pattern.MULTILINE);
private static final Pattern PATTERN_HEADING_LINE = Pattern.compile("^(?:=*|-*)$", Pattern.MULTILINE);
private static final Pattern PATTERN_EMPHASIS = Pattern.compile("(\\*+|_+)(.*?)\\1", Pattern.MULTILINE);
private static final Pattern PATTERN_SPACE_1 = Pattern.compile("^\\s+", Pattern.MULTILINE);
private static final Pattern PATTERN_SPACE_2 = Pattern.compile("\\s+$", Pattern.MULTILINE);
private static final Pattern PATTERN_CODE_FENCE = Pattern.compile("^(`{3,})");
private static final Pattern PATTERN_ORDERED_LIST_ITEM = Pattern.compile("^(\\d+).\\s.+$");
private static final Pattern PATTERN_ORDERED_LIST_ITEM_EMPTY = Pattern.compile("^(\\d+).\\s$");
@ -550,23 +543,16 @@ public class MarkdownUtil {
*/
@NonNull
public static String removeMarkdown(@Nullable String s) {
if (s == null)
if (TextUtils.isEmpty(s))
return "";
// TODO maybe we can utilize the markwon renderer?
for (EListType listType : EListType.values()) {
for (String item : Arrays.asList(listType.checkboxChecked, listType.checkboxUnchecked, listType.listSymbolWithTrailingSpace)) {
if (s.startsWith(item)) {
s = s.substring(item.length());
}
}
}
s = PATTERN_LISTS.matcher(s).replaceAll("");
s = PATTERN_HEADINGS.matcher(s).replaceAll("$1");
s = PATTERN_HEADING_LINE.matcher(s).replaceAll("");
s = PATTERN_EMPHASIS.matcher(s).replaceAll("$2");
s = PATTERN_SPACE_1.matcher(s).replaceAll("");
s = PATTERN_SPACE_2.matcher(s).replaceAll("");
// Create HTML string from Markup
String html = renderer.render(parser.parse(replaceCheckboxesWithEmojis(s)));
// Convert Spanned from HTML.
Spanned spanned = HtmlCompat.fromHtml(html, HtmlCompat.FROM_HTML_MODE_COMPACT);
// Convert from spanned to string
s = spanned.toString();
// The default string has two additional \n in the end, the trim is used to delete this two \n.
s = s.trim();
return s;
}
}