Merge branch 'main' into Serializable_extensions

Author: Isira-Seneviratne

app/build.gradle

@@ -37,7 +37,7 @@ android {
         applicationId 'org.wikipedia'
         minSdk 21
         targetSdk 34
-        versionCode 50453
+        versionCode 50455
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'

app/src/main/java/org/wikipedia/activity/SingleWebViewActivity.kt

@@ -13,6 +13,7 @@ import android.webkit.WebView
 import androidx.core.view.isVisible
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
+import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.databinding.ActivitySingleWebViewBinding
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.okhttp.OkHttpWebViewClient
@@ -115,6 +116,9 @@ class SingleWebViewActivity : BaseActivity() {
     }
 
     private fun goBack() {
+        if (intent.getStringExtra(EXTRA_PAGE_CONTENT_INFO).orEmpty() == PAGE_CONTENT_SOURCE_DONOR_EXPERIENCE) {
+            DonorExperienceEvent.logAction("article_return_click", "webpay_processed")
+        }
         pageTitle?.let {
             val entry = HistoryEntry(it, HistoryEntry.SOURCE_SINGLE_WEBVIEW)
             startActivity(PageActivity.newIntentForExistingTab(this@SingleWebViewActivity, entry, entry.title))
@@ -133,12 +137,15 @@ class SingleWebViewActivity : BaseActivity() {
         const val EXTRA_URL = "url"
         const val EXTRA_SHOW_BACK_BUTTON = "goBack"
         const val EXTRA_PAGE_TITLE = "pageTitle"
+        const val EXTRA_PAGE_CONTENT_INFO = "pageContentInfo"
+        const val PAGE_CONTENT_SOURCE_DONOR_EXPERIENCE = "donorExperience"
 
-        fun newIntent(context: Context, url: String, showBackButton: Boolean = false, pageTitle: PageTitle? = null): Intent {
+        fun newIntent(context: Context, url: String, showBackButton: Boolean = false, pageTitle: PageTitle? = null, pageContentInfo: String? = null): Intent {
             return Intent(context, SingleWebViewActivity::class.java)
                     .putExtra(EXTRA_URL, url)
                     .putExtra(EXTRA_SHOW_BACK_BUTTON, showBackButton)
                     .putExtra(EXTRA_PAGE_TITLE, pageTitle)
+                    .putExtra(EXTRA_PAGE_CONTENT_INFO, pageContentInfo)
         }
     }
 }

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

@@ -13,21 +13,21 @@ class DonorExperienceEvent(
     private val action_data: String,
     private val primary_language: String,
     private val wiki_id: String,
-    private val platform: String = "android"
+    private var platform: String
 ) : MobileAppsEvent(STREAM_NAME) {
 
     companion object {
         private const val STREAM_NAME = "app_donor_experience"
 
-        fun logImpression(activeInterface: String, actionData: String = "", wikiId: String = "") {
-            submitDonorExperienceEvent("impression", activeInterface, actionData, wikiId)
+        fun logImpression(activeInterface: String, campaignId: String? = null, wikiId: String = "") {
+            submitDonorExperienceEvent("impression", activeInterface, getActionDataString(campaignId), wikiId)
         }
 
         fun logAction(
             action: String,
             activeInterface: String,
             wikiId: String = "",
-            campaignId: Long? = null
+            campaignId: String? = null
         ) {
             submitDonorExperienceEvent(
                 action,
@@ -37,7 +37,7 @@ class DonorExperienceEvent(
             )
         }
 
-        fun getActionDataString(campaignId: Long? = null): String {
+        fun getActionDataString(campaignId: String? = null): String {
             return campaignId?.let { "campaign_id: $it, " }.orEmpty()
         }
 
@@ -53,7 +53,8 @@ class DonorExperienceEvent(
                     activeInterface,
                     actionData,
                     WikipediaApp.instance.languageState.appLanguageCode,
-                    wikiId
+                    wikiId,
+                    "android"
                 )
             )
         }

app/src/main/java/org/wikipedia/navtab/MenuNavTabDialog.kt

@@ -12,6 +12,7 @@ import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.activity.FragmentUtil
 import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
+import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.auth.AccountUtil
 import org.wikipedia.databinding.ViewMainDrawerBinding
 import org.wikipedia.page.ExtendedBottomSheetDialogFragment
@@ -70,6 +71,7 @@ class MenuNavTabDialog : ExtendedBottomSheetDialogFragment() {
         }
 
         binding.mainDrawerDonateContainer.setOnClickListener {
+            DonorExperienceEvent.logAction("donate_start_click", "more_menu")
             BreadCrumbLogEvent.logClick(requireActivity(), binding.mainDrawerDonateContainer)
             visitInExternalBrowser(requireContext(),
                     Uri.parse(getString(R.string.donate_url,

app/src/main/java/org/wikipedia/page/PageActivity.kt

@@ -33,6 +33,7 @@ import org.wikipedia.activity.BaseActivity
 import org.wikipedia.activity.SingleWebViewActivity
 import org.wikipedia.analytics.eventplatform.ArticleLinkPreviewInteractionEvent
 import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
+import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.analytics.metricsplatform.ArticleLinkPreviewInteraction
 import org.wikipedia.auth.AccountUtil
 import org.wikipedia.commons.FilePageActivity
@@ -517,7 +518,9 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Ca
                     val utmCampaign = uri.getQueryParameter("utm_campaign")
                     if (utmCampaign != null && utmCampaign == "Android") {
                         // TODO: need to verify if the page can be displayed and logged properly.
-                        startActivity(SingleWebViewActivity.newIntent(this@PageActivity, uri.toString(), true, pageFragment.title))
+                        DonorExperienceEvent.logImpression("webpay_processed")
+                        startActivity(SingleWebViewActivity.newIntent(this@PageActivity, uri.toString(),
+                            true, pageFragment.title, SingleWebViewActivity.PAGE_CONTENT_SOURCE_DONOR_EXPERIENCE))
                         finish()
                         return
                     }

app/src/main/java/org/wikipedia/page/PageFragment.kt

@@ -51,6 +51,7 @@ import org.wikipedia.WikipediaApp
 import org.wikipedia.activity.FragmentUtil.getCallback
 import org.wikipedia.analytics.eventplatform.ArticleFindInPageInteractionEvent
 import org.wikipedia.analytics.eventplatform.ArticleInteractionEvent
+import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.analytics.eventplatform.EventPlatformClient
 import org.wikipedia.analytics.eventplatform.WatchlistAnalyticsHelper
 import org.wikipedia.analytics.metricsplatform.ArticleFindInPageInteraction
@@ -664,7 +665,7 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
     }
 
     private fun maybeShowAnnouncement() {
-        title?.let {
+        title?.let { pageTitle ->
             // Check if the pause time is older than 1 day.
             val dateDiff = Duration.between(Instant.ofEpochMilli(Prefs.announcementPauseTime), Instant.now())
             if (Prefs.hasVisitedArticlePage && dateDiff.toDays() >= 1) {
@@ -673,6 +674,8 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
                     val availableCampaign = campaignList.find { campaign -> campaign.assets[app.appOrSystemLanguageCode] != null }
                     availableCampaign?.let {
                         if (!Prefs.announcementShownDialogs.contains(it.id)) {
+                            DonorExperienceEvent.logImpression("article_banner",
+                                it.id, pageTitle.wikiSite.languageCode)
                             val dialog = CampaignDialog(requireActivity(), it)
                             dialog.setCancelable(false)
                             dialog.show()

app/src/main/java/org/wikipedia/page/campaign/CampaignDialog.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
+import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.dataclient.donate.Campaign
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.CustomTabsUtil
@@ -42,23 +43,28 @@ class CampaignDialog internal constructor(private val context: Context, val camp
     }
 
     override fun onPositiveAction(url: String) {
+        DonorExperienceEvent.logAction("donate_start_click", "article_banner", campaignId = campaign.id)
         val customTabUrl = Prefs.announcementCustomTabTestUrl.orEmpty().ifEmpty { url }
         CustomTabsUtil.openInCustomTab(context, customTabUrl)
         dismissDialog()
     }
 
     override fun onNegativeAction() {
+        DonorExperienceEvent.logAction("already_donated_click", "article_banner", campaignId = campaign.id)
         FeedbackUtil.showMessage(context as Activity, R.string.donation_campaign_donated_snackbar)
         dismissDialog()
     }
 
     override fun onNeutralAction() {
+        DonorExperienceEvent.logAction("later_click", "article_banner", campaignId = campaign.id)
         Prefs.announcementPauseTime = Date().time
         FeedbackUtil.showMessage(context as Activity, R.string.donation_campaign_maybe_later_snackbar)
+        DonorExperienceEvent.logAction("reminder_toast", "article_banner", campaignId = campaign.id)
         dismissDialog(false)
     }
 
     override fun onClose() {
+        DonorExperienceEvent.logAction("close_click", "article_banner", campaignId = campaign.id)
         dismissDialog()
     }
 }

app/src/main/java/org/wikipedia/page/campaign/CampaignDialogView.kt

@@ -1,14 +1,18 @@
 package org.wikipedia.page.campaign
 
 import android.content.Context
+import android.net.Uri
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.view.isVisible
+import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.databinding.DialogCampaignBinding
 import org.wikipedia.dataclient.donate.Campaign
+import org.wikipedia.page.LinkMovementMethodExt
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.StringUtil
+import org.wikipedia.util.UriUtil
 
 class CampaignDialogView(context: Context) : FrameLayout(context) {
     interface Callback {
@@ -30,7 +34,10 @@ class CampaignDialogView(context: Context) : FrameLayout(context) {
                 binding.contentText.text = StringUtil.fromHtml(it.text)
             }
             if (!it.footer.isNullOrEmpty()) {
-                binding.footerText.movementMethod = LinkMovementMethodCompat.getInstance()
+                binding.footerText.movementMethod = LinkMovementMethodExt { url: String ->
+                    DonorExperienceEvent.logAction("donor_policy_click", "article_banner")
+                    UriUtil.visitInExternalBrowser(this.context, Uri.parse(url))
+                }
                 binding.footerText.text = StringUtil.fromHtml(it.footer)
             }
 

app/src/main/java/org/wikipedia/util/StringUtil.kt

@@ -144,11 +144,11 @@ object StringUtil {
         textView.text = fromHtml(parentTextStr)
     }
 
-    fun setHighlightedAndBoldenedText(textView: TextView, input: CharSequence, query: String?) {
-        textView.text = if (query.isNullOrEmpty()) input else buildSpannedString {
-            append(input)
+    fun setHighlightedAndBoldenedText(textView: TextView, parentText: CharSequence, query: String?) {
+        textView.text = if (query.isNullOrEmpty()) parentText else buildSpannedString {
+            append(parentText)
 
-            query.toRegex(HIGHLIGHT_REGEX_OPTIONS).findAll(input)
+            query.toRegex(HIGHLIGHT_REGEX_OPTIONS).findAll(parentText)
                 .forEach {
                     val range = it.range
                     val (start, end) = range.first to range.last + 1

app/src/main/res/layout/dialog_campaign.xml

@@ -27,11 +27,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:layout_marginBottom="12dp"
                 android:lineSpacingMultiplier="1.21"
                 android:fontFamily="sans-serif"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
+                android:paddingHorizontal="16dp"
+                android:paddingBottom="24dp"
                 android:textColor="?attr/primary_color"
                 android:textSize="16sp"
                 android:clipChildren="false"