mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-01-01 05:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better post layout on post listing

Browse Source 
This commit fixes the issue where the user and community names had multiple line breaks in them if they were too long. I broke the instance part to a different textview with different colours.
This commit is contained in:
Balazs Toldi 2023-08-16 08:11:23 +02:00
parent 0328f34df2
commit a120fcf068
No known key found for this signature in database
GPG Key ID: 6C7D440036F99D58
14 changed files with 1002 additions and 657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
app/src/main/java/eu/toldi/infinityforlemmy/adapters/PostRecyclerViewAdapter.java
View File

@ -61,6 +61,7 @@ import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.regex.Pattern;
import javax.inject.Provider; import javax.inject.Provider;
@ -539,8 +540,12 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
((PostBaseViewHolder) holder).subredditTextView.setText(post.getSubredditName()); ((PostBaseViewHolder) holder).subredditTextView.setText(post.getSubredditName());
((PostBaseViewHolder) holder).userTextView.setText(post.getAuthor()); ((PostBaseViewHolder) holder).userTextView.setText(post.getAuthor());
} else { } else {
((PostBaseViewHolder) holder).subredditTextView.setText(post.getSubredditNamePrefixed()); ((PostBaseViewHolder) holder).subredditTextView.setText(post.getSubredditName());
((PostBaseViewHolder) holder).userTextView.setText(authorPrefixed); ((PostBaseViewHolder) holder).communityInstanceTextView.setText('@' + post.getSubredditNamePrefixed().split(Pattern.quote("@"))[1]);
((PostBaseViewHolder) holder).userTextView.setText(post.getAuthor());
((PostBaseViewHolder) holder).userInstanceTextView.setText('@' + post.getAuthorNamePrefixed().split(Pattern.quote("@"))[1]);
((PostBaseViewHolder) holder).communityInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(mSubredditColor, 0.7f));
((PostBaseViewHolder) holder).userInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(post.isModerator() || post.isAdmin() ? mModeratorColor : mUsernameColor, 0.7f));
} }
((PostBaseViewHolder) holder).userTextView.setTextColor( ((PostBaseViewHolder) holder).userTextView.setTextColor(
@ -1208,8 +1213,11 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
if (mHideSubredditAndUserPrefix) { if (mHideSubredditAndUserPrefix) {
((PostCompactBaseViewHolder) holder).nameTextView.setText(post.getSubredditName()); ((PostCompactBaseViewHolder) holder).nameTextView.setText(post.getSubredditName());
} else { } else {
((PostCompactBaseViewHolder) holder).nameTextView.setText(post.getSubredditNamePrefixed()); ((PostCompactBaseViewHolder) holder).nameTextView.setText(post.getSubredditName());
((PostCompactBaseViewHolder) holder).instanceTextView.setText('@' + post.getSubredditNamePrefixed().split(Pattern.quote("@"))[1]);
((PostCompactBaseViewHolder) holder).instanceTextView.setTextColor(CustomThemeWrapper.darkenColor(mSubredditColor, 0.7f));
} }
d
} else { } else {
if (post.getAuthorIconUrl() == null) { if (post.getAuthorIconUrl() == null) {
String authorName = post.getAuthorNamePrefixed(); String authorName = post.getAuthorNamePrefixed();
@ -2349,7 +2357,10 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
public class PostBaseViewHolder extends RecyclerView.ViewHolder { public class PostBaseViewHolder extends RecyclerView.ViewHolder {
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
TextView subredditTextView; TextView subredditTextView;
TextView communityInstanceTextView;
TextView userTextView; TextView userTextView;
TextView userInstanceTextView;
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
TextView postTimeTextView; TextView postTimeTextView;
TextView titleTextView; TextView titleTextView;
@ -2382,7 +2393,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
void setBaseView(AspectRatioGifImageView iconGifImageView, void setBaseView(AspectRatioGifImageView iconGifImageView,
TextView subredditTextView, TextView subredditTextView,
TextView communityInstanceTextView,
TextView userTextView, TextView userTextView,
TextView userInstanceTextView,
ImageView stickiedPostImageView, ImageView stickiedPostImageView,
TextView postTimeTextView, TextView postTimeTextView,
TextView titleTextView, TextView titleTextView,
@ -2404,7 +2417,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
ImageView shareButton) { ImageView shareButton) {
this.iconGifImageView = iconGifImageView; this.iconGifImageView = iconGifImageView;
this.subredditTextView = subredditTextView; this.subredditTextView = subredditTextView;
this.communityInstanceTextView = communityInstanceTextView;
this.userTextView = userTextView; this.userTextView = userTextView;
this.userInstanceTextView = userInstanceTextView;
this.stickiedPostImageView = stickiedPostImageView; this.stickiedPostImageView = stickiedPostImageView;
this.postTimeTextView = postTimeTextView; this.postTimeTextView = postTimeTextView;
this.titleTextView = titleTextView; this.titleTextView = titleTextView;
@ -2942,7 +2957,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
void setBaseView(AspectRatioGifImageView iconGifImageView, void setBaseView(AspectRatioGifImageView iconGifImageView,
TextView subredditTextView, TextView subredditTextView,
TextView communityInstanceTextView,
TextView userTextView, TextView userTextView,
TextView userInstanceTextView,
ImageView stickiedPostImageView, ImageView stickiedPostImageView,
TextView postTimeTextView, TextView postTimeTextView,
TextView titleTextView, TextView titleTextView,
@ -2964,10 +2981,10 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
ImageView shareButton, boolean itemViewIsNotCardView) { ImageView shareButton, boolean itemViewIsNotCardView) {
this.itemViewIsNotCardView = itemViewIsNotCardView; this.itemViewIsNotCardView = itemViewIsNotCardView;
setBaseView(iconGifImageView, subredditTextView, userTextView, stickiedPostImageView, postTimeTextView, setBaseView(iconGifImageView, subredditTextView, communityInstanceTextView, userTextView, userInstanceTextView, stickiedPostImageView, postTimeTextView,
titleTextView, typeTextView, archivedImageView, lockedImageView, crosspostImageView, titleTextView, typeTextView, archivedImageView, lockedImageView, crosspostImageView,
nsfwTextView, spoilerTextView, flairTextView, awardsTextView, bottomConstraintLayout, nsfwTextView, spoilerTextView, flairTextView, awardsTextView, bottomConstraintLayout,
upvoteButton, scoreTextView, downvoteTextView,downvoteButton, commentsCountTextView, saveButton, shareButton); upvoteButton, scoreTextView, downvoteTextView, downvoteButton, commentsCountTextView, saveButton, shareButton);
} }
void markPostRead(Post post, boolean changePostItemColor) { void markPostRead(Post post, boolean changePostItemColor) {
@ -2997,8 +3014,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.subreddit_name_text_view_item_post_video_type_autoplay) @BindView(R.id.subreddit_name_text_view_item_post_video_type_autoplay)
TextView subredditTextView; TextView subredditTextView;
@BindView(R.id.community_instance_text_view_item_post_video_type_autoplay)
TextView communityInstanceTextView;
@BindView(R.id.user_text_view_item_post_video_type_autoplay) @BindView(R.id.user_text_view_item_post_video_type_autoplay)
TextView userTextView; TextView userTextView;
@BindView(R.id.user_instance_text_view_item_post_video_type_autoplay)
TextView userInstanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_video_type_autoplay) @BindView(R.id.stickied_post_image_view_item_post_video_type_autoplay)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_video_type_autoplay) @BindView(R.id.post_time_text_view_item_post_video_type_autoplay)
@ -3072,7 +3094,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
setBaseView( setBaseView(
iconGifImageView, iconGifImageView,
subredditTextView, subredditTextView,
communityInstanceTextView,
userTextView, userTextView,
userInstanceTextView,
stickiedPostImageView, stickiedPostImageView,
postTimeTextView, postTimeTextView,
titleTextView, titleTextView,
@ -3320,8 +3344,14 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.subreddit_name_text_view_item_post_with_preview) @BindView(R.id.subreddit_name_text_view_item_post_with_preview)
TextView subredditTextView; TextView subredditTextView;
@BindView(R.id.community_instance_text_view_item_post_with_preview)
TextView communityInstanceTextView;
@BindView(R.id.user_text_view_item_post_with_preview) @BindView(R.id.user_text_view_item_post_with_preview)
TextView userTextView; TextView userTextView;
@BindView(R.id.user_instance_text_view_item_post_with_preview)
TextView userInstanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_with_preview) @BindView(R.id.stickied_post_image_view_item_post_with_preview)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_with_preview) @BindView(R.id.post_time_text_view_item_post_with_preview)
@ -3383,7 +3413,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
setBaseView( setBaseView(
iconGifImageView, iconGifImageView,
subredditTextView, subredditTextView,
communityInstanceTextView,
userTextView, userTextView,
userInstanceTextView,
stickiedPostImageView, stickiedPostImageView,
postTimeTextView, postTimeTextView,
titleTextView, titleTextView,
@ -3468,7 +3500,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
PostBaseGalleryTypeViewHolder(View rootView, PostBaseGalleryTypeViewHolder(View rootView,
AspectRatioGifImageView iconGifImageView, AspectRatioGifImageView iconGifImageView,
TextView subredditTextView, TextView subredditTextView,
TextView communityInstanceTextView,
TextView userTextView, TextView userTextView,
TextView userInstanceTextView,
ImageView stickiedPostImageView, ImageView stickiedPostImageView,
TextView postTimeTextView, TextView postTimeTextView,
TextView titleTextView, TextView titleTextView,
@ -3497,7 +3531,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
setBaseView( setBaseView(
iconGifImageView, iconGifImageView,
subredditTextView, subredditTextView,
communityInstanceTextView,
userTextView, userTextView,
userInstanceTextView,
stickiedPostImageView, stickiedPostImageView,
postTimeTextView, postTimeTextView,
titleTextView, titleTextView,
@ -3648,7 +3684,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
super(binding.getRoot(), super(binding.getRoot(),
binding.iconGifImageViewItemPostGalleryType, binding.iconGifImageViewItemPostGalleryType,
binding.subredditNameTextViewItemPostGalleryType, binding.subredditNameTextViewItemPostGalleryType,
binding.communityInstanceTextViewItemPostGalleryType,
binding.userTextViewItemPostGalleryType, binding.userTextViewItemPostGalleryType,
binding.userInstanceTextViewItemPostGalleryType,
binding.stickiedPostImageViewItemPostGalleryType, binding.stickiedPostImageViewItemPostGalleryType,
binding.postTimeTextViewItemPostGalleryType, binding.postTimeTextViewItemPostGalleryType,
binding.titleTextViewItemPostGalleryType, binding.titleTextViewItemPostGalleryType,
@ -3681,8 +3719,15 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.subreddit_name_text_view_item_post_text_type) @BindView(R.id.subreddit_name_text_view_item_post_text_type)
TextView subredditTextView; TextView subredditTextView;
@BindView(R.id.community_instance_text_view_item_post_text_type)
TextView communityInstanceTextView;
@BindView(R.id.user_text_view_item_post_text_type) @BindView(R.id.user_text_view_item_post_text_type)
TextView userTextView; TextView userTextView;
@BindView(R.id.user_instance_text_view_item_post_text_type)
TextView userInstanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_text_type) @BindView(R.id.stickied_post_image_view_item_post_text_type)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_text_type) @BindView(R.id.post_time_text_view_item_post_text_type)
@ -3732,7 +3777,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
setBaseView( setBaseView(
iconGifImageView, iconGifImageView,
subredditTextView, subredditTextView,
communityInstanceTextView,
userTextView, userTextView,
userInstanceTextView,
stickiedPostImageView, stickiedPostImageView,
postTimeTextView, postTimeTextView,
titleTextView, titleTextView,
@ -3763,6 +3810,8 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
public class PostCompactBaseViewHolder extends RecyclerView.ViewHolder { public class PostCompactBaseViewHolder extends RecyclerView.ViewHolder {
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
TextView nameTextView; TextView nameTextView;
TextView instanceTextView;
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
TextView postTimeTextView; TextView postTimeTextView;
ConstraintLayout titleAndImageConstraintLayout; ConstraintLayout titleAndImageConstraintLayout;
@ -3802,7 +3851,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
} }
void setBaseView(AspectRatioGifImageView iconGifImageView, void setBaseView(AspectRatioGifImageView iconGifImageView,
TextView nameTextView, ImageView stickiedPostImageView, TextView nameTextView, TextView instanceTextView, ImageView stickiedPostImageView,
TextView postTimeTextView, ConstraintLayout titleAndImageConstraintLayout, TextView postTimeTextView, ConstraintLayout titleAndImageConstraintLayout,
TextView titleTextView, CustomTextView typeTextView, TextView titleTextView, CustomTextView typeTextView,
ImageView archivedImageView, ImageView lockedImageView, ImageView archivedImageView, ImageView lockedImageView,
@ -3819,6 +3868,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
ImageView shareButton, View divider) { ImageView shareButton, View divider) {
this.iconGifImageView = iconGifImageView; this.iconGifImageView = iconGifImageView;
this.nameTextView = nameTextView; this.nameTextView = nameTextView;
this.instanceTextView = instanceTextView;
this.stickiedPostImageView = stickiedPostImageView; this.stickiedPostImageView = stickiedPostImageView;
this.postTimeTextView = postTimeTextView; this.postTimeTextView = postTimeTextView;
this.titleAndImageConstraintLayout = titleAndImageConstraintLayout; this.titleAndImageConstraintLayout = titleAndImageConstraintLayout;
@ -3861,17 +3911,11 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
constraintSet.clear(upvoteButton.getId(), ConstraintSet.START); constraintSet.clear(upvoteButton.getId(), ConstraintSet.START);
constraintSet.clear(scoreTextView.getId(), ConstraintSet.START); constraintSet.clear(scoreTextView.getId(), ConstraintSet.START);
constraintSet.clear(downvoteButton.getId(), ConstraintSet.START); constraintSet.clear(downvoteButton.getId(), ConstraintSet.START);
constraintSet.clear(downvoteTextView.getId(), ConstraintSet.START);
constraintSet.clear(saveButton.getId(), ConstraintSet.END); constraintSet.clear(saveButton.getId(), ConstraintSet.END);
constraintSet.clear(shareButton.getId(), ConstraintSet.END); constraintSet.clear(shareButton.getId(), ConstraintSet.END);
constraintSet.connect(upvoteButton.getId(), ConstraintSet.END, scoreTextView.getId(), ConstraintSet.START); constraintSet.connect(upvoteButton.getId(), ConstraintSet.END, scoreTextView.getId(), ConstraintSet.START);
constraintSet.connect(scoreTextView.getId(), ConstraintSet.END, downvoteButton.getId(), ConstraintSet.START); constraintSet.connect(scoreTextView.getId(), ConstraintSet.END, downvoteButton.getId(), ConstraintSet.START);
if (!mSeparateUpandDownVotes) { constraintSet.connect(downvoteButton.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
constraintSet.connect(downvoteButton.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
} else {
constraintSet.connect(downvoteButton.getId(), ConstraintSet.END, downvoteTextView.getId(), ConstraintSet.START);
constraintSet.connect(downvoteTextView.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
}
constraintSet.connect(commentsCountTextView.getId(), ConstraintSet.START, saveButton.getId(), ConstraintSet.END); constraintSet.connect(commentsCountTextView.getId(), ConstraintSet.START, saveButton.getId(), ConstraintSet.END);
constraintSet.connect(commentsCountTextView.getId(), ConstraintSet.END, upvoteButton.getId(), ConstraintSet.START); constraintSet.connect(commentsCountTextView.getId(), ConstraintSet.END, upvoteButton.getId(), ConstraintSet.START);
constraintSet.connect(saveButton.getId(), ConstraintSet.START, shareButton.getId(), ConstraintSet.END); constraintSet.connect(saveButton.getId(), ConstraintSet.START, shareButton.getId(), ConstraintSet.END);
@ -4384,6 +4428,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.name_text_view_item_post_compact) @BindView(R.id.name_text_view_item_post_compact)
TextView nameTextView; TextView nameTextView;
@BindView(R.id.instance_name_text_view_item_post_compact)
TextView instanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_compact) @BindView(R.id.stickied_post_image_view_item_post_compact)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_compact) @BindView(R.id.post_time_text_view_item_post_compact)
@ -4448,12 +4495,12 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
super(itemView); super(itemView);
ButterKnife.bind(this, itemView); ButterKnife.bind(this, itemView);
setBaseView(iconGifImageView, nameTextView, stickiedPostImageView, postTimeTextView, setBaseView(iconGifImageView, nameTextView, instanceTextView, stickiedPostImageView, postTimeTextView,
titleAndImageConstraintLayout, titleTextView, typeTextView, archivedImageView, titleAndImageConstraintLayout, titleTextView, typeTextView, archivedImageView,
lockedImageView, crosspostImageView, nsfwTextView, spoilerTextView, lockedImageView, crosspostImageView, nsfwTextView, spoilerTextView,
flairTextView, awardsTextView, linkTextView, relativeLayout, progressBar, imageView, flairTextView, awardsTextView, linkTextView, relativeLayout, progressBar, imageView,
playButtonImageView, noPreviewLinkImageFrameLayout, noPreviewLinkImageView, playButtonImageView, noPreviewLinkImageFrameLayout, noPreviewLinkImageView,
imageBarrier, bottomConstraintLayout, upvoteButton, scoreTextView, downvoteTextView,downvoteButton, imageBarrier, bottomConstraintLayout, upvoteButton, scoreTextView, downvoteTextView, downvoteButton,
commentsCountTextView, saveButton, shareButton, divider); commentsCountTextView, saveButton, shareButton, divider);
} }
} }
@ -4463,6 +4510,8 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.name_text_view_item_post_compact_right_thumbnail) @BindView(R.id.name_text_view_item_post_compact_right_thumbnail)
TextView nameTextView; TextView nameTextView;
@BindView(R.id.instance_name_text_view_item_post_compact_right_thumbnail)
TextView instanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_compact_right_thumbnail) @BindView(R.id.stickied_post_image_view_item_post_compact_right_thumbnail)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_compact_right_thumbnail) @BindView(R.id.post_time_text_view_item_post_compact_right_thumbnail)
@ -4527,12 +4576,12 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
super(itemView); super(itemView);
ButterKnife.bind(this, itemView); ButterKnife.bind(this, itemView);
setBaseView(iconGifImageView, nameTextView, stickiedPostImageView, postTimeTextView, setBaseView(iconGifImageView, nameTextView, instanceTextView, stickiedPostImageView, postTimeTextView,
titleAndImageConstraintLayout, titleTextView, typeTextView, archivedImageView, titleAndImageConstraintLayout, titleTextView, typeTextView, archivedImageView,
lockedImageView, crosspostImageView, nsfwTextView, spoilerTextView, lockedImageView, crosspostImageView, nsfwTextView, spoilerTextView,
flairTextView, awardsTextView, linkTextView, relativeLayout, progressBar, imageView, flairTextView, awardsTextView, linkTextView, relativeLayout, progressBar, imageView,
playButtonImageView, noPreviewLinkImageFrameLayout, noPreviewLinkImageView, playButtonImageView, noPreviewLinkImageFrameLayout, noPreviewLinkImageView,
imageBarrier, bottomConstraintLayout, upvoteButton, scoreTextView,downvoteTextView, downvoteButton, imageBarrier, bottomConstraintLayout, upvoteButton, scoreTextView, downvoteTextView, downvoteButton,
commentsCountTextView, saveButton, shareButton, divider); commentsCountTextView, saveButton, shareButton, divider);
} }
} }
@ -4852,8 +4901,12 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.subreddit_name_text_view_item_post_card_2_video_autoplay) @BindView(R.id.subreddit_name_text_view_item_post_card_2_video_autoplay)
TextView subredditTextView; TextView subredditTextView;
@BindView(R.id.community_instance_text_view_item_post_card_2_video_autoplay)
TextView communityInstanceTextView;
@BindView(R.id.user_text_view_item_post_card_2_video_autoplay) @BindView(R.id.user_text_view_item_post_card_2_video_autoplay)
TextView userTextView; TextView userTextView;
@BindView(R.id.user_instance_text_view_item_post_card_2_video_autoplay)
TextView userInstanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_card_2_video_autoplay) @BindView(R.id.stickied_post_image_view_item_post_card_2_video_autoplay)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_card_2_video_autoplay) @BindView(R.id.post_time_text_view_item_post_card_2_video_autoplay)
@ -4930,7 +4983,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
setBaseView( setBaseView(
iconGifImageView, iconGifImageView,
subredditTextView, subredditTextView,
communityInstanceTextView,
userTextView, userTextView,
userInstanceTextView,
stickiedPostImageView, stickiedPostImageView,
postTimeTextView, postTimeTextView,
titleTextView, titleTextView,
@ -5178,8 +5233,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.subreddit_name_text_view_item_post_card_2_with_preview) @BindView(R.id.subreddit_name_text_view_item_post_card_2_with_preview)
TextView subredditTextView; TextView subredditTextView;
@BindView(R.id.community_instance_text_view_item_post_card_2_with_preview)
TextView communityInstanceTextView;
@BindView(R.id.user_text_view_item_post_card_2_with_preview) @BindView(R.id.user_text_view_item_post_card_2_with_preview)
TextView userTextView; TextView userTextView;
@BindView(R.id.user_instance_text_view_item_post_card_2_with_preview)
TextView userInstanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_card_2_with_preview) @BindView(R.id.stickied_post_image_view_item_post_card_2_with_preview)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_card_2_with_preview) @BindView(R.id.post_time_text_view_item_post_card_2_with_preview)
@ -5241,7 +5301,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
setBaseView( setBaseView(
iconGifImageView, iconGifImageView,
subredditTextView, subredditTextView,
communityInstanceTextView,
userTextView, userTextView,
userInstanceTextView,
stickiedPostImageView, stickiedPostImageView,
postTimeTextView, postTimeTextView,
titleTextView, titleTextView,
@ -5322,7 +5384,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
super(binding.getRoot(), super(binding.getRoot(),
binding.iconGifImageViewItemPostCard2GalleryType, binding.iconGifImageViewItemPostCard2GalleryType,
binding.subredditNameTextViewItemPostCard2GalleryType, binding.subredditNameTextViewItemPostCard2GalleryType,
binding.communityInstanceTextViewItemPostCard2GalleryType,
binding.userTextViewItemPostCard2GalleryType, binding.userTextViewItemPostCard2GalleryType,
binding.userInstanceTextViewItemPostCard2GalleryType,
binding.stickiedPostImageViewItemPostCard2GalleryType, binding.stickiedPostImageViewItemPostCard2GalleryType,
binding.postTimeTextViewItemPostCard2GalleryType, binding.postTimeTextViewItemPostCard2GalleryType,
binding.titleTextViewItemPostCard2GalleryType, binding.titleTextViewItemPostCard2GalleryType,
@ -5357,8 +5421,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
AspectRatioGifImageView iconGifImageView; AspectRatioGifImageView iconGifImageView;
@BindView(R.id.subreddit_name_text_view_item_post_card_2_text) @BindView(R.id.subreddit_name_text_view_item_post_card_2_text)
TextView subredditTextView; TextView subredditTextView;
@BindView(R.id.community_instance_text_view_item_post_card_2_text)
TextView communityInstanceTextView;
@BindView(R.id.user_text_view_item_post_card_2_text) @BindView(R.id.user_text_view_item_post_card_2_text)
TextView userTextView; TextView userTextView;
@BindView(R.id.user_instance_text_view_item_post_card_2_text)
TextView userInstanceTextView;
@BindView(R.id.stickied_post_image_view_item_post_card_2_text) @BindView(R.id.stickied_post_image_view_item_post_card_2_text)
ImageView stickiedPostImageView; ImageView stickiedPostImageView;
@BindView(R.id.post_time_text_view_item_post_card_2_text) @BindView(R.id.post_time_text_view_item_post_card_2_text)
@ -5409,7 +5478,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
setBaseView( setBaseView(
iconGifImageView, iconGifImageView,
subredditTextView, subredditTextView,
communityInstanceTextView,
userTextView, userTextView,
userInstanceTextView,
stickiedPostImageView, stickiedPostImageView,
postTimeTextView, postTimeTextView,
titleTextView, titleTextView,

13
app/src/main/java/eu/toldi/infinityforlemmy/customtheme/CustomThemeWrapper.java
View File

@ -1536,4 +1536,17 @@ public class CustomThemeWrapper {
return customTheme; return customTheme;
} }
public static int darkenColor(int color, float factor) {
int a = Color.alpha(color);
int r = Math.round(Color.red(color) * factor);
int g = Math.round(Color.green(color) * factor);
int b = Math.round(Color.blue(color) * factor);
return Color.argb(a,
Math.min(r, 255),
Math.min(g, 255),
Math.min(b, 255));
}
} }

51
app/src/main/res/layout/item_post_card_2_gallery_type.xml
View File

@ -182,36 +182,63 @@
</com.nex3z.flowlayout.FlowLayout> </com.nex3z.flowlayout.FlowLayout>
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:flRowVerticalGravity="center"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView <eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView
android:id="@+id/icon_gif_image_view_item_post_card_2_gallery_type" android:id="@+id/icon_gif_image_view_item_post_card_2_gallery_type"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" /> android:layout_height="24dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/subreddit_name_text_view_item_post_card_2_gallery_type" android:id="@+id/subreddit_name_text_view_item_post_card_2_gallery_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_card_2_gallery_type"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/community_instance_text_view_item_post_card_2_gallery_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintStart_toEndOf="@+id/subreddit_name_text_view_item_post_card_2_gallery_type"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_card_2_gallery_type" android:id="@+id/user_text_view_item_post_card_2_gallery_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/subreddit_name_text_view_item_post_card_2_gallery_type"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_card_2_gallery_type" />
<TextView
android:id="@+id/user_instance_text_view_item_post_card_2_gallery_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_card_2_gallery_type" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.nex3z.flowlayout.FlowLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_constraint_layout_item_post_card_2_gallery_type" android:id="@+id/bottom_constraint_layout_item_post_card_2_gallery_type"

50
app/src/main/res/layout/item_post_card_2_text.xml
View File

@ -142,36 +142,62 @@
</com.nex3z.flowlayout.FlowLayout> </com.nex3z.flowlayout.FlowLayout>
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:flRowVerticalGravity="center"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView <eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView
android:id="@+id/icon_gif_image_view_item_post_card_2_text" android:id="@+id/icon_gif_image_view_item_post_card_2_text"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" /> android:layout_height="24dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/subreddit_name_text_view_item_post_card_2_text" android:id="@+id/subreddit_name_text_view_item_post_card_2_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_card_2_text"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/community_instance_text_view_item_post_card_2_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintStart_toEndOf="@+id/subreddit_name_text_view_item_post_card_2_text"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_card_2_text" android:id="@+id/user_text_view_item_post_card_2_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/subreddit_name_text_view_item_post_card_2_text"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_card_2_text" />
</com.nex3z.flowlayout.FlowLayout> <TextView
android:id="@+id/user_instance_text_view_item_post_card_2_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_card_2_text" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_constraint_layout_item_post_card_2_text" android:id="@+id/bottom_constraint_layout_item_post_card_2_text"

52
app/src/main/res/layout/item_post_card_2_video_autoplay.xml
View File

@ -182,37 +182,63 @@
android:fontFamily="?attr/font_family" /> android:fontFamily="?attr/font_family" />
</com.nex3z.flowlayout.FlowLayout> </com.nex3z.flowlayout.FlowLayout>
<androidx.constraintlayout.widget.ConstraintLayout
<com.nex3z.flowlayout.FlowLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:flRowVerticalGravity="center"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView <eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView
android:id="@+id/icon_gif_image_view_item_post_card_2_video_autoplay" android:id="@+id/icon_gif_image_view_item_post_card_2_video_autoplay"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" /> android:layout_height="24dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay" android:id="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_card_2_video_autoplay"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/community_instance_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintStart_toEndOf="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_card_2_video_autoplay" android:id="@+id/user_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay" />
<TextView
android:id="@+id/user_instance_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_card_2_video_autoplay" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.nex3z.flowlayout.FlowLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_constraint_layout_item_post_card_2_video_autoplay" android:id="@+id/bottom_constraint_layout_item_post_card_2_video_autoplay"

49
app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml
View File

@ -183,37 +183,62 @@
</com.nex3z.flowlayout.FlowLayout> </com.nex3z.flowlayout.FlowLayout>
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:flRowVerticalGravity="center"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView <eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView
android:id="@+id/icon_gif_image_view_item_post_card_2_video_autoplay" android:id="@+id/icon_gif_image_view_item_post_card_2_video_autoplay"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" /> android:layout_height="24dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay" android:id="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_card_2_video_autoplay"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/community_instance_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintStart_toEndOf="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_card_2_video_autoplay" android:id="@+id/user_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_card_2_video_autoplay" />
</com.nex3z.flowlayout.FlowLayout> <TextView
android:id="@+id/user_instance_text_view_item_post_card_2_video_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_card_2_video_autoplay" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_constraint_layout_item_post_card_2_video_autoplay" android:id="@+id/bottom_constraint_layout_item_post_card_2_video_autoplay"
android:layout_width="match_parent" android:layout_width="match_parent"

52
app/src/main/res/layout/item_post_card_2_with_preview.xml
View File

@ -193,37 +193,63 @@
android:fontFamily="?attr/font_family" /> android:fontFamily="?attr/font_family" />
</com.nex3z.flowlayout.FlowLayout> </com.nex3z.flowlayout.FlowLayout>
<androidx.constraintlayout.widget.ConstraintLayout
<com.nex3z.flowlayout.FlowLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:flRowVerticalGravity="center"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView <eu.toldi.infinityforlemmy.customviews.AspectRatioGifImageView
android:id="@+id/icon_gif_image_view_item_post_card_2_with_preview" android:id="@+id/icon_gif_image_view_item_post_card_2_with_preview"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" /> android:layout_height="24dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/subreddit_name_text_view_item_post_card_2_with_preview" android:id="@+id/subreddit_name_text_view_item_post_card_2_with_preview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_card_2_with_preview"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/community_instance_text_view_item_post_card_2_with_preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintStart_toEndOf="@+id/subreddit_name_text_view_item_post_card_2_with_preview"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_card_2_with_preview" android:id="@+id/user_text_view_item_post_card_2_with_preview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/subreddit_name_text_view_item_post_card_2_with_preview"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_card_2_with_preview" />
<TextView
android:id="@+id/user_instance_text_view_item_post_card_2_with_preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_card_2_with_preview" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.nex3z.flowlayout.FlowLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_constraint_layout_item_post_card_2_with_preview" android:id="@+id/bottom_constraint_layout_item_post_card_2_with_preview"

52
app/src/main/res/layout/item_post_compact.xml
View File

@ -29,45 +29,37 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_compact"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/instance_name_text_view_item_post_compact"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
app:layout_constraintHorizontal_bias="0" app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_compact" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_compact"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_compact" app:layout_constraintHorizontal_bias="0"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/name_text_view_item_post_compact"
app:layout_constrainedWidth="true" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/stickied_post_image_view_item_post_compact" android:id="@+id/stickied_post_image_view_item_post_compact"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/post_time_text_view_item_post_compact"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="?attr/font_family"
android:gravity="end"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -75,6 +67,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView
android:id="@+id/post_time_text_view_item_post_compact"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:gravity="end"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/flow_layout_item_post_compact"
app:layout_constraintTop_toBottomOf="@+id/title_text_view_item_post_compact" />
<TextView <TextView
android:id="@+id/title_text_view_item_post_compact" android:id="@+id/title_text_view_item_post_compact"
android:layout_width="0dp" android:layout_width="0dp"

52
app/src/main/res/layout/item_post_compact_right_thumbnail.xml
View File

@ -29,45 +29,37 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_compact_right_thumbnail"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/instance_name_text_view_item_post_compact_right_thumbnail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_compact_right_thumbnail" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_compact_right_thumbnail"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_compact_right_thumbnail" app:layout_constraintHorizontal_bias="0"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/name_text_view_item_post_compact_right_thumbnail"
app:layout_constrainedWidth="true" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintHorizontal_bias="0" />
<ImageView <ImageView
android:id="@+id/stickied_post_image_view_item_post_compact_right_thumbnail" android:id="@+id/stickied_post_image_view_item_post_compact_right_thumbnail"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/post_time_text_view_item_post_compact_right_thumbnail"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="?attr/font_family"
android:gravity="end"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -75,6 +67,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView
android:id="@+id/post_time_text_view_item_post_compact_right_thumbnail"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:gravity="end"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_text_view_item_post_compact_right_thumbnail" />
<RelativeLayout <RelativeLayout
android:id="@+id/image_view_wrapper_item_post_compact_right_thumbnail" android:id="@+id/image_view_wrapper_item_post_compact_right_thumbnail"
android:layout_width="72dp" android:layout_width="72dp"

235
app/src/main/res/layout/item_post_gallery_type.xml
View File

@ -40,10 +40,24 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_gallery_type" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_gallery_type"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_gallery_type" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_gallery_type"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gallery_type"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0"/> app:layout_constraintHorizontal_bias="0" />
<TextView
android:id="@+id/community_instance_text_view_item_post_gallery_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_gallery_type"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gallery_type"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/subreddit_name_text_view_item_post_gallery_type"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_gallery_type" android:id="@+id/user_text_view_item_post_gallery_type"
@ -55,41 +69,34 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_gallery_type" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_gallery_type"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gallery_type"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_gallery_type" app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_gallery_type"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constrainedWidth="true" /> app:layout_constrainedWidth="true" />
<TextView
android:id="@+id/user_instance_text_view_item_post_gallery_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gallery_type"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_gallery_type"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_gallery_type" />
<ImageView <ImageView
android:id="@+id/stickied_post_image_view_item_post_gallery_type" android:id="@+id/stickied_post_image_view_item_post_gallery_type"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView
android:id="@+id/post_time_text_view_item_post_gallery_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
@ -101,100 +108,118 @@
android:textSize="?attr/title_font_18" android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" /> android:fontFamily="?attr/title_font_family" />
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:padding="16dp"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<com.libRG.CustomTextView <TextView
android:id="@+id/type_text_view_item_post_gallery_type" android:id="@+id/post_time_text_view_item_post_gallery_type"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginEnd="8dp"
android:text="@string/gallery"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:lib_setRadius="6dp" android:gravity="end"
app:lib_setRoundedView="true" android:textSize="?attr/font_default"
app:lib_setShape="rectangle" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/flowLayout2"
app:layout_constraintTop_toTopOf="parent" />
<com.libRG.CustomTextView <com.nex3z.flowlayout.FlowLayout
android:id="@+id/spoiler_text_view_item_post_gallery_type" android:id="@+id/flowLayout2"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:padding="16dp"
android:text="@string/spoiler" app:flChildSpacing="16dp"
android:textSize="?attr/font_12" app:flChildSpacingForLastRow="align"
android:fontFamily="?attr/font_family" app:flRowSpacing="8dp">
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/nsfw_text_view_item_post_gallery_type" android:id="@+id/type_text_view_item_post_gallery_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:text="@string/nsfw" android:padding="4dp"
android:textSize="?attr/font_12" android:text="@string/gallery"
android:fontFamily="?attr/font_family" android:textSize="?attr/font_12"
android:visibility="gone" app:lib_setRadius="6dp"
app:lib_setRadius="6dp" app:lib_setRoundedView="true"
app:lib_setRoundedView="true" app:lib_setShape="rectangle" />
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/flair_text_view_item_post_gallery_type" android:id="@+id/spoiler_text_view_item_post_gallery_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="?attr/font_12" android:fontFamily="?attr/font_family"
android:fontFamily="?attr/font_family" android:padding="4dp"
android:padding="4dp" android:text="@string/spoiler"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/awards_text_view_item_post_gallery_type" android:id="@+id/nsfw_text_view_item_post_gallery_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_12" android:padding="4dp"
android:fontFamily="?attr/font_family" android:text="@string/nsfw"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/archived_image_view_item_post_gallery_type" android:id="@+id/flair_text_view_item_post_gallery_type"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_archive_outline" android:layout_gravity="center"
android:visibility="gone" /> android:fontFamily="?attr/font_family"
android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/locked_image_view_item_post_gallery_type" android:id="@+id/awards_text_view_item_post_gallery_type"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_lock_24dp" android:fontFamily="?attr/font_family"
android:visibility="gone" /> android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <ImageView
android:id="@+id/crosspost_image_view_item_post_gallery_type" android:id="@+id/archived_image_view_item_post_gallery_type"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/crosspost" android:src="@drawable/ic_archive_outline"
android:visibility="gone" /> android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout> <ImageView
android:id="@+id/locked_image_view_item_post_gallery_type"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_outline_lock_24dp"
android:visibility="gone" />
<ImageView
android:id="@+id/crosspost_image_view_item_post_gallery_type"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout <FrameLayout
android:id="@+id/gallery_frame_layout_item_post_gallery_type" android:id="@+id/gallery_frame_layout_item_post_gallery_type"

250
app/src/main/res/layout/item_post_text.xml
View File

@ -27,7 +27,7 @@
android:layout_gravity="center" android:layout_gravity="center"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/subreddit_name_text_view_item_post_text_type" android:id="@+id/subreddit_name_text_view_item_post_text_type"
@ -36,14 +36,27 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_text_type" android:textSize="?attr/font_default"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_text_type"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_text_type"
app:layout_constraintTop_toTopOf="parent"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0" /> app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_text_type"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_text_type"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_text_type"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/community_instance_text_view_item_post_text_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/user_text_view_item_post_text_type"
app:layout_constraintStart_toEndOf="@+id/subreddit_name_text_view_item_post_text_type"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_text_type" android:id="@+id/user_text_view_item_post_text_type"
@ -51,45 +64,38 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_text_type"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_text_type" app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_text_type"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_text_type"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constrainedWidth="true" /> app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_text_type"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_text_type" />
<TextView
android:id="@+id/user_instance_text_view_item_post_text_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_text_type"
app:layout_constraintTop_toBottomOf="@+id/community_instance_text_view_item_post_text_type" />
<ImageView <ImageView
android:id="@+id/stickied_post_image_view_item_post_text_type" android:id="@+id/stickied_post_image_view_item_post_text_type"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView
android:id="@+id/post_time_text_view_item_post_text_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
@ -114,100 +120,118 @@
android:fontFamily="?attr/content_font_family" android:fontFamily="?attr/content_font_family"
android:ellipsize="end" /> android:ellipsize="end" />
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:padding="16dp"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<com.libRG.CustomTextView <TextView
android:id="@+id/type_text_view_item_post_text_type" android:id="@+id/post_time_text_view_item_post_text_type"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginEnd="8dp"
android:text="@string/text"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:lib_setRadius="6dp" android:gravity="end"
app:lib_setRoundedView="true" android:textSize="?attr/font_default"
app:lib_setShape="rectangle" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/flowLayout"
app:layout_constraintTop_toTopOf="parent" />
<com.libRG.CustomTextView <com.nex3z.flowlayout.FlowLayout
android:id="@+id/spoiler_custom_text_view_item_post_text_type" android:id="@+id/flowLayout"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:padding="16dp"
android:text="@string/spoiler" app:flChildSpacing="16dp"
android:textSize="?attr/font_12" app:flChildSpacingForLastRow="align"
android:fontFamily="?attr/font_family" app:flRowSpacing="8dp">
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/nsfw_text_view_item_post_text_type" android:id="@+id/type_text_view_item_post_text_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:text="@string/nsfw" android:padding="4dp"
android:textSize="?attr/font_12" android:text="@string/text"
android:fontFamily="?attr/font_family" android:textSize="?attr/font_12"
android:visibility="gone" app:lib_setRadius="6dp"
app:lib_setRadius="6dp" app:lib_setRoundedView="true"
app:lib_setRoundedView="true" app:lib_setShape="rectangle" />
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/flair_custom_text_view_item_post_text_type" android:id="@+id/spoiler_custom_text_view_item_post_text_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="?attr/font_12" android:fontFamily="?attr/font_family"
android:fontFamily="?attr/font_family" android:padding="4dp"
android:padding="4dp" android:text="@string/spoiler"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/awards_text_view_item_post_text_type" android:id="@+id/nsfw_text_view_item_post_text_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_12" android:padding="4dp"
android:fontFamily="?attr/font_family" android:text="@string/nsfw"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/archived_image_view_item_post_text_type" android:id="@+id/flair_custom_text_view_item_post_text_type"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_archive_outline" android:layout_gravity="center"
android:visibility="gone" /> android:fontFamily="?attr/font_family"
android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/locked_image_view_item_post_text_type" android:id="@+id/awards_text_view_item_post_text_type"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_lock_24dp" android:fontFamily="?attr/font_family"
android:visibility="gone" /> android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <ImageView
android:id="@+id/crosspost_image_view_item_post_text_type" android:id="@+id/archived_image_view_item_post_text_type"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/crosspost" android:src="@drawable/ic_archive_outline"
android:visibility="gone" /> android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout> <ImageView
android:id="@+id/locked_image_view_item_post_text_type"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_outline_lock_24dp"
android:visibility="gone" />
<ImageView
android:id="@+id/crosspost_image_view_item_post_text_type"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_constraint_layout_item_post_text_type" android:id="@+id/bottom_constraint_layout_item_post_text_type"

233
app/src/main/res/layout/item_post_video_type_autoplay.xml
View File

@ -40,11 +40,25 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_type_autoplay" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_type_autoplay"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_video_type_autoplay" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_video_type_autoplay"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0" /> app:layout_constraintHorizontal_bias="0" />
<TextView
android:id="@+id/community_instance_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_type_autoplay"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/subreddit_name_text_view_item_post_video_type_autoplay"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_video_type_autoplay" android:id="@+id/user_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -55,41 +69,34 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_video_type_autoplay" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_video_type_autoplay"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_video_type_autoplay" app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_video_type_autoplay"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constrainedWidth="true" /> app:layout_constrainedWidth="true" />
<TextView
android:id="@+id/user_instance_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_video_type_autoplay"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_video_type_autoplay" />
<ImageView <ImageView
android:id="@+id/stickied_post_image_view_item_post_video_type_autoplay" android:id="@+id/stickied_post_image_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView
android:id="@+id/post_time_text_view_item_post_video_type_autoplay"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
@ -101,100 +108,118 @@
android:textSize="?attr/title_font_18" android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" /> android:fontFamily="?attr/title_font_family" />
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:padding="16dp"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<com.libRG.CustomTextView <TextView
android:id="@+id/type_text_view_item_post_video_type_autoplay" android:id="@+id/post_time_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginEnd="8dp"
android:text="@string/video"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:lib_setRadius="6dp" android:gravity="end"
app:lib_setRoundedView="true" android:textSize="?attr/font_default"
app:lib_setShape="rectangle" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.libRG.CustomTextView <com.nex3z.flowlayout.FlowLayout
android:id="@+id/spoiler_custom_text_view_item_post_video_type_autoplay" android:id="@+id/flowLayout4"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:padding="16dp"
android:text="@string/spoiler" app:flChildSpacing="16dp"
android:textSize="?attr/font_12" app:flChildSpacingForLastRow="align"
android:fontFamily="?attr/font_family" app:flRowSpacing="8dp">
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/nsfw_text_view_item_post_video_type_autoplay" android:id="@+id/type_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:text="@string/nsfw" android:padding="4dp"
android:textSize="?attr/font_12" android:text="@string/video"
android:fontFamily="?attr/font_family" android:textSize="?attr/font_12"
android:visibility="gone" app:lib_setRadius="6dp"
app:lib_setRadius="6dp" app:lib_setRoundedView="true"
app:lib_setRoundedView="true" app:lib_setShape="rectangle" />
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/flair_custom_text_view_item_post_video_type_autoplay" android:id="@+id/spoiler_custom_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="?attr/font_12" android:fontFamily="?attr/font_family"
android:fontFamily="?attr/font_family" android:padding="4dp"
android:padding="4dp" android:text="@string/spoiler"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/awards_text_view_item_post_video_type_autoplay" android:id="@+id/nsfw_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_12" android:padding="4dp"
android:fontFamily="?attr/font_family" android:text="@string/nsfw"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/archived_image_view_item_post_video_type_autoplay" android:id="@+id/flair_custom_text_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_archive_outline" android:layout_gravity="center"
android:visibility="gone" /> android:fontFamily="?attr/font_family"
android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/locked_image_view_item_post_video_type_autoplay" android:id="@+id/awards_text_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_lock_24dp" android:fontFamily="?attr/font_family"
android:visibility="gone" /> android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <ImageView
android:id="@+id/crosspost_image_view_item_post_video_type_autoplay" android:id="@+id/archived_image_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/crosspost" android:src="@drawable/ic_archive_outline"
android:visibility="gone" /> android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout> <ImageView
android:id="@+id/locked_image_view_item_post_video_type_autoplay"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_outline_lock_24dp"
android:visibility="gone" />
<ImageView
android:id="@+id/crosspost_image_view_item_post_video_type_autoplay"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.exoplayer2.ui.AspectRatioFrameLayout <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
android:id="@+id/aspect_ratio_frame_layout_item_post_video_type_autoplay" android:id="@+id/aspect_ratio_frame_layout_item_post_video_type_autoplay"

232
app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml
View File

@ -40,11 +40,25 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_type_autoplay" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_type_autoplay"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_video_type_autoplay" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_video_type_autoplay"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0" /> app:layout_constraintHorizontal_bias="0" />
<TextView
android:id="@+id/community_instance_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_video_type_autoplay"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/subreddit_name_text_view_item_post_video_type_autoplay"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_video_type_autoplay" android:id="@+id/user_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -55,41 +69,34 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_video_type_autoplay" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_video_type_autoplay"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_video_type_autoplay" app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_video_type_autoplay"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constrainedWidth="true" /> app:layout_constrainedWidth="true" />
<TextView
android:id="@+id/user_instance_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_video_type_autoplay"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_video_type_autoplay"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_video_type_autoplay" />
<ImageView <ImageView
android:id="@+id/stickied_post_image_view_item_post_video_type_autoplay" android:id="@+id/stickied_post_image_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView
android:id="@+id/post_time_text_view_item_post_video_type_autoplay"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
@ -101,100 +108,117 @@
android:textSize="?attr/title_font_18" android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" /> android:fontFamily="?attr/title_font_family" />
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:padding="16dp"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<com.libRG.CustomTextView <TextView
android:id="@+id/type_text_view_item_post_video_type_autoplay" android:id="@+id/post_time_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginEnd="8dp"
android:text="@string/video"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:lib_setRadius="6dp" android:gravity="end"
app:lib_setRoundedView="true" android:textSize="?attr/font_default"
app:lib_setShape="rectangle" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.libRG.CustomTextView <com.nex3z.flowlayout.FlowLayout
android:id="@+id/spoiler_custom_text_view_item_post_video_type_autoplay" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:padding="16dp"
android:text="@string/spoiler" app:flChildSpacing="16dp"
android:textSize="?attr/font_12" app:flChildSpacingForLastRow="align"
android:fontFamily="?attr/font_family" app:flRowSpacing="8dp">
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/nsfw_text_view_item_post_video_type_autoplay" android:id="@+id/type_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:text="@string/nsfw" android:padding="4dp"
android:textSize="?attr/font_12" android:text="@string/video"
android:fontFamily="?attr/font_family" android:textSize="?attr/font_12"
android:visibility="gone" app:lib_setRadius="6dp"
app:lib_setRadius="6dp" app:lib_setRoundedView="true"
app:lib_setRoundedView="true" app:lib_setShape="rectangle" />
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/flair_custom_text_view_item_post_video_type_autoplay" android:id="@+id/spoiler_custom_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="?attr/font_12" android:fontFamily="?attr/font_family"
android:fontFamily="?attr/font_family" android:padding="4dp"
android:padding="4dp" android:text="@string/spoiler"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/awards_text_view_item_post_video_type_autoplay" android:id="@+id/nsfw_text_view_item_post_video_type_autoplay"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_12" android:padding="4dp"
android:fontFamily="?attr/font_family" android:text="@string/nsfw"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/archived_image_view_item_post_video_type_autoplay" android:id="@+id/flair_custom_text_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_archive_outline" android:layout_gravity="center"
android:visibility="gone" /> android:fontFamily="?attr/font_family"
android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/locked_image_view_item_post_video_type_autoplay" android:id="@+id/awards_text_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_lock_24dp" android:fontFamily="?attr/font_family"
android:visibility="gone" /> android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <ImageView
android:id="@+id/crosspost_image_view_item_post_video_type_autoplay" android:id="@+id/archived_image_view_item_post_video_type_autoplay"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/crosspost" android:src="@drawable/ic_archive_outline"
android:visibility="gone" /> android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout> <ImageView
android:id="@+id/locked_image_view_item_post_video_type_autoplay"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_outline_lock_24dp"
android:visibility="gone" />
<ImageView
android:id="@+id/crosspost_image_view_item_post_video_type_autoplay"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.exoplayer2.ui.AspectRatioFrameLayout <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
android:id="@+id/aspect_ratio_frame_layout_item_post_video_type_autoplay" android:id="@+id/aspect_ratio_frame_layout_item_post_video_type_autoplay"

233
app/src/main/res/layout/item_post_with_preview.xml
View File

@ -40,10 +40,24 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_with_preview" app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_with_preview"
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_with_preview" app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_with_preview"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_with_preview"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0"/> app:layout_constraintHorizontal_bias="0" />
<TextView
android:id="@+id/community_instance_text_view_item_post_with_preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_with_preview"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_with_preview"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/subreddit_name_text_view_item_post_with_preview"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/user_text_view_item_post_with_preview" android:id="@+id/user_text_view_item_post_with_preview"
@ -55,41 +69,34 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_with_preview" app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_with_preview"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_with_preview"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_with_preview" app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_with_preview"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
app:layout_constrainedWidth="true" /> app:layout_constrainedWidth="true" />
<TextView
android:id="@+id/user_instance_text_view_item_post_with_preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:fontFamily="?attr/font_family"
android:textSize="?attr/font_default"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_with_preview"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/user_text_view_item_post_with_preview"
app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_with_preview" />
<ImageView <ImageView
android:id="@+id/stickied_post_image_view_item_post_with_preview" android:id="@+id/stickied_post_image_view_item_post_with_preview"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView
android:id="@+id/post_time_text_view_item_post_with_preview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
@ -101,99 +108,117 @@
android:textSize="?attr/title_font_18" android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" /> android:fontFamily="?attr/title_font_family" />
<com.nex3z.flowlayout.FlowLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:padding="16dp"
app:flChildSpacing="16dp"
app:flChildSpacingForLastRow="align"
app:flRowSpacing="8dp">
<com.libRG.CustomTextView <TextView
android:id="@+id/type_text_view_item_post_with_preview" android:id="@+id/post_time_text_view_item_post_with_preview"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:layout_marginEnd="8dp"
android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:lib_setRadius="6dp" android:gravity="end"
app:lib_setRoundedView="true" android:textSize="?attr/font_default"
app:lib_setShape="rectangle" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/flowLayout3"
app:layout_constraintTop_toTopOf="parent" />
<com.libRG.CustomTextView <com.nex3z.flowlayout.FlowLayout
android:id="@+id/spoiler_custom_text_view_item_post_with_preview" android:id="@+id/flowLayout3"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:padding="16dp"
android:text="@string/spoiler" app:flChildSpacing="16dp"
android:textSize="?attr/font_12" app:flChildSpacingForLastRow="align"
android:fontFamily="?attr/font_family" app:flRowSpacing="8dp">
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/nsfw_text_view_item_post_with_preview" android:id="@+id/type_text_view_item_post_with_preview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:text="@string/nsfw" android:padding="4dp"
android:textSize="?attr/font_12" android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" app:lib_setRadius="6dp"
android:visibility="gone" app:lib_setRoundedView="true"
app:lib_setRadius="6dp" app:lib_setShape="rectangle" />
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/flair_custom_text_view_item_post_with_preview" android:id="@+id/spoiler_custom_text_view_item_post_with_preview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="?attr/font_12" android:fontFamily="?attr/font_family"
android:fontFamily="?attr/font_family" android:padding="4dp"
android:padding="4dp" android:text="@string/spoiler"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<com.libRG.CustomTextView <com.libRG.CustomTextView
android:id="@+id/awards_text_view_item_post_with_preview" android:id="@+id/nsfw_text_view_item_post_with_preview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:fontFamily="?attr/font_family"
android:textSize="?attr/font_12" android:padding="4dp"
android:fontFamily="?attr/font_family" android:text="@string/nsfw"
android:visibility="gone" android:textSize="?attr/font_12"
app:lib_setRadius="6dp" android:visibility="gone"
app:lib_setRoundedView="true" app:lib_setRadius="6dp"
app:lib_setShape="rectangle" /> app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/archived_image_view_item_post_with_preview" android:id="@+id/flair_custom_text_view_item_post_with_preview"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_archive_outline" android:layout_gravity="center"
android:visibility="gone" /> android:fontFamily="?attr/font_family"
android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <com.libRG.CustomTextView
android:id="@+id/locked_image_view_item_post_with_preview" android:id="@+id/awards_text_view_item_post_with_preview"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_lock_24dp" android:fontFamily="?attr/font_family"
android:visibility="gone" /> android:padding="4dp"
android:textSize="?attr/font_12"
android:visibility="gone"
app:lib_setRadius="6dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
<ImageView <ImageView
android:id="@+id/crosspost_image_view_item_post_with_preview" android:id="@+id/archived_image_view_item_post_with_preview"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/crosspost" android:src="@drawable/ic_archive_outline"
android:visibility="gone" /> android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout> <ImageView
android:id="@+id/locked_image_view_item_post_with_preview"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_outline_lock_24dp"
android:visibility="gone" />
<ImageView
android:id="@+id/crosspost_image_view_item_post_with_preview"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/link_text_view_item_post_with_preview" android:id="@+id/link_text_view_item_post_with_preview"