Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ public boolean areContentsTheSame(@NonNull Post post, @NonNull Post t1) {
private boolean mMarkPostsAsRead;
private boolean mMarkPostsAsReadAfterVoting;
private boolean mMarkPostsAsReadOnScroll;
private boolean mShowReadPostsWithReducedTransparency;
private boolean mHidePostType;
private boolean mHidePostFlair;
private boolean mHideSubredditAndUserPrefix;
Expand Down Expand Up @@ -339,6 +340,7 @@ public PostRecyclerViewAdapter(BaseActivity activity, PostFragmentBase fragment,
mMarkPostsAsRead = postHistorySharedPreferences.getBoolean((accountName.equals(Account.ANONYMOUS_ACCOUNT) ? "" : accountName) + SharedPreferencesUtils.MARK_POSTS_AS_READ_BASE, false);
mMarkPostsAsReadAfterVoting = postHistorySharedPreferences.getBoolean((accountName.equals(Account.ANONYMOUS_ACCOUNT) ? "" : accountName) + SharedPreferencesUtils.MARK_POSTS_AS_READ_AFTER_VOTING_BASE, false);
mMarkPostsAsReadOnScroll = postHistorySharedPreferences.getBoolean((accountName.equals(Account.ANONYMOUS_ACCOUNT) ? "" : accountName) + SharedPreferencesUtils.MARK_POSTS_AS_READ_ON_SCROLL_BASE, false);
mShowReadPostsWithReducedTransparency = postHistorySharedPreferences.getBoolean((accountName.equals(Account.ANONYMOUS_ACCOUNT) ? "" : accountName) + SharedPreferencesUtils.SHOW_READ_POSTS_WITH_REDUCED_TRANSPARENCY_BASE, false);
mHandleReadPost = true;
}

Expand Down Expand Up @@ -659,6 +661,9 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
if (mHandleReadPost && post.isRead()) {
((PostViewHolder) holder).setItemViewBackgroundColor(true);
((PostViewHolder) holder).titleTextView.setTextColor(mReadPostTitleColor);
((PostViewHolder) holder).setItemViewReducedTransparency(mShowReadPostsWithReducedTransparency);
} else {
((PostViewHolder) holder).setItemViewReducedTransparency(false);
}

if (mDisplaySubredditName) {
Expand Down Expand Up @@ -1152,6 +1157,9 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
if (mHandleReadPost && post.isRead()) {
holder.itemView.setBackgroundTintList(ColorStateList.valueOf(mReadPostCardViewBackgroundColor));
((PostGalleryViewHolder) holder).binding.titleTextViewItemPostGallery.setTextColor(mReadPostTitleColor);
holder.itemView.setAlpha(mShowReadPostsWithReducedTransparency ? 0.6f : 1.0f);
} else {
holder.itemView.setAlpha(1.0f);
}

if (mDataSavingMode && (mDisableImagePreview ||
Expand Down Expand Up @@ -1309,6 +1317,9 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
((PostGalleryBaseGalleryTypeViewHolder) holder).currentPosition = position;
if (mHandleReadPost && post.isRead()) {
holder.itemView.setBackgroundTintList(ColorStateList.valueOf(mReadPostCardViewBackgroundColor));
holder.itemView.setAlpha(mShowReadPostsWithReducedTransparency ? 0.6f : 1.0f);
} else {
holder.itemView.setAlpha(1.0f);
}

if (mDataSavingMode && mDisableImagePreview) {
Expand Down Expand Up @@ -2532,6 +2543,7 @@ void setOnClickListeners(@Nullable CustomTextView typeTextView,
}

abstract void setItemViewBackgroundColor(boolean isReadPost);
abstract void setItemViewReducedTransparency(boolean applyTransparency);
abstract void markPostRead(Post post, boolean changePostItemColor);
}

Expand Down Expand Up @@ -3112,7 +3124,7 @@ void markPostRead(Post post, boolean changePostItemColor) {
return;
}

if (!mAccountName.equals(Account.ANONYMOUS_ACCOUNT) && !post.isRead() && mMarkPostsAsRead) {
if (!post.isRead() && mMarkPostsAsRead) {
post.markAsRead();
if (changePostItemColor) {
setItemViewBackgroundColor(true);
Expand Down Expand Up @@ -3302,6 +3314,11 @@ class PostVideoAutoplayViewHolder extends PostBaseVideoAutoplayViewHolder {
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

@UnstableApi
Expand Down Expand Up @@ -3343,6 +3360,11 @@ class PostVideoAutoplayLegacyControllerViewHolder extends PostBaseVideoAutoplayV
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

class PostWithPreviewTypeViewHolder extends PostBaseViewHolder {
Expand Down Expand Up @@ -3518,6 +3540,11 @@ public boolean onResourceReady(Drawable resource, Object model, Target<Drawable>
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

public abstract class PostBaseGalleryTypeViewHolder extends PostBaseViewHolder {
Expand Down Expand Up @@ -3773,6 +3800,11 @@ public class PostGalleryTypeViewHolder extends PostBaseGalleryTypeViewHolder {
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

class PostTextTypeViewHolder extends PostBaseViewHolder {
Expand Down Expand Up @@ -3863,6 +3895,11 @@ void setBaseView(AspectRatioGifImageView iconGifImageView,
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

public class PostCompactBaseViewHolder extends PostViewHolder {
Expand Down Expand Up @@ -4137,13 +4174,18 @@ void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundColor(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor);
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}

@Override
void markPostRead(Post post, boolean changePostItemColor) {
if (!mHandleReadPost) {
return;
}

if (!mAccountName.equals(Account.ANONYMOUS_ACCOUNT) && !post.isRead() && mMarkPostsAsRead) {
if (!post.isRead() && mMarkPostsAsRead) {
post.markAsRead();
if (changePostItemColor) {
itemView.setBackgroundColor(mReadPostCardViewBackgroundColor);
Expand Down Expand Up @@ -4386,7 +4428,7 @@ void markPostRead(Post post, boolean changePostItemColor) {
return;
}

if (!mAccountName.equals(Account.ANONYMOUS_ACCOUNT) && !post.isRead() && mMarkPostsAsRead) {
if (!post.isRead() && mMarkPostsAsRead) {
post.markAsRead();
if (changePostItemColor) {
itemView.setBackgroundTintList(ColorStateList.valueOf(mReadPostCardViewBackgroundColor));
Expand Down Expand Up @@ -4583,7 +4625,7 @@ void markPostRead(Post post, boolean changePostItemColor) {
return;
}

if (!mAccountName.equals(Account.ANONYMOUS_ACCOUNT) && !post.isRead() && mMarkPostsAsRead) {
if (!post.isRead() && mMarkPostsAsRead) {
post.markAsRead();
if (changePostItemColor) {
itemView.setBackgroundTintList(ColorStateList.valueOf(mReadPostCardViewBackgroundColor));
Expand Down Expand Up @@ -4645,6 +4687,11 @@ class PostCard2VideoAutoplayViewHolder extends PostBaseVideoAutoplayViewHolder {
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundColor(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor);
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

@UnstableApi
Expand Down Expand Up @@ -4688,6 +4735,11 @@ class PostCard2VideoAutoplayLegacyControllerViewHolder extends PostBaseVideoAuto
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundColor(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor);
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

class PostCard2WithPreviewViewHolder extends PostWithPreviewTypeViewHolder {
Expand Down Expand Up @@ -4730,6 +4782,11 @@ class PostCard2WithPreviewViewHolder extends PostWithPreviewTypeViewHolder {
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundColor(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor);
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

public class PostCard2GalleryTypeViewHolder extends PostBaseGalleryTypeViewHolder {
Expand Down Expand Up @@ -4768,6 +4825,11 @@ public class PostCard2GalleryTypeViewHolder extends PostBaseGalleryTypeViewHolde
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundColor(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor);
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

class PostCard2TextTypeViewHolder extends PostTextTypeViewHolder {
Expand Down Expand Up @@ -4804,6 +4866,11 @@ class PostCard2TextTypeViewHolder extends PostTextTypeViewHolder {
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundColor(isReadPost ? mReadPostCardViewBackgroundColor : mCardViewBackgroundColor);
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

@UnstableApi
Expand Down Expand Up @@ -4845,6 +4912,11 @@ public class PostMaterial3CardVideoAutoplayViewHolder extends PostBaseVideoAutop
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostFilledCardViewBackgroundColor : mFilledCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

@UnstableApi
Expand Down Expand Up @@ -4886,6 +4958,11 @@ public class PostMaterial3CardVideoAutoplayLegacyControllerViewHolder extends Po
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostFilledCardViewBackgroundColor : mFilledCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

public class PostMaterial3CardWithPreviewViewHolder extends PostWithPreviewTypeViewHolder {
Expand Down Expand Up @@ -4924,6 +5001,11 @@ public class PostMaterial3CardWithPreviewViewHolder extends PostWithPreviewTypeV
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostFilledCardViewBackgroundColor : mFilledCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

public class PostMaterial3CardGalleryTypeViewHolder extends PostBaseGalleryTypeViewHolder {
Expand Down Expand Up @@ -4959,6 +5041,11 @@ public class PostMaterial3CardGalleryTypeViewHolder extends PostBaseGalleryTypeV
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostFilledCardViewBackgroundColor : mFilledCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}

public class PostMaterial3CardTextTypeViewHolder extends PostTextTypeViewHolder {
Expand Down Expand Up @@ -4992,5 +5079,10 @@ public class PostMaterial3CardTextTypeViewHolder extends PostTextTypeViewHolder
void setItemViewBackgroundColor(boolean isReadPost) {
itemView.setBackgroundTintList(ColorStateList.valueOf(isReadPost ? mReadPostFilledCardViewBackgroundColor : mFilledCardViewBackgroundColor));
}

@Override
void setItemViewReducedTransparency(boolean applyTransparency) {
itemView.setAlpha(applyTransparency ? 0.6f : 1.0f);
}
}
}
Loading
Loading