Merge remote-tracking branch 'origin/release/24.1' into merge/24.0.2-…

…to-release_24.1

.buildkite/commands/run-unit-tests.sh

@@ -3,14 +3,17 @@
 echo "--- 🧪 Testing"
 set +e
 if [ "$1" == "wordpress" ]; then
- test_suite="testWordpressVanillaRelease"
+ test_suite="testWordpressVanillaRelease koverXmlReportWordpressVanillaRelease"
  test_log_dir="WordPress/build/test-results/*/*.xml"
+ code_coverage_report="WordPress/build/reports/kover/reportWordpressVanillaRelease.xml"
 elif [ "$1" == "processors" ]; then
- test_suite=":libs:processors:test"
+ test_suite=":libs:processors:test :libs:processors:koverXmlReport"
  test_log_dir="libs/processors/build/test-results/test/*.xml"
+ code_coverage_report="libs/processors/build/reports/kover/report.xml"
 elif [ "$1" == "image-editor" ]; then
- test_suite=":libs:image-editor:testReleaseUnitTest"
+ test_suite=":libs:image-editor:testReleaseUnitTest :libs:image-editor:koverXmlReportRelease"
  test_log_dir="libs/image-editor/build/test-results/testReleaseUnitTest/*.xml"
+ code_coverage_report="libs/image-editor/build/reports/kover/reportRelease.xml"
 else
  echo "Invalid Test Suite! Expected 'wordpress', 'processors', or 'image-editor', received '$1' instead"
  exit 1
@@ -46,4 +49,7 @@ echo "--- 🧪 Copying test logs for test collector"
 mkdir buildkite-test-analytics
 cp $test_log_dir buildkite-test-analytics
 
+echo "--- ⚒️ Uploading code coverage"
+.buildkite/commands/upload-code-coverage.sh $code_coverage_report
+
 exit $TESTS_EXIT_STATUS

.buildkite/commands/upload-code-coverage.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -eu
+
+curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import
+curl -Os https://uploader.codecov.io/latest/linux/codecov
+curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
+sha256sum -c codecov.SHA256SUM
+chmod +x codecov
+./codecov -t "$CODECOV_TOKEN" -f "$1"

.buildkite/pipeline.yml

@@ -29,19 +29,6 @@ steps:
  #################
  - group: "🕵️‍♂️ Linters"
  steps:
- - label: "☢️ Danger - PR Check"
- command: .buildkite/commands/danger-pr-check.sh
- plugins:
- - docker#v5.8.0:
- image: "public.ecr.aws/docker/library/ruby:3.2.2"
- propagate-environment: true
- environment:
- - "DANGER_GITHUB_API_TOKEN"
- if: "build.pull_request.id != null"
- retry:
- manual:
- permit_on_passed: true
-
  - label: "🕵️ checkstyle"
  command: |
  cp gradle.properties-example gradle.properties

.github/dependabot.yml

@@ -36,7 +36,10 @@ updates:
  # dependapot.
  - dependency-name: "org.wordpress:fluxc"
  - dependency-name: "org.wordpress:utils"
+ # org.wordpress-mobile.gutenberg-mobile is deprecated and org.wordpress.gutenberg-mobile is used instead.
+ # Temporarily leaving this declaration during transition, but this should be removed soon.
  - dependency-name: "org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge"
+ - dependency-name: "org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge"
  - dependency-name: "org.wordpress:login"
  - dependency-name: "com.automattic:stories"
  - dependency-name: "com.automattic.stories:mp4compose"

.github/workflows/run-danger.yml

@@ -0,0 +1,11 @@
+name: ☢️ Danger
+
+on:
+ pull_request:
+ types: [opened, synchronize, edited, review_requested, review_request_removed, labeled, unlabeled, milestoned, demilestoned]
+
+jobs:
+ dangermattic:
+ uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@trunk
+ secrets:
+ github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}

.github/workflows/submit-gradle-dependencies.yml

@@ -0,0 +1,24 @@
+name: Submit dependencies to GitHub Dependency Graph
+on:
+ push:
+ branches:
+ - trunk
+ - release/*
+permissions:
+ contents: write
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+ - run: cp gradle.properties-example gradle.properties
+ - name: Setup Gradle to generate and submit dependency graphs
+ uses: gradle/gradle-build-action@v2
+ with:
+ dependency-graph: generate-and-submit
+ - name: Generate the dependency graph which will be submitted post-job
+ run: ./gradlew :WordPress:dependencies --no-configure-on-demand

RELEASE-NOTES.txt

@@ -1,7 +1,13 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+24.2
+-----
+
+
 24.1
 -----
+* [**] Disabled the ability of creating new Story posts. [#20014]
+* [**] Disable Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20005]
 
 24.0.2
 -----
@@ -11,6 +17,13 @@
 -----
 * [**] Fix crash when RichText values are not defined [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6563]
 
+* [*] Block Editor: Fix missing custom color indicator for custom gradients [https://github.com/WordPress/gutenberg/pull/57605]
+* [**] Block Editor: Display a notice when a network connection is unavailable [https://github.com/WordPress/gutenberg/pull/56934]
+* [**] Block Editor: Image block media uploads display a custom error message when there is no internet connection [https://github.com/wordpress-mobile/WordPress-Android/pull/19878]
+* [**] Block Editor: Media uploads that failed due to lack of internet connectivity automatically retry once a connection is re-established [https://github.com/wordpress-mobile/WordPress-Android/pull/19803]
+* [*] [Jetpack-only] Added opening domain management from the Site Domain screen by tapping on the domain cards [https://github.com/wordpress-mobile/WordPress-Android/pull/19910]
+* [*] [Jetpack-only] Fix Prompt response posts not having one of the `dailyprompt` tags [https://github.com/wordpress-mobile/WordPress-Android/pull/19971]
+* [*] Reader: Fix the issue with icons displaying incorrectly in RTL languages. [https://github.com/wordpress-mobile/WordPress-Android/pull/19962]
 
 24.0
 -----

WordPress/build.gradle

@@ -12,6 +12,7 @@ plugins {
  id "se.bjurr.violations.violation-comments-to-github-gradle-plugin"
  id "com.google.gms.google-services"
  id 'dagger.hilt.android.plugin'
+ id "org.jetbrains.kotlinx.kover"
 }
 
 sentry {
@@ -35,12 +36,16 @@ repositories {
  includeGroup "org.wordpress.aztec"
  includeGroup "org.wordpress.fluxc"
  includeGroup "org.wordpress.wellsql"
- includeGroup "org.wordpress-mobile"
- includeGroup "org.wordpress-mobile.gutenberg-mobile"
- includeGroupByRegex "org.wordpress-mobile.react-native-libraries.*"
+ includeGroup "org.wordpress.gutenberg-mobile"
+ includeGroupByRegex "org.wordpress.react-native-libraries.*"
  includeGroup "com.automattic"
  includeGroup "com.automattic.stories"
  includeGroup "com.automattic.tracks"
+ // 'org.wordpress-mobile' group is deprecated. It's kept for now for smoother transition
+ // but it should be removed soon (within couple weeks)
+ includeGroup "org.wordpress-mobile"
+ includeGroup "org.wordpress-mobile.gutenberg-mobile"
+ includeGroupByRegex "org.wordpress-mobile.react-native-libraries.*"
  }
  }
  maven {
@@ -145,6 +150,7 @@ android {
  buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
  buildConfigField "boolean", "IN_APP_REVIEWS", "false"
  buildConfigField "boolean", "DYNAMIC_DASHBOARD_CARDS", "false"
+ buildConfigField "boolean", "STATS_TRAFFIC_TAB", "false"
 
  // Override these constants in jetpack product flavor to enable/ disable features
  buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -10,6 +10,17 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
+msgctxt "release_note_241"
+msgid ""
+"24.1:\n"
+"- Get notified when you’re working offline.\n"
+"- Image block uploads pause/resume with internet connection.\n"
+"- See custom gradient selections in the editor.\n"
+"- Fixed forward/back arrows for right-to-left readers.\n"
+"- Daily Prompt tags work properly.\n"
+"- Tap Site Domain cards to manage domains.\n"
+msgstr ""
+
 msgctxt "release_note_240"
 msgid ""
 "24.0:\n"
@@ -20,15 +31,6 @@ msgid ""
 "- Share different media types to the app at once without crashing\n"
 msgstr ""
 
-msgctxt "release_note_239"
-msgid ""
-"23.9:\n"
-"No updates this week! Enjoy these reindeer facts:\n"
-"- Male reindeer shed their antlers in fall and females in spring, so Santa’s reindeer are female.\n"
-"- Reindeer don’t actually have red noses.\n"
-"- Santa hasn’t eaten milk and cookies since 2003 because Blitzen always gets there first.\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"

WordPress/jetpack_metadata/release_notes.txt

@@ -1,5 +1,6 @@
-- Get a WordPress plan with a free domain in the domain dashboard
-- Device keyboard remains when editing text blocks
-- Editor screen auto-scrolls to newly inserted blocks
-- Unselect blocks by pressing device’s back button
-- Share different media types to the app at once without crashing
+- Get notified when you’re working offline.
+- Image block uploads pause/resume with internet connection.
+- See custom gradient selections in the editor.
+- Fixed forward/back arrows for right-to-left readers.
+- Daily Prompt tags work properly.
+- Tap Site Domain cards to manage domains.

WordPress/metadata/PlayStoreStrings.po

@@ -10,6 +10,15 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
+msgctxt "release_note_241"
+msgid ""
+"24.1:\n"
+"- Get notified when you’re working offline.\n"
+"- Image block uploads pause when you lose internet and resume when you reconnect.\n"
+"- Select a custom gradient in the editor and see a color indicator.\n"
+"- “Forward” and “back” arrows are correct for right-to-left readers.\n"
+msgstr ""
+
 msgctxt "release_note_240"
 msgid ""
 "24.0:\n"
@@ -20,15 +29,6 @@ msgid ""
 "- Share different media types to the app at once without crashing\n"
 msgstr ""
 
-msgctxt "release_note_239"
-msgid ""
-"23.9:\n"
-"No updates this week! Enjoy these reindeer facts:\n"
-"- Male reindeer shed their antlers in fall and females in spring, so Santa’s reindeer are female.\n"
-"- Reindeer don’t actually have red noses.\n"
-"- Santa hasn’t eaten milk and cookies since 2003 because Blitzen always gets there first.\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"

WordPress/metadata/release_notes.txt

@@ -1,5 +1,4 @@
-Block Editor updates:
-- Device keyboard remains when editing text blocks
-- Screen auto-scrolls to newly inserted blocks
-- Unselect blocks by pressing your device’s back button
-- Share different media types to the app at once without crashing
+- Get notified when you’re working offline.
+- Image block uploads pause when you lose internet and resume when you reconnect.
+- Select a custom gradient in the editor and see a color indicator.
+- “Forward” and “back” arrows are correct for right-to-left readers.

WordPress/src/debug/AndroidManifest.xml

@@ -34,6 +34,9 @@
  <activity
  android:name=".ui.debug.previews.PreviewFragmentActivity"
  android:theme="@style/WordPress.NoActionBar" />
+ <activity
+ android:name=".ui.debug.preferences.DebugSharedPreferenceFlagsActivity"
+ android:label="@string/debug_settings_debug_flags_screen"
+ android:theme="@style/WordPress.NoActionBar" />
  </application>
-
 </manifest>

WordPress/src/main/AndroidManifest.xml

@@ -196,6 +196,11 @@
  android:configChanges="locale|orientation|screenSize"
  android:label="@string/me_btn_app_settings"
  android:theme="@style/WordPress.NoActionBar" />
+ <activity
+ android:name=".designsystem.DesignSystemActivity"
+ android:configChanges="locale|orientation|screenSize"
+ android:label="@string/preference_design_system"
+ android:theme="@style/WordPress.NoActionBar" />
  <activity
  android:name=".ui.prefs.notifications.NotificationsSettingsActivity"
  android:configChanges="orientation|screenSize"

WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt

@@ -0,0 +1,31 @@
+package org.wordpress.android.designsystem
+
+import android.content.res.Configuration
+import android.os.Bundle
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import org.wordpress.android.ui.LocaleAwareActivity
+import org.wordpress.android.util.extensions.setContent
+
+class DesignSystemActivity : LocaleAwareActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContent {
+ DesignSystem()
+ }
+ }
+
+ @Preview(name = "Light Mode")
+ @Preview(
+ uiMode = Configuration.UI_MODE_NIGHT_YES,
+ showBackground = true,
+ name = "Dark Mode"
+ )
+
+ @Composable
+ fun PreviewDesignSystemActivity() {
+ DesignSystem()
+ }
+}
+
+

WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemDataSource.kt

@@ -0,0 +1,10 @@
+package org.wordpress.android.designsystem
+
+import org.wordpress.android.R
+
+object DesignSystemDataSource {
+ val buttonOptions = listOf(
+ R.string.design_system_foundation,
+ R.string.design_system_components
+ )
+}