NT-2133:UI – Misaligned icon on error messages (#1335)

* Fix Icon alignment * add action to Icon
kickstarter · Jul 27, 2021 · b754a76 · b754a76
1 parent ded1315
commit b754a76
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 31 deletions.
diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/PaginationErrorViewHolder.kt b/app/src/main/java/com/kickstarter/ui/viewholders/PaginationErrorViewHolder.kt
@@ -25,10 +25,13 @@ class PaginationErrorViewHolder(
             .compose(bindToLifecycle())
             .compose(Transformers.observeForUI())
             .subscribe {
-                binding.errorPaginationRetryButton.visibility = it.toVisibility()
+                binding.errorPaginationRetryButtonGroup.visibility = it.toVisibility()
             }
 
-        binding.errorPaginationRetryButton.setOnClickListener {
+        binding.retryButton.setOnClickListener {
+            viewListener.retryCallback()
+        }
+        binding.retryIcon.setOnClickListener {
             viewListener.retryCallback()
         }
 

diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/RepliesStatusCellViewHolder.kt b/app/src/main/java/com/kickstarter/ui/viewholders/RepliesStatusCellViewHolder.kt
@@ -34,10 +34,13 @@ class RepliesStatusCellViewHolder(
             .compose(bindToLifecycle())
             .compose(Transformers.observeForUI())
             .subscribe {
-                binding.errorPaginationRetryButton.visibility = it.toVisibility()
+                binding.errorPaginationRetryButtonGroup.visibility = it.toVisibility()
             }
 
-        binding.errorPaginationRetryButton.setOnClickListener {
+        binding.retryButton.setOnClickListener {
+            viewListener.retryCallback()
+        }
+        binding.retryIcon.setOnClickListener {
             viewListener.retryCallback()
         }
     }

diff --git a/app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt
@@ -339,14 +339,14 @@ interface ThreadViewModel {
                     this.initialError.onNext(it)
                 }
 
-            this.internalError
-                .compose(Transformers.combineLatestPair(onCommentReplies))
+            this.onCommentReplies
+                .compose(Transformers.takePairWhen(internalError))
                 .filter {
-                    it.second.first.isNotEmpty()
+                    it.first.first.isNotEmpty()
                 }
                 .compose(bindToLifecycle())
                 .subscribe {
-                    this.paginationError.onNext(it.first)
+                    this.paginationError.onNext(it.second)
                 }
         }
 

diff --git a/app/src/main/res/layout/item_error_pagination.xml b/app/src/main/res/layout/item_error_pagination.xml
@@ -6,20 +6,33 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/retry_icon"
+        style="@style/CommentsReplyButton"
+        android:layout_marginStart="@dimen/grid_3"
+        app:layout_constraintTop_toTopOf="@id/retry_button"
+        app:layout_constraintStart_toStartOf="parent"
+        android:src="@drawable/ic_retry_send_comment" />
+
     <androidx.appcompat.widget.AppCompatButton
-        android:layout_width="match_parent"
-        android:id="@+id/error_pagination_retry_button"
+        android:id="@+id/retry_button"
         style="@style/CommentsRetryButton"
-        android:layout_height="@dimen/grid_9"
-        android:layout_marginStart="@dimen/grid_3"
-        android:layout_marginTop="@dimen/grid_2"
-        android:drawableStart="@drawable/ic_retry_send_comment"
+        android:layout_width="@dimen/grid_none"
+        android:gravity="start"
+        android:includeFontPadding="false"
+        android:layout_marginTop="@dimen/grid_3"
         android:text="@string/Couldnt_load_more_comments_Tap_to_retry"
-        android:gravity="center_vertical"
-        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/retry_icon"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="visible" />
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/error_pagination_retry_button_group"
+        android:layout_width="wrap_content"
+        android:visibility="gone"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        app:constraint_referenced_ids="retry_button,retry_icon" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_show_more_replies.xml b/app/src/main/res/layout/item_show_more_replies.xml
@@ -22,19 +22,33 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:visibility="visible" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:layout_width="match_parent"
-        android:id="@+id/error_pagination_retry_button"
-        style="@style/CommentsRetryButton"
-        android:layout_height="@dimen/grid_9"
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/retry_icon"
+        style="@style/CommentsReplyButton"
         android:layout_marginStart="@dimen/grid_3"
-        android:layout_marginTop="@dimen/grid_2"
-        android:drawableStart="@drawable/ic_retry_send_comment"
+        app:layout_constraintTop_toTopOf="@id/retry_button"
+        app:layout_constraintStart_toStartOf="parent"
+        android:src="@drawable/ic_retry_send_comment" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/retry_button"
+        style="@style/CommentsRetryButton"
+        android:layout_width="@dimen/grid_none"
+        android:gravity="start"
+        android:includeFontPadding="false"
+        android:layout_marginTop="@dimen/grid_3"
         android:text="@string/Couldnt_load_more_comments_Tap_to_retry"
-        android:gravity="center_vertical"
-        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/retry_icon"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="visible" />
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/error_pagination_retry_button_group"
+        android:layout_width="wrap_content"
+        android:visibility="gone"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        app:constraint_referenced_ids="retry_button,retry_icon" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>