Merge AAOptions && AAOptionsConstructor

charts/src/main/java/com/github/aachartmodel/aainfographics/aachartcreator/AAChartModel.kt

@@ -28,7 +28,6 @@
 
 package com.github.aachartmodel.aainfographics.aachartcreator
 
-import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAOptions
 import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAScrollablePlotArea
 import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAStyle
 
@@ -462,6 +461,6 @@ class AAChartModel {
 }
 
 
-fun AAChartModel.aa_toAAOptions(): AAOptions{
+fun AAChartModel.aa_toAAOptions(): AAOptions {
     return AAOptionsConstructor.configureChartOptions(this)
 }

charts/src/main/java/com/github/aachartmodel/aainfographics/aachartcreator/AAChartView.kt

@@ -39,7 +39,6 @@ import android.content.Context
 import android.os.Build
 import android.util.AttributeSet
 import android.webkit.*
-import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAOptions
 import com.github.aachartmodel.aainfographics.aatools.AAJSStringPurer
 import com.google.gson.Gson
 import com.google.gson.internal.LinkedTreeMap

charts/src/main/java/com/github/aachartmodel/aainfographics/aachartcreator/AAOptionsConstructor.kt → charts/src/main/java/com/github/aachartmodel/aainfographics/aachartcreator/AAOptions.kt

@@ -1,10 +1,3 @@
-/**
-//  AAChartModel.java
-//  ChartCore-Slim
-//
-//  Created by AnAn on 2018/12/08.
-//  Copyright © 2018年 An An. All rights reserved.
- */
 /**
  * ◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉ ...... SOURCE CODE ......◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉
  * ◉◉◉...................................................       ◉◉◉
@@ -36,6 +29,113 @@ package com.github.aachartmodel.aainfographics.aachartcreator
 
 import com.github.aachartmodel.aainfographics.aaoptionsmodel.*
 
+class AAOptions {
+    var chart: AAChart? = null
+    var title: AATitle? = null
+    var subtitle: AASubtitle? = null
+    var xAxis: AAXAxis? = null
+    var yAxis: AAYAxis? = null
+    var xAxisArray: Array<AAXAxis>? = null
+    var yAxisArray: Array<AAYAxis>? = null
+    var tooltip: AATooltip? = null
+    var plotOptions: AAPlotOptions? = null
+    var series: Array<AASeriesElement>? = null
+    var legend: AALegend? = null
+    var pane: AAPane? = null
+    var colors: Array<Any>? = null
+    var credits: AACredits? = null
+    var defaultOptions: AALang? = null
+    var touchEventEnabled: Boolean? = null
+
+    fun chart(prop: AAChart): AAOptions {
+        chart = prop
+        return this
+    }
+
+    fun title(prop: AATitle): AAOptions {
+        title = prop
+        return this
+    }
+
+    fun subtitle(prop: AASubtitle): AAOptions {
+        subtitle = prop
+        return this
+    }
+
+    fun xAxis(prop: AAXAxis): AAOptions {
+        xAxis = prop
+        return this
+    }
+
+    fun yAxis(prop: AAYAxis): AAOptions {
+        yAxis = prop
+        return this
+    }
+
+    fun xAxisArray(prop: Array<AAXAxis>): AAOptions {
+        xAxisArray = prop
+        return this
+    }
+
+    fun yAxisArray(prop: Array<AAYAxis>): AAOptions {
+        yAxisArray = prop
+        return this
+    }
+
+    fun tooltip(prop: AATooltip): AAOptions {
+        tooltip = prop
+        return this
+    }
+
+    fun plotOptions(prop: AAPlotOptions): AAOptions {
+        plotOptions = prop
+        return this
+    }
+
+    fun series(prop: Array<AASeriesElement>?): AAOptions {
+        series = prop
+        return this
+    }
+
+    fun legend(prop: AALegend): AAOptions {
+        legend = prop
+        return this
+    }
+
+    fun pane(prop: AAPane?): AAOptions {
+        pane = prop
+        return this
+    }
+
+    fun colors(prop: Array<Any>?): AAOptions {
+        colors = prop
+        return this
+    }
+
+    fun credits(prop: AACredits): AAOptions {
+        credits = prop
+        return this
+    }
+
+    fun defaultOptions(prop: AALang): AAOptions {
+        defaultOptions = prop
+        return this
+    }
+
+    fun touchEventEnabled(prop: Boolean?): AAOptions {
+        touchEventEnabled = prop
+        return this
+    }
+
+
+     init {
+        val aaCredits = AACredits()
+        aaCredits.enabled = false
+        credits = aaCredits
+    }
+}
+
+
 object AAOptionsConstructor {
     fun configureChartOptions(
         aaChartModel: AAChartModel
@@ -67,15 +167,15 @@ object AAOptionsConstructor {
 
         val aaPlotOptions = AAPlotOptions()
             .series(AASeries()
-                    .stacking(aaChartModel.stacking) //设置是否百分比堆叠显示图形
+                .stacking(aaChartModel.stacking) //设置是否百分比堆叠显示图形
             )
 
         if (aaChartModel.animationType != AAChartAnimationType.Linear) {
             aaPlotOptions.series?.animation(
-                    AAAnimation()
-                        .easing(aaChartModel.animationType)
-                        .duration(aaChartModel.animationDuration)
-                )
+                AAAnimation()
+                    .easing(aaChartModel.animationType)
+                    .duration(aaChartModel.animationDuration)
+            )
         }
 
         configureAAPlotOptionsMarkerStyle(aaChartModel, aaPlotOptions)
@@ -84,7 +184,7 @@ object AAOptionsConstructor {
         val aaLegend = AALegend()
             .enabled(aaChartModel.legendEnabled) //是否显示 legend
             .itemStyle(AAItemStyle()
-                    .color(aaChartModel.axesTextColor))
+                .color(aaChartModel.axesTextColor))
 
         val aaOptions = AAOptions()
             .chart(aaChart)
@@ -205,7 +305,7 @@ object AAOptionsConstructor {
                 .enabled(aaXAxisLabelsEnabled) //设置 x 轴是否显示文字
             if (aaXAxisLabelsEnabled!!) {
                 aaXAxisLabels.style(
-                        AAStyle()
+                    AAStyle()
                         .color(aaChartModel.axesTextColor)
                 )
             }
@@ -223,7 +323,7 @@ object AAOptionsConstructor {
                 .enabled(aaChartModel.yAxisLabelsEnabled)
             if (aaYAxisLabelsEnabled!!) {
                 aaYAxisLabels.style(
-                        AAStyle()
+                    AAStyle()
                         .color(aaChartModel.axesTextColor)
                 )
             }
@@ -236,10 +336,10 @@ object AAOptionsConstructor {
                 .reversed(aaChartModel.yAxisReversed)
                 .gridLineWidth(aaChartModel.yAxisGridLineWidth) //y轴网格线宽度
                 .title(AATitle()
-                        .text(aaChartModel.yAxisTitle)
-                        .style(AAStyle()
-                                .color(aaChartModel.axesTextColor)
-                        )
+                    .text(aaChartModel.yAxisTitle)
+                    .style(AAStyle()
+                        .color(aaChartModel.axesTextColor)
+                    )
                 ) //y 轴标题
                 .lineWidth(aaChartModel.yAxisLineWidth) //设置 y轴轴线的宽度,为0即是隐藏 y轴轴线
                 .visible(aaChartModel.yAxisVisible)

charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAOptions.kt

@@ -1,117 +0,0 @@
-/**
- * Copyright (C), 2015-2019
- * FileName: AAOptions
- * Author: AnAn
- * Date: 2019-08-30 14:18
- * Description:
- * History:
- */
-package com.github.aachartmodel.aainfographics.aaoptionsmodel
-
-import com.github.aachartmodel.aainfographics.aachartcreator.AASeriesElement
-
-class AAOptions {
-    var chart: AAChart? = null
-    var title: AATitle? = null
-    var subtitle: AASubtitle? = null
-    var xAxis: AAXAxis? = null
-    var yAxis: AAYAxis? = null
-    var xAxisArray: Array<AAXAxis>? = null
-    var yAxisArray: Array<AAYAxis>? = null
-    var tooltip: AATooltip? = null
-    var plotOptions: AAPlotOptions? = null
-    var series: Array<AASeriesElement>? = null
-    var legend: AALegend? = null
-    var pane: AAPane? = null
-    var colors: Array<Any>? = null
-    var credits: AACredits? = null
-    var defaultOptions: AALang? = null
-    var touchEventEnabled: Boolean? = null
-
-    fun chart(prop: AAChart): AAOptions {
-        chart = prop
-        return this
-    }
-
-    fun title(prop: AATitle): AAOptions {
-        title = prop
-        return this
-    }
-
-    fun subtitle(prop: AASubtitle): AAOptions {
-        subtitle = prop
-        return this
-    }
-
-    fun xAxis(prop: AAXAxis): AAOptions {
-        xAxis = prop
-        return this
-    }
-
-    fun yAxis(prop: AAYAxis): AAOptions {
-        yAxis = prop
-        return this
-    }
-
-    fun xAxisArray(prop: Array<AAXAxis>): AAOptions {
-        xAxisArray = prop
-        return this
-    }
-
-    fun yAxisArray(prop: Array<AAYAxis>): AAOptions {
-        yAxisArray = prop
-        return this
-    }
-
-    fun tooltip(prop: AATooltip): AAOptions {
-        tooltip = prop
-        return this
-    }
-
-    fun plotOptions(prop: AAPlotOptions): AAOptions {
-        plotOptions = prop
-        return this
-    }
-
-    fun series(prop: Array<AASeriesElement>?): AAOptions {
-        series = prop
-        return this
-    }
-
-    fun legend(prop: AALegend): AAOptions {
-        legend = prop
-        return this
-    }
-
-    fun pane(prop: AAPane?): AAOptions {
-        pane = prop
-        return this
-    }
-
-    fun colors(prop: Array<Any>?): AAOptions {
-        colors = prop
-        return this
-    }
-
-    fun credits(prop: AACredits): AAOptions {
-        credits = prop
-        return this
-    }
-
-    fun defaultOptions(prop: AALang): AAOptions {
-        defaultOptions = prop
-        return this
-    }
-
-    fun touchEventEnabled(prop: Boolean?): AAOptions {
-        touchEventEnabled = prop
-        return this
-    }
-
-
-     init {
-        val aaCredits = AACredits()
-        aaCredits.enabled = false
-        credits = aaCredits
-    }
-}

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

@@ -5,7 +5,7 @@ import android.os.Handler
 import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
 import com.github.aachartmodel.aainfographics.aachartcreator.*
-import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAOptions
+import com.github.aachartmodel.aainfographics.aachartcreator.AAOptions
 import com.github.aachartmodel.aainfographics.aatools.AAColor
 import com.github.aachartmodel.aainfographics.aatools.AAGradientColor
 import com.github.aachartmodel.aainfographics.demo.R

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

@@ -31,7 +31,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 
 import com.github.aachartmodel.aainfographics.aachartcreator.AAChartView
-import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAOptions
+import com.github.aachartmodel.aainfographics.aachartcreator.AAOptions
 import com.github.aachartmodel.aainfographics.demo.R
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.ChartOptionsComposer.Companion.configureAAPlotBandsForChart
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.ChartOptionsComposer.Companion.configureAAPlotLinesForChart

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

@@ -31,7 +31,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 
 import com.github.aachartmodel.aainfographics.aachartcreator.AAChartView
-import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAOptions
+import com.github.aachartmodel.aainfographics.aachartcreator.AAOptions
 import com.github.aachartmodel.aainfographics.demo.R
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithColorfulHtmlLabels
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithDifferentUnitSuffix

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

@@ -32,7 +32,7 @@ import android.os.Handler
 import androidx.appcompat.app.AppCompatActivity
 
 import com.github.aachartmodel.aainfographics.aachartcreator.*
-import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAOptions
+import com.github.aachartmodel.aainfographics.aachartcreator.AAOptions
 import com.github.aachartmodel.aainfographics.aatools.AAGradientColor
 import com.github.aachartmodel.aainfographics.demo.R
 import kotlin.math.cos

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

@@ -1,6 +1,5 @@
 package com.github.aachartmodel.aainfographics.demo.additionalcontent
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.github.aachartmodel.aainfographics.aachartcreator.*

sample/src/main/java/com/github/aachartmodel/aainfographics/demo/basiccontent/MainActivity.kt

@@ -146,7 +146,7 @@ class MainActivity : AppCompatActivity() {
                 AAChartType.Area.value,
                 AAChartType.Line.value,
                 AAChartType.Line.value,
-                AAChartType.Spline
+                AAChartType.Spline.value
             ), arrayOf( /*特殊类型图表*/
                 AAChartType.Column.value,
                 AAChartType.Pie.value,

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

@@ -296,7 +296,7 @@ function () {
             return aaOptions
         }
 
-         fun customYAxisLabels():AAOptions {
+         fun customYAxisLabels(): AAOptions {
             val aaChartModel = AAChartModel()
                 .chartType(AAChartType.Line)//图形类型
                 .title("")//图表主标题
@@ -338,7 +338,7 @@ function () {
             return aaOptions
         }
 
-         fun customYAxisLabels2():AAOptions {
+         fun customYAxisLabels2(): AAOptions {
             val aaChartModel = AAChartModel()
                 .chartType(AAChartType.Line)//图形类型
                 .title("")//图表主标题
@@ -390,7 +390,7 @@ function () {
             return aaOptions
         }
 
-         fun customStackedAndGroupedColumnChartTooltip():AAOptions {
+         fun customStackedAndGroupedColumnChartTooltip(): AAOptions {
             val aaChartModel = AAChartModel()
                 .title("Total fruit consumption, grouped by gender")
                 .subtitle("stacked and grouped")
@@ -441,7 +441,7 @@ function () {
             return aaOptions
         }
 
-         fun customDoubleXAxesChart():AAOptions {
+         fun customDoubleXAxesChart(): AAOptions {
             val gradientColorDic1 = AAGradientColor.linearGradient(
                 AALinearGradientDirection.ToTop,
                 "#7052f4",
@@ -537,7 +537,7 @@ function () {
                 .series(arrayOf(aaSeriesElement1, aaSeriesElement2))
         }
 
-         fun customArearangeChartTooltip():AAOptions {
+         fun customArearangeChartTooltip(): AAOptions {
           val aaChartModel =  AAChartModel()
                 .chartType(AAChartType.Areasplinerange)
                 .title("Area spline range chart")