WEB-605: Update string for flagged comments (#1650)

* Add new flagged copy and update UI * Update shot tests, add hyperlink to string res * Change context type in shot test * - new recorded screenshot * Linter Co-authored-by: Isabel Martin <arkariang@gmail.com> Co-authored-by: Hadia <hadiamohamed.iti@gmail.com>
kickstarter · Jun 30, 2022 · e09c5d2 · e09c5d2
1 parent d6121b3
commit e09c5d2
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 7 deletions.
diff --git a/...ui.components.CommentCardShotTest_commentCardScreenshotTest_FLAGGED_MESSAGE.png b/...ui.components.CommentCardShotTest_commentCardScreenshotTest_FLAGGED_MESSAGE.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
@@ -86,6 +86,11 @@ class CommentCardShotTest : ScreenshotTest {
     @Test
     fun commentCardScreenshotTest_FLAGGED_MESSAGE() {
         commentCard.setCommentCardStatus(CommentCardStatus.FLAGGED_COMMENT)
+        commentCard.setFlaggedMessage(
+            getInstrumentation().targetContext.getString(R.string.FPO_this_comment_is_under_review_for_potentially_violating) +
+                " " +
+                getInstrumentation().targetContext.getString(R.string.FPO_kickstarters_community_guidelines)
+        )
         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
@@ -151,9 +151,9 @@ class CommentCardViewHolder(
         })
 
         binding.commentsCardView.setFlaggedMessage(
-            context().getString(R.string.FPO_this_comment_is_under_review) +
+            context().getString(R.string.FPO_this_comment_is_under_review_for_potentially_violating) +
                 " " +
-                context().getString(R.string.Learn_more_about_comment_guidelines)
+                context().getString(R.string.FPO_kickstarters_community_guidelines)
         )
 
         binding.commentsCardView.setRemovedMessage(

diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/RootCommentViewHolder.kt b/app/src/main/java/com/kickstarter/ui/viewholders/RootCommentViewHolder.kt
@@ -21,9 +21,9 @@ class RootCommentViewHolder(
     init {
 
         binding.commentsCardView.setFlaggedMessage(
-            context().getString(R.string.FPO_this_comment_is_under_review) +
+            context().getString(R.string.FPO_this_comment_is_under_review_for_potentially_violating) +
                 " " +
-                context().getString(R.string.Learn_more_about_comment_guidelines)
+                context().getString(R.string.FPO_kickstarters_community_guidelines)
         )
 
         this.vm.outputs.bindRootComment()

diff --git a/app/src/main/java/com/kickstarter/ui/views/CommentCard.kt b/app/src/main/java/com/kickstarter/ui/views/CommentCard.kt
@@ -35,7 +35,7 @@ class CommentCard @JvmOverloads constructor(
         obtainStyledAttributes(context, attrs, defStyleAttr)
 
         bindCommunityGuidelines(binding.removedMessage, onCommentCardClickedListener)
-        bindCommunityGuidelines(binding.flaggedMessage, onCommentCardClickedListener)
+        bindFlaggedCommunityGuidelines(binding.flaggedMessage, onCommentCardClickedListener)
 
         binding.retryButtonGroup.setAllOnClickListener {
             onCommentCardClickedListener?.onRetryViewClicked(it)
@@ -69,6 +69,21 @@ class CommentCard @JvmOverloads constructor(
         )
     }
 
+    private fun bindFlaggedCommunityGuidelines(textView: AppCompatTextView, onCommentCardClickedListener: OnCommentCardClickedListener?) {
+        textView.parseHtmlTag()
+        textView.makeLinks(
+            Pair(
+                context.resources.getString(R.string.FPO_kickstarters_community_guidelines).parseHtmlTag(),
+                OnClickListener {
+                    onCommentCardClickedListener?.onCommentGuideLinesClicked(it)
+                },
+
+            ),
+            linkColor = R.color.kds_create_500,
+            isUnderlineText = false
+        )
+    }
+
     private fun bindCancelPledgeMessage() {
         binding.canceledPledgeMessage.parseHtmlTag()
         binding.canceledPledgeMessage.makeLinks(
@@ -236,7 +251,7 @@ class CommentCard @JvmOverloads constructor(
 
     fun setFlaggedMessage(message: String) {
         binding.flaggedMessage.text = message
-        bindCommunityGuidelines(binding.flaggedMessage, onCommentCardClickedListener)
+        bindFlaggedCommunityGuidelines(binding.flaggedMessage, onCommentCardClickedListener)
     }
 
     fun setCancelPledgeMessage(message: String) {

diff --git a/app/src/main/res/layout/comment_card.xml b/app/src/main/res/layout/comment_card.xml
@@ -187,7 +187,7 @@
         android:id="@+id/flagged_message"
         style="@style/CommentCardFlaggedMessage"
         android:visibility="gone"
-        android:text="@string/FPO_this_comment_is_under_review"
+        android:text="@string/FPO_this_comment_is_under_review_for_potentially_violating"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/info_button"
         app:layout_constraintTop_toBottomOf="@id/avatar"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -71,6 +71,8 @@
 
   <!-- Comments -->
   <string name="FPO_this_comment_is_under_review">This comment is under review.</string>
+  <string name="FPO_this_comment_is_under_review_for_potentially_violating">This comment is under review for potentially violating</string>
+  <string name="FPO_kickstarters_community_guidelines">&lt;a href="%{community_link}">Kickstarter’s Community Guidelines.&lt;/a></string>
 
   <!--  Qualtrics -->
   <string name="Take_our_survey_to_help_us_make_a_better_app_for_you">Take our survey to help us make a better app for you.</string>