Merge pull request #502 from kiwicom/renovate/org.jmailen.kotlinter-3.x

chore(deps): update plugin org.jmailen.kotlinter to v3.16.0
kiwicom · Aug 19, 2023 · 6c93bd5 · 6c93bd5
2 parents c6bdf86 + f40bee6
commit 6c93bd5
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 70 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
     id("com.google.firebase.appdistribution") version "4.0.0" apply false
     id("com.vanniktech.maven.publish.base") version "0.25.3" apply false
     id("io.gitlab.arturbosch.detekt") version "1.23.1" apply false
-    id("org.jmailen.kotlinter") version "3.15.0" apply false
+    id("org.jmailen.kotlinter") version "3.16.0" apply false
     id("org.jetbrains.dokka") version "1.8.20"
 }
 

diff --git a/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/PillButtonScreen.kt b/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/PillButtonScreen.kt
@@ -74,8 +74,18 @@ private fun PillButtonScreenInner(
             verticalArrangement = Arrangement.spacedBy(8.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            ButtonSecondary(onClick = { show = true; showIcon = false }) { Text("Show") }
-            ButtonSecondary(onClick = { show = true; showIcon = true }) { Text("Show with icon") }
+            ButtonSecondary(
+                onClick = {
+                    show = true
+                    showIcon = false
+                },
+            ) { Text("Show") }
+            ButtonSecondary(
+                onClick = {
+                    show = true
+                    showIcon = true
+                },
+            ) { Text("Show with icon") }
         }
     }
 }

diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/controls/Stepper.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/controls/Stepper.kt
@@ -1,5 +1,4 @@
 @file:Suppress("MatchingDeclarationName")
-// ktlint-disable filename
 
 package kiwi.orbit.compose.ui.controls
 
@@ -111,11 +110,17 @@ private fun StepperPrimitive(
         modifier = modifier.semantics(mergeDescendants = true) {
             if (isDecreaseValid) {
                 this[StepperSemanticsActions.DecreaseValue] =
-                    AccessibilityAction(null) { onValueChange.invoke(value - 1); true }
+                    AccessibilityAction(null) {
+                        onValueChange.invoke(value - 1)
+                        true
+                    }
             }
             if (isIncreaseValid) {
                 this[StepperSemanticsActions.IncreaseValue] =
-                    AccessibilityAction(null) { onValueChange.invoke(value + 1); true }
+                    AccessibilityAction(null) {
+                        onValueChange.invoke(value + 1)
+                        true
+                    }
             }
         },
         verticalAlignment = Alignment.CenterVertically,
@@ -128,31 +133,7 @@ private fun StepperPrimitive(
             Icon(Icons.Minus, contentDescription = removeContentDescription)
         }
 
-        AnimatedContent(
-            targetState = value,
-            transitionSpec = {
-                if (targetState > initialState) {
-                    slideInVertically { height -> height / 2 } + fadeIn() togetherWith
-                        slideOutVertically { height -> -height / 2 } + fadeOut()
-                } else {
-                    slideInVertically { height -> -height / 2 } + fadeIn() togetherWith
-                        slideOutVertically { height -> height / 2 } + fadeOut()
-                }.using(
-                    SizeTransform(clip = false),
-                )
-            },
-            label = "StepperValue",
-        ) { targetNumber ->
-            Text(
-                modifier = Modifier
-                    .padding(horizontal = 10.dp)
-                    .widthIn(min = 20.dp),
-                text = targetNumber.toString(),
-                style = OrbitTheme.typography.bodyLargeMedium,
-                emphasis = ContentEmphasis.Normal,
-                textAlign = TextAlign.Center,
-            )
-        }
+        StepperLabel(value)
 
         StepperButton(
             onClick = { onValueChange.invoke(value + 1) },
@@ -164,6 +145,37 @@ private fun StepperPrimitive(
     }
 }
 
+@Composable
+private fun StepperLabel(
+    value: Int,
+) {
+    AnimatedContent(
+        targetState = value,
+        transitionSpec = {
+            if (targetState > initialState) {
+                slideInVertically { height -> height / 2 } + fadeIn() togetherWith
+                    slideOutVertically { height -> -height / 2 } + fadeOut()
+            } else {
+                slideInVertically { height -> -height / 2 } + fadeIn() togetherWith
+                    slideOutVertically { height -> height / 2 } + fadeOut()
+            }.using(
+                SizeTransform(clip = false),
+            )
+        },
+        label = "StepperValue",
+    ) { targetNumber ->
+        Text(
+            modifier = Modifier
+                .padding(horizontal = 10.dp)
+                .widthIn(min = 20.dp),
+            text = targetNumber.toString(),
+            style = OrbitTheme.typography.bodyLargeMedium,
+            emphasis = ContentEmphasis.Normal,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
 @Composable
 private fun StepperButton(
     onClick: () -> Unit,

diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/foundation/ColorBundleGradient.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/foundation/ColorBundleGradient.kt
@@ -1,5 +1,3 @@
-// ktlint-disable filename
-
 package kiwi.orbit.compose.ui.foundation
 
 import androidx.compose.ui.geometry.Offset

diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/foundation/Colors.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/foundation/Colors.kt
@@ -33,7 +33,8 @@ public class SurfaceColors(
      *
      * - Orbit light-theme color: [ColorTokens.White].
      */
-    public var main: Color by mutableStateOf(main, structuralEqualityPolicy()); internal set
+    public var main: Color by mutableStateOf(main, structuralEqualityPolicy())
+        internal set
 
     /**
      * Subtle gray color, secondary color for backgrounds.
@@ -43,42 +44,48 @@ public class SurfaceColors(
      *
      * - Orbit light-theme color: [ColorTokens.CloudLight].
      */
-    public var subtle: Color by mutableStateOf(subtle, structuralEqualityPolicy()); internal set
+    public var subtle: Color by mutableStateOf(subtle, structuralEqualityPolicy())
+        internal set
 
     /**
      * Alt darker subtle gray color.
      *
      * - Orbit light-theme color: [ColorTokens.CloudLightHover].
      */
-    public var subtleAlt: Color by mutableStateOf(subtleAlt, structuralEqualityPolicy()); internal set
+    public var subtleAlt: Color by mutableStateOf(subtleAlt, structuralEqualityPolicy())
+        internal set
 
     /**
      * Normal gray color for UI control backgrounds.
      *
      * - Orbit light-theme color: [ColorTokens.CloudNormal].
      */
-    public var normal: Color by mutableStateOf(normal, structuralEqualityPolicy()); internal set
+    public var normal: Color by mutableStateOf(normal, structuralEqualityPolicy())
+        internal set
 
     /**
      * Alt darker normal gray color.
      *
      * - Orbit light-theme color: [ColorTokens.CloudNormalHover].
      */
-    public var normalAlt: Color by mutableStateOf(normalAlt, structuralEqualityPolicy()); internal set
+    public var normalAlt: Color by mutableStateOf(normalAlt, structuralEqualityPolicy())
+        internal set
 
     /**
      * Strong gray color.
      *
      * - Orbit light-theme color: [ColorTokens.CloudDark].
      */
-    public var strong: Color by mutableStateOf(strong, structuralEqualityPolicy()); internal set
+    public var strong: Color by mutableStateOf(strong, structuralEqualityPolicy())
+        internal set
 
     /**
      * Alt strong gray color.
      *
      * - Orbit light-theme color: [ColorTokens.CloudDarkHover].
      */
-    public var strongAlt: Color by mutableStateOf(strongAlt, structuralEqualityPolicy()); internal set
+    public var strongAlt: Color by mutableStateOf(strongAlt, structuralEqualityPolicy())
+        internal set
 
     /**
      * Disabled surface color.
@@ -87,7 +94,8 @@ public class SurfaceColors(
      *
      * - Orbit light-theme color: [ColorTokens.CloudNormal].
      */
-    public var disabled: Color by mutableStateOf(disabled, structuralEqualityPolicy()); internal set
+    public var disabled: Color by mutableStateOf(disabled, structuralEqualityPolicy())
+        internal set
 
     public fun copy(
         main: Color = this.main,
@@ -126,7 +134,8 @@ public class ContentColors(
      *
      * - Orbit light-theme color: [ColorTokens.InkDark].
      */
-    public var normal: Color by mutableStateOf(normal, structuralEqualityPolicy()); internal set
+    public var normal: Color by mutableStateOf(normal, structuralEqualityPolicy())
+        internal set
 
     /**
      * Less important text color.
@@ -135,7 +144,8 @@ public class ContentColors(
      *
      * - Orbit light-theme color: [ColorTokens.InkNormal].
      */
-    public var minor: Color by mutableStateOf(minor, structuralEqualityPolicy()); internal set
+    public var minor: Color by mutableStateOf(minor, structuralEqualityPolicy())
+        internal set
 
     /**
      *
@@ -145,7 +155,8 @@ public class ContentColors(
      *
      * - Orbit light-theme color: [ColorTokens.InkLight].
      */
-    public var subtle: Color by mutableStateOf(subtle, structuralEqualityPolicy()); internal set
+    public var subtle: Color by mutableStateOf(subtle, structuralEqualityPolicy())
+        internal set
 
     /**
      * Highlighting text color.
@@ -154,14 +165,16 @@ public class ContentColors(
      *
      * - Orbit light-theme color: [ColorTokens.ProductDark].
      */
-    public var highlight: Color by mutableStateOf(highlight, structuralEqualityPolicy()); internal set
+    public var highlight: Color by mutableStateOf(highlight, structuralEqualityPolicy())
+        internal set
 
     /**
      * Disabled text color.
      *
      * - Orbit light-theme color: [ColorTokens.CloudDarkHover].
      */
-    public var disabled: Color by mutableStateOf(disabled, structuralEqualityPolicy()); internal set
+    public var disabled: Color by mutableStateOf(disabled, structuralEqualityPolicy())
+        internal set
 
     public fun copy(
         normal: Color = this.normal,
@@ -200,54 +213,61 @@ public class FeatureColors(
      * - Related content color: [onNormal].
      * - Orbit light-theme color example: [ColorTokens.RedNormal].
      */
-    public var normal: Color by mutableStateOf(normal, structuralEqualityPolicy()); internal set
+    public var normal: Color by mutableStateOf(normal, structuralEqualityPolicy())
+        internal set
 
     /**
      * Alternative (darker) full color of particular feature color set.
      *
      * - Related content color: [onNormal].
      * - Orbit light-theme color example: [ColorTokens.RedNormalActive].
      */
-    public var normalAlt: Color by mutableStateOf(normalAlt, structuralEqualityPolicy()); internal set
+    public var normalAlt: Color by mutableStateOf(normalAlt, structuralEqualityPolicy())
+        internal set
 
     /**
      * Light color of particular feature color set.
      *
      * - Related content color: [onSubtle].
      * - Orbit light-theme color example: [ColorTokens.RedLight].
      */
-    public var subtle: Color by mutableStateOf(subtle, structuralEqualityPolicy()); internal set
+    public var subtle: Color by mutableStateOf(subtle, structuralEqualityPolicy())
+        internal set
 
     /**
      * Alternative (darker) light color of particular feature color set.
      *
      * - Related content color: [onSubtleAlt].
      * - Orbit light-theme color example: [ColorTokens.RedLightHover].
      */
-    public var subtleAlt: Color by mutableStateOf(subtleAlt, structuralEqualityPolicy()); internal set
+    public var subtleAlt: Color by mutableStateOf(subtleAlt, structuralEqualityPolicy())
+        internal set
 
     /**
      * Dark color of particular feature color set.
      *
      * - Related content color: [onNormal].
      * - Orbit light-theme color example: [ColorTokens.RedDark].
      */
-    public var strong: Color by mutableStateOf(strong, structuralEqualityPolicy()); internal set
+    public var strong: Color by mutableStateOf(strong, structuralEqualityPolicy())
+        internal set
 
     /**
      * Darker color of particular feature color set.
      *
      * - Related content color: [onNormal].
      * - Orbit light-theme color example: [ColorTokens.RedDarkHover].
      */
-    public var strongAlt: Color by mutableStateOf(strongAlt, structuralEqualityPolicy()); internal set
+    public var strongAlt: Color by mutableStateOf(strongAlt, structuralEqualityPolicy())
+        internal set
 
     /**
      * Color for content on [normal], [strong] shades.
      *
      * - Orbit light-theme color example: [ColorTokens.White].
      */
-    public var onNormal: Color by mutableStateOf(onNormal, structuralEqualityPolicy()); internal set
+    public var onNormal: Color by mutableStateOf(onNormal, structuralEqualityPolicy())
+        internal set
 
     public fun copy(
         normal: Color = this.normal,
@@ -283,17 +303,25 @@ public class BundleColors(
     onMedium: Color,
     onTop: Color,
 ) {
-    public var basic: Color by mutableStateOf(basic, structuralEqualityPolicy()); internal set
-    public var basicGradient: Brush by mutableStateOf(basicGradient, structuralEqualityPolicy()); internal set
-    public var medium: Color by mutableStateOf(medium, structuralEqualityPolicy()); internal set
+    public var basic: Color by mutableStateOf(basic, structuralEqualityPolicy())
+        internal set
+    public var basicGradient: Brush by mutableStateOf(basicGradient, structuralEqualityPolicy())
+        internal set
+    public var medium: Color by mutableStateOf(medium, structuralEqualityPolicy())
+        internal set
     public var mediumGradient: Brush
         by mutableStateOf(mediumGradient, structuralEqualityPolicy())
         internal set
-    public var top: Color by mutableStateOf(top, structuralEqualityPolicy()); internal set
-    public var topGradient: Brush by mutableStateOf(topGradient, structuralEqualityPolicy()); internal set
-    public var onBasic: Color by mutableStateOf(onBasic, structuralEqualityPolicy()); internal set
-    public var onMedium: Color by mutableStateOf(onMedium, structuralEqualityPolicy()); internal set
-    public var onTop: Color by mutableStateOf(onTop, structuralEqualityPolicy()); internal set
+    public var top: Color by mutableStateOf(top, structuralEqualityPolicy())
+        internal set
+    public var topGradient: Brush by mutableStateOf(topGradient, structuralEqualityPolicy())
+        internal set
+    public var onBasic: Color by mutableStateOf(onBasic, structuralEqualityPolicy())
+        internal set
+    public var onMedium: Color by mutableStateOf(onMedium, structuralEqualityPolicy())
+        internal set
+    public var onTop: Color by mutableStateOf(onTop, structuralEqualityPolicy())
+        internal set
 
     public fun copy(
         basic: Color = this.basic,
@@ -343,7 +371,8 @@ public class Colors(
     public val bundle: BundleColors,
     isLight: Boolean,
 ) {
-    public var isLight: Boolean by mutableStateOf(isLight, structuralEqualityPolicy()); internal set
+    public var isLight: Boolean by mutableStateOf(isLight, structuralEqualityPolicy())
+        internal set
 
     public fun copy(
         surface: SurfaceColors = this.surface,

diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/foundation/TextSelectionColors.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/foundation/TextSelectionColors.kt
@@ -1,5 +1,3 @@
-// ktlint-disable filename
-
 package kiwi.orbit.compose.ui.foundation
 
 import androidx.compose.foundation.text.selection.TextSelectionColors

diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/layout/AlignByLineHeightModifier.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/layout/AlignByLineHeightModifier.kt
@@ -1,5 +1,3 @@
-// ktlint-disable filename
-
 package kiwi.orbit.compose.ui.layout
 
 import androidx.compose.foundation.layout.height

diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/layout/ExpandModifier.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/layout/ExpandModifier.kt
@@ -1,5 +1,3 @@
-// ktlint-disable filename
-
 package kiwi.orbit.compose.ui.layout
 
 import androidx.compose.ui.Modifier

diff --git a/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/utils/PaddingValuesExtensions.kt b/ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/utils/PaddingValuesExtensions.kt
@@ -1,5 +1,3 @@
-// ktlint-disable filename
-
 package kiwi.orbit.compose.ui.utils
 
 import androidx.compose.foundation.layout.PaddingValues