Simplify selected when expressions

patrykandpatrick · Jul 30, 2023 · 722c9f3 · 722c9f3
1 parent 9500f06
commit 722c9f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
@@ -217,16 +217,9 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
     ): Float =
         when {
             itemPlacer.getShiftExtremeTicks(this).not() -> 0f
-            else -> {
-                val isFirstLine = entryX == fullXRange.start
-                val isLastLine = entryX == fullXRange.endInclusive
-
-                when {
-                    isFirstLine -> -tickThickness.half
-                    isLastLine -> tickThickness.half
-                    else -> 0f
-                }
-            }
+            entryX == fullXRange.start -> -tickThickness.half
+            entryX == fullXRange.endInclusive -> tickThickness.half
+            else -> 0f
         }
 
     override fun drawAboveChart(context: ChartDrawContext): Unit = Unit

diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
@@ -212,8 +212,8 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
         return when {
             onLeft && horizontalLabelPosition == Outside -> base - axisThickness - tickLength
             onLeft && horizontalLabelPosition == Inside -> base - axisThickness
-            onLeft.not() && horizontalLabelPosition == Outside -> base
-            onLeft.not() && horizontalLabelPosition == Inside -> base - tickLength
+            horizontalLabelPosition == Outside -> base
+            horizontalLabelPosition == Inside -> base - tickLength
             else -> error("Unexpected combination of axis position and label position")
         }
     }