Pārlūkot izejas kodu

Optimize AAModels properties access permission

AnAn 4 gadi atpakaļ
vecāks
revīzija
5326e6072b

+ 2 - 2
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAAnimation.kt

@@ -11,8 +11,8 @@ package com.github.aachartmodel.aainfographics.aaoptionsmodel
 import com.github.aachartmodel.aainfographics.aachartcreator.AAChartAnimationType
 
 class AAAnimation {
-    private var duration: Int? = null
-    private var easing: String? = null
+    var duration: Int? = null
+    var easing: String? = null
 
     fun duration(prop: Int?): AAAnimation {
         duration = prop

+ 3 - 3
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AACrosshair.kt

@@ -38,9 +38,9 @@ package com.github.aachartmodel.aainfographics.aaoptionsmodel
 import com.github.aachartmodel.aainfographics.aachartcreator.AAChartLineDashStyleType
 
 class AACrosshair {
-    private var width: Float? = null
-    private var color: String? = null
-    private var dashStyle: AAChartLineDashStyleType? = null
+    var width: Float? = null
+    var color: String? = null
+    var dashStyle: AAChartLineDashStyleType? = null
 
     fun width(prop: Float?): AACrosshair {
         width = prop

+ 2 - 2
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AALabel.kt

@@ -9,8 +9,8 @@
 package com.github.aachartmodel.aainfographics.aaoptionsmodel
 
 class AALabel {
-    private var text: String? = null
-    private var style: Any? = null
+    var text: String? = null
+    var style: Any? = null
 
     fun text(prop: String): AALabel {
         text = prop

+ 16 - 16
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AALegend.kt

@@ -13,19 +13,19 @@ import com.github.aachartmodel.aainfographics.aachartcreator.AAChartLayoutType
 import com.github.aachartmodel.aainfographics.aachartcreator.AAChartVerticalAlignType
 
 class AALegend {
-    private var layout: String? =
+    var layout: String? =
         null //图例数据项的布局。布局类型: "horizontal" 或 "vertical" 即水平布局和垂直布局 默认是:horizontal.
-    private var align: String? = null //设定图例在图表区中的水平对齐方式,合法值有left,center 和 right。
-    private var verticalAlign: String? =
+    var align: String? = null //设定图例在图表区中的水平对齐方式,合法值有left,center 和 right。
+    var verticalAlign: String? =
         null //设定图例在图表区中的垂直对齐方式,合法值有 top,middle 和 bottom。垂直位置可以通过 y 选项做进一步设定。
-    private var enabled: Boolean? = null
-    private var borderColor: String? = null
-    private var borderWidth: Float? = null
-    private var itemMarginTop: Float? = null //图例的每一项的顶部外边距,单位px。 默认是:0.
-    private var itemStyle: AAItemStyle? = null
-    private var x: Float? = null
-    private var y: Float? = null
-    private var floating: Boolean? = null
+    var enabled: Boolean? = null
+    var borderColor: String? = null
+    var borderWidth: Float? = null
+    var itemMarginTop: Float? = null //图例的每一项的顶部外边距,单位px。 默认是:0.
+    var itemStyle: AAItemStyle? = null
+    var x: Float? = null
+    var y: Float? = null
+    var floating: Boolean? = null
 
     fun layout(prop: AAChartLayoutType): AALegend {
         layout = prop.value
@@ -86,11 +86,11 @@ class AALegend {
 }
 
 class AAItemStyle {
-    private var color: String? = null
-    private var cursor: String? = null
-    private var pointer: String? = null
-    private var fontSize: String? = null
-    private var fontWeight: String? = null
+    var color: String? = null
+    var cursor: String? = null
+    var pointer: String? = null
+    var fontSize: String? = null
+    var fontWeight: String? = null
 
 
     fun color(prop: String?): AAItemStyle {

+ 6 - 6
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAMarker.kt

@@ -9,12 +9,12 @@
 package com.github.aachartmodel.aainfographics.aaoptionsmodel
 
 class AAMarker {
-    private var radius: Float? = null
-    private var symbol: String? = null
-    private var fillColor: String? = null//点的填充色(用来设置折线连接点的填充色)
-    private var lineWidth: Float? = null//外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
-    private var lineColor: Any? = null//外沿线的颜色(用来设置折线连接点的轮廓描边颜色,当值为空字符串时,默认取数据点或数据列的颜色。)
-    private var states: AAMarkerStates? = null
+    var radius: Float? = null
+    var symbol: String? = null
+    var fillColor: String? = null//点的填充色(用来设置折线连接点的填充色)
+    var lineWidth: Float? = null//外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
+    var lineColor: Any? = null//外沿线的颜色(用来设置折线连接点的轮廓描边颜色,当值为空字符串时,默认取数据点或数据列的颜色。)
+    var states: AAMarkerStates? = null
 
 
     fun radius(prop: Float?): AAMarker {

+ 15 - 15
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AATooltip.kt

@@ -39,21 +39,21 @@ import com.github.aachartmodel.aainfographics.aatools.AAJSStringPurer
 
 
 class AATooltip {
-    private var backgroundColor: String? = null
-    private var borderColor: String? = null
-    private var borderRadius: Float? = null
-    private var borderWidth: Float? = null
-    private var style: AAStyle? = null
-    private var enabled: Boolean? = null
-    private var useHTML: Boolean? = null
-    private var formatter: String? = null
-    private var headerFormat: String? = null
-    private var pointFormat: String? = null
-    private var footerFormat: String? = null
-    private var valueDecimals: Int? = null
-    private var shared: Boolean? = null
-    private var crosshairs: Boolean? = null
-    private var valueSuffix: String? = null
+    var backgroundColor: String? = null
+    var borderColor: String? = null
+    var borderRadius: Float? = null
+    var borderWidth: Float? = null
+    var style: AAStyle? = null
+    var enabled: Boolean? = null
+    var useHTML: Boolean? = null
+    var formatter: String? = null
+    var headerFormat: String? = null
+    var pointFormat: String? = null
+    var footerFormat: String? = null
+    var valueDecimals: Int? = null
+    var shared: Boolean? = null
+    var crosshairs: Boolean? = null
+    var valueSuffix: String? = null
 
     fun backgroundColor(prop: String): AATooltip {
         backgroundColor = prop