Implement gateway ordering.

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewayOrderStrategy.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import org.signal.core.util.orNull
+import org.thoughtcrime.securesms.recipients.Recipient
+
+sealed interface GatewayOrderStrategy {
+
+  val orderedGateways: Set<GatewayResponse.Gateway>
+
+  private object Default : GatewayOrderStrategy {
+    override val orderedGateways: Set<GatewayResponse.Gateway> = setOf(
+      GatewayResponse.Gateway.CREDIT_CARD,
+      GatewayResponse.Gateway.PAYPAL,
+      GatewayResponse.Gateway.GOOGLE_PAY,
+      GatewayResponse.Gateway.SEPA_DEBIT
+    )
+  }
+
+  private object NorthAmerica : GatewayOrderStrategy {
+
+    override val orderedGateways: Set<GatewayResponse.Gateway> = setOf(
+      GatewayResponse.Gateway.GOOGLE_PAY,
+      GatewayResponse.Gateway.PAYPAL,
+      GatewayResponse.Gateway.CREDIT_CARD,
+      GatewayResponse.Gateway.SEPA_DEBIT
+    )
+  }
+
+  companion object {
+    fun getStrategy(): GatewayOrderStrategy {
+      val self = Recipient.self()
+      val e164 = self.e164.orNull() ?: return Default
+
+      return if (PhoneNumberUtil.getInstance().parse(e164, "").countryCode == 1) {
+        NorthAmerica
+      } else {
+        Default
+      }
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt

@@ -72,7 +72,26 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
         return@configure
       }
 
+      state.gatewayOrderStrategy.orderedGateways.forEachIndexed { index, gateway ->
+        val isFirst = index == 0
+        when (gateway) {
+          GatewayResponse.Gateway.GOOGLE_PAY -> renderGooglePayButton(state, isFirst)
+          GatewayResponse.Gateway.PAYPAL -> renderPayPalButton(state, isFirst)
+          GatewayResponse.Gateway.CREDIT_CARD -> renderCreditCardButton(state, isFirst)
+          GatewayResponse.Gateway.SEPA_DEBIT -> renderSEPADebitButton(state, isFirst)
+        }
+      }
+
+      space(16.dp)
+    }
+  }
+
+  private fun DSLConfiguration.renderGooglePayButton(state: GatewaySelectorState, isFirstButton: Boolean) {
     if (state.isGooglePayAvailable) {
+      if (!isFirstButton) {
+        space(8.dp)
+      }
+
       customPref(
         GooglePayButton.Model(
           isEnabled = true,
@@ -84,9 +103,13 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
         )
       )
     }
+  }
 
+  private fun DSLConfiguration.renderPayPalButton(state: GatewaySelectorState, isFirstButton: Boolean) {
     if (state.isPayPalAvailable) {
+      if (!isFirstButton) {
         space(8.dp)
+      }
 
       customPref(
         PayPalButton.Model(
@@ -99,13 +122,17 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
         )
       )
     }
+  }
 
+  private fun DSLConfiguration.renderCreditCardButton(state: GatewaySelectorState, isFirstButton: Boolean) {
     if (state.isCreditCardAvailable) {
+      if (!isFirstButton) {
         space(8.dp)
+      }
 
       primaryButton(
         text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__credit_or_debit_card),
-          icon = DSLSettingsIcon.from(R.drawable.credit_card, R.color.signal_colorOnPrimary),
+        icon = DSLSettingsIcon.from(R.drawable.credit_card, R.color.signal_colorOnCustom),
         onClick = {
           findNavController().popBackStack()
           val response = GatewayResponse(GatewayResponse.Gateway.CREDIT_CARD, args.request)
@@ -113,9 +140,13 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
         }
       )
     }
+  }
 
+  private fun DSLConfiguration.renderSEPADebitButton(state: GatewaySelectorState, isFirstButton: Boolean) {
     if (state.isSEPADebitAvailable) {
+      if (!isFirstButton) {
         space(8.dp)
+      }
 
       tonalButton(
         text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__bank_transfer),
@@ -127,9 +158,6 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
         }
       )
     }
-
-      space(16.dp)
-    }
   }
 
   companion object {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorState.kt

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate.g
 import org.thoughtcrime.securesms.badges.models.Badge
 
 data class GatewaySelectorState(
+  val gatewayOrderStrategy: GatewayOrderStrategy,
   val loading: Boolean = true,
   val badge: Badge,
   val isGooglePayAvailable: Boolean = false,

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorViewModel.kt

@@ -21,6 +21,7 @@ class GatewaySelectorViewModel(
 
   private val store = RxStore(
     GatewaySelectorState(
+      gatewayOrderStrategy = GatewayOrderStrategy.getStrategy(),
       badge = args.request.badge,
       isGooglePayAvailable = InAppDonations.isPaymentSourceAvailable(PaymentSourceType.Stripe.GooglePay, args.request.donateToSignalType),
       isCreditCardAvailable = InAppDonations.isPaymentSourceAvailable(PaymentSourceType.Stripe.CreditCard, args.request.donateToSignalType),