diff --git a/redwood-treehouse-host-composeui/src/commonMain/kotlin/app/cash/redwood/treehouse/composeui/TreehouseContent.kt b/redwood-treehouse-host-composeui/src/commonMain/kotlin/app/cash/redwood/treehouse/composeui/TreehouseContent.kt index 9732704efd..06099a1bbb 100644 --- a/redwood-treehouse-host-composeui/src/commonMain/kotlin/app/cash/redwood/treehouse/composeui/TreehouseContent.kt +++ b/redwood-treehouse-host-composeui/src/commonMain/kotlin/app/cash/redwood/treehouse/composeui/TreehouseContent.kt @@ -15,8 +15,6 @@ */ package app.cash.redwood.treehouse.composeui -import app.cash.redwood.ui.LayoutDirection as RedwoodLayoutDirection -import app.cash.redwood.ui.dp as redwoodDp import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable @@ -42,10 +40,12 @@ import app.cash.redwood.treehouse.TreehouseView.ReadyForContentChangeListener import app.cash.redwood.treehouse.TreehouseView.WidgetSystem import app.cash.redwood.treehouse.bindWhenReady import app.cash.redwood.ui.Density +import app.cash.redwood.ui.LayoutDirection as RedwoodLayoutDirection import app.cash.redwood.ui.Margin import app.cash.redwood.ui.OnBackPressedDispatcher import app.cash.redwood.ui.Size import app.cash.redwood.ui.UiConfiguration +import app.cash.redwood.ui.dp as redwoodDp import app.cash.redwood.widget.SavedStateRegistry import app.cash.redwood.widget.compose.ComposeWidgetChildren import kotlinx.coroutines.flow.MutableStateFlow diff --git a/redwood-widget/src/androidMain/kotlin/app/cash/redwood/widget/RedwoodLayout.kt b/redwood-widget/src/androidMain/kotlin/app/cash/redwood/widget/RedwoodLayout.kt index bf23f13fdd..a40157dd06 100644 --- a/redwood-widget/src/androidMain/kotlin/app/cash/redwood/widget/RedwoodLayout.kt +++ b/redwood-widget/src/androidMain/kotlin/app/cash/redwood/widget/RedwoodLayout.kt @@ -15,21 +15,21 @@ */ package app.cash.redwood.widget -import androidx.activity.OnBackPressedCallback as AndroidOnBackPressedCallback -import androidx.activity.OnBackPressedDispatcher as AndroidOnBackPressedDispatcher -import androidx.core.view.children as viewGroupChildren -import app.cash.redwood.ui.OnBackPressedCallback as RedwoodOnBackPressedCallback -import app.cash.redwood.ui.OnBackPressedDispatcher as RedwoodOnBackPressedDispatcher import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import android.view.View import android.view.ViewGroup +import androidx.activity.OnBackPressedCallback as AndroidOnBackPressedCallback +import androidx.activity.OnBackPressedDispatcher as AndroidOnBackPressedDispatcher +import androidx.core.view.children as viewGroupChildren import androidx.savedstate.findViewTreeSavedStateRegistryOwner import app.cash.redwood.ui.Cancellable import app.cash.redwood.ui.Density import app.cash.redwood.ui.LayoutDirection import app.cash.redwood.ui.Margin +import app.cash.redwood.ui.OnBackPressedCallback as RedwoodOnBackPressedCallback +import app.cash.redwood.ui.OnBackPressedDispatcher as RedwoodOnBackPressedDispatcher import app.cash.redwood.ui.Size import app.cash.redwood.ui.UiConfiguration import kotlinx.coroutines.flow.MutableStateFlow @@ -87,7 +87,7 @@ public open class RedwoodLayout( init { setOnWindowInsetsChangeListener { insets -> mutableUiConfiguration.value = computeUiConfiguration( - viewInsets = insets.safeDrawing.toMargin(Density(resources)) + viewInsets = insets.safeDrawing.toMargin(Density(resources)), ) } }