[Quick View] Merging compose-latest to main #985
Merged
Conversation
This file contains 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
Merge main in to latest
Upgrade to Compose 1.3
…in 1.7.10 (#925) * Update versions * Fix review comments
* [Crane] Fix destinations not in list issue.
# Conflicts: # Crane/app/build.gradle # Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt # JetNews/app/build.gradle # JetNews/build.gradle # Jetcaster/app/build.gradle # Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt # Jetchat/app/build.gradle # Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt # Jetsnack/app/build.gradle # Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt # Jetsurvey/app/build.gradle # Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt # Owl/app/build.gradle # Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt # Reply/app/build.gradle # Reply/build.gradle # scripts/upgrade_samples.sh
Co-authored-by: Rebecca Franks <riggaroo@google.com> Co-authored-by: Ben Trengrove <bentrengrove@users.noreply.github.com> Co-authored-by: Ben Trengrove <bentrengrove@google.com>
….3.0-beta01 (#967) Update samples on compose-latest branch to Compose 1.3.0-beta01 Co-authored-by: Ben Trengrove <bentrengrove@google.com>
This updates Jetsurvey from Material 2 to Material 3. All Compose components now use Material 3 instead of Material 2. The date picker is currently still using the MaterialDatePicker DialogFragment the same as before this change. This also fixes the visibility of the status bars when in light mode and updates the screenshot and animated gif. Before: https://raw.githubusercontent.com/android/compose-samples/70d05efe9c5de6d3788ac3c6023caa20761d410a/Jetsurvey/screenshots/survey.gif After: https://raw.githubusercontent.com/android/compose-samples/ede93fc907ad32c61bd7f3d55a33af48e782ea2a/Jetsurvey/screenshots/survey.gif
Co-authored-by: Rebecca Franks <riggaroo@google.com> Co-authored-by: Ben Trengrove <bentrengrove@users.noreply.github.com> Co-authored-by: Ben Trengrove <bentrengrove@google.com> Co-authored-by: Ian G. Clifton <1033551+IanGClifton@users.noreply.github.com> Co-authored-by: Ian G. Clifton <IanGClifton@users.noreply.github.com> Co-authored-by: Ale Stamato <alejandra.stamato@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Merge main to compose-latest Co-authored-by: Rebecca Franks <riggaroo@google.com> Co-authored-by: Jolanda Verhoef <JolandaVerhoef@users.noreply.github.com> Co-authored-by: Ian G. Clifton <1033551+IanGClifton@users.noreply.github.com> Co-authored-by: Ian G. Clifton <IanGClifton@users.noreply.github.com> Co-authored-by: Ale Stamato <alejandra.stamato@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Nick Rout <nickrout@google.com>
Co-authored-by: Manuel Vivo <mvivo@google.com>
https://issuetracker.google.com/248164773 was fixed in material3 1.0.0-rc01, which the compose-latest branch is now on. I've removed the workaround of placing the slider in a box and confirmed it's functioning as expected on a Pixel 5.
https://issuetracker.google.com/248164773 was fixed in material3 1.0.0-rc01, which the compose-latest branch is now on. I've removed the workaround of placing the slider in a box and confirmed it's functioning as expected on a Pixel 5.
# Conflicts: # Crane/gradle/libs.versions.toml # JetNews/gradle/libs.versions.toml # Jetcaster/gradle/libs.versions.toml # Jetchat/gradle/libs.versions.toml # Jetsnack/gradle/libs.versions.toml # Jetsurvey/gradle/libs.versions.toml # Owl/gradle/libs.versions.toml # Reply/app/src/main/java/com/example/reply/ui/MainActivity.kt # Reply/gradle/libs.versions.toml # scripts/libs.versions.toml
JolandaVerhoef
approved these changes
Oct 24, 2022
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.
No description provided.