diff options
Diffstat (limited to '')
4 files changed, 364 insertions, 349 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java index 98355c69..2b65b05a 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java @@ -898,8 +898,8 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView ((PostCompactViewHolder) holder).linkTextView.setVisibility(View.VISIBLE); String noPreviewLinkDomain = Uri.parse(noPreviewLinkUrl).getHost(); ((PostCompactViewHolder) holder).linkTextView.setText(noPreviewLinkDomain); - ((PostCompactViewHolder) holder).noPreviewLinkImageView.setVisibility(View.VISIBLE); - ((PostCompactViewHolder) holder).noPreviewLinkImageView.setOnClickListener(view -> { + ((PostCompactViewHolder) holder).noPreviewLinkImageFrameLayout.setVisibility(View.VISIBLE); + ((PostCompactViewHolder) holder).noPreviewLinkImageFrameLayout.setOnClickListener(view -> { Intent intent = new Intent(mActivity, LinkResolverActivity.class); Uri uri = Uri.parse(post.getUrl()); if (uri.getScheme() == null && uri.getHost() == null) { @@ -1385,7 +1385,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView ((PostCompactViewHolder) holder).progressBar.setVisibility(View.GONE); ((PostCompactViewHolder) holder).imageView.setVisibility(View.GONE); ((PostCompactViewHolder) holder).playButtonImageView.setVisibility(View.GONE); - ((PostCompactViewHolder) holder).noPreviewLinkImageView.setVisibility(View.GONE); + ((PostCompactViewHolder) holder).noPreviewLinkImageFrameLayout.setVisibility(View.GONE); ((PostCompactViewHolder) holder).upvoteButton.setColorFilter(mPostIconAndInfoColor, android.graphics.PorterDuff.Mode.SRC_IN); ((PostCompactViewHolder) holder).scoreTextView.setTextColor(mPostIconAndInfoColor); ((PostCompactViewHolder) holder).downvoteButton.setColorFilter(mPostIconAndInfoColor, android.graphics.PorterDuff.Mode.SRC_IN); @@ -2576,6 +2576,8 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView ImageView imageView; @BindView(R.id.play_button_image_view_item_post_compact) ImageView playButtonImageView; + @BindView(R.id.frame_layout_image_view_no_preview_link_item_post_compact) + FrameLayout noPreviewLinkImageFrameLayout; @BindView(R.id.image_view_no_preview_link_item_post_compact) ImageView noPreviewLinkImageView; @BindView(R.id.barrier2) @@ -2634,11 +2636,11 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView constraintSet.clear(linkTextView.getId(), ConstraintSet.END); constraintSet.clear(relativeLayout.getId(), ConstraintSet.START); constraintSet.clear(relativeLayout.getId(), ConstraintSet.END); - constraintSet.clear(noPreviewLinkImageView.getId(), ConstraintSet.START); - constraintSet.clear(noPreviewLinkImageView.getId(), ConstraintSet.END); + constraintSet.clear(noPreviewLinkImageFrameLayout.getId(), ConstraintSet.START); + constraintSet.clear(noPreviewLinkImageFrameLayout.getId(), ConstraintSet.END); int barrierId = 1234; constraintSet.createBarrier(barrierId, Barrier.END, R.id.image_view_wrapper_item_post_compact, - R.id.image_view_no_preview_link_item_post_compact); + R.id.frame_layout_image_view_no_preview_link_item_post_compact); constraintSet.connect(titleTextView.getId(), ConstraintSet.START, barrierId, ConstraintSet.END); constraintSet.connect(titleTextView.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END); constraintSet.connect(R.id.flow_layout_item_post_compact, ConstraintSet.START, barrierId, ConstraintSet.END); @@ -2648,11 +2650,13 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView constraintSet.connect(linkTextView.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END); constraintSet.connect(relativeLayout.getId(), ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START); constraintSet.connect(relativeLayout.getId(), ConstraintSet.END, barrierId, ConstraintSet.START); - constraintSet.connect(noPreviewLinkImageView.getId(), ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START); - constraintSet.connect(noPreviewLinkImageView.getId(), ConstraintSet.END, barrierId, ConstraintSet.START); + constraintSet.connect(noPreviewLinkImageFrameLayout.getId(), ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START); + constraintSet.connect(noPreviewLinkImageFrameLayout.getId(), ConstraintSet.END, barrierId, ConstraintSet.START); constraintSet.applyTo(titleAndImageConstraintLayout); - ((ConstraintLayout.LayoutParams) relativeLayout.getLayoutParams()).leftMargin = (int) Utils.convertDpToPixel(16, mActivity); + int leftMargin = (int) Utils.convertDpToPixel(16, mActivity); + ((ConstraintLayout.LayoutParams) relativeLayout.getLayoutParams()).leftMargin = leftMargin; + ((ConstraintLayout.LayoutParams) noPreviewLinkImageFrameLayout.getLayoutParams()).leftMargin = leftMargin; } itemView.setBackgroundTintList(ColorStateList.valueOf(mCardViewBackgroundColor)); @@ -2688,6 +2692,10 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView saveButton.setColorFilter(mPostIconAndInfoColor, android.graphics.PorterDuff.Mode.SRC_IN); shareButton.setColorFilter(mPostIconAndInfoColor, android.graphics.PorterDuff.Mode.SRC_IN); divider.setBackgroundColor(mDividerColor); + + imageView.setClipToOutline(true); + noPreviewLinkImageFrameLayout.setClipToOutline(true); + } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java index 73854808..23bd9910 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; import ml.docilealligator.infinityforreddit.Utils.JSONUtils; +import ml.docilealligator.infinityforreddit.Utils.Utils; class ParseSubredditData { static void parseSubredditData(String response, ParseSubredditDataListener parseSubredditDataListener) { @@ -24,7 +25,7 @@ class ParseSubredditData { String id = subredditDataJsonObject.getString(JSONUtils.NAME_KEY); String subredditFullName = subredditDataJsonObject.getString(JSONUtils.DISPLAY_NAME_KEY); String description = subredditDataJsonObject.getString(JSONUtils.PUBLIC_DESCRIPTION_KEY).trim(); - String sidebarDescription = subredditDataJsonObject.getString(JSONUtils.DESCRIPTION_KEY).trim(); + String sidebarDescription = Utils.modifyMarkdown(subredditDataJsonObject.getString(JSONUtils.DESCRIPTION_KEY).trim()); long createdUTC = subredditDataJsonObject.getLong(JSONUtils.CREATED_UTC_KEY) * 1000; String bannerImageUrl; diff --git a/app/src/main/res/drawable/thumbnail_compact_layout_rounded_edge.xml b/app/src/main/res/drawable/thumbnail_compact_layout_rounded_edge.xml new file mode 100644 index 00000000..6543b1e7 --- /dev/null +++ b/app/src/main/res/drawable/thumbnail_compact_layout_rounded_edge.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <corners android:radius="8dp"/> + <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" /> +</shape>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index 59444cef..1cee1578 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -1,387 +1,388 @@ <?xml version="1.0" encoding="utf-8"?> -<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="?attr/cardViewBackgroundColor" - xmlns:tools="http://schemas.android.com/tools"> + android:orientation="vertical"> - <LinearLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:paddingStart="16dp" + android:paddingTop="8dp" + android:paddingEnd="16dp" + android:paddingBottom="8dp"> + + <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView + android:id="@+id/icon_gif_image_view_item_post_compact" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/name_text_view_item_post_compact" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginStart="16dp" + android:layout_marginEnd="8dp" + android:fontFamily="?attr/font_family" + android:textColor="#E91E63" + android:textSize="?attr/font_default" + app:layout_constraintBottom_toBottomOf="parent" + 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_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/stickied_post_image_view_item_post_compact" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginEnd="8dp" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/guideline2" + app:layout_constraintStart_toEndOf="@id/name_text_view_item_post_compact" + 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_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 - android:layout_width="match_parent" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/title_and_image_constraint_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/title_text_view_item_post_compact" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:fontFamily="?attr/title_font_family" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/title_font_18" + app:layout_constraintBottom_toTopOf="@id/flow_layout_item_post_compact" + app:layout_constraintEnd_toStartOf="@id/barrier2" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.nex3z.flowlayout.FlowLayout + android:id="@+id/flow_layout_item_post_compact" + android:layout_width="0dp" android:layout_height="wrap_content" + android:paddingStart="16dp" android:paddingTop="8dp" + android:paddingEnd="16dp" android:paddingBottom="8dp" - android:paddingStart="16dp" - android:paddingEnd="16dp"> - - <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView - android:id="@+id/icon_gif_image_view_item_post_compact" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_gravity="center" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/name_text_view_item_post_compact" - android:layout_width="0dp" + app:flChildSpacing="8dp" + app:flChildSpacingForLastRow="align" + app:flRowSpacing="8dp" + app:layout_constraintBottom_toTopOf="@id/link_text_view_item_post_compact" + app:layout_constraintEnd_toStartOf="@id/barrier2" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/title_text_view_item_post_compact"> + + <com.libRG.CustomTextView + android:id="@+id/type_text_view_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="?attr/font_family" + android:padding="4dp" + android:textSize="?attr/font_10" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + <com.libRG.CustomTextView + android:id="@+id/spoiler_custom_text_view_item_post_compact" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginStart="16dp" - android:layout_marginEnd="8dp" - android:textColor="#E91E63" - android:textSize="?attr/font_default" android:fontFamily="?attr/font_family" - app:layout_constraintBottom_toBottomOf="parent" - 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_constraintTop_toTopOf="parent" /> + android:padding="4dp" + android:text="@string/spoiler" + android:textSize="?attr/font_10" + android:visibility="gone" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> - <ImageView - android:id="@+id/stickied_post_image_view_item_post_compact" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginEnd="8dp" + <com.libRG.CustomTextView + android:id="@+id/nsfw_text_view_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="?attr/font_family" + android:padding="4dp" + android:text="@string/nsfw" + android:textSize="?attr/font_10" android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/guideline2" - app:layout_constraintStart_toEndOf="@id/name_text_view_item_post_compact" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/post_time_text_view_item_post_compact" - android:layout_width="0dp" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + <com.libRG.CustomTextView + android:id="@+id/flair_custom_text_view_item_post_compact" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="end" - android:textSize="?attr/font_default" + android:layout_gravity="center" 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" /> + android:padding="4dp" + android:textSize="?attr/font_10" + android:visibility="gone" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline2" + <com.libRG.CustomTextView + android:id="@+id/awards_text_view_item_post_compact" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.6" /> + android:fontFamily="?attr/font_family" + android:padding="4dp" + android:textSize="?attr/font_10" + android:visibility="gone" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> - </androidx.constraintlayout.widget.ConstraintLayout> + <ImageView + android:id="@+id/archived_image_view_item_post_compact" + android:layout_width="24dp" + android:layout_height="24dp" + android:src="@drawable/ic_archive_outline" + android:visibility="gone" /> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/title_and_image_constraint_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <ImageView + android:id="@+id/locked_image_view_item_post_compact" + android:layout_width="24dp" + android:layout_height="24dp" + android:src="@drawable/ic_outline_lock_24dp" + android:visibility="gone" /> - <TextView - android:id="@+id/title_text_view_item_post_compact" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/title_font_18" - android:fontFamily="?attr/title_font_family" - app:layout_constraintBottom_toTopOf="@id/flow_layout_item_post_compact" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/barrier2" - app:layout_constraintTop_toTopOf="parent" /> - - <com.nex3z.flowlayout.FlowLayout - android:id="@+id/flow_layout_item_post_compact" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" - app:layout_constraintTop_toBottomOf="@id/title_text_view_item_post_compact" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/barrier2" - app:layout_constraintBottom_toTopOf="@id/link_text_view_item_post_compact" - app:flChildSpacing="8dp" - app:flChildSpacingForLastRow="align" - app:flRowSpacing="8dp"> - - <com.libRG.CustomTextView - android:id="@+id/type_text_view_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_10" - android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - - <com.libRG.CustomTextView - android:id="@+id/spoiler_custom_text_view_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:padding="4dp" - android:text="@string/spoiler" - android:textSize="?attr/font_10" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="3dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - - <com.libRG.CustomTextView - android:id="@+id/nsfw_text_view_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:text="@string/nsfw" - android:textSize="?attr/font_10" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="3dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - - <com.libRG.CustomTextView - android:id="@+id/flair_custom_text_view_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:padding="4dp" - android:textSize="?attr/font_10" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="3dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - - <com.libRG.CustomTextView - android:id="@+id/awards_text_view_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:textSize="?attr/font_10" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="3dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> + <ImageView + android:id="@+id/crosspost_image_view_item_post_compact" + android:layout_width="24dp" + android:layout_height="24dp" + android:src="@drawable/crosspost" + android:visibility="gone" /> - <ImageView - android:id="@+id/archived_image_view_item_post_compact" - android:layout_width="24dp" - android:layout_height="24dp" - android:src="@drawable/ic_archive_outline" - android:visibility="gone" /> + </com.nex3z.flowlayout.FlowLayout> + + <TextView + android:id="@+id/link_text_view_item_post_compact" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:fontFamily="?attr/font_family" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:textSize="?attr/font_12" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/barrier2" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/flow_layout_item_post_compact" /> + + <RelativeLayout + android:id="@+id/image_view_wrapper_item_post_compact" + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginEnd="16dp" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/barrier2" + app:layout_constraintTop_toTopOf="parent"> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> <ImageView - android:id="@+id/locked_image_view_item_post_compact" - android:layout_width="24dp" - android:layout_height="24dp" - android:src="@drawable/ic_outline_lock_24dp" - android:visibility="gone" /> + android:id="@+id/image_view_item_post_compact" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/thumbnail_compact_layout_rounded_edge" + android:scaleType="center" /> <ImageView - android:id="@+id/crosspost_image_view_item_post_compact" - android:layout_width="24dp" - android:layout_height="24dp" - android:src="@drawable/crosspost" + android:id="@+id/play_button_image_view_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_margin="0dp" + android:background="@drawable/play_button_round_background" + android:src="@drawable/ic_play_circle_36dp" android:visibility="gone" /> - </com.nex3z.flowlayout.FlowLayout> + </FrameLayout> - <TextView - android:id="@+id/link_text_view_item_post_compact" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:textSize="?attr/font_12" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:layout_constraintTop_toBottomOf="@id/flow_layout_item_post_compact" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/barrier2" - app:layout_constraintBottom_toBottomOf="parent" /> + <ProgressBar + android:id="@+id/progress_bar_item_post_compact" + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_centerInParent="true" + android:visibility="gone" /> - <RelativeLayout - android:id="@+id/image_view_wrapper_item_post_compact" - android:layout_width="72dp" - android:layout_height="72dp" - android:layout_marginEnd="16dp" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/barrier2" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent"> + </RelativeLayout> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ImageView - android:id="@+id/image_view_item_post_compact" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="center" /> - - <ImageView - android:id="@+id/play_button_image_view_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="0dp" - android:layout_gravity="center" - android:background="@drawable/play_button_round_background" - android:src="@drawable/ic_play_circle_36dp" - android:visibility="gone" /> - - </FrameLayout> - - <ProgressBar - android:id="@+id/progress_bar_item_post_compact" - android:layout_width="36dp" - android:layout_height="36dp" - android:layout_centerInParent="true" - android:visibility="gone" /> - - </RelativeLayout> + <FrameLayout + android:id="@+id/frame_layout_image_view_no_preview_link_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:visibility="gone" + android:background="@drawable/thumbnail_compact_layout_rounded_edge" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/barrier2" + app:layout_constraintTop_toTopOf="parent"> <ImageView android:id="@+id/image_view_no_preview_link_item_post_compact" android:layout_width="72dp" android:layout_height="72dp" - android:layout_marginEnd="16dp" android:scaleType="center" android:src="@drawable/ic_link" - android:tint="@android:color/tab_indicator_text" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/barrier2" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:tint="@android:color/tab_indicator_text" /> - <androidx.constraintlayout.widget.Barrier - android:id="@+id/barrier2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:barrierDirection="start" - app:constraint_referenced_ids="image_view_wrapper_item_post_compact,image_view_no_preview_link_item_post_compact" /> + </FrameLayout> - </androidx.constraintlayout.widget.ConstraintLayout> + <androidx.constraintlayout.widget.Barrier + android:id="@+id/barrier2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="start" + app:constraint_referenced_ids="image_view_wrapper_item_post_compact,frame_layout_image_view_no_preview_link_item_post_compact" /> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/bottom_constraint_layout_item_post_compact" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + </androidx.constraintlayout.widget.ConstraintLayout> - <ImageView - android:id="@+id/plus_button_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="12dp" - android:paddingEnd="12dp" - android:src="@drawable/ic_arrow_upward_grey_24dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/score_text_view_item_post_compact" - android:layout_width="64dp" - android:layout_height="wrap_content" - android:gravity="center" - android:textSize="?attr/font_12" - android:textStyle="bold" - android:fontFamily="?attr/font_family" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/plus_button_item_post_compact" - app:layout_constraintTop_toTopOf="parent" /> + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/bottom_constraint_layout_item_post_compact" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <ImageView - android:id="@+id/minus_button_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="12dp" - android:paddingEnd="12dp" - android:src="@drawable/ic_arrow_downward_grey_24dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_compact" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/comments_count_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:drawableStart="@drawable/ic_comment_grey_24dp" - android:drawablePadding="12dp" - android:gravity="center_vertical" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="12dp" - android:paddingEnd="12dp" - android:textSize="?attr/font_12" - android:textStyle="bold" - android:fontFamily="?attr/font_family" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/minus_button_item_post_compact" - app:layout_constraintTop_toTopOf="parent" /> + <ImageView + android:id="@+id/plus_button_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp" + android:src="@drawable/ic_arrow_upward_grey_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/score_text_view_item_post_compact" + android:layout_width="64dp" + android:layout_height="wrap_content" + android:fontFamily="?attr/font_family" + android:gravity="center" + android:textSize="?attr/font_12" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/plus_button_item_post_compact" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/minus_button_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp" + android:src="@drawable/ic_arrow_downward_grey_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_compact" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/comments_count_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawableStart="@drawable/ic_comment_grey_24dp" + android:drawablePadding="12dp" + android:fontFamily="?attr/font_family" + android:gravity="center_vertical" + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp" + android:textSize="?attr/font_12" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/minus_button_item_post_compact" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/save_button_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/share_button_item_post_compact" + app:layout_constraintHorizontal_bias="1" + app:layout_constraintStart_toEndOf="@id/comments_count_item_post_compact" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/share_button_item_post_compact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp" + android:src="@drawable/ic_share_grey_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <ImageView - android:id="@+id/save_button_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="12dp" - android:paddingEnd="12dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/share_button_item_post_compact" - app:layout_constraintHorizontal_bias="1" - app:layout_constraintStart_toEndOf="@id/comments_count_item_post_compact" - app:layout_constraintTop_toTopOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout> - <ImageView - android:id="@+id/share_button_item_post_compact" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="12dp" - android:paddingEnd="12dp" - android:src="@drawable/ic_share_grey_24dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - - <View - android:id="@+id/divider_item_post_compact" - android:layout_width="match_parent" - android:layout_height="1dp" /> - - </LinearLayout> - -</com.google.android.material.card.MaterialCardView>
\ No newline at end of file + <View + android:id="@+id/divider_item_post_compact" + android:layout_width="match_parent" + android:layout_height="1dp" /> + +</LinearLayout>
\ No newline at end of file |