Skip to content
This repository was archived by the owner on Aug 2, 2024. It is now read-only.

Merge compose branch into main#769

Merged
arriolac merged 25 commits into
mainfrom
compose
Jun 6, 2022
Merged

Merge compose branch into main#769
arriolac merged 25 commits into
mainfrom
compose

Conversation

@arriolac

@arriolac arriolac commented May 31, 2022

Copy link
Copy Markdown
Contributor

Merges compose branch into main.

Changes

manuelvicnt and others added 22 commits August 24, 2020 17:03
@manuelvicnt
Migrates Plant details screen to Compose (#1) (#638)
49e2b48
@manuelvicnt
Updates to Compose alpha (#639)
175d12f
@manuelvicnt
Updates to Compose alpha04 (#657)
e0d50a5
@manuelvicnt
Updates to compose alpha05 (#664)
0cbd50c
@manuelvicnt
Updates Compose to alpha06 (#666)
eeecb92
@manuelvicnt
Updates Compose to alpha07 (#670)
5637264
@JolandaVerhoef
Update to alpha08 version of Compose (#677)
7cc84cd 
* Update to alpha08 version of Compose

* Updates to AS Arctic Fox

Co-authored-by: Manuel Vivo <mvivo@google.com>
@manuelvicnt
Updates to Compose alpha10 (#683)
65c5107
@manuelvicnt
Updates Compose to alpha11 (#693)
d316e4c
@manuelvicnt
Updates to Compose alpha12 (#697)
86c7993
@manuelvicnt
@manuelvicnt Update to Compose beta01 (#704)
af41a17
@yrezgui
Update to Compose beta02 (#708)
a16a47b
@manuelvicnt
[Compose] Update to beta07 (#716)
a2f3fb4
@manuelvicnt
[Compose] Update to rc02 (#731)
d16890c
@JolandaVerhoef
Update tooling dependencies (#754)
409fac7
@arriolac
[Compose]: Upgrade to 1.2.0-alpha07 (#758)
d6775ac
@arriolac
[Compose]: Update dependencies and remove reference to accompanist (#760
d5229ee 
)

* [Compose]: Update dependencies and remove reference to accompanist.

* Update README.

* Run tests on main and compose branches.

* Use JDK 11.

* Use new nested scrolling API to implement parallax scrolling.

* Use Chipmunk in README.
@arriolac
[Compose]: Implement RecyclerView item in Compose. (#763)
2680662
@arriolac
Update Compose in RecyclerView implementation. (#766)
395d403
@arriolac
Merge main into compose.
bc49636
@arriolac
Merge branch 'main' into compose
8437b16
@arriolac
Add rounded corners to plant item.
c086bed
@arriolac
arriolac marked this pull request as ready for review June 2, 2022 21:34
@arriolac
arriolac requested review from manuelvicnt and tunjid June 2, 2022 21:35
bentrengrove
bentrengrove reviewed Jun 2, 2022
View reviewed changes
Comment thread .github/workflows/android.yml Outdated
Comment thread app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt
Comment thread app/src/main/java/com/google/samples/apps/sunflower/compose/utils/TextUtils.kt Outdated
tunjid
tunjid approved these changes Jun 3, 2022
View reviewed changes

@tunjid tunjid left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@arriolac
arriolac merged commit 2260621 into main Jun 6, 2022
This was referenced Jun 9, 2022
Closed
Closed
@Giangpro89

Giangpro89 commented Jun 23, 2022

Copy link
Copy Markdown

Cam on

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@manuelvicnt manuelvicnt Awaiting requested review from manuelvicnt
2 more reviewers
@bentrengrove bentrengrove bentrengrove left review comments
@tunjid tunjid tunjid approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@arriolac @Giangpro89 @bentrengrove @tunjid @manuelvicnt @JolandaVerhoef @yrezgui