Add toDictionaryProp method for AAButtonTheme

Author: AAChartModel

AAInfographics/AAOptionsModel/AAButtonTheme.swift

@@ -181,6 +181,47 @@ public class AAButtonTheme: AAObject {
         return self
     }
 
+    /*
+     public func toDictionaryProp() -> [String: Any]? {
+         var dic = [String: Any]()
+         if let fill = fill {
+             dic["fill"] = fill
+         }
+         if let stroke = stroke {
+             dic["stroke"] = stroke
+         }
+         if let strokeWidth = strokeWidth {
+             dic["stroke-width"] = strokeWidth
+         }
+         return dic
+     }
+     */
+    public func toDictionaryProp() -> [String: Any]? {
+        var dic = [String: Any]()
+        if let fill = fill {
+            dic["fill"] = fill
+        }
+        if let padding = padding {
+            dic["padding"] = padding
+        }
+        if let r = r {
+            dic["r"] = r
+        }
+        if let states = states {
+            dic["states"] = states.toDic() as Any
+        }
+        if let stroke = stroke {
+            dic["stroke"] = stroke
+        }
+        if let strokeWidth = strokeWidth {
+            dic["stroke-width"] = strokeWidth
+        }
+        if let style = style {
+            dic["style"] = style.toDic() as Any
+        }
+        return dic
+    }
+    
     public override init() {
 
     }

AAInfographics/AAOptionsModel/AAChart.swift

@@ -449,7 +449,7 @@ public class AAMouseWheel: AAObject {
 public class AAResetButton: AAObject {
     public var position: AAPosition?
     public var relativeTo: String?
-    public var theme: AAButtonTheme?
+    public var theme: [String: Any]?
 
     @discardableResult
     public func position(_ prop: AAPosition?) -> AAResetButton {
@@ -465,7 +465,7 @@ public class AAResetButton: AAObject {
 
     @discardableResult
     public func theme(_ prop: AAButtonTheme?) -> AAResetButton {
-        theme = prop
+        theme = prop?.toDictionaryProp()
         return self
     }
 

AAInfographicsDemo/Demo/AdditionalContent2/AABaseChartVC.swift

@@ -261,7 +261,7 @@ class AABaseChartVC: UIViewController {
                 .theme(AAButtonTheme()
                     .fill(AAColor.yellow)
                     .stroke(AAColor.green)
-//                    .strokeWidth(6)
+                    .strokeWidth(3)
                     .r(3)
                     .states(AAButtonThemeStates()
                         .hover(AAButtonThemeStatesHover()