From aeddd51430cce24d71540b94914fa685ab28c4e1 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Fri, 18 Nov 2022 20:53:15 -0500 Subject: [PATCH] No default values for expect functions 4 --- .../jui/ui/AndroidViewModelComponent.kt | 2 +- .../ui/base/components/AndroidTooltipArea.kt | 4 ++-- .../ca/gosyer/jui/ui/ViewModelComponent.kt | 8 ++++++- .../jui/ui/base/components/TooltipArea.kt | 24 +++++++++---------- .../jui/ui/DesktopViewModelComponent.kt | 2 +- .../ui/base/components/DesktopTooltipArea.kt | 4 ++-- .../ca/gosyer/jui/ui/IosViewModelComponent.kt | 2 +- .../jui/ui/base/components/IosTooltipArea.kt | 4 ++-- .../jui/uicore/components/DropDownMenu.kt | 2 +- 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/AndroidViewModelComponent.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/AndroidViewModelComponent.kt index 3b17999d..f1059214 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/AndroidViewModelComponent.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/AndroidViewModelComponent.kt @@ -22,7 +22,7 @@ import cafe.adriel.voyager.core.screen.Screen actual interface ViewModelComponent : SharedViewModelComponent @Composable -actual inline fun Screen.stateViewModel( +actual inline fun Screen.realStateViewModel( tag: String?, crossinline factory: @DisallowComposableCalls ViewModelComponent.(SavedStateHandle) -> VM ): VM { diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/components/AndroidTooltipArea.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/components/AndroidTooltipArea.kt index dc6b2179..1fb4940c 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/components/AndroidTooltipArea.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/components/AndroidTooltipArea.kt @@ -15,13 +15,13 @@ import androidx.compose.ui.unit.DpOffset actual interface TooltipPlacement -actual class CursorPoint actual constructor( +actual class CursorPointImpl actual constructor( offset: DpOffset, alignment: Alignment, windowMargin: Dp ) : TooltipPlacement -actual class ComponentRect actual constructor( +actual class ComponentRectImpl actual constructor( anchor: Alignment, alignment: Alignment, offset: DpOffset diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/ViewModelComponent.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/ViewModelComponent.kt index 77023cd5..5d137e44 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/ViewModelComponent.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/ViewModelComponent.kt @@ -72,9 +72,15 @@ interface SharedViewModelComponent { expect interface ViewModelComponent : SharedViewModelComponent @Composable -expect inline fun Screen.stateViewModel( +inline fun Screen.stateViewModel( tag: String? = null, crossinline factory: @DisallowComposableCalls ViewModelComponent.(SavedStateHandle) -> VM +): VM = realStateViewModel(tag, factory) + +@Composable +expect inline fun Screen.realStateViewModel( + tag: String?, + crossinline factory: @DisallowComposableCalls ViewModelComponent.(SavedStateHandle) -> VM ): VM @Composable diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/TooltipArea.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/TooltipArea.kt index 8dbb5b5e..51093462 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/TooltipArea.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/components/TooltipArea.kt @@ -17,30 +17,30 @@ import androidx.compose.ui.unit.dp @ExperimentalFoundationApi expect interface TooltipPlacement -fun TooltipPlacement.CursorPoint( +fun CursorPoint( offset: DpOffset = DpOffset.Zero, alignment: Alignment = Alignment.BottomEnd, windowMargin: Dp = 4.dp -) = ca.gosyer.jui.ui.base.components.CursorPoint(offset, alignment, windowMargin) +) = CursorPointImpl(offset, alignment, windowMargin) @ExperimentalFoundationApi -expect class CursorPoint( - offset: DpOffset = DpOffset.Zero, - alignment: Alignment = Alignment.BottomEnd, - windowMargin: Dp = 4.dp +expect class CursorPointImpl( + offset: DpOffset, + alignment: Alignment, + windowMargin: Dp ) : TooltipPlacement -fun TooltipPlacement.ComponentRect( +fun ComponentRect( anchor: Alignment = Alignment.BottomCenter, alignment: Alignment = Alignment.BottomCenter, offset: DpOffset = DpOffset.Zero -) = ca.gosyer.jui.ui.base.components.ComponentRect(anchor, alignment, offset) +) = ca.gosyer.jui.ui.base.components.ComponentRectImpl(anchor, alignment, offset) @ExperimentalFoundationApi -expect class ComponentRect( - anchor: Alignment = Alignment.BottomCenter, - alignment: Alignment = Alignment.BottomCenter, - offset: DpOffset = DpOffset.Zero +expect class ComponentRectImpl( + anchor: Alignment, + alignment: Alignment, + offset: DpOffset ) : TooltipPlacement @OptIn(ExperimentalFoundationApi::class) diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/DesktopViewModelComponent.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/DesktopViewModelComponent.kt index 9df64dc3..230cc504 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/DesktopViewModelComponent.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/DesktopViewModelComponent.kt @@ -21,7 +21,7 @@ actual interface ViewModelComponent : SharedViewModelComponent { } @Composable -actual inline fun Screen.stateViewModel( +actual inline fun Screen.realStateViewModel( tag: String?, crossinline factory: @DisallowComposableCalls ViewModelComponent.(SavedStateHandle) -> VM ): VM { diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/components/DesktopTooltipArea.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/components/DesktopTooltipArea.kt index 3db79999..46e295d6 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/components/DesktopTooltipArea.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/components/DesktopTooltipArea.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.Modifier actual typealias TooltipPlacement = androidx.compose.foundation.TooltipPlacement -actual typealias CursorPoint = androidx.compose.foundation.TooltipPlacement.CursorPoint +actual typealias CursorPointImpl = androidx.compose.foundation.TooltipPlacement.CursorPoint -actual typealias ComponentRect = androidx.compose.foundation.TooltipPlacement.ComponentRect +actual typealias ComponentRectImpl = androidx.compose.foundation.TooltipPlacement.ComponentRect @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/IosViewModelComponent.kt b/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/IosViewModelComponent.kt index 80b4dfa0..e1266648 100644 --- a/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/IosViewModelComponent.kt +++ b/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/IosViewModelComponent.kt @@ -18,7 +18,7 @@ import cafe.adriel.voyager.core.screen.Screen actual interface ViewModelComponent : SharedViewModelComponent @Composable -actual inline fun Screen.stateViewModel( +actual inline fun Screen.realStateViewModel( tag: String?, crossinline factory: @DisallowComposableCalls ViewModelComponent.(SavedStateHandle) -> VM ): VM { diff --git a/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/base/components/IosTooltipArea.kt b/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/base/components/IosTooltipArea.kt index dc6b2179..1fb4940c 100644 --- a/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/base/components/IosTooltipArea.kt +++ b/presentation/src/iosMain/kotlin/ca/gosyer/jui/ui/base/components/IosTooltipArea.kt @@ -15,13 +15,13 @@ import androidx.compose.ui.unit.DpOffset actual interface TooltipPlacement -actual class CursorPoint actual constructor( +actual class CursorPointImpl actual constructor( offset: DpOffset, alignment: Alignment, windowMargin: Dp ) : TooltipPlacement -actual class ComponentRect actual constructor( +actual class ComponentRectImpl actual constructor( anchor: Alignment, alignment: Alignment, offset: DpOffset diff --git a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropDownMenu.kt b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropDownMenu.kt index 700a85b3..9d0ca33b 100644 --- a/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropDownMenu.kt +++ b/ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/components/DropDownMenu.kt @@ -79,7 +79,7 @@ fun DropdownMenu( @Composable internal expect fun RealDropdownMenuItem( onClick: () -> Unit, - modifier: Modifier = Modifier, + modifier: Modifier, enabled: Boolean, contentPadding: PaddingValues, interactionSource: MutableInteractionSource,