Merge branch 'trunk' into gutenberg/upgrade/react-native-0.71.15

# Conflicts:
#	build.gradle

.github/dependabot.yml

@@ -36,7 +36,7 @@ updates:
       # dependapot.
       - dependency-name: "org.wordpress:fluxc"
       - dependency-name: "org.wordpress:utils"
-      - 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/submit-gradle-dependencies.yml

@@ -21,4 +21,4 @@ jobs:
         with:
           dependency-graph: generate-and-submit
       - name: Generate the dependency graph which will be submitted post-job
-        run: ./gradlew dependencies
+        run: ./gradlew :WordPress:dependencies --no-configure-on-demand

.gitignore

@@ -4,6 +4,7 @@
 # built application files
 *.apk
 *.ap_
+*.aab
 
 # files for the dex VM
 *.dex

RELEASE-NOTES.txt

@@ -1,10 +1,29 @@
 *** 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
+-----
+* [**] Fix Aztec editor crash when losing or gaining network connectivity [https://github.com/wordpress-mobile/WordPress-Android/pull/20053]
+
+24.0.1
+-----
+* [**] 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

@@ -1,6 +1,5 @@
 import se.bjurr.violations.comments.github.plugin.gradle.ViolationCommentsToGitHubTask
 import se.bjurr.violations.lib.model.SEVERITY
-import io.sentry.android.gradle.extensions.InstrumentationFeature
 
 plugins {
     id "com.android.application"
@@ -36,9 +35,8 @@ 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"
@@ -160,6 +158,7 @@ android {
         buildConfigField "boolean", "ENABLE_OPEN_WEB_LINKS_WITH_JP_FLOW", "true"
         buildConfigField "boolean", "BLAZE_MANAGE_CAMPAIGNS", "false"
         buildConfigField "boolean", "DASHBOARD_PERSONALIZATION", "false"
+        buildConfigField "boolean", "ENABLE_SITE_MONITORING", "false"
 
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
@@ -344,6 +343,7 @@ kapt {
 
 dependencies {
     implementation 'androidx.webkit:webkit:1.7.0'
+    implementation "androidx.navigation:navigation-compose:$androidxComposeNavigationVersion"
     compileOnly project(path: ':libs:annotations')
     kapt project(':libs:processors')
     implementation (project(path:':libs:networking')) {

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/jetpack/res/values-ar/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2023-08-09 12:54:03+0000
+Translation-Revision-Date: 2024-01-16 13:54:02+0000
 Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;
 Generator: GlotPress/2.4.0-alpha
 Language: ar
 -->
 <resources>
+    <string name="login_prologue_revamped_jetpack_feature_text_13">تكوين جمهور</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_12">قراءة المدونات الأخرى</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_16">إدارة نطاقاتك</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_15">الكتابة من أي مكان</string>
     <string name="missing_splits_dialog_message">يفتقد التطبيق Jetpack إلى المكوّنات المطلوبة ولا بد من إعادة تثبيته من متجر Google Play.</string>
     <string name="me_btn_share">مشاركة Jetpack مع صديق</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_12">إضافة مؤلف</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_14">نشر صورة</string>
     <string name="login_prologue_revamped_jetpack_feature_text_11">نشر صورة</string>
     <string name="login_prologue_revamped_jetpack_feature_text_10">إصلاح مشكلة الأمان</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_9">شارك على فيسبوك</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_9">المشاركة على شبكات التواصل الاجتماعي</string>
     <string name="login_prologue_revamped_jetpack_feature_text_8">البحث عن الإضافات</string>
     <string name="login_prologue_revamped_jetpack_feature_text_7">استعادة نسخة احتياطية</string>
     <string name="login_prologue_revamped_jetpack_feature_text_6">الرد على التعليقات</string>

WordPress/src/jetpack/res/values-de/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2023-08-09 14:54:03+0000
+Translation-Revision-Date: 2024-01-15 15:54:05+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: de
 -->
 <resources>
+    <string name="login_prologue_revamped_jetpack_feature_text_13">Baue eine Zielgruppe auf</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_12">Lies andere Blogs</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_16">Verwalte deine Domains</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_15">Schreibe von überall aus</string>
     <string name="missing_splits_dialog_message">Der Jetpack-App fehlen erforderliche Komponenten. Die App muss erneut aus dem Google Play Store installiert werden.</string>
     <string name="me_btn_share">Jetpack mit einem Freund teilen</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_12">Einen Autor hinzufügen</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_14">Veröffentliche ein Foto</string>
     <string name="login_prologue_revamped_jetpack_feature_text_11">Ein Foto veröffentlichen</string>
     <string name="login_prologue_revamped_jetpack_feature_text_10">Ein Sicherheitsproblem beheben</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_9">Auf Facebook teilen</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_9">Teile Inhalte in sozialen Medien</string>
     <string name="login_prologue_revamped_jetpack_feature_text_8">Plugins suchen</string>
     <string name="login_prologue_revamped_jetpack_feature_text_7">Ein Backup wiederherstellen</string>
     <string name="login_prologue_revamped_jetpack_feature_text_6">Kommentare beantworten</string>

WordPress/src/jetpack/res/values-es/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2023-08-09 16:54:03+0000
+Translation-Revision-Date: 2024-01-16 15:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: es
 -->
 <resources>
+    <string name="login_prologue_revamped_jetpack_feature_text_13">Crear una audiencia</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_12">Leer otros blogs</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_16">Gestiona tus dominios</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_15">Escribe desde cualquier lugar</string>
     <string name="missing_splits_dialog_message">Faltan componentes necesarios en la aplicación de Jetpack, por lo que tendrás que volver a instalarla desde la Google Play Store.</string>
     <string name="me_btn_share">Compartir Jetpack con un amigo</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_12">Añadir un autor</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_14">Publicar una foto</string>
     <string name="login_prologue_revamped_jetpack_feature_text_11">Publicar una foto</string>
     <string name="login_prologue_revamped_jetpack_feature_text_10">Solucionar un problema de seguridad</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_9">Compartir en Facebook</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_9">Comparte el contenido en redes sociales</string>
     <string name="login_prologue_revamped_jetpack_feature_text_8">Buscar plugins</string>
     <string name="login_prologue_revamped_jetpack_feature_text_7">Restaurar una copia de seguridad</string>
     <string name="login_prologue_revamped_jetpack_feature_text_6">Responder a comentarios</string>

WordPress/src/jetpack/res/values-fr/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2023-08-11 08:54:03+0000
+Translation-Revision-Date: 2024-01-15 17:54:03+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/2.4.0-alpha
 Language: fr
 -->
 <resources>
+    <string name="login_prologue_revamped_jetpack_feature_text_13">Construire une audience</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_12">Lire d’autres blogs</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_16">Gérer vos domaines</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_15">Écrire de n’importe où</string>
     <string name="missing_splits_dialog_message">Des composants sur l\'application Jetpack sont manquants. Il est nécessaire de les réinstaller depuis le Play Store de Google.</string>
     <string name="me_btn_share">Partager Jetpack avec un ami</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_12">Ajouter un auteur</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_14">Publier une photo</string>
     <string name="login_prologue_revamped_jetpack_feature_text_11">Publier une photo</string>
     <string name="login_prologue_revamped_jetpack_feature_text_10">Résoudre un incident de sécurité</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_9">Partager sur Facebook</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_9">Partager sur les réseaux</string>
     <string name="login_prologue_revamped_jetpack_feature_text_8">Rechercher des extensions</string>
     <string name="login_prologue_revamped_jetpack_feature_text_7">Rétablir une sauvegarde</string>
     <string name="login_prologue_revamped_jetpack_feature_text_6">Répondre aux commentaires</string>

WordPress/src/jetpack/res/values-he/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2023-08-09 14:54:03+0000
+Translation-Revision-Date: 2024-01-16 17:54:02+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: he_IL
 -->
 <resources>
+    <string name="login_prologue_revamped_jetpack_feature_text_13">ליצור קהל לאתר</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_12">לקרוא בלוגים אחרים</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_16">לנהל את הדומיינים שלך</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_15">לכתוב מכל מקום</string>
     <string name="missing_splits_dialog_message">באפליקציה של Jetpack חסרים רכיבים חיוניים ועליך להתקין אותה מחדש מהחנות Google Play.</string>
     <string name="me_btn_share">לשתף את Jetpack עם חברים</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_12">להוסיף מחבר</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_14">לפרסם תמונה</string>
     <string name="login_prologue_revamped_jetpack_feature_text_11">לפרסם תמונה</string>
     <string name="login_prologue_revamped_jetpack_feature_text_10">לתקן בעיית אבטחה</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_9">Share on Facebook</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_9">לשתף ברשתות החברתיות</string>
     <string name="login_prologue_revamped_jetpack_feature_text_8">לחפש תוספים</string>
     <string name="login_prologue_revamped_jetpack_feature_text_7">לשחזר גיבוי</string>
     <string name="login_prologue_revamped_jetpack_feature_text_6">לענות לתגובות</string>

WordPress/src/jetpack/res/values-id/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2023-08-09 16:54:03+0000
+Translation-Revision-Date: 2024-01-16 09:54:03+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/2.4.0-alpha
 Language: id
 -->
 <resources>
+    <string name="login_prologue_revamped_jetpack_feature_text_13">Perbanyak pengunjung</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_12">Baca blog lain</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_16">Kelola domain Anda</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_15">Tulis dari mana saja</string>
     <string name="missing_splits_dialog_message">Beberapa komponen penting aplikasi Jetpack tidak tersedia. Aplikasi perlu diinstal ulang dari Google Play Store.</string>
     <string name="me_btn_share">Rekomendasikan Jetpack kepada teman</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_12">Tambahkan penulis</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_14">Kirim foto</string>
     <string name="login_prologue_revamped_jetpack_feature_text_11">Kirim foto</string>
     <string name="login_prologue_revamped_jetpack_feature_text_10">Perbaiki masalah keamanan</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_9">Bagikan ke Facebook</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_9">Bagikan pos di media sosial</string>
     <string name="login_prologue_revamped_jetpack_feature_text_8">Cari plugin</string>
     <string name="login_prologue_revamped_jetpack_feature_text_7">Pulihkan cadangan</string>
     <string name="login_prologue_revamped_jetpack_feature_text_6">Tanggapi komentar</string>