Start adding Card Layout 2.

4 files changed, 440 insertions, 72 deletions

diff --git a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml
index 760a5ea3..3cf40d28 100644
--- a/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_post_layot_bottom_sheet.xml
@@ -60,6 +60,22 @@
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family" />
 
+        <TextView
+            android:id="@+id/card_layout_2_text_view_post_layout_bottom_sheet_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:paddingStart="32dp"
+            android:paddingTop="16dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="16dp"
+            android:text="@string/post_layout_card_2"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family" />
+
     </LinearLayout>
 
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_post_card_2_with_preview.xml b/app/src/main/res/layout/item_post_card_2_with_preview.xml
new file mode 100644
index 00000000..8a5fe64e
--- /dev/null
+++ b/app/src/main/res/layout/item_post_card_2_with_preview.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:id="@+id/card_view_item_post_card_2_with_preview"
+    android:orientation="vertical">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/image_wrapper_relative_layout_item_post_card_2_with_preview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:cardElevation="2dp"
+        app:cardCornerRadius="8dp"
+        android:visibility="gone">
+
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
+            android:id="@+id/image_view_item_post_card_2_with_preview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitStart" />
+
+        <ImageView
+            android:id="@+id/video_or_gif_indicator_image_view_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:layout_gravity="start"
+            android:background="@drawable/play_button_round_background"
+            android:src="@drawable/ic_play_circle_36dp"
+            android:visibility="gone" />
+
+        <ProgressBar
+            android:id="@+id/progress_bar_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true" />
+
+        <RelativeLayout
+            android:id="@+id/load_image_error_relative_layout_item_post_card_2_with_preview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/load_image_error_text_view_item_post_card_2_with_preview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawableTop="@drawable/ic_error_outline_black_24dp"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/error_loading_image_tap_to_retry"
+                android:textSize="?attr/font_default"
+                android:fontFamily="?attr/font_family" />
+
+        </RelativeLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <ImageView
+        android:id="@+id/image_view_no_preview_gallery_item_post_card_2_with_preview"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:scaleType="center"
+        android:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+
+        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
+            android:id="@+id/icon_gif_image_view_item_post_card_2_with_preview"
+            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/subreddit_name_text_view_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family"
+            app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_card_2_with_preview"
+            app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_card_2_with_preview"
+            app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_card_2_with_preview"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="0"/>
+
+        <TextView
+            android:id="@+id/user_text_view_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_card_2_with_preview"
+            app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_card_2_with_preview"
+            app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_card_2_with_preview"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constrainedWidth="true" />
+
+        <ImageView
+            android:id="@+id/stickied_post_image_view_item_post_card_2_with_preview"
+            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_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/post_time_text_view_item_post_card_2_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>
+
+    <TextView
+        android:id="@+id/title_text_view_item_post_card_2_with_preview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textSize="?attr/title_font_18"
+        android:fontFamily="?attr/title_font_family" />
+
+    <TextView
+        android:id="@+id/content_text_view_item_post_card_2_with_preview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:maxLines="4"
+        android:visibility="gone"
+        android:textSize="?attr/content_font_default"
+        android:fontFamily="?attr/content_font_family"
+        android:ellipsize="end" />
+
+    <com.nex3z.flowlayout.FlowLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        app:flChildSpacing="16dp"
+        app:flChildSpacingForLastRow="align"
+        app:flRowSpacing="8dp">
+
+        <com.libRG.CustomTextView
+            android:id="@+id/type_text_view_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="4dp"
+            android:text="@string/gallery"
+            android:textSize="?attr/font_12"
+            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_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/spoiler"
+            android:textSize="?attr/font_12"
+            android:fontFamily="?attr/font_family"
+            android:padding="4dp"
+            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_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="4dp"
+            android:text="@string/nsfw"
+            android:textSize="?attr/font_12"
+            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_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textSize="?attr/font_12"
+            android:fontFamily="?attr/font_family"
+            android:padding="4dp"
+            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_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="4dp"
+            android:textSize="?attr/font_12"
+            android:fontFamily="?attr/font_family"
+            android:visibility="gone"
+            app:lib_setRadius="3dp"
+            app:lib_setRoundedView="true"
+            app:lib_setShape="rectangle" />
+
+        <ImageView
+            android:id="@+id/archived_image_view_item_post_card_2_with_preview"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/ic_archive_outline"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/locked_image_view_item_post_card_2_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_card_2_with_preview"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/crosspost"
+            android:visibility="gone" />
+
+    </com.nex3z.flowlayout.FlowLayout>
+
+    <TextView
+        android:id="@+id/link_text_view_item_post_card_2_with_preview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textSize="?attr/font_12"
+        android:fontFamily="?attr/font_family"
+        android:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/bottom_constraint_layout_item_post_card_2_with_preview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/plus_button_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:src="@drawable/ic_arrow_upward_grey_24dp"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/score_text_view_item_post_card_2_with_preview"
+            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_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/plus_button_item_post_card_2_with_preview" />
+
+        <ImageView
+            android:id="@+id/minus_button_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:src="@drawable/ic_arrow_downward_grey_24dp"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_with_preview" />
+
+        <TextView
+            android:id="@+id/comments_count_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:gravity="center_vertical"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            android:fontFamily="?attr/font_family"
+            android:drawableStart="@drawable/ic_comment_grey_24dp"
+            android:drawablePadding="12dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_with_preview" />
+
+        <ImageView
+            android:id="@+id/save_button_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/comments_count_item_post_card_2_with_preview"
+            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_with_preview" />
+
+        <ImageView
+            android:id="@+id/share_button_item_post_card_2_with_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:src="@drawable/ic_share_grey_24dp"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:id="@+id/divider_item_post_card_2_with_preview"
+        android:layout_width="match_parent"
+        android:layout_height="1dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_post_gallery.xml b/app/src/main/res/layout/item_post_gallery.xml
index 4d40c4d8..3d32cd04 100644
--- a/app/src/main/res/layout/item_post_gallery.xml
+++ b/app/src/main/res/layout/item_post_gallery.xml
@@ -8,73 +8,67 @@
     app:cardElevation="2dp"
     app:cardCornerRadius="8dp">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ProgressBar
-            android:id="@+id/progress_bar_item_post_gallery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone" />
-
-        <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
-            android:id="@+id/image_view_item_post_gallery"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/image_view_no_preview_item_post_gallery"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:scaleType="center"
-            android:background="@drawable/thumbnail_compact_layout_rounded_edge"
-            android:visibility="gone" />
+    <ProgressBar
+        android:id="@+id/progress_bar_item_post_gallery"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
 
-        <ImageView
-            android:id="@+id/video_or_gif_indicator_image_view_item_post_gallery"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_margin="16dp"
-            android:layout_gravity="start"
-            android:scaleType="center"
-            android:background="@drawable/play_button_round_background"
-            android:visibility="gone" />
+    <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
+        android:id="@+id/image_view_item_post_gallery"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
 
-        <RelativeLayout
-            android:id="@+id/load_image_error_relative_layout_item_post_gallery"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:visibility="gone">
+    <ImageView
+        android:id="@+id/image_view_no_preview_item_post_gallery"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:scaleType="center"
+        android:background="@drawable/thumbnail_compact_layout_rounded_edge"
+        android:visibility="gone" />
 
-            <TextView
-                android:id="@+id/load_image_error_text_view_item_gallery"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:drawableTopCompat="@drawable/ic_error_outline_black_24dp"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/error_loading_image_tap_to_retry"
-                android:textSize="?attr/font_default"
-                android:fontFamily="?attr/font_family" />
+    <ImageView
+        android:id="@+id/video_or_gif_indicator_image_view_item_post_gallery"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_margin="16dp"
+        android:layout_gravity="start"
+        android:scaleType="center"
+        android:background="@drawable/play_button_round_background"
+        android:visibility="gone" />
 
-        </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/load_image_error_relative_layout_item_post_gallery"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:visibility="gone">
 
         <TextView
-            android:id="@+id/title_text_view_item_post_gallery"
+            android:id="@+id/load_image_error_text_view_item_gallery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textSize="?attr/title_font_18"
-            android:fontFamily="?attr/title_font_family"
-            android:visibility="gone" />
+            app:drawableTopCompat="@drawable/ic_error_outline_black_24dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text="@string/error_loading_image_tap_to_retry"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family" />
 
-    </FrameLayout>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/title_text_view_item_post_gallery"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textSize="?attr/title_font_18"
+        android:fontFamily="?attr/title_font_family"
+        android:visibility="gone" />
 
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_post_with_preview.xml b/app/src/main/res/layout/item_post_with_preview.xml
index 5cec4cfa..5782403c 100644
--- a/app/src/main/res/layout/item_post_with_preview.xml
+++ b/app/src/main/res/layout/item_post_with_preview.xml
@@ -101,19 +101,6 @@
             android:textSize="?attr/title_font_18"
             android:fontFamily="?attr/title_font_family" />
 
-        <TextView
-            android:id="@+id/content_text_view_item_post_with_preview"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:maxLines="4"
-            android:visibility="gone"
-            android:textSize="?attr/content_font_default"
-            android:fontFamily="?attr/content_font_family"
-            android:ellipsize="end" />
-
         <com.nex3z.flowlayout.FlowLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"