fix/radar_chart/wrong_weight_modifier_behavior

README.md

@@ -5,7 +5,7 @@
 
 <div align="left">
 The library contains several chart composables for usage in <strong>Kotlin Multiplatform</strong> projects and <strong>Android Native</strong>.   
-Currently supported platforms are <strong>Desktop</strong> <strong>Android</strong> and soon <strong>IOS </strong></strong>
+Currently supported platforms are <strong>Desktop</strong> <strong>Android</strong> and <strong>IOS </strong></strong>
 </div>
 
 &nbsp;

build.gradle.kts

@@ -9,7 +9,6 @@ allprojects {
 
 plugins {
     kotlin("multiplatform") apply false
-    kotlin("native.cocoapods") version "1.8.0"
     kotlin("android") apply false
     id("com.android.application") apply false
     id("com.android.library") apply false

chart/build.gradle.kts

@@ -1,35 +1,38 @@
-
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
     id("com.android.library")
     id("org.jetbrains.dokka") version "1.5.0"
     id("convention.publication")
-    id ("org.jetbrains.kotlin.native.cocoapods") version "1.8.0"
+    kotlin("native.cocoapods")
 }
 group = "io.github.thechance101"
-version = "Beta-0.0.1"
+version = "Beta-0.0.5"
 
 kotlin {
     android {
-        publishLibraryVariants("release","debug")
+        publishLibraryVariants("release", "debug")
     }
     jvm("desktop") {
         jvmToolchain(11)
     }
+    ios{}
     iosX64()
     iosArm64()
     iosSimulatorArm64()
-    cocoapods {
-        version = "1.0.0"
-        summary = "Some description for the chart Module"
-        homepage = "Link to the chart Module homepage"
-        ios.deploymentTarget = "14.1"
-        podfile = project.file("../iosApp/Podfile")
-        framework {
-            baseName = "chart"
-            isStatic = true
+
+    js(IR) {
+        browser {
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                    webpackConfig.cssSupport {
+                        enabled.set(true)
+                    }
+                }
+            }
         }
+        binaries.executable()
     }
 
     sourceSets {
@@ -40,42 +43,30 @@ kotlin {
                 api(compose.material)
             }
         }
-        val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test"))
-            }
-        }
+
         val androidMain by getting {
             dependencies {
                 api("androidx.appcompat:appcompat:1.5.1")
                 api("androidx.core:core-ktx:1.9.0")
             }
         }
-        val androidTest by getting {
-            dependencies {
-                implementation("junit:junit:4.13.2")
-            }
-        }
+
         val desktopMain by getting {
             dependencies {
                 api(compose.preview)
             }
         }
-        val desktopTest by getting
-
-
         val iosX64Main by getting
         val iosArm64Main by getting
         val iosSimulatorArm64Main by getting
-        val iosMain by creating {
+        val iosMain by getting {
             dependsOn(commonMain)
             iosX64Main.dependsOn(this)
             iosArm64Main.dependsOn(this)
             iosSimulatorArm64Main.dependsOn(this)
-            dependencies {
-                implementation("io.ktor:ktor-client-darwin:2.3.3")
-            }
+
         }
+        val jsMain by getting
     }
 }
 
@@ -91,16 +82,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-        }
-        create("staging") {
-            initWith(getByName("release"))
-            manifestPlaceholders["TheChance101"] = "io.github.thechance101"
-        }
-    }
-}
-
-
+}

chart/src/commonMain/kotlin/com/aay/compose/baseComponents/XAxisDrawing.kt

@@ -26,9 +26,10 @@ internal fun <T> DrawScope.xAxisDrawing(
     val yTextLayoutResult = textMeasure.measure(
         text = AnnotatedString(upperValue.formatToThousandsMillionsBillions()),
     ).size.width
+    val textSpace = yTextLayoutResult - (yTextLayoutResult/4)
 
     xAxisData.forEachIndexed { index, dataPoint ->
-        val xLength = (yTextLayoutResult.toDp()) + (index * xRegionWidth)
+        val xLength = (textSpace.toDp()) + (index * xRegionWidth)
 
         drawContext.canvas.nativeCanvas.apply {
             drawText(

chart/src/commonMain/kotlin/com/aay/compose/baseComponents/grid.kt

@@ -35,7 +35,7 @@ internal fun DrawScope.grid(
     val yTextLayoutResult = textMeasurer.measure(
         text = AnnotatedString(upperValue.formatToThousandsMillionsBillions()),
     ).size.width
-
+    val textSpace = yTextLayoutResult - (yTextLayoutResult/4)
 
     if (isShowGrid) {
         when (gridOrientation) {
@@ -45,7 +45,7 @@ internal fun DrawScope.grid(
                 gridColor = gridColor,
                 backgroundLineWidth = backgroundLineWidth,
                 showGridWithSpacer = showGridWithSpacer,
-                yTextLayoutResult = yTextLayoutResult
+                yTextLayoutResult = textSpace
             )
 
             GridOrientation.VERTICAL -> drawVerticalGrid(
@@ -54,7 +54,7 @@ internal fun DrawScope.grid(
                 gridColor = gridColor,
                 backgroundLineWidth = backgroundLineWidth,
                 showGridWithSpacer = showGridWithSpacer,
-                yTextLayoutResult = yTextLayoutResult
+                yTextLayoutResult = textSpace
             )
 
             else -> {
@@ -65,7 +65,7 @@ internal fun DrawScope.grid(
                     xEndLength = 38.dp.toPx(),
                     backgroundLineWidth = backgroundLineWidth,
                     showGridWithSpacer = showGridWithSpacer,
-                    yTextLayoutResult = yTextLayoutResult
+                    yTextLayoutResult = textSpace
                 )
 
                 drawVerticalGrid(
@@ -75,7 +75,7 @@ internal fun DrawScope.grid(
                     yEndLength = 9f.toDp(),
                     backgroundLineWidth = backgroundLineWidth,
                     showGridWithSpacer = showGridWithSpacer,
-                    yTextLayoutResult = yTextLayoutResult
+                    yTextLayoutResult = textSpace
                 )
             }
 
@@ -90,12 +90,14 @@ private fun DrawScope.drawHorizontalGrid(
     xEndLength: Float = 0f,
     backgroundLineWidth: Float,
     showGridWithSpacer: Boolean,
-    yTextLayoutResult: Int
+    yTextLayoutResult: Int,
 ) {
 
     val xAxisMaxValue = size.width
     val yAxisList = mutableListOf<Float>()
 
+    val textSpace = yTextLayoutResult - (yTextLayoutResult/4)
+
     (0..yAxisRange).forEach { i ->
         yAxisList.add(
             size.height.toDp()
@@ -107,7 +109,7 @@ private fun DrawScope.drawHorizontalGrid(
             gridColor = gridColor,
             xStart = (yTextLayoutResult * 1.5.toFloat().toDp()).toPx(),
             yStart = yAlignmentValue,
-            xEnd = xAxisMaxValue - xEndLength,
+            xEnd = xAxisMaxValue - (textSpace/0.9.toFloat().toDp().toPx()),
             yEnd = yAlignmentValue,
             backgroundLineWidth = backgroundLineWidth,
             showGridWithSpacer = showGridWithSpacer

chart/src/commonMain/kotlin/com/aay/compose/donutChart/component/PiePedigreeChart.kt

@@ -45,12 +45,12 @@ internal fun DrawScope.drawPedigreeChart(
         val angleInRadians = (startArcWithoutAnimation + arcWithoutAnimation / 2).degreeToAngle
         if (pieChart == ChartTypes.PIE_CHART) {
             val lineStart = Offset(
-                center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 0.8f,
-                center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 0.8f
+                (center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 0.8f).toFloat(),
+                (center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 0.8f).toFloat()
             )
             val lineEnd = Offset(
-                center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 1.1f,
-                center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 1.1f
+                (center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 1.1f).toFloat(),
+                (center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 1.1f).toFloat()
             )
             val arcOffset = Offset(center.x - (minValue / 2), center.y - (minValue / 2))
             val region = pieValueWithRatio.subList(0, index).sum()
@@ -88,12 +88,12 @@ internal fun DrawScope.drawPedigreeChart(
 
         } else {
             val lineStart = Offset(
-                center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 0.8f,
-                center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 0.8f
+                (center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 0.8f).toFloat(),
+                (center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 0.8f).toFloat()
             )
             val lineEnd = Offset(
-                center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 1.1f,
-                center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 1.1f
+                (center.x + (outerCircularRadius * 1.18f) * cos(angleInRadians) * 1.1f).toFloat(),
+                (center.y + (outerCircularRadius * 1.18f) * sin(angleInRadians) * 1.1f).toFloat()
             )
             val arcOffset = Offset(center.x - (minValue / 2), center.y - (minValue / 2))
             val region = pieValueWithRatio.subList(0, index).sum()
@@ -132,7 +132,7 @@ internal fun DrawScope.drawPedigreeChart(
 }
 
 private val Float.degreeToAngle
-    get() = (this * Math.PI / 180f).toFloat()
+    get() = (this * (22/7) / 180f)
 
 private fun calculateAngle(dataLength: Float, totalLength: Float, progress: Float): Float =
     -360F * dataLength * progress / totalLength

chart/src/commonMain/kotlin/com/aay/compose/lineChart/components/DefaultLines.kt

@@ -82,10 +82,10 @@ private fun DrawScope.drawLineAsDefault(
         val yTextLayoutResult = textMeasure.measure(
             text = AnnotatedString(upperValue.formatToThousandsMillionsBillions()),
         ).size.width
-
+        val textSpace = yTextLayoutResult - (yTextLayoutResult/4)
         val info = lineParameter.data[index]
         val ratio = (info - lowerValue) / (upperValue - lowerValue)
-        val startXPoint = (yTextLayoutResult * 1.5.toFloat().toDp()) + (index * xRegionWidth)
+        val startXPoint = (textSpace * 1.5.toFloat().toDp()) + (index * xRegionWidth)
         val startYPoint =
             (height.toPx() + 8.dp.toPx() - spacingY.toPx() - (ratio * (height.toPx() - spacingY.toPx())))
 

chart/src/commonMain/kotlin/com/aay/compose/lineChart/components/QuadraticLines.kt

@@ -87,16 +87,16 @@ fun DrawScope.drawLineAsQuadratic(
         val yTextLayoutResult = textMeasurer.measure(
             text = AnnotatedString(upperValue.formatToThousandsMillionsBillions()),
         ).size.width
-
+        val textSpace = yTextLayoutResult - (yTextLayoutResult/4)
 
         val info = lineParameter.data[index]
         val nextInfo = lineParameter.data.getOrNull(index + 1) ?: lineParameter.data.last()
         val firstRatio = (info - lowerValue) / (upperValue - lowerValue)
         val secondRatio = (nextInfo - lowerValue) / (upperValue - lowerValue)
 
-        val xFirstPoint = (yTextLayoutResult * 1.5.toFloat().toDp()) + index * xRegionWidth
+        val xFirstPoint = (textSpace * 1.5.toFloat().toDp()) + index * xRegionWidth
         val xSecondPoint =
-            (yTextLayoutResult * 1.5.toFloat().toDp()) + (index + checkLastIndex(
+            (textSpace * 1.5.toFloat().toDp()) + (index + checkLastIndex(
                 lineParameter.data,
                 index
             )) * xRegionWidth

chart/src/commonMain/kotlin/com/aay/compose/radarChart/CalculateRadarConfig.kt

@@ -18,7 +18,7 @@ internal fun calculateRadarConfig(
     val netCornersPoints = mutableListOf<Offset>()
     val stepsStartPoints = mutableListOf<Offset>()
     val stepsEndPoints = mutableListOf<Offset>()
-    val polygonPoints = mutableListOf<Offset>()
+    val scalarValuesPoints = mutableListOf<Offset>()
     val labelsPoints = mutableListOf<Offset>()
 
     val center = Offset(size.width / 2, size.height / 2)
@@ -42,12 +42,12 @@ internal fun calculateRadarConfig(
             val nextEndPoint = getCircumferencePointOffset(center, value * step, nextAngle)
             stepsStartPoints.add(startEndPoint)
             stepsEndPoints.add(nextEndPoint)
-            if (lineIndex == 0) polygonPoints.add(startEndPoint)
+            if (lineIndex == 0) scalarValuesPoints.add(startEndPoint)
         }
     }
 
     return RadarChartConfig(
-        center, netCornersPoints, stepsEndPoints, stepsStartPoints, polygonPoints, labelsPoints
+        center, netCornersPoints, stepsEndPoints, stepsStartPoints, scalarValuesPoints, labelsPoints
     )
 }