simplify visibility of values in some classes

JetBrains · Dec 8, 2023 · 24334fd · 24334fd
1 parent 75acf2e
commit 24334fd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeContainer.uikit.kt b/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeContainer.uikit.kt
@@ -88,7 +88,7 @@ internal class ComposeContainer(
         InterfaceOrientation.Portrait
     )
     val systemThemeState: MutableState<SystemTheme> = mutableStateOf(SystemTheme.Unknown)
-    val focusStack: FocusStack<UIView> = FocusStackImpl()
+    private val focusStack: FocusStack<UIView> = FocusStackImpl()
     private val windowInfo = WindowInfoImpl().also {
         it.isWindowFocused = true
     }
@@ -248,7 +248,7 @@ internal class ComposeContainer(
     }
 
     @OptIn(ExperimentalComposeApi::class)
-    fun setContent(content: @Composable () -> Unit) {
+    private fun setContent(content: @Composable () -> Unit) {
         if (composeSceneMediator != null) {
             return // already attached
         }

diff --git a/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeSceneMediator.uikit.kt b/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeSceneMediator.uikit.kt
@@ -232,7 +232,7 @@ internal class ComposeSceneMediator(
     private fun ProvideComposeSceneMediatorCompositionLocals(content: @Composable () -> Unit) =
         CompositionLocalProvider(
             LocalUIKitInteropContext provides interopContext,
-            LocalKeyboardOverlapHeight provides keyboardVisibilityListener.keyboardOverlapHeightState.value,
+            LocalKeyboardOverlapHeight provides keyboardOverlapHeightState.value,
             LocalSafeArea provides safeAreaState.value,
             LocalLayoutMargins provides layoutMarginsState.value,
             content = content

diff --git a/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/DensityProvider.uikit.kt b/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/DensityProvider.uikit.kt
@@ -42,8 +42,8 @@ internal interface DensityProvider {
 }
 
 internal class DensityProviderImpl(
-    val uiViewControllerProvider: () -> UIViewController,
-    val viewProvider: () -> UIView,
+    private val uiViewControllerProvider: () -> UIViewController,
+    private val viewProvider: () -> UIView,
 ) : DensityProvider {
 
     val uiViewController get() = uiViewControllerProvider()

diff --git a/...ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/KeyboardVisibilityListener.uikit.kt b/...ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/KeyboardVisibilityListener.uikit.kt
@@ -49,7 +49,7 @@ internal interface KeyboardVisibilityListener {
 
 internal class KeyboardVisibilityListenerImpl(
     private val configuration: ComposeUIViewControllerConfiguration,
-    val keyboardOverlapHeightState: MutableState<Float>,
+    private val keyboardOverlapHeightState: MutableState<Float>,
     private val viewProvider: () -> UIView,
     private val densityProvider: DensityProvider,
     private val composeSceneMediatorProvider: () -> ComposeSceneMediator,

diff --git a/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/SkikoUIViewDelegate.uikit.kt b/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/SkikoUIViewDelegate.uikit.kt
@@ -51,9 +51,9 @@ internal interface SkikoUIViewDelegate {
 }
 
 internal class SkikoUIViewDelegateImpl(
-    val sceneProvider: () -> ComposeScene,
-    val interopContext: UIKitInteropContext,
-    val densityProvider: DensityProvider,
+    private val sceneProvider: () -> ComposeScene,
+    private val interopContext: UIKitInteropContext,
+    private val densityProvider: DensityProvider,
 ) : SkikoUIViewDelegate {
     val scene get() = sceneProvider()
     val density get() = densityProvider()