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 f2678990..9f579923 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/AndroidViewModelComponent.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/AndroidViewModelComponent.kt @@ -32,4 +32,4 @@ actual inline fun Screen.stateViewModel( lifecycle.defaultViewModelCreationExtras.addScreenModelKey(this, tag).createSavedStateHandle() } return rememberScreenModel(tag) { viewModelFactory.factory(handle) } -} \ No newline at end of file +} diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt index ccdb61e3..93324a79 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt @@ -8,4 +8,4 @@ package ca.gosyer.jui.ui.base.screen import cafe.adriel.voyager.androidx.AndroidScreen -actual typealias BaseScreen = AndroidScreen \ No newline at end of file +actual typealias BaseScreen = AndroidScreen diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/AndroidSavedStateHandle.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/AndroidSavedStateHandle.kt index abe3c949..7bc49798 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/AndroidSavedStateHandle.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/AndroidSavedStateHandle.kt @@ -6,4 +6,4 @@ package ca.gosyer.jui.ui.base.state -actual typealias SavedStateHandle = androidx.lifecycle.SavedStateHandle \ No newline at end of file +actual typealias SavedStateHandle = androidx.lifecycle.SavedStateHandle diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleSupport.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleSupport.kt index bdfeb518..8cd46285 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleSupport.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleSupport.kt @@ -23,7 +23,6 @@ import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.screen.Screen import java.lang.reflect.Method - private const val SAVED_STATE_KEY = "androidx.lifecycle.internal.SavedStateHandlesProvider" val SavedStateHandleSupportClass: Class<*> by lazy { @@ -46,7 +45,8 @@ private fun createSavedStateHandle( val vm = getSavedStateHandlesVM.invoke(null, viewModelStoreOwner)!! val handles = vm::class.java.methods.first { it.name == "getHandles" }.invoke(vm) as MutableMap return handles[key] ?: SavedStateHandle.createHandle( - provider.consumeRestoredStateForKey(key), defaultArgs + provider.consumeRestoredStateForKey(key), + defaultArgs ).also { handles[key] = it } } @@ -78,21 +78,26 @@ fun CreationExtras.createSavedStateHandle(): SavedStateHandle { "CreationExtras must have a value by `VIEW_MODEL_KEY`" ) return createSavedStateHandle( - savedStateRegistryOwner, viewModelStateRegistryOwner, key, defaultArgs + savedStateRegistryOwner, + viewModelStateRegistryOwner, + key, + defaultArgs ) } internal val SavedStateRegistryOwner.savedStateHandlesProvider: SavedStateHandlesProvider get() = savedStateRegistry.getSavedStateProvider(SAVED_STATE_KEY)?.let(::SavedStateHandlesProvider) - ?: throw IllegalStateException("enableSavedStateHandles() wasn't called " + - "prior to createSavedStateHandle() call") + ?: throw IllegalStateException( + "enableSavedStateHandles() wasn't called " + + "prior to createSavedStateHandle() call" + ) /** * This single SavedStateProvider is responsible for saving the state of every * SavedStateHandle associated with the SavedState/ViewModel pair. */ internal class SavedStateHandlesProvider( - private val savedStateRegistry: SavedStateRegistry.SavedStateProvider, + private val savedStateRegistry: SavedStateRegistry.SavedStateProvider ) { /** * Restore the state associated with a particular SavedStateHandle, identified by its [key] @@ -111,4 +116,4 @@ inline fun CreationExtras.addScreenModelKey(screen: Sc return MutableCreationExtras(this).apply { set(VIEW_MODEL_KEY, getKey(screen, tag)) } -} \ No newline at end of file +} diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt index 507550b9..59b8c8d1 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt @@ -8,4 +8,4 @@ package ca.gosyer.jui.ui.base.screen import cafe.adriel.voyager.core.screen.Screen -expect abstract class BaseScreen() : Screen \ No newline at end of file +expect abstract class BaseScreen() : Screen diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandle.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandle.kt index ea68711f..58860afc 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandle.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandle.kt @@ -16,4 +16,4 @@ expect class SavedStateHandle { fun remove(key: String): T? fun getStateFlow(key: String, initialValue: T): StateFlow -} \ No newline at end of file +} diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleFlow.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleFlow.kt index ebefe96a..9abade44 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleFlow.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleFlow.kt @@ -12,14 +12,14 @@ import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty fun SavedStateHandle.getStateFlow( - initialValue: () -> T, + initialValue: () -> T ): SavedStateHandleDelegate { return SavedStateHandleDelegate(this, initialValue) } class SavedStateHandleDelegate( private val savedStateHandle: SavedStateHandle, - private val initialValue: () -> T, + private val initialValue: () -> T ) : ReadOnlyProperty> { private var item: SavedStateHandleStateFlow? = null @@ -28,7 +28,9 @@ class SavedStateHandleDelegate( if (item == null) { savedStateHandle.getSavedStateFlow(property.name, initialValue) .also { item = it } - } else item!! + } else { + item!! + } } } } @@ -36,7 +38,7 @@ class SavedStateHandleDelegate( class SavedStateHandleStateFlow( private val key: String, private val savedStateHandle: SavedStateHandle, - private val stateFlow: StateFlow, + private val stateFlow: StateFlow ) : StateFlow by stateFlow { override var value: T @@ -52,7 +54,7 @@ class SavedStateHandleStateFlow( fun SavedStateHandle.getSavedStateFlow( key: String, - initialValue: () -> T, + initialValue: () -> T ): SavedStateHandleStateFlow { val value = get(key) @@ -65,6 +67,6 @@ fun SavedStateHandle.getSavedStateFlow( return SavedStateHandleStateFlow( key = key, savedStateHandle = this, - stateFlow = flow, + stateFlow = flow ) -} \ No newline at end of file +} 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 2296aa34..9df64dc3 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/DesktopViewModelComponent.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/DesktopViewModelComponent.kt @@ -28,4 +28,4 @@ actual inline fun Screen.stateViewModel( val viewModelFactory = LocalViewModels.current val savedStateHandle = rememberSaveable { SavedStateHandle() } return rememberScreenModel(tag) { viewModelFactory.factory(savedStateHandle) } -} \ No newline at end of file +} diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt index 085b3f2d..31471b90 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/screen/BaseScreen.kt @@ -13,4 +13,4 @@ import cafe.adriel.voyager.core.screen.uniqueScreenKey actual abstract class BaseScreen : Screen { override val key: ScreenKey = uniqueScreenKey -} \ No newline at end of file +} diff --git a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/state/DesktopSavedStateHandle.kt b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/state/DesktopSavedStateHandle.kt index ce05ee0e..1bd5685d 100644 --- a/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/state/DesktopSavedStateHandle.kt +++ b/presentation/src/desktopMain/kotlin/ca/gosyer/jui/ui/base/state/DesktopSavedStateHandle.kt @@ -47,4 +47,4 @@ actual class SavedStateHandle { MutableStateFlow(regular[key]).apply { flows[key] = this } }.asStateFlow() as StateFlow } -} \ No newline at end of file +} diff --git a/ui-core/src/iosArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt b/ui-core/src/iosArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt index 75cc36cf..633402bb 100644 --- a/ui-core/src/iosArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt +++ b/ui-core/src/iosArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt @@ -8,11 +8,8 @@ package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import dev.icerock.moko.resources.PluralsResource -import dev.icerock.moko.resources.StringResource import dev.icerock.moko.resources.desc.Plural import dev.icerock.moko.resources.desc.PluralFormatted -import dev.icerock.moko.resources.desc.Resource -import dev.icerock.moko.resources.desc.ResourceFormatted import dev.icerock.moko.resources.desc.StringDesc @Composable diff --git a/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosDropDownMenu.kt b/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosDropDownMenu.kt index c7229381..1b6286a3 100644 --- a/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosDropDownMenu.kt +++ b/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosDropDownMenu.kt @@ -47,4 +47,4 @@ internal actual fun RealDropdownMenuItem( interactionSource = interactionSource, content = content ) -*/ \ No newline at end of file +*/ diff --git a/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/resources/IosImageResource.kt b/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/resources/IosImageResource.kt index eeec889d..cf79973f 100644 --- a/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/resources/IosImageResource.kt +++ b/ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/resources/IosImageResource.kt @@ -70,6 +70,6 @@ private fun UIImage.toSkiaImage(): Image? { return Image.makeRaster( imageInfo = ImageInfo(width = width, height = height, colorType = ColorType.RGBA_8888, alphaType = alphaType), bytes = byteArray, - rowBytes = bytesPerRow.toInt(), + rowBytes = bytesPerRow.toInt() ) -} \ No newline at end of file +} diff --git a/ui-core/src/iosSimulatorArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt b/ui-core/src/iosSimulatorArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt index 75cc36cf..633402bb 100644 --- a/ui-core/src/iosSimulatorArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt +++ b/ui-core/src/iosSimulatorArm64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt @@ -8,11 +8,8 @@ package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import dev.icerock.moko.resources.PluralsResource -import dev.icerock.moko.resources.StringResource import dev.icerock.moko.resources.desc.Plural import dev.icerock.moko.resources.desc.PluralFormatted -import dev.icerock.moko.resources.desc.Resource -import dev.icerock.moko.resources.desc.ResourceFormatted import dev.icerock.moko.resources.desc.StringDesc @Composable diff --git a/ui-core/src/iosX64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt b/ui-core/src/iosX64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt index 75cc36cf..633402bb 100644 --- a/ui-core/src/iosX64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt +++ b/ui-core/src/iosX64Main/kotlin/ca/gosyer/jui/uicore/resources/IosStringResource.kt @@ -8,11 +8,8 @@ package ca.gosyer.jui.uicore.resources import androidx.compose.runtime.Composable import dev.icerock.moko.resources.PluralsResource -import dev.icerock.moko.resources.StringResource import dev.icerock.moko.resources.desc.Plural import dev.icerock.moko.resources.desc.PluralFormatted -import dev.icerock.moko.resources.desc.Resource -import dev.icerock.moko.resources.desc.ResourceFormatted import dev.icerock.moko.resources.desc.StringDesc @Composable