Optimize many details

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AADataLabels.kt

@@ -8,8 +8,11 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartCreator.AAChartVerticalAlignType
+
 class AADataLabels {
     var enabled: Boolean? = null
+    var inside: Boolean? = null
     var style: AAStyle? = null
     var format: String? = null
     var rotation: Float? = null
@@ -31,6 +34,11 @@ class AADataLabels {
         return this
     }
 
+    fun inside(prop: Boolean): AADataLabels {
+        inside = prop
+        return this
+    }
+
     fun style(prop: AAStyle): AADataLabels {
         style = prop
         return this
@@ -61,8 +69,8 @@ class AADataLabels {
         return this
     }
 
-    fun verticalAlign(prop: String): AADataLabels {
-        verticalAlign = prop
+    fun verticalAlign(prop: AAChartVerticalAlignType): AADataLabels {
+        verticalAlign = prop.value
         return this
     }
 

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAStyle.kt

@@ -24,7 +24,7 @@ class AAStyle {
     }
 
     fun fontSize(prop: Float?): AAStyle {
-        fontSize = "$prop px"
+        fontSize = "${prop}px"
         return this
     }
 

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAColor.kt

@@ -90,4 +90,13 @@ object AAColor {
         return "clear"
     }
 
+    fun rgbaColor(
+        red: Int,
+        green: Int,
+        blue: Int,
+        alpha: Float
+    ): String {
+        return "rgba($red,$green,$blue,$alpha)"
+    }
+
 }

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAGradientColor.kt

@@ -237,7 +237,7 @@ object AAGradientColor {
      fun linearGradient(
          startColor: String,
          endColor: String
-     ): HashMap<String, Any> {
+     ): Map<String, Any> {
         return linearGradient(
             AALinearGradientDirection.ToTop,
             startColor,
@@ -248,7 +248,7 @@ object AAGradientColor {
         direction: AALinearGradientDirection,
         startColor: String,
         endColor: String
-     ): HashMap<String, Any> {
+     ): Map<String, Any> {
         val stopsArr = arrayOf<Any>(
             arrayOf(0, startColor),
             arrayOf(1, endColor)
@@ -259,12 +259,11 @@ object AAGradientColor {
     fun linearGradient(
         direction: AALinearGradientDirection,
         stopsArr: Array<Any>
-    ): HashMap<String, Any> {
-        val linearGradientColorMap = linearGradientMap(direction)
-        val gradientColorMap = HashMap<String, Any>()
-        gradientColorMap["linearGradient"] = linearGradientColorMap
-        gradientColorMap["stops"] = stopsArr
-        return gradientColorMap
+    ): Map<String, Any> {
+        return mapOf(
+            "linearGradient" to linearGradientMap(direction),
+            "stops" to stopsArr
+        )
     }
 
     /**

app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/CustomTooltipComposer.kt

@@ -115,14 +115,12 @@ function () {
                         .name("🐶狗子")
                         .lineWidth(5f)
                         .fillOpacity(0.5f)
-                        .data(arrayOf(0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58,
-                            0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36)),
+                        .data(arrayOf(0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36)),
                     AASeriesElement()
                         .name("🌲树木")
                         .lineWidth(5f)
                         .fillOpacity(0.5f)
-                        .data(arrayOf(0.38, 0.31, 0.32, 0.32, 0.64, 0.66, 0.86, 0.47, 0.52, 0.75, 0.52, 0.56, 0.54, 0.60, 0.46,
-                            0.63, 0.54, 0.51, 0.58, 0.64, 0.60, 0.45, 0.36, 0.67))
+                        .data(arrayOf(0.38, 0.31, 0.32, 0.32, 0.64, 0.66, 0.86, 0.47, 0.52, 0.75, 0.52, 0.56, 0.54, 0.60, 0.46, 0.63, 0.54, 0.51, 0.58, 0.64, 0.60, 0.45, 0.36, 0.67))
                 ))
 
             val aaTooltip = AATooltip()
@@ -210,26 +208,22 @@ function () {
                         .name("Tokyo Hot")
                         .lineWidth(5.0f)
                         .fillOpacity(0.4f)
-                        .data(arrayOf(0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50,
-                            0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36)),
+                        .data(arrayOf(0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36)),
                     AASeriesElement()
                         .name("Berlin Hot")
                         .lineWidth(5.0f)
                         .fillOpacity(0.4f)
-                        .data(arrayOf(0.38, 0.31, 0.32, 0.32, 0.64, 0.66, 0.86, 0.47, 0.52, 0.75, 0.52, 0.56, 0.54,
-                            0.60, 0.46, 0.63, 0.54, 0.51, 0.58, 0.64, 0.60, 0.45, 0.36, 0.67)),
+                        .data(arrayOf(0.38, 0.31, 0.32, 0.32, 0.64, 0.66, 0.86, 0.47, 0.52, 0.75, 0.52, 0.56, 0.54, 0.60, 0.46, 0.63, 0.54, 0.51, 0.58, 0.64, 0.60, 0.45, 0.36, 0.67)),
                     AASeriesElement()
                         .name("New York Hot")
                         .lineWidth(5.0f)
                         .fillOpacity(0.4f)
-                        .data(arrayOf(0.46, 0.32, 0.53, 0.58, 0.86, 0.68, 0.85, 0.73, 0.69, 0.71, 0.91, 0.74, 0.60,
-                            0.50, 0.39, 0.67, 0.55, 0.49, 0.65, 0.45, 0.64, 0.47, 0.63, 0.64)),
+                        .data(arrayOf(0.46, 0.32, 0.53, 0.58, 0.86, 0.68, 0.85, 0.73, 0.69, 0.71, 0.91, 0.74, 0.60, 0.50, 0.39, 0.67, 0.55, 0.49, 0.65, 0.45, 0.64, 0.47, 0.63, 0.64)),
                     AASeriesElement()
                         .name("London Hot")
                         .lineWidth(5.0f)
                         .fillOpacity(0.4f)
-                        .data(arrayOf(0.60, 0.51, 0.52, 0.53, 0.64, 0.84, 0.65, 0.68, 0.63, 0.47, 0.72, 0.60, 0.65,
-                            0.74, 0.66, 0.65, 0.71, 0.59, 0.65, 0.77, 0.52, 0.53, 0.58, 0.53))
+                        .data(arrayOf(0.60, 0.51, 0.52, 0.53, 0.64, 0.84, 0.65, 0.68, 0.63, 0.47, 0.72, 0.60, 0.65, 0.74, 0.66, 0.65, 0.71, 0.59, 0.65, 0.77, 0.52, 0.53, 0.58, 0.53))
                 ))
 
             val aaTooltip = AATooltip()
@@ -404,7 +398,7 @@ function () {
 
          fun customStackedAndGroupedColumnChartTooltip():AAOptions {
             val aaChartModel = AAChartModel()
-                .title("Total fruit consumtion, grouped by gender")
+                .title("Total fruit consumption, grouped by gender")
                 .subtitle("stacked and grouped")
                 .yAxisTitle("Number of fruits")
                 .chartType(AAChartType.Column)

app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/MixedChartComposer.kt

@@ -27,9 +27,9 @@
  */
 package com.aachartmodel.aainfographics.ChartsDemo.ChartComposer
 
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartCreator.*
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AADataLabels
 import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAStyle
-import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartCreator.*
 
 class MixedChartComposer {
 companion object {
@@ -483,7 +483,14 @@ companion object {
                         arrayOf(0.116163, 3.129283)
                     )
                     )
-                    .color("#0088FF")
+                    .color("#0088FF"),
+                AASeriesElement()
+                    .name("线性回归线")
+                    .type(AAChartType.Line)
+                    .data(arrayOf(
+                            arrayOf(0.014, 3.078),
+                            arrayOf(0.969, 4.655)))
+                    .color("#FF0000")
             )
             )
     }