Merge pull request #123 from hi-manshu/fix/detekt

Fix: Detekt
hi-manshu · Feb 8, 2025 · 262f5ec · 262f5ec
2 parents 5a33b37 + 1e75c1b
commit 262f5ec
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 21 deletions.
diff --git a/charty/detekt.yml b/charty/detekt.yml
@@ -22,9 +22,13 @@ naming:
     functionPattern: '^[a-z][A-Za-z0-9]*$'
     ignoreAnnotated: [ "Composable" ]
 
+formatting:
+  Indentation:
+    active: false
+
 style:
   MaxLineLength:
-    active: false
+    active: true
     maxLineLength: 166
   MagicNumber:
     active: false

diff --git a/charty/src/commonMain/kotlin/com/himanshoe/charty/bar/BarChart.kt b/charty/src/commonMain/kotlin/com/himanshoe/charty/bar/BarChart.kt
@@ -233,7 +233,8 @@ internal fun getTextYOffsetAndCornerRadius(
     }
     val cornerRadius = if (barChartConfig.showCurvedBar) {
         CornerRadius(
-            barWidth / 2, barWidth / 2
+            x = barWidth / 2,
+            y = barWidth / 2
         )
     } else {
         CornerRadius.Zero
@@ -422,7 +423,9 @@ internal fun BarChartCanvasScaffold(
         val barWidth = (canvasWidth - gap * (data().count() - 1)) / data().count()
 
         content(
-            canvasHeight, gap, barWidth
+            canvasHeight,
+            gap,
+            barWidth
         )
     }
 }

diff --git a/charty/src/commonMain/kotlin/com/himanshoe/charty/bar/ComparisonBarChart.kt b/charty/src/commonMain/kotlin/com/himanshoe/charty/bar/ComparisonBarChart.kt
@@ -103,7 +103,8 @@ private fun ComparisonBarContent(
         val barWidth = groupWidth / (maxBarsCount * 2)
         val cornerRadius = if (comparisonBarChartConfig.showCurvedBar) {
             CornerRadius(
-                barWidth / 2, barWidth / 2
+                x = barWidth / 2,
+                y = barWidth / 2
             )
         } else {
             CornerRadius.Zero
@@ -122,9 +123,9 @@ private fun ComparisonBarContent(
             group.bars.fastForEachIndexed { barIndex, barValue ->
                 val barHeight = (barValue / maxValue) * canvasHeight
 
-                val barX =
-                    groupStartX + (groupWidth - (group.bars.size * (barWidth + barWidth / 4))) / 2 +
-                            barIndex * (barWidth + barWidth / 4)
+                val barX = groupStartX +
+                        (groupWidth - (group.bars.size * (barWidth + barWidth / 4))) / 2 +
+                        barIndex * (barWidth + barWidth / 4)
 
                 val brush = Brush.linearGradient(
                     colors = group.colors[barIndex].value,

diff --git a/charty/src/commonMain/kotlin/com/himanshoe/charty/bar/LineBarChart.kt b/charty/src/commonMain/kotlin/com/himanshoe/charty/bar/LineBarChart.kt
@@ -123,7 +123,7 @@ private fun LineBarChartContent(
                 canvasHeight = canvasHeight,
                 maxHeight = maxHeight
             )
-            val (individualBarTopLeft, individualBarRectSize) = getBarTopLeftAndRectSize(
+            val (singleBarTopLeft, singleBarRectSize) = getBarTopLeftAndRectSize(
                 index = index,
                 barWidth = barWidth,
                 barData = barData,
@@ -143,14 +143,14 @@ private fun LineBarChartContent(
             )
             val (textOffsetY, cornerRadius) = getTextYOffsetAndCornerRadius(
                 barData = barData,
-                individualBarTopLeft = individualBarTopLeft,
+                individualBarTopLeft = singleBarTopLeft,
                 textLayoutResult = textLayoutResult,
-                individualBarRectSize = individualBarRectSize,
+                individualBarRectSize = singleBarRectSize,
                 barChartConfig = barChartConfig,
                 barWidth = barWidth
             )
 
-            if (isClickInsideBar(clickedOffset, individualBarTopLeft, individualBarRectSize)) {
+            if (isClickInsideBar(clickedOffset, singleBarTopLeft, singleBarRectSize)) {
                 clickedBarIndex = index
                 onBarClick(index, barData)
             }
@@ -167,22 +167,25 @@ private fun LineBarChartContent(
                 )
             }
             getDrawingPath(
-                barTopLeft = individualBarTopLeft,
-                barRectSize = individualBarRectSize,
+                barTopLeft = singleBarTopLeft,
+                barRectSize = singleBarRectSize,
                 topLeftCornerRadius = if (barData.yValue >= 0) cornerRadius else CornerRadius.Zero,
                 topRightCornerRadius = if (barData.yValue >= 0) cornerRadius else CornerRadius.Zero,
                 bottomLeftCornerRadius = if (barData.yValue < 0) cornerRadius else CornerRadius.Zero,
                 bottomRightCornerRadius = if (barData.yValue < 0) cornerRadius else CornerRadius.Zero
             ).let {
+                val textOffset = Offset(
+                    x = singleBarTopLeft.x + singleBarRectSize.width.div(2) - textLayoutResult.size.width.div(
+                        2
+                    ),
+                    y = textOffsetY,
+                )
                 drawPath(path = it, brush = Brush.linearGradient(color))
                 if (labelConfig.showXLabel) {
                     drawText(
                         textLayoutResult = textLayoutResult,
                         brush = Brush.linearGradient(labelConfig.textColor.value),
-                        topLeft = Offset(
-                            x = individualBarTopLeft.x + individualBarRectSize.width / 2 - textLayoutResult.size.width / 2,
-                            y = textOffsetY,
-                        ),
+                        topLeft = textOffset,
                     )
                 }
             }

diff --git a/charty/src/commonMain/kotlin/com/himanshoe/charty/pie/PieChart.kt b/charty/src/commonMain/kotlin/com/himanshoe/charty/pie/PieChart.kt
@@ -76,8 +76,8 @@ private fun PieChartContent(
                     var currentStartAngle = 0f
                     val clickedAngle = (
                             atan2(
-                                offset.y - size.height / 2,
-                                offset.x - size.width / 2
+                                y = offset.y - size.height / 2,
+                                x = offset.x - size.width / 2
                             ) * STRAIGHT_ANGLE / PI + COMPLETE_CIRCLE_DEGREE
                             ) % COMPLETE_CIRCLE_DEGREE
                     angles.fastForEachIndexed { index, sweepAngle ->
@@ -138,4 +138,4 @@ private fun PieChartContent(
             startAngle += sweepAngle
         }
     }
-}
+}
diff --git a/charty/src/commonMain/kotlin/com/himanshoe/charty/point/PointChart.kt b/charty/src/commonMain/kotlin/com/himanshoe/charty/point/PointChart.kt
@@ -204,7 +204,6 @@ private fun DrawScope.drawPoints(
         val animatedRadius =
             if (index == clickedIndex) circleRadius.value * 1.5f else circleRadius.value
 
-
         val circleCenter = Offset(x, y)
 
         drawCircle(

diff --git a/...eproj/project.xcworkspace/xcuserdata/himanshoe.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/himanshoe.xcuserdatad/UserInterfaceState.xcuserstate