Merge branch 'trunk' into task/migrate-to-new-blaze-fetch-campaigns-e…

…ndpoint # Conflicts: # build.gradle
wordpress-mobile · Mar 8, 2024 · 2922653 · 2922653
2 parents 3f9edb3 + fa61130
commit 2922653
Show file tree

Hide file tree

Showing 265 changed files with 6,651 additions and 8,233 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -32,7 +32,7 @@ Fixes #
 
 -----
 
-## Testing Checklist:
+## Testing Checklist (strike-out the not-applying and unnecessary ones):
 
 - [ ] WordPress.com sites and self-hosted Jetpack sites.
 - [ ] Portrait and landscape orientations.

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,9 +1,17 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+24.5
+-----
+* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400]
+* [*] [Jetpack-only] Fixes broken links on some notifications [https://github.com/wordpress-mobile/WordPress-Android/pull/20417]
+* [**] [internal] Block editor: Upgrade React Native to version 0.73.3 [#20167]
+
 24.4
 -----
-[***] [Jetpack-only] Improved Notifications experience with richer UI elements and interactions [https://github.com/wordpress-mobile/WordPress-Android/pull/20072]
+* [***] [Jetpack-only] Improved Notifications experience with richer UI elements and interactions [https://github.com/wordpress-mobile/WordPress-Android/pull/20072]
 * [**] [Jetpack-only] Block editor: Introduce VideoPress v5 support, to fix issues using video block with dotcom and Jetpack sites [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6634]
+* [**] [internal] Removed the Stories from the codebase [https://github.com/wordpress-mobile/WordPress-Android/pull/20016]
+* [***] [Jetpack-only] Stats: Introducing Traffic tab, delivering improved graphs, and combining Days/Weeks/Months/Years tabs into one, behind a feature flag. [https://github.com/wordpress-mobile/WordPress-Android/pull/19942]
 * [*] Block editor: Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110]
 * [*] Block editor: Remove opacity change when images are being uploaded [https://github.com/WordPress/gutenberg/pull/59264]
 * [*] Block editor: Media & Text blocks correctly show an error message when the attached video upload fails [https://github.com/WordPress/gutenberg/pull/59288]
@@ -12,6 +20,7 @@
 -----
 * [**] Added support to use third-party passkey providers and other devices passkeys as a WordPress.com login option [https://github.com/wordpress-mobile/WordPress-Android/pull/20174]
 * [*] [Jetpack-only] Fix the visibility issue with the menu button on the stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20175]
+* [*] [internal][WordPress-only] Updates Jetpack banners and badges copy for consistency [https://github.com/wordpress-mobile/WordPress-Android/pull/20123]
 
 24.2
 -----

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -38,7 +38,6 @@ repositories {
             includeGroup "org.wordpress.gutenberg-mobile"
             includeGroupByRegex "org.wordpress.react-native-libraries.*"
             includeGroup "com.automattic"
-            includeGroup "com.automattic.stories"
             includeGroup "com.automattic.tracks"
         }
     }
@@ -142,9 +141,9 @@ android {
         buildConfigField "boolean", "PLANS_IN_SITE_CREATION", "false"
         buildConfigField "boolean", "READER_IMPROVEMENTS", "false"
         buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
-        buildConfigField "boolean", "IN_APP_REVIEWS", "false"
         buildConfigField "boolean", "DYNAMIC_DASHBOARD_CARDS", "false"
         buildConfigField "boolean", "STATS_TRAFFIC_TAB", "false"
+        buildConfigField "boolean", "READER_DISCOVER_NEW_ENDPOINT", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
@@ -159,6 +158,7 @@ android {
         buildConfigField "boolean", "BLAZE_MANAGE_CAMPAIGNS", "false"
         buildConfigField "boolean", "DASHBOARD_PERSONALIZATION", "false"
         buildConfigField "boolean", "ENABLE_SITE_MONITORING", "false"
+        buildConfigField "boolean", "SYNC_PUBLISHING", "false"
 
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
@@ -375,11 +375,6 @@ dependencies {
         exclude group: 'org.wordpress', module: 'utils'
     }
     implementation "$gradle.ext.aboutAutomatticBinaryPath:$automatticAboutVersion"
-    implementation ("$gradle.ext.storiesAndroidPath:$automatticStoriesVersion") {
-        exclude group: 'androidx.navigation', module: 'navigation-fragment-ktx'
-        exclude group: 'androidx.navigation', module: 'navigation-ui-ktx'
-    }
-    implementation "$gradle.ext.storiesAndroidMp4ComposePath:$automatticStoriesVersion"
 
     implementation("$gradle.ext.tracksBinaryPath") {
         version {
@@ -470,8 +465,6 @@ dependencies {
     implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
     kapt "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
 
-    testImplementation "$gradle.ext.storiesAndroidPhotoEditorPath:$automatticStoriesVersion"
-
     testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", {
         exclude group: 'com.android.support', module: 'support-compat'
         exclude group: 'com.android.support', module: 'support-annotations'

diff --git a/WordPress/jetpack_metadata/PlayStoreStrings.po b/WordPress/jetpack_metadata/PlayStoreStrings.po
@@ -10,22 +10,24 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
+msgctxt "release_note_244"
+msgid ""
+"24.4:\n"
+"- Added a new Traffic tab on the Stats screen\n"
+"- Upgraded the Notifications design\n"
+"- Introduced video block support for VideoPress v5\n"
+"- Fixed a crash caused by block editor auto-scrolling\n"
+"- Provided an error message for video upload failure\n"
+"- Removed image transparency during upload\n"
+msgstr ""
+
 msgctxt "release_note_243"
 msgid ""
 "24.3:\n"
 "Log in to your site with Google credentials, physical devices, and third-party passkeys. Don’t worry, the site’s still locked down tighter than the Colonel’s secret recipe.\n"
 "We hid the menu icon on Stats screens so it’s only visible from the Insights tab. Ninja mode: activated.\n"
 msgstr ""
 
-msgctxt "release_note_242"
-msgid ""
-"24.2:\n"
-"- We added a new look and feel for content navigation and filtering.\n"
-"- Images and other media won’t “blink” during upload.\n"
-"- The editor won’t crash when you’re working on a large post.\n"
-"- We added new Site Monitoring menu items like metrics, PHP logs, and web server logs.\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
 msgctxt "play_store_app_title"

diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt
@@ -1,2 +1,6 @@
-Log in to your site with Google credentials, physical devices, and third-party passkeys. Don’t worry, the site’s still locked down tighter than the Colonel’s secret recipe.
-We hid the menu icon on Stats screens so it’s only visible from the Insights tab. Ninja mode: activated.
+- Added a new Traffic tab on the Stats screen
+- Upgraded the Notifications design
+- Introduced video block support for VideoPress v5
+- Fixed a crash caused by block editor auto-scrolling
+- Provided an error message for video upload failure
+- Removed image transparency during upload
diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po
@@ -10,18 +10,20 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
-msgctxt "release_note_243"
+msgctxt "release_note_244"
 msgid ""
-"24.3:\n"
-"You can log in to your WordPress website using Google credentials, physical devices, and other third-party passkeys. Don’t worry, your site is still locked down tighter than the Colonel’s secret recipe.\n"
+"24.4:\n"
+"We made a few changes to the block editor.\n"
+"\n"
+"- The app won’t crash anymore when the editor auto-scrolls down to a block.\n"
+"- You’ll now see an error message when a video fails to upload to media and text blocks.\n"
+"- Images no longer appear partly transparent while they’re being uploaded.\n"
 msgstr ""
 
-msgctxt "release_note_242"
+msgctxt "release_note_243"
 msgid ""
-"24.2:\n"
-"We fixed an issue that made images and other media blink away while being uploaded. Presto, no more disappearing act.\n"
-"\n"
-"The editor won’t crash anymore when you’re working on large posts. That’s right, we’ve saved your drafts and your sanity.\n"
+"24.3:\n"
+"You can log in to your WordPress website using Google credentials, physical devices, and other third-party passkeys. Don’t worry, your site is still locked down tighter than the Colonel’s secret recipe.\n"
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!

diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1 +1,5 @@
-You can log in to your WordPress website using Google credentials, physical devices, and other third-party passkeys. Don’t worry, your site is still locked down tighter than the Colonel’s secret recipe.
+We made a few changes to the block editor.
+
+- The app won’t crash anymore when the editor auto-scrolls down to a block.
+- You’ll now see an error message when a video fails to upload to media and text blocks.
+- Images no longer appear partly transparent while they’re being uploaded.
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/StatsTests.kt b/WordPress/src/androidTest/java/org/wordpress/android/e2e/StatsTests.kt
@@ -6,7 +6,6 @@ import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Assume.assumeTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
@@ -22,9 +21,7 @@ import org.wordpress.android.util.StatsVisitsData
 class StatsTests : BaseTest() {
     @Before
     fun setUp() {
-        // We're not running Stats tests for JP.
-        // See https://github.com/wordpress-mobile/WordPress-Android/issues/18065
-        assumeTrue(!BuildConfig.IS_JETPACK_APP)
+        assumeTrue(BuildConfig.IS_JETPACK_APP)
         ComposeEspressoLink().unregister()
         logoutIfNecessary()
         wpLogin()
@@ -38,8 +35,7 @@ class StatsTests : BaseTest() {
             Espresso.pressBack()
         }
     }
-
-    @Ignore("Will be taken care of in a future PR - scrollToPosts is not working")
+
     @Test
     fun e2eAllDayStatsLoad() {
         val todayVisits = StatsVisitsData("97", "28", "14", "11")

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.kt b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.kt
@@ -149,7 +149,7 @@ class MySitesPage {
         val statsButton = Espresso.onView(
             Matchers.allOf(
                 ViewMatchers.withText(R.string.stats),
-                ViewMatchers.withId(R.id.my_site_item_primary_text)
+                ViewMatchers.withId(R.id.quick_link_item)
             )
         )
         WPSupportUtils.clickOn(statsButton)
@@ -158,7 +158,7 @@ class MySitesPage {
         WPSupportUtils.waitForElementToBeDisplayedWithoutFailure(R.id.tabLayout)
 
         // Wait for the stats to load
-        WPSupportUtils.idleFor(8000)
+        WPSupportUtils.idleFor(4000)
         return StatsPage()
     }
 

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/StatsPage.kt b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/StatsPage.kt
@@ -1,12 +1,15 @@
 package org.wordpress.android.e2e.pages
 
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers
 import org.hamcrest.Matchers
 import org.wordpress.android.R
 import org.wordpress.android.support.WPSupportUtils
+import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel
 import org.wordpress.android.util.StatsKeyValueData
 import org.wordpress.android.util.StatsVisitsData
 
@@ -31,37 +34,37 @@ class StatsPage {
     }
 
     fun scrollToPosts(): StatsPage {
-        scrollToCard("Posts and Pages")
+        scrollToCard(1, StatsListViewModel.StatsSection.DAYS)
         return this
     }
 
     fun scrollToReferrers(): StatsPage {
-        scrollToCard("Referrers")
+        scrollToCard(2, StatsListViewModel.StatsSection.DAYS)
         return this
     }
 
     fun scrollToClicks(): StatsPage {
-        scrollToCard("Clicks")
+        scrollToCard(3, StatsListViewModel.StatsSection.DAYS)
         return this
     }
 
     fun scrollToAuthors(): StatsPage {
-        scrollToCard("Authors")
+        scrollToCard(4, StatsListViewModel.StatsSection.DAYS)
         return this
     }
 
     fun scrollToCountries(): StatsPage {
-        scrollToCard("Countries")
+        scrollToCard(5, StatsListViewModel.StatsSection.DAYS)
         return this
     }
 
     fun scrollToVideos(): StatsPage {
-        scrollToCard("Videos")
+        scrollToCard(7, StatsListViewModel.StatsSection.DAYS)
         return this
     }
 
     fun scrollToFileDownloads(): StatsPage {
-        scrollToCard("File downloads")
+        scrollToCard(8, StatsListViewModel.StatsSection.DAYS)
         return this
     }
 
@@ -96,7 +99,7 @@ class StatsPage {
                 )
             )
         )
-        cardStructure.check(ViewAssertions.matches(ViewMatchers.isCompletelyDisplayed()))
+        cardStructure.check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
         return this
     }
 
@@ -121,7 +124,7 @@ class StatsPage {
                     )
                 )
             )
-            cardStructure.check(ViewAssertions.matches(ViewMatchers.isCompletelyDisplayed()))
+            cardStructure.check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
         }
     }
 
@@ -160,15 +163,14 @@ class StatsPage {
         return this
     }
 
-    private fun scrollToCard(cardHeader: String) {
-        val card = Espresso.onView(
-            Matchers.allOf(
-                ViewMatchers.isDescendantOfA(visibleCoordinatorLayout),
-                ViewMatchers.withId(R.id.stats_block_list),
-                ViewMatchers.hasDescendant(ViewMatchers.withText(cardHeader))
-            )
+    private fun scrollToCard(viewholderPosition: Int, section: StatsListViewModel.StatsSection) {
+        WPSupportUtils.idleFor(2000)
+        Espresso.onView(Matchers.allOf(
+            ViewMatchers.withTagValue(Matchers.`is`(section.name))
+        )).perform(
+            RecyclerViewActions.scrollToPosition<ViewHolder>(viewholderPosition)
         )
-        WPSupportUtils.scrollIntoView(R.id.statsPager, card, 0.5.toFloat())
+        WPSupportUtils.idleFor(2000)
     }
 
     companion object {

diff --git a/...s/src/androidTest/java/org/wordpress/android/ui/notifications/NotificationsUtilsTest.java b/...s/src/androidTest/java/org/wordpress/android/ui/notifications/NotificationsUtilsTest.java