From c06acb93510bfc63ab32c5ade5317eeb0a5405fe Mon Sep 17 00:00:00 2001
From: Kristen Halper <khalper@microsoft.com>
Date: Thu, 11 May 2023 10:06:09 -0700
Subject: [PATCH] Address PR comments

---
 .../accompanist/adaptive/FoldAwareColumn.kt   | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt b/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt
index cb882092d..b2c56b164 100644
--- a/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt
+++ b/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt
@@ -43,7 +43,6 @@ import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.findRootCoordinates
 import androidx.compose.ui.platform.InspectorInfo
 import androidx.compose.ui.platform.InspectorValueInfo
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
@@ -77,32 +76,19 @@ public fun FoldAwareColumn(
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
     content: @Composable FoldAwareColumnScope.() -> Unit,
 ) {
-    // Extract folding feature if horizontal and separating
-    val fold = displayFeatures.find {
-        it is FoldingFeature && it.orientation == FoldingFeature.Orientation.HORIZONTAL && it.isSeparating
-    } as FoldingFeature?
-
-    // Calculate fold bounds in pixels (including any added fold padding)
-    val foldBoundsPx = with(LocalDensity.current) {
-        val topPaddingPx = foldPadding.calculateTopPadding().roundToPx()
-        val bottomPaddingPx = foldPadding.calculateBottomPadding().roundToPx()
-
-        fold?.bounds?.let {
-            Rect(
-                left = it.left.toFloat(),
-                top = it.top.toFloat() - topPaddingPx,
-                right = it.right.toFloat(),
-                bottom = it.bottom.toFloat() + bottomPaddingPx
-            )
-        }
-    }
-
     Layout(
         modifier = modifier,
         measurePolicy = foldAwareColumnMeasurePolicy(
             verticalArrangement = Arrangement.Top,
             horizontalAlignment = horizontalAlignment,
-            foldBoundsPx = foldBoundsPx
+            fold = {
+                // Extract folding feature if horizontal and separating
+                displayFeatures.find {
+                    it is FoldingFeature && it.orientation == FoldingFeature.Orientation.HORIZONTAL &&
+                        it.isSeparating
+                } as FoldingFeature?
+            },
+            foldPadding = foldPadding,
         ),
         content = { FoldAwareColumnScopeInstance.content() }
     )
@@ -111,15 +97,15 @@ public fun FoldAwareColumn(
 /**
  * FoldAwareColumn version of [rowColumnMeasurePolicy] that uses [FoldAwareColumnMeasurementHelper.foldAwarePlaceHelper]
  * method instead of [RowColumnMeasurementHelper.placeHelper]
- *
- * TODO: change from internal to private once metalava issue is solved https://partnerissuetracker.corp.google.com/issues/271539608
  */
+// TODO: change from internal to private once metalava issue is solved https://issuetracker.google.com/issues/271539608
 @Composable
 internal fun foldAwareColumnMeasurePolicy(
     verticalArrangement: Arrangement.Vertical,
     horizontalAlignment: Alignment.Horizontal,
-    foldBoundsPx: Rect?
-) = remember(verticalArrangement, horizontalAlignment, foldBoundsPx) {
+    fold: () -> FoldingFeature?,
+    foldPadding: PaddingValues
+) = remember(verticalArrangement, horizontalAlignment, fold, foldPadding) {
 
     val orientation = LayoutOrientation.Vertical
     val arrangement: (Int, IntArray, LayoutDirection, Density, IntArray) -> Unit =
@@ -163,6 +149,21 @@ internal fun foldAwareColumnMeasurePolicy(
                 layoutHeight = measureResult.mainAxisSize
             }
 
+            // Calculate fold bounds in pixels (including any added fold padding)
+            val foldBoundsPx = with(density) {
+                val topPaddingPx = foldPadding.calculateTopPadding().roundToPx()
+                val bottomPaddingPx = foldPadding.calculateBottomPadding().roundToPx()
+
+                fold()?.bounds?.let {
+                    Rect(
+                        left = it.left.toFloat(),
+                        top = it.top.toFloat() - topPaddingPx,
+                        right = it.right.toFloat(),
+                        bottom = it.bottom.toFloat() + bottomPaddingPx
+                    )
+                }
+            }
+
             // We only know how much padding is added inside the placement scope, so just add fold height
             // and height of the largest child when laying out to cover the maximum possible height
             val heightPadding = foldBoundsPx?.let { bounds ->