Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor/cleanup #4268

Merged
merged 4 commits into from
Jan 23, 2020
Merged

Refactor/cleanup #4268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ec4ee6
Removed redundant minEntries > 0
danielgindi Jan 23, 2020
91f2b2b
Propagate file header to newer files
danielgindi Jan 23, 2020
c65c948
Unified styling
danielgindi Jan 23, 2020
db95c0f
Deduplicate BalloonMarker code
danielgindi Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
225B363A1F6EBA040005B3D5 /* DateValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36361F6EB9FE0005B3D5 /* DateValueFormatter.swift */; };
225B363B1F6EBA040005B3D5 /* LargeValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36371F6EB9FE0005B3D5 /* LargeValueFormatter.swift */; };
225B36401F6EBA1D0005B3D5 /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B363D1F6EBA180005B3D5 /* XYMarkerView.swift */; };
225B36411F6EBA1D0005B3D5 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B363E1F6EBA180005B3D5 /* BalloonMarker.swift */; };
225B36421F6EBA1D0005B3D5 /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B363F1F6EBA180005B3D5 /* RadarMarkerView.swift */; };
225B365B1F6EBA470005B3D5 /* MultipleLinesChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36441F6EBA410005B3D5 /* MultipleLinesChartViewController.swift */; };
225B365C1F6EBA470005B3D5 /* MultipleBarChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36451F6EBA410005B3D5 /* MultipleBarChartViewController.swift */; };
Expand Down Expand Up @@ -80,6 +79,8 @@
5B0CC7851ABB875400665592 /* PieChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B0CC7831ABB875400665592 /* PieChartViewController.m */; };
5B0CC7861ABB875400665592 /* PieChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B0CC7841ABB875400665592 /* PieChartViewController.xib */; };
5B1B5DAB1E911A15006D1375 /* RealmDemosViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */; };
5B442CD223D9B0A300B1F801 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
5B442CD323D9B0AB00B1F801 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
5B57BBB51A9B26AA0036A6CC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB41A9B26AA0036A6CC /* main.m */; };
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB71A9B26AA0036A6CC /* AppDelegate.m */; };
5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */; };
Expand All @@ -93,7 +94,6 @@
5B8EAF301AB32E15009697AA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF2F1AB32E15009697AA /* Images.xcassets */; };
5B9624411B38608C007763E2 /* NegativeStackedBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */; };
5B9624421B38608C007763E2 /* NegativeStackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */; };
5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
5BD47E601ABB3C91008FCEC6 /* LineChart2ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */; };
5BD47E611ABB3C91008FCEC6 /* LineChart2ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */; };
5BD47E651ABB424E008FCEC6 /* BarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E631ABB424E008FCEC6 /* BarChartViewController.m */; };
Expand Down Expand Up @@ -208,7 +208,6 @@
225B36361F6EB9FE0005B3D5 /* DateValueFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateValueFormatter.swift; sourceTree = "<group>"; };
225B36371F6EB9FE0005B3D5 /* LargeValueFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeValueFormatter.swift; sourceTree = "<group>"; };
225B363D1F6EBA180005B3D5 /* XYMarkerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XYMarkerView.swift; sourceTree = "<group>"; };
225B363E1F6EBA180005B3D5 /* BalloonMarker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BalloonMarker.swift; sourceTree = "<group>"; };
225B363F1F6EBA180005B3D5 /* RadarMarkerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadarMarkerView.swift; sourceTree = "<group>"; };
225B36441F6EBA410005B3D5 /* MultipleLinesChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipleLinesChartViewController.swift; sourceTree = "<group>"; };
225B36451F6EBA410005B3D5 /* MultipleBarChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipleBarChartViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -259,7 +258,7 @@
5B96243E1B38608C007763E2 /* NegativeStackedBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NegativeStackedBarChartViewController.h; sourceTree = "<group>"; };
5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NegativeStackedBarChartViewController.m; sourceTree = "<group>"; };
5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NegativeStackedBarChartViewController.xib; sourceTree = "<group>"; };
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonMarker.swift; sourceTree = "<group>"; };
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BalloonMarker.swift; path = "../../Objective-C/Components/BalloonMarker.swift"; sourceTree = "<group>"; };
5BD47E5C1ABB0273008FCEC6 /* ChartsDemo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ChartsDemo-Bridging-Header.h"; sourceTree = "<group>"; };
5BD47E5D1ABB3C91008FCEC6 /* LineChart2ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineChart2ViewController.h; sourceTree = "<group>"; };
5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LineChart2ViewController.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -383,7 +382,7 @@
225B363C1F6EBA180005B3D5 /* Components */ = {
isa = PBXGroup;
children = (
225B363E1F6EBA180005B3D5 /* BalloonMarker.swift */,
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */,
225B363F1F6EBA180005B3D5 /* RadarMarkerView.swift */,
225B363D1F6EBA180005B3D5 /* XYMarkerView.swift */,
);
Expand Down Expand Up @@ -530,7 +529,6 @@
5BD47E541ABB0177008FCEC6 /* Components */ = {
isa = PBXGroup;
children = (
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */,
5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */,
5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */,
);
Expand Down Expand Up @@ -796,10 +794,10 @@
225B366A1F6EBA470005B3D5 /* CubicLineChartViewController.swift in Sources */,
225B36671F6EBA470005B3D5 /* PositiveNegativeBarChartViewController.swift in Sources */,
225B363A1F6EBA040005B3D5 /* DateValueFormatter.swift in Sources */,
5B442CD223D9B0A300B1F801 /* BalloonMarker.swift in Sources */,
225B366D1F6EBA470005B3D5 /* PiePolylineChartViewController.swift in Sources */,
225B366F1F6EBA470005B3D5 /* BarChartViewController.swift in Sources */,
225B36601F6EBA470005B3D5 /* LineChart2ViewController.swift in Sources */,
225B36411F6EBA1D0005B3D5 /* BalloonMarker.swift in Sources */,
225B366C1F6EBA470005B3D5 /* HorizontalBarChartViewController.swift in Sources */,
225B36401F6EBA1D0005B3D5 /* XYMarkerView.swift in Sources */,
225B36421F6EBA1D0005B3D5 /* RadarMarkerView.swift in Sources */,
Expand Down Expand Up @@ -836,6 +834,7 @@
5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */,
5BD47E651ABB424E008FCEC6 /* BarChartViewController.m in Sources */,
5BDEDC471ABB871E007D3A60 /* CombinedChartViewController.m in Sources */,
5B442CD323D9B0AB00B1F801 /* BalloonMarker.swift in Sources */,
5BE377F21D47FDF1006EB34F /* IntAxisValueFormatter.m in Sources */,
5BD8F0741AB89CE500566E05 /* LineChart1ViewController.m in Sources */,
5BE377DE1D425151006EB34F /* DayAxisValueFormatter.m in Sources */,
Expand All @@ -845,7 +844,6 @@
5BEAED251ABC0BE20013F194 /* MultipleBarChartViewController.m in Sources */,
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */,
55E356511ADC638F00A57971 /* BubbleChartViewController.m in Sources */,
5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */,
5BEAED2C1ABC160F0013F194 /* CandleStickChartViewController.m in Sources */,
5BEAED271ABC0BE20013F194 /* MultipleLinesChartViewController.m in Sources */,
5BE6739A1D5BAD7E00A87BA2 /* DateValueFormatter.m in Sources */,
Expand Down
209 changes: 0 additions & 209 deletions ChartsDemo-iOS/Swift/Components/BalloonMarker.swift
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions Source/Charts/Renderers/LegendRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,13 @@ open class LegendRenderer: Renderer
for j in 0..<minEntries
{
let label: String?
if (sLabels.count > 0 && minEntries > 0) {
if (sLabels.count > 0)
{
let labelIndex = j % minEntries
label = sLabels.indices.contains(labelIndex) ? sLabels[labelIndex] : nil
} else {
}
else
{
label = nil
}

Expand Down
17 changes: 12 additions & 5 deletions Source/Charts/Utils/ChartUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,20 @@ import CoreGraphics
import Cocoa
#endif

extension Comparable {
func clamped(to range: ClosedRange<Self>) -> Self {
if self > range.upperBound {
extension Comparable
{
func clamped(to range: ClosedRange<Self>) -> Self
{
if self > range.upperBound
{
return range.upperBound
} else if self < range.lowerBound {
}
else if self < range.lowerBound
{
return range.lowerBound
} else {
}
else
{
return self
}
}
Expand Down
11 changes: 11 additions & 0 deletions Source/Charts/Utils/Platform+Accessibility.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
//
// Platform+Accessibility.swift
// Charts
//
// Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
// A port of MPAndroidChart for iOS
// Licensed under Apache License 2.0
//
// https://github.com/danielgindi/Charts
//

import Foundation

#if os(iOS) || os(tvOS)
Expand Down
6 changes: 5 additions & 1 deletion Source/Charts/Utils/Platform+Color.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
// Platform+Color.swift
// Charts
//
// Created by Jacob Christie on 2019-10-15.
// Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
// A port of MPAndroidChart for iOS
// Licensed under Apache License 2.0
//
// https://github.com/danielgindi/Charts
//

#if canImport(UIKit)
Expand Down
8 changes: 6 additions & 2 deletions Source/Charts/Utils/Platform+Gestures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
//
// Platform+Gestures.swift
//
// Charts
//
// Created by Jacob Christie on 2019-10-15.
// Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
// A port of MPAndroidChart for iOS
// Licensed under Apache License 2.0
//
// https://github.com/danielgindi/Charts
//

// MARK: - UIKit
Expand Down
8 changes: 6 additions & 2 deletions Source/Charts/Utils/Platform+Graphics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
//
// Platform+Graphics.swift
//
// Charts
//
// Created by Jacob Christie on 2019-10-15.
// Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
// A port of MPAndroidChart for iOS
// Licensed under Apache License 2.0
//
// https://github.com/danielgindi/Charts
//

// MARK: - UIKit
Expand Down
Loading