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

Merge remote-tracking branch 'origin/feat/edit-history-diff' into feat/merge-commits

Browse Source
This commit is contained in:
FineFindus
2023-11-08 18:39:52 +01:00
parent f1a5e3afae 536bd11798
commit 6cfc1f3955
6 changed files with 2736 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java Normal file
View File

@@ -0,0 +1,26 @@
package org.joinmastodon.android.ui.text;
import android.text.TextPaint;
import android.text.style.CharacterStyle;
import org.joinmastodon.android.ui.utils.UiUtils;
public class DiffRemovedSpan extends CharacterStyle {
private final String text;
public DiffRemovedSpan(String text){
this.text=text;
}
@Override
public void updateDrawState(TextPaint tp) {
tp.setStrikeThruText(true);
tp.setColor(0xFFCA5B63);
}
public String getText() {
return text;
}
}

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

@@ -1,6 +1,7 @@
package org.joinmastodon.android.ui.text;
import android.content.Context;
import android.graphics.Color;
import android.graphics.Typeface;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
@@ -171,6 +172,9 @@ public class HtmlParser{
}
case "code", "pre" -> openSpans.add(new SpanInfo(new TypefaceSpan("monospace"), ssb.length(), el));
case "blockquote" -> openSpans.add(new SpanInfo(new LeadingMarginSpan.Standard(V.dp(10)), ssb.length(), el));
//fake elements for the edit history diff view
case "edit_diff_added" -> openSpans.add(new SpanInfo(new ForegroundColorSpan(UiUtils.isDarkTheme() ? 0xFF89bb9c : 0xFF5b8e63), ssb.length(), el));
case "edit_diff_removed" -> openSpans.add(new SpanInfo(new DiffRemovedSpan(el.text()), ssb.length(), el));
}
}
}