Merge branch 'trunk' into analysis/use-updated-and-null-proof-theme-model-class

# Conflicts:
#	build.gradle

Author: antonis

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,38 @@
 Fixes #
 
-To test:
+-----
+
+## To Test:
+
+<!-- Test instructions per dependency update: https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/docs/test_instructions_per_dependency_update.md -->
+
+-----
 
 ## Regression Notes
+
 1. Potential unintended areas of impact
 
+    - TODO
 
 2. What I did to test those areas of impact (or what existing automated tests I relied on)
 
+    - TODO
 
 3. What automated tests I added (or what prevented me from doing so)
 
-PR submission checklist:
+    - TODO
+
+-----
+
+## PR Submission Checklist:
 
 - [ ] I have completed the Regression Notes.
 - [ ] I have considered adding accessibility improvements for my changes.
 - [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.
 
-UI Changes testing checklist:
+-----
+
+## UI Changes Testing Checklist:
 
 - [ ] Portrait and landscape orientations.
 - [ ] Light and dark modes.

.idea/checkstyle-idea.xml

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/Automattic/dangermattic
-  revision: 078aa57c084790327da4cb401f18b350a4d1e329
+  revision: 9ba0e5824e66e16526897a4583c9b900f9b8635c
   specs:
     danger-dangermattic (0.0.1)
       danger (~> 9.3)
@@ -16,7 +16,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.1.1)
+    activesupport (7.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -31,24 +31,24 @@ GEM
     artifactory (3.0.15)
     ast (2.4.2)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.844.0)
-    aws-sdk-core (3.186.0)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.855.0)
+    aws-sdk-core (3.188.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.73.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.139.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.1)
+    aws-sigv4 (1.7.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bigdecimal (3.1.4)
     buildkit (1.5.0)
       sawyer (>= 0.6)
@@ -66,7 +66,7 @@ GEM
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (9.3.2)
+    danger (9.4.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -77,7 +77,7 @@ GEM
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
-      octokit (~> 6.0)
+      octokit (>= 6.0, < 8.0)
       terminal-table (>= 1, < 4)
     danger-junit (1.0.2)
       danger (> 2.0)
@@ -87,7 +87,7 @@ GEM
     danger-rubocop (0.12.0)
       danger
       rubocop (~> 1.0)
-    danger-swiftlint (0.33.0)
+    danger-swiftlint (0.34.0)
       danger
       rake (> 10)
       thor (~> 0.19)
@@ -98,10 +98,9 @@ GEM
     diffy (3.4.2)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dotenv (2.8.1)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
     emoji_regex (3.2.3)
     excon (0.104.0)
@@ -136,7 +135,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.216.0)
+    fastlane (2.217.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -197,7 +196,7 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.51.0)
+    google-apis-androidpublisher_v3 (0.53.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
@@ -212,19 +211,19 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -255,12 +254,12 @@ GEM
     minitest (5.20.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     no_proxy_fix (0.1.2)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (6.1.1)
@@ -279,8 +278,8 @@ GEM
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
-    public_suffix (5.0.3)
-    racc (1.7.2)
+    public_suffix (5.0.4)
+    racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
     rake-compiler (1.2.5)
@@ -335,9 +334,6 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)

Gemfile.lock

@@ -1,7 +1,24 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+23.9
+-----
+
+
+23.8
+-----
+* [*] [Jetpack-only] Block Editor: Ensure text is always visible within Contact Info block [https://github.com/Automattic/jetpack/pull/33873]
+* [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627]
+* [*] Block Editor: In the deeply nested block warning, only display the ungroup option for blocks that support it [https://github.com/WordPress/gutenberg/pull/56445]
+* [**] Enable Optimize Image setting (via Me → App Settings) by default, and change default compression and resolution values. [https://github.com/wordpress-mobile/WordPress-Android/pull/19581]
+* [*] Fixed an issue that prevented theme installation on atomic sites [https://github.com/wordpress-mobile/WordPress-Android/pull/19668]
+
 23.7
 -----
+* [***] [Jetpack-only] Added the All Domains screen enabling the users to manage their domains from within the app [https://github.com/wordpress-mobile/WordPress-Android/pull/19599]
+* [*] Block Editor: Fix error when pasting deeply nested structure content [https://github.com/WordPress/gutenberg/pull/55613]
+* [*] Block Editor: Fix crash related to accessing undefined value in `TextColorEdit` [https://github.com/WordPress/gutenberg/pull/55664]
+* [**] Posts & Pages: Redesigned the posts and pages screen. We’ve consolidated the “default” and “compact” display options [https://github.com/wordpress-mobile/WordPress-Android/issues/19341] &  [https://github.com/wordpress-mobile/WordPress-Android/issues/19348]
+* [*] Posts & Pages: Moved actions to a context menu and added new actions such as “comment”, “settings”  [https://github.com/wordpress-mobile/WordPress-Android/issues/19343] & [https://github.com/wordpress-mobile/WordPress-Android/issues/19356]
 
 23.6
 -----

RELEASE-NOTES.txt

@@ -138,11 +138,11 @@ android {
         buildConfigField "boolean", "ENABLE_BLAZE_FEATURE", "false"
         buildConfigField "boolean", "WP_INDIVIDUAL_PLUGIN_OVERLAY", "false"
         buildConfigField "boolean", "SITE_EDITOR_MVP", "false"
-        buildConfigField "boolean", "JETPACK_SOCIAL", "false"
         buildConfigField "boolean", "CONTACT_SUPPORT_CHATBOT", "false"
         buildConfigField "boolean", "ENABLE_DOMAIN_MANAGEMENT_FEATURE", "false"
         buildConfigField "boolean", "PLANS_IN_SITE_CREATION", "false"
         buildConfigField "boolean", "READER_IMPROVEMENTS", "false"
+        buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
@@ -423,6 +423,7 @@ dependencies {
     implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion"
     implementation "com.google.android.gms:play-services-code-scanner:$googlePlayServicesCodeScannerVersion"
     implementation "com.google.mlkit:barcode-scanning-common:$googleMLKitBarcodeScanningVersion"
+
     implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion"
     implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion"
     implementation "org.greenrobot:eventbus:$eventBusVersion"

WordPress/build.gradle

@@ -10,20 +10,20 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
-msgctxt "release_note_236"
+msgctxt "release_note_238"
 msgid ""
-"23.6:\n"
-"- New domain/plan options and checkout screens in site creation process\n"
-"- My Site navigation has links to common sections\n"
-"- Inactive social icons and Synced Pattern titles are visible in dark mode for block-based themes\n"
-"- Content can be converted into blocks in the Classic editor\n"
+"23.8:\n"
+"- Block editor only shows the “ungroup” option for nested blocks that support it.\n"
+"- Optimize Images setting uses optimal size and quality by default.\n"
+"- Themes install properly for sites on Business and Commerce plans.\n"
 msgstr ""
 
-msgctxt "release_note_235"
+msgctxt "release_note_237"
 msgid ""
-"23.5:\n"
-"We’ve made some visual changes to the reader, including feed cards, headers, buttons, recommendations, and more.\n"
-"In the block editor, you can now split or exit a formatted block by pressing the “enter” key three times. The left-hand border is always visible for quote blocks, too.\n"
+"23.7:\n"
+"- The All Domains screen lets you manage all your domains in the app.\n"
+"- Posts & Pages has improved display options and an expanded context menu.\n"
+"- We fixed block editor issues caused by pasting deeply nested content, or using text colors in older site themes.\n"
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -1,4 +1,3 @@
-- New domain/plan options and checkout screens in site creation process
-- My Site navigation has links to common sections
-- Inactive social icons and Synced Pattern titles are visible in dark mode for block-based themes
-- Content can be converted into blocks in the Classic editor
+- Block editor only shows the “ungroup” option for nested blocks that support it.
+- Optimize Images setting uses optimal size and quality by default.
+- Themes install properly for sites on Business and Commerce plans.

WordPress/jetpack_metadata/release_notes.txt

@@ -10,18 +10,19 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
-msgctxt "release_note_236"
+msgctxt "release_note_238"
 msgid ""
-"23.6:\n"
-"- Inactive social icons and Synced Pattern titles are no longer invisible in block-based themes using dark mode. Good try, fellas, but you’re not as ninja as you think.\n"
-"- In the Classic editor, you can now convert your content into blocks with the click of a button.\n"
+"23.8:\n"
+"- Block editor only shows the “ungroup” option for nested blocks that support it.\n"
+"- Optimize Images setting uses optimal size and quality by default.\n"
+"- Themes install properly for sites on Business and Commerce plans.\n"
 msgstr ""
 
-msgctxt "release_note_235"
+msgctxt "release_note_237"
 msgid ""
-"23.5:\n"
-"In the block editor, you can now split or exit a formatted block by pressing the “enter” key three times.\n"
-"The left-hand border is always visible for quote blocks, too, even in block-based themes on dark mode. And you can quote us on that.\n"
+"23.7:\n"
+"- The Posts & Pages screen now has clean, simple display options. The context menu also lets you access comments, settings, and other actions for a post or page.\n"
+"- We fixed block editor issues caused by pasting deeply nested content, or using text colors in older site themes.\n"
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!

WordPress/metadata/PlayStoreStrings.po

@@ -1,2 +1,3 @@
-- Inactive social icons and Synced Pattern titles are no longer invisible in block-based themes using dark mode. Good try, fellas, but you’re not as ninja as you think.
-- In the Classic editor, you can now convert your content into blocks with the click of a button.
+- Block editor only shows the “ungroup” option for nested blocks that support it.
+- Optimize Images setting uses optimal size and quality by default.
+- Themes install properly for sites on Business and Commerce plans.

WordPress/metadata/release_notes.txt

@@ -12,7 +12,7 @@ class MockingInterceptor : Interceptor {
         val request = chain.request()
 
         // Redirect all WordPress.com API requests to local mock server
-        if (request.url.host == "public-api.wordpress.com") {
+        if (request.url.host == "public-api.wordpress.com" || request.url.host == "wordpress.com") {
             val newUrl = request.url.newBuilder()
                 .scheme("http")
                 .host("localhost")