fixes #16 fixes #8

1.0.2 release
yamin8000 · Jan 23, 2024 · aedbbe6 · aedbbe6
1 parent ebcca26
commit aedbbe6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/Gauge/build.gradle.kts b/Gauge/build.gradle.kts
@@ -20,7 +20,7 @@
  */
 
 private val artifact = "com.github.yamin8000.gauge"
-private val version = "1.0.1"
+private val version = "1.0.2"
 
 plugins {
     id("com.android.library")
@@ -74,9 +74,7 @@ android {
 dependencies {
     implementation(platform("androidx.compose:compose-bom:2023.10.01"))
     implementation("androidx.compose.material3:material3")
-//    implementation("androidx.compose.foundation:foundation")
     implementation("androidx.compose.ui:ui")
-//    implementation("androidx.compose.material3:material3-window-size-class")
     implementation("androidx.compose.ui:ui-tooling-preview")
     debugImplementation("androidx.compose.ui:ui-tooling")
 }

diff --git a/Gauge/src/main/java/com/github/yamin8000/gauge/main/Gauge.kt b/Gauge/src/main/java/com/github/yamin8000/gauge/main/Gauge.kt
@@ -21,8 +21,10 @@
 
 package com.github.yamin8000.gauge.main
 
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -103,7 +105,7 @@ fun Gauge(
     ticksColors: GaugeTicksColors = GaugeTicksColors(
         smallTicks = MaterialTheme.colorScheme.inversePrimary,
         bigTicks = MaterialTheme.colorScheme.primary,
-        bigTicksLabels = MaterialTheme.colorScheme.tertiary
+        bigTicksLabels = MaterialTheme.colorScheme.primary
     ),
     ticksColorProvider: (List<Pair<Int, Color>>) -> List<Pair<Int, Color>> = { it },
     arcColorsProvider: (GaugeArcColors, Float, ClosedFloatingPointRange<Float>) -> GaugeArcColors = { _, _, _ -> arcColors }
@@ -112,7 +114,7 @@ fun Gauge(
     require(numerics.sweepAngle in 1..360) { "Sweep angle: ${numerics.sweepAngle} must be from 1 to 360" }
 
     BoxWithConstraints(
-        modifier = modifier,
+        modifier = modifier.padding(8.dp),
         content = {
             val textMeasurer = rememberTextMeasurer()
             val size = if (totalSize > maxWidth) maxWidth
@@ -134,8 +136,15 @@ fun Gauge(
                     if (style.hasValueText) {
                         drawCompatibleText(
                             textMeasurer = textMeasurer,
-                            text = "${decimalFormat.format(value)}\n$valueUnit".trim(),
-                            topLeft = center.plus(Offset(0f, size.toPx() / 5)),
+                            text = decimalFormat.format(value).trim(),
+                            topLeft = center.plus(Offset(0f, size.toPx() / 12)),
+                            color = valueColor,
+                            totalSize = size
+                        )
+                        drawCompatibleText(
+                            textMeasurer = textMeasurer,
+                            text = valueUnit.trim(),
+                            topLeft = center.plus(Offset(0f, size.toPx() / 7)),
                             color = valueColor,
                             totalSize = size
                         )
@@ -262,7 +271,7 @@ private fun DrawScope.drawTicks(
         val isBigTick = isSmallTick && (value % numerics.bigTicksStep == 0)
         val isStartOrEnd =
             isBigTick && (degreeInt == numerics.startAngle || degreeInt == totalAngle)
-        val endRatio = if (isBigTick) size.toPx().div(6f) else size.toPx().div(7f)
+        val endRatio = if (isBigTick) size.toPx().div(5f) else size.toPx().div(6f)
         val width = if (isBigTick) size.div(500f).toPx() else size.div(700f).toPx()
         val tickColor = if (isBigTick) colors.bigTicks else ticksColors[value].second
 
@@ -288,7 +297,7 @@ private fun DrawScope.drawTicks(
             )
         }
         if (hasNumbers && isBigTick) {
-            val textSizeFactor = 30f
+            val textSizeFactor = 20f
             val textStyle = TextStyle(
                 color = colors.bigTicksLabels,
                 fontSize = size.toSp() / textSizeFactor
@@ -301,7 +310,7 @@ private fun DrawScope.drawTicks(
                 )
             )
             textOffset = textOffset.plus(
-                Offset(-1 * textSizeFactor * cos, -1 * textSizeFactor * sin)
+                Offset(-1f * textSizeFactor * cos, -1f * textSizeFactor * sin)
             )
             drawText(
                 textMeasurer = textMeasurer,
@@ -372,7 +381,7 @@ private fun DrawScope.drawCompatibleText(
     textMeasurer: TextMeasurer,
     topLeft: Offset
 ) {
-    val textSizeFactor = 30f
+    val textSizeFactor = 20f
     val textStyle = TextStyle(
         color = color,
         fontSize = totalSize.toSp() / textSizeFactor

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -75,8 +75,8 @@ android {
 
 dependencies {
     implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
     implementation(platform("androidx.compose:compose-bom:2023.10.01"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")

diff --git a/app/src/main/java/com/github/yamin8000/gauge/MainActivity.kt b/app/src/main/java/com/github/yamin8000/gauge/MainActivity.kt
@@ -27,6 +27,8 @@ import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Slider
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -54,7 +56,9 @@ class MainActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     content = {
                         Column(
-                            modifier = Modifier.padding(16.dp)
+                            modifier = Modifier
+                                .padding(16.dp)
+                                .verticalScroll(rememberScrollState())
                         ) {
                             val configuration = LocalConfiguration.current
                             val screenWidth = configuration.screenWidthDp.dp

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,8 +20,8 @@
  */
 
 plugins {
-    id("com.android.application") version "8.1.2" apply false
+    id("com.android.application") version "8.2.1" apply false
+    id("com.android.library") version "8.2.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.10" apply false
-    id("com.android.library") version "8.1.2" apply false
     id("com.vanniktech.maven.publish") version "0.25.3"
 }