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

Its half working++

Browse Source
This commit is contained in:
LucasGGamerM
2023-01-09 16:16:38 -03:00
parent 2d9938e8b2
commit 6c778d05ea
1 changed files with 69 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
View File

@@ -43,6 +43,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
private CharSequence text; private CharSequence text;
private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), spoilerEmojiHelper; private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), spoilerEmojiHelper;
private CharSequence parsedSpoilerText; private CharSequence parsedSpoilerText;
private boolean showFiltered = false;
public boolean textSelectable; public boolean textSelectable;
public final Status status; public final Status status;
public boolean translated = false; public boolean translated = false;
@@ -119,9 +120,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
text.setText(item.translated text.setText(item.translated
? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID()) ? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
: item.text); : item.text);
if(item.status.filtered.size() > 0){
text.setText("Filtered");
}
text.setTextIsSelectable(item.textSelectable); text.setTextIsSelectable(item.textSelectable);
spoilerTitleInline.setTextIsSelectable(item.textSelectable); spoilerTitleInline.setTextIsSelectable(item.textSelectable);
text.setInvalidateOnEveryFrame(false); text.setInvalidateOnEveryFrame(false);
@@ -129,27 +127,82 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14)); spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14));
borderTop.setBackground(item.inset ? null : borderColor); borderTop.setBackground(item.inset ? null : borderColor);
borderBottom.setBackground(item.inset ? null : borderColor); borderBottom.setBackground(item.inset ? null : borderColor);
if(!TextUtils.isEmpty(item.status.spoilerText)){
spoilerTitle.setText(item.parsedSpoilerText); // if(!TextUtils.isEmpty(item.status.spoilerText)){
spoilerTitleInline.setText(item.parsedSpoilerText); // spoilerTitle.setText(item.parsedSpoilerText);
if(item.status.spoilerRevealed){ // spoilerTitleInline.setText(item.parsedSpoilerText);
spoilerOverlay.setVisibility(View.GONE); // if(item.status.spoilerRevealed){
spoilerHeader.setVisibility(View.VISIBLE); // spoilerOverlay.setVisibility(View.GONE);
textWrap.setVisibility(View.VISIBLE); // spoilerHeader.setVisibility(View.VISIBLE);
itemView.setClickable(false); // textWrap.setVisibility(View.VISIBLE);
}else{ // itemView.setClickable(false);
// }else{
// spoilerOverlay.setVisibility(View.VISIBLE);
// spoilerHeader.setVisibility(View.GONE);
// textWrap.setVisibility(View.GONE);
// itemView.setClickable(true);
// }
// }else{
// spoilerOverlay.setVisibility(View.GONE);
// spoilerHeader.setVisibility(View.GONE);
// textWrap.setVisibility(View.VISIBLE);
// itemView.setClickable(false);
// }
if(!item.showFiltered){
if(item.status.filtered.size() > 0){
spoilerTitle.setText("Filtered");
spoilerTitleInline.setText(item.parsedSpoilerText);
// if(item.status.spoilerRevealed){
// spoilerOverlay.setVisibility(View.GONE);
// spoilerHeader.setVisibility(View.VISIBLE);
// textWrap.setVisibility(View.VISIBLE);
// itemView.setClickable(false);
// }else{
spoilerOverlay.setVisibility(View.VISIBLE); spoilerOverlay.setVisibility(View.VISIBLE);
spoilerHeader.setVisibility(View.GONE); spoilerHeader.setVisibility(View.GONE);
textWrap.setVisibility(View.GONE); textWrap.setVisibility(View.GONE);
itemView.setClickable(true); itemView.setClickable(true);
} }
}else{ }else{
spoilerOverlay.setVisibility(View.GONE); if(!TextUtils.isEmpty(item.status.spoilerText)){
spoilerHeader.setVisibility(View.GONE); spoilerTitle.setText(item.parsedSpoilerText);
textWrap.setVisibility(View.VISIBLE); spoilerTitleInline.setText(item.parsedSpoilerText);
itemView.setClickable(false); if(item.status.spoilerRevealed){
spoilerOverlay.setVisibility(View.GONE);
spoilerHeader.setVisibility(View.VISIBLE);
textWrap.setVisibility(View.VISIBLE);
itemView.setClickable(false);
}else{
spoilerOverlay.setVisibility(View.VISIBLE);
spoilerHeader.setVisibility(View.GONE);
textWrap.setVisibility(View.GONE);
itemView.setClickable(true);
}
}else{
spoilerOverlay.setVisibility(View.GONE);
spoilerHeader.setVisibility(View.GONE);
textWrap.setVisibility(View.VISIBLE);
itemView.setClickable(false);
}
} }
// else{
// spoilerOverlay.setVisibility(View.GONE);
// spoilerHeader.setVisibility(View.GONE);
// textWrap.setVisibility(View.VISIBLE);
// itemView.setClickable(false);
// }
// if(item.status.filtered.size() > 0){
//// text.setText("Filtered");
// spoilerOverlay.setVisibility(View.VISIBLE);
// spoilerHeader.setVisibility(View.VISIBLE);
// textWrap.setVisibility(View.GONE);
// itemView.setClickable(false);
// }
Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain); Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled; boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;