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

Reverting TextStatusDisplayItem to master's, as I have figured out a better way to do filters

Browse Source
This commit is contained in:
LucasGGamerM
2023-01-18 15:36:22 -03:00
parent 18275183d0
commit 5118a1fb1e
1 changed files with 16 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,10 @@ import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import org.joinmastodon.android.R; import org.joinmastodon.android.R;
import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
import org.joinmastodon.android.api.requests.statuses.TranslateStatus; import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
import org.joinmastodon.android.api.session.AccountSession; import org.joinmastodon.android.api.session.AccountSession;
import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.fragments.BaseStatusListFragment;
import org.joinmastodon.android.model.Filter;
import org.joinmastodon.android.model.Instance; import org.joinmastodon.android.model.Instance;
import org.joinmastodon.android.model.Status; import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable; import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable;
@@ -27,9 +25,6 @@ import org.joinmastodon.android.model.TranslatedStatus;
import org.joinmastodon.android.ui.text.HtmlParser; import org.joinmastodon.android.ui.text.HtmlParser;
import org.joinmastodon.android.ui.utils.CustomEmojiHelper; import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
import org.joinmastodon.android.ui.views.LinkedTextView; import org.joinmastodon.android.ui.views.LinkedTextView;
import org.joinmastodon.android.utils.StatusFilterPredicate;
import java.util.List;
import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.Callback;
import me.grishka.appkit.api.ErrorResponse; import me.grishka.appkit.api.ErrorResponse;
@@ -43,7 +38,6 @@ 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 disableTranslate; public boolean disableTranslate;
@@ -129,44 +123,6 @@ 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);
// 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);
// 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);
spoilerHeader.setVisibility(View.GONE);
textWrap.setVisibility(View.GONE);
itemView.setClickable(true);
}
}else{
if(!TextUtils.isEmpty(item.status.spoilerText)){ if(!TextUtils.isEmpty(item.status.spoilerText)){
spoilerTitle.setText(item.parsedSpoilerText); spoilerTitle.setText(item.parsedSpoilerText);
spoilerTitleInline.setText(item.parsedSpoilerText); spoilerTitleInline.setText(item.parsedSpoilerText);
@@ -187,23 +143,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
textWrap.setVisibility(View.VISIBLE); textWrap.setVisibility(View.VISIBLE);
itemView.setClickable(false); 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 = !item.disableTranslate && instanceInfo.v2 != null && boolean translateEnabled = !item.disableTranslate && instanceInfo.v2 != null &&