Optimize AAColor && AAGradient

charts/src/main/java/com/github/aachartmodel/aainfographics/aatools/AAColor.kt

@@ -29,74 +29,88 @@ package com.github.aachartmodel.aainfographics.aatools
 
 
 object AAColor {
+    var Black = blackColor()
+    var DarkGray = darkGrayColor()
+    var LightGray = lightGrayColor()
+    var White = whiteColor()
+    var Gray = grayColor()
+    var Red = redColor()
+    var Green = greenColor()
+    var Blue = blueColor()
+    var Cyan = cyanColor()
+    var Yellow = yellowColor()
+    var Magenta = magentaColor()
+    var Orange = orangeColor()
+    var Purple = purpleColor()
+    var Brown = brownColor()
+    var Clear = clearColor()
 
-    fun blackColor(): String {
+    fun rgbaColor(
+            red: Int,
+            green: Int,
+            blue: Int,
+            alpha: Float = 1f
+    ): String {
+        return "rgba($red,$green,$blue,$alpha)"
+    }
+
+    private fun blackColor(): String {
         return "black"
     }
 
-    fun darkGrayColor(): String {
+    private fun darkGrayColor(): String {
         return "darkGray"
     }
 
-    fun lightGrayColor(): String {
+    private fun lightGrayColor(): String {
         return "lightGray"
     }
 
-    fun whiteColor(): String {
+    private fun whiteColor(): String {
         return "white"
     }
 
-    fun grayColor(): String {
+    private fun grayColor(): String {
         return "gray"
     }
 
-    fun redColor(): String {
+    private fun redColor(): String {
         return "red"
     }
 
-    fun greenColor(): String {
+    private fun greenColor(): String {
         return "green"
     }
 
-    fun blueColor(): String {
+    private fun blueColor(): String {
         return "blue"
     }
 
-    fun cyanColor(): String {
+    private fun cyanColor(): String {
         return "cyan"
     }
 
-    fun yellowColor(): String {
+    private fun yellowColor(): String {
         return "yellow"
     }
 
-    fun magentaColor(): String {
+    private fun magentaColor(): String {
         return "magenta"
     }
 
-    fun orangeColor(): String {
+    private fun orangeColor(): String {
         return "orange"
     }
 
-    fun purpleColor(): String {
+    private fun purpleColor(): String {
         return "purple"
     }
 
-    fun brownColor(): String {
+    private fun brownColor(): String {
         return "brown"
     }
 
-    fun clearColor(): String {
+    private fun clearColor(): String {
         return "clear"
     }
-
-    fun rgbaColor(
-        red: Int,
-        green: Int,
-        blue: Int,
-        alpha: Float
-    ): String {
-        return "rgba($red,$green,$blue,$alpha)"
-    }
-
 }

charts/src/main/java/com/github/aachartmodel/aainfographics/aatools/AAGradientColor.kt

@@ -27,6 +27,7 @@
  */
 package com.github.aachartmodel.aainfographics.aatools
 
+
 enum class AALinearGradientDirection {
     ToTop,           //⇧⇧⇧⇧⇧⇧
     ToBottom,        //⇩⇩⇩⇩⇩⇩
@@ -39,99 +40,124 @@ enum class AALinearGradientDirection {
 }
 
 object AAGradientColor {
-    fun oceanBlueColor(): Map<String, Any> {
+    var OceanBlue = oceanBlueColor()
+    var Sanguine = sanguineColor()
+    var LusciousLime = lusciousLimeColor()
+    var PurpleLake = purpleLakeColor()
+    var FreshPapaya = freshPapayaColor()
+    var Ultramarine = ultramarineColor()
+    var PinkSugar = pinkSugarColor()
+    var LemonDrizzle = lemonDrizzleColor()
+    var VictoriaPurple = victoriaPurpleColor()
+    var SpringGreens = springGreensColor()
+    var MysticMauve = mysticMauveColor()
+    var ReflexSilver = reflexSilverColor()
+    var NeonGlow = neonGlowColor()
+    var BerrySmoothie = berrySmoothieColor()
+    var NewLeaf = newLeafColor()
+    var CottonCandy = cottonCandyColor()
+    var PixieDust = pixieDustColor()
+    var FizzyPeach = fizzyPeachColor()
+    var SweetDream = sweetDreamColor()
+    var Firebrick = firebrickColor()
+    var WroughtIron = wroughtIronColor()
+    var DeepSea = deepSeaColor()
+    var CoastalBreeze = coastalBreezeColor()
+    var EveningDelight = eveningDelightColor()
+
+    private fun oceanBlueColor(): Map<String, Any> {
         return oceanBlueColor(AALinearGradientDirection.ToTop)
     }
 
-    fun sanguineColor(): Map<String, Any> {
+    private fun sanguineColor(): Map<String, Any> {
         return sanguineColor(AALinearGradientDirection.ToTop)
     }
 
-    fun lusciousLimeColor(): Map<String, Any> {
+    private fun lusciousLimeColor(): Map<String, Any> {
         return lusciousLimeColor(AALinearGradientDirection.ToTop)
     }
 
-    fun purpleLakeColor(): Map<String, Any> {
+    private fun purpleLakeColor(): Map<String, Any> {
         return purpleLakeColor(AALinearGradientDirection.ToTop)
     }
 
-    fun freshPapayaColor(): Map<String, Any> {
+    private fun freshPapayaColor(): Map<String, Any> {
         return freshPapayaColor(AALinearGradientDirection.ToTop)
     }
 
-    fun ultramarineColor(): Map<String, Any> {
+    private fun ultramarineColor(): Map<String, Any> {
         return ultramarineColor(AALinearGradientDirection.ToTop)
     }
 
-    fun pinkSugarColor(): Map<String, Any> {
+    private fun pinkSugarColor(): Map<String, Any> {
         return pinkSugarColor(AALinearGradientDirection.ToTop)
     }
 
-    fun lemonDrizzleColor(): Map<String, Any> {
+    private fun lemonDrizzleColor(): Map<String, Any> {
         return lemonDrizzleColor(AALinearGradientDirection.ToTop)
     }
 
-    fun victoriaPurpleColor(): Map<String, Any> {
+    private fun victoriaPurpleColor(): Map<String, Any> {
         return victoriaPurpleColor(AALinearGradientDirection.ToTop)
     }
 
-    fun springGreensColor(): Map<String, Any> {
+    private fun springGreensColor(): Map<String, Any> {
         return springGreensColor(AALinearGradientDirection.ToTop)
     }
 
-    fun mysticMauveColor(): Map<String, Any> {
+    private fun mysticMauveColor(): Map<String, Any> {
         return mysticMauveColor(AALinearGradientDirection.ToTop)
     }
 
-    fun reflexSilverColor(): Map<String, Any> {
+    private fun reflexSilverColor(): Map<String, Any> {
         return reflexSilverColor(AALinearGradientDirection.ToTop)
     }
 
-    fun neonGlowColor(): Map<String, Any> {
+    private fun neonGlowColor(): Map<String, Any> {
         return neonGlowColor(AALinearGradientDirection.ToTop)
     }
 
-    fun berrySmoothieColor(): Map<String, Any> {
+    private fun berrySmoothieColor(): Map<String, Any> {
         return berrySmoothieColor(AALinearGradientDirection.ToTop)
     }
 
-    fun newLeafColor(): Map<String, Any> {
+    private fun newLeafColor(): Map<String, Any> {
         return newLeafColor(AALinearGradientDirection.ToTop)
     }
 
-    fun cottonCandyColor(): Map<String, Any> {
+    private fun cottonCandyColor(): Map<String, Any> {
         return cottonCandyColor(AALinearGradientDirection.ToTop)
     }
 
-    fun pixieDustColor(): Map<String, Any> {
+    private fun pixieDustColor(): Map<String, Any> {
         return pixieDustColor(AALinearGradientDirection.ToTop)
     }
 
-    fun fizzyPeachColor(): Map<String, Any> {
+    private fun fizzyPeachColor(): Map<String, Any> {
         return fizzyPeachColor(AALinearGradientDirection.ToTop)
     }
 
-    fun sweetDreamColor(): Map<String, Any> {
+    private fun sweetDreamColor(): Map<String, Any> {
         return sweetDreamColor(AALinearGradientDirection.ToTop)
     }
 
-    fun firebrickColor(): Map<String, Any> {
+    private fun firebrickColor(): Map<String, Any> {
         return firebrickColor(AALinearGradientDirection.ToTop)
     }
 
-    fun wroughtIronColor(): Map<String, Any> {
+    private fun wroughtIronColor(): Map<String, Any> {
         return wroughtIronColor(AALinearGradientDirection.ToTop)
     }
 
-    fun deepSeaColor(): Map<String, Any> {
+    private fun deepSeaColor(): Map<String, Any> {
         return deepSeaColor(AALinearGradientDirection.ToTop)
     }
 
-    fun coastalBreezeColor(): Map<String, Any> {
+    private fun coastalBreezeColor(): Map<String, Any> {
         return coastalBreezeColor(AALinearGradientDirection.ToTop)
     }
 
-    fun eveningDelightColor(): Map<String, Any> {
+    private fun eveningDelightColor(): Map<String, Any> {
         return eveningDelightColor(AALinearGradientDirection.ToTop)
     }
 
@@ -233,35 +259,34 @@ object AAGradientColor {
     }
 
     fun linearGradient(
-        startColor: String,
-        endColor: String
+            startColor: String,
+            endColor: String
     ): Map<String, Any> {
         return linearGradient(
-            AALinearGradientDirection.ToTop,
-            startColor,
-            endColor
+                AALinearGradientDirection.ToTop,
+                startColor,
+                endColor
         )
     }
 
     fun linearGradient(
-        direction: AALinearGradientDirection,
-        startColor: String,
-        endColor: String
+            direction: AALinearGradientDirection,
+            startColor: String,
+            endColor: String
     ): Map<String, Any> {
-        val stopsArr = arrayOf<Any>(
-            arrayOf(0, startColor),
-            arrayOf(1, endColor)
-        )
-        return linearGradient(direction, stopsArr)
+        return linearGradient(direction, arrayOf<Any>(
+                arrayOf(0, startColor),
+                arrayOf(1, endColor)
+        ))
     }
 
     fun linearGradient(
-        direction: AALinearGradientDirection,
-        stopsArr: Array<Any>
+            direction: AALinearGradientDirection,
+            stopsArr: Array<Any>
     ): Map<String, Any> {
         return mapOf(
-            "linearGradient" to linearGradientMap(direction),
-            "stops" to stopsArr
+                "linearGradient" to linearGradientMap(direction),
+                "stops" to stopsArr
         )
     }
 
@@ -275,7 +300,7 @@ object AAGradientColor {
     (0,1) ----------- (1,1)
      */
     private fun linearGradientMap(
-        direction: AALinearGradientDirection
+            direction: AALinearGradientDirection
     ): Map<String, Int> {
         when (direction) {
             AALinearGradientDirection.ToTop ->

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/additionalcontent/DoubleChartsLinkedWorkActivity.kt

@@ -12,7 +12,7 @@ import com.github.aachartmodel.aainfographics.demo.R
 
 class DoubleChartsLinkedWorkActivity : AppCompatActivity(),
     AAChartView.AAChartViewCallBack {
-    private var selectedGradientColor: Any = AAColor.redColor()
+    private var selectedGradientColor: Any = AAColor.Red
     private var aaChartView1: AAChartView? = null
     private var aaChartView2: AAChartView? = null
     private var gradientColorsArr: Array<Any>? = null
@@ -28,62 +28,60 @@ class DoubleChartsLinkedWorkActivity : AppCompatActivity(),
 
     private fun configureChartOptions1(): AAOptions {
         val gradientColorNamesArr = arrayOf(
-            "oceanBlue",
-            "sanguine",
-            "lusciousLime",
-            "purpleLake",
-            "freshPapaya",
-            "ultramarine",
-            "pinkSugar",
-            "lemonDrizzle",
-            "victoriaPurple",
-            "springGreens",
-            "mysticMauve",
-            "reflexSilver",
-            "neonGlowColor",
-            "berrySmoothieColor",
-            "newLeaf",
-            "cottonCandy",
-            "pixieDust",
-            "fizzyPeach",
-            "sweetDream",
-            "firebrick",
-            "wroughtIron",
-            "deepSea",
-            "coastalBreeze",
-            "eveningDelight",
-            "neonGlowColor",
-            "berrySmoothieColor"
+                "oceanBlue",
+                "sanguine",
+                "lusciousLime",
+                "purpleLake",
+                "freshPapaya",
+                "ultramarine",
+                "pinkSugar",
+                "lemonDrizzle",
+                "victoriaPurple",
+                "springGreens",
+                "mysticMauve",
+                "reflexSilver",
+                "neonGlowColor",
+                "berrySmoothieColor",
+                "newLeaf",
+                "cottonCandy",
+                "pixieDust",
+                "fizzyPeach",
+                "sweetDream",
+                "firebrick",
+                "wroughtIron",
+                "deepSea",
+                "coastalBreeze",
+                "eveningDelight",
+                "neonGlowColor",
+                "berrySmoothieColor"
+        )
+
+        val gradientColorArr = arrayOf(
+                AAGradientColor.OceanBlue,
+                AAGradientColor.Sanguine,
+                AAGradientColor.LusciousLime,
+                AAGradientColor.PurpleLake,
+                AAGradientColor.FreshPapaya,
+                AAGradientColor.Ultramarine,
+                AAGradientColor.PinkSugar,
+                AAGradientColor.LemonDrizzle,
+                AAGradientColor.VictoriaPurple,
+                AAGradientColor.SpringGreens,
+                AAGradientColor.MysticMauve,
+                AAGradientColor.ReflexSilver,
+                AAGradientColor.NewLeaf,
+                AAGradientColor.CottonCandy,
+                AAGradientColor.PixieDust,
+                AAGradientColor.FizzyPeach,
+                AAGradientColor.SweetDream,
+                AAGradientColor.Firebrick,
+                AAGradientColor.WroughtIron,
+                AAGradientColor.DeepSea,
+                AAGradientColor.CoastalBreeze,
+                AAGradientColor.EveningDelight,
+                AAGradientColor.NeonGlow,
+                AAGradientColor.BerrySmoothie
         )
-        val gradientColorArr =
-            arrayOf<Map<*, *>>(
-                AAGradientColor.oceanBlueColor(),
-                AAGradientColor.sanguineColor(),
-                AAGradientColor.lusciousLimeColor(),
-                AAGradientColor.purpleLakeColor(),
-                AAGradientColor.freshPapayaColor(),
-                AAGradientColor.ultramarineColor(),
-                AAGradientColor.pinkSugarColor(),
-                AAGradientColor.lemonDrizzleColor(),
-                AAGradientColor.victoriaPurpleColor(),
-                AAGradientColor.springGreensColor(),
-                AAGradientColor.mysticMauveColor(),
-                AAGradientColor.reflexSilverColor(),
-                AAGradientColor.neonGlowColor(),
-                AAGradientColor.berrySmoothieColor(),
-                AAGradientColor.newLeafColor(),
-                AAGradientColor.cottonCandyColor(),
-                AAGradientColor.pixieDustColor(),
-                AAGradientColor.fizzyPeachColor(),
-                AAGradientColor.sweetDreamColor(),
-                AAGradientColor.firebrickColor(),
-                AAGradientColor.wroughtIronColor(),
-                AAGradientColor.deepSeaColor(),
-                AAGradientColor.coastalBreezeColor(),
-                AAGradientColor.eveningDelightColor(),
-                AAGradientColor.neonGlowColor(),
-                AAGradientColor.berrySmoothieColor()
-            )
         gradientColorsArr = gradientColorArr as Array<Any>
         val aaChartModel: AAChartModel = AAChartModel()
             .chartType(AAChartType.Column)
@@ -96,19 +94,14 @@ class DoubleChartsLinkedWorkActivity : AppCompatActivity(),
             .inverted(true)
             .legendEnabled(false)
             .touchEventEnabled(true)
-            .series(
-                arrayOf(
+            .series(arrayOf(
                     AASeriesElement()
                         .name("Tokyo")
-                        .data(
-                            arrayOf(
+                        .data(arrayOf(
                                 211, 183, 157, 133, 111, 91, 73, 57, 43, 31, 21, 13,
                                 211, 183, 157, 133, 111, 91, 73, 57, 43, 31, 21, 13
-                            )
-                        )
-                        .colorByPoint(true)
-                )
-            )
+                            ))
+                        .colorByPoint(true)))
         val aaOptions: AAOptions = AAOptionsConstructor.configureChartOptions(aaChartModel)
         aaOptions.plotOptions?.column?.groupPadding = 0f
         return aaOptions
@@ -121,40 +114,14 @@ class DoubleChartsLinkedWorkActivity : AppCompatActivity(),
             .yAxisTitle("")
             .legendEnabled(false)
             .yAxisGridLineWidth(0f)
-            .series(
-                arrayOf(
+            .series(arrayOf(
                     AASeriesElement()
                         .name("Tokyo")
-                        .data(
-                            arrayOf(
-                                149.9,
-                                171.5,
-                                106.4,
-                                129.2,
-                                144.0,
-                                176.0,
-                                135.6,
-                                188.5,
-                                276.4,
-                                214.1,
-                                95.6,
-                                54.4,
-                                149.9,
-                                171.5,
-                                106.4,
-                                129.2,
-                                144.0,
-                                176.0,
-                                135.6,
-                                188.5,
-                                276.4,
-                                214.1,
-                                95.6,
-                                54.4
-                            )
-                        )
-                )
-            )
+                        .data(arrayOf(
+                                211,183,157,133,111,91,73,57,43,31,21,13,
+                                211,183,157,133,111,91,73,57,43,31,21,13,
+                            ))
+            ))
         val aaOptions: AAOptions = AAOptionsConstructor.configureChartOptions(aaChartModel)
         aaOptions.plotOptions?.column?.groupPadding = 0f
         return aaOptions

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/additionalcontent/OnlyRefreshChartDataActivity.kt

@@ -85,14 +85,12 @@ class OnlyRefreshChartDataActivity : AppCompatActivity() {
             .yAxisVisible(false)
             .title("")
             .yAxisTitle("摄氏度")
-            .colorsTheme(
-                arrayOf(
-                    AAGradientColor.sanguineColor(),
-                    AAGradientColor.deepSeaColor(),
-                    AAGradientColor.neonGlowColor(),
-                    AAGradientColor.wroughtIronColor()
-                )
-            )
+            .colorsTheme(arrayOf(
+                    AAGradientColor.Sanguine,
+                    AAGradientColor.DeepSea,
+                    AAGradientColor.NeonGlow,
+                    AAGradientColor.WroughtIron
+                ))
             .stacking(AAChartStackingType.Normal)
     }
 

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/chartcomposer/ChartOptionsComposer.kt

@@ -65,7 +65,7 @@ class ChartOptionsComposer {
                 .subtitle("LEGEND ON THE TOP_RIGHT SIDE WITH VERTICAL STYLE")
                 .subtitleAlign(AAChartAlignType.Left)
                 .markerRadius(0f)
-                .backgroundColor(AAColor.whiteColor())
+                .backgroundColor(AAColor.White)
                 .dataLabelsEnabled(false)
                 .yAxisGridLineWidth(0f)
                 .yAxisTitle("percent values")
@@ -100,7 +100,7 @@ class ChartOptionsComposer {
                     AASeriesElement()
                         .name("Tokyo")
                         .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, 21.5, 5.2, 26.5, 23.3, 45.3, 13.9, 9.6))
-                        .color(AAColor.whiteColor())
+                        .color(AAColor.White)
                         .lineWidth(10.0f)
                 ))
 
@@ -270,7 +270,7 @@ function () {
             .series(arrayOf(
                 AASeriesElement()
                     .name("2020")
-                    .color(AAGradientColor.deepSeaColor())
+                    .color(AAGradientColor.DeepSea)
                     .data(arrayOf(
                         arrayOf(12464064, 21.5),
                         arrayOf(12464928, 22.1),
@@ -307,7 +307,7 @@ function () {
 
         val aaOptions = AAOptionsConstructor.configureChartOptions(aaChartModel)
         val aaCrosshair = AACrosshair()
-            .color(AAColor.redColor())
+            .color(AAColor.Red)
             .width(1f)
             .dashStyle(AAChartLineDashStyleType.LongDashDotDot)
          aaOptions.xAxis?.crosshair(aaCrosshair)
@@ -341,7 +341,7 @@ function () {
                 .series(arrayOf(
                     AASeriesElement()
                         .name("Berlin Hot")
-                        .color(AAGradientColor.mysticMauveColor())
+                        .color(AAGradientColor.MysticMauve)
                         .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, 21.5, 5.2, 26.5, 23.3, 45.3, 13.9, 9.6))
                 ))
 
@@ -377,7 +377,7 @@ function () {
                  .series(arrayOf(
                      AASeriesElement()
                          .name("Berlin Hot")
-                         .color(AAGradientColor.deepSeaColor())
+                         .color(AAGradientColor.DeepSea)
                          .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, 21.5, 5.2, 26.5, 23.3, 45.3, 13.9, 9.6))
                  ))
 
@@ -414,7 +414,7 @@ function () {
                 .series(arrayOf(
                         AASeriesElement()
                             .name("Berlin Hot")
-                            .color(AAColor.whiteColor())
+                            .color(AAColor.White)
                             .lineWidth(7f)
                             .fillColor(fillColorGradientColor)
                             .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, 21.5, 5.2, 26.5, 23.3, 45.3, 13.9, 9.6))
@@ -424,13 +424,13 @@ function () {
                 ?.dataLabels(AADataLabels()
                              .enabled(true)
                              .style(AAStyle()
-                                    .color(AAColor.blackColor())
+                                    .color(AAColor.Black)
                                     .fontSize(14f)
                                     .fontWeight(AAChartFontWeightType.Thin)))
 
             val aaCrosshair = AACrosshair()
                 .dashStyle(AAChartLineDashStyleType.LongDashDot)
-                .color(AAColor.whiteColor())
+                .color(AAColor.White)
                 .width(1f)
 
             val aaLabels = AALabels()
@@ -438,13 +438,13 @@ function () {
                 .style(AAStyle()
                         .fontSize(10f)
                         .fontWeight(AAChartFontWeightType.Bold)
-                        .color(AAColor.whiteColor()))//轴文字颜色
+                        .color(AAColor.White))//轴文字颜色
 
             aaOptions.yAxis!!
                 .opposite(true)
                 .tickWidth(2f)
                 .lineWidth(1.5f)//Y轴轴线颜色
-                .lineColor(AAColor.whiteColor())//Y轴轴线颜色
+                .lineColor(AAColor.White)//Y轴轴线颜色
                 .gridLineWidth(0f)//Y轴网格线宽度
                 .crosshair(aaCrosshair)
                 .labels(aaLabels)
@@ -452,7 +452,7 @@ function () {
             aaOptions.xAxis!!
                 .tickWidth(2f)//X轴刻度线宽度
                 .lineWidth(1.5f)//X轴轴线宽度
-                .lineColor(AAColor.whiteColor())//X轴轴线颜色
+                .lineColor(AAColor.White)//X轴轴线颜色
                 .crosshair(aaCrosshair)
                 .labels(aaLabels)
 
@@ -468,7 +468,7 @@ function () {
 
             aaOptions.legend!!
                 .itemStyle(AAItemStyle()
-                        .color(AAColor.whiteColor())//字体颜色
+                        .color(AAColor.White)//字体颜色
                         .fontSize(13f)//字体大小
                         .fontWeight("thin")//字体为细体字
                 )
@@ -562,7 +562,7 @@ function () {
                 .title(AATitle()
                         .text("正负镜像柱形图")
                         .style(AAStyle()
-                                .color(AAColor.whiteColor())
+                                .color(AAColor.White)
                                 .fontSize(18f)))
                 .xAxis(AAXAxis()
                         .categories(arrayOf("一月", "二月", "三月", "四月", "五月", "六月",
@@ -831,11 +831,11 @@ function () {
                     arrayOf(0.2, "rgba(156,107,211,0.3)"),
                     arrayOf(1.0, "rgba(156,107,211,0)")
                 )
-            val gradientColorDic1: Map<String, *> = AAGradientColor.linearGradient(
+            val gradientColorDic1 = AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToBottom,
                 stopsArr
             )
-            val gradientColorDic2: Map<String, *> = AAGradientColor.linearGradient(
+            val gradientColorDic2 = AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToBottom,
                 "#956FD4",
                 "#3EACE5" //颜色字符串设置支持十六进制类型和 rgba 类型
@@ -874,7 +874,7 @@ function () {
             val aaLabels = AALabels()
                 .enabled(true)
                 .style(AAStyle()
-                        .color(AAColor.lightGrayColor()))
+                        .color(AAColor.LightGray))
             val aaXAxis = AAXAxis()
                 .visible(true)
                 .labels(aaLabels)
@@ -915,7 +915,7 @@ function () {
             val aaLegend = AALegend()
                 .enabled(true)
                 .itemStyle(AAItemStyle()
-                        .color(AAColor.lightGrayColor()))
+                        .color(AAColor.LightGray))
                 .floating(true)
                 .layout(AAChartLayoutType.Horizontal)
                 .align(AAChartAlignType.Left)
@@ -975,7 +975,7 @@ function () {
                 .visible(true)
                 .plotLines(arrayOf(
                         AAPlotLinesElement()
-                            .color(AAColor.redColor())
+                            .color(AAColor.Red)
                             .value(0.1523f)
                             .width(1.5f)
                             .label(AALabel()

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/chartcomposer/CustomStyleChartComposer.kt

@@ -54,19 +54,19 @@ class CustomStyleChartComposer  {
             )
 
             val colorsArr = arrayOf<Any>(
-                AAColor.redColor(),
-                AAColor.orangeColor(),
-                AAColor.yellowColor(),
-                AAColor.greenColor(),
-                AAColor.cyanColor(),
-                AAColor.blueColor(),
-                AAColor.purpleColor(),
-                AAColor.grayColor(),
-                AAColor.darkGrayColor(),
-                AAColor.lightGrayColor(),
-                AAColor.magentaColor(),
-                AAColor.brownColor(),
-                AAColor.blackColor()
+                    AAColor.Red,
+                    AAColor.Orange,
+                    AAColor.Yellow,
+                    AAColor.Green,
+                    AAColor.Cyan,
+                    AAColor.Blue,
+                    AAColor.Purple,
+                    AAColor.Gray,
+                    AAColor.DarkGray,
+                    AAColor.LightGray,
+                    AAColor.Magenta,
+                    AAColor.Brown,
+                    AAColor.Black,
             )
 
             return AAChartModel()
@@ -115,30 +115,30 @@ class CustomStyleChartComposer  {
             )
 
             val gradientColorArr = arrayOf<Any>(
-                AAGradientColor.oceanBlueColor(),
-                AAGradientColor.sanguineColor(),
-                AAGradientColor.lusciousLimeColor(),
-                AAGradientColor.purpleLakeColor(),
-                AAGradientColor.freshPapayaColor(),
-                AAGradientColor.ultramarineColor(),
-                AAGradientColor.pinkSugarColor(),
-                AAGradientColor.lemonDrizzleColor(),
-                AAGradientColor.victoriaPurpleColor(),
-                AAGradientColor.springGreensColor(),
-                AAGradientColor.mysticMauveColor(),
-                AAGradientColor.reflexSilverColor(),
-                AAGradientColor.newLeafColor(),
-                AAGradientColor.cottonCandyColor(),
-                AAGradientColor.pixieDustColor(),
-                AAGradientColor.fizzyPeachColor(),
-                AAGradientColor.sweetDreamColor(),
-                AAGradientColor.firebrickColor(),
-                AAGradientColor.wroughtIronColor(),
-                AAGradientColor.deepSeaColor(),
-                AAGradientColor.coastalBreezeColor(),
-                AAGradientColor.eveningDelightColor(),
-                AAGradientColor.neonGlowColor(),
-                AAGradientColor.berrySmoothieColor()
+                    AAGradientColor.OceanBlue,
+                    AAGradientColor.Sanguine,
+                    AAGradientColor.LusciousLime,
+                    AAGradientColor.PurpleLake,
+                    AAGradientColor.FreshPapaya,
+                    AAGradientColor.Ultramarine,
+                    AAGradientColor.PinkSugar,
+                    AAGradientColor.LemonDrizzle,
+                    AAGradientColor.VictoriaPurple,
+                    AAGradientColor.SpringGreens,
+                    AAGradientColor.MysticMauve,
+                    AAGradientColor.ReflexSilver,
+                    AAGradientColor.NewLeaf,
+                    AAGradientColor.CottonCandy,
+                    AAGradientColor.PixieDust,
+                    AAGradientColor.FizzyPeach,
+                    AAGradientColor.SweetDream,
+                    AAGradientColor.Firebrick,
+                    AAGradientColor.WroughtIron,
+                    AAGradientColor.DeepSea,
+                    AAGradientColor.CoastalBreeze,
+                    AAGradientColor.EveningDelight,
+                    AAGradientColor.NeonGlow,
+                    AAGradientColor.BerrySmoothie
             )
 
             return AAChartModel()
@@ -170,7 +170,7 @@ class CustomStyleChartComposer  {
                         .name("Tokyo")
                         .data(arrayOf(
                             arrayOf<Any?>(6.9, 9.5, 14.5, 18.2, 21.5, null, null, null, null, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6)))
-                        .color(AAGradientColor.deepSeaColor())))
+                        .color(AAGradientColor.DeepSea)))
         }
 
         fun configureColorfulColumnChart(): AAChartModel {
@@ -225,7 +225,7 @@ class CustomStyleChartComposer  {
                             .offsetY(15.0f)
                             .opacity(0.2f)
                             .width(8.0f)
-                            .color(AAColor.redColor()))))
+                            .color(AAColor.Red))))
         }
 
         fun configureColorfulGradientAreaChart(): AAChartModel {
@@ -367,7 +367,7 @@ class CustomStyleChartComposer  {
 
         internal fun configureSpecialStyleColumnOfSingleDataElementChart(): AAChartModel {
             val singleSpecialData = AADataElement()
-                .color(AAGradientColor.freshPapayaColor())
+                .color(AAGradientColor.FreshPapaya)
                 .y(49.5f)
 
             return AAChartModel()
@@ -384,7 +384,8 @@ class CustomStyleChartComposer  {
                             .name("Virtual Data")
                             .lineWidth(6f)
                             .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, singleSpecialData, 5.2, 26.5, 23.3, 26.5, 13.9, 9.6))
-                            .color(AAGradientColor.oceanBlueColor())))
+                            .color(AAGradientColor.OceanBlue)
+                ))
         }
 
         internal fun configureAreaChartThreshold(): AAChartModel {
@@ -619,7 +620,7 @@ class CustomStyleChartComposer  {
                         .format(formatStr)
                         .style(AAStyle()
                                 .fontWeight(AAChartFontWeightType.Bold)
-                                .color(AAColor.whiteColor())
+                                .color(AAColor.White)
                                 .fontSize(16f))
                         .y(-35f)
                         .align(AAChartAlignType.Center)
@@ -658,17 +659,16 @@ class CustomStyleChartComposer  {
                             .allowPointSelect(true)
                             .states(AAStates()
                                     .hover(AAHover()
-                                            .color("rgba(220,20,60,1)")
-                                    ) //猩红色, alpha 透明度 1
+                                            .color("rgba(220,20,60,1)")) //猩红色, alpha 透明度 1
                                     .select(AASelect()
-                                            .color(AAColor.redColor())))))
+                                            .color(AAColor.Red)))))
         }
 
         fun customChartHoverAndSelectHaloStyle(): AAChartModel {
             return AAChartModel()
                 .chartType(AAChartType.Line)
                 .title("Custom Chart Hover And Select Halo Style")
-                .colorsTheme(arrayOf(AAColor.redColor()))
+                .colorsTheme(arrayOf(AAColor.Red))
                 .yAxisReversed(true)
                 .xAxisReversed(true)
                 .markerRadius(20f)
@@ -717,9 +717,9 @@ class CustomStyleChartComposer  {
                             .marker(AAMarker()
                                     .states(AAMarkerStates()
                                             .hover(AAMarkerHover()
-                                                    .fillColor(AAColor.whiteColor())
+                                                    .fillColor(AAColor.White)
                                                     .radius(40f)
-                                                    .lineColor(AAColor.greenColor())
+                                                    .lineColor(AAColor.Green)
                                                     .lineWidth(20f))))
                             .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, 21.5, 5.2, 26.5, 23.3, 45.3, 13.9, 9.6))))
         }
@@ -741,7 +741,7 @@ class CustomStyleChartComposer  {
                 "闪客",
                 "忍者之印"
             )
-            val colorsTheme: Array<Any> = arrayOf(
+            val colorsTheme = arrayOf<Any>(
                 "#fe117c",
                 "#ffc069",
                 "#06caf4",
@@ -753,10 +753,10 @@ class CustomStyleChartComposer  {
                     AADataLabels()
                         .y(-10f)
                         .format("{total} mm")
-                        .color(AAColor.redColor())
+                        .color(AAColor.Red)
                         .shape("callout")
-                        .backgroundColor(AAColor.whiteColor())
-                        .borderColor(AAColor.redColor())
+                        .backgroundColor(AAColor.White)
+                        .borderColor(AAColor.Red)
                         .borderRadius(1f)
                         .borderWidth(1f)
                 )

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/chartcomposer/CustomTooltipComposer.kt

@@ -262,7 +262,7 @@ function () {
                     AASeriesElement()
                         .name("Observed Data")
                         .color("#ef476f")
-                        .fillColor(AAGradientColor.deepSeaColor())
+                        .fillColor(AAGradientColor.DeepSea)
                         .data(arrayOf(
                             arrayOf(760, 801, 848, 895, 965),
                             arrayOf(733, 853, 939, 980, 1080),
@@ -358,7 +358,7 @@ function () {
                 .style(AAStyle()
                     .fontSize(10f)
                     .fontWeight(AAChartFontWeightType.Bold)
-                    .color(AAColor.grayColor()))
+                    .color(AAColor.Gray))
                 .formatter("""
 function () {
         var yValue = this.value;
@@ -382,7 +382,7 @@ function () {
                 .opposite(true)
                 .tickWidth(2f)
                 .lineWidth(1.5f)//Y轴轴线颜色
-                .lineColor(AAColor.lightGrayColor())//Y轴轴线颜色
+                .lineColor(AAColor.LightGray)//Y轴轴线颜色
                 .gridLineWidth(0f)//Y轴网格线宽度
                 .tickPositions(arrayOf(0, 2500, 5000, 7500, 10000))
                 .labels(aaYAxisLabels)

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/chartcomposer/MixedChartComposer.kt

@@ -168,9 +168,9 @@ companion object {
             .stacking(AAChartStackingType.Normal)
             .legendEnabled(true)
             .colorsTheme(arrayOf(
-                AAGradientColor.oceanBlueColor(),
-                AAGradientColor.sanguineColor(),
-                AAGradientColor.lusciousLimeColor()))
+                AAGradientColor.OceanBlue,
+                AAGradientColor.Sanguine,
+                AAGradientColor.LusciousLime))
             .series(arrayOf(
                 AASeriesElement()
                     .name("新用户")
@@ -179,7 +179,7 @@ companion object {
                         AADataLabels()
                         .enabled(true)
                         .style(AAStyle()
-                                .color(AAColor.redColor())
+                                .color(AAColor.Red)
                                 .fontSize(11f))),
                 AASeriesElement()
                     .name("老用户")
@@ -622,7 +622,7 @@ companion object {
             .marker(AAMarker()
                     .fillColor("#1E90FF")
                     .lineWidth(2.0f)
-                    .lineColor(AAColor.whiteColor()
+                    .lineColor(AAColor.White
                     ))
         val pieElement = AAPie()
             .type(AAChartType.Pie)
@@ -635,25 +635,25 @@ companion object {
                     AADataElement()
                         .name("Ada")
                         .y(13.0f)
-                        .color(AAGradientColor.oceanBlueColor())
+                        .color(AAGradientColor.OceanBlue)
                     ,
                     AADataElement()
                         .name("Bob")
                         .y(13.0f)
-                        .color(AAGradientColor.sanguineColor())
+                        .color(AAGradientColor.Sanguine)
                     ,
                     AADataElement()
                         .name("Coco")
                         .y(13.0f)
-                        .color(AAGradientColor.purpleLakeColor())
+                        .color(AAGradientColor.PurpleLake)
                 ))
 
         return AAChartModel()
             .stacking(AAChartStackingType.Normal)
             .colorsTheme(arrayOf(
-                    AAGradientColor.oceanBlueColor(),
-                    AAGradientColor.sanguineColor(),
-                    AAGradientColor.purpleLakeColor()
+                    AAGradientColor.OceanBlue,
+                    AAGradientColor.Sanguine,
+                    AAGradientColor.PurpleLake
                 ))
             .dataLabelsEnabled(false)
             .series(arrayOf(

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/chartcomposer/SpecialChartComposer.kt

@@ -801,7 +801,7 @@ object SpecialChartComposer{
                 AASeriesElement()
                     .name("Observed Data")
                     .color("#ef476f")
-                    .fillColor(AAGradientColor.firebrickColor())
+                    .fillColor(AAGradientColor.Firebrick)
                     .data(arrayOf(
                         arrayOf(760, 801, 848, 895, 965),
                         arrayOf(733, 853, 939, 980,1080),
@@ -894,7 +894,7 @@ object SpecialChartComposer{
                         .enabled(true)
                         .inside(true)
                         .verticalAlign(AAChartVerticalAlignType.Middle)
-                        .color(AAColor.blackColor())
+                        .color(AAColor.Black)
                         .style(AAStyle()
                             .fontSize(25f)
                             .textOutline("0px 0px contrast")))
@@ -921,13 +921,12 @@ object SpecialChartComposer{
                         .color("#06caf4")
                         .data(arrayOf(49.9, 71.5, 106.4, 129.2, 144.0, 176.0,
                             135.6, 148.5, 216.4, 194.1, 95.6, 54.4
-                            ))
-                    ,
+                            )),
                     AASeriesElement()
                         .name("降雨误差")
                         .type(AAChartType.Errorbar)
                         .lineWidth(2.5f)
-                        .color(AAColor.redColor())
+                        .color(AAColor.Red)
                         .data(arrayOf(
                                 arrayOf(48,   51),
                                 arrayOf(68,   73),