Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

removed debug code

This commit is contained in:
Mariotaku Lee 2016-05-30 17:04:46 +08:00
parent d0b1299dbc
commit 8ccc78d7f2
2 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
twidere/src/main/java/org/mariotaku/twidere/loader/UserTimelineLoader.java
View File

@ -72,7 +72,6 @@ public class UserTimelineLoader extends MicroBlogAPIStatusesLoader {
@WorkerThread @WorkerThread
@Override @Override
protected boolean shouldFilterStatus(final SQLiteDatabase database, final ParcelableStatus status) { protected boolean shouldFilterStatus(final SQLiteDatabase database, final ParcelableStatus status) {
if (true) return false;
final UserKey accountId = getAccountKey(); final UserKey accountId = getAccountKey();
if (accountId != null && mUserId != null && TextUtils.equals(accountId.getId(), mUserId.getId())) if (accountId != null && mUserId != null && TextUtils.equals(accountId.getId(), mUserId.getId()))
return false; return false;

49
twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java
View File

@ -85,8 +85,7 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
private final View itemMenu; private final View itemMenu;
private final View profileImageSpace; private final View profileImageSpace;
private final View statusContentUpperSpace, statusContentLowerSpace; private final View statusContentUpperSpace, statusContentLowerSpace;
private View textMediaSpace, quotedTextMediaSpace; private final View mediaLabelSpace = null, quotedMediaLabelSpace = null;
private final View mediaLabelSpace, quotedMediaLabelSpace;
private final View quoteIndicatorAnchorTop, quoteIndicatorAnchorBottom; private final View quoteIndicatorAnchorTop, quoteIndicatorAnchorBottom;
private final EventListener eventListener; private final EventListener eventListener;
@ -139,8 +138,6 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
quoteIndicatorAnchorTop = itemView.findViewById(R.id.quote_indicator_anchor_top); quoteIndicatorAnchorTop = itemView.findViewById(R.id.quote_indicator_anchor_top);
quoteIndicatorAnchorBottom = itemView.findViewById(R.id.quote_indicator_anchor_bottom); quoteIndicatorAnchorBottom = itemView.findViewById(R.id.quote_indicator_anchor_bottom);
mediaLabelSpace = null;
quotedMediaLabelSpace = null;
//TODO //TODO
// profileImageView.setSelectorColor(ThemeUtils.getUserHighlightColor(itemView.getContext())); // profileImageView.setSelectorColor(ThemeUtils.getUserHighlightColor(itemView.getContext()));
@ -177,15 +174,9 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
if (adapter.isMediaPreviewEnabled()) { if (adapter.isMediaPreviewEnabled()) {
mediaPreview.setVisibility(View.VISIBLE); mediaPreview.setVisibility(View.VISIBLE);
mediaLabel.setVisibility(View.GONE); mediaLabel.setVisibility(View.GONE);
if (textMediaSpace != null) {
textMediaSpace.setVisibility(View.GONE);
}
} else { } else {
mediaPreview.setVisibility(View.GONE); mediaPreview.setVisibility(View.GONE);
mediaLabel.setVisibility(View.VISIBLE); mediaLabel.setVisibility(View.VISIBLE);
if (textMediaSpace != null) {
textMediaSpace.setVisibility(showCardActions ? View.GONE : View.VISIBLE);
}
} }
quoteMediaLabel.setVisibility(View.GONE); quoteMediaLabel.setVisibility(View.GONE);
actionButtons.setVisibility(showCardActions ? View.VISIBLE : View.GONE); actionButtons.setVisibility(showCardActions ? View.VISIBLE : View.GONE);
@ -194,9 +185,6 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
statusContentLowerSpace.setVisibility(showCardActions ? View.GONE : View.VISIBLE); statusContentLowerSpace.setVisibility(showCardActions ? View.GONE : View.VISIBLE);
} }
quoteMediaPreview.setVisibility(View.GONE); quoteMediaPreview.setVisibility(View.GONE);
if (quotedTextMediaSpace != null) {
quotedTextMediaSpace.setVisibility(View.GONE);
}
mediaPreview.displayMedia(R.drawable.nyan_stars_background); mediaPreview.displayMedia(R.drawable.nyan_stars_background);
extraTypeView.setImageResource(R.drawable.ic_action_gallery); extraTypeView.setImageResource(R.drawable.ic_action_gallery);
} }
@ -399,28 +387,7 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
mediaPreview.setVisibility(View.GONE); mediaPreview.setVisibility(View.GONE);
quoteMediaPreview.setVisibility(View.GONE); quoteMediaPreview.setVisibility(View.GONE);
if (textMediaSpace != null) {
textMediaSpace.setVisibility(showCardActions && !status.is_quote ? View.GONE : View.VISIBLE);
}
if (quotedTextMediaSpace != null) {
quotedTextMediaSpace.setVisibility(status.is_quote ? View.VISIBLE : View.GONE);
}
if (mediaLabelSpace != null) {
mediaLabelSpace.setVisibility(View.GONE);
}
if (quotedMediaLabelSpace != null) {
quotedMediaLabelSpace.setVisibility(View.GONE);
}
} else { } else {
if (textMediaSpace != null) {
textMediaSpace.setVisibility(!status.is_quote && (hasPrimaryMedia || showCardActions) ?
View.GONE : View.VISIBLE);
}
if (quotedTextMediaSpace != null) {
quotedTextMediaSpace.setVisibility(!status.is_quote || hasQuotedMedia ?
View.GONE : View.VISIBLE);
}
if (!adapter.isSensitiveContentEnabled() && status.is_possibly_sensitive) { if (!adapter.isSensitiveContentEnabled() && status.is_possibly_sensitive) {
// Sensitive content, show label instead of media view // Sensitive content, show label instead of media view
@ -435,13 +402,6 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
mediaLabel.setVisibility(hasPrimaryMedia ? View.VISIBLE : View.GONE); mediaLabel.setVisibility(hasPrimaryMedia ? View.VISIBLE : View.GONE);
quoteMediaLabel.setVisibility(hasQuotedMedia ? View.VISIBLE : View.GONE); quoteMediaLabel.setVisibility(hasQuotedMedia ? View.VISIBLE : View.GONE);
if (mediaLabelSpace != null) {
mediaLabelSpace.setVisibility(hasPrimaryMedia && !showCardActions ? View.VISIBLE : View.GONE);
}
if (quotedMediaLabelSpace != null) {
quotedMediaLabelSpace.setVisibility(hasQuotedMedia && !showCardActions ? View.VISIBLE : View.GONE);
}
mediaPreview.setVisibility(View.GONE); mediaPreview.setVisibility(View.GONE);
quoteMediaPreview.setVisibility(View.GONE); quoteMediaPreview.setVisibility(View.GONE);
@ -451,13 +411,6 @@ public class StatusViewHolder extends ViewHolder implements Constants, IStatusVi
mediaLabel.setVisibility(View.GONE); mediaLabel.setVisibility(View.GONE);
quoteMediaLabel.setVisibility(View.GONE); quoteMediaLabel.setVisibility(View.GONE);
if (mediaLabelSpace != null) {
mediaLabelSpace.setVisibility(View.GONE);
}
if (quotedMediaLabelSpace != null) {
quotedMediaLabelSpace.setVisibility(View.GONE);
}
mediaPreview.setStyle(adapter.getMediaPreviewStyle()); mediaPreview.setStyle(adapter.getMediaPreviewStyle());
quoteMediaPreview.setStyle(adapter.getMediaPreviewStyle()); quoteMediaPreview.setStyle(adapter.getMediaPreviewStyle());