mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-01-02 14:27:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix spoiler's background in comments cannot be removed in CommentAndPostRecyclerViewAdapter. Fix blockquote overriding spoiler.

Browse Source
This commit is contained in:
Alex Ning 2020-08-14 10:24:10 +08:00
parent fac3b83bae
commit 04d1079ad7
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
View File

@ -14,8 +14,10 @@ import android.os.Bundle;
import android.text.Html; import android.text.Html;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.method.LinkMovementMethod;
import android.text.style.BackgroundColorSpan; import android.text.style.BackgroundColorSpan;
import android.text.style.ClickableSpan; import android.text.style.ClickableSpan;
import android.text.style.SuperscriptSpan; import android.text.style.SuperscriptSpan;
@ -253,7 +255,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
Pattern spoilerPattern = Pattern.compile(">!.+!<"); Pattern spoilerPattern = Pattern.compile(">!.+!<");
Matcher matcher = spoilerPattern.matcher(markdownStringBuilder); Matcher matcher = spoilerPattern.matcher(markdownStringBuilder);
while (matcher.find()) { while (matcher.find()) {
markdownStringBuilder.setCharAt(matcher.start(), '<'); markdownStringBuilder.replace(matcher.start(), matcher.start() + 1, "&gt;");
} }
return super.processMarkdown(markdownStringBuilder.toString()); return super.processMarkdown(markdownStringBuilder.toString());
} }
@ -262,11 +264,13 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
public void afterSetText(@NonNull TextView textView) { public void afterSetText(@NonNull TextView textView) {
textView.setHighlightColor(Color.TRANSPARENT); textView.setHighlightColor(Color.TRANSPARENT);
StringBuilder markdownStringBuilder = new StringBuilder(textView.getText().toString()); StringBuilder markdownStringBuilder = new StringBuilder(textView.getText().toString());
Pattern spoilerPattern = Pattern.compile("<!.+!<"); Pattern spoilerPattern = Pattern.compile(">!.+!<");
Matcher matcher = spoilerPattern.matcher(markdownStringBuilder); Matcher matcher = spoilerPattern.matcher(markdownStringBuilder);
Spannable spannable = new SpannableString(markdownStringBuilder); Spannable spannable = new SpannableString(markdownStringBuilder);
int start = 0; int start = 0;
boolean find = false;
while (matcher.find(start)) { while (matcher.find(start)) {
find = true;
markdownStringBuilder.delete(matcher.end() - 2, matcher.end()); markdownStringBuilder.delete(matcher.end() - 2, matcher.end());
markdownStringBuilder.delete(matcher.start(), matcher.start() + 2); markdownStringBuilder.delete(matcher.start(), matcher.start() + 2);
@ -290,7 +294,9 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
spannable = spannableCopy; spannable = spannableCopy;
start = matcher.end() - 4; start = matcher.end() - 4;
} }
textView.setText(spannable); if (find) {
textView.setText(spannable);
}
} }
@Override @Override
@ -345,44 +351,53 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
Pattern spoilerPattern = Pattern.compile(">!.+!<"); Pattern spoilerPattern = Pattern.compile(">!.+!<");
Matcher matcher = spoilerPattern.matcher(markdownStringBuilder); Matcher matcher = spoilerPattern.matcher(markdownStringBuilder);
while (matcher.find()) { while (matcher.find()) {
markdownStringBuilder.setCharAt(matcher.start(), '<'); markdownStringBuilder.replace(matcher.start(), matcher.start() + 1, "&gt;");
} }
return super.processMarkdown(markdownStringBuilder.toString()); return super.processMarkdown(markdownStringBuilder.toString());
} }
@Override @Override
public void afterSetText(@NonNull TextView textView) { public void afterSetText(@NonNull TextView textView) {
textView.setHighlightColor(Color.TRANSPARENT); SpannableStringBuilder markdownStringBuilder = new SpannableStringBuilder(textView.getText().toString());
StringBuilder markdownStringBuilder = new StringBuilder(textView.getText().toString()); Pattern spoilerPattern = Pattern.compile(">!.+!<");
Pattern spoilerPattern = Pattern.compile("<!.+!<");
Matcher matcher = spoilerPattern.matcher(markdownStringBuilder); Matcher matcher = spoilerPattern.matcher(markdownStringBuilder);
Spannable spannable = new SpannableString(markdownStringBuilder); Spannable spannable = new SpannableString(markdownStringBuilder);
int start = 0; int start = 0;
boolean find = false;
while (matcher.find(start)) { while (matcher.find(start)) {
find = true;
markdownStringBuilder.delete(matcher.end() - 2, matcher.end()); markdownStringBuilder.delete(matcher.end() - 2, matcher.end());
markdownStringBuilder.delete(matcher.start(), matcher.start() + 2); markdownStringBuilder.delete(matcher.start(), matcher.start() + 2);
Spannable spannableCopy = new SpannableString(markdownStringBuilder); Spannable spannableCopy = new SpannableString(markdownStringBuilder);
BackgroundColorSpan backgroundColorSpan = new BackgroundColorSpan(Color.BLACK);
ClickableSpan clickableSpan = new ClickableSpan() { ClickableSpan clickableSpan = new ClickableSpan() {
private boolean isShowing = false;
@Override @Override
public void updateDrawState(@NonNull TextPaint ds) { public void updateDrawState(@NonNull TextPaint ds) {
if (isShowing) {
super.updateDrawState(ds);
ds.setColor(mCommentTextColor);
} else {
ds.bgColor = Color.BLACK;
ds.setColor(mCommentTextColor);
}
ds.setUnderlineText(false); ds.setUnderlineText(false);
} }
@Override @Override
public void onClick(@NonNull View view) { public void onClick(@NonNull View view) {
spannableCopy.removeSpan(backgroundColorSpan); isShowing = !isShowing;
spannableCopy.removeSpan(this); view.invalidate();
} }
}; };
spannableCopy.setSpan(clickableSpan, matcher.start(), matcher.end() - 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); spannableCopy.setSpan(clickableSpan, matcher.start(), matcher.end() - 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spannableCopy.setSpan(backgroundColorSpan, matcher.start(), matcher.end() - 4, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
spannable = spannableCopy; spannable = spannableCopy;
start = matcher.end() - 4; start = matcher.end() - 4;
} }
textView.setText(spannable); if (find) {
textView.setText(spannable);
}
} }
@Override @Override
@ -3353,6 +3368,8 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
} }
}); });
commentMarkdownView.setMovementMethod(LinkMovementMethod.getInstance());
if (mSwapTapAndLong) { if (mSwapTapAndLong) {
if (mCommentToolbarHideOnClick) { if (mCommentToolbarHideOnClick) {
View.OnLongClickListener hideToolbarOnLongClickListener = view -> hideToolbar(); View.OnLongClickListener hideToolbarOnLongClickListener = view -> hideToolbar();
@ -3360,20 +3377,29 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
commentMarkdownView.setOnLongClickListener(hideToolbarOnLongClickListener); commentMarkdownView.setOnLongClickListener(hideToolbarOnLongClickListener);
commentTimeTextView.setOnLongClickListener(hideToolbarOnLongClickListener); commentTimeTextView.setOnLongClickListener(hideToolbarOnLongClickListener);
} }
View.OnClickListener expandCommentsOnClickListener = view -> expandComments(); commentMarkdownView.setOnClickListener(view -> {
commentMarkdownView.setOnClickListener(expandCommentsOnClickListener); if (commentMarkdownView.getSelectionStart() == -1 && commentMarkdownView.getSelectionEnd() == -1) {
itemView.setOnClickListener(expandCommentsOnClickListener); expandComments();
}
});
itemView.setOnClickListener(view -> expandComments());
} else { } else {
if (mCommentToolbarHideOnClick) { if (mCommentToolbarHideOnClick) {
commentMarkdownView.setOnClickListener(view -> {
if (commentMarkdownView.getSelectionStart() == -1 && commentMarkdownView.getSelectionEnd() == -1) {
hideToolbar();
}
});
View.OnClickListener hideToolbarOnClickListener = view -> hideToolbar(); View.OnClickListener hideToolbarOnClickListener = view -> hideToolbar();
linearLayout.setOnClickListener(hideToolbarOnClickListener); linearLayout.setOnClickListener(hideToolbarOnClickListener);
commentMarkdownView.setOnClickListener(hideToolbarOnClickListener);
commentTimeTextView.setOnClickListener(hideToolbarOnClickListener); commentTimeTextView.setOnClickListener(hideToolbarOnClickListener);
} }
View.OnLongClickListener expandsCommentsOnLongClickListener = view -> expandComments(); View.OnLongClickListener expandsCommentsOnLongClickListener = view -> expandComments();
commentMarkdownView.setOnLongClickListener(expandsCommentsOnLongClickListener); commentMarkdownView.setOnLongClickListener(expandsCommentsOnLongClickListener);
itemView.setOnLongClickListener(expandsCommentsOnLongClickListener); itemView.setOnLongClickListener(expandsCommentsOnLongClickListener);
} }
commentMarkdownView.setMovementMethod(LinkMovementMethod.getInstance());
commentMarkdownView.setHighlightColor(Color.TRANSPARENT);
} }
private boolean expandComments() { private boolean expandComments() {