Add AARgba() function to simplify samples code

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

@@ -27,6 +27,12 @@
  */
 package com.github.aachartmodel.aainfographics.aatools
 
+ fun AARgba(red: Int,
+            green: Int,
+            blue: Int,
+            alpha: Float = 1f): String {
+     return "rgba($red,$green,$blue,$alpha)"
+ }
 
 object AAColor {
     val Black = blackColor()

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

@@ -1,11 +1,3 @@
-/**
- * Copyright (C), 2015-2019, 飞牛集达有限公司
- * FileName: AAJSStringPurer
- * Author: ios-fn
- * Date: 2019-06-16 19:05
- * Description:
- * History:
- */
 /**
  * ◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉ ...... SOURCE CODE ......◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉
  * ◉◉◉...................................................       ◉◉◉

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

@@ -599,14 +599,14 @@ class CustomStyleChartComposer  {
 
         fun customSpecialStyleDataLabelOfSingleDataElementChart(): AAChartModel {
             val redStopsArr = arrayOf(
-                    arrayOf(0.0, AAColor.rgbaColor(255, 0, 0, 0.6f)),
-                    arrayOf(0.5, AAColor.rgbaColor(255, 0, 0, 0.0f)),
-                    arrayOf(1.0, AAColor.rgbaColor(255, 0, 0, 0.0f))
+                arrayOf(0.0, AARgba(255, 0, 0, 0.6f)),
+                arrayOf(0.5, AARgba(255, 0, 0, 0.0f)),
+                arrayOf(1.0, AARgba(255, 0, 0, 0.0f))
                 )
             val gradientColorDic1= AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToTop,
-                AAColor.rgbaColor(255, 215, 0, 0.1f),
-                AAColor.rgbaColor(255, 215, 0, 0.6f)
+                AARgba(255, 215, 0, 0.1f),
+                AARgba(255, 215, 0, 0.6f)
             )
             val formatStr =
                 "<img src=\"https://www.highcharts.com/samples/graphics/sun.png\">" +
@@ -693,8 +693,8 @@ class CustomStyleChartComposer  {
                                                     .opacity(1.0f)
                                                     .attributes(mapOf(
                                                         "stroke-width" to 150,
-                                                        "fill" to AAColor.rgbaColor(138, 43, 226, 1f),
-                                                        "stroke" to AAColor.rgbaColor(30, 144, 255, 1f)
+                                                        "fill" to AARgba(138, 43, 226, 1f),
+                                                        "stroke" to AARgba(30, 144, 255, 1f)
                                                     )))))))
         }
 
@@ -970,9 +970,9 @@ class CustomStyleChartComposer  {
         // GitHub issue https://github.com/AAChartModel/AAChartKit-Swift/issues/223
         fun configureColorfulGradientColorAndColorfulDataLabelsStepAreaChart(): AAChartModel {
             val blueStopsArr: Array<Any> = arrayOf(
-                    arrayOf(0.0, AAColor.rgbaColor(30, 144, 255, 1.0f)),
-                    arrayOf(0.5, AAColor.rgbaColor(30, 144, 255, 0.2f)),
-                    arrayOf(1.0, AAColor.rgbaColor(30, 144, 255, 0.0f))
+                arrayOf(0.0, AARgba(30, 144, 255, 1.0f)),
+                arrayOf(0.5, AARgba(30, 144, 255, 0.2f)),
+                arrayOf(1.0, AARgba(30, 144, 255, 0.0f))
                 )
             val gradientBlueColorDic = AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToBottom,
@@ -980,9 +980,9 @@ class CustomStyleChartComposer  {
             )
 
             val redStopsArr: Array<Any> = arrayOf(
-                arrayOf(0.0, AAColor.rgbaColor(255, 0, 0, 1.0f)),
-                arrayOf(0.5, AAColor.rgbaColor(255, 0, 0, 0.2f)),
-                arrayOf(1.0, AAColor.rgbaColor(255, 0, 0, 0.0f))
+                arrayOf(0.0, AARgba(255, 0, 0, 1.0f)),
+                arrayOf(0.5, AARgba(255, 0, 0, 0.2f)),
+                arrayOf(1.0, AARgba(255, 0, 0, 0.0f))
             )
             val gradientRedColorDic = AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToBottom,
@@ -990,9 +990,9 @@ class CustomStyleChartComposer  {
             )
 
             val goldStopsArr: Array<Any> = arrayOf(
-                arrayOf(0.0, AAColor.rgbaColor(255, 215, 0, 1.0f)),
-                arrayOf(0.5, AAColor.rgbaColor(255, 215, 0, 0.2f)),
-                arrayOf(1.0, AAColor.rgbaColor(255, 215, 0, 0.0f))
+                arrayOf(0.0, AARgba(255, 215, 0, 1.0f)),
+                arrayOf(0.5, AARgba(255, 215, 0, 0.2f)),
+                arrayOf(1.0, AARgba(255, 215, 0, 0.0f))
             )
             val gradientGoldColorDic = AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToBottom,
@@ -1000,9 +1000,9 @@ class CustomStyleChartComposer  {
             )
 
             val greenStopsArr: Array<Any> = arrayOf(
-                arrayOf(0.0, AAColor.rgbaColor(50, 205, 50, 1.0f)),
-                arrayOf(0.5, AAColor.rgbaColor(50, 205, 50, 0.2f)),
-                arrayOf(1.0, AAColor.rgbaColor(50, 205, 50, 0.0f))
+                arrayOf(0.0, AARgba(50, 205, 50, 1.0f)),
+                arrayOf(0.5, AARgba(50, 205, 50, 0.2f)),
+                arrayOf(1.0, AARgba(50, 205, 50, 0.0f))
             )
             val gradientGreenColorDic = AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToBottom,

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

@@ -669,9 +669,9 @@ companion object {
     //GitHub issue https://github.com/AAChartModel/AAChartKit/issues/921
     private fun configureNegativeColorMixedAreasplineChart(): AAChartModel? {
         val blueStopsArr: Array<Any> = arrayOf(
-                arrayOf(0.0, AAColor.rgbaColor(30, 144, 255, 0.0f)),
-                arrayOf(0.5, AAColor.rgbaColor(30, 144, 255, 0.0f)),
-                arrayOf(1.0, AAColor.rgbaColor(30, 144, 255, 0.6f))
+                arrayOf(0.0, AARgba(30, 144, 255, 0.0f)),
+                arrayOf(0.5, AARgba(30, 144, 255, 0.0f)),
+                arrayOf(1.0, AARgba(30, 144, 255, 0.6f))
             )
         val gradientBlueColorDic = AAGradientColor.linearGradient(
             AALinearGradientDirection.ToTop,
@@ -679,9 +679,9 @@ companion object {
         )
 
         val redStopsArr: Array<Any> = arrayOf(
-            arrayOf(0.0, AAColor.rgbaColor(255, 0, 0, 0.6f)),
-            arrayOf(0.5, AAColor.rgbaColor(255, 0, 0, 0.0f)),
-            arrayOf(1.0, AAColor.rgbaColor(255, 0, 0, 0.0f))
+            arrayOf(0.0, AARgba(255, 0, 0, 0.6f)),
+            arrayOf(0.5, AARgba(255, 0, 0, 0.0f)),
+            arrayOf(1.0, AARgba(255, 0, 0, 0.0f))
         )
         val gradientRedColorDic = AAGradientColor.linearGradient(
             AALinearGradientDirection.ToTop,
@@ -703,8 +703,8 @@ companion object {
                         -7.0, -6.9, -2.5, -14.5, -18.2, -21.5, -5.2, -26.5, -23.3, -45.3, -13.9, -9.6
                     ))
                     .lineWidth(5f)
-                    .color(AAColor.rgbaColor(30, 144, 255, 1.0f))
-                    .negativeColor(AAColor.rgbaColor(255, 0, 0, 1.0f))
+                    .color(AARgba(30, 144, 255, 1.0f))
+                    .negativeColor(AARgba(255, 0, 0, 1.0f))
                     .fillColor(gradientBlueColorDic)
                     .negativeFillColor(gradientRedColorDic)
                     .threshold(0f) //default:0