NT-2161:UI – Not-a-backer-anymore taking the space of the original co…

…mment (#1342) * Fix extra space in case cancaled pledge comment * Re record the screen shots as ui changes * Add extra space to show comment * Update ui test * Update test case
kickstarter · Aug 3, 2021 · 3e70dcf · 3e70dcf
1 parent d9e6734
commit 3e70dcf
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 14 deletions.
diff --git a/...nents.CommentCardShotTest_commentCardScreenshotTest_CANCELED_PLEDGE_MESSAGE.png b/...nents.CommentCardShotTest_commentCardScreenshotTest_CANCELED_PLEDGE_MESSAGE.png
diff --git a/...ommentCardShotTest_commentCardScreenshotTest_COMMENT_FOR_LOGIN_BACKED_USERS.png b/...ommentCardShotTest_commentCardScreenshotTest_COMMENT_FOR_LOGIN_BACKED_USERS.png
diff --git a/...mponents.CommentCardShotTest_commentCardScreenshotTest_COMMENT_WITH_REPLIES.png b/...mponents.CommentCardShotTest_commentCardScreenshotTest_COMMENT_WITH_REPLIES.png
diff --git a/...ui.components.CommentCardShotTest_commentCardScreenshotTest_DELETED_COMMENT.png b/...ui.components.CommentCardShotTest_commentCardScreenshotTest_DELETED_COMMENT.png
diff --git a/...onents.CommentCardShotTest_commentCardScreenshotTest_FAILED_TO_SEND_COMMENT.png b/...onents.CommentCardShotTest_commentCardScreenshotTest_FAILED_TO_SEND_COMMENT.png
diff --git a/....components.CommentCardShotTest_commentCardScreenshotTest_RE_TRYING_TO_POST.png b/....components.CommentCardShotTest_commentCardScreenshotTest_RE_TRYING_TO_POST.png
diff --git a/...androidTest/java/com/kickstarter/screenshoot/testing/ui/components/CommentCardShotTest.kt b/...androidTest/java/com/kickstarter/screenshoot/testing/ui/components/CommentCardShotTest.kt
@@ -76,8 +76,9 @@ class CommentCardShotTest : ScreenshotTest {
     fun commentCardScreenshotTest_CANCELED_PLEDGE_MESSAGE() {
         commentCard.setCommentCardStatus(CommentCardStatus.CANCELED_PLEDGE_MESSAGE)
         commentCard.setCancelPledgeMessage(
-            getInstrumentation().targetContext.getString(R.string.this_person_canceled_pledge) +
-                getInstrumentation().targetContext.getString(R.string.show_comment)
+
+            getInstrumentation().targetContext.getString(R.string.this_person_canceled_pledge).plus(" ").plus(getInstrumentation().targetContext.getString(R.string.show_comment))
+
         )
         compareScreenshot(commentCard)
     }

diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CommentCardViewHolder.kt b/app/src/main/java/com/kickstarter/ui/viewholders/CommentCardViewHolder.kt
@@ -155,8 +155,7 @@ class CommentCardViewHolder(
         )
 
         binding.commentsCardView.setCancelPledgeMessage(
-            context().getString(R.string.this_person_canceled_pledge) +
-                context().getString(R.string.show_comment)
+            context().getString(R.string.this_person_canceled_pledge).plus(" ").plus(context().getString(R.string.show_comment))
         )
 
         if (isReply) {

diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/RootCommentViewHolder.kt b/app/src/main/java/com/kickstarter/ui/viewholders/RootCommentViewHolder.kt
@@ -26,8 +26,7 @@ class RootCommentViewHolder(
                     if (it == CommentCardStatus.CANCELED_PLEDGE_MESSAGE) {
                         binding.commentsCardView.setCommentCardStatus(it)
                         binding.commentsCardView.setCancelPledgeMessage(
-                            context().getString(R.string.this_person_canceled_pledge) +
-                                context().getString(R.string.show_comment)
+                            context().getString(R.string.this_person_canceled_pledge).plus(" ").plus(context().getString(R.string.show_comment))
                         )
                         binding.commentsCardView.setCommentCardClickedListener(object :
                                 OnCommentCardClickedListener {

diff --git a/app/src/main/java/com/kickstarter/ui/views/CommentCard.kt b/app/src/main/java/com/kickstarter/ui/views/CommentCard.kt
@@ -9,7 +9,6 @@ import android.view.View.OnClickListener
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.kickstarter.R
 import com.kickstarter.databinding.CommentCardBinding
@@ -150,10 +149,6 @@ class CommentCard @JvmOverloads constructor(
             cardCommentStatus == CommentCardStatus.TRYING_TO_POST ||
             cardCommentStatus == CommentCardStatus.CANCELED_PLEDGE_COMMENT
 
-        if (cardCommentStatus == CommentCardStatus.DELETED_COMMENT || cardCommentStatus == CommentCardStatus.CANCELED_PLEDGE_MESSAGE) {
-            binding.commentBody.isInvisible = true
-        }
-
         binding.commentDeletedMessageGroup.isVisible =
             cardCommentStatus == CommentCardStatus.DELETED_COMMENT
 

diff --git a/app/src/main/res/layout/comment_card.xml b/app/src/main/res/layout/comment_card.xml
@@ -105,7 +105,7 @@
         android:text="@string/View_replies"
         app:layout_constraintBottom_toTopOf="@+id/reply_button"
         app:layout_goneMarginBottom="@dimen/grid_3"
-        android:layout_marginTop="@dimen/grid_3_half"
+        app:layout_goneMarginTop="@dimen/grid_10"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 

diff --git a/app/src/test/java/com/kickstarter/ui/view/CommentCardTest.kt b/app/src/test/java/com/kickstarter/ui/view/CommentCardTest.kt
@@ -6,7 +6,7 @@ import androidx.appcompat.widget.AppCompatButton
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.Group
-import androidx.core.view.isInvisible
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.kickstarter.KSRobolectricTestCase
 import com.kickstarter.R
@@ -47,7 +47,7 @@ class CommentCardTest : KSRobolectricTestCase() {
     @Test
     fun testDeleteCommentStatus() {
         commentCard.setCommentCardStatus(CommentCardStatus.DELETED_COMMENT)
-        assertTrue(commentBody.isInvisible)
+        assertTrue(commentBody.isGone)
         assertFalse(retryButton.isVisible)
         assertFalse(replyButton.isVisible)
         assertTrue(commentDeletedMessageGroup.isVisible)