Extract CharSequence.enforceWesternArabicNumerals

Author: ovitrif

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

@@ -6,6 +6,7 @@ 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 +19,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
-    }
 }