Merge pull request #58 from yml-org/bug/CM-963

[bug/CM-963]: Removed yScale ciel function.

Author: dkk009

YChartsLib/src/main/java/co/yml/charts/ui/linechart/LineChartExtensions.kt

@@ -2,7 +2,6 @@ package co.yml.charts.ui.linechart
 
 import androidx.compose.ui.geometry.Offset
 import co.yml.charts.common.model.Point
-import kotlin.math.ceil
 
 /**
  * returns total offset for given no of steps and offset .
@@ -25,9 +24,8 @@ fun getYAxisScale(
     val yMin = points.takeIf { it.isNotEmpty() }?.minOf { it.y } ?: 0f
     val yMax = points.takeIf { it.isNotEmpty() }?.maxOf { it.y } ?: 0f
     val totalSteps = (yMax - yMin)
-    val temp =
+    val scale =
         totalSteps / if (steps > 1) (steps - 1) else 1 // First step starts from 0 by default
-    val scale = ceil(temp)
     return Triple(yMin, yMax, scale)
 }
 

app/src/main/java/co/yml/ycharts/app/presentation/LineChartActivity.kt

@@ -4,7 +4,11 @@ import android.graphics.Typeface
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
@@ -15,10 +19,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import co.yml.ycharts.app.R
-import co.yml.ycharts.app.ui.compositions.AppBarWithBackButton
-import co.yml.ycharts.app.ui.theme.YChartsTheme
 import co.yml.charts.axis.AxisData
+import co.yml.charts.common.extensions.formatToSinglePrecision
+import co.yml.charts.common.model.Point
+import co.yml.charts.common.utils.DataUtils
 import co.yml.charts.ui.linechart.LineChart
 import co.yml.charts.ui.linechart.model.GridLines
 import co.yml.charts.ui.linechart.model.IntersectionPoint
@@ -30,9 +34,9 @@ import co.yml.charts.ui.linechart.model.LineType
 import co.yml.charts.ui.linechart.model.SelectionHighlightPoint
 import co.yml.charts.ui.linechart.model.SelectionHighlightPopUp
 import co.yml.charts.ui.linechart.model.ShadowUnderLine
-import co.yml.charts.common.extensions.formatToSinglePrecision
-import co.yml.charts.common.model.Point
-import co.yml.charts.common.utils.DataUtils
+import co.yml.ycharts.app.R
+import co.yml.ycharts.app.ui.compositions.AppBarWithBackButton
+import co.yml.ycharts.app.ui.theme.YChartsTheme
 
 class LineChartActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,8 @@ private fun LineGraph1(pointsData: List<Point>) {
         .labelData { i ->
             // Add yMin to get the negative axis values to the scale
             val yMin = pointsData.minOf { it.y }
-            val yScale = 50 / steps
+            val yMax = pointsData.maxOf { it.y }
+            val yScale = (yMax - yMin) / steps
             ((i * yScale) + yMin).formatToSinglePrecision()
         }.build()
     val data = LineChartData(
@@ -186,7 +191,8 @@ private fun LineGraph3(pointsData: List<Point>) {
         .steps(steps)
         .labelData { i ->
             val yMin = pointsData.minOf { it.y }
-            val yScale = 100 / steps
+            val yMax = pointsData.maxOf { it.y }
+            val yScale = (yMax - yMin) / steps
             ((i * yScale) + yMin).formatToSinglePrecision()
         }
         .axisLineColor(Color.Red)

buildSrc/src/main/java/co/ycharts/dependency/YChartDependency.kt

@@ -17,4 +17,5 @@ object YChartDependency {
     val COMPOSE_UI_TEST_MANIFEST by lazy { "androidx.compose.ui:ui-test-manifest:${Version.COMPOSE_UI}" }
     val RUNTIME_KTX by lazy { "androidx.lifecycle:lifecycle-runtime-ktx:${Version.RUNTIME_KTX}" }
     val MOCKK by lazy { "io.mockk:mockk:${Version.MOCKK}" }
+    val YCHART by lazy { "co.yml:ycharts:1.0.0" }
 }