Skip to content

Commit 75a71a8

Browse files
committed
add and enable detekt.
1 parent d77473e commit 75a71a8

31 files changed

+856
-38
lines changed

charts/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
alias(libs.plugins.android.library)
88
alias(libs.plugins.jetbrains.kotlin.android)
99
alias(libs.plugins.jetbrains.dokka)
10+
alias(libs.plugins.detekt.gradle.plugin)
1011
id("maven-publish")
1112
id("signing")
1213
}

charts/src/main/java/me/bytebeats/views/charts/Animations.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ import androidx.compose.animation.core.TweenSpec
99
* Quote: Peasant. Educated. Worker
1010
*/
1111

12-
fun simpleChartAnimation(): AnimationSpec<Float> = TweenSpec(durationMillis = 500)
12+
fun simpleChartAnimation(): AnimationSpec<Float> = TweenSpec(durationMillis = 500)

charts/src/main/java/me/bytebeats/views/charts/AxisLine.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ data class AxisLine(
2626
fun paint(density: Density) {
2727
mPaint.strokeWidth = thickness.value * density.density
2828
}
29-
}
29+
}

charts/src/main/java/me/bytebeats/views/charts/TypeAlias.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ package me.bytebeats.views.charts
77
*/
88

99
typealias LabelFormatter = (value: Float) -> String
10-
typealias AxisLabelFormatter = (value: Any?) -> String
10+
typealias AxisLabelFormatter = (value: Any?) -> String

charts/src/main/java/me/bytebeats/views/charts/bar/BarChartData.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.bytebeats.views.charts.bar
22

33
import androidx.compose.ui.graphics.Color
4+
import me.bytebeats.views.charts.util.FLOAT_100
45

56
/**
67
* Created by bytebeats on 2021/9/25 : 13:52 E-mail: [email protected]
@@ -14,7 +15,7 @@ data class BarChartData(
1415
) {
1516

1617
init {
17-
require(padBy in 0F..100F) {
18+
require(padBy in 0F..FLOAT_100) {
1819
"padBy must be between 0F and 100F, included"
1920
}
2021
require(maxBarValue >= bars.maxOf { it.value }) {
@@ -30,10 +31,10 @@ data class BarChartData(
3031
}
3132

3233
val maxY: Float
33-
get() = yMinMaxValues.second + (yMinMaxValues.second - yMinMaxValues.first) * padBy / 100F
34+
get() = yMinMaxValues.second + (yMinMaxValues.second - yMinMaxValues.first) * padBy / FLOAT_100
3435
val minY: Float
3536
get() = if (startAtZero) 0F
36-
else yMinMaxValues.first - (yMinMaxValues.second - yMinMaxValues.first) * padBy / 100F
37+
else yMinMaxValues.first - (yMinMaxValues.second - yMinMaxValues.first) * padBy / FLOAT_100
3738

3839
data class Bar(
3940
val value: Float,

charts/src/main/java/me/bytebeats/views/charts/bar/BarCharts.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import androidx.compose.ui.graphics.drawscope.DrawScope
66
import androidx.compose.ui.unit.dp
77
import me.bytebeats.views.charts.bar.render.label.ILabelDrawer
88
import me.bytebeats.views.charts.bar.render.xaxis.IXAxisDrawer
9+
import me.bytebeats.views.charts.util.FLOAT_10
10+
import me.bytebeats.views.charts.util.FLOAT_100
911

1012
/**
1113
* Created by bytebeats on 2021/9/25 : 13:57
@@ -22,7 +24,7 @@ internal fun axisAreas(
2224
with(drawScope) {
2325

2426
val yAxisTop = labelDrawer.requiredAboveBarHeight(drawScope)
25-
val yAxisRight = 50.dp.toPx().coerceAtMost(size.width * 10F / 100F)
27+
val yAxisRight = 50.dp.toPx().coerceAtMost(size.width * FLOAT_10 / FLOAT_100)
2628
val xAxisRight = totalSize.width
2729
val xAxisTop = totalSize.height - xAxisDrawer.requiredHeight(drawScope)
2830

charts/src/main/java/me/bytebeats/views/charts/bar/render/bar/IBarDrawer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ interface IBarDrawer {
1717
barArea: Rect,
1818
bar: BarChartData.Bar
1919
)
20-
}
20+
}

charts/src/main/java/me/bytebeats/views/charts/bar/render/label/ILabelDrawer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ interface ILabelDrawer {
1919
barArea: Rect,
2020
xAxisArea: Rect
2121
)
22-
}
22+
}

charts/src/main/java/me/bytebeats/views/charts/bar/render/label/SimpleLabelDrawer.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.ui.unit.TextUnit
99
import androidx.compose.ui.unit.sp
1010
import me.bytebeats.views.charts.AxisLabelFormatter
1111
import me.bytebeats.views.charts.toLegacyInt
12+
import me.bytebeats.views.charts.util.FLOAT_1_5
1213

1314
/**
1415
* Created by bytebeats on 2021/9/25 : 14:01
@@ -30,7 +31,7 @@ data class SimpleLabelDrawer(
3031
}
3132

3233
override fun requiredAboveBarHeight(drawScope: DrawScope): Float = when (drawLocation) {
33-
DrawLocation.Outside -> 3F / 2F * labelTextHeight(drawScope)
34+
DrawLocation.Outside -> FLOAT_1_5 * labelTextHeight(drawScope)
3435
else -> 0F
3536
}
3637

@@ -59,7 +60,7 @@ data class SimpleLabelDrawer(
5960
}
6061

6162
private fun labelTextHeight(drawScope: DrawScope): Float = with(drawScope) {
62-
mLabelTextArea ?: (1.5F * labelTextSize.toPx())
63+
mLabelTextArea ?: (FLOAT_1_5 * labelTextSize.toPx())
6364
}
6465

6566
private fun paint(drawScope: DrawScope): android.graphics.Paint = with(drawScope) {
@@ -71,4 +72,4 @@ data class SimpleLabelDrawer(
7172
Outside,
7273
XAxis;
7374
}
74-
}
75+
}

charts/src/main/java/me/bytebeats/views/charts/bar/render/xaxis/IXAxisDrawer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ interface IXAxisDrawer {
1616
canvas: Canvas,
1717
drawableArea: Rect
1818
)
19-
}
19+
}

0 commit comments

Comments
 (0)