From 08bfa254bcbb2b9b15f0db3c772664427cbd606a Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 27 Jun 2019 15:17:37 +0800
Subject: Loading more comments in ViewPostDetailActivity is back. Display a
 progress bar when loading more comments. Display an error view when loading
 more comments failed.

---
 .../main/res/layout/item_comment_footer_error.xml  | 25 ++++++++++++++++++++++
 .../res/layout/item_comment_footer_loading.xml     | 14 ++++++++++++
 app/src/main/res/layout/item_footer_error.xml      |  7 +++---
 app/src/main/res/layout/item_footer_loading.xml    |  1 -
 app/src/main/res/values/strings.xml                |  1 -
 5 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/layout/item_comment_footer_error.xml
 create mode 100644 app/src/main/res/layout/item_comment_footer_loading.xml

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

diff --git a/app/src/main/res/layout/item_comment_footer_error.xml b/app/src/main/res/layout/item_comment_footer_error.xml
new file mode 100644
index 00000000..39195989
--- /dev/null
+++ b/app/src/main/res/layout/item_comment_footer_error.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/relative_layout_item_comment_footer_error"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp">
+
+    <TextView
+        android:id="@+id/error_text_view_item_comment_footer_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@id/retry_button_item_comment_footer_error"
+        android:textSize="18sp" />
+
+    <Button
+        android:id="@+id/retry_button_item_comment_footer_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:text="@string/retry" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_comment_footer_loading.xml b/app/src/main/res/layout/item_comment_footer_loading.xml
new file mode 100644
index 00000000..bf01664e
--- /dev/null
+++ b/app/src/main/res/layout/item_comment_footer_loading.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_footer_error.xml b/app/src/main/res/layout/item_footer_error.xml
index e1d3c14b..f795adf9 100644
--- a/app/src/main/res/layout/item_footer_error.xml
+++ b/app/src/main/res/layout/item_footer_error.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/relative_layout_footer_error_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
@@ -9,16 +8,16 @@
     android:layout_marginBottom="16dp">
 
     <TextView
-        android:id="@+id/error_text_view_footer_error_item"
+        android:id="@+id/error_text_view_item_footer_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_toStartOf="@id/retry_button_footer_error_item"
+        android:layout_toStartOf="@id/retry_button_item_footer_error"
         android:textSize="18sp" />
 
     <Button
-        android:id="@+id/retry_button_footer_error_item"
+        android:id="@+id/retry_button_item_footer_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/item_footer_loading.xml b/app/src/main/res/layout/item_footer_loading.xml
index 7cd0d8f2..9a4dce0e 100644
--- a/app/src/main/res/layout/item_footer_loading.xml
+++ b/app/src/main/res/layout/item_footer_loading.xml
@@ -5,7 +5,6 @@
     android:layout_height="wrap_content">
 
     <ProgressBar
-        android:id="@+id/progress_bar_footer_progress_bar_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8cd06098..29b0c4e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,6 @@
 
     <string name="load_posts_failed">Error loading posts</string>
     <string name="post_load_comments_failed">Error loading comments</string>
-    <string name="post_load_more_comments_failed">Error loading more comments</string>
     <string name="retry">Retry</string>
     <string name="comments">Comments</string>
     <string name="no_comments_yet">No comments yet. Write a comment?</string>
-- 
cgit v1.2.3