diff options
56 files changed, 26 insertions, 555 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"; } diff --git a/app/src/main/res/layout/item_post_card_2_gallery_type.xml b/app/src/main/res/layout/item_post_card_2_gallery_type.xml index dfc0dd95..a3664c6d 100644 --- a/app/src/main/res/layout/item_post_card_2_gallery_type.xml +++ b/app/src/main/res/layout/item_post_card_2_gallery_type.xml @@ -125,18 +125,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_card_2_gallery_type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_card_2_gallery_type" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_card_2_text.xml b/app/src/main/res/layout/item_post_card_2_text.xml index 3589905b..54d6fefe 100644 --- a/app/src/main/res/layout/item_post_card_2_text.xml +++ b/app/src/main/res/layout/item_post_card_2_text.xml @@ -93,18 +93,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_card_2_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_card_2_text" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml index d92016d1..618d2bff 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml @@ -126,18 +126,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_card_2_video_autoplay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_card_2_video_autoplay" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml index be99cadc..c213b9ee 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml @@ -126,18 +126,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_card_2_video_autoplay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_card_2_video_autoplay" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_card_2_with_preview.xml b/app/src/main/res/layout/item_post_card_2_with_preview.xml index b7964db6..0dddf0ff 100644 --- a/app/src/main/res/layout/item_post_card_2_with_preview.xml +++ b/app/src/main/res/layout/item_post_card_2_with_preview.xml @@ -137,18 +137,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_card_2_with_preview" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_card_2_with_preview" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index 7e82b616..7b2c42af 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -156,18 +156,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="?attr/font_family" - android:padding="4dp" - android:textSize="?attr/font_10" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_compact" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml index d5755e48..d86c8261 100644 --- a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml +++ b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml @@ -218,18 +218,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_compact_right_thumbnail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="?attr/font_family" - android:padding="4dp" - android:textSize="?attr/font_10" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_compact_right_thumbnail" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_detail_gallery.xml b/app/src/main/res/layout/item_post_detail_gallery.xml index 5faf5feb..8790147d 100644 --- a/app/src/main/res/layout/item_post_detail_gallery.xml +++ b/app/src/main/res/layout/item_post_detail_gallery.xml @@ -192,14 +192,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_gallery" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <FrameLayout diff --git a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml index 0fe2ab98..88226537 100644 --- a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml @@ -192,14 +192,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_image_and_gif_autoplay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <RelativeLayout diff --git a/app/src/main/res/layout/item_post_detail_link.xml b/app/src/main/res/layout/item_post_detail_link.xml index cf0f815c..07146487 100644 --- a/app/src/main/res/layout/item_post_detail_link.xml +++ b/app/src/main/res/layout/item_post_detail_link.xml @@ -192,14 +192,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_link" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <TextView diff --git a/app/src/main/res/layout/item_post_detail_no_preview.xml b/app/src/main/res/layout/item_post_detail_no_preview.xml index 4bf6b71a..edeff313 100644 --- a/app/src/main/res/layout/item_post_detail_no_preview.xml +++ b/app/src/main/res/layout/item_post_detail_no_preview.xml @@ -202,14 +202,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_no_preview" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <TextView diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml index fc27afe2..dece9e5b 100644 --- a/app/src/main/res/layout/item_post_detail_text.xml +++ b/app/src/main/res/layout/item_post_detail_text.xml @@ -202,14 +202,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <androidx.constraintlayout.widget.ConstraintLayout diff --git a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml index 48379b62..0a0cbefb 100644 --- a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml +++ b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml @@ -191,14 +191,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_video_and_gif_preview" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <RelativeLayout diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml index 75b86f3f..042b13f7 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml @@ -192,14 +192,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_video_autoplay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <com.google.android.exoplayer2.ui.AspectRatioFrameLayout diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml index 45d61789..5ebbcf6f 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml @@ -192,14 +192,6 @@ android:src="@drawable/crosspost" android:visibility="gone" /> - <TextView - android:id="@+id/awards_text_view_item_post_detail_video_autoplay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> <com.google.android.exoplayer2.ui.AspectRatioFrameLayout diff --git a/app/src/main/res/layout/item_post_gallery_type.xml b/app/src/main/res/layout/item_post_gallery_type.xml index 1e92ecfb..722620c9 100644 --- a/app/src/main/res/layout/item_post_gallery_type.xml +++ b/app/src/main/res/layout/item_post_gallery_type.xml @@ -161,18 +161,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_gallery_type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_gallery_type" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml index 9428b05a..2d67b40d 100644 --- a/app/src/main/res/layout/item_post_text.xml +++ b/app/src/main/res/layout/item_post_text.xml @@ -174,18 +174,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_text_type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_text_type" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml index 598bd146..554ae93e 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml @@ -161,18 +161,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_video_type_autoplay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_video_type_autoplay" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml index 3f5427b3..13131024 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml @@ -161,18 +161,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_video_type_autoplay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_video_type_autoplay" android:layout_width="24dp" diff --git a/app/src/main/res/layout/item_post_with_preview.xml b/app/src/main/res/layout/item_post_with_preview.xml index fcb4e9f4..8e6c0c06 100644 --- a/app/src/main/res/layout/item_post_with_preview.xml +++ b/app/src/main/res/layout/item_post_with_preview.xml @@ -160,18 +160,6 @@ app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_with_preview" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - <ImageView android:id="@+id/archived_image_view_item_post_with_preview" android:layout_width="24dp" diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d2e4e473..6c0980aa 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -743,8 +743,6 @@ Chodí popředu."</string> <string name="delete_multi_reddit">"Odstranit multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d ocenění"</string> - <string name="one_award">"1 ocenění"</string> <string name="report">"Nahlásit"</string> <string name="reporting">"Nahlašování"</string> <string name="report_successful">"Nahlášeno"</string> @@ -969,7 +967,6 @@ Automatické přehrávání videí je zakázáno."</string> <string name="choose_a_user">"Vybrat uživatele"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Klikněte pro zobrazení médií v rozložení galerie"</string> <string name="settings_hide_post_type">"Skrýt typ příspěvků"</string> - <string name="settings_hide_the_number_of_awards">"Skrýt počet ocenění"</string> <string name="settings_hide_subreddit_and_user_prefix">"Skrýt předponu subredditů a uživatelů"</string> <string name="settings_hide_the_number_of_votes">"Skrýt počet hlasů"</string> <string name="settings_hide_the_number_of_comments">"Skrýt počet komentářů"</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6864a314..1424031c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -759,8 +759,6 @@ Basiere auf Indigo-AMOLED-Thema"</string> Sie ist nicht krank oder so, aber sie könnte sich definitiv bessern."</string> <string name="edit_multi_reddit">"Multireddit bearbeiten"</string> <string name="delete_multi_reddit">"Multireddit löschen"</string> - <string name="n_awards">"%1$,d Auszeichnungen"</string> - <string name="one_award">"1 Auszeichnung"</string> <string name="report">"Melden"</string> <string name="reporting">"Melde"</string> <string name="report_successful">"Gemeldet"</string> @@ -1006,7 +1004,6 @@ Automatisches Abspielen von Videos ist deaktiviert."</string> <string name="choose_a_user">"Wähle einen Benutzer"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Antippen, um die Medien in der Galerie-Ansicht anzuzeigen"</string> <string name="settings_hide_post_type">"Beitragsart verstecken"</string> - <string name="settings_hide_the_number_of_awards">"Anzahl der Auszeichnungen verstecken"</string> <string name="settings_hide_subreddit_and_user_prefix">"Subreddit und Benutzerpräfix verstecken"</string> <string name="settings_hide_the_number_of_votes">"Anzahl der Abstimmungen verstecken"</string> <string name="settings_hide_the_number_of_comments">"Anzahl der Kommentare verstecken"</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 38da5ef2..7cc39f15 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -689,8 +689,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd Δεν είναι άρρωστη ή κάτι, αλλά σίγουρα θα μπορούσε να γίνει καλύτερα."</string> <string name="edit_multi_reddit">"Επεξεργασία Multireddit"</string> <string name="delete_multi_reddit">"Διαγραφή Multireddit"</string> - <string name="n_awards">"%1$,d Βραβεία"</string> - <string name="one_award">"1 Βραβείο"</string> <string name="report">"Αναφορά"</string> <string name="reporting">"Αναφέρεται"</string> <string name="report_successful">"Αναφέρθηκε"</string> @@ -913,7 +911,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="choose_a_user">"Επιλέξτε έναν χρηστη"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Κάντε κλικ για Εμφάνιση Πολυμέσων στη Διάταξη Συλλογής"</string> <string name="settings_hide_post_type">"Απόκρυψη Τύπου Ανάρτησης"</string> - <string name="settings_hide_the_number_of_awards">"Απόκρυψη Αριθμού των Βραβείων"</string> <string name="settings_hide_subreddit_and_user_prefix">"Απόκρυψη Subreddit και προθέματος Χρήστη"</string> <string name="settings_hide_the_number_of_votes">"Απόκρυψη Αριθμού Ψήφων"</string> <string name="settings_hide_the_number_of_comments">"Απόκρυψη Αριθμού Σχολίων"</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1652b31a..f7d1c719 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -784,8 +784,6 @@ No está enferma ni nada, pero definitivamente podría mejorar."</string> <string name="delete_multi_reddit">"Borrar multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d Premios"</string> - <string name="one_award">"1 Premio"</string> <string name="report">"Reportar"</string> <string name="reporting">"Reportando"</string> <string name="report_successful">"Reportado"</string> @@ -1017,7 +1015,6 @@ https://s3.eu-west-1.amazonaws.com/po-pub/i/hJAe7sMhrfJzqjhp9VkDQOVC.PNG --> <string name="choose_a_user">"Elige un usuario"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Pulsa para mostrar los medios en el diseño de galería"</string> <string name="settings_hide_post_type">"Ocultar el tipo de publicación"</string> - <string name="settings_hide_the_number_of_awards">"Ocultar el número de premios"</string> <string name="settings_hide_subreddit_and_user_prefix">"Ocultar el prefijo de subreddit y de usuario"</string> <string name="settings_hide_the_number_of_votes">"Ocultar el número de votos"</string> <string name="settings_hide_the_number_of_comments">"Ocultar el número de comentarios"</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 995bd836..666d73e3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -828,8 +828,6 @@ Basé sur le thème sombre Indigo"</string> <string name="delete_multi_reddit">"Supprimer le multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d récompenses"</string> - <string name="one_award">"Une récompense"</string> <string name="report">"Signaler"</string> <!-- Not sure about the tense.. --> @@ -1073,7 +1071,6 @@ Les onglets pourraient perdre tout leur contenu quand vous passez d'un onglet à <string name="choose_a_user">"Choisir un utilisateur"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Cliquez pour afficher les médias dans la disposition galerie"</string> <string name="settings_hide_post_type">"Masquer le type de publication"</string> - <string name="settings_hide_the_number_of_awards">"Masquer le nombre de récompenses"</string> <string name="settings_hide_subreddit_and_user_prefix">"Masquer Subreddit et préfixe utilisateur"</string> <string name="settings_hide_the_number_of_votes">"Cacher le Nombre de Votes"</string> <string name="settings_hide_the_number_of_comments">"Cacher le Nombre de Commentaires"</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index ac7049f0..f06553b3 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -810,8 +810,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="delete_multi_reddit">"मल्टीरैडिट्स मिटा दें "</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d पदक "</string> - <string name="one_award">"1 पदक "</string> <string name="report">"रिपोर्ट "</string> <string name="reporting">"रिपोर्ट हो रही है "</string> <string name="report_successful">"रिपोर्ट कर दी गई "</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 4168236f..322cc477 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -777,8 +777,6 @@ Baziraj na Indigo Amoled temi"</string> <string name="delete_multi_reddit">"Obriši Multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d Nagrade/a"</string> - <string name="one_award">"1 Nagrada"</string> <string name="report">"Prijavi"</string> <string name="reporting">"Prijavljivanje"</string> <string name="report_successful">"Prijavljeno"</string> @@ -1002,7 +1000,6 @@ Reddit videi su niže rezolucije."</string> <string name="choose_a_user">"Odaberi korisnika"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Klikni da prikažeš medij u obliku galerije"</string> <string name="settings_hide_post_type">"Sakrij vrstu objave"</string> - <string name="settings_hide_the_number_of_awards">"Sakrij broj nagrada"</string> <string name="settings_hide_the_number_of_votes">"Sakrij broj glasanja"</string> <string name="settings_hide_the_number_of_comments">"Sakrij broj komentara"</string> <string name="post_layout_gallery">"Izgled galerije"</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 519a7cba..3c13336a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -716,8 +716,6 @@ Az alap az indigó amoled téma"</string> <string name="delete_multi_reddit">"Multireddit törlése"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d kitüntetés"</string> - <string name="one_award">"1 kitüntetés"</string> <string name="report">"Jelent"</string> <string name="reporting">"Jelentés"</string> <string name="report_successful">"Jelentve"</string> @@ -948,7 +946,6 @@ Videó autómatikus lejátszása le van tiltva."</string> <string name="choose_a_user">"Felhasználó kiválasztása"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Koppints a média megjelenítéséhez gallléria elrendezésben."</string> <string name="settings_hide_post_type">"Poszt típus elrejtése"</string> - <string name="settings_hide_the_number_of_awards">"Díjak számának elrejtése"</string> <string name="settings_hide_subreddit_and_user_prefix">"Subreddit és felhasználó prefix elrejtése"</string> <string name="settings_hide_the_number_of_votes">"Szavazások számának elrejtése"</string> <string name="settings_hide_the_number_of_comments">"Kommentek számának elrejtése"</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d83da4bf..7130cfdd 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -693,8 +693,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="comment_content_preview">"Non mi fido molto delle statistiche, perché un uomo con la testa nel forno acceso e i piedi nel congelatore statisticamente ha una temperatura media."</string> <string name="edit_multi_reddit">"Modifica multireddit"</string> <string name="delete_multi_reddit">"Cancella Multireddit"</string> - <string name="n_awards">"%1$,d premi"</string> - <string name="one_award">"1 Premio"</string> <string name="report">"Segnala"</string> <string name="reporting">"Segnala"</string> <string name="report_successful">"Segnalato"</string> @@ -917,7 +915,6 @@ La riproduzione automatica video è disabilitata."</string> <string name="choose_a_user">"Seleziona un utente"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Clicca per mostrare i media nel layout a galleria"</string> <string name="settings_hide_post_type">"Nascondi tipo di post"</string> - <string name="settings_hide_the_number_of_awards">"Nascondi numero di premi"</string> <string name="settings_hide_subreddit_and_user_prefix">"Nascondi subreddit e prefisso utente"</string> <string name="settings_hide_the_number_of_votes">"Nascondi numero di voti"</string> <string name="settings_hide_the_number_of_comments">"Nascondi numero di commenti"</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 946dd85c..3e409923 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -822,8 +822,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="delete_multi_reddit">"カスタムフィードを削除"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d個のアワード"</string> - <string name="one_award">"1個のアワード"</string> <string name="report">"通報"</string> <string name="reporting">"通報しています"</string> <string name="report_successful">"通報しました"</string> @@ -1041,7 +1039,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="choose_a_user">"ユーザーを選択"</string> <string name="settings_click_to_show_media_in_gallery_layout">"クリックしてギャラリービューでメディアを見る"</string> <string name="settings_hide_post_type">"投稿の種類を非表示にする"</string> - <string name="settings_hide_the_number_of_awards">"Awardsの数を非表示にする"</string> <string name="settings_hide_the_number_of_comments">"コメント数を非表示にする"</string> <string name="post_layout_gallery">"ギャラリーレイアウト"</string> <string name="post_layout_card_2">"カードレイアウト2"</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9619e200..4d9b3405 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -751,8 +751,6 @@ Ze is niet ziek of zo, maar ze kan zeker beter worden."</string> <string name="delete_multi_reddit">"Verwijder Multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d Awards"</string> - <string name="one_award">"1 Award"</string> <string name="report">"Meld"</string> <string name="reporting">"Aan het melden"</string> <string name="report_successful">"Gemeld"</string> @@ -977,7 +975,6 @@ Automatisch afspelen van video is uitgeschakeld."</string> <string name="choose_a_user">"Kies een gebruiker"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Klik om Media in Gallerij Lay-Out te Tonen"</string> <string name="settings_hide_post_type">"Verberg Post Type"</string> - <string name="settings_hide_the_number_of_awards">"Verberg het Aantal Awards"</string> <string name="settings_hide_the_number_of_votes">"Verberg het Aantal Stemmen"</string> <string name="settings_hide_the_number_of_comments">"Verberg het aantal reacties"</string> <string name="post_layout_gallery">"Gallerij Lay-Out"</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 3e09a9fa..18f0a027 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -743,8 +743,6 @@ Nie jest chora ani nic, ale na pewno może stać się lepsza."</string> <string name="delete_multi_reddit">"Usuń Multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d Nagród"</string> - <string name="one_award">"1 Nagroda"</string> <string name="report">"Zgłoś"</string> <string name="reporting">"Zagłaszanie"</string> <string name="report_successful">"Zgłoszono"</string> @@ -968,7 +966,6 @@ użytkownika / multireddita"</string> <string name="choose_a_user">"Wybierz użytkownika"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Kliknij by pokazać media w układzie galerii"</string> <string name="settings_hide_post_type">"Ukryj typ posta"</string> - <string name="settings_hide_the_number_of_awards">"Ukryj liczbę nagród"</string> <string name="settings_hide_subreddit_and_user_prefix">"Ukryj prefix subbredita i użytkownika"</string> <string name="settings_hide_the_number_of_votes">"Ukryj liczbę głosów"</string> <string name="settings_hide_the_number_of_comments">"Ukryj liczbę komentarzy"</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index fce347aa..73364184 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -729,8 +729,6 @@ Baseado no tema Índigo AMOLED"</string> Ela não está doente ou algo assim, mas definitivamente poderia melhorar."</string> <string name="edit_multi_reddit">"Editar Multireddit"</string> <string name="delete_multi_reddit">"Excluir Multireddit"</string> - <string name="n_awards">"%1$,d prêmios"</string> - <string name="one_award">"1 Prêmio"</string> <string name="report">"Reportar"</string> <string name="reporting">"Reportando"</string> <string name="report_successful">"Reportado"</string> @@ -955,7 +953,6 @@ A reprodução automática de vídeos fica desativada."</string> <string name="choose_a_user">"Escolha um usuário"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Clicar para exibir mídia na estrutura de galeria"</string> <string name="settings_hide_post_type">"Ocultar tipo de postagem"</string> - <string name="settings_hide_the_number_of_awards">"Ocultar o Número de Prêmios"</string> <string name="settings_hide_subreddit_and_user_prefix">"Ocultar prefixos do subreddit e do usuário"</string> <string name="settings_hide_the_number_of_votes">"Ocultar o número de votos"</string> <string name="settings_hide_the_number_of_comments">"Ocultar o Número de Comentários"</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1c704e68..acc1e76b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -740,8 +740,6 @@ Ela não está doente nem nada, mas certamente poderá melhorar."</string> <string name="delete_multi_reddit">"Eliminar Multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d Prémios"</string> - <string name="one_award">"1 Prémio"</string> <string name="report">"Denunciar"</string> <string name="reporting">"A denunciar"</string> <string name="report_successful">"Denunciado"</string> @@ -964,7 +962,6 @@ Reprodução automática de vídeos desativada."</string> <string name="choose_a_user">"Escolher um utilizador"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Clicar para Mostrar Média na Visualização Galeria"</string> <string name="settings_hide_post_type">"Esconder Tipo de Publicação"</string> - <string name="settings_hide_the_number_of_awards">"Esconder Número de Prémios"</string> <string name="settings_hide_subreddit_and_user_prefix">"Esconder Prefixos de Comunidades e Utilizador"</string> <string name="settings_hide_the_number_of_votes">"Esconder Número de Votos"</string> <string name="settings_hide_the_number_of_comments">"Esconder Número de Comentários"</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 68fff571..405cf27e 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -735,8 +735,6 @@ Nu e bolnavă sau ceva de genul, dar cu siguranță ar putea să se facă bine." <string name="delete_multi_reddit">"Șterge Multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d Premii"</string> - <string name="one_award">"1 Premiu"</string> <string name="report">"Raportează"</string> <string name="reporting">"Se raportează"</string> <string name="report_successful">"Raportat"</string> @@ -961,7 +959,6 @@ Redarea automată a videoclipurilor este dezactivată."</string> <string name="choose_a_user">"Alege un utilizator"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Apăsă pentru a Afișa Fișierele Media din Galerie"</string> <string name="settings_hide_post_type">"Ascunde Tipul de Postare"</string> - <string name="settings_hide_the_number_of_awards">"Ascunde Numărul de Premii"</string> <string name="settings_hide_subreddit_and_user_prefix">"Ascunde Prefixul Subreddit-urilor și Utilizatorilor"</string> <string name="settings_hide_the_number_of_votes">"Ascunde Numărul de Voturi"</string> <string name="settings_hide_the_number_of_comments">"Ascunde Numărul de Comentarii"</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a443bac6..dcbf0146 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -751,8 +751,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="delete_multi_reddit">"Удалить мультиреддит"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d наград"</string> - <string name="one_award">"1 награда"</string> <string name="report">"Пожаловаться"</string> <string name="reporting">"Жалоба отправляется"</string> <string name="report_successful">"Жалоба отправлена"</string> @@ -977,7 +975,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="choose_a_user">"Выберите пользователя"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Открывать мультимедиа нажатием в режиме галереи"</string> <string name="settings_hide_post_type">"Скрыть тип поста"</string> - <string name="settings_hide_the_number_of_awards">"Скрыть количество наград"</string> <string name="settings_hide_subreddit_and_user_prefix">"Скрыть префикс сабреддита и пользователя"</string> <string name="settings_hide_the_number_of_votes">"Скрыть количество голосов"</string> <string name="settings_hide_the_number_of_comments">"Скрыть количество комментариев"</string> diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 57ecd524..16dee245 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -522,8 +522,6 @@ <string name="delete_multi_reddit">"பல்ரெட்டிட்டை அழி"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d விருதுகள்"</string> - <string name="one_award">"1 விருது"</string> <string name="report">"புகாரளி"</string> <string name="reporting">"புகாரளிக்கிறது"</string> <string name="report_successful">"புகாரளிக்கப்பட்டது"</string> @@ -656,7 +654,6 @@ <string name="read_all_messages_failed">"எல்லா தகவல்களையும் வாசிக்க இயலவில்லை"</string> <string name="choose_a_user">"பயனரைத் தெரிவுசெய்"</string> <string name="settings_hide_post_type">"இடுகை வகையை மறை"</string> - <string name="settings_hide_the_number_of_awards">"விருது எண்ணிக்கையை மறை"</string> <string name="settings_hide_the_number_of_votes">"வாக்கெண்ணிக்கையை மறை"</string> <string name="settings_hide_the_number_of_comments">"கருத்தெண்ணிக்கையை மறை"</string> <string name="post_layout_gallery">"காட்சியக தளவமைப்பு"</string> diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index ce62d458..046bcbeb 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -743,8 +743,6 @@ Amoled Tema Şablonu Oluştur"</string> <string name="delete_multi_reddit">"Multireddit'i Sil"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d Ödül"</string> - <string name="one_award">"1 Ödül"</string> <string name="report">"Bildir"</string> <string name="reporting">"Bildiriliyor"</string> <string name="report_successful">"Bildirildi"</string> @@ -985,7 +983,6 @@ Otomatik video oynatma kapatılır."</string> <string name="choose_a_user">"Bir kullanıcı seç"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Medyayı Galeri Düzeninde Göstermek İçin Tıkla"</string> <string name="settings_hide_post_type">"Gönderi Türünü Gizle"</string> - <string name="settings_hide_the_number_of_awards">"Ödül Sayısını Gizle"</string> <string name="settings_hide_subreddit_and_user_prefix">"Subreddit ve Kullanıcı Önekini Gizle"</string> <string name="settings_hide_the_number_of_votes">"Oy Sayısını Gizle"</string> <string name="settings_hide_the_number_of_comments">"Yorum Sayısını Gizle"</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 924c7940..c097c267 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -739,8 +739,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="delete_multi_reddit">"Видалити мультиредит"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d нагород"</string> - <string name="one_award">"1 нагорода"</string> <string name="report">"Повідомити"</string> <string name="reporting">"Звітування"</string> <string name="report_successful">"Відзвітовано"</string> @@ -965,7 +963,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="choose_a_user">"Оберіть користувача"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Клацнути, щоб показати медія у вигляді галереї"</string> <string name="settings_hide_post_type">"Ховати тип дописів"</string> - <string name="settings_hide_the_number_of_awards">"Ховати кількість нагород"</string> <string name="settings_hide_subreddit_and_user_prefix">"Ховати префікс сабредитів і користувачів"</string> <string name="settings_hide_the_number_of_votes">"Ховати кількість голосів"</string> <string name="settings_hide_the_number_of_comments">"Ховати кількість коментарів"</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6f2cfc1e..ed162dec 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -752,8 +752,6 @@ Cô ta không ốm hay gì cả, nhưng cô ấy chắc chắn có thể khá h <string name="delete_multi_reddit">"Xoá Multireddit"</string> <!-- Fuzzy --> - <string name="n_awards">"%1$d giải thưởng"</string> - <string name="one_award">"1 giải thưởng"</string> <string name="report">"Báo cáo"</string> <string name="reporting">"Đang báo cáo"</string> <string name="report_successful">"Đã báo cáo"</string> @@ -978,7 +976,6 @@ Tự động phát video bị tắt."</string> <string name="choose_a_user">"Chọn người dùng"</string> <string name="settings_click_to_show_media_in_gallery_layout">"Nhấn để hiện phương tiện trong bố cục thư viện"</string> <string name="settings_hide_post_type">"Ẩn loại bài đăng"</string> - <string name="settings_hide_the_number_of_awards">"Ẩn số lượng giải thưởng"</string> <string name="settings_hide_subreddit_and_user_prefix">"Ẩn subreddit và tiền tố người dùng"</string> <string name="settings_hide_the_number_of_votes">"Ẩn số lượng vote"</string> <string name="settings_hide_the_number_of_comments">"Ẩn số lượng bình luận"</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 26d6aab2..e97b8a3a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -760,8 +760,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd 她没有生病或遇到任何问题，但是她肯定会好起来的。"</string> <string name="edit_multi_reddit">"编辑聚合版块"</string> <string name="delete_multi_reddit">"删除聚合版块"</string> - <string name="n_awards">"%1$d 个奖励"</string> - <string name="one_award">"1 个奖励"</string> <string name="report">"举报"</string> <string name="reporting">"正在举报"</string> <string name="report_successful">"已举报"</string> @@ -992,7 +990,6 @@ Reddit 视频分辨率较低。 <string name="choose_a_user">"选择一个用户"</string> <string name="settings_click_to_show_media_in_gallery_layout">"点击在相册布局中显示媒体"</string> <string name="settings_hide_post_type">"隐藏帖子类型"</string> - <string name="settings_hide_the_number_of_awards">"隐藏奖励数量"</string> <string name="settings_hide_subreddit_and_user_prefix">"隐藏版块与用户前缀"</string> <string name="settings_hide_the_number_of_votes">"隐藏投票数"</string> <string name="settings_hide_the_number_of_comments">"隐藏评论数"</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2c2b96e8..1b66885f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -583,7 +583,6 @@ <string name="settings_click_to_show_media_in_gallery_layout">Click to Show Media in Gallery Layout</string> <string name="settings_hide_post_type">Hide Post Type</string> <string name="settings_hide_post_flair">Hide Post Flair</string> - <string name="settings_hide_the_number_of_awards">Hide the Number of Awards</string> <string name="settings_hide_subreddit_and_user_prefix">Hide Subreddit and User Prefix</string> <string name="settings_hide_the_number_of_votes">Hide the Number of Votes</string> <string name="settings_hide_the_number_of_comments">Hide the Number of Comments</string> @@ -1004,9 +1003,6 @@ <string name="edit_multi_reddit">Edit Multireddit</string> <string name="delete_multi_reddit">Delete Multireddit</string> - <string name="n_awards">%1$,d Awards</string> - <string name="one_award">1 Award</string> - <string name="report">Report</string> <string name="reporting">Reporting</string> <string name="report_successful">Reported</string> diff --git a/app/src/main/res/xml-sw600dp/post_details_preferences.xml b/app/src/main/res/xml-sw600dp/post_details_preferences.xml index cbad3b15..036673f3 100644 --- a/app/src/main/res/xml-sw600dp/post_details_preferences.xml +++ b/app/src/main/res/xml-sw600dp/post_details_preferences.xml @@ -26,11 +26,6 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="false" - app:key="hide_the_number_of_awards" - app:title="@string/settings_hide_the_number_of_awards" /> - - <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference - app:defaultValue="false" app:key="hide_subreddit_and_user_prefix" app:title="@string/settings_hide_subreddit_and_user_prefix" /> diff --git a/app/src/main/res/xml/post_details_preferences.xml b/app/src/main/res/xml/post_details_preferences.xml index cf856634..366b9a98 100644 --- a/app/src/main/res/xml/post_details_preferences.xml +++ b/app/src/main/res/xml/post_details_preferences.xml @@ -25,11 +25,6 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="false" - app:key="hide_the_number_of_awards" - app:title="@string/settings_hide_the_number_of_awards" /> - - <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference - app:defaultValue="false" app:key="hide_subreddit_and_user_prefix" app:title="@string/settings_hide_subreddit_and_user_prefix" /> diff --git a/app/src/main/res/xml/post_preferences.xml b/app/src/main/res/xml/post_preferences.xml index d07b5edd..fde31eb1 100644 --- a/app/src/main/res/xml/post_preferences.xml +++ b/app/src/main/res/xml/post_preferences.xml @@ -34,11 +34,6 @@ <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference app:defaultValue="false" - app:key="hide_the_number_of_awards" - app:title="@string/settings_hide_the_number_of_awards" /> - - <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference - app:defaultValue="false" app:key="hide_subreddit_and_user_prefix" app:title="@string/settings_hide_subreddit_and_user_prefix" /> |