Merge 23.8-rc-3 and editorialized release notes to trunk - #19713
Merged
Conversation
added 30 commits
November 27, 2023 11:49
…y-nudge-ff [Bloganuary] Create Bloganuary Nudge FF
We were using bodyLarge and changing the text size to be the same as the medium, so it makes more sense to use the `bodyMedium` directly, since it has better values for the line height and letter spacing for the smaller font size.
This change will be done at the end of feature development so it is easier to test the dashboard nudge PRs. Before delivering the feature we should check if the current device date is in December 2023 as one of the eligibility params.
…y-nudge-dashboard-card [Bloganuary] Dashboard Nudge card
…y-card-hide-button [Bloganuary] Implement Dashboard Nudge card hide button functionality
…evert QR Code: Partial MLKit Revert
…y-nudge-modal-ui [Bloganuary] Create Learn More nudge modal UI
…y-nudge-modal-turn-prompts-on [Boganuary] Implement Modal action to enable prompts
…y-nudge-modal-analytics [Bloganuary] Modal analytics tracking
…e-eligible-only-in-december [Bloganuary] Make Bloganuary Nudge only be eligible in December
Merge 23.8 editorialized release notes to release/23.8
Merge 23.8-rc-3 to release/23.8
Contributor
|
Found 1 violations: The PR caused the following dependency changes: +--- com.automattic:stories:2.4.0
| \--- com.automattic.stories:photoeditor:2.4.0
-| +--- androidx.camera:camera-core:1.0.0-alpha06 -> 1.2.3
-| | +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-| | +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
-| | +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-| | +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-| | +--- androidx.exifinterface:exifinterface:1.3.2 -> 1.3.6 (*)
-| | +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
-| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.2 (*)
-| | +--- com.google.auto.value:auto-value-annotations:1.6.3
-| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
+| +--- androidx.camera:camera-core:1.0.0-alpha06
+| | +--- com.google.auto.value:auto-value-annotations:1.6.3
+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.2 (*)
+| | +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
+| | +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+| | +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+| | +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+| | \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.1.0 (*)
-| \--- androidx.camera:camera-camera2:1.0.0-alpha06 -> 1.2.3
-| +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-| +--- androidx.camera:camera-core:1.2.3 (*)
-| +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-| +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-| +--- com.google.auto.value:auto-value-annotations:1.6.3
-| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| \--- androidx.camera:camera-camera2:1.0.0-alpha06
+| +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| +--- androidx.camera:camera-core:1.0.0-alpha06 (*)
+| +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+| +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+| \--- androidx.concurrent:concurrent-futures:1.0.0-alpha03 -> 1.1.0 (*)
++--- com.google.android.gms:play-services-code-scanner:16.0.0-beta3
+| +--- androidx.activity:activity:1.3.1 -> 1.8.0 (*)
+| +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
+| | +--- com.google.android.datatransport:transport-runtime:3.1.8
+| | | +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+| | | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
+| | | +--- com.google.firebase:firebase-encoders:17.0.0
+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | +--- com.google.firebase:firebase-encoders-proto:16.0.0
+| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | | | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
+| | | \--- javax.inject:javax.inject:1
+| | +--- com.google.firebase:firebase-encoders:17.0.0 (*)
+| | \--- com.google.firebase:firebase-encoders-json:18.0.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+| | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
+| +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+| +--- com.google.android.gms:play-services-base:18.1.0 (*)
+| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
+| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
+| +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0
+| | +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
+| | +--- com.google.errorprone:error_prone_annotations:2.9.0 -> 2.15.0
+| | \--- com.google.firebase:firebase-annotations:16.2.0
+| | \--- javax.inject:javax.inject:1
+| +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+| +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+| +--- com.google.mlkit:barcode-scanning-common:17.0.0
+| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+| | \--- com.google.mlkit:vision-common:17.0.0
+| | +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+| | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
+| | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
+| | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+| | +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
+| | +--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
+| | +--- com.google.android.odml:image:1.0.0-beta1
+| | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
+| | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+| | +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+| | \--- com.google.mlkit:common:18.0.0 -> 18.5.0
+| | +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
+| | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
+| | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
+| | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
+| | +--- com.google.android.gms:play-services-base:18.1.0 (*)
+| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
+| | +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
+| | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
+| | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
+| | \--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+| \--- com.google.mlkit:common:18.5.0 (*)
-+--- com.google.mlkit:barcode-scanning-common:17.0.0
-| +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
-| \--- com.google.mlkit:vision-common:17.0.0 -> 17.3.0
-| +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
-| +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0
-| | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8
-| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-| | +--- com.google.android.datatransport:transport-runtime:3.1.8
-| | | +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-| | | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-| | | +--- com.google.firebase:firebase-encoders:17.0.0
-| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | +--- com.google.firebase:firebase-encoders-proto:16.0.0
-| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | | | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
-| | | \--- javax.inject:javax.inject:1
-| | +--- com.google.firebase:firebase-encoders:17.0.0 (*)
-| | \--- com.google.firebase:firebase-encoders-json:18.0.0
-| | +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-| | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
-| +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| +--- com.google.android.odml:image:1.0.0-beta1
-| +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0
-| | +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
-| | +--- com.google.errorprone:error_prone_annotations:2.9.0 -> 2.15.0
-| | \--- com.google.firebase:firebase-annotations:16.2.0
-| | \--- javax.inject:javax.inject:1
-| +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-| \--- com.google.mlkit:common:18.6.0 -> 18.9.0
-| +--- androidx.core:core:1.0.0 -> 1.10.0 (*)
-| +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-| +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-| +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| \--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
+\--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-+--- com.google.mlkit:text-recognition:16.0.0
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-mlkit-text-recognition:19.0.0
-| | +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-mlkit-text-recognition-common:19.0.0
-| | | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-| | | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-| | | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| | | +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| | | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | | +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| | | +--- com.google.android.odml:image:1.0.0-beta1
-| | | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-| | | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| | | +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-| | | +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| | | +--- com.google.mlkit:vision-common:17.3.0 (*)
-| | | \--- com.google.mlkit:vision-interfaces:16.2.0
-| | | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | | \--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| | \--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| \--- com.google.mlkit:text-recognition-bundled-common:16.0.0
-| +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| +--- com.google.mlkit:common:18.8.0 -> 18.9.0 (*)
-| \--- com.google.mlkit:vision-common:17.3.0 (*)
-+--- com.google.mlkit:barcode-scanning:17.2.0
-| +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| +--- com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.0
-| | +--- com.google.android.datatransport:transport-api:2.2.1 -> 3.0.0 (*)
-| | +--- com.google.android.datatransport:transport-backend-cct:2.3.3 -> 3.1.8 (*)
-| | +--- com.google.android.datatransport:transport-runtime:2.2.6 -> 3.1.8 (*)
-| | +--- com.google.android.gms:play-services-base:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-basement:18.1.0 (*)
-| | +--- com.google.android.gms:play-services-tasks:18.0.2 (*)
-| | +--- com.google.android.odml:image:1.0.0-beta1
-| | +--- com.google.firebase:firebase-components:16.1.0 -> 17.1.0 (*)
-| | +--- com.google.firebase:firebase-encoders:16.1.0 -> 17.0.0 (*)
-| | +--- com.google.firebase:firebase-encoders-json:17.1.0 -> 18.0.0 (*)
-| | +--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-| | +--- com.google.mlkit:common:18.9.0 (*)
-| | +--- com.google.mlkit:vision-common:17.3.0 (*)
-| | \--- com.google.mlkit:vision-interfaces:16.2.0 (*)
-| +--- com.google.mlkit:barcode-scanning-common:17.0.0 (*)
-| +--- com.google.mlkit:common:18.9.0 (*)
-| \--- com.google.mlkit:vision-common:17.3.0 (*)
-+--- androidx.camera:camera-camera2:1.2.3 (*)
-+--- androidx.camera:camera-lifecycle:1.2.3
-| +--- androidx.camera:camera-core:1.2.3 (*)
-| +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
-| +--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-| +--- androidx.lifecycle:lifecycle-common:2.1.0 -> 2.6.2 (*)
-| +--- com.google.auto.value:auto-value-annotations:1.6.3
-| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-\--- androidx.camera:camera-view:1.2.3
- +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
- +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
- +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
- +--- androidx.camera:camera-core:1.2.3 (*)
- +--- androidx.camera:camera-lifecycle:1.2.3 (*)
- +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
- +--- androidx.core:core:1.3.2 -> 1.10.0 (*)
- +--- androidx.lifecycle:lifecycle-common:2.0.0 -> 2.6.2 (*)
- +--- com.google.auto.value:auto-value-annotations:1.6.3
- \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
Please review and act accordingly
|
…Android into feature/bloganuary-nudge
Contributor
|
| App Name | Jetpack |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr19713-0a3337b | |
| Commit | 0a3337b | |
| Direct Download | jetpack-prototype-build-pr19713-0a3337b.apk |
Contributor
|
| App Name | WordPress |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr19713-0a3337b | |
| Commit | 0a3337b | |
| Direct Download | wordpress-prototype-build-pr19713-0a3337b.apk |
[Bloganuary] Implement Dashboard Card and Modal for Bloganuary Nudge
Generated by 🚫 dangerJS |
jkmassel
approved these changes
Dec 1, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.


Includes #19708.
Edit: It now also includes #19715.