Optimize Float type be Number type

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

@@ -1,19 +1,19 @@
 package com.github.aachartmodel.aainfographics.aaoptionsmodel
 
 class AAScrollablePlotArea {
-    var minHeight: Int? = null
-    var minWidth: Int? = null
+    var minHeight: Number? = null
+    var minWidth: Number? = null
     var opacity: Float? = null
-    var scrollPositionX: Float? = null
-    var scrollPositionY: Float? = null
+    var scrollPositionX: Number? = null
+    var scrollPositionY: Number? = null
 
 
-    fun minHeight(prop: Int?): AAScrollablePlotArea {
+    fun minHeight(prop: Number?): AAScrollablePlotArea {
         minHeight = prop
         return this
     }
 
-    fun minWidth(prop: Int?): AAScrollablePlotArea {
+    fun minWidth(prop: Number?): AAScrollablePlotArea {
         minWidth = prop
         return this
     }
@@ -23,12 +23,12 @@ class AAScrollablePlotArea {
         return this
     }
 
-    fun scrollPositionX(prop: Float?): AAScrollablePlotArea {
+    fun scrollPositionX(prop: Number?): AAScrollablePlotArea {
         scrollPositionX = prop
         return this
     }
 
-    fun scrollPositionY(prop: Float?): AAScrollablePlotArea {
+    fun scrollPositionY(prop: Number?): AAScrollablePlotArea {
         scrollPositionY = prop
         return this
     }

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

@@ -15,9 +15,9 @@ class AASeries {
     var borderColor //The border color, It is only valid for column, bar, pie, columnrange, pyramid and funnel chart types
             : String? = null
     var borderWidth //The border width, It is only valid for column, bar, pie, columnrange, pyramid and funnel chart types
-            : Float? = null
+            : Number? = null
     var borderRadius //The corner radius of the border surrounding each column or bar.
-            : Float? = null
+            : Number? = null
     var borderRadiusTopLeft: Any? = null
     var borderRadiusTopRight: Any? = null
     var borderRadiusBottomLeft: Any? = null
@@ -35,19 +35,19 @@ class AASeries {
     var pointInterval: Int? = null
     var pointIntervalUnit: String? = null
     var pointPlacement: Any? = null
-    var pointStart: Float? = null
+    var pointStart: Number? = null
 
     fun borderColor(prop: String?): AASeries {
         borderColor = prop
         return this
     }
 
-    fun borderWidth(prop: Float?): AASeries {
+    fun borderWidth(prop: Number?): AASeries {
         borderWidth = prop
         return this
     }
 
-    fun borderRadius(prop: Float?): AASeries {
+    fun borderRadius(prop: Number?): AASeries {
         borderRadius = prop
         return this
     }
@@ -137,7 +137,7 @@ class AASeries {
         return this
     }
 
-    fun pointStart(prop: Float): AASeries {
+    fun pointStart(prop: Number): AASeries {
         pointStart = prop
         return this
     }

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

@@ -10,22 +10,22 @@ package com.github.aachartmodel.aainfographics.aaoptionsmodel
 
 class AAShadow {
     private var color: String? = null
-    private var offsetX: Float? = null
-    private var offsetY: Float? = null
+    private var offsetX: Number? = null
+    private var offsetY: Number? = null
     private var opacity: Float? = null
-    private var width: Float? = null
+    private var width: Number? = null
 
     fun color(prop: String): AAShadow {
         color = prop
         return this
     }
 
-    fun offsetX(prop: Float?): AAShadow {
+    fun offsetX(prop: Number?): AAShadow {
         offsetX = prop
         return this
     }
 
-    fun offsetY(prop: Float?): AAShadow {
+    fun offsetY(prop: Number?): AAShadow {
         offsetY = prop
         return this
     }
@@ -35,7 +35,7 @@ class AAShadow {
         return this
     }
 
-    fun width(prop: Float?): AAShadow {
+    fun width(prop: Number?): AAShadow {
         width = prop
         return this
     }

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

@@ -92,7 +92,7 @@ class AASelect {
 class AAHalo {
     var attributes: Map<*, *>? = null
     var opacity: Float? = null
-    var size: Float? = null
+    var size: Number? = null
 
     fun attributes(prop: Map<*, *>?): AAHalo {
         attributes = prop
@@ -104,7 +104,7 @@ class AAHalo {
         return this
     }
 
-    fun size(prop: Float?): AAHalo {
+    fun size(prop: Number?): AAHalo {
         size = prop
         return this
     }

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

@@ -167,14 +167,14 @@ class AAStyle {
 
         fun style(
             color: String?,
-            fontSize: Float?
+            fontSize: Number?
         ): AAStyle {
             return style(color, fontSize, null)
         }
 
         fun style(
             color: String?,
-            fontSize: Float?,
+            fontSize: Number?,
             fontWeight: AAChartFontWeightType?
         ): AAStyle {
             return style(color, fontSize, fontWeight, null)
@@ -182,7 +182,7 @@ class AAStyle {
 
         fun style(
             color: String?,
-            fontSize: Float?,
+            fontSize: Number?,
             fontWeight: AAChartFontWeightType?,
             textOutline: String?
         ): AAStyle {

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

@@ -17,8 +17,8 @@ class AASubtitle {
     private var style: AAStyle? = null
     private var align: String? = null
     private var verticalAlign: String? = null
-    private var x: Float? = null
-    private var y: Float? = null
+    private var x: Number? = null
+    private var y: Number? = null
     private var userHTML: Boolean? = null
 
     fun text(prop: String?): AASubtitle {
@@ -41,12 +41,12 @@ class AASubtitle {
         return this
     }
 
-    fun x(prop: Float?): AASubtitle {
+    fun x(prop: Number?): AASubtitle {
         x = prop
         return this
     }
 
-    fun y(prop: Float?): AASubtitle {
+    fun y(prop: Number?): AASubtitle {
         y = prop
         return this
     }

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

@@ -16,8 +16,8 @@ class AATitle {
     private var style: AAStyle? = null
     private var align: String? = null
     private var verticalAlign: String? = null
-    private var x: Float? = null
-    private var y: Float? = null
+    private var x: Number? = null
+    private var y: Number? = null
     private var userHTML: Boolean? = null
 
     fun text(prop: String?): AATitle {
@@ -40,12 +40,12 @@ class AATitle {
         return this
     }
 
-    fun x(prop: Float?): AATitle {
+    fun x(prop: Number?): AATitle {
         x = prop
         return this
     }
 
-    fun y(prop: Float?): AATitle {
+    fun y(prop: Number?): AATitle {
         y = prop
         return this
     }

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

@@ -41,8 +41,8 @@ import com.github.aachartmodel.aainfographics.aatools.AAJSStringPurer
 class AATooltip {
     var backgroundColor: Any? = null
     var borderColor: String? = null
-    var borderRadius: Float? = null
-    var borderWidth: Float? = null
+    var borderRadius: Number? = null
+    var borderWidth: Number? = null
     var style: AAStyle? = null
     var enabled: Boolean? = null
     var useHTML: Boolean? = null
@@ -55,7 +55,7 @@ class AATooltip {
     var valueSuffix: String? = null
     var followTouchMove: Boolean? = null //https://api.highcharts.com.cn/highcharts#chart.panning
     var shadow: Boolean? = null
-    var padding: Float? = null
+    var padding: Number? = null
     var pointFormatter: String? = null
     var positioner: String? = null
     var dateTimeLabelFormats: AADateTimeLabelFormats? = null
@@ -70,12 +70,12 @@ class AATooltip {
         return this
     }
 
-    fun borderRadius(prop: Float?): AATooltip {
+    fun borderRadius(prop: Number?): AATooltip {
         borderRadius = prop
         return this
     }
 
-    fun borderWidth(prop: Float?): AATooltip {
+    fun borderWidth(prop: Number?): AATooltip {
         borderWidth = prop
         return this
     }
@@ -142,7 +142,7 @@ class AATooltip {
         return this
     }
 
-    fun padding(prop: Float): AATooltip {
+    fun padding(prop: Number): AATooltip {
         padding = prop
         return this
     }