Update BasicChartActivity.kt

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

@@ -38,6 +38,7 @@ import com.github.aachartmodel.aainfographics.aachartcreator.*
 import com.github.aachartmodel.aainfographics.aatools.AAGradientColor
 import com.github.aachartmodel.aainfographics.aatools.AALinearGradientDirection
 import com.github.aachartmodel.aainfographics.demo.R
+import com.github.aachartmodel.aainfographics.demo.chartcomposer.BasicChartComposer
 import com.google.gson.Gson
 
 open class BasicChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListener,
@@ -69,30 +70,9 @@ open class BasicChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeL
         val intent = intent
         chartType = intent.getStringExtra("chartType").toString()
         val position = intent.getIntExtra("position", 0)
+        aaChartModel = BasicChartComposer.configureAreaChart()
         val chartTypeEnum = convertStringToEnum(chartType)
-
-        val aaChartModel = AAChartModel.Builder(this)
-            .setChartType(chartTypeEnum)
-            .setBackgroundColor("#4b2b7f")
-            .setDataLabelsEnabled(false)
-            .setYAxisGridLineWidth(0f)
-            .setLegendEnabled(false)
-            .setTouchEventEnabled(true)
-            .setSeries(
-                AASeriesElement()
-                    .name("Tokyo")
-                    .data(arrayOf(7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6)),
-                AASeriesElement()
-                    .name("NewYork")
-                    .data(arrayOf(0.2, 0.8, 5.7, 11.3, 17.0, 22.0, 24.8, 24.1, 20.1, 14.1, 8.6, 2.5)),
-                AASeriesElement()
-                    .name("London")
-                    .data(arrayOf(0.9, 0.6, 3.5, 8.4, 13.5, 17.0, 18.6, 17.9, 14.3, 9.0, 3.9, 1.0)),
-                AASeriesElement()
-                    .name("Berlin")
-                    .data(arrayOf(3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8))
-            )
-            .build()
+        aaChartModel.chartType(chartTypeEnum)
 
         configureTheStyleForDifferentTypeChart(chartType,position)
         configureViewsVisibility(chartType)
@@ -113,7 +93,7 @@ open class BasicChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeL
         }
     }
 
-    fun configureViewsVisibility(chartType: String) {
+    private fun configureViewsVisibility(chartType: String) {
         val squareCornersRadio: RadioGroup = findViewById(R.id.cornerStyleTypeRadioGroup)
         val markerSymbolTypeRadioGroup: RadioGroup = findViewById(R.id.markerSymbolTypeRadioGroup)
         if (chartType == AAChartType.Column.value || chartType == AAChartType.Bar.value) {