From 221c5182d874bda63818845dc1093267b1fc34ea Mon Sep 17 00:00:00 2001 From: higan Date: Sat, 18 May 2024 15:40:29 +0800 Subject: [PATCH] Make ktlint happy --- foundation/api/foundation.api | 133 ++++++++++-------- .../draggable/LazyLayoutDraggableState.kt | 2 +- .../foundation/lazy/table/LazyTableContent.kt | 1 - .../lazy/table/LazyTableDimensionScope.kt | 2 +- .../lazy/table/LazyTableIntervalContent.kt | 11 +- .../lazy/table/LazyTableItemProvider.kt | 1 - .../lazy/table/draggable/Draggable.kt | 4 +- .../standalone/view/component/Tables.kt | 33 +++-- 8 files changed, 98 insertions(+), 89 deletions(-) diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api index fe3799583..94fa72b94 100644 --- a/foundation/api/foundation.api +++ b/foundation/api/foundation.api @@ -372,12 +372,12 @@ public abstract class org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDr public final fun getDraggingOffset-F1C5BW0 ()J public abstract fun getIndex (Ljava/lang/Object;)I public final fun getInitialOffset-F1C5BW0 ()J - public abstract fun getItemAt-k-4lQ0M (J)Ljava/lang/Object; public abstract fun getItemWithKey (Ljava/lang/Object;)Ljava/lang/Object; public abstract fun getKey (Ljava/lang/Object;)Ljava/lang/Object; public abstract fun getOffset-tuRUvjQ (Ljava/lang/Object;)J + public abstract fun getReplacingItem (Ljava/lang/Object;)Ljava/lang/Object; public abstract fun getSize-7Ah8Wj8 (Ljava/lang/Object;)J - public abstract fun moveItem (II)V + public abstract fun moveItem (Ljava/lang/Object;Ljava/lang/Object;)V public final fun onDrag-k-4lQ0M (J)V public final fun onDragInterrupted ()V public final fun onDragStart-Uv8p0NA (Ljava/lang/Object;J)V @@ -388,22 +388,6 @@ public abstract class org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDr public final fun setInitialOffset-k-4lQ0M (J)V } -public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize { - public static final field Companion Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize$Companion; - public abstract fun columnConstraints-xF2OJ5Q (Landroidx/compose/ui/unit/Density;IIII)J - public abstract fun rowConstraints-xF2OJ5Q (Landroidx/compose/ui/unit/Density;IIII)J -} - -public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize$Companion { -} - -public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableCellSizeKt { - public static final fun fixed-73KfpEQ (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize$Companion;FFLandroidx/compose/runtime/Composer;I)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize; - public static final fun fixedHeight-hFKHopI (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize$Companion;FFFLandroidx/compose/runtime/Composer;II)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize; - public static final fun responsive-qDBjuR0 (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize$Companion;FFFF)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize; - public static synthetic fun responsive-qDBjuR0$default (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize$Companion;FFFFILjava/lang/Object;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize; -} - public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableCellState { public abstract fun getColumn ()I public abstract fun getRow ()I @@ -415,23 +399,13 @@ public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTa public abstract fun type (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; } -public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableColumnDraggingState : org/jetbrains/jewel/foundation/lazy/table/LazyTableDraggableState { - public static final field $stable I - public fun (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;)V - public synthetic fun getIndex (Ljava/lang/Object;)I - public fun getIndex (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)I - public synthetic fun getItemWithKey (Ljava/lang/Object;)Ljava/lang/Object; - public fun getItemWithKey (Ljava/lang/Object;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; - public synthetic fun getKey (Ljava/lang/Object;)Ljava/lang/Object; - public fun getKey (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)Ljava/lang/Object; -} - public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableColumnScope { public abstract fun row (ILkotlin/jvm/functions/Function3;)V } public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableContent { public abstract fun Item (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemScope;ILandroidx/compose/runtime/Composer;I)V + public abstract fun getColumnConstraints-SzdZ-w8 (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableLayoutScope;I)Landroidx/compose/ui/unit/Constraints; public abstract fun getColumnCount ()I public abstract fun getContentType (I)Ljava/lang/Object; public abstract fun getContentType--gyyYBs (J)Ljava/lang/Object; @@ -439,26 +413,23 @@ public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTa public abstract fun getKey (I)Lkotlin/Pair; public abstract fun getKey--gyyYBs (J)Lkotlin/Pair; public abstract fun getPosition-Bjo55l4 (I)J + public abstract fun getRowConstraints-SzdZ-w8 (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableLayoutScope;I)Landroidx/compose/ui/unit/Constraints; public abstract fun getRowCount ()I } -public abstract class org/jetbrains/jewel/foundation/lazy/table/LazyTableDraggableState : org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState { +public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionDefinition { public static final field $stable I - public fun (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;)V - public synthetic fun getItemAt-k-4lQ0M (J)Ljava/lang/Object; - public fun getItemAt-k-4lQ0M (J)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; - public synthetic fun getOffset-tuRUvjQ (Ljava/lang/Object;)J - public fun getOffset-tuRUvjQ (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)J - public final fun getOnMove ()Lkotlin/jvm/functions/Function2; - public synthetic fun getSize-7Ah8Wj8 (Ljava/lang/Object;)J - public fun getSize-7Ah8Wj8 (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)J - public final fun getTableState ()Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState; - public fun moveItem (II)V + public synthetic fun (Ljava/lang/Object;JLkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun equals (Ljava/lang/Object;)Z + public final fun getConstraints-msEJaDk ()J + public final fun getKey ()Ljava/lang/Object; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; } -public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableDraggableStateKt { - public static final fun rememberLazyTableColumnDraggingState (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableColumnDraggingState; - public static final fun rememberLazyTableRowDraggingState (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableRowDraggingState; +public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionScope { + public abstract fun getNoConstraints-msEJaDk ()J + public abstract fun with-0kLqBqw (Ljava/lang/Object;J)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionDefinition; } public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo { @@ -484,7 +455,7 @@ public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableItemScope$ } public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableKt { - public static final fun LazyTable (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCellSize;Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;IILandroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/gestures/FlingBehavior;ZILandroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V + public static final fun LazyTable (Landroidx/compose/ui/Modifier;Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;IILandroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/gestures/FlingBehavior;ZILandroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;III)V } public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableLayoutInfo { @@ -515,15 +486,12 @@ public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableLayoutInfo public static fun getViewportSize-YbymL2g (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableLayoutInfo;)J } -public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableRowDraggingState : org/jetbrains/jewel/foundation/lazy/table/LazyTableDraggableState { - public static final field $stable I - public fun (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;)V - public synthetic fun getIndex (Ljava/lang/Object;)I - public fun getIndex (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)I - public synthetic fun getItemWithKey (Ljava/lang/Object;)Ljava/lang/Object; - public fun getItemWithKey (Ljava/lang/Object;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; - public synthetic fun getKey (Ljava/lang/Object;)Ljava/lang/Object; - public fun getKey (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)Ljava/lang/Object; +public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableLayoutScope : androidx/compose/ui/unit/Density { + public abstract fun getAvailableSize-YbymL2g ()J + public abstract fun getColumns ()I + public abstract fun getHorizontalSpacing ()I + public abstract fun getRows ()I + public abstract fun getVerticalSpacing ()I } public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableRowScope { @@ -532,17 +500,18 @@ public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTa public abstract interface class org/jetbrains/jewel/foundation/lazy/table/LazyTableScope { public abstract fun cells (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function5;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCells; - public abstract fun columnDefinitions (ILkotlin/jvm/functions/Function1;)V - public abstract fun rowDefinitions (ILkotlin/jvm/functions/Function1;)V + public abstract fun columnDefinition (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V + public abstract fun columnDefinitions (ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V + public abstract fun rowDefinition (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V + public abstract fun rowDefinitions (ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V } public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableScope$DefaultImpls { public static synthetic fun cells$default (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableScope;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function5;ILjava/lang/Object;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableCells; -} - -public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableScopeKt { - public static final fun columnDefinition (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableScope;Ljava/lang/Object;)V - public static final fun rowDefinition (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableScope;Ljava/lang/Object;)V + public static synthetic fun columnDefinition$default (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableScope;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun columnDefinitions$default (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V + public static synthetic fun rowDefinition$default (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableScope;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun rowDefinitions$default (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V } public final class org/jetbrains/jewel/foundation/lazy/table/LazyTableScrollbarAdapterKt { @@ -596,6 +565,50 @@ public abstract interface class org/jetbrains/jewel/foundation/lazy/table/TableS public abstract fun scrollBy-E7KxVPU (J)J } +public final class org/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableColumnDraggingState : org/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableDraggableState { + public static final field $stable I + public fun (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;)V + public synthetic fun getIndex (Ljava/lang/Object;)I + public fun getIndex (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)I + public synthetic fun getItemWithKey (Ljava/lang/Object;)Ljava/lang/Object; + public fun getItemWithKey (Ljava/lang/Object;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; + public synthetic fun getKey (Ljava/lang/Object;)Ljava/lang/Object; + public fun getKey (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)Ljava/lang/Object; + public synthetic fun getReplacingItem (Ljava/lang/Object;)Ljava/lang/Object; + public fun getReplacingItem (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; +} + +public abstract class org/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableDraggableState : org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState { + public static final field $stable I + public fun (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;)V + protected final fun getItemAt-k-4lQ0M (J)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; + public synthetic fun getOffset-tuRUvjQ (Ljava/lang/Object;)J + public fun getOffset-tuRUvjQ (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)J + public final fun getOnMove ()Lkotlin/jvm/functions/Function2; + public synthetic fun getSize-7Ah8Wj8 (Ljava/lang/Object;)J + public fun getSize-7Ah8Wj8 (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)J + public final fun getTableState ()Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState; + public fun moveItem (Ljava/lang/Object;Ljava/lang/Object;)V +} + +public final class org/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableDraggableStateKt { + public static final fun rememberLazyTableColumnDraggingState (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)Lorg/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableColumnDraggingState; + public static final fun rememberLazyTableRowDraggingState (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)Lorg/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableRowDraggingState; +} + +public final class org/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableRowDraggingState : org/jetbrains/jewel/foundation/lazy/table/draggable/LazyTableDraggableState { + public static final field $stable I + public fun (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableState;Lkotlin/jvm/functions/Function2;)V + public synthetic fun getIndex (Ljava/lang/Object;)I + public fun getIndex (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)I + public synthetic fun getItemWithKey (Ljava/lang/Object;)Ljava/lang/Object; + public fun getItemWithKey (Ljava/lang/Object;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; + public synthetic fun getKey (Ljava/lang/Object;)Ljava/lang/Object; + public fun getKey (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)Ljava/lang/Object; + public synthetic fun getReplacingItem (Ljava/lang/Object;)Ljava/lang/Object; + public fun getReplacingItem (Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo;)Lorg/jetbrains/jewel/foundation/lazy/table/LazyTableItemInfo; +} + public final class org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTreeKt { public static final fun BasicLazyTree-orM9XXQ (Lorg/jetbrains/jewel/foundation/lazy/tree/Tree;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;Lkotlin/jvm/functions/Function1;JJJFLandroidx/compose/foundation/shape/CornerSize;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/foundation/layout/PaddingValues;FFLorg/jetbrains/jewel/foundation/lazy/tree/TreeState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;JLorg/jetbrains/jewel/foundation/lazy/tree/KeyActions;Lorg/jetbrains/jewel/foundation/lazy/tree/PointerEventActions;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;IIII)V } diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState.kt index 908278d52..ea5d7456d 100644 --- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState.kt +++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState.kt @@ -40,7 +40,7 @@ public abstract class LazyLayoutDraggableState { val hoverItem = getReplacingItem(draggingItem) if (hoverItem != null && draggingItem.key != hoverItem.key) { - val targetOffset = if(draggingItem.index < hoverItem.index) { + val targetOffset = if (draggingItem.index < hoverItem.index) { val maxOffset = hoverItem.offset + Offset(hoverItem.size.width, hoverItem.size.height) maxOffset - Offset(draggingItem.size.width, draggingItem.size.height) } else { diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableContent.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableContent.kt index 120062115..be347feb8 100644 --- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableContent.kt +++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableContent.kt @@ -2,7 +2,6 @@ package org.jetbrains.jewel.foundation.lazy.table import androidx.compose.runtime.Composable import androidx.compose.ui.unit.Constraints -import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.IntOffset public interface LazyTableContent { diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionScope.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionScope.kt index 402892e52..b3c6fc440 100644 --- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionScope.kt +++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionScope.kt @@ -21,4 +21,4 @@ internal object LazyTableDimensionScopeImpl : LazyTableDimensionScope { override val noConstraints: Constraints = Constraints() override fun Any.with(constraints: Constraints): LazyTableDimensionDefinition = LazyTableDimensionDefinition(this, constraints) -} \ No newline at end of file +} diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableIntervalContent.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableIntervalContent.kt index 63d12b90f..c38cf7bdc 100644 --- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableIntervalContent.kt +++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableIntervalContent.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.lazy.layout.MutableIntervalList import androidx.compose.foundation.lazy.layout.getDefaultLazyLayoutKey import androidx.compose.runtime.Composable import androidx.compose.ui.unit.Constraints -import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.IntOffset internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableCells) : LazyTableScope, LazyTableContent { @@ -23,7 +22,8 @@ internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableC get() = rowIntervals.size override fun columnDefinitions( - count: Int, key: ((index: Int) -> Any)?, + count: Int, + key: ((index: Int) -> Any)?, constraints: (LazyTableLayoutScope.(index: Int) -> Constraints)?, ) { columnIntervals.addInterval(count, LazyTableDimensionInterval(key, constraints)) @@ -35,12 +35,13 @@ internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableC LazyTableDimensionInterval( key = if (key != null) { _: Int -> key } else null, constraints = if (constraints != null) { _: Int -> constraints() } else null, - ) + ), ) } override fun rowDefinitions( - count: Int, key: ((index: Int) -> Any)?, + count: Int, + key: ((index: Int) -> Any)?, constraints: (LazyTableLayoutScope.(index: Int) -> Constraints)?, ) { rowIntervals.addInterval(count, LazyTableDimensionInterval(key, constraints)) @@ -52,7 +53,7 @@ internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableC LazyTableDimensionInterval( key = if (key != null) { _: Int -> key } else null, constraints = if (constraints != null) { _: Int -> constraints() } else null, - ) + ), ) } diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableItemProvider.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableItemProvider.kt index ce65a9167..57e6f510f 100644 --- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableItemProvider.kt +++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableItemProvider.kt @@ -9,7 +9,6 @@ import androidx.compose.runtime.referentialEqualityPolicy import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.unit.Constraints -import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.IntOffset internal interface LazyTableItemProvider : LazyLayoutItemProvider { diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/draggable/Draggable.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/draggable/Draggable.kt index aac584378..976728a64 100644 --- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/draggable/Draggable.kt +++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/draggable/Draggable.kt @@ -1,5 +1,3 @@ package org.jetbrains.jewel.foundation.lazy.table.draggable -import androidx.compose.foundation.gestures.Orientation -import androidx.compose.ui.Modifier -import org.jetbrains.jewel.foundation.lazy.draggable.LazyLayoutDraggableState + diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Tables.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Tables.kt index 106b8bc22..55e679cee 100644 --- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Tables.kt +++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Tables.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -59,67 +58,67 @@ data class Order( @ColumnInfo( name = "ID", minWidth = 50, - order = 0 + order = 0, ) val id: Int, @ColumnInfo( name = "Transaction ID", minWidth = 120, - order = 1 + order = 1, ) val transactionId: String, @ColumnInfo( name = "User ID", minWidth = 120, - order = 2 + order = 2, ) val uid: String, @ColumnInfo( name = "User Name", minWidth = 120, - order = 3 + order = 3, ) val userName: String, @ColumnInfo( name = "Product ID", minWidth = 80, - order = 4 + order = 4, ) val productId: Int, @ColumnInfo( name = "Product Name", minWidth = 300, - order = 5 + order = 5, ) val productName: String, @ColumnInfo( name = "Price", minWidth = 80, - order = 6 + order = 6, ) val price: String, @ColumnInfo( name = "Shipping Address", minWidth = 400, - order = 8 + order = 8, ) val shippingAddress: String, @ColumnInfo( name = "Postal Code", minWidth = 120, - order = 7 + order = 7, ) val postalCode: String, @ColumnInfo( name = "Create Time", minWidth = 50, - order = 9 + order = 9, ) val createTime: Int, @ColumnInfo( name = "Update Time", minWidth = 50, - order = 10 + order = 10, ) val updateTime: Int, ) { @@ -139,7 +138,7 @@ data class Order( shippingAddress = faker.address.fullAddress(), postalCode = faker.code.asin(), createTime = 0, - updateTime = 0 + updateTime = 0, ) } } @@ -285,7 +284,7 @@ fun Tables() { val info = columns[it].findAnnotations().firstOrNull() Constraints( minWidth = info?.minWidth?.takeIf { it >= 0 }?.dp?.roundToPx() ?: 0, - maxWidth = info?.maxWidth?.takeIf { it >= 0 }?.dp?.roundToPx() ?: Constraints.Infinity + maxWidth = info?.maxWidth?.takeIf { it >= 0 }?.dp?.roundToPx() ?: Constraints.Infinity, ) } @@ -318,7 +317,7 @@ fun Tables() { } LazyTableHeader( modifier = draggable, - contentAlignment = Alignment.CenterStart + contentAlignment = Alignment.CenterStart, ) { val info = column.findAnnotations().firstOrNull() Text(info?.name ?: column.name, Modifier.padding(horizontal = 4.dp), maxLines = 1) @@ -346,13 +345,13 @@ fun Tables() { LazyTableCell( modifier = draggable, - contentAlignment = Alignment.CenterEnd + contentAlignment = Alignment.CenterEnd, ) { Text( column.getter.call(data[rowKey as Int]).toString(), Modifier.padding(horizontal = 4.dp), overflow = TextOverflow.Ellipsis, - maxLines = 1 + maxLines = 1, ) } }