Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/markdown-lists'

This commit is contained in:
sk 2022-11-30 00:17:40 +01:00
parent 76ad896461 4880c642fe
commit bba3b7476a
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
View File

@ -3,6 +3,7 @@ package org.joinmastodon.android.ui.text;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.BulletSpan;
import android.widget.TextView; import android.widget.TextView;
import com.twitter.twittertext.Regex; import com.twitter.twittertext.Regex;
@ -15,7 +16,6 @@ import org.jsoup.Jsoup;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node; import org.jsoup.nodes.Node;
import org.jsoup.nodes.TextNode; import org.jsoup.nodes.TextNode;
import org.jsoup.safety.Cleaner;
import org.jsoup.safety.Safelist; import org.jsoup.safety.Safelist;
import org.jsoup.select.NodeVisitor; import org.jsoup.select.NodeVisitor;
@ -29,6 +29,8 @@ import java.util.stream.Collectors;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import me.grishka.appkit.utils.V;
public class HtmlParser{ public class HtmlParser{
private static final String TAG="HtmlParser"; private static final String TAG="HtmlParser";
private static final String VALID_URL_PATTERN_STRING = private static final String VALID_URL_PATTERN_STRING =
@ -89,6 +91,12 @@ public class HtmlParser{
ssb.append(textNode.text()); ssb.append(textNode.text());
}else if(node instanceof Element el){ }else if(node instanceof Element el){
switch(el.nodeName()){ switch(el.nodeName()){
case "p" -> {
Node sib=el.previousSibling();
// compensate for missing empty line after </ul> to match the empty
// line added by the <p> before <ul> elements
if(sib!=null && !sib.nodeName().equals("p")) ssb.append('\n');
}
case "a" -> { case "a" -> {
String href=el.attr("href"); String href=el.attr("href");
LinkSpan.Type linkType; LinkSpan.Type linkType;
@ -119,6 +127,7 @@ public class HtmlParser{
openSpans.add(new SpanInfo(new InvisibleSpan(), ssb.length(), el)); openSpans.add(new SpanInfo(new InvisibleSpan(), ssb.length(), el));
} }
} }
case "li" -> openSpans.add(new SpanInfo(new BulletSpan(V.dp(6)), ssb.length(), el));
} }
} }
} }
@ -137,6 +146,11 @@ public class HtmlParser{
ssb.setSpan(si.span, si.start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.setSpan(si.span, si.start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
openSpans.remove(openSpans.size()-1); openSpans.remove(openSpans.size()-1);
} }
if("li".equals(el.nodeName())) {
ssb.append('\n');
Node sib=node.nextSibling();
if(sib!=null && !sib.nodeName().equals("li")) ssb.append('\n');
}
} }
} }
} }