chore(fc): show success after user report

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt

@@ -54,6 +54,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Instant
 import timber.log.Timber
+import xyz.flipchat.app.features.login.register.onResult
 import xyz.flipchat.chat.RoomController
 import xyz.flipchat.services.domain.model.chat.ConversationMember
 import xyz.flipchat.services.domain.model.chat.ConversationMessage
@@ -361,14 +362,25 @@ class ConversationViewModel @Inject constructor(
             .filterIsInstance<Event.ReportUser>()
             .map { (userId, messageId) ->
                 roomController.reportUserForMessage(userId, messageId)
-            }.onError {
-                TopBarManager.showMessage(
-                    TopBarManager.TopBarMessage(
-                        title = resources.getString(R.string.error_title_failedToReportUserForMessage),
-                        message = resources.getString(R.string.error_description_failedToReportUserForMessage)
+            }.onResult(
+                onError = {
+                    TopBarManager.showMessage(
+                        TopBarManager.TopBarMessage(
+                            title = resources.getString(R.string.error_title_failedToReportUserForMessage),
+                            message = resources.getString(R.string.error_description_failedToReportUserForMessage)
+                        )
                     )
-                )
-            }
+                },
+                onSuccess = {
+                    TopBarManager.showMessage(
+                        TopBarManager.TopBarMessage(
+                            title = resources.getString(R.string.success_title_reportUser),
+                            message = resources.getString(R.string.success_description_reportUser),
+                            type = TopBarManager.TopBarMessageType.SUCCESS
+                        )
+                    )
+                }
+            )
             .launchIn(viewModelScope)
 
         eventFlow

flipchatApp/src/main/res/values/strings.xml

@@ -64,21 +64,24 @@
     <string name="action_joinRoomByName">Join %1$s</string>
 
     <string name="title_leaveRoom">Leave Room?</string>
-    <string name="subtitle_leaveRoom">You will need to pay to get back in, but we won\’t tell people you left.</string>
+    <string name="subtitle_leaveRoom">You will need to pay to get back in, but we won\’t tell people you left</string>
     <string name="action_leaveRoomByName">Leave %1$s</string>
 
     <string name="title_deleteMessage">Delete Message?</string>
     <string name="subtitle_deleteMessage">Their messages will be deleted for everyone</string>
     <string name="action_delete">Delete</string>
 
     <string name="title_removeUserFromRoom">Remove %1$s?</string>
-    <string name="subtitle_removeUserFromRoom">They will be able to rejoin after waiting an hour, but will have to pay the cover charge again.</string>
+    <string name="subtitle_removeUserFromRoom">They will be able to rejoin after waiting an hour, but will have to pay the cover charge again</string>
     <string name="action_remove">Remove</string>
 
-    <string name="title_reportUserForMessage">Report %1$s?</string>
-    <string name="subtitle_reportUserForMessage">This message will be forwarded to Flipchat. This contact will not be notified.</string>
+    <string name="title_reportUserForMessage">Report</string>
+    <string name="subtitle_reportUserForMessage">This message will be forwarded to Flipchat. This contact will not be notified</string>
     <string name="action_report">Report</string>
 
+    <string name="success_title_reportUser">Report Sent</string>
+    <string name="success_description_reportUser">Your report was sent successfully</string>
+
     <string name="permissions_description_push_messages">Receive push notifications when people message you.</string>
 
     <string name="action_copyMessage">Copy</string>

ui/components/src/main/kotlin/com/getcode/ui/components/bars/TopBarContainer.kt

@@ -95,7 +95,7 @@ private fun TopBarView(
                     WARNING -> Warning
                     NOTIFICATION -> TopNotification
                     NEUTRAL -> TopNeutral
-                    SUCCESS -> TopSuccess
+                    SUCCESS -> CodeTheme.colors.brand
 
                 }
             )

ui/theme/src/main/kotlin/com/getcode/theme/Color.kt

@@ -39,7 +39,6 @@ val SystemGreen = Color(0xFF04C759)
 
 val TopNotification = Color(0xFF4f49ce)
 val TopNeutral = Color(0xFF747474)
-val TopSuccess = Brand
 
 val textSelectionColors = TextSelectionColors(
     handleColor = White,