diff options
Diffstat (limited to 'app/src/main/java/ml/docilealligator/infinityforreddit')
11 files changed, 26 insertions, 266 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java index 2e6d8850..d306c151 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/HistoryPostRecyclerViewAdapter.java @@ -190,8 +190,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy private int mSpoilerTextColor; private int mFlairBackgroundColor; private int mFlairTextColor; - private int mAwardsBackgroundColor; - private int mAwardsTextColor; private int mNSFWBackgroundColor; private int mNSFWTextColor; private int mArchivedIconTint; @@ -229,7 +227,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy private boolean mOnlyDisablePreviewInVideoAndGifPosts; private boolean mHidePostType; private boolean mHidePostFlair; - private boolean mHideTheNumberOfAwards; private boolean mHideSubredditAndUserPrefix; private boolean mHideTheNumberOfVotes; private boolean mHideTheNumberOfComments; @@ -305,7 +302,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy mHidePostType = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_POST_TYPE, false); mHidePostFlair = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_POST_FLAIR, false); - mHideTheNumberOfAwards = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_AWARDS, false); mHideSubredditAndUserPrefix = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_SUBREDDIT_AND_USER_PREFIX, false); mHideTheNumberOfVotes = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_VOTES, false); mHideTheNumberOfComments = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_COMMENTS, false); @@ -334,8 +330,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy mSpoilerTextColor = customThemeWrapper.getSpoilerTextColor(); mFlairBackgroundColor = customThemeWrapper.getFlairBackgroundColor(); mFlairTextColor = customThemeWrapper.getFlairTextColor(); - mAwardsBackgroundColor = customThemeWrapper.getAwardsBackgroundColor(); - mAwardsTextColor = customThemeWrapper.getAwardsTextColor(); mNSFWBackgroundColor = customThemeWrapper.getNsfwBackgroundColor(); mNSFWTextColor = customThemeWrapper.getNsfwTextColor(); mArchivedIconTint = customThemeWrapper.getArchivedIconTint(); @@ -721,15 +715,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } } - if (post.getNAwards() > 0 && !mHideTheNumberOfAwards) { - ((PostBaseViewHolder) holder).awardsTextView.setVisibility(View.VISIBLE); - if (post.getNAwards() == 1) { - ((PostBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.one_award)); - } else { - ((PostBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.n_awards, post.getNAwards())); - } - } - switch (post.getVoteType()) { case 1: //Upvoted @@ -1135,7 +1120,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy boolean nsfw = post.isNSFW(); boolean spoiler = post.isSpoiler(); String flair = post.getFlair(); - int nAwards = post.getNAwards(); boolean isArchived = post.isArchived(); if (mDisplaySubredditName) { @@ -1305,15 +1289,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy } } - if (nAwards > 0 && !mHideTheNumberOfAwards) { - ((PostCompactBaseViewHolder) holder).awardsTextView.setVisibility(View.VISIBLE); - if (nAwards == 1) { - ((PostCompactBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.one_award)); - } else { - ((PostCompactBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.n_awards, nAwards)); - } - } - switch (post.getVoteType()) { case 1: //Upvoted @@ -2221,10 +2196,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy mHidePostFlair = hidePostFlair; } - public void setHideTheNumberOfAwards(boolean hideTheNumberOfAwards) { - mHideTheNumberOfAwards = hideTheNumberOfAwards; - } - public void setHideSubredditAndUserPrefix(boolean hideSubredditAndUserPrefix) { mHideSubredditAndUserPrefix = hideSubredditAndUserPrefix; } @@ -2334,8 +2305,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostBaseViewHolder) holder).spoilerTextView.setVisibility(View.GONE); ((PostBaseViewHolder) holder).flairTextView.setText(""); ((PostBaseViewHolder) holder).flairTextView.setVisibility(View.GONE); - ((PostBaseViewHolder) holder).awardsTextView.setText(""); - ((PostBaseViewHolder) holder).awardsTextView.setVisibility(View.GONE); ((PostBaseViewHolder) holder).upvoteButton.setIconResource(R.drawable.ic_upvote_24dp); ((PostBaseViewHolder) holder).upvoteButton.setIconTint(ColorStateList.valueOf(mPostIconAndInfoColor)); ((PostBaseViewHolder) holder).scoreTextView.setTextColor(mPostIconAndInfoColor); @@ -2355,8 +2324,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy ((PostCompactBaseViewHolder) holder).spoilerTextView.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).flairTextView.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).flairTextView.setText(""); - ((PostCompactBaseViewHolder) holder).awardsTextView.setVisibility(View.GONE); - ((PostCompactBaseViewHolder) holder).awardsTextView.setText(""); ((PostCompactBaseViewHolder) holder).linkTextView.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).progressBar.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).imageView.setVisibility(View.GONE); @@ -2585,7 +2552,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView; CustomTextView spoilerTextView; CustomTextView flairTextView; - CustomTextView awardsTextView; ConstraintLayout bottomConstraintLayout; MaterialButton upvoteButton; TextView scoreTextView; @@ -2615,7 +2581,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, ConstraintLayout bottomConstraintLayout, MaterialButton upvoteButton, TextView scoreTextView, @@ -2636,7 +2601,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy this.nsfwTextView = nsfwTextView; this.spoilerTextView = spoilerTextView; this.flairTextView = flairTextView; - this.awardsTextView = awardsTextView; this.bottomConstraintLayout = bottomConstraintLayout; this.upvoteButton = upvoteButton; this.scoreTextView = scoreTextView; @@ -2678,7 +2642,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy spoilerTextView.setTypeface(mActivity.typeface); nsfwTextView.setTypeface(mActivity.typeface); flairTextView.setTypeface(mActivity.typeface); - awardsTextView.setTypeface(mActivity.typeface); scoreTextView.setTypeface(mActivity.typeface); commentsCountButton.setTypeface(mActivity.typeface); } @@ -2703,9 +2666,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy flairTextView.setBackgroundColor(mFlairBackgroundColor); flairTextView.setBorderColor(mFlairBackgroundColor); flairTextView.setTextColor(mFlairTextColor); - awardsTextView.setBackgroundColor(mAwardsBackgroundColor); - awardsTextView.setBorderColor(mAwardsBackgroundColor); - awardsTextView.setTextColor(mAwardsTextColor); archivedImageView.setColorFilter(mArchivedIconTint, PorterDuff.Mode.SRC_IN); lockedImageView.setColorFilter(mLockedIconTint, PorterDuff.Mode.SRC_IN); crosspostImageView.setColorFilter(mCrosspostIconTint, PorterDuff.Mode.SRC_IN); @@ -3139,7 +3099,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, ConstraintLayout bottomConstraintLayout, MaterialButton upvoteButton, TextView scoreTextView, @@ -3151,7 +3110,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy setBaseView(iconGifImageView, subredditTextView, userTextView, stickiedPostImageView, postTimeTextView, titleTextView, typeTextView, archivedImageView, lockedImageView, crosspostImageView, - nsfwTextView, spoilerTextView, flairTextView, awardsTextView, bottomConstraintLayout, + nsfwTextView, spoilerTextView, flairTextView, bottomConstraintLayout, upvoteButton, scoreTextView, downvoteButton, commentsCountButton, saveButton, shareButton); } } @@ -3189,7 +3148,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, AspectRatioFrameLayout aspectRatioFrameLayout, GifImageView previewImageView, ImageView errorLoadingGfycatImageView, @@ -3221,7 +3179,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy nsfwTextView, spoilerTextView, flairTextView, - awardsTextView, bottomConstraintLayout, upvoteButton, scoreTextView, @@ -3477,7 +3434,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostVideoTypeAutoplay, binding.spoilerCustomTextViewItemPostVideoTypeAutoplay, binding.flairCustomTextViewItemPostVideoTypeAutoplay, - binding.awardsTextViewItemPostVideoTypeAutoplay, binding.aspectRatioFrameLayoutItemPostVideoTypeAutoplay, binding.previewImageViewItemPostVideoTypeAutoplay, binding.errorLoadingGfycatImageViewItemPostVideoTypeAutoplay, @@ -3513,7 +3469,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostVideoTypeAutoplay, binding.spoilerCustomTextViewItemPostVideoTypeAutoplay, binding.flairCustomTextViewItemPostVideoTypeAutoplay, - binding.awardsTextViewItemPostVideoTypeAutoplay, binding.aspectRatioFrameLayoutItemPostVideoTypeAutoplay, binding.previewImageViewItemPostVideoTypeAutoplay, binding.errorLoadingGfycatImageViewItemPostVideoTypeAutoplay, @@ -3554,7 +3509,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostWithPreview, binding.spoilerCustomTextViewItemPostWithPreview, binding.flairCustomTextViewItemPostWithPreview, - binding.awardsTextViewItemPostWithPreview, binding.bottomConstraintLayoutItemPostWithPreview, binding.upvoteButtonItemPostWithPreview, binding.scoreTextViewItemPostWithPreview, @@ -3637,7 +3591,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, FrameLayout frameLayout, RecyclerView galleryRecyclerView, CustomTextView imageIndexTextView, @@ -3665,7 +3618,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy nsfwTextView, spoilerTextView, flairTextView, - awardsTextView, bottomConstraintLayout, upvoteButton, scoreTextView, @@ -3813,7 +3765,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostGalleryType, binding.spoilerTextViewItemPostGalleryType, binding.flairTextViewItemPostGalleryType, - binding.awardsTextViewItemPostGalleryType, binding.galleryFrameLayoutItemPostGalleryType, binding.galleryRecyclerViewItemPostGalleryType, binding.imageIndexTextViewItemPostGalleryType, @@ -3850,7 +3801,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostTextType, binding.spoilerCustomTextViewItemPostTextType, binding.flairCustomTextViewItemPostTextType, - binding.awardsTextViewItemPostTextType, binding.bottomConstraintLayoutItemPostTextType, binding.upvoteButtonItemPostTextType, binding.scoreTextViewItemPostTextType, @@ -3880,7 +3830,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView; CustomTextView spoilerTextView; CustomTextView flairTextView; - CustomTextView awardsTextView; TextView linkTextView; RelativeLayout relativeLayout; ProgressBar progressBar; @@ -3917,7 +3866,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, TextView linkTextView, RelativeLayout relativeLayout, ProgressBar progressBar, @@ -3947,7 +3895,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy this.nsfwTextView = nsfwTextView; this.spoilerTextView = spoilerTextView; this.flairTextView = flairTextView; - this.awardsTextView = awardsTextView; this.linkTextView = linkTextView; this.relativeLayout = relativeLayout; this.progressBar = progressBar; @@ -3995,7 +3942,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy spoilerTextView.setTypeface(mActivity.typeface); nsfwTextView.setTypeface(mActivity.typeface); flairTextView.setTypeface(mActivity.typeface); - awardsTextView.setTypeface(mActivity.typeface); linkTextView.setTypeface(mActivity.typeface); upvoteButton.setTypeface(mActivity.typeface); commentsCountButton.setTypeface(mActivity.typeface); @@ -4020,9 +3966,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy flairTextView.setBackgroundColor(mFlairBackgroundColor); flairTextView.setBorderColor(mFlairBackgroundColor); flairTextView.setTextColor(mFlairTextColor); - awardsTextView.setBackgroundColor(mAwardsBackgroundColor); - awardsTextView.setBorderColor(mAwardsBackgroundColor); - awardsTextView.setTextColor(mAwardsTextColor); archivedImageView.setColorFilter(mArchivedIconTint, PorterDuff.Mode.SRC_IN); lockedImageView.setColorFilter(mLockedIconTint, PorterDuff.Mode.SRC_IN); crosspostImageView.setColorFilter(mCrosspostIconTint, PorterDuff.Mode.SRC_IN); @@ -4479,7 +4422,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostCompact, binding.spoilerCustomTextViewItemPostCompact, binding.flairCustomTextViewItemPostCompact, - binding.awardsTextViewItemPostCompact, binding.linkTextViewItemPostCompact, binding.imageViewWrapperItemPostCompact, binding.progressBarItemPostCompact, @@ -4516,7 +4458,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostCompactRightThumbnail, binding.spoilerCustomTextViewItemPostCompactRightThumbnail, binding.flairCustomTextViewItemPostCompactRightThumbnail, - binding.awardsTextViewItemPostCompactRightThumbnail, binding.linkTextViewItemPostCompactRightThumbnail, binding.imageViewWrapperItemPostCompactRightThumbnail, binding.progressBarItemPostCompactRightThumbnail, @@ -4831,12 +4772,12 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy private boolean isManuallyPaused; PostCard2BaseVideoAutoplayViewHolder(View itemView, - AspectRatioGifImageView iconGifImageView, - TextView subredditTextView, - TextView userTextView, - ImageView stickiedPostImageView, - TextView postTimeTextView, - TextView titleTextView, + AspectRatioGifImageView iconGifImageView, + TextView subredditTextView, + TextView userTextView, + ImageView stickiedPostImageView, + TextView postTimeTextView, + TextView titleTextView, CustomTextView typeTextView, ImageView archivedImageView, ImageView lockedImageView, @@ -4844,24 +4785,23 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, - AspectRatioFrameLayout aspectRatioFrameLayout, - GifImageView previewImageView, - ImageView errorLoadingGfycatImageView, - PlayerView videoPlayer, - ImageView muteButton, - ImageView fullscreenButton, - ImageView pauseButton, - ImageView playButton, - DefaultTimeBar progressBar, - ConstraintLayout bottomConstraintLayout, - MaterialButton upvoteButton, - TextView scoreTextView, - MaterialButton downvoteButton, - MaterialButton commentsCountButton, - MaterialButton saveButton, - MaterialButton shareButton, - View divider) { + AspectRatioFrameLayout aspectRatioFrameLayout, + GifImageView previewImageView, + ImageView errorLoadingGfycatImageView, + PlayerView videoPlayer, + ImageView muteButton, + ImageView fullscreenButton, + ImageView pauseButton, + ImageView playButton, + DefaultTimeBar progressBar, + ConstraintLayout bottomConstraintLayout, + MaterialButton upvoteButton, + TextView scoreTextView, + MaterialButton downvoteButton, + MaterialButton commentsCountButton, + MaterialButton saveButton, + MaterialButton shareButton, + View divider) { super(itemView); setBaseView( iconGifImageView, @@ -4877,7 +4817,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy nsfwTextView, spoilerTextView, flairTextView, - awardsTextView, bottomConstraintLayout, upvoteButton, scoreTextView, @@ -5134,7 +5073,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostCard2VideoAutoplay, binding.spoilerCustomTextViewItemPostCard2VideoAutoplay, binding.flairCustomTextViewItemPostCard2VideoAutoplay, - binding.awardsTextViewItemPostCard2VideoAutoplay, binding.aspectRatioFrameLayoutItemPostCard2VideoAutoplay, binding.previewImageViewItemPostCard2VideoAutoplay, binding.errorLoadingGfycatImageViewItemPostCard2VideoAutoplay, @@ -5171,7 +5109,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostCard2VideoAutoplay, binding.spoilerCustomTextViewItemPostCard2VideoAutoplay, binding.flairCustomTextViewItemPostCard2VideoAutoplay, - binding.awardsTextViewItemPostCard2VideoAutoplay, binding.aspectRatioFrameLayoutItemPostCard2VideoAutoplay, binding.previewImageViewItemPostCard2VideoAutoplay, binding.errorLoadingGfycatImageViewItemPostCard2VideoAutoplay, @@ -5213,7 +5150,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostCard2WithPreview, binding.spoilerCustomTextViewItemPostCard2WithPreview, binding.flairCustomTextViewItemPostCard2WithPreview, - binding.awardsTextViewItemPostCard2WithPreview, binding.bottomConstraintLayoutItemPostCard2WithPreview, binding.upvoteButtonItemPostCard2WithPreview, binding.scoreTextViewItemPostCard2WithPreview, @@ -5292,7 +5228,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostCard2GalleryType, binding.spoilerCustomTextViewItemPostCard2GalleryType, binding.flairCustomTextViewItemPostCard2GalleryType, - binding.awardsTextViewItemPostCard2GalleryType, binding.galleryFrameLayoutItemPostCard2GalleryType, binding.galleryRecyclerViewItemPostCard2GalleryType, binding.imageIndexTextViewItemPostCard2GalleryType, @@ -5331,7 +5266,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy binding.nsfwTextViewItemPostCard2Text, binding.spoilerCustomTextViewItemPostCard2Text, binding.flairCustomTextViewItemPostCard2Text, - binding.awardsTextViewItemPostCard2Text, binding.bottomConstraintLayoutItemPostCard2Text, binding.upvoteButtonItemPostCard2Text, binding.scoreTextViewItemPostCard2Text, diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java index 1f7fcc2e..9137aece 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java @@ -168,7 +168,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler private boolean mHidePostType; private boolean mHidePostFlair; private boolean mHideUpvoteRatio; - private boolean mHideTheNumberOfAwards; private boolean mHideSubredditAndUserPrefix; private boolean mHideTheNumberOfVotes; private boolean mHideTheNumberOfComments; @@ -339,7 +338,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler mHidePostType = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_POST_TYPE, false); mHidePostFlair = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_POST_FLAIR, false); mHideUpvoteRatio = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_UPVOTE_RATIO, false); - mHideTheNumberOfAwards = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_AWARDS, false); mHideSubredditAndUserPrefix = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_SUBREDDIT_AND_USER_PREFIX, false); mHideTheNumberOfVotes = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_VOTES, false); mHideTheNumberOfComments = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_COMMENTS, false); @@ -619,11 +617,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler Utils.setHTMLWithImageToTextView(((PostDetailBaseViewHolder) holder).flairTextView, mPost.getFlair(), false); } - if (!mHideTheNumberOfAwards && mPost.getAwards() != null && !mPost.getAwards().equals("")) { - ((PostDetailBaseViewHolder) holder).awardsTextView.setVisibility(View.VISIBLE); - Utils.setHTMLWithImageToTextView(((PostDetailBaseViewHolder) holder).awardsTextView, mPost.getAwards(), true); - } - if (mHideUpvoteRatio) { ((PostDetailBaseViewHolder) holder).upvoteRatioTextView.setVisibility(View.GONE); } else { @@ -974,14 +967,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler } } - public void giveAward(String awardsHTML, int awardCount) { - if (mPost != null) { - mPost.addAwards(awardsHTML); - mPost.addAwards(awardCount); - notifyItemChanged(0); - } - } - public void addOneComment() { if (mPost != null) { mPost.setNComments(mPost.getNComments() + 1); @@ -1066,7 +1051,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler CustomTextView nsfwTextView; CustomTextView spoilerTextView; CustomTextView flairTextView; - TextView awardsTextView; TextView upvoteRatioTextView; RecyclerView contentMarkdownView; ConstraintLayout bottomConstraintLayout; @@ -1094,7 +1078,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler CustomTextView nSFWTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - TextView awardsTextView, TextView upvoteRatioTextView, RecyclerView contentMarkdownView, ConstraintLayout bottomConstraintLayout, @@ -1117,7 +1100,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler this.nsfwTextView = nSFWTextView; this.spoilerTextView = spoilerTextView; this.flairTextView = flairTextView; - this.awardsTextView = awardsTextView; this.upvoteRatioTextView = upvoteRatioTextView; this.contentMarkdownView = contentMarkdownView; this.bottomConstraintLayout = bottomConstraintLayout; @@ -1517,7 +1499,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler spoilerTextView.setTypeface(mActivity.typeface); nSFWTextView.setTypeface(mActivity.typeface); flairTextView.setTypeface(mActivity.typeface); - awardsTextView.setTypeface(mActivity.typeface); upvoteRatioTextView.setTypeface(mActivity.typeface); upvoteButton.setTypeface(mActivity.typeface); commentsCountButton.setTypeface(mActivity.typeface); @@ -1546,7 +1527,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler archivedImageView.setColorFilter(mArchivedTintColor, PorterDuff.Mode.SRC_IN); lockedImageView.setColorFilter(mLockedTintColor, PorterDuff.Mode.SRC_IN); crosspostImageView.setColorFilter(mCrosspostTintColor, PorterDuff.Mode.SRC_IN); - awardsTextView.setTextColor(mSecondaryTextColor); Drawable upvoteRatioDrawable = Utils.getTintedDrawable(mActivity, R.drawable.ic_upvote_ratio, mUpvoteRatioTintColor); upvoteRatioTextView.setCompoundDrawablesWithIntrinsicBounds( upvoteRatioDrawable, null, null, null); @@ -1594,7 +1574,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - TextView awardsTextView, TextView upvoteRatioTextView, AspectRatioFrameLayout aspectRatioFrameLayout, PlayerView playerView, @@ -1627,7 +1606,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler nsfwTextView, spoilerTextView, flairTextView, - awardsTextView, upvoteRatioTextView, contentMarkdownView, bottomConstraintLayout, @@ -1871,7 +1849,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailVideoAutoplay, binding.spoilerCustomTextViewItemPostDetailVideoAutoplay, binding.flairCustomTextViewItemPostDetailVideoAutoplay, - binding.awardsTextViewItemPostDetailVideoAutoplay, binding.upvoteRatioTextViewItemPostDetailVideoAutoplay, binding.aspectRatioFrameLayoutItemPostDetailVideoAutoplay, binding.playerViewItemPostDetailVideoAutoplay, @@ -1909,7 +1886,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailVideoAutoplay, binding.spoilerCustomTextViewItemPostDetailVideoAutoplay, binding.flairCustomTextViewItemPostDetailVideoAutoplay, - binding.awardsTextViewItemPostDetailVideoAutoplay, binding.upvoteRatioTextViewItemPostDetailVideoAutoplay, binding.aspectRatioFrameLayoutItemPostDetailVideoAutoplay, binding.playerViewItemPostDetailVideoAutoplay, @@ -1950,7 +1926,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailVideoAndGifPreview, binding.spoilerCustomTextViewItemPostDetailVideoAndGifPreview, binding.flairCustomTextViewItemPostDetailVideoAndGifPreview, - binding.awardsTextViewItemPostDetailVideoAndGifPreview, binding.upvoteRatioTextViewItemPostDetailVideoAndGifPreview, binding.contentMarkdownViewItemPostDetailVideoAndGifPreview, binding.bottomConstraintLayoutItemPostDetailVideoAndGifPreview, @@ -2025,7 +2000,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailImageAndGifAutoplay, binding.spoilerCustomTextViewItemPostDetailImageAndGifAutoplay, binding.flairCustomTextViewItemPostDetailImageAndGifAutoplay, - binding.awardsTextViewItemPostDetailImageAndGifAutoplay, binding.upvoteRatioTextViewItemPostDetailImageAndGifAutoplay, binding.contentMarkdownViewItemPostDetailImageAndGifAutoplay, binding.bottomConstraintLayoutItemPostDetailImageAndGifAutoplay, @@ -2083,7 +2057,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailLink, binding.spoilerCustomTextViewItemPostDetailLink, binding.flairCustomTextViewItemPostDetailLink, - binding.awardsTextViewItemPostDetailLink, binding.upvoteRatioTextViewItemPostDetailLink, binding.contentMarkdownViewItemPostDetailLink, binding.bottomConstraintLayoutItemPostDetailLink, @@ -2130,7 +2103,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailNoPreview, binding.spoilerCustomTextViewItemPostDetailNoPreview, binding.flairCustomTextViewItemPostDetailNoPreview, - binding.awardsTextViewItemPostDetailNoPreview, binding.upvoteRatioTextViewItemPostDetailNoPreview, binding.contentMarkdownViewItemPostDetailNoPreview, binding.bottomConstraintLayoutItemPostDetailNoPreview, @@ -2223,7 +2195,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailGallery, binding.spoilerCustomTextViewItemPostDetailGallery, binding.flairCustomTextViewItemPostDetailGallery, - binding.awardsTextViewItemPostDetailGallery, binding.upvoteRatioTextViewItemPostDetailGallery, binding.contentMarkdownViewItemPostDetailGallery, binding.bottomConstraintLayoutItemPostDetailGallery, @@ -2364,7 +2335,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler binding.nsfwTextViewItemPostDetailText, binding.spoilerCustomTextViewItemPostDetailText, binding.flairCustomTextViewItemPostDetailText, - binding.awardsTextViewItemPostDetailText, binding.upvoteRatioTextViewItemPostDetailText, binding.contentMarkdownViewItemPostDetailText, binding.bottomConstraintLayoutItemPostDetailText, diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java index 4336129b..b069c8df 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java @@ -199,8 +199,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie private int mSpoilerTextColor; private int mFlairBackgroundColor; private int mFlairTextColor; - private int mAwardsBackgroundColor; - private int mAwardsTextColor; private int mNSFWBackgroundColor; private int mNSFWTextColor; private int mArchivedIconTint; @@ -242,7 +240,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie private boolean mMarkPostsAsReadOnScroll; private boolean mHidePostType; private boolean mHidePostFlair; - private boolean mHideTheNumberOfAwards; private boolean mHideSubredditAndUserPrefix; private boolean mHideTheNumberOfVotes; private boolean mHideTheNumberOfComments; @@ -324,7 +321,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie mHidePostType = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_POST_TYPE, false); mHidePostFlair = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_POST_FLAIR, false); - mHideTheNumberOfAwards = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_AWARDS, false); mHideSubredditAndUserPrefix = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_SUBREDDIT_AND_USER_PREFIX, false); mHideTheNumberOfVotes = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_VOTES, false); mHideTheNumberOfComments = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_COMMENTS, false); @@ -358,8 +354,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie mSpoilerTextColor = customThemeWrapper.getSpoilerTextColor(); mFlairBackgroundColor = customThemeWrapper.getFlairBackgroundColor(); mFlairTextColor = customThemeWrapper.getFlairTextColor(); - mAwardsBackgroundColor = customThemeWrapper.getAwardsBackgroundColor(); - mAwardsTextColor = customThemeWrapper.getAwardsTextColor(); mNSFWBackgroundColor = customThemeWrapper.getNsfwBackgroundColor(); mNSFWTextColor = customThemeWrapper.getNsfwTextColor(); mArchivedIconTint = customThemeWrapper.getArchivedIconTint(); @@ -763,15 +757,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } } - if (post.getNAwards() > 0 && !mHideTheNumberOfAwards) { - ((PostBaseViewHolder) holder).awardsTextView.setVisibility(View.VISIBLE); - if (post.getNAwards() == 1) { - ((PostBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.one_award)); - } else { - ((PostBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.n_awards, post.getNAwards())); - } - } - switch (post.getVoteType()) { case 1: //Upvoted @@ -1197,7 +1182,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie boolean nsfw = post.isNSFW(); boolean spoiler = post.isSpoiler(); String flair = post.getFlair(); - int nAwards = post.getNAwards(); boolean isArchived = post.isArchived(); if (mDisplaySubredditName) { @@ -1368,15 +1352,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } } - if (nAwards > 0 && !mHideTheNumberOfAwards) { - ((PostCompactBaseViewHolder) holder).awardsTextView.setVisibility(View.VISIBLE); - if (nAwards == 1) { - ((PostCompactBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.one_award)); - } else { - ((PostCompactBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.n_awards, nAwards)); - } - } - switch (post.getVoteType()) { case 1: //Upvoted @@ -2309,10 +2284,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie mHidePostFlair = hidePostFlair; } - public void setHideTheNumberOfAwards(boolean hideTheNumberOfAwards) { - mHideTheNumberOfAwards = hideTheNumberOfAwards; - } - public void setHideSubredditAndUserPrefix(boolean hideSubredditAndUserPrefix) { mHideSubredditAndUserPrefix = hideSubredditAndUserPrefix; } @@ -2429,8 +2400,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostBaseViewHolder) holder).spoilerTextView.setVisibility(View.GONE); ((PostBaseViewHolder) holder).flairTextView.setText(""); ((PostBaseViewHolder) holder).flairTextView.setVisibility(View.GONE); - ((PostBaseViewHolder) holder).awardsTextView.setText(""); - ((PostBaseViewHolder) holder).awardsTextView.setVisibility(View.GONE); ((PostBaseViewHolder) holder).upvoteButton.setIconResource(R.drawable.ic_upvote_24dp); ((PostBaseViewHolder) holder).upvoteButton.setIconTint(ColorStateList.valueOf(mPostIconAndInfoColor)); ((PostBaseViewHolder) holder).scoreTextView.setTextColor(mPostIconAndInfoColor); @@ -2457,8 +2426,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ((PostCompactBaseViewHolder) holder).spoilerTextView.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).flairTextView.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).flairTextView.setText(""); - ((PostCompactBaseViewHolder) holder).awardsTextView.setVisibility(View.GONE); - ((PostCompactBaseViewHolder) holder).awardsTextView.setText(""); ((PostCompactBaseViewHolder) holder).linkTextView.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).progressBar.setVisibility(View.GONE); ((PostCompactBaseViewHolder) holder).imageView.setVisibility(View.GONE); @@ -2709,7 +2676,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView; CustomTextView spoilerTextView; CustomTextView flairTextView; - CustomTextView awardsTextView; ConstraintLayout bottomConstraintLayout; MaterialButton upvoteButton; TextView scoreTextView; @@ -2740,7 +2706,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, ConstraintLayout bottomConstraintLayout, MaterialButton upvoteButton, TextView scoreTextView, @@ -2761,7 +2726,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie this.nsfwTextView = nsfwTextView; this.spoilerTextView = spoilerTextView; this.flairTextView = flairTextView; - this.awardsTextView = awardsTextView; this.bottomConstraintLayout = bottomConstraintLayout; this.upvoteButton = upvoteButton; this.scoreTextView = scoreTextView; @@ -2803,7 +2767,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie spoilerTextView.setTypeface(mActivity.typeface); nsfwTextView.setTypeface(mActivity.typeface); flairTextView.setTypeface(mActivity.typeface); - awardsTextView.setTypeface(mActivity.typeface); upvoteButton.setTypeface(mActivity.typeface); commentsCountButton.setTypeface(mActivity.typeface); } @@ -2828,9 +2791,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie flairTextView.setBackgroundColor(mFlairBackgroundColor); flairTextView.setBorderColor(mFlairBackgroundColor); flairTextView.setTextColor(mFlairTextColor); - awardsTextView.setBackgroundColor(mAwardsBackgroundColor); - awardsTextView.setBorderColor(mAwardsBackgroundColor); - awardsTextView.setTextColor(mAwardsTextColor); archivedImageView.setColorFilter(mArchivedIconTint, PorterDuff.Mode.SRC_IN); lockedImageView.setColorFilter(mLockedIconTint, PorterDuff.Mode.SRC_IN); crosspostImageView.setColorFilter(mCrosspostIconTint, PorterDuff.Mode.SRC_IN); @@ -3277,7 +3237,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, ConstraintLayout bottomConstraintLayout, MaterialButton upvoteButton, TextView scoreTextView, @@ -3289,7 +3248,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie setBaseView(iconGifImageView, subredditTextView, userTextView, stickiedPostImageView, postTimeTextView, titleTextView, typeTextView, archivedImageView, lockedImageView, crosspostImageView, - nsfwTextView, spoilerTextView, flairTextView, awardsTextView, bottomConstraintLayout, + nsfwTextView, spoilerTextView, flairTextView, bottomConstraintLayout, upvoteButton, scoreTextView, downvoteButton, commentsCountButton, saveButton, shareButton); } @@ -3348,7 +3307,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, AspectRatioFrameLayout aspectRatioFrameLayout, GifImageView previewImageView, ImageView errorLoadingGfycatImageView, @@ -3380,7 +3338,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie nsfwTextView, spoilerTextView, flairTextView, - awardsTextView, bottomConstraintLayout, upvoteButton, scoreTextView, @@ -3637,7 +3594,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostVideoTypeAutoplay, binding.spoilerCustomTextViewItemPostVideoTypeAutoplay, binding.flairCustomTextViewItemPostVideoTypeAutoplay, - binding.awardsTextViewItemPostVideoTypeAutoplay, binding.aspectRatioFrameLayoutItemPostVideoTypeAutoplay, binding.previewImageViewItemPostVideoTypeAutoplay, binding.errorLoadingGfycatImageViewItemPostVideoTypeAutoplay, @@ -3673,7 +3629,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostVideoTypeAutoplay, binding.spoilerCustomTextViewItemPostVideoTypeAutoplay, binding.flairCustomTextViewItemPostVideoTypeAutoplay, - binding.awardsTextViewItemPostVideoTypeAutoplay, binding.aspectRatioFrameLayoutItemPostVideoTypeAutoplay, binding.previewImageViewItemPostVideoTypeAutoplay, binding.errorLoadingGfycatImageViewItemPostVideoTypeAutoplay, @@ -3714,7 +3669,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostWithPreview, binding.spoilerCustomTextViewItemPostWithPreview, binding.flairCustomTextViewItemPostWithPreview, - binding.awardsTextViewItemPostWithPreview, binding.bottomConstraintLayoutItemPostWithPreview, binding.upvoteButtonItemPostWithPreview, binding.scoreTextViewItemPostWithPreview, @@ -3798,7 +3752,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, FrameLayout frameLayout, RecyclerView galleryRecyclerView, CustomTextView imageIndexTextView, @@ -3826,7 +3779,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie nsfwTextView, spoilerTextView, flairTextView, - awardsTextView, bottomConstraintLayout, upvoteButton, scoreTextView, @@ -3976,7 +3928,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostGalleryType, binding.spoilerTextViewItemPostGalleryType, binding.flairTextViewItemPostGalleryType, - binding.awardsTextViewItemPostGalleryType, binding.galleryFrameLayoutItemPostGalleryType, binding.galleryRecyclerViewItemPostGalleryType, binding.imageIndexTextViewItemPostGalleryType, @@ -4013,7 +3964,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostTextType, binding.spoilerCustomTextViewItemPostTextType, binding.flairCustomTextViewItemPostTextType, - binding.awardsTextViewItemPostTextType, binding.bottomConstraintLayoutItemPostTextType, binding.upvoteButtonItemPostTextType, binding.scoreTextViewItemPostTextType, @@ -4043,7 +3993,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView; CustomTextView spoilerTextView; CustomTextView flairTextView; - CustomTextView awardsTextView; TextView linkTextView; RelativeLayout relativeLayout; ProgressBar progressBar; @@ -4082,7 +4031,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, TextView linkTextView, RelativeLayout relativeLayout, ProgressBar progressBar, @@ -4112,7 +4060,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie this.nsfwTextView = nsfwTextView; this.spoilerTextView = spoilerTextView; this.flairTextView = flairTextView; - this.awardsTextView = awardsTextView; this.linkTextView = linkTextView; this.relativeLayout = relativeLayout; this.progressBar = progressBar; @@ -4160,7 +4107,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie spoilerTextView.setTypeface(mActivity.typeface); nsfwTextView.setTypeface(mActivity.typeface); flairTextView.setTypeface(mActivity.typeface); - awardsTextView.setTypeface(mActivity.typeface); linkTextView.setTypeface(mActivity.typeface); upvoteButton.setTypeface(mActivity.typeface); commentsCountButton.setTypeface(mActivity.typeface); @@ -4185,9 +4131,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie flairTextView.setBackgroundColor(mFlairBackgroundColor); flairTextView.setBorderColor(mFlairBackgroundColor); flairTextView.setTextColor(mFlairTextColor); - awardsTextView.setBackgroundColor(mAwardsBackgroundColor); - awardsTextView.setBorderColor(mAwardsBackgroundColor); - awardsTextView.setTextColor(mAwardsTextColor); archivedImageView.setColorFilter(mArchivedIconTint, PorterDuff.Mode.SRC_IN); lockedImageView.setColorFilter(mLockedIconTint, PorterDuff.Mode.SRC_IN); crosspostImageView.setColorFilter(mCrosspostIconTint, PorterDuff.Mode.SRC_IN); @@ -4670,7 +4613,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostCompact, binding.spoilerCustomTextViewItemPostCompact, binding.flairCustomTextViewItemPostCompact, - binding.awardsTextViewItemPostCompact, binding.linkTextViewItemPostCompact, binding.imageViewWrapperItemPostCompact, binding.progressBarItemPostCompact, @@ -4707,7 +4649,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostCompactRightThumbnail, binding.spoilerCustomTextViewItemPostCompactRightThumbnail, binding.flairCustomTextViewItemPostCompactRightThumbnail, - binding.awardsTextViewItemPostCompactRightThumbnail, binding.linkTextViewItemPostCompactRightThumbnail, binding.imageViewWrapperItemPostCompactRightThumbnail, binding.progressBarItemPostCompactRightThumbnail, @@ -5071,7 +5012,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie CustomTextView nsfwTextView, CustomTextView spoilerTextView, CustomTextView flairTextView, - CustomTextView awardsTextView, AspectRatioFrameLayout aspectRatioFrameLayout, GifImageView previewImageView, ImageView errorLoadingGfycatImageView, @@ -5104,7 +5044,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie nsfwTextView, spoilerTextView, flairTextView, - awardsTextView, bottomConstraintLayout, upvoteButton, scoreTextView, @@ -5362,7 +5301,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostCard2VideoAutoplay, binding.spoilerCustomTextViewItemPostCard2VideoAutoplay, binding.flairCustomTextViewItemPostCard2VideoAutoplay, - binding.awardsTextViewItemPostCard2VideoAutoplay, binding.aspectRatioFrameLayoutItemPostCard2VideoAutoplay, binding.previewImageViewItemPostCard2VideoAutoplay, binding.errorLoadingGfycatImageViewItemPostCard2VideoAutoplay, @@ -5399,7 +5337,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostCard2VideoAutoplay, binding.spoilerCustomTextViewItemPostCard2VideoAutoplay, binding.flairCustomTextViewItemPostCard2VideoAutoplay, - binding.awardsTextViewItemPostCard2VideoAutoplay, binding.aspectRatioFrameLayoutItemPostCard2VideoAutoplay, binding.previewImageViewItemPostCard2VideoAutoplay, binding.errorLoadingGfycatImageViewItemPostCard2VideoAutoplay, @@ -5441,7 +5378,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostCard2WithPreview, binding.spoilerCustomTextViewItemPostCard2WithPreview, binding.flairCustomTextViewItemPostCard2WithPreview, - binding.awardsTextViewItemPostCard2WithPreview, binding.bottomConstraintLayoutItemPostCard2WithPreview, binding.upvoteButtonItemPostCard2WithPreview, binding.scoreTextViewItemPostCard2WithPreview, @@ -5521,7 +5457,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostCard2GalleryType, binding.spoilerCustomTextViewItemPostCard2GalleryType, binding.flairCustomTextViewItemPostCard2GalleryType, - binding.awardsTextViewItemPostCard2GalleryType, binding.galleryFrameLayoutItemPostCard2GalleryType, binding.galleryRecyclerViewItemPostCard2GalleryType, binding.imageIndexTextViewItemPostCard2GalleryType, @@ -5560,7 +5495,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie binding.nsfwTextViewItemPostCard2Text, binding.spoilerCustomTextViewItemPostCard2Text, binding.flairCustomTextViewItemPostCard2Text, - binding.awardsTextViewItemPostCard2Text, binding.bottomConstraintLayoutItemPostCard2Text, binding.upvoteButtonItemPostCard2Text, binding.scoreTextViewItemPostCard2Text, diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java index c8bb5298..f7093b7b 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java @@ -272,16 +272,6 @@ public class CustomThemeWrapper { getDefaultColor("#FFFFFF", "#FFFFFF", "#FFFFFF")); } - public int getAwardsBackgroundColor() { - return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.AWARDS_BACKGROUND_COLOR, - getDefaultColor("#EEAB02", "#EEAB02", "#EEAB02")); - } - - public int getAwardsTextColor() { - return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.AWARDS_TEXT_COLOR, - getDefaultColor("#FFFFFF", "#FFFFFF", "#FFFFFF")); - } - public int getArchivedIconTint() { return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.ARCHIVED_ICON_TINT, getDefaultColor("#B4009F", "#B4009F", "#B4009F")); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHideTheNumberOfAwardsEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHideTheNumberOfAwardsEvent.java deleted file mode 100644 index ef9330af..00000000 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHideTheNumberOfAwardsEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package ml.docilealligator.infinityforreddit.events; - -public class ChangeHideTheNumberOfAwardsEvent { - public boolean hideTheNumberOfAwards; - - public ChangeHideTheNumberOfAwardsEvent(boolean hideTheNumberOfAwards) { - this.hideTheNumberOfAwards = hideTheNumberOfAwards; - } -} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java index bdb0b004..67c158b6 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/HistoryPostFragment.java @@ -93,7 +93,6 @@ import ml.docilealligator.infinityforreddit.events.ChangeHidePostFlairEvent; import ml.docilealligator.infinityforreddit.events.ChangeHidePostTypeEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideSubredditAndUserPrefixEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTextPostContent; -import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfAwardsEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfCommentsEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfVotesEvent; import ml.docilealligator.infinityforreddit.events.ChangeLongPressToHideToolbarInCompactLayoutEvent; @@ -1312,14 +1311,6 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato } @Subscribe - public void onChangeHideTheNumberOfAwardsEvent(ChangeHideTheNumberOfAwardsEvent event) { - if (mAdapter != null) { - mAdapter.setHideTheNumberOfAwards(event.hideTheNumberOfAwards); - refreshAdapter(); - } - } - - @Subscribe public void onChangeHideSubredditAndUserEvent(ChangeHideSubredditAndUserPrefixEvent event) { if (mAdapter != null) { mAdapter.setHideSubredditAndUserPrefix(event.hideSubredditAndUserPrefix); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java index 06eef725..322c5088 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java @@ -103,7 +103,6 @@ import ml.docilealligator.infinityforreddit.events.ChangeHidePostFlairEvent; import ml.docilealligator.infinityforreddit.events.ChangeHidePostTypeEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideSubredditAndUserPrefixEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTextPostContent; -import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfAwardsEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfCommentsEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfVotesEvent; import ml.docilealligator.infinityforreddit.events.ChangeLongPressToHideToolbarInCompactLayoutEvent; @@ -2081,14 +2080,6 @@ public class PostFragment extends Fragment implements FragmentCommunicator { } @Subscribe - public void onChangeHideTheNumberOfAwardsEvent(ChangeHideTheNumberOfAwardsEvent event) { - if (mAdapter != null) { - mAdapter.setHideTheNumberOfAwards(event.hideTheNumberOfAwards); - refreshAdapter(); - } - } - - @Subscribe public void onChangeHideSubredditAndUserEvent(ChangeHideSubredditAndUserPrefixEvent event) { if (mAdapter != null) { mAdapter.setHideSubredditAndUserPrefix(event.hideSubredditAndUserPrefix); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java b/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java index 0916775b..137c9fdc 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/post/Post.java @@ -59,8 +59,6 @@ public class Post implements Parcelable { private boolean loadGfyOrStreamableVideoSuccess; private String permalink; private String flair; - private String awards; - private int nAwards; private long postTimeMillis; private int score; private int postType; @@ -106,8 +104,6 @@ public class Post implements Parcelable { this.nComments = nComments; this.upvoteRatio = upvoteRatio; this.flair = flair; - this.awards = awards; - this.nAwards = nAwards; this.hidden = hidden; this.spoiler = spoiler; this.nsfw = nsfw; @@ -145,8 +141,6 @@ public class Post implements Parcelable { this.nComments = nComments; this.upvoteRatio = upvoteRatio; this.flair = flair; - this.awards = awards; - this.nAwards = nAwards; this.hidden = hidden; this.spoiler = spoiler; this.nsfw = nsfw; @@ -188,8 +182,6 @@ public class Post implements Parcelable { loadGfyOrStreamableVideoSuccess = in.readByte() != 0; permalink = in.readString(); flair = in.readString(); - awards = in.readString(); - nAwards = in.readInt(); score = in.readInt(); postType = in.readInt(); voteType = in.readInt(); @@ -408,22 +400,6 @@ public class Post implements Parcelable { return suggestedSort; } - public String getAwards() { - return awards; - } - - public void addAwards(String newAwardsHTML) { - awards += newAwardsHTML; - } - - public int getNAwards() { - return nAwards; - } - - public void addAwards(int newNAwards) { - nAwards += newNAwards; - } - public int getScore() { return score; } @@ -578,8 +554,6 @@ public class Post implements Parcelable { parcel.writeByte((byte) (loadGfyOrStreamableVideoSuccess ? 1 : 0)); parcel.writeString(permalink); parcel.writeString(flair); - parcel.writeString(awards); - parcel.writeInt(nAwards); parcel.writeInt(score); parcel.writeInt(postType); parcel.writeInt(voteType); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java index 464b6d9f..13b8a679 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java @@ -137,12 +137,6 @@ public class PostFilter implements Parcelable { if (postFilter.minComments > 0 && post.getNComments() < postFilter.minComments) { return false; } - if (postFilter.maxAwards > 0 && post.getNAwards() > postFilter.maxAwards) { - return false; - } - if (postFilter.minAwards > 0 && post.getNAwards() < postFilter.minAwards) { - return false; - } if (postFilter.onlyNSFW && !post.isNSFW()) { if (postFilter.onlySpoiler) { return post.isSpoiler(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java index 7f4fe935..af70a9ac 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java @@ -17,7 +17,6 @@ import ml.docilealligator.infinityforreddit.events.ChangeHidePostFlairEvent; import ml.docilealligator.infinityforreddit.events.ChangeHidePostTypeEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideSubredditAndUserPrefixEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTextPostContent; -import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfAwardsEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfCommentsEvent; import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfVotesEvent; import ml.docilealligator.infinityforreddit.events.ChangeLongPressToHideToolbarInCompactLayoutEvent; @@ -41,7 +40,6 @@ public class PostPreferenceFragment extends CustomFontPreferenceFragmentCompat { SwitchPreference postCompactLayoutToolbarHiddenByDefaultSwitch = findPreference(SharedPreferencesUtils.POST_COMPACT_LAYOUT_TOOLBAR_HIDDEN_BY_DEFAULT); SwitchPreference hidePostTypeSwitch = findPreference(SharedPreferencesUtils.HIDE_POST_TYPE); SwitchPreference hidePostFlairSwitch = findPreference(SharedPreferencesUtils.HIDE_POST_FLAIR); - SwitchPreference hideTheNumberOfAwardsSwitch = findPreference(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_AWARDS); SwitchPreference hideSubredditAndUserPrefixSwitch = findPreference(SharedPreferencesUtils.HIDE_SUBREDDIT_AND_USER_PREFIX); SwitchPreference hideTheNumberOfVotesSwitch = findPreference(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_VOTES); SwitchPreference hideTheNumberOfCommentsSwitch = findPreference(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_COMMENTS); @@ -111,13 +109,6 @@ public class PostPreferenceFragment extends CustomFontPreferenceFragmentCompat { }); } - if (hideTheNumberOfAwardsSwitch != null) { - hideTheNumberOfAwardsSwitch.setOnPreferenceChangeListener((preference, newValue) -> { - EventBus.getDefault().post(new ChangeHideTheNumberOfAwardsEvent((Boolean) newValue)); - return true; - }); - } - if (hideSubredditAndUserPrefixSwitch != null) { hideSubredditAndUserPrefixSwitch.setOnPreferenceChangeListener((preference, newValue) -> { EventBus.getDefault().post(new ChangeHideSubredditAndUserPrefixEvent((Boolean) newValue)); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java index 56900dd3..684d9468 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java @@ -178,7 +178,6 @@ public class SharedPreferencesUtils { public static final String CLICK_TO_SHOW_MEDIA_IN_GALLERY_LAYOUT = "click_to_show_media_in_gallery_layout"; public static final String HIDE_POST_TYPE = "hide_post_type"; public static final String HIDE_POST_FLAIR = "hide_post_flair"; - public static final String HIDE_THE_NUMBER_OF_AWARDS = "hide_the_number_of_awards"; public static final String HIDE_SUBREDDIT_AND_USER_PREFIX = "hide_subreddit_and_user_prefix"; public static final String HIDE_THE_NUMBER_OF_VOTES = "hide_the_number_of_votes"; public static final String HIDE_THE_NUMBER_OF_COMMENTS = "hide_the_number_of_comments"; @@ -395,4 +394,5 @@ public class SharedPreferencesUtils { public static final String OPEN_LINK_IN_APP_LEGACY = "open_link_in_app"; public static final String DO_NOT_SHOW_REDDIT_API_INFO_AGAIN_LEGACY = "do_not_show_reddit_api_info_again"; + public static final String HIDE_THE_NUMBER_OF_AWARDS_LEGACY = "hide_the_number_of_awards"; } |