Merge pull request #58 from cheonjaeung/refactor-utils

Refactor utilities

Author: cheonjaeung

grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/BoxGridMeasurePolicy.kt

@@ -248,22 +248,6 @@ private class BoxGridMeasureHelper(
         }
     }
 
-    private fun <T> mutableListOfNulls(size: Int): MutableList<T?> {
-        return MutableList(size) { null }
-    }
-
-    private fun Placeable.size(): IntSize {
-        return IntSize(width = width, height = height)
-    }
-
-    private fun <T> Iterable<T>.sumOfIndexed(selector: (Int, T) -> Int): Int {
-        var sum = 0
-        for ((index, element) in this.withIndex()) {
-            sum += selector(index, element)
-        }
-        return sum
-    }
-
     class GridMeasureResult(
         val layoutSize: Size,
         val placeableMeasureInfos: List<PlaceableMeasureInfo?>

grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/CollectionUtils.kt

@@ -0,0 +1,44 @@
+package com.cheonjaeung.compose.grid
+
+import kotlin.math.max
+
+/**
+ * Returns a new [IntArray] with specified [size] filled with 0.
+ */
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun intArrayOfZeros(size: Int): IntArray {
+    return IntArray(size) { 0 }
+}
+
+/**
+ * Returns a new [MutableList] with specified [size] filled with `null`.
+ */
+@Suppress("NOTHING_TO_INLINE")
+internal inline fun <T> mutableListOfNulls(size: Int): MutableList<T?> {
+    return MutableList(size) { null }
+}
+
+/**
+ * Returns the largest element or 0 if there are no elements.
+ */
+internal fun IntArray.maxOrZero(): Int {
+    if (this.isEmpty()) {
+        return 0
+    }
+    var maxValue = this[0]
+    for (i in 1 until this.size) {
+        maxValue = max(maxValue, this[i])
+    }
+    return maxValue
+}
+
+/**
+ * Returns the sum of the all values produced by [selector] function applied to each element.
+ */
+internal inline fun <T> Iterable<T>.sumOfIndexed(selector: (Int, T) -> Int): Int {
+    var sum = 0
+    for ((index, element) in this.withIndex()) {
+        sum += selector(index, element)
+    }
+    return sum
+}

grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/HorizontalVerticalGridMeasurePolicy.kt

@@ -204,7 +204,7 @@ private class HorizontalVerticalGridMeasureHelper(
                 crossAxisPlacedSpace += crossAxisCellConstraints + crossAxisSpaceAfterLast
                 placeableMainAxisSizeMax = max(
                     placeableMainAxisSizeMax,
-                    placeable.mainAxisSize()
+                    placeable.mainAxisSize(orientation)
                 )
                 crossAxisLineLayoutSize = max(crossAxisLineLayoutSize, crossAxisPlacedSpace)
                 crossAxisIndex += span
@@ -255,15 +255,15 @@ private class HorizontalVerticalGridMeasureHelper(
         val crossAxisCount = measureResult.crossAxisCount
         val mainAxisLayoutSize = measureResult.mainAxisLayoutSize
         val crossAxisLayoutSize = measureResult.crossAxisLayoutSize
-        val mainAxisPositions = IntArray(mainAxisCount) { 0 }
-        val crossAxisPositions = IntArray(crossAxisCount) { 0 }
+        val mainAxisPositions = intArrayOfZeros(mainAxisCount)
+        val crossAxisPositions = intArrayOfZeros(crossAxisCount)
 
-        val mainAxisBiggestChildrenSizes = IntArray(mainAxisCount) { 0 }
+        val mainAxisBiggestChildrenSizes = intArrayOfZeros(mainAxisCount)
         for (m in 0 until mainAxisCount) {
             val currentLinePlaceables = placeableMeasureInfoTable[m]
             val currentLineChildrenSizes = IntArray(currentLinePlaceables.size) { index ->
                 val placeable = currentLinePlaceables[index].placeable
-                placeable.mainAxisSize()
+                placeable.mainAxisSize(orientation)
             }
             mainAxisBiggestChildrenSizes[m] = currentLineChildrenSizes.maxOrZero()
         }
@@ -356,38 +356,6 @@ private class HorizontalVerticalGridMeasureHelper(
         }
     }
 
-    /**
-     * Returns main axis size of this [Placeable] by current orientation.
-     */
-    private fun Placeable.mainAxisSize(): Int {
-        return if (orientation == LayoutOrientation.Horizontal) {
-            width
-        } else {
-            height
-        }
-    }
-
-    /**
-     * Returns the size of this [Placeable].
-     */
-    private fun Placeable.size(): IntSize {
-        return IntSize(width = width, height = height)
-    }
-
-    /**
-     * Returns the largest element or 0 if there are no elements.
-     */
-    private fun IntArray.maxOrZero(): Int {
-        if (this.isEmpty()) {
-            return 0
-        }
-        var maxValue = this[0]
-        for (i in 1 until this.size) {
-            maxValue = max(maxValue, this[i])
-        }
-        return maxValue
-    }
-
     /**
      * Result data of [HorizontalVerticalGridMeasureHelper.measure].
      *

grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/PlaceableUtils.kt

@@ -0,0 +1,22 @@
+package com.cheonjaeung.compose.grid
+
+import androidx.compose.ui.layout.Placeable
+import androidx.compose.ui.unit.IntSize
+
+/**
+ * Returns an [IntSize] containing the width and height size of the [Placeable].
+ */
+internal fun Placeable.size(): IntSize {
+    return IntSize(width, height)
+}
+
+/**
+ * Returns the size of the main axis of the [Placeable].
+ */
+internal fun Placeable.mainAxisSize(orientation: LayoutOrientation): Int {
+    return if (orientation == LayoutOrientation.Horizontal) {
+        width
+    } else {
+        height
+    }
+}