Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge of compose-Latest changes into main #1444

Merged
merged 98 commits into from
Aug 14, 2024
Merged

Merge of compose-Latest changes into main #1444

merged 98 commits into from
Aug 14, 2024

Conversation

riggaroo
Copy link
Collaborator

  • Including updates such as Shared element transitions
  • Migrating Jetsnack to Material3

riggaroo added 30 commits April 4, 2024 15:45
@riggaroo
Adding Shared elements to Jetsnack
5577a50
@riggaroo
Adding Shared elements to Jetsnack
b4b8bd0
@riggaroo
Adding Shared elements to Jetsnack
32bf222
@riggaroo
Throw IllegalStateException instead of IllegalArgumentException.
3393f6b 
Code cleanup
@riggaroo
Place background on whole screen.
d54a398
@riggaroo
Cleanup
03d9235
@riggaroo
disable predictive back for now.
e8bc672
@riggaroo
Added a debugPlaceholder for Previews.
9db6c53
@riggaroo
Set ExitTransition.None and using sharedBounds instead of sharedElement.
bcd5d1c
@riggaroo
Set ExitTransition.None and using sharedBounds instead of sharedElement.
61a9c94
@riggaroo
Only display IconButton when the transition isn't active anymore.
7852d36
@riggaroo
skipToLookaheadSize() for Text description to prevent reflowing of co…
e326aaf 
…ntent as it transitions in size.

Clip the background during transition.
@riggaroo
Added background back to the headings
b532356
@riggaroo
Ordering cleanup
27a9d9d
@riggaroo
Change CompositionLocals to be individually provided
e23e553
@riggaroo
Shared element tweaking
3592280
@riggaroo
change spring spec to expressive
844a8d6
@riggaroo
Changed to expressive baseline
cc61fa7
@riggaroo
Fix previews.
70bd4c4
@riggaroo
Polish animation
92fc2ba
@riggaroo
Polish animation
7c2574b
@riggaroo
Slide TopAppBar up when shared element animates
bc49bbe
@riggaroo
Update springs to use expressive
e4abbae
@riggaroo
Animate clipping as it goes.
515d402 
Fix overlap of detail text.
@riggaroo
Code clean up
09f9a0b
@riggaroo
Code clean up
ed03bbd
@riggaroo
Code clean up
b218908
@riggaroo
Merge branch 'refs/heads/bugfix/fix-debug-keystores' into jetsnack/sh…
9e481e8 
…ared-element

# Conflicts:
#	Jetsnack/gradle/libs.versions.toml
@riggaroo
Switch to alpha version of compose
61b7a5e
@riggaroo
Formatting
c44327e
riggaroo and others added 23 commits August 8, 2024 16:16
@riggaroo
Merge branch 'compose-latest' into jetsnack/m3
7703263
@riggaroo
Update to remove Material 2 from dependencies
d1e4589
@riggaroo
fix formatting
7bf234c
@riggaroo
Formatting
9f8b5e5
@riggaroo
Formatting
d66341e
@riggaroo
Formatting
56ecfcc
@riggaroo
Formatting
677ac78
@riggaroo @github-actions
🤖 Apply Spotless
09dfbb8
@riggaroo
Fix previews and icons
3565077
@riggaroo
Merge branch 'jetsnack/m3' of https://github.com/android/compose-samples
e488f71 
 into jetsnack/m3
@riggaroo
Fix formatting
ed3fa5e
@riggaroo @github-actions
🤖 Apply Spotless
d94481b
@riggaroo
Removed Rtl mirroring function in favour of AutoMirror icons
7ee7824
@riggaroo
Merge branch 'jetsnack/m3' of https://github.com/android/compose-samples
83ff22a 
 into jetsnack/m3
@riggaroo @github-actions
🤖 Apply Spotless
925e847
@riggaroo
Remove experimental annotation
1ef9bf1
@riggaroo
Fix swipe to dismiss background to use progress instead of dp
9ff6650
@riggaroo @github-actions
🤖 Apply Spotless
f42c4b5
@riggaroo
Code cleanup
941fe60
@riggaroo @github-actions
🤖 Apply Spotless
5d06366
@riggaroo
Cleanup workflows
502e188
@riggaroo
remove emulator cache for jetnews
9ea3eba
@riggaroo
Jetsnack - Migrate to Material 3 (#1437)
9996d5e 
Jetsnack sample is using Material 2 instead of Material 3, keeping most
of the UI the same as previously. Material 3 is the preferred choice for
Material.

This pull request migrates to using M3, as well as fixes the filters
screen selection to have a shared element transition to show and hide
the dialog.


https://github.com/user-attachments/assets/0121a41c-2aff-4bb0-abc3-d2075a8f2bd4

It also fixes build issues some machines were experiencing, where there
is a mismatch in JVM versions by setting `jvmToolchain` version.
@riggaroo riggaroo marked this pull request as ready for review August 13, 2024 09:04
@riggaroo riggaroo requested a review from a team as a code owner August 13, 2024 09:04
@riggaroo riggaroo requested review from jdkoren and JolandaVerhoef and removed request for jdkoren August 13, 2024 09:04
@riggaroo riggaroo merged commit 86aadeb into main Aug 14, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JolandaVerhoef JolandaVerhoef JolandaVerhoef approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@riggaroo @JolandaVerhoef