Replace the RecyclerView for comments to MultiLevelRecyclerView in order to display the comment trees easily. Click the expand more button to expand the comment tree. Click the expand less button to hide the comment tree. Rewrite some code.

7 files changed, 131 insertions, 94 deletions

diff --git a/app/src/main/res/drawable/ic_arrow_downward_black_12dp.xml b/app/src/main/res/drawable/ic_arrow_downward_black_20dp.xml
index 91cbabce..964c12ac 100644
--- a/app/src/main/res/drawable/ic_arrow_downward_black_12dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_downward_black_20dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="12dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="20dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#010101" android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_upward_black_12dp.xml b/app/src/main/res/drawable/ic_arrow_upward_black_20dp.xml
index 355c40f0..320c0fc8 100644
--- a/app/src/main/res/drawable/ic_arrow_upward_black_12dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_upward_black_20dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="12dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="20dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_expand_less_black_20dp.xml b/app/src/main/res/drawable/ic_expand_less_black_20dp.xml
new file mode 100644
index 00000000..54ce5912
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand_less_black_20dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="20dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_expand_more_black_20dp.xml b/app/src/main/res/drawable/ic_expand_more_black_20dp.xml
new file mode 100644
index 00000000..2e1e234a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand_more_black_20dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="20dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reply_black_12dp.xml b/app/src/main/res/drawable/ic_reply_black_20dp.xml
index e35610aa..9cb7e46c 100644
--- a/app/src/main/res/drawable/ic_reply_black_12dp.xml
+++ b/app/src/main/res/drawable/ic_reply_black_20dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="12dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="12dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="20dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index 4e9feffc..c3a1c688 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -258,7 +258,12 @@
                         android:textColor="#000000"
                         android:textSize="18sp" />
 
-                    <android.support.v7.widget.RecyclerView
+                    <!--<android.support.v7.widget.RecyclerView
+                        android:id="@+id/recycler_view_view_post_detail"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />-->
+
+                    <com.multilevelview.MultiLevelRecyclerView
                         android:id="@+id/recycler_view_view_post_detail"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/item_post_comment.xml b/app/src/main/res/layout/item_post_comment.xml
index c1421084..6981b955 100644
--- a/app/src/main/res/layout/item_post_comment.xml
+++ b/app/src/main/res/layout/item_post_comment.xml
@@ -2,104 +2,128 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/linear_layout_item_post_comment"
-    android:orientation="vertical"
-    android:layout_marginTop="12dp"
-    android:layout_marginBottom="8dp">
+    android:id="@+id/linear_layout_item_post_comment">
+
+    <View
+        android:id="@+id/vertical_block_item_post_comment"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"/>
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/author_text_view_item_post_comment"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginEnd="16dp"
-            android:textColor="@color/colorPrimary"/>
+            android:layout_marginEnd="16dp">
 
-        <TextView
-            android:id="@+id/comment_time_text_view_item_post_comment"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="end"
-            android:layout_marginEnd="16dp" />
+            <TextView
+                android:id="@+id/author_text_view_item_post_comment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="16dp"
+                android:textColor="@color/colorPrimary"/>
 
-    </LinearLayout>
+            <TextView
+                android:id="@+id/comment_time_text_view_item_post_comment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end" />
 
-    <org.sufficientlysecure.htmltextview.HtmlTextView
-        android:id="@+id/comment_html_text_view_item_post_comment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        android:layout_marginLeft="32dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginRight="32dp"
-        android:layout_marginEnd="32dp"
-        android:textAppearance="@android:style/TextAppearance.Small"/>
-
-    <RelativeLayout
-        android:id="@+id/relative_layout_item_post_comment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp">
-
-        <ImageView
-            android:id="@+id/plus_button_item_post_comment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:padding="8dp"
-            android:src="@drawable/ic_arrow_upward_black_12dp"
-            android:layout_centerVertical="true"
-            android:tint="@android:color/tab_indicator_text"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"/>
-
-        <TextView
-            android:id="@+id/score_text_view_item_post_comment"
-            android:layout_width="64dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/plus_button_item_post_comment"
-            android:gravity="center"/>
+        </LinearLayout>
 
-        <ImageView
-            android:id="@+id/minus_button_item_post_comment"
-            android:layout_width="wrap_content"
+        <org.sufficientlysecure.htmltextview.HtmlTextView
+            android:id="@+id/comment_html_text_view_item_post_comment"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/score_text_view_item_post_comment"
-            android:padding="8dp"
-            android:src="@drawable/ic_arrow_downward_black_12dp"
-            android:tint="@android:color/tab_indicator_text"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"/>
-
-        <ImageView
-            android:id="@+id/reply_button_item_post_comment"
-            android:layout_width="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="@android:style/TextAppearance.Small"/>
+
+        <RelativeLayout
+            android:id="@+id/relative_layout_item_post_comment"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:padding="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_alignParentEnd="true"
-            android:src="@drawable/ic_reply_black_12dp"
-            android:tint="@android:color/tab_indicator_text"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"/>
-
-    </RelativeLayout>
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
+
+            <ImageView
+                android:id="@+id/plus_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:src="@drawable/ic_arrow_upward_black_20dp"
+                android:layout_centerVertical="true"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_comment"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/plus_button_item_post_comment"
+                android:gravity="center"/>
+
+            <ImageView
+                android:id="@+id/minus_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/score_text_view_item_post_comment"
+                android:src="@drawable/ic_arrow_downward_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <ProgressBar
+                android:id="@+id/load_more_comments_progress_bar"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginEnd="16dp"
+                android:layout_toStartOf="@id/expand_button_item_post_comment"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/expand_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toStartOf="@id/reply_button_item_post_comment"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/reply_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:src="@drawable/ic_reply_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+        </RelativeLayout>
+
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file