From 03d5a024800f37c4af0d94a77915dbac31c9e84d Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Mon, 26 Apr 2021 17:26:24 +0800
Subject: [PATCH] Change divider hierachy in item_load_more_comments.xml and
 item_comment_fully_collapsed.xml.

---
 .../layout/item_comment_fully_collapsed.xml   | 100 ++++++++++--------
 .../item_load_more_comments_placeholder.xml   |  26 ++---
 2 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/app/src/main/res/layout/item_comment_fully_collapsed.xml b/app/src/main/res/layout/item_comment_fully_collapsed.xml
index a2751958..b1023c7e 100644
--- a/app/src/main/res/layout/item_comment_fully_collapsed.xml
+++ b/app/src/main/res/layout/item_comment_fully_collapsed.xml
@@ -1,59 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ml.docilealligator.infinityforreddit.customviews.CommentIndentationView
+        android:id="@+id/vertical_block_indentation_item_comment_fully_collapsed"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <ml.docilealligator.infinityforreddit.customviews.CommentIndentationView
-            android:id="@+id/vertical_block_indentation_item_comment_fully_collapsed"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/user_name_text_view_item_comment_fully_collapsed"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="8dp"
-            android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
+            <TextView
+                android:id="@+id/user_name_text_view_item_comment_fully_collapsed"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:fontFamily="?attr/font_family"
+                android:paddingStart="16dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="8dp"
+                android:paddingBottom="12dp"
+                android:textSize="?attr/font_default" />
 
-        <TextView
-            android:id="@+id/score_text_view_item_comment_fully_collapsed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
+            <TextView
+                android:id="@+id/score_text_view_item_comment_fully_collapsed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="?attr/font_family"
+                android:paddingStart="8dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="8dp"
+                android:paddingBottom="12dp"
+                android:textSize="?attr/font_default" />
 
-        <TextView
-            android:id="@+id/time_text_view_item_comment_fully_collapsed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:paddingStart="8dp"
-            android:paddingEnd="16dp"
-            android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
+            <TextView
+                android:id="@+id/time_text_view_item_comment_fully_collapsed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:fontFamily="?attr/font_family"
+                android:paddingStart="8dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="12dp"
+                android:textSize="?attr/font_default" />
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/divider_item_comment_fully_collapsed"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:visibility="gone" />
 
     </LinearLayout>
 
-    <View
-        android:id="@+id/divider_item_comment_fully_collapsed"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:visibility="gone" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
index d5f83544..db050cfb 100644
--- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml
+++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
@@ -2,17 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:background="?attr/cardViewBackgroundColor">
 
+    <ml.docilealligator.infinityforreddit.customviews.CommentIndentationView
+        android:id="@+id/vertical_block_indentation_item_load_more_comments_placeholder"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent" />
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ml.docilealligator.infinityforreddit.customviews.CommentIndentationView
-            android:id="@+id/vertical_block_indentation_item_load_more_comments_placeholder"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/placeholder_text_view_item_load_more_comments"
@@ -25,12 +25,12 @@
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family" />
 
+        <View
+            android:id="@+id/divider_item_load_more_comments_placeholder"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:visibility="gone" />
+
     </LinearLayout>
 
-    <View
-        android:id="@+id/divider_item_load_more_comments_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:visibility="gone" />
-
 </LinearLayout>
\ No newline at end of file