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 material3.ModalBottomSheet in common #794

Merged
merged 3 commits into from
Sep 12, 2023

Conversation

MatkovIvan
Copy link
Member

@MatkovIvan MatkovIvan commented Sep 6, 2023

Proposed Changes

  • Expect ModalBottomSheet in common and implement for skiko
  • Add test usage in mpp demo app
Screenshot 2023-09-06 at 18 15 15

API Changes

+@Composable
+@ExperimentalMaterial3Api
+expect fun ModalBottomSheet(
+    onDismissRequest: () -> Unit,
+    modifier: Modifier = Modifier,
+    sheetState: SheetState = rememberModalBottomSheetState(),
+    shape: Shape = BottomSheetDefaults.ExpandedShape,
+    containerColor: Color = BottomSheetDefaults.ContainerColor,
+    contentColor: Color = contentColorFor(containerColor),
+    tonalElevation: Dp = BottomSheetDefaults.Elevation,
+    scrimColor: Color = BottomSheetDefaults.ScrimColor,
+    dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() },
+    windowInsets: WindowInsets = BottomSheetDefaults.windowInsets,
+    content: @Composable ColumnScope.() -> Unit,
+)

Testing

Test: Try to use ModalBottomSheet from common or look at mpp demo

Issues Fixed

JetBrains/compose-multiplatform#3528

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
@MatkovIvan MatkovIvan force-pushed the ivan.matkov/common-modalbottomsheet3 branch from a721167 to 1c05d15 Compare September 11, 2023 11:57
@MatkovIvan MatkovIvan merged commit 765fced into jb-main Sep 12, 2023
@MatkovIvan MatkovIvan deleted the ivan.matkov/common-modalbottomsheet3 branch September 12, 2023 14:44
MatkovIvan added a commit that referenced this pull request Sep 26, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
## Proposed Changes

- Revert incorrect merge changes from #843 (it was moved to common in
#794)
igordmn pushed a commit that referenced this pull request Nov 15, 2023
* Expect ModalBottomSheet in common

* Add ModalBottomSheet3Sample sample

* Move everything except Popup to common
igordmn pushed a commit that referenced this pull request Nov 16, 2023
…` in common (#794)

* Expect ModalBottomSheet in common

* Add ModalBottomSheet3Sample sample

* Move everything except Popup to common
igordmn pushed a commit that referenced this pull request Jan 30, 2024
* Expect ModalBottomSheet in common

* Add ModalBottomSheet3Sample sample

* Move everything except Popup to common
MatkovIvan added a commit that referenced this pull request May 15, 2024
It's upstreaming of #794.
This API is already available from common since Compose Multiplatform 1.5.10

Test: N/A
Relnote: Make `ModalBottomSheet` available from common source set
Change-Id: Id7cc733003fc7c2cdceb95a30b6d7183d39fdffc
copybara-service bot pushed a commit to androidx/androidx that referenced this pull request May 16, 2024
It's upstreaming of JetBrains#794.
This API is already available from common since Compose Multiplatform 1.5.10

Test: N/A
Relnote: Make `ModalBottomSheet` available from common source set
Change-Id: Id7cc733003fc7c2cdceb95a30b6d7183d39fdffc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants