diff --git a/compose/core/src/main/java/dev/funkymuse/compose/core/GetterExtensions.kt b/compose/core/src/main/java/dev/funkymuse/compose/core/GetterExtensions.kt index 3c95d715b..ff34ab610 100644 --- a/compose/core/src/main/java/dev/funkymuse/compose/core/GetterExtensions.kt +++ b/compose/core/src/main/java/dev/funkymuse/compose/core/GetterExtensions.kt @@ -30,10 +30,8 @@ import androidx.compose.ui.platform.LocalFontFamilyResolver import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.platform.LocalLayoutDirection -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalSavedStateRegistryOwner import androidx.compose.ui.platform.LocalSoftwareKeyboardController -import androidx.compose.ui.platform.LocalTextInputService import androidx.compose.ui.platform.LocalTextToolbar import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.platform.LocalView @@ -45,7 +43,6 @@ import androidx.compose.ui.platform.UriHandler import androidx.compose.ui.platform.ViewConfiguration import androidx.compose.ui.platform.WindowInfo import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.input.TextInputService import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.LayoutDirection import androidx.lifecycle.LifecycleOwner @@ -57,7 +54,7 @@ import androidx.savedstate.SavedStateRegistryOwner val lifecycleOwner: LifecycleOwner @Composable get() { - return LocalLifecycleOwner.current + return androidx.lifecycle.compose.LocalLifecycleOwner.current } val context: Context @@ -129,11 +126,6 @@ val savedStateRegistryOwner: SavedStateRegistryOwner return LocalSavedStateRegistryOwner.current } -val textInputService: TextInputService? - @Composable get() { - return LocalTextInputService.current - } - val uriHandler: UriHandler @Composable get() { return LocalUriHandler.current diff --git a/compose/core/src/main/java/dev/funkymuse/compose/core/LifecycleExtensions.kt b/compose/core/src/main/java/dev/funkymuse/compose/core/LifecycleExtensions.kt index 3532f6bc3..f8b0ddefc 100644 --- a/compose/core/src/main/java/dev/funkymuse/compose/core/LifecycleExtensions.kt +++ b/compose/core/src/main/java/dev/funkymuse/compose/core/LifecycleExtensions.kt @@ -24,7 +24,7 @@ fun AddLifecycleObserver(observer: LifecycleObserver) { } @Composable -fun OWNER.ObserveLifecycle(lifecycle: Lifecycle = LocalLifecycleOwner.current.lifecycle) { +fun OWNER.ObserveLifecycle(lifecycle: Lifecycle = androidx.lifecycle.compose.LocalLifecycleOwner.current.lifecycle) { DisposableEffect(lifecycle) { lifecycle.addObserver(this@ObserveLifecycle) onDispose {