Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android into analysis/wordpress-all-warnings-as-errors

ParaskP7 · ParaskP7 · commit 48c8e00506d3 · 2022-10-13T15:01:13.000+03:00
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,8 +2,10 @@
 
 21.0
 -----
+* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
 * [*] 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
 -----
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/ContactUsTests.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/ContactUsTests.java
@@ -1,7 +1,6 @@
 package org.wordpress.android.e2e;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.e2e.pages.ContactSupportScreen;
@@ -18,7 +17,6 @@ public void setUp() {
         logoutIfNecessary();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eSendButtonEnabledWhenTextIsEntered() {
         try {
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.java
@@ -2,7 +2,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.support.BaseTest;
@@ -24,7 +23,6 @@ public void setUp() {
         logoutIfNecessary();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLoginWithEmailPassword() {
         new LoginFlow().chooseContinueWithWpCom()
@@ -33,7 +31,6 @@ public void e2eLoginWithEmailPassword() {
                        .confirmLogin(false);
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLoginWithPasswordlessAccount() {
         new LoginFlow().chooseContinueWithWpCom()
@@ -51,7 +48,6 @@ public void e2eLoginWithSiteAddress() {
                        .confirmLogin(false);
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLoginWithMagicLink() {
         new LoginFlow().chooseContinueWithWpCom()
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/ReaderTests.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/ReaderTests.java
@@ -5,7 +5,6 @@
 import androidx.test.rule.GrantPermissionRule;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.wordpress.android.e2e.pages.ReaderPage;
@@ -28,7 +27,6 @@ public void setUp() {
     String mCoachingPostTitle = "Let's check out the coaching team!";
     String mCompetitionPostTitle = "Let's focus on the competition.";
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eNavigateThroughPosts() {
         new ReaderPage()
@@ -42,7 +40,6 @@ public void e2eNavigateThroughPosts() {
                 .goBackToReader();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLikePost() {
         new ReaderPage()
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/ContactSupportScreen.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/ContactSupportScreen.java
@@ -17,6 +17,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.wordpress.android.support.WPSupportUtils.populateTextField;
 import static org.wordpress.android.support.WPSupportUtils.sleep;
+import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayed;
 import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayedWithoutFailure;
 
 public class ContactSupportScreen {
@@ -67,6 +68,7 @@ public HelpAndSupportScreen goBackAndDeleteUnsentMessageIfNeeded() {
 
     // Assertions:
     public ContactSupportScreen assertContactSupportScreenLoaded() {
+        waitForElementToBeDisplayed(textInput);
         textInput.check(matches(isCompletelyDisplayed()));
         sendButton.check(matches(isCompletelyDisplayed()));
         return this;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutViewModel.kt
@@ -4,13 +4,16 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.automattic.about.model.AboutConfig
+import com.automattic.about.model.AboutFooterConfig
 import com.automattic.about.model.AnalyticsConfig
+import com.automattic.about.model.AutomatticConfig
 import com.automattic.about.model.HeaderConfig
 import com.automattic.about.model.ItemConfig
 import com.automattic.about.model.LegalConfig
 import com.automattic.about.model.RateUsConfig
 import com.automattic.about.model.ShareConfig
 import com.automattic.about.model.SocialsConfig
+import com.automattic.about.model.WorkWithUsConfig
 import org.wordpress.android.Constants
 import org.wordpress.android.R
 import org.wordpress.android.models.recommend.RecommendApiCallsProvider
@@ -49,7 +52,7 @@ class UnifiedAboutViewModel @Inject constructor(
             customItems = listOf(
                     ItemConfig(
                             name = BLOG_ITEM_NAME,
-                            title = contextProvider.getContext().getString(R.string.about_blog),
+                            title = blogTitle(),
                             onClick = ::onBlogClick
                     )
             ),
@@ -58,6 +61,13 @@ class UnifiedAboutViewModel @Inject constructor(
                     privacyPolicyUrl = Constants.URL_PRIVACY_POLICY,
                     acknowledgementsUrl = LICENSES_FILE_URL
             ),
+            automatticConfig = AutomatticConfig(isVisible = buildConfig.isJetpackApp),
+            workWithUsConfig = WorkWithUsConfig(
+                    title =  workWithUsTitle(),
+                    subtitle = workWithUsSubTitle(),
+                    url = if (buildConfig.isJetpackApp) JP_WORK_WITH_US_URL else WP_CONTRIBUTE_URL
+            ),
+            aboutFooterConfig = AboutFooterConfig(isVisible = buildConfig.isJetpackApp),
             analyticsConfig = AnalyticsConfig(
                     trackScreenShown = unifiedAboutTracker::trackScreenShown,
                     trackScreenDismissed = unifiedAboutTracker::trackScreenDismissed,
@@ -90,16 +100,36 @@ class UnifiedAboutViewModel @Inject constructor(
         _onNavigation.postValue(Event(OpenBlog(if (buildConfig.isJetpackApp) JP_BLOG_URL else WP_BLOG_URL)))
     }
 
+    private fun blogTitle() = if (buildConfig.isJetpackApp) {
+        contextProvider.getContext().getString(R.string.about_blog)
+    } else {
+        contextProvider.getContext().getString(R.string.about_news)
+    }
+
+    private fun workWithUsTitle() = if (buildConfig.isJetpackApp) {
+        contextProvider.getContext().getString(R.string.about_automattic_work_with_us_item_title)
+    } else {
+        contextProvider.getContext().getString(R.string.about_automattic_contribute_item_title)
+    }
+
+    private fun workWithUsSubTitle() = if (buildConfig.isJetpackApp) {
+        contextProvider.getContext().getString(R.string.about_automattic_work_with_us_item_subtitle)
+    } else {
+        null
+    }
+
     companion object {
         private const val BLOG_ITEM_NAME = "blog"
         private const val LICENSES_FILE_URL = "file:///android_asset/licenses.html"
 
-        private const val WP_SOCIAL_HANDLE = "wordpress"
+        private const val WP_SOCIAL_HANDLE = "WPAndroid"
         private const val WP_APPS_URL = "https://apps.wordpress.com"
-        private const val WP_BLOG_URL = "https://blog.wordpress.com"
+        private const val WP_BLOG_URL = "https://wordpress.org/news/"
+        private const val WP_CONTRIBUTE_URL = "https://make.wordpress.org/mobile/handbook/"
 
         private const val JP_SOCIAL_HANDLE = "jetpack"
         private const val JP_APPS_URL = "https://jetpack.com/app"
         private const val JP_BLOG_URL = "https://jetpack.com/blog"
+        private const val JP_WORK_WITH_US_URL = "https://automattic.com/work-with-us/"
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsMapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsMapper.kt
@@ -13,6 +13,7 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
 import org.wordpress.android.util.text.PercentFormatter
 import org.wordpress.android.viewmodel.ResourceProvider
+import java.math.RoundingMode.HALF_UP
 import javax.inject.Inject
 
 class PostDayViewsMapper
@@ -67,7 +68,7 @@ class PostDayViewsMapper
                 0 -> "∞"
                 else -> {
                     val percentageValue = difference.toFloat() / previousValue
-                    percentFormatter.format(percentageValue)
+                    percentFormatter.format(value = percentageValue, rounding = HALF_UP)
                 }
             }
             val formattedDifference = mapIntToString(difference, isFormattedNumber)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCase.kt
@@ -24,6 +24,7 @@ import org.wordpress.android.ui.stats.refresh.utils.ItemPopupMenuHandler
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.util.text.PercentFormatter
 import org.wordpress.android.viewmodel.ResourceProvider
+import java.math.RoundingMode
 import javax.inject.Inject
 import javax.inject.Named
 import kotlin.math.roundToInt
@@ -75,11 +76,17 @@ class MostPopularInsightsUseCase
         } else {
             val highestDayPercent = resourceProvider.getString(
                     R.string.stats_most_popular_percent_views,
-                    percentFormatter.format(domainModel.highestDayPercent.roundToInt())
+                    percentFormatter.format(
+                            value = domainModel.highestDayPercent.roundToInt(),
+                            rounding = RoundingMode.HALF_UP
+                    )
             )
             val highestHourPercent = resourceProvider.getString(
                     R.string.stats_most_popular_percent_views,
-                    percentFormatter.format(domainModel.highestHourPercent.roundToInt())
+                    percentFormatter.format(
+                            value = domainModel.highestHourPercent.roundToInt(),
+                            rounding = RoundingMode.HALF_UP
+                    )
             )
             items.add(
                     QuickScanItem(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt b/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()
             )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsUtils.kt
@@ -7,6 +7,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LineC
 import org.wordpress.android.util.LocaleManagerWrapper
 import org.wordpress.android.util.text.PercentFormatter
 import org.wordpress.android.viewmodel.ResourceProvider
+import java.math.RoundingMode.HALF_UP
 import java.text.DecimalFormat
 import java.util.TreeMap
 import javax.inject.Inject
@@ -197,7 +198,7 @@ class StatsUtils @Inject constructor(
                 0L -> "∞"
                 else -> {
                     val percentageValue = difference.toFloat() / previousValue
-                    percentFormatter.format(percentageValue)
+                    percentFormatter.format(value = percentageValue, rounding = HALF_UP)
                 }
             }
             val formattedDifference = mapLongToString(difference, isFormattedNumber)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/extensions/StringExtensions.kt b/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
 
 /**
@@ -18,3 +21,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
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/MaterialTextViewWithNumerals.kt b/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
-    }
 }
diff --git a/WordPress/src/main/res/layout/stats_block_text_item.xml b/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"
diff --git a/WordPress/src/main/res/layout/stats_block_value_item.xml b/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>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -4057,6 +4057,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
 
     <!-- About -->
     <string name="about_blog">Blog</string>
+    <string name="about_news">News</string>
     <string name="about_automattic_main_page_title" tools:ignore="UnusedResources" a8c-src-lib="about">About %1$s</string>
     <string name="about_automattic_legal_page_title" tools:ignore="UnusedResources" a8c-src-lib="about">Legal and More</string>
     <string name="about_automattic_acknowledgements_page_title" tools:ignore="UnusedResources" a8c-src-lib="about">Acknowledgements</string>
@@ -4068,6 +4069,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="about_automattic_legal_and_more_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Legal and More</string>
     <string name="about_automattic_family_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Automattic Family</string>
     <string name="about_automattic_work_with_us_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Work With Us</string>
+    <string name="about_automattic_contribute_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Contribute</string>
     <string name="about_automattic_work_with_us_item_subtitle" tools:ignore="UnusedResources" a8c-src-lib="about">Work from Anywhere</string>
     <string name="about_automattic_terms_of_service_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Terms of Service</string>
     <string name="about_automattic_privacy_policy_item_title" tools:ignore="UnusedResources" a8c-src-lib="about">Privacy Policy</string>
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsMapperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostDayViewsMapperTest.kt
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/MostPopularInsightsUseCaseTest.kt
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/utils/StatsUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/utils/StatsUtilsTest.kt
diff --git a/build.gradle b/build.gradle
