Merge branch 'feature/notifications_refresh_p1' into task/notes-to-ko…

…tlin
wordpress-mobile · Feb 20, 2024 · 14c493d · 14c493d
2 parents 693efee + 688940e
commit 14c493d
Show file tree

Hide file tree

Showing 35 changed files with 873 additions and 582 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (7.1.2)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -19,24 +21,25 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     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.894.0)
+    aws-sdk-core (3.191.2)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.73.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.139.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.7.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.6)
     buildkit (1.5.0)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -49,7 +52,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -86,19 +89,19 @@ GEM
       danger
       rake (> 10)
       thor (~> 1.0.0)
-    danger-xcode_summary (1.2.0)
+    danger-xcode_summary (1.3.0)
       danger-plugin-api (~> 1.0)
       xcresult (~> 0.2)
     declarative (0.0.20)
     diffy (3.4.2)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20231109)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     drb (2.2.0)
       ruby2_keywords
     emoji_regex (3.2.3)
-    excon (0.104.0)
+    excon (0.109.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -129,8 +132,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.217.0)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -149,6 +152,7 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -157,7 +161,7 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -170,7 +174,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-wpmreleasetoolkit (9.2.0)
+    fastlane-plugin-wpmreleasetoolkit (9.4.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -179,7 +183,7 @@ GEM
       git (~> 1.3)
       google-cloud-storage (~> 1.31)
       java-properties (~> 0.3.0)
-      nokogiri (~> 1.11)
+      nokogiri (~> 1.11, < 1.16)
       octokit (~> 6.1)
       parallel (~> 1.14)
       plist (~> 3.1)
@@ -191,34 +195,33 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.53.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.2)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       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.29.0)
+    google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       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.45.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.29.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -237,7 +240,8 @@ GEM
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.1)
-    jwt (2.7.1)
+    jwt (2.8.0)
+      base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -246,13 +250,14 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.22.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
+    nkf (0.2.0)
     no_proxy_fix (0.1.2)
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
@@ -262,22 +267,22 @@ GEM
       sawyer (~> 0.9)
     open4 (1.3.4)
     options (2.3.2)
-    optparse (0.1.1)
+    optparse (0.4.0)
     os (1.1.4)
     ox (2.14.17)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    plist (3.7.0)
+    plist (3.7.1)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (5.0.4)
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
-    rake-compiler (1.2.5)
+    rake-compiler (1.2.7)
       rake
     rchardet (1.8.0)
     regexp_parser (2.9.0)
@@ -309,7 +314,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     security (0.1.3)
-    signet (0.18.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -323,16 +328,15 @@ GEM
     thor (1.0.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.5.0)
-    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+24.4
+-----
+
+
 24.3
 -----
 * [**] 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]

diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt
@@ -1,4 +1,3 @@
-- We added a new look and feel for content navigation and filtering.
-- Images and other media won’t “blink” during upload.
-- The editor won’t crash when you’re working on a large post.
-- We added new Site Monitoring menu items like metrics, PHP logs, and web server logs.
+* [**] 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]
+
diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1,3 +1,2 @@
-We fixed an issue that made images and other media blink away while being uploaded. Presto, no more disappearing act.
+* [**] 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]
 
-The editor won’t crash anymore when you’re working on large posts. That’s right, we’ve saved your drafts and your sanity.
diff --git a/WordPress/src/jetpack/res/drawable-night/ic_logo_plus_gravatar.xml b/WordPress/src/jetpack/res/drawable-night/ic_logo_plus_gravatar.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="50dp"
+    android:height="30dp"
+    android:viewportWidth="50"
+    android:viewportHeight="30">
+  <path
+      android:pathData="M14,1L14,1A14,14 0,0 1,28 15L28,15A14,14 0,0 1,14 29L14,29A14,14 0,0 1,0 15L0,15A14,14 0,0 1,14 1z"
+      android:fillColor="#069E08"/>
+  <path
+      android:pathData="M7.002,17.182H13.359V4.501L7.002,17.182Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14.659,12.816V25.497L21,12.816H14.659Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M35,0.5L35,0.5A14.5,14.5 0,0 1,49.5 15L49.5,15A14.5,14.5 0,0 1,35 29.5L35,29.5A14.5,14.5 0,0 1,20.5 15L20.5,15A14.5,14.5 0,0 1,35 0.5z"
+      android:fillColor="#1D4FC4"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M35,0.5L35,0.5A14.5,14.5 0,0 1,49.5 15L49.5,15A14.5,14.5 0,0 1,35 29.5L35,29.5A14.5,14.5 0,0 1,20.5 15L20.5,15A14.5,14.5 0,0 1,35 0.5z"
+      android:fillColor="#00000000"
+      android:strokeColor="#1C1C1E"/>
+  <path
+      android:pathData="M33,6.999V13.999C33,14.53 33.211,15.038 33.586,15.413C33.961,15.788 34.469,15.998 34.999,15.998C35.53,15.998 36.038,15.788 36.413,15.413C36.788,15.038 36.999,14.53 36.999,13.999V9.342C38.226,9.775 39.279,10.595 40,11.678C40.72,12.761 41.069,14.049 40.994,15.348C40.919,16.647 40.424,17.886 39.583,18.879C38.742,19.872 37.601,20.565 36.332,20.853C35.064,21.141 33.736,21.009 32.548,20.477C31.361,19.945 30.379,19.041 29.75,17.902C29.121,16.763 28.88,15.45 29.062,14.162C29.244,12.874 29.84,11.679 30.759,10.759C31.128,10.383 31.334,9.876 31.331,9.348C31.328,8.821 31.118,8.316 30.745,7.943C30.372,7.571 29.867,7.36 29.34,7.357C28.813,7.355 28.306,7.56 27.929,7.929C26.293,9.565 25.275,11.717 25.048,14.02C24.821,16.322 25.4,18.632 26.685,20.556C27.971,22.479 29.883,23.898 32.097,24.569C34.311,25.241 36.69,25.124 38.827,24.239C40.965,23.353 42.729,21.754 43.819,19.714C44.91,17.673 45.259,15.318 44.808,13.049C44.356,10.78 43.132,8.737 41.343,7.27C39.555,5.802 37.313,5 34.999,5C34.469,5 33.961,5.211 33.586,5.586C33.211,5.96 33,6.469 33,6.999Z"
+      android:fillColor="#ffffff"
+      tools:ignore="VectorPath" />
+</vector>
diff --git a/WordPress/src/jetpack/res/drawable/ic_logo_plus_gravatar.xml b/WordPress/src/jetpack/res/drawable/ic_logo_plus_gravatar.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="50dp"
+    android:height="30dp"
+    android:viewportWidth="50"
+    android:viewportHeight="30">
+  <path
+      android:pathData="M14,1L14,1A14,14 0,0 1,28 15L28,15A14,14 0,0 1,14 29L14,29A14,14 0,0 1,0 15L0,15A14,14 0,0 1,14 1z"
+      android:fillColor="#069E08"/>
+  <path
+      android:pathData="M7.002,17.182H13.359V4.501L7.002,17.182Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14.659,12.816V25.497L21,12.816H14.659Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M35,0.5L35,0.5A14.5,14.5 0,0 1,49.5 15L49.5,15A14.5,14.5 0,0 1,35 29.5L35,29.5A14.5,14.5 0,0 1,20.5 15L20.5,15A14.5,14.5 0,0 1,35 0.5z"
+      android:fillColor="#1D4FC4"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M35,0.5L35,0.5A14.5,14.5 0,0 1,49.5 15L49.5,15A14.5,14.5 0,0 1,35 29.5L35,29.5A14.5,14.5 0,0 1,20.5 15L20.5,15A14.5,14.5 0,0 1,35 0.5z"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"/>
+  <path
+      android:pathData="M33,6.999V13.999C33,14.53 33.211,15.038 33.586,15.413C33.961,15.788 34.469,15.998 34.999,15.998C35.53,15.998 36.038,15.788 36.413,15.413C36.788,15.038 36.999,14.53 36.999,13.999V9.342C38.226,9.775 39.279,10.595 40,11.678C40.72,12.761 41.069,14.049 40.994,15.348C40.919,16.647 40.424,17.886 39.583,18.879C38.742,19.872 37.601,20.565 36.332,20.853C35.064,21.141 33.736,21.009 32.548,20.477C31.361,19.945 30.379,19.041 29.75,17.902C29.121,16.763 28.88,15.45 29.062,14.162C29.244,12.874 29.84,11.679 30.759,10.759C31.128,10.383 31.334,9.876 31.331,9.348C31.328,8.821 31.118,8.316 30.745,7.943C30.372,7.571 29.867,7.36 29.34,7.357C28.813,7.355 28.306,7.56 27.929,7.929C26.293,9.565 25.275,11.717 25.048,14.02C24.821,16.322 25.4,18.632 26.685,20.556C27.971,22.479 29.883,23.898 32.097,24.569C34.311,25.241 36.69,25.124 38.827,24.239C40.965,23.353 42.729,21.754 43.819,19.714C44.91,17.673 45.259,15.318 44.808,13.049C44.356,10.78 43.132,8.737 41.343,7.27C39.555,5.802 37.313,5 34.999,5C34.469,5 33.961,5.211 33.586,5.586C33.211,5.96 33,6.469 33,6.999Z"
+      android:fillColor="#ffffff"
+      tools:ignore="VectorPath" />
+</vector>