From 5c77c33dffd23b47066ad23d095979cdaa9bca0f Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 7 Oct 2022 14:35:05 -0300
Subject: [PATCH] Fix flow colors.

---
 .../thoughtcrime/securesms/color/ViewColorSet.kt |  5 +++++
 .../forward/MultiselectForwardActivity.kt        | 16 +---------------
 .../forward/MultiselectForwardFragmentArgs.kt    |  4 ++--
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/color/ViewColorSet.kt b/app/src/main/java/org/thoughtcrime/securesms/color/ViewColorSet.kt
index 654d62d518..60cfe75996 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/color/ViewColorSet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/color/ViewColorSet.kt
@@ -19,6 +19,11 @@ data class ViewColorSet(
   val background: ViewColor
 ) : Parcelable {
   companion object {
+    val PRIMARY = ViewColorSet(
+      foreground = ViewColor.ColorResource(R.color.signal_colorOnPrimary),
+      background = ViewColor.ColorResource(R.color.signal_colorPrimary)
+    )
+
     fun forCustomColor(@ColorInt customColor: Int): ViewColorSet {
       return ViewColorSet(
         foreground = ViewColor.ColorResource(R.color.signal_colorOnCustom),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt
index 8e0fd39ded..16e800524d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardActivity.kt
@@ -35,21 +35,7 @@ open class MultiselectForwardActivity : FragmentWrapperActivity(), MultiselectFo
   }
 
   override fun getFragment(): Fragment {
-    return MultiselectForwardFragment.create(
-      args.let {
-        if (it.sendButtonColors == null) {
-          args.withSendButtonTint(ContextCompat.getColor(this, R.color.signal_colorPrimary))
-          args.copy(
-            sendButtonColors = ViewColorSet(
-              foreground = ViewColorSet.ViewColor.ColorResource(R.color.signal_colorOnPrimary),
-              background = ViewColorSet.ViewColor.ColorResource(R.color.signal_colorPrimary)
-            )
-          )
-        } else {
-          args
-        }
-      }
-    )
+    return MultiselectForwardFragment.create(args)
   }
 
   override fun onFinishForwardAction() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt
index 940ee8fdd7..7f967071ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt
@@ -44,7 +44,7 @@ data class MultiselectForwardFragmentArgs @JvmOverloads constructor(
   val forceDisableAddMessage: Boolean = false,
   val forceSelectionOnly: Boolean = false,
   val selectSingleRecipient: Boolean = false,
-  val sendButtonColors: ViewColorSet? = null,
+  val sendButtonColors: ViewColorSet = ViewColorSet.PRIMARY,
   val storySendRequirements: Stories.MediaTransform.SendRequirements = Stories.MediaTransform.SendRequirements.CAN_NOT_SEND,
   val isSearchEnabled: Boolean = true
 ) : Parcelable {
@@ -74,7 +74,7 @@ data class MultiselectForwardFragmentArgs @JvmOverloads constructor(
               isMmsSupported,
               listOf(multiShareArgs),
               storySendRequirements = Stories.MediaTransform.SendRequirements.CAN_NOT_SEND,
-              sendButtonColors = sendButtonColors
+              sendButtonColors = sendButtonColors ?: ViewColorSet.PRIMARY
             )
           )
         }