Continue adding Card Layout 3.

2 files changed, 117 insertions, 174 deletions

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
index bce379ef..26a12c88 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
@@ -93,6 +93,7 @@ import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView;
 import ml.docilealligator.infinityforreddit.customviews.LinearLayoutManagerBugFixed;
 import ml.docilealligator.infinityforreddit.databinding.ItemPostCard2GalleryTypeBinding;
+import ml.docilealligator.infinityforreddit.databinding.ItemPostCard3TextBinding;
 import ml.docilealligator.infinityforreddit.databinding.ItemPostCard3WithPreviewBinding;
 import ml.docilealligator.infinityforreddit.databinding.ItemPostGalleryGalleryTypeBinding;
 import ml.docilealligator.infinityforreddit.databinding.ItemPostGalleryTypeBinding;
@@ -487,7 +488,8 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
         } else if (viewType == VIEW_TYPE_POST_CARD_GALLERY_TYPE) {
             return new PostGalleryTypeViewHolder(ItemPostGalleryTypeBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
         } else if (viewType == VIEW_TYPE_POST_CARD_TEXT_TYPE) {
-            return new PostTextTypeViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_text, parent, false));
+            //return new PostTextTypeViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_text, parent, false));
+            return new PostMaterial3CardTextTypeViewHolder(ItemPostCard3TextBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
         } else if (viewType == VIEW_TYPE_POST_COMPACT) {
             if (mShowThumbnailOnTheRightInCompactLayout) {
                 return new PostCompactRightThumbnailViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_compact_right_thumbnail, parent, false));
@@ -6350,4 +6352,33 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
             };
         }
     }
+
+    class PostMaterial3CardTextTypeViewHolder extends PostMaterial3CardBaseViewHolder {
+
+        ItemPostCard3TextBinding binding;
+
+        PostMaterial3CardTextTypeViewHolder(@NonNull ItemPostCard3TextBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+            setBaseView(
+                    binding.iconGifImageViewItemPostCard3TextType,
+                    binding.subredditNameTextViewItemPostCard3TextType,
+                    binding.userTextViewItemPostCard3TextType,
+                    binding.stickiedPostImageViewItemPostCard3TextType,
+                    binding.postTimeTextViewItemPostCard3TextType,
+                    binding.titleTextViewItemPostCard3TextType,
+                    binding.bottomConstraintLayoutItemPostCard3TextType,
+                    binding.voteButtonToggleItemPostCard3TextType,
+                    binding.upvoteButtonItemPostCard3TextType,
+                    binding.downvoteButtonItemPostCard3TextType,
+                    binding.commentsCountButtonItemPostCard3TextType,
+                    binding.saveButtonItemPostCard3TextType,
+                    binding.shareButtonItemPostCard3TextType);
+
+            if (mActivity.contentTypeface != null) {
+                binding.contentTextViewItemPostCard3TextType.setTypeface(mActivity.titleTypeface);
+            }
+            binding.contentTextViewItemPostCard3TextType.setTextColor(mPostContentColor);
+        }
+    }
 }
diff --git a/app/src/main/res/layout/item_post_card_3_text.xml b/app/src/main/res/layout/item_post_card_3_text.xml
index 80f1b927..769a61d8 100644
--- a/app/src/main/res/layout/item_post_card_3_text.xml
+++ b/app/src/main/res/layout/item_post_card_3_text.xml
@@ -4,8 +4,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_margin="8dp"
-    app:cardCornerRadius="16dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    app:cardCornerRadius="12dp"
     app:cardBackgroundColor="#FBEEFC"
     style="?attr/materialCardViewFilledStyle">
 
@@ -20,7 +23,7 @@
             android:padding="16dp">
 
             <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
-                android:id="@+id/icon_gif_image_view_item_post_text_type"
+                android:id="@+id/icon_gif_image_view_item_post_card_3_text_type"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center"
@@ -29,7 +32,7 @@
                 app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
-                android:id="@+id/subreddit_name_text_view_item_post_text_type"
+                android:id="@+id/subreddit_name_text_view_item_post_card_3_text_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -37,15 +40,15 @@
                 android:layout_marginEnd="8dp"
                 android:textSize="?attr/font_default"
                 android:fontFamily="?attr/font_family"
-                app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_text_type"
-                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_constraintBottom_toTopOf="@id/user_text_view_item_post_card_3_text_type"
+                app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_card_3_text_type"
+                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_card_3_text_type"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintHorizontal_bias="0" />
 
             <TextView
-                android:id="@+id/user_text_view_item_post_text_type"
+                android:id="@+id/user_text_view_item_post_card_3_text_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -53,14 +56,14 @@
                 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_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_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_card_3_text_type"
+                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_card_3_text_type"
+                app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_card_3_text_type"
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constrainedWidth="true" />
 
             <ImageView
-                android:id="@+id/stickied_post_image_view_item_post_text_type"
+                android:id="@+id/stickied_post_image_view_item_post_card_3_text_type"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginEnd="8dp"
@@ -71,7 +74,7 @@
                 tools:visibility="visible" />
 
             <TextView
-                android:id="@+id/post_time_text_view_item_post_text_type"
+                android:id="@+id/post_time_text_view_item_post_card_3_text_type"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="end"
@@ -92,7 +95,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
-            android:id="@+id/title_text_view_item_post_text_type"
+            android:id="@+id/title_text_view_item_post_card_3_text_type"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
@@ -101,7 +104,7 @@
             android:fontFamily="?attr/title_font_family" />
 
         <TextView
-            android:id="@+id/content_text_view_item_post_text_type"
+            android:id="@+id/content_text_view_item_post_card_3_text_type"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -113,185 +116,94 @@
             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_text_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:text="@string/text"
-                android:textSize="?attr/font_12"
-                android:fontFamily="?attr/font_family"
-                app:lib_setRadius="6dp"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-            <com.libRG.CustomTextView
-                android:id="@+id/spoiler_custom_text_view_item_post_text_type"
-                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="6dp"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-            <com.libRG.CustomTextView
-                android:id="@+id/nsfw_text_view_item_post_text_type"
-                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="6dp"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-            <com.libRG.CustomTextView
-                android:id="@+id/flair_custom_text_view_item_post_text_type"
-                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="6dp"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-            <com.libRG.CustomTextView
-                android:id="@+id/awards_text_view_item_post_text_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:textSize="?attr/font_12"
-                android:fontFamily="?attr/font_family"
-                android:visibility="gone"
-                app:lib_setRadius="6dp"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-            <ImageView
-                android:id="@+id/archived_image_view_item_post_text_type"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:src="@drawable/ic_archive_outline"
-                android:visibility="gone" />
-
-            <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
-            android:id="@+id/bottom_constraint_layout_item_post_text_type"
+            android:id="@+id/bottom_constraint_layout_item_post_card_3_text_type"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="8dp">
 
-            <ImageView
-                android:id="@+id/plus_button_item_post_text_type"
-                android:layout_width="wrap_content"
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/vote_button_toggle_item_post_card_3_text_type"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_upvote_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:singleSelection="true"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_text_type"
-                android:layout_width="64dp"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/upvote_button_item_post_card_3_text_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    android:textSize="?attr/font_12"
+                    android:textStyle="bold"
+                    android:fontFamily="?attr/font_family"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_upvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/downvote_button_item_post_card_3_text_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_downvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button_item_post_card_3_text_type"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:fontFamily="?attr/font_family"
-                android:textStyle="bold"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/plus_button_item_post_text_type" />
+                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_3_text_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
-                android:id="@+id/minus_button_item_post_text_type"
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/share_button_item_post_card_3_text_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_downvote_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_share_grey_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_text_type" />
+                app:layout_constraintStart_toEndOf="@id/save_button_item_post_card_3_text_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <TextView
-                android:id="@+id/comments_count_item_post_text_type"
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/comments_count_button_item_post_card_3_text_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:gravity="center_vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
                 android:textSize="?attr/font_12"
-                android:fontFamily="?attr/font_family"
                 android:textStyle="bold"
-                android:drawableStart="@drawable/ic_comment_grey_24dp"
-                android:drawablePadding="12dp"
+                android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
+                app:iconTint="@null"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/minus_button_item_post_text_type" />
-
-            <ImageView
-                android:id="@+id/save_button_item_post_text_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:layout_constraintStart_toEndOf="@id/share_button_item_post_card_3_text_type"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/comments_count_item_post_text_type"
-                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_text_type" />
-
-            <ImageView
-                android:id="@+id/share_button_item_post_text_type"
-                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" />
+                style="?attr/materialButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>