From e6bb87a9cc2ded99707020592957627726d91898 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 4 Nov 2021 22:13:59 +0800
Subject: Fix Material Design 3 issue.

---
 app/src/main/res/layout/activity_post_gallery.xml          |  8 ++++----
 app/src/main/res/layout/activity_post_image.xml            | 10 ++++++----
 app/src/main/res/layout/activity_post_link.xml             | 14 +++++++-------
 app/src/main/res/layout/activity_post_text.xml             |  8 ++++----
 app/src/main/res/layout/activity_post_video.xml            |  8 ++++----
 app/src/main/res/layout/activity_view_subreddit_detail.xml |  3 ++-
 app/src/main/res/layout/activity_view_user_detail.xml      |  3 ++-
 7 files changed, 29 insertions(+), 25 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_post_gallery.xml b/app/src/main/res/layout/activity_post_gallery.xml
index 150870e0..7d3124f8 100644
--- a/app/src/main/res/layout/activity_post_gallery.xml
+++ b/app/src/main/res/layout/activity_post_gallery.xml
@@ -36,9 +36,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="16dp"
                 android:paddingTop="8dp"
-                android:paddingEnd="16dp"
                 android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
@@ -46,7 +44,8 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true" />
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp" />
 
                 <TextView
                     android:id="@+id/subreddit_name_text_view_post_gallery_activity"
@@ -54,7 +53,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
-                    android:layout_marginEnd="16dp"
                     android:layout_toStartOf="@id/rules_button_post_gallery_activity"
                     android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_gallery_activity"
                     android:text="@string/choose_a_subreddit"
@@ -67,6 +65,8 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:text="@string/rules"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index 2e66a7ea..fe286ab8 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -36,9 +36,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="16dp"
                 android:paddingTop="8dp"
-                android:paddingEnd="16dp"
                 android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
@@ -46,7 +44,8 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true" />
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp" />
 
                 <TextView
                     android:id="@+id/subreddit_name_text_view_post_image_activity"
@@ -54,7 +53,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
-                    android:layout_marginEnd="16dp"
                     android:layout_toStartOf="@id/rules_button_post_image_activity"
                     android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_image_activity"
                     android:text="@string/choose_a_subreddit"
@@ -67,6 +65,8 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:text="@string/rules"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
@@ -197,6 +197,7 @@
                     android:id="@+id/capture_fab_post_image_activity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
                     android:src="@drawable/ic_outline_add_a_photo_24dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity"
@@ -209,6 +210,7 @@
                     android:id="@+id/select_from_library_fab_post_image_activity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
                     android:src="@drawable/ic_outline_select_photo_24dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index 427b8306..9023e2a0 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -36,9 +36,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="16dp"
                 android:paddingTop="8dp"
-                android:paddingEnd="16dp"
                 android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
@@ -46,7 +44,8 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true" />
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp" />
 
                 <TextView
                     android:id="@+id/subreddit_name_text_view_post_link_activity"
@@ -54,7 +53,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
-                    android:layout_marginEnd="16dp"
                     android:layout_toStartOf="@id/rules_button_post_link_activity"
                     android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_link_activity"
                     android:text="@string/choose_a_subreddit"
@@ -67,6 +65,8 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:text="@string/rules"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
@@ -171,9 +171,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="0dp"
-                android:paddingEnd="16dp">
+                android:layout_height="wrap_content">
 
                 <EditText
                     android:id="@+id/post_title_edit_text_post_link_activity"
@@ -195,6 +193,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:text="@string/suggest_title"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index f18bf667..12440dd4 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -42,9 +42,7 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingStart="16dp"
                     android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
                     android:paddingBottom="8dp">
 
                     <pl.droidsonroids.gif.GifImageView
@@ -52,7 +50,8 @@
                         android:layout_width="24dp"
                         android:layout_height="24dp"
                         android:layout_alignParentStart="true"
-                        android:layout_centerVertical="true" />
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="16dp" />
 
                     <TextView
                         android:id="@+id/subreddit_name_text_view_post_text_activity"
@@ -60,7 +59,6 @@
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginStart="32dp"
-                        android:layout_marginEnd="16dp"
                         android:layout_toStartOf="@id/rules_button_post_text_activity"
                         android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_text_activity"
                         android:text="@string/choose_a_subreddit"
@@ -73,6 +71,8 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
                         android:text="@string/rules"
                         android:textSize="?attr/font_default"
                         android:fontFamily="?attr/font_family" />
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index e1c297cb..3c74922a 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -36,9 +36,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="16dp"
                 android:paddingTop="8dp"
-                android:paddingEnd="16dp"
                 android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
@@ -46,7 +44,8 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true" />
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp" />
 
                 <TextView
                     android:id="@+id/subreddit_name_text_view_post_video_activity"
@@ -54,7 +53,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
-                    android:layout_marginEnd="16dp"
                     android:layout_toStartOf="@id/rules_button_post_video_activity"
                     android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_video_activity"
                     android:text="@string/choose_a_subreddit"
@@ -67,6 +65,8 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:text="@string/rules"
                     android:textSize="?attr/font_default"
                     android:fontFamily="?attr/font_family" />
diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml
index 6709af9f..a347b353 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -65,7 +65,8 @@
                         android:id="@+id/subscribe_subreddit_chip_view_subreddit_detail_activity"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"/>
+                        android:layout_gravity="center_horizontal"
+                        app:chipStrokeColor="#00000000"  />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml
index c312e808..203f53ff 100644
--- a/app/src/main/res/layout/activity_view_user_detail.xml
+++ b/app/src/main/res/layout/activity_view_user_detail.xml
@@ -67,7 +67,8 @@
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
                         android:layout_gravity="center_horizontal"
-                        android:visibility="gone"/>
+                        android:visibility="gone"
+                        app:chipStrokeColor="#00000000" />
 
                     <RelativeLayout
                         android:layout_width="match_parent"
-- 
cgit v1.2.3