Use the new insets API in EmojiSearch (#2464)

Co-authored-by: Jesse Wilson <[email protected]>
cashapp · Nov 21, 2024 · 6e172dd · 6e172dd
1 parent 42676b6
commit 6e172dd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/...ylayout-uiview/src/commonMain/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyList.kt b/...ylayout-uiview/src/commonMain/kotlin/app/cash/redwood/lazylayout/uiview/UIViewLazyList.kt
@@ -50,6 +50,7 @@ import platform.UIKit.UIControlEventValueChanged
 import platform.UIKit.UIEdgeInsetsMake
 import platform.UIKit.UIRefreshControl
 import platform.UIKit.UIScrollView
+import platform.UIKit.UIScrollViewContentInsetAdjustmentBehavior.UIScrollViewContentInsetAdjustmentNever
 import platform.UIKit.UITableView
 import platform.UIKit.UITableViewAutomaticDimension
 import platform.UIKit.UITableViewCell
@@ -275,6 +276,7 @@ internal class UIViewLazyList :
       rowHeight = UITableViewAutomaticDimension
       separatorStyle = UITableViewCellSeparatorStyleNone
       backgroundColor = UIColor.clearColor
+      contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever
 
       registerClass(
         cellClass = LazyListContainerCell(UITableViewCellStyle.UITableViewCellStyleDefault, REUSE_IDENTIFIER)

diff --git a/...iews/src/main/kotlin/com/example/redwood/emojisearch/android/views/EmojiSearchActivity.kt b/...iews/src/main/kotlin/com/example/redwood/emojisearch/android/views/EmojiSearchActivity.kt
@@ -21,7 +21,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.activity.ComponentActivity
-import androidx.core.view.WindowCompat
+import androidx.activity.enableEdgeToEdge
 import app.cash.redwood.compose.AndroidUiDispatcher.Companion.Main
 import app.cash.redwood.layout.view.ViewRedwoodLayoutWidgetFactory
 import app.cash.redwood.lazylayout.view.ViewRedwoodLazyLayoutWidgetFactory
@@ -75,8 +75,8 @@ class EmojiSearchActivity : ComponentActivity() {
 
   @SuppressLint("ResourceType")
   override fun onCreate(savedInstanceState: Bundle?) {
+    enableEdgeToEdge()
     super.onCreate(savedInstanceState)
-    WindowCompat.setDecorFitsSystemWindows(window, false)
 
     val context = this
     val treehouseApp = createTreehouseApp()

diff --git a/...-search/desktop-composeui/src/main/kotlin/com/example/redwood/emojisearch/desktop/main.kt b/...-search/desktop-composeui/src/main/kotlin/com/example/redwood/emojisearch/desktop/main.kt
@@ -62,7 +62,7 @@ fun main() {
             EmojiSearch(
               httpClient = httpClient,
               navigator = DesktopNavigator,
-              safeAreaInsets = Margin.Zero,
+              viewInsets = Margin.Zero,
             )
           }
         }

diff --git a/.../presenter/src/commonMain/kotlin/com/example/redwood/emojisearch/presenter/EmojiSearch.kt b/.../presenter/src/commonMain/kotlin/com/example/redwood/emojisearch/presenter/EmojiSearch.kt
@@ -35,6 +35,7 @@ import app.cash.redwood.layout.api.CrossAxisAlignment
 import app.cash.redwood.layout.api.MainAxisAlignment
 import app.cash.redwood.layout.compose.Column
 import app.cash.redwood.layout.compose.Row
+import app.cash.redwood.layout.compose.Spacer
 import app.cash.redwood.lazylayout.compose.ExperimentalRedwoodLazyLayoutApi
 import app.cash.redwood.lazylayout.compose.LazyColumn
 import app.cash.redwood.lazylayout.compose.items
@@ -71,7 +72,7 @@ fun EmojiSearch(
   httpClient: HttpClient,
   navigator: Navigator,
   modifier: Modifier = Modifier,
-  safeAreaInsets: Margin = LocalUiConfiguration.current.safeAreaInsets,
+  viewInsets: Margin = LocalUiConfiguration.current.safeAreaInsets,
 ) {
   val scope = rememberCoroutineScope()
   val allEmojis = remember { mutableStateListOf<EmojiImage>() }
@@ -123,7 +124,7 @@ fun EmojiSearch(
     width = Constraint.Fill,
     height = Constraint.Fill,
     horizontalAlignment = CrossAxisAlignment.Stretch,
-    margin = safeAreaInsets,
+    margin = Margin(start = viewInsets.start, end = viewInsets.end, top = viewInsets.top),
     modifier = modifier,
   ) {
     TextInput(
@@ -166,6 +167,9 @@ fun EmojiSearch(
           },
         )
       }
+      item {
+        Spacer(height = viewInsets.bottom)
+      }
     }
   }
 }

diff --git a/...ter/src/jsMain/kotlin/com/example/redwood/emojisearch/presenter/EmojiSearchTreehouseUi.kt b/...ter/src/jsMain/kotlin/com/example/redwood/emojisearch/presenter/EmojiSearchTreehouseUi.kt
@@ -16,6 +16,7 @@
 package com.example.redwood.emojisearch.presenter
 
 import androidx.compose.runtime.Composable
+import app.cash.redwood.compose.ConsumeInsets
 import app.cash.redwood.treehouse.TreehouseUi
 
 class EmojiSearchTreehouseUi(
@@ -24,6 +25,12 @@ class EmojiSearchTreehouseUi(
 ) : TreehouseUi {
   @Composable
   override fun Show() {
-    EmojiSearch(httpClient, navigator)
+    ConsumeInsets { insets ->
+      EmojiSearch(
+        httpClient = httpClient,
+        navigator = navigator,
+        viewInsets = insets,
+      )
+    }
   }
 }