[Feature branch] The Donation Reminder

app/src/extra/java/org/wikipedia/donate/GooglePayActivity.kt

@@ -46,7 +46,7 @@ class GooglePayActivity : BaseActivity() {
     private var shouldWatchText = true
     private var typedManually = false
 
-    private val transactionFee get() = max(getAmountFloat(binding.donateAmountText.text.toString()) * GooglePayComponent.TRANSACTION_FEE_PERCENTAGE, viewModel.transactionFee)
+    private val transactionFee get() = max(DonateUtil.getAmountFloat(binding.donateAmountText.text.toString()) * GooglePayComponent.TRANSACTION_FEE_PERCENTAGE, viewModel.transactionFee)
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -56,7 +56,7 @@ class GooglePayActivity : BaseActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         title = ""
 
-        binding.donateAmountInput.prefixText = viewModel.currencySymbol
+        binding.donateAmountInput.prefixText = DonateUtil.currencySymbol
 
         paymentsClient = GooglePayComponent.createPaymentsClient(this)
 
@@ -87,7 +87,7 @@ class GooglePayActivity : BaseActivity() {
                                 )
                                 CampaignCollection.addDonationResult(
                                     amount = viewModel.finalAmount,
-                                    currency = viewModel.currencyCode,
+                                    currency = DonateUtil.currencyCode,
                                     recurring = binding.checkBoxRecurring.isChecked
                                 )
                                 setResult(RESULT_OK)
@@ -109,7 +109,7 @@ class GooglePayActivity : BaseActivity() {
                 return@setOnClickListener
             }
 
-            var totalAmount = getAmountFloat(amountText)
+            var totalAmount = DonateUtil.getAmountFloat(amountText)
             if (binding.checkBoxTransactionFee.isChecked) {
                 totalAmount += transactionFee
             }
@@ -135,7 +135,7 @@ class GooglePayActivity : BaseActivity() {
             }
             val buttonToHighlight = binding.amountPresetsContainer.children.firstOrNull { child ->
                 if (child is MaterialButton) {
-                    val amount = getAmountFloat(text.toString())
+                    val amount = DonateUtil.getAmountFloat(text.toString())
                     child.tag == amount
                 } else {
                     false
@@ -166,18 +166,20 @@ class GooglePayActivity : BaseActivity() {
     }
 
     private fun validateInput(text: String): Boolean {
-        val amount = getAmountFloat(text)
+        val amount = DonateUtil.getAmountFloat(text)
         val min = viewModel.minimumAmount
         val max = viewModel.maximumAmount
 
         updateTransactionFee()
 
         if (amount <= 0f || amount < min) {
-            binding.donateAmountInput.error = getString(R.string.donate_gpay_minimum_amount, viewModel.currencyFormat.format(min))
+            binding.donateAmountInput.error = getString(R.string.donate_gpay_minimum_amount,
+                DonateUtil.currencyFormat.format(min))
             DonorExperienceEvent.submit("submission_error", "gpay", "error_reason: min_amount")
             return false
         } else if (max > 0f && amount > max) {
-            binding.donateAmountInput.error = getString(R.string.donate_gpay_maximum_amount, viewModel.currencyFormat.format(max))
+            binding.donateAmountInput.error = getString(R.string.donate_gpay_maximum_amount,
+                DonateUtil.currencyFormat.format(max))
             DonorExperienceEvent.submit("submission_error", "gpay", "error_reason: max_amount")
             return false
         } else {
@@ -219,23 +221,38 @@ class GooglePayActivity : BaseActivity() {
             .build())
 
         val viewIds = mutableListOf<Int>()
-        val presets = donationConfig.currencyAmountPresets[viewModel.currencyCode]
-        presets?.forEach { amount ->
+        val presets = donationConfig.currencyAmountPresets[DonateUtil.currencyCode]?.toMutableSet()
+        if (viewModel.filledAmount > 0f) {
+            presets?.add(viewModel.filledAmount)
+        }
+        var filledAmountButton: MaterialButton? = null
+        presets?.sorted()?.forEach { amount ->
             val viewId = View.generateViewId()
             viewIds.add(viewId)
             val button = MaterialButton(this)
-            button.text = viewModel.currencyFormat.format(amount)
+            button.text = DonateUtil.currencyFormat.format(amount)
             button.id = viewId
             button.tag = amount
+            if (amount == viewModel.filledAmount) {
+                filledAmountButton = button
+            }
             binding.amountPresetsContainer.addView(button)
+
             button.setOnClickListener {
                 setButtonHighlighted(it)
                 setAmountText(it.tag as Float)
                 DonorExperienceEvent.logAction("amount_selected", "gpay")
             }
         }
         binding.amountPresetsFlow.referencedIds = viewIds.toIntArray()
-        setButtonHighlighted()
+        setFilledAmountToText()
+        setButtonHighlighted(filledAmountButton)
+    }
+
+    private fun setFilledAmountToText() {
+        if (viewModel.filledAmount > 0f) {
+            setAmountText(viewModel.filledAmount)
+        }
     }
 
     private fun setButtonHighlighted(button: View? = null) {
@@ -254,17 +271,7 @@ class GooglePayActivity : BaseActivity() {
 
     private fun updateTransactionFee() {
         binding.checkBoxTransactionFee.text = getString(R.string.donate_gpay_check_transaction_fee,
-            viewModel.currencyFormat.format(transactionFee))
-    }
-
-    private fun getAmountFloat(text: String): Float {
-        var result: Float?
-        result = text.toFloatOrNull()
-        if (result == null) {
-            val text2 = if (text.contains(".")) text.replace(".", ",") else text.replace(",", ".")
-            result = text2.toFloatOrNull()
-        }
-        return result ?: 0f
+            DonateUtil.currencyFormat.format(transactionFee))
     }
 
     private fun setAmountText(amount: Float) {
@@ -306,11 +313,13 @@ class GooglePayActivity : BaseActivity() {
     companion object {
         private const val LOAD_PAYMENT_DATA_REQUEST_CODE = 42
         private const val CAMPAIGN_ID_APP_MENU = "appmenu"
+        const val FILLED_AMOUNT = "filledAmount"
 
-        fun newIntent(context: Context, campaignId: String? = null, donateUrl: String? = null): Intent {
+        fun newIntent(context: Context, campaignId: String? = null, donateUrl: String? = null, filledAmount: Float = 0f): Intent {
             return Intent(context, GooglePayActivity::class.java)
                 .putExtra(DonateDialog.ARG_CAMPAIGN_ID, campaignId)
                 .putExtra(DonateDialog.ARG_DONATE_URL, donateUrl)
+                .putExtra(FILLED_AMOUNT, filledAmount)
         }
     }
 }

app/src/extra/java/org/wikipedia/donate/GooglePayComponent.kt

@@ -78,8 +78,8 @@ internal object GooglePayComponent {
         return available
     }
 
-    fun getDonateActivityIntent(activity: Activity, campaignId: String? = null, donateUrl: String? = null): Intent {
-        return GooglePayActivity.newIntent(activity, campaignId, donateUrl)
+    fun getDonateActivityIntent(activity: Activity, campaignId: String? = null, donateUrl: String? = null, filledAmount: Float = 0f): Intent {
+        return GooglePayActivity.newIntent(activity, campaignId, donateUrl, filledAmount)
     }
 
     fun getPaymentDataRequestJson(

app/src/extra/java/org/wikipedia/donate/GooglePayViewModel.kt

@@ -1,5 +1,6 @@
 package org.wikipedia.donate
 
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.google.android.gms.wallet.PaymentData
@@ -19,52 +20,45 @@ import org.wikipedia.dataclient.donate.CampaignCollection
 import org.wikipedia.dataclient.donate.DonationConfig
 import org.wikipedia.dataclient.donate.DonationConfigHelper
 import org.wikipedia.settings.Prefs
-import org.wikipedia.util.GeoUtil
 import org.wikipedia.util.Resource
 import org.wikipedia.util.log.L
-import java.text.NumberFormat
 import java.time.Instant
-import java.util.Locale
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
 
-class GooglePayViewModel : ViewModel() {
+class GooglePayViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
+    val filledAmount = savedStateHandle.get<Float>(GooglePayActivity.FILLED_AMOUNT) ?: 0f
     val uiState = MutableStateFlow(Resource<DonationConfig>())
     private var donationConfig: DonationConfig? = null
-    private val currentCountryCode get() = GeoUtil.geoIPCountry.orEmpty()
 
-    val currencyFormat: NumberFormat = NumberFormat.getCurrencyInstance(Locale.Builder()
-        .setLocale(Locale.getDefault()).setRegion(currentCountryCode).build())
-    val currencyCode get() = currencyFormat.currency?.currencyCode ?: GooglePayComponent.CURRENCY_FALLBACK
-    val currencySymbol get() = currencyFormat.currency?.symbol ?: "$"
-    val decimalFormat = GooglePayComponent.getDecimalFormat(currencyCode)
+    val decimalFormat = GooglePayComponent.getDecimalFormat(DonateUtil.currencyCode)
 
-    val transactionFee get() = donationConfig?.currencyTransactionFees?.get(currencyCode)
+    val transactionFee get() = donationConfig?.currencyTransactionFees?.get(DonateUtil.currencyCode)
         ?: donationConfig?.currencyTransactionFees?.get("default") ?: 0f
 
-    val minimumAmount get() = donationConfig?.currencyMinimumDonation?.get(currencyCode) ?: 0f
+    val minimumAmount get() = donationConfig?.currencyMinimumDonation?.get(DonateUtil.currencyCode) ?: 0f
 
     val maximumAmount: Float get() {
-        var max = donationConfig?.currencyMaximumDonation?.get(currencyCode) ?: 0f
+        var max = donationConfig?.currencyMaximumDonation?.get(DonateUtil.currencyCode) ?: 0f
         if (max == 0f) {
             val defaultMin = donationConfig?.currencyMinimumDonation?.get(GooglePayComponent.CURRENCY_FALLBACK) ?: 0f
             if (defaultMin > 0f) {
-                max = (donationConfig?.currencyMinimumDonation?.get(currencyCode) ?: 0f) / defaultMin *
+                max = (donationConfig?.currencyMinimumDonation?.get(DonateUtil.currencyCode) ?: 0f) / defaultMin *
                         (donationConfig?.currencyMaximumDonation?.get(GooglePayComponent.CURRENCY_FALLBACK) ?: 0f)
             }
         }
         return max
     }
 
-    val emailOptInRequired get() = donationConfig?.countryCodeEmailOptInRequired.orEmpty().contains(currentCountryCode)
+    val emailOptInRequired get() = donationConfig?.countryCodeEmailOptInRequired.orEmpty().contains(DonateUtil.currentCountryCode)
 
     var disclaimerInformationSharing: String? = null
     var disclaimerMonthlyCancel: String? = null
 
     var finalAmount = 0f
 
     init {
-        currencyFormat.minimumFractionDigits = 0
+        DonateUtil.currencyFormat.minimumFractionDigits = 0
         load()
     }
 
@@ -75,8 +69,7 @@ class GooglePayViewModel : ViewModel() {
             uiState.value = Resource.Loading()
 
             val donationConfigCall = async { DonationConfigHelper.getConfig() }
-            val donationMessagesCall = async { ServiceFactory.get(WikipediaApp.instance.wikiSite,
-                DonationConfigHelper.DONATE_WIKI_URL, Service::class.java).getMessages(
+            val donationMessagesCall = async { ServiceFactory[WikipediaApp.instance.wikiSite, DonationConfigHelper.DONATE_WIKI_URL, Service::class.java].getMessages(
                 listOf(MSG_DISCLAIMER_INFORMATION_SHARING, MSG_DISCLAIMER_MONTHLY_CANCEL).joinToString("|"),
                 null, WikipediaApp.instance.appOrSystemLanguageCode) }
 
@@ -94,7 +87,7 @@ class GooglePayViewModel : ViewModel() {
 
                 val paymentMethodsCall = async {
                     ServiceFactory.get(WikiSite(GooglePayComponent.PAYMENTS_API_URL))
-                        .getPaymentMethods(currentCountryCode)
+                        .getPaymentMethods(DonateUtil.currentCountryCode)
                 }
                 paymentMethodsCall.await().response?.let { response ->
                     Prefs.paymentMethodsLastQueryTime = now
@@ -107,8 +100,8 @@ class GooglePayViewModel : ViewModel() {
 
             if (Prefs.paymentMethodsMerchantId.isEmpty() ||
                 Prefs.paymentMethodsGatewayId.isEmpty() ||
-                !donationConfig!!.countryCodeGooglePayEnabled.contains(currentCountryCode) ||
-                !donationConfig!!.currencyAmountPresets.containsKey(currencyCode)) {
+                !donationConfig!!.countryCodeGooglePayEnabled.contains(DonateUtil.currentCountryCode) ||
+                !donationConfig!!.currencyAmountPresets.containsKey(DonateUtil.currencyCode)) {
                 uiState.value = NoPaymentMethod()
             } else {
                 uiState.value = Resource.Success(donationConfig!!)
@@ -118,7 +111,7 @@ class GooglePayViewModel : ViewModel() {
 
     fun getPaymentDataRequest(): PaymentDataRequest {
         return PaymentDataRequest.fromJson(GooglePayComponent.getPaymentDataRequestJson(finalAmount,
-            currencyCode,
+            DonateUtil.currencyCode,
             Prefs.paymentMethodsMerchantId,
             Prefs.paymentMethodsGatewayId
         ).toString())
@@ -149,17 +142,17 @@ class GooglePayViewModel : ViewModel() {
 
             // The backend expects the final amount in the canonical decimal format, instead of
             // any localized format, e.g. comma as decimal separator.
-            val decimalFormatCanonical = GooglePayComponent.getDecimalFormat(currencyCode, true)
+            val decimalFormatCanonical = GooglePayComponent.getDecimalFormat(DonateUtil.currencyCode, true)
 
             val response = ServiceFactory.get(WikiSite(GooglePayComponent.PAYMENTS_API_URL))
                 .submitPayment(
                     decimalFormatCanonical.format(finalAmount),
                     BuildConfig.VERSION_NAME,
                     CampaignCollection.getFormattedCampaignId(campaignId),
                     billingObj.optString("locality", ""),
-                    currentCountryCode,
-                    currencyCode,
-                    billingObj.optString("countryCode", currentCountryCode),
+                    DonateUtil.currentCountryCode,
+                    DonateUtil.currencyCode,
+                    billingObj.optString("countryCode", DonateUtil.currentCountryCode),
                     paymentDataObj.optString("email", ""),
                     billingObj.optString("name", ""),
                     WikipediaApp.instance.appOrSystemLanguageCode,

app/src/main/AndroidManifest.xml

@@ -376,6 +376,10 @@
             android:name=".readinglist.recommended.RecommendedReadingListSettingsActivity"
             android:windowSoftInputMode="adjustResize" />
 
+        <activity
+            android:name=".donate.donationreminder.DonationReminderActivity"
+            android:windowSoftInputMode="adjustResize"/>
+
         <provider
             android:name=".WikipediaFileProvider"
             android:authorities="${applicationId}.fileprovider"

app/src/main/java/org/wikipedia/analytics/eventplatform/DonorExperienceEvent.kt

@@ -1,7 +1,10 @@
 package org.wikipedia.analytics.eventplatform
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import org.wikipedia.WikipediaApp
 import org.wikipedia.dataclient.donate.CampaignCollection
+import org.wikipedia.json.JsonUtil
 import org.wikipedia.settings.Prefs
 
 open class DonorExperienceEvent {
@@ -22,6 +25,37 @@ open class DonorExperienceEvent {
             )
         }
 
+        fun logDonationReminderAction(
+            action: String,
+            activeInterface: String,
+            wikiId: String = WikipediaApp.instance.appOrSystemLanguageCode,
+            defaultMilestone: Boolean? = null,
+            campaignId: String? = null,
+            articleFrequency: Int? = null,
+            donateAmount: Float? = null,
+            settingSelect: Boolean? = null,
+            feedbackSelect: Int? = null,
+            feedbackText: String? = null,
+            userGroup: String? = null
+        ) {
+            val actionData = DonationRemindersActionData(
+                defaultMilestone = defaultMilestone,
+                campaignId = campaignId?.let { CampaignCollection.getFormattedCampaignId(campaignId) },
+                articleFrequency = articleFrequency,
+                donateAmount = donateAmount,
+                settingSelect = settingSelect,
+                feedbackSelect = feedbackSelect,
+                feedbackText = feedbackText,
+                userGroup = userGroup
+            )
+            submit(
+                action,
+                activeInterface,
+                JsonUtil.encodeToString(actionData).orEmpty(),
+                wikiId
+            )
+        }
+
         fun submit(
             action: String,
             activeInterface: String,
@@ -40,4 +74,16 @@ open class DonorExperienceEvent {
             )
         }
     }
+
+    @Serializable
+    class DonationRemindersActionData(
+        @SerialName("milestone_default") val defaultMilestone: Boolean? = null,
+        @SerialName("campaign_id") val campaignId: String? = null,
+        @SerialName("read_freq") val articleFrequency: Int? = null,
+        @SerialName("donate_amount") val donateAmount: Float? = null,
+        @SerialName("setting_select") val settingSelect: Boolean? = null,
+        @SerialName("feedback_select") val feedbackSelect: Int? = null,
+        @SerialName("feedback_text") val feedbackText: String? = null,
+        @SerialName("user_group") val userGroup: String? = null
+    )
 }

app/src/main/java/org/wikipedia/bridge/CommunicationBridge.kt

@@ -4,7 +4,12 @@ import android.annotation.SuppressLint
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
-import android.webkit.*
+import android.webkit.ConsoleMessage
+import android.webkit.JavascriptInterface
+import android.webkit.ValueCallback
+import android.webkit.WebChromeClient
+import android.webkit.WebView
+import android.webkit.WebViewClient
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import org.wikipedia.bridge.JavaScriptActionHandler.setUp
@@ -40,6 +45,7 @@ class CommunicationBridge constructor(private val communicationBridgeListener: C
         val model: PageViewModel
         val isPreview: Boolean
         val toolbarMargin: Int
+        val messageCardHeight: Int
     }
 
     init {
@@ -175,7 +181,7 @@ class CommunicationBridge constructor(private val communicationBridgeListener: C
         val setupSettings: String
             get() = setUp(communicationBridgeListener.webView.context,
                     communicationBridgeListener.model.title!!, communicationBridgeListener.isPreview,
-                    communicationBridgeListener.toolbarMargin)
+                    communicationBridgeListener.toolbarMargin, communicationBridgeListener.messageCardHeight)
     }
 
     @Serializable