diff --git a/AAInfographics/AAChartCreator/AAChartModel.swift b/AAInfographics/AAChartCreator/AAChartModel.swift index 6e56d9c0..2209bb95 100755 --- a/AAInfographics/AAChartCreator/AAChartModel.swift +++ b/AAInfographics/AAChartCreator/AAChartModel.swift @@ -498,104 +498,4 @@ public class AAChartModel: AAObject { borderRadius = 0 markerRadius = 5 //The radius of the polyline connection point. If the default value is set to 0, then this is equivalent to not displaying. } - - - - @available(*, unavailable, message: "please use titleStyle instead of it") - public var titleFontColor: String? //The chart title font color - @available(*, unavailable, message: "please use titleStyle instead of it") - public var titleFontSize: Float? //The chart title font size - @available(*, unavailable, message: "please use titleStyle instead of it") - public var titleFontWeight: AAChartFontWeightType? //The chart font weight - - @available(*, unavailable, message: "please use subtitleStyle instead of it") - public var subtitleFontColor: String? //The chart subtitle font color - @available(*, unavailable, message: "please use subtitleStyle instead of it") - public var subtitleFontSize: Float? //The chart subtitle font size - @available(*, unavailable, message: "please use subtitleStyle instead of it") - public var subtitleFontWeight: AAChartFontWeightType? //The chart subtitle font weight - - @available(*, unavailable, message: "please use dataLabelsStyle instead of it") - public var dataLabelsFontColor: String? //The data labels font color - @available(*, unavailable, message: "please use dataLabelsStyle instead of it") - public var dataLabelsFontSize: Float? //The data labels font size - @available(*, unavailable, message: "please use dataLabelsStyle instead of it") - public var dataLabelsFontWeight: AAChartFontWeightType?//The data labels font weight - - @available(*, unavailable, message: "please use xAxisLabelsStyle or yAxisLabelsStyle instead of it") - public var axesTextColor: String? //The labels font color of chart x axis and y axis - - @available(*, unavailable, message: "This property is useless now, please remove it directly") - public var touchEventEnabled: Bool? //Support touch event call back or not - - - @available(*, unavailable, message: "please use titleStyle instead of it") - public func titleFontColor(_ prop: String) -> AAChartModel { -// titleFontColor = prop - return self - } - - @available(*, unavailable, message: "please use titleStyle instead of it") - public func titleFontSize(_ prop: Float?) -> AAChartModel { -// titleFontSize = prop - return self - } - - @available(*, unavailable, message: "please use titleStyle instead of it") - public func titleFontWeight(_ prop: AAChartFontWeightType) -> AAChartModel { -// titleFontWeight = prop - return self - } - - - @available(*, unavailable, message: "please use subtitleStyle instead of it") - public func subtitleFontColor(_ prop: String) -> AAChartModel { -// subtitleFontColor = prop - return self - } - - @available(*, unavailable, message: "please use subtitleStyle instead of it") - public func subtitleFontSize(_ prop: Float?) -> AAChartModel { -// subtitleFontSize = prop - return self - } - - @available(*, unavailable, message: "please use subtitleStyle instead of it") - public func subtitleFontWeight(_ prop: AAChartFontWeightType) -> AAChartModel { -// subtitleFontWeight = prop - return self - } - - - @available(*, unavailable, message: "please use dataLabelsStyle instead of it") - public func dataLabelsFontColor(_ prop: String) -> AAChartModel { -// dataLabelsFontColor = prop - return self - } - - @available(*, unavailable, message: "please use dataLabelsStyle instead of it") - public func dataLabelsFontSize(_ prop: Float?) -> AAChartModel { -// dataLabelsFontSize = prop - return self - } - - @available(*, unavailable, message: "please use dataLabelsStyle instead of it") - public func dataLabelsFontWeight(_ prop: AAChartFontWeightType) -> AAChartModel { -// dataLabelsFontWeight = prop - return self - } - - @available(*, unavailable, message: "please use xAxisLabelsStyle or yAxisLabelsStyle instead of it") - public func axesTextColor(_ prop: String) -> AAChartModel { -// axesTextColor = prop - return self - } - - @available(*, unavailable, message: "This setter function is useless now, please remove it directly") - public func touchEventEnabled(_ prop: Bool) -> AAChartModel { -// touchEventEnabled = prop - return self - } - - } diff --git a/AAInfographics/AAChartCreator/AAChartView.swift b/AAInfographics/AAChartCreator/AAChartView.swift index d1e9af02..5f55c1a8 100644 --- a/AAInfographics/AAChartCreator/AAChartView.swift +++ b/AAInfographics/AAChartCreator/AAChartView.swift @@ -32,9 +32,6 @@ import WebKit -let kUserContentMessageNameClick = "click" -let kUserContentMessageNameMouseOver = "mouseover" - @available(iOS 10.0, macCatalyst 13.1, macOS 10.13, *) @objc public protocol AAChartViewDelegate: NSObjectProtocol { @objc optional func aaChartViewDidFinishLoad(_ aaChartView: AAChartView) @@ -79,6 +76,9 @@ public class AALeakAvoider : NSObject, WKScriptMessageHandler { @available(iOS 10.0, macCatalyst 13.1, macOS 10.13, *) public class AAChartView: WKWebView { + let kUserContentMessageNameClick = "click" + let kUserContentMessageNameMouseOver = "mouseover" + private var clickEventEnabled: Bool? private var touchEventEnabled: Bool? @@ -105,8 +105,6 @@ public class AAChartView: WKWebView { // MARK: - Setter Method #if os(iOS) - @available(*, unavailable, message: "This property was renamed, please use isScrollEnabled instead of it") - public var scrollEnabled: Bool? public var isScrollEnabled: Bool? { willSet { scrollView.isScrollEnabled = newValue! @@ -390,7 +388,7 @@ extension AAChartView { extension AAChartView { /// A common chart update function /// (you can update any chart element) to open, close, delete, add, resize, reformat, etc. elements in the chart. - /// Refer to https://api.highcharts.com.cn/highcharts#Chart.update + /// Refer to https://api.highcharts.com/highcharts#Chart.update /// /// It should be noted that when updating the array configuration, /// for example, when updating configuration attributes including arrays such as xAxis, yAxis, series, etc., the updated data will find existing objects based on id and update them. If no id is configured or passed If the id does not find the corresponding object, the first element of the array is updated. Please refer to this example for details. @@ -452,7 +450,7 @@ extension AAChartView { /// Add a new point to the data column after the chart has been rendered. /// The new point can be the last point, or it can be placed in the corresponding position given the X value (first, middle position, depending on the x value) - /// Refer to https://api.highcharts.com.cn/highcharts#Series.addPoint + /// Refer to https://api.highcharts.com/highcharts#Series.addPoint /// /// - Parameter elementIndex: The specific series element /// - Parameter options: The configuration of the data point can be a single value, indicating the y value of the data point; it can also be an array containing x and y values; it can also be an object containing detailed data point configuration. For detailed configuration, see series.data. @@ -501,7 +499,7 @@ extension AAChartView { } /// Add a new series element to the chart after the chart has been rendered. - /// Refer to https://api.highcharts.com.cn/highcharts#Chart.addSeries + /// Refer to https://api.highcharts.com/highcharts#Chart.addSeries /// /// - Parameter element: chart series element public func aa_addElementToChartSeries(element: AASeriesElement) { @@ -512,7 +510,7 @@ extension AAChartView { } /// Remove a specific series element from the chart after the chart has been rendered. - /// Refer to https://api.highcharts.com.cn/highcharts#Series.remove + /// Refer to https://api.highcharts.com/highcharts#Series.remove /// /// - Parameter elementIndex: chart series element index public func aa_removeElementFromChartSeries(elementIndex: Int) { @@ -583,7 +581,7 @@ extension AAChartView { } /// Set the chart view content be adaptive to screen rotation with custom animation effect - /// Refer to https://api.highcharts.com.cn/highcharts#Chart.setSize + /// Refer to https://api.highcharts.com/highcharts#Chart.setSize /// /// - Parameter animation: The instance object of AAAnimation public func aa_adaptiveScreenRotationWithAnimation(_ animation: AAAnimation) { @@ -591,8 +589,11 @@ extension AAChartView { forName: UIDevice.orientationDidChangeNotification, object: nil, queue: nil) { [weak self] _ in - self?.handleDeviceOrientationChangeEventWithAnimation(animation) - } + //Delay execution by 0.01 seconds to prevent incorrect screen width and height obtained when the screen is rotated + DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) { + self?.handleDeviceOrientationChangeEventWithAnimation(animation) + } + } } private func handleDeviceOrientationChangeEventWithAnimation(_ animation: AAAnimation) { diff --git a/AAInfographics/AAChartCreator/AASeriesElement.swift b/AAInfographics/AAChartCreator/AASeriesElement.swift index 0d4c02f4..a0668877 100755 --- a/AAInfographics/AAChartCreator/AASeriesElement.swift +++ b/AAInfographics/AAChartCreator/AASeriesElement.swift @@ -69,13 +69,14 @@ public class AASeriesElement: AAObject { public var stack: String? public var tooltip: AATooltip? public var pointPlacement: Any? + public var pointPadding: Float? public var enableMouseTracking: Bool? public var dataSorting: AADataSorting? public var reversed: Bool? //Only useful for pyramid chart and funnel chart public var id: String? public var connectNulls: Bool? //Whether to connect a graph line across null points. default value：false. public var enabledCrosshairs: Bool? - + public var jitter: AAJitter? //Only useful for scatter chart and bubble chart @discardableResult public func type(_ prop: AAChartType) -> AASeriesElement { @@ -304,6 +305,12 @@ public class AASeriesElement: AAObject { pointPlacement = prop return self } + + @discardableResult + public func pointPadding(_ prop: Float) -> AASeriesElement { + pointPadding = prop + return self + } @discardableResult public func enableMouseTracking(_ prop: Bool) -> AASeriesElement { @@ -340,6 +347,12 @@ public class AASeriesElement: AAObject { connectNulls = prop return self } + + @discardableResult + public func jitter(_ prop: AAJitter) -> AASeriesElement { + jitter = prop + return self + } public override init() { } diff --git a/AAInfographics/AAOptionsModel/AAAxis.swift b/AAInfographics/AAOptionsModel/AAAxis.swift index 5e015c7a..e2feb754 100644 --- a/AAInfographics/AAOptionsModel/AAAxis.swift +++ b/AAInfographics/AAOptionsModel/AAAxis.swift @@ -49,7 +49,8 @@ public class AAAxis: AAObject { public var plotBands: [AAPlotBandsElement]? public var plotLines: [AAPlotLinesElement]? public var categories: [String]? - public var reversed: Bool? + public var reversed: Bool? //Whether to reverse the axis so that the highest number is closest to the origin. If the chart is inverted, the XOrY-axis is reversed by default. + public var reversedStacks: Bool? public var lineWidth: Float? // XOrY-axis line width public var lineColor: String? // XOrY-axis line color public var linkedTo: Int? @@ -90,9 +91,12 @@ public class AAAxis: AAObject { public var tickInterval: Float? // Number of ticks on the X or Y axis (set the X or Y axis content every few points: public var tickmarkPlacement: String? // This parameter is only valid for the classification axis. When the value is on, the tick mark will be displayed above the classification; when the value is between, the tick mark will be displayed between the two classifications. When tickInterval is 1, the default is between, otherwise it is on. The default is: null. public var tickWidth: Float? // The width of the axis tick marks. When set to 0, tick marks are not displayed. - public var tickLength: Float? /// The length of the axis tick marks. The default is: 10. + public var tickLength: Float? // The length of the axis tick marks. The default is: 10. public var tickPosition: String? // Position of the tick line relative to the axis line. Available values ​​are "inside" and "outside", which represent the inside and outside of the axis line, respectively. The default is: "outside". public var tickPositions: [Any]? // Custom XOrY-axis coordinates + public var height: Any? //number | string + public var top: Any? //number | string + @discardableResult public func allowDecimals(_ prop: Bool?) -> Self { @@ -154,6 +158,12 @@ public class AAAxis: AAObject { return self } + @discardableResult + public func reversedStacks(_ prop: Bool?) -> Self { + reversedStacks = prop + return self + } + @discardableResult public func lineWidth(_ prop: Float?) -> Self { lineWidth = prop @@ -376,6 +386,18 @@ public class AAAxis: AAObject { return self } + @discardableResult + public func height(_ prop: Any?) -> Self { + height = prop + return self + } + + @discardableResult + public func top(_ prop: Any?) -> Self { + top = prop + return self + } + public override init() { } diff --git a/AAInfographics/AAOptionsModel/AABoxplot.swift b/AAInfographics/AAOptionsModel/AABoxplot.swift index 8009eeb1..6e50eb73 100644 --- a/AAInfographics/AAOptionsModel/AABoxplot.swift +++ b/AAInfographics/AAOptionsModel/AABoxplot.swift @@ -35,10 +35,12 @@ import Foundation public class AABoxplot: AAObject { public var boxDashStyle: String? public var fillColor: Any? + public var grouping: Bool?//Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other. default：true. public var lineWidth: Float? public var medianColor: String? public var medianDashStyle: String? public var medianWidth: Float? + public var pointRange: Float? public var stemColor: String? public var stemDashStyle: String? public var stemWidth: Float? @@ -58,6 +60,12 @@ public class AABoxplot: AAObject { fillColor = prop return self } + + @discardableResult + public func grouping(_ prop: Bool?) -> AABoxplot { + grouping = prop + return self + } @discardableResult public func lineWidth(_ prop: Float?) -> AABoxplot { @@ -83,6 +91,12 @@ public class AABoxplot: AAObject { return self } + @discardableResult + public func pointRange(_ prop: Float?) -> AABoxplot { + pointRange = prop + return self + } + @discardableResult public func stemColor(_ prop: String?) -> AABoxplot { stemColor = prop diff --git a/AAInfographics/AAOptionsModel/AAChart.swift b/AAInfographics/AAOptionsModel/AAChart.swift index 5d8de37d..20d01f3a 100644 --- a/AAInfographics/AAOptionsModel/AAChart.swift +++ b/AAInfographics/AAOptionsModel/AAChart.swift @@ -293,11 +293,18 @@ public class AAResetZoomButton: AAObject { } public class AAChartEvents: AAObject { + public var click: String? public var load: String? public var redraw: String? public var render: String? public var selection: String? + + @discardableResult + public func click(_ prop: String?) -> AAChartEvents { + click = prop?.aa_toPureJSString() + return self + } @discardableResult public func load(_ prop: String?) -> AAChartEvents { diff --git a/AAInfographics/AAOptionsModel/AAPlotOptions.swift b/AAInfographics/AAOptionsModel/AAPlotOptions.swift index 2528a61c..c5bc37ec 100644 --- a/AAInfographics/AAOptionsModel/AAPlotOptions.swift +++ b/AAInfographics/AAOptionsModel/AAPlotOptions.swift @@ -134,6 +134,8 @@ public class AAPlotOptions: AAObject { public class AALine: AAObject { public var dataLabels: AADataLabels? + public var lineColor: String? + public var lineWidth: Float? @discardableResult public func dataLabels(_ prop: AADataLabels) -> AALine { @@ -141,17 +143,15 @@ public class AALine: AAObject { return self } - public override init() { - + @discardableResult + public func lineColor(_ prop: String) -> Self { + lineColor = prop + return self } -} -public class AASpline: AAObject { - public var dataLabels: AADataLabels? - @discardableResult - public func dataLabels(_ prop: AADataLabels) -> AASpline { - dataLabels = prop + public func lineWidth(_ prop: Float) -> Self { + lineWidth = prop return self } @@ -160,13 +160,19 @@ public class AASpline: AAObject { } } +public class AASpline: AALine { + + public override init() { + + } +} + public class AAArea: AASeries { public var fillColor: String? public var fillOpacity: Float? public var negativeFillColor: String? public var trackByArea: Bool? public var lineColor: String? - public var lineWidth: Float? @discardableResult public func fillColor(_ prop: String) -> Self { @@ -198,12 +204,6 @@ public class AAArea: AASeries { return self } - @discardableResult - public func lineWidth(_ prop: Float) -> Self { - lineWidth = prop - return self - } - public override init() { } diff --git a/AAInfographics/AAOptionsModel/AAScatter.swift b/AAInfographics/AAOptionsModel/AAScatter.swift index 78b86985..2c0f7105 100644 --- a/AAInfographics/AAOptionsModel/AAScatter.swift +++ b/AAInfographics/AAOptionsModel/AAScatter.swift @@ -40,6 +40,9 @@ public class AAScatter: AAObject { public var linkedTo: String? public var states: AAStates? public var marker: AAMarker? + public var jitter: AAJitter? + public var showInLegend: Bool? + public var tooltip: AATooltip? @discardableResult public func lineWidth(_ prop: Float?) -> AAScatter { @@ -83,6 +86,24 @@ public class AAScatter: AAObject { return self } + @discardableResult + public func jitter(_ prop: AAJitter?) -> AAScatter { + jitter = prop + return self + } + + @discardableResult + public func showInLegend(_ prop: Bool?) -> AAScatter { + showInLegend = prop + return self + } + + @discardableResult + public func tooltip(_ prop: AATooltip?) -> AAScatter { + tooltip = prop + return self + } + public override init() { } @@ -94,7 +115,8 @@ public class AABubble: AAObject { public var zMin: Float? public var zMax: Float? public var dataLabels:AADataLabels? - + public var jitter: AAJitter? + @discardableResult public func minSize(_ prop: Any?) -> AABubble { minSize = prop @@ -124,8 +146,35 @@ public class AABubble: AAObject { dataLabels = prop return self } + + @discardableResult + public func jitter(_ prop: AAJitter?) -> AABubble { + jitter = prop + return self + } public override init() { } } + +public class AAJitter: AAObject { + public var x: Float? + public var y: Float? + + @discardableResult + public func x(_ prop: Float?) -> AAJitter { + x = prop + return self + } + + @discardableResult + public func y(_ prop: Float?) -> AAJitter { + y = prop + return self + } + + public override init() { + + } +} diff --git a/AAInfographics/AAOptionsModel/AASeries.swift b/AAInfographics/AAOptionsModel/AASeries.swift index 49b48a86..02631b93 100644 --- a/AAInfographics/AAOptionsModel/AASeries.swift +++ b/AAInfographics/AAOptionsModel/AASeries.swift @@ -57,15 +57,17 @@ public class AASeries: AAObject { public var maxPointWidth: Float? public var minPointLength: Float? public var tooltip: AATooltip? + public var lineWidth: Float? + @discardableResult - public func borderColor(_ prop: String) -> Self { + public func borderColor(_ prop: String?) -> Self { borderColor = prop return self } @discardableResult - public func borderWidth(_ prop: Float) -> Self { + public func borderWidth(_ prop: Float?) -> Self { borderWidth = prop return self } @@ -208,6 +210,12 @@ public class AASeries: AAObject { return self } + @discardableResult + public func lineWidth(_ prop: Float?) -> Self { + lineWidth = prop + return self + } + public override init() { } diff --git a/AAInfographicsDemo.xcodeproj/project.pbxproj b/AAInfographicsDemo.xcodeproj/project.pbxproj index 6c838a96..49decc09 100644 --- a/AAInfographicsDemo.xcodeproj/project.pbxproj +++ b/AAInfographicsDemo.xcodeproj/project.pbxproj @@ -33,7 +33,13 @@ 44EB70A722BCB606008FECE4 /* JSFunctionForAATooltipVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44EB70A622BCB606008FECE4 /* JSFunctionForAATooltipVC.swift */; }; 58603080BAE839A9CF7C8F73 /* BarOrColumnChartOptionsComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58603443E4FDDF32FE4E4F94 /* BarOrColumnChartOptionsComposer.swift */; }; 58603456B9A269D72A0F9656 /* PieChartOptionsComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58603EE90A0888618D985466 /* PieChartOptionsComposer.swift */; }; + 586035AD1F2AA0AF6BFBDA7D /* LineChartOptionsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5860320C2A4B0800D56FF4E0 /* LineChartOptionsVC.swift */; }; 5860368820ADD4DC745A2997 /* AreaChartOptionsComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5860339F7333DE51631C871D /* AreaChartOptionsComposer.swift */; }; + 840716532A6A79770037193B /* AreaChartOptionsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840716522A6A79770037193B /* AreaChartOptionsVC.swift */; }; + 840716552A6E82290037193B /* MultiYAxesChartOptionsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840716542A6E82290037193B /* MultiYAxesChartOptionsVC.swift */; }; + 840716572A6FC5170037193B /* ScatterChartOptionsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840716562A6FC5170037193B /* ScatterChartOptionsVC.swift */; }; + 840716592A70B69C0037193B /* PieChartOptionsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840716582A70B69C0037193B /* PieChartOptionsVC.swift */; }; + 8407165B2A7393FC0037193B /* ColumnChartOptionsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8407165A2A7393FC0037193B /* ColumnChartOptionsVC.swift */; }; 84086B1628E44B19006BD30D /* JSFunctionForAALegendVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84086B1528E44B19006BD30D /* JSFunctionForAALegendVC.swift */; }; 84086B1B28E45127006BD30D /* JSFunctionForAAAxisVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84086B1A28E45127006BD30D /* JSFunctionForAAAxisVC.swift */; }; 84086B1E28E6C612006BD30D /* CustomTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84086B1C28E6C612006BD30D /* CustomTableViewCell.swift */; }; @@ -195,10 +201,16 @@ 4490BB372388E1AE005B9238 /* AAInfographicsDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AAInfographicsDemo.entitlements; sourceTree = ""; }; 449A0ED52377149D009F8FE1 /* ScrollingUpdateDataVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollingUpdateDataVC.swift; sourceTree = ""; }; 44EB70A622BCB606008FECE4 /* JSFunctionForAATooltipVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSFunctionForAATooltipVC.swift; sourceTree = ""; }; + 5860320C2A4B0800D56FF4E0 /* LineChartOptionsVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartOptionsVC.swift; sourceTree = ""; }; 5860339874E0BA3EA9A9BA0D /* AAPie.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AAPie.swift; sourceTree = ""; }; 5860339F7333DE51631C871D /* AreaChartOptionsComposer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AreaChartOptionsComposer.swift; sourceTree = ""; }; 58603443E4FDDF32FE4E4F94 /* BarOrColumnChartOptionsComposer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarOrColumnChartOptionsComposer.swift; sourceTree = ""; }; 58603EE90A0888618D985466 /* PieChartOptionsComposer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieChartOptionsComposer.swift; sourceTree = ""; }; + 840716522A6A79770037193B /* AreaChartOptionsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AreaChartOptionsVC.swift; sourceTree = ""; }; + 840716542A6E82290037193B /* MultiYAxesChartOptionsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiYAxesChartOptionsVC.swift; sourceTree = ""; }; + 840716562A6FC5170037193B /* ScatterChartOptionsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScatterChartOptionsVC.swift; sourceTree = ""; }; + 840716582A70B69C0037193B /* PieChartOptionsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PieChartOptionsVC.swift; sourceTree = ""; }; + 8407165A2A7393FC0037193B /* ColumnChartOptionsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColumnChartOptionsVC.swift; sourceTree = ""; }; 84086B1528E44B19006BD30D /* JSFunctionForAALegendVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSFunctionForAALegendVC.swift; sourceTree = ""; }; 84086B1A28E45127006BD30D /* JSFunctionForAAAxisVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSFunctionForAAAxisVC.swift; sourceTree = ""; }; 84086B1C28E6C612006BD30D /* CustomTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTableViewCell.swift; sourceTree = ""; }; @@ -443,6 +455,12 @@ isa = PBXGroup; children = ( 447B4B3421C9F40900FDA965 /* DrawChartWithAAOptionsVC.swift */, + 5860320C2A4B0800D56FF4E0 /* LineChartOptionsVC.swift */, + 840716522A6A79770037193B /* AreaChartOptionsVC.swift */, + 8407165A2A7393FC0037193B /* ColumnChartOptionsVC.swift */, + 840716562A6FC5170037193B /* ScatterChartOptionsVC.swift */, + 840716582A70B69C0037193B /* PieChartOptionsVC.swift */, + 840716542A6E82290037193B /* MultiYAxesChartOptionsVC.swift */, ); path = AAOptions; sourceTree = ""; @@ -697,6 +715,8 @@ 84DEB8A028F7A58900BF9423 /* JSFunctionForAATooltipVC2.swift in Sources */, 84086B2128E6F499006BD30D /* JSFunctionForAAOptionsVC.swift in Sources */, 84086B1B28E45127006BD30D /* JSFunctionForAAAxisVC.swift in Sources */, + 840716532A6A79770037193B /* AreaChartOptionsVC.swift in Sources */, + 840716592A70B69C0037193B /* PieChartOptionsVC.swift in Sources */, 276A56FF22C77228007F53E7 /* DoubleChartsLinkedWorkVC.swift in Sources */, 848FEAF7265DF5D3006E4F25 /* TestAAChartViewForXibVC.swift in Sources */, 4419618C230D8EDC00C12AAF /* CustomStyleChartVC.swift in Sources */, @@ -718,14 +738,18 @@ 44EB70A722BCB606008FECE4 /* JSFunctionForAATooltipVC.swift in Sources */, 84B68246266DB09100957FC5 /* AAChartSymbolConstant.swift in Sources */, 84086B1628E44B19006BD30D /* JSFunctionForAALegendVC.swift in Sources */, + 840716572A6FC5170037193B /* ScatterChartOptionsVC.swift in Sources */, 84DEA0D42845ADEB00D0206F /* CustomMouseOutEventCallback.swift in Sources */, 449A0ED62377149D009F8FE1 /* ScrollingUpdateDataVC.swift in Sources */, 447B4B3521C9F40900FDA965 /* DrawChartWithAAOptionsVC.swift in Sources */, 278C55141EE948C900770B97 /* BasicChartVC.swift in Sources */, 84086B1E28E6C612006BD30D /* CustomTableViewCell.swift in Sources */, 5860368820ADD4DC745A2997 /* AreaChartOptionsComposer.swift in Sources */, + 8407165B2A7393FC0037193B /* ColumnChartOptionsVC.swift in Sources */, 58603080BAE839A9CF7C8F73 /* BarOrColumnChartOptionsComposer.swift in Sources */, + 840716552A6E82290037193B /* MultiYAxesChartOptionsVC.swift in Sources */, 58603456B9A269D72A0F9656 /* PieChartOptionsComposer.swift in Sources */, + 586035AD1F2AA0AF6BFBDA7D /* LineChartOptionsVC.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -955,7 +979,7 @@ INFOPLIST_FILE = AAInfographicsDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = Love.AAInfographics; + PRODUCT_BUNDLE_IDENTIFIER = Love.AAInfographics999; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; SWIFT_VERSION = 5.0; diff --git a/AAInfographicsDemo/Base.lproj/LaunchScreen.storyboard b/AAInfographicsDemo/Base.lproj/LaunchScreen.storyboard index 61f37cee..e3a36121 100644 --- a/AAInfographicsDemo/Base.lproj/LaunchScreen.storyboard +++ b/AAInfographicsDemo/Base.lproj/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -21,13 +21,13 @@