Merge pull request #17217 from wordpress-mobile/fix/20.8-western-arabic-numerals

Update more in-app Stats texts to always use western arabic numerals

Author: ovitrif

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 -----
 * [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
 * [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
+* [*] Stats: Fix Western Arabic Numerals not being shown on every text of the stats screens in Arabic languages [https://github.com/wordpress-mobile/WordPress-Android/pull/17217]
 
 20.9
 -----

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt

@@ -23,6 +23,7 @@ import org.wordpress.android.ui.stats.refresh.utils.MILLION
 import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
 import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.util.extensions.enforceWesternArabicNumerals
 import org.wordpress.android.viewmodel.ResourceProvider
 import javax.inject.Inject
 
@@ -117,7 +118,7 @@ class ViewsAndVisitorsMapper
             val value = it.getValue(selectedType)
             val date = statsDateFormatter.parseStatsDate(statsGranularity, it.period)
             Line(
-                    statsDateFormatter.printDayWithoutYear(date),
+                    statsDateFormatter.printDayWithoutYear(date).enforceWesternArabicNumerals() as String,
                     it.period,
                     value.toInt()
             )

WordPress/src/main/java/org/wordpress/android/util/extensions/StringExtensions.kt

@@ -1,6 +1,9 @@
 package org.wordpress.android.util.extensions
 
 import android.annotation.SuppressLint
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.TextUtils
 import java.util.Locale
 
 /**
@@ -17,3 +20,26 @@ import java.util.Locale
 fun String.capitalizeWithLocaleWithoutLint(locale: Locale): String {
     return this.capitalize(locale)
 }
+
+/**
+ * Converts digits to Western Arabic -- Workaround for an issue in Android that shows Eastern Arabic numerals.
+ * There is an issue in Google's bug tracker for this: [SO Answer](https://stackoverflow.com/a/34612487/4129245).
+ * The returned String uses the default Locale.
+ * @return a String with numerals in Western Arabic format persisting spans if available.
+ */
+fun CharSequence.enforceWesternArabicNumerals(): CharSequence {
+    val textWithArabicNumerals = this
+            // Replace Eastern Arabic numerals
+            .replace(Regex("[٠-٩]")) { match -> (match.value.single() - '٠').toString() }
+            // Replace Persian/Urdu numerals
+            .replace(Regex("[۰-۹]")) { match -> (match.value.single() - '۰').toString() }
+
+    // Restore spans if text is an instance of Spanned
+    if (this is Spanned) {
+        val spannableText = SpannableString(textWithArabicNumerals)
+        TextUtils.copySpansFrom(this, 0, this.length, null, spannableText, 0)
+        return spannableText
+    }
+
+    return textWithArabicNumerals
+}

WordPress/src/main/java/org/wordpress/android/widgets/MaterialTextViewWithNumerals.kt

@@ -1,11 +1,9 @@
 package org.wordpress.android.widgets
 
 import android.content.Context
-import android.text.SpannableString
-import android.text.Spanned
-import android.text.TextUtils
 import android.util.AttributeSet
 import com.google.android.material.textview.MaterialTextView
+import org.wordpress.android.util.extensions.enforceWesternArabicNumerals
 
 /**
  * MaterialTextView which enforces Western Arabic numerals.
@@ -18,21 +16,4 @@ class MaterialTextViewWithNumerals @JvmOverloads constructor(
     override fun setText(text: CharSequence?, type: BufferType?) {
         super.setText(text?.enforceWesternArabicNumerals(), type)
     }
-
-    private fun CharSequence.enforceWesternArabicNumerals(): CharSequence {
-        val textWithArabicNumerals = this
-                // Replace Eastern Arabic numerals
-                .replace(Regex("[٠-٩]")) { match -> (match.value.single() - '٠').toString() }
-                // Replace Persian/Urdu numerals
-                .replace(Regex("[۰-۹]")) { match -> (match.value.single() - '۰').toString() }
-
-        val spannableText = SpannableString(textWithArabicNumerals)
-
-        // Restore spans if text is an instance of Spanned
-        if (this is Spanned) {
-            TextUtils.copySpansFrom(this, 0, this.length, null, spannableText, 0)
-        }
-
-        return spannableText
-    }
 }

WordPress/src/main/res/layout/stats_block_text_item.xml

@@ -8,7 +8,7 @@
     android:paddingStart="@dimen/margin_extra_large"
     android:paddingEnd="@dimen/margin_extra_large">
 
-    <com.google.android.material.textview.MaterialTextView
+    <org.wordpress.android.widgets.MaterialTextViewWithNumerals
         android:id="@+id/text"
         style="@style/StatsBlockText"
         android:layout_width="wrap_content"

WordPress/src/main/res/layout/stats_block_value_item.xml

@@ -8,6 +8,7 @@
     android:paddingStart="@dimen/margin_extra_large"
     android:paddingTop="@dimen/margin_extra_large"
     android:paddingEnd="@dimen/margin_extra_large"
+    xmlns:tools="http://schemas.android.com/tools"
     android:paddingBottom="8dp">
 
     <org.wordpress.android.widgets.MaterialTextViewWithNumerals
@@ -38,5 +39,8 @@
         android:layout_gravity="bottom"
         android:textColor="?attr/wpColorSuccess"
         android:textSize="16sp"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:text="-7 (-100%)"
+        android:layoutDirection="ltr"
+        tools:visibility="visible" />
 </LinearLayout>