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.

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

Expect insets in common #586

Merged
merged 5 commits into from
Jun 9, 2023
Merged

Expect insets in common #586

merged 5 commits into from
Jun 9, 2023

Conversation

MatkovIvan
Copy link
Member

@MatkovIvan MatkovIvan commented Jun 1, 2023

Proposed Changes

Commonize insets from Android and iOS (introduced in #577)

  • expect/actual for WindowInsets
  • Use new source setnotMobile instead of desktopMain + jsWasmMain + macosMain
  • Move application layout example to common mpp

Testing

Test: run mpp demo

# Conflicts:
#	compose/mpp/demo/src/commonMain/kotlin/androidx/compose/mpp/demo/App.kt
#	compose/mpp/demo/src/uikitMain/kotlin/androidx/compose/mpp/demo/main.uikit.kt
Copy link

@mazunin-v-jb mazunin-v-jb left a comment

Choose a reason for hiding this comment

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

seems ok to me

# Conflicts:
#	compose/mpp/demo/src/commonMain/kotlin/androidx/compose/mpp/demo/App.kt
@MatkovIvan MatkovIvan marked this pull request as ready for review June 8, 2023 08:13
@MatkovIvan MatkovIvan merged commit 16167ae into jb-main Jun 9, 2023
@MatkovIvan MatkovIvan deleted the ivan.matkov/common-insets branch June 9, 2023 09:58
copybara-service bot pushed a commit to androidx/androidx that referenced this pull request Jun 20, 2023
`WindowInsets` API is compatible with other platforms.

Commonize insets API with iOS safe area that has been added to Compose Multiplatform. This change is required to make it available to use in the common source set.

Proposed changes:
- `expect`/`actual` for `WindowInsets`
- Add stubs for desktop

Upstreaming changes from JetBrains#586

Test: n/a
Change-Id: I82e60d7e8ad9c86b60abbabcf0407f6212a5c71d
eymar pushed a commit that referenced this pull request Aug 16, 2023
…ntation

Test: ./gradlew paging:paging-testing:allTests

This is an imported pull request from androidx#586.

Resolves #586
Github-Pr-Head-Sha: 7250175
GitOrigin-RevId: 4ec4136

Change-Id: Ic2d81933a14555b0d8ca862437189aebbe6956d6
igordmn pushed a commit that referenced this pull request Nov 15, 2023
* Expect WindowInsets in commonMain

* Move app layout mpp example to common

* Copy comments to common
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants