From a7a29db8d584522aedbb44c7602111bfcf6e7547 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 30 Nov 2022 10:51:25 +0100
Subject: [PATCH 1/3] improve list rendering implementation

---
 .../org/joinmastodon/android/ui/text/HtmlParser.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
index 000b70969..20612a335 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
@@ -91,12 +91,6 @@ public class HtmlParser{
 					ssb.append(textNode.text());
 				}else if(node instanceof Element el){
 					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" -> {
 							String href=el.attr("href");
 							LinkSpan.Type linkType;
@@ -137,7 +131,7 @@ public class HtmlParser{
 				if(node instanceof Element el){
 					if("span".equals(el.nodeName()) && el.hasClass("ellipsis")){
 						ssb.append("…", new DeleteWhenCopiedSpan(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-					}else if("p".equals(el.nodeName())){
+					}else if("p".equals(el.nodeName()) || "ul".equals(el.nodeName()) || "ol".equals(el.nodeName())){
 						if(node.nextSibling()!=null)
 							ssb.append("\n\n");
 					}else if(!openSpans.isEmpty()){
@@ -147,9 +141,7 @@ public class HtmlParser{
 							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');
+							if(node.nextSibling()!=null) ssb.append('\n');
 						}
 					}
 				}

From 34b8888c8f573db334f8ad7f13e55a36492c5180 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 30 Nov 2022 11:04:19 +0100
Subject: [PATCH 2/3] add support for html code tag

---
 .../java/org/joinmastodon/android/ui/text/HtmlParser.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
index be120dd16..ee3874d5e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
@@ -1,11 +1,14 @@
 package org.joinmastodon.android.ui.text;
 
 import android.graphics.Typeface;
+import android.graphics.fonts.FontFamily;
+import android.graphics.fonts.FontStyle;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.BulletSpan;
 import android.text.style.StyleSpan;
+import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
 import android.widget.TextView;
 
@@ -128,6 +131,7 @@ public class HtmlParser{
 						case "em", "i" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.ITALIC), ssb.length(), el));
 						case "strong", "b" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.BOLD), ssb.length(), el));
 						case "u" -> openSpans.add(new SpanInfo(new UnderlineSpan(), ssb.length(), el));
+						case "code" -> openSpans.add(new SpanInfo(new TypefaceSpan("monospace"), ssb.length(), el));
 					}
 				}
 			}

From a0da73f76f108371db895f98f95669edca0f314a Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 30 Nov 2022 11:05:00 +0100
Subject: [PATCH 3/3] add support for html code tag

---
 .../main/java/org/joinmastodon/android/ui/text/HtmlParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
index ee3874d5e..50112befb 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
@@ -131,7 +131,7 @@ public class HtmlParser{
 						case "em", "i" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.ITALIC), ssb.length(), el));
 						case "strong", "b" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.BOLD), ssb.length(), el));
 						case "u" -> openSpans.add(new SpanInfo(new UnderlineSpan(), ssb.length(), el));
-						case "code" -> openSpans.add(new SpanInfo(new TypefaceSpan("monospace"), ssb.length(), el));
+						case "code", "pre" -> openSpans.add(new SpanInfo(new TypefaceSpan("monospace"), ssb.length(), el));
 					}
 				}
 			}