More warning fixes

JBChartView 3.0

CHANGELOG.md

@@ -0,0 +1,606 @@
+# Change Log
+
+## [v3.0.0](https://github.com/Jawbone/JBChartView/tree/v3.0.0) (2016-01-14)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.9.1...v3.0.0)
+
+**Closed issues:**
+
+- Show data above each column   [\#194](https://github.com/Jawbone/JBChartView/issues/194)
+
+**Merged pull requests:**
+
+- JBChartView 3.0 [\#195](https://github.com/Jawbone/JBChartView/pull/195) ([terryworona](https://github.com/terryworona))
+
+## [v2.9.1](https://github.com/Jawbone/JBChartView/tree/v2.9.1) (2015-12-17)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.9.0...v2.9.1)
+
+**Implemented enhancements:**
+
+- Min bars shouldn't animate bars when animating setState [\#192](https://github.com/Jawbone/JBChartView/issues/192)
+
+## [v2.9.0](https://github.com/Jawbone/JBChartView/tree/v2.9.0) (2015-12-04)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.19...v2.9.0)
+
+## [v2.8.19](https://github.com/Jawbone/JBChartView/tree/v2.8.19) (2015-11-23)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.18...v2.8.19)
+
+**Fixed bugs:**
+
+- Straight lines [\#94](https://github.com/Jawbone/JBChartView/issues/94)
+
+## [v2.8.18](https://github.com/Jawbone/JBChartView/tree/v2.8.18) (2015-11-22)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.17...v2.8.18)
+
+**Implemented enhancements:**
+
+- Vertical values should be supplied by the DataSource delegate for LineCharts [\#180](https://github.com/Jawbone/JBChartView/issues/180)
+- JBLineChartDotsView reloadData performance issues [\#179](https://github.com/Jawbone/JBChartView/issues/179)
+
+## [v2.8.17](https://github.com/Jawbone/JBChartView/tree/v2.8.17) (2015-11-21)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.16...v2.8.17)
+
+**Implemented enhancements:**
+
+- Disabling/Enabling certain functionality: line chart selection and x-axis values [\#185](https://github.com/Jawbone/JBChartView/issues/185)
+- Add ability to set selection permanently. [\#153](https://github.com/Jawbone/JBChartView/issues/153)
+- The line fill color doesn't match the bottom of the drawn line [\#146](https://github.com/Jawbone/JBChartView/issues/146)
+
+**Fixed bugs:**
+
+- Bug when quickly tapping a line chart in two different places [\#159](https://github.com/Jawbone/JBChartView/issues/159)
+
+**Closed issues:**
+
+- Show dot only on vertical line selection [\#190](https://github.com/Jawbone/JBChartView/issues/190)
+- Needs to support negative values [\#189](https://github.com/Jawbone/JBChartView/issues/189)
+
+## [v2.8.16](https://github.com/Jawbone/JBChartView/tree/v2.8.16) (2015-09-18)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.15...v2.8.16)
+
+**Closed issues:**
+
+- Partially filled bar [\#186](https://github.com/Jawbone/JBChartView/issues/186)
+
+**Merged pull requests:**
+
+- Delegate call to ignore touches on selected lines [\#188](https://github.com/Jawbone/JBChartView/pull/188) ([andrewloyola](https://github.com/andrewloyola))
+
+## [v2.8.15](https://github.com/Jawbone/JBChartView/tree/v2.8.15) (2015-08-12)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.14...v2.8.15)
+
+**Implemented enhancements:**
+
+- Suggestion for the README.md [\#176](https://github.com/Jawbone/JBChartView/issues/176)
+
+**Fixed bugs:**
+
+- Line color overlap issue [\#168](https://github.com/Jawbone/JBChartView/issues/168)
+
+**Closed issues:**
+
+- JBLineChart reloadData problem [\#181](https://github.com/Jawbone/JBChartView/issues/181)
+- JBLineChartView: wrong width on iPhone6/6+ [\#177](https://github.com/Jawbone/JBChartView/issues/177)
+- Is there anyway to plot two vertical values for one horizontal index in the bar chart? [\#172](https://github.com/Jawbone/JBChartView/issues/172)
+- Charts not rendering properly [\#171](https://github.com/Jawbone/JBChartView/issues/171)
+- How can you set the bar chart to fill the width of a UIView? [\#170](https://github.com/Jawbone/JBChartView/issues/170)
+- Adding X and Y Values [\#169](https://github.com/Jawbone/JBChartView/issues/169)
+- Undefined symbols for architecture i386 [\#167](https://github.com/Jawbone/JBChartView/issues/167)
+- Not All Data Points Visible in Flexible View [\#166](https://github.com/Jawbone/JBChartView/issues/166)
+
+**Merged pull requests:**
+
+- Return the available height instead of 0 [\#183](https://github.com/Jawbone/JBChartView/pull/183) ([0xPr0xy](https://github.com/0xPr0xy))
+- Adds support for gradients to line charts [\#175](https://github.com/Jawbone/JBChartView/pull/175) ([benjaminsnorris](https://github.com/benjaminsnorris))
+
+## [v2.8.14](https://github.com/Jawbone/JBChartView/tree/v2.8.14) (2015-04-30)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.13...v2.8.14)
+
+**Closed issues:**
+
+- Will JBChartView integrated with React Native? [\#164](https://github.com/Jawbone/JBChartView/issues/164)
+- white dot+dotted lines sometimes does not appear when touched. [\#161](https://github.com/Jawbone/JBChartView/issues/161)
+- Small offset when using a footer for a x-axis [\#160](https://github.com/Jawbone/JBChartView/issues/160)
+- gradient for bar chart is lost / sizing problem [\#158](https://github.com/Jawbone/JBChartView/issues/158)
+
+**Merged pull requests:**
+
+- Nil out delegate and datasource on dealloc [\#165](https://github.com/Jawbone/JBChartView/pull/165) ([eventualbuddha](https://github.com/eventualbuddha))
+
+## [v2.8.13](https://github.com/Jawbone/JBChartView/tree/v2.8.13) (2015-04-16)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.12...v2.8.13)
+
+**Fixed bugs:**
+
+- Wrong calculation of the lineIndex  [\#157](https://github.com/Jawbone/JBChartView/issues/157)
+
+**Closed issues:**
+
+- Swift round up for respondsToSelector\(\) and sizeWithFont\(\) [\#156](https://github.com/Jawbone/JBChartView/issues/156)
+
+## [v2.8.12](https://github.com/Jawbone/JBChartView/tree/v2.8.12) (2015-04-13)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.11...v2.8.12)
+
+**Fixed bugs:**
+
+- Footer and Header view Swift implementation [\#152](https://github.com/Jawbone/JBChartView/issues/152)
+
+**Closed issues:**
+
+- Problems with selection when JBLineChartView is within UITableView [\#155](https://github.com/Jawbone/JBChartView/issues/155)
+- Show chart selection permanently [\#151](https://github.com/Jawbone/JBChartView/issues/151)
+- Crash when returning NAN [\#150](https://github.com/Jawbone/JBChartView/issues/150)
+
+**Merged pull requests:**
+
+- Fix warnings when building w/ Xcode 6.3 [\#154](https://github.com/Jawbone/JBChartView/pull/154) ([amro](https://github.com/amro))
+
+## [v2.8.11](https://github.com/Jawbone/JBChartView/tree/v2.8.11) (2015-03-31)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.10...v2.8.11)
+
+**Implemented enhancements:**
+
+- Pass back barView & dot instances on selection [\#118](https://github.com/Jawbone/JBChartView/issues/118)
+- Add ability to have the line start or end at any given point [\#115](https://github.com/Jawbone/JBChartView/issues/115)
+- Consolidate dot view selection/unselection/color calls [\#101](https://github.com/Jawbone/JBChartView/issues/101)
+- Change dot radius to dot diameter [\#99](https://github.com/Jawbone/JBChartView/issues/99)
+- need Swift implementation details and example [\#80](https://github.com/Jawbone/JBChartView/issues/80)
+- Add bar/line caching for only visible content.  [\#61](https://github.com/Jawbone/JBChartView/issues/61)
+
+**Closed issues:**
+
+- Pie Chart support [\#149](https://github.com/Jawbone/JBChartView/issues/149)
+- hi is it possible to have x,y value because in example there is no y value and only 2 x value [\#141](https://github.com/Jawbone/JBChartView/issues/141)
+- imports without pods [\#140](https://github.com/Jawbone/JBChartView/issues/140)
+- How can I group Bars? [\#139](https://github.com/Jawbone/JBChartView/issues/139)
+- request: AreaChart - fillColorForLineAtLineIndex - add custom color for a specific X axis range [\#137](https://github.com/Jawbone/JBChartView/issues/137)
+- smallest value is shown as a blank bar [\#136](https://github.com/Jawbone/JBChartView/issues/136)
+- Is there any way I can use JBBarChartView as horizontal bars? [\#135](https://github.com/Jawbone/JBChartView/issues/135)
+- Multiple colors to a line graph [\#134](https://github.com/Jawbone/JBChartView/issues/134)
+- Overriding - \(void\)barChartView:\(JBBarChartView \*\)barChartView didSelectBarAtIndex:\(NSUInteger\)index  is not showing selection view? [\#133](https://github.com/Jawbone/JBChartView/issues/133)
+- Exception thrown on setState: [\#132](https://github.com/Jawbone/JBChartView/issues/132)
+- X and Y scale and reference values [\#131](https://github.com/Jawbone/JBChartView/issues/131)
+- Determine x-value of a certain point by a number instead of it's index in the input array? [\#130](https://github.com/Jawbone/JBChartView/issues/130)
+- How to accomplish similar didUnselectBarChartView [\#129](https://github.com/Jawbone/JBChartView/issues/129)
+- Is posible - scroll chart [\#126](https://github.com/Jawbone/JBChartView/issues/126)
+- Crash when vertical value for horizontal at index x less than zero [\#125](https://github.com/Jawbone/JBChartView/issues/125)
+- JBBarChartView does not display all the bars [\#124](https://github.com/Jawbone/JBChartView/issues/124)
+- "automatically normalized across the entire chart" [\#123](https://github.com/Jawbone/JBChartView/issues/123)
+- reloadData in viewDidLayoutSubviews does not trigger didDeselectLineInLineChartView on first selection [\#122](https://github.com/Jawbone/JBChartView/issues/122)
+- Question [\#121](https://github.com/Jawbone/JBChartView/issues/121)
+- Sublayers not properly resized [\#120](https://github.com/Jawbone/JBChartView/issues/120)
+- It will be really cool if "while on tap on line charts dots I can get the dot object do some scale animation" or something? [\#119](https://github.com/Jawbone/JBChartView/issues/119)
+- Is there any way I can pass new bar view while user selects particular bar? [\#117](https://github.com/Jawbone/JBChartView/issues/117)
+- Typo error in README [\#114](https://github.com/Jawbone/JBChartView/issues/114)
+- Dynamic/append values [\#113](https://github.com/Jawbone/JBChartView/issues/113)
+- It needs better documentation [\#112](https://github.com/Jawbone/JBChartView/issues/112)
+
+**Merged pull requests:**
+
+- Keep tooltip subviews above line subviews [\#144](https://github.com/Jawbone/JBChartView/pull/144) ([vocaro](https://github.com/vocaro))
+- Fix crash and warnings that can occur when a chart line has no data [\#143](https://github.com/Jawbone/JBChartView/pull/143) ([vocaro](https://github.com/vocaro))
+- Add automatically generated change log file. [\#142](https://github.com/Jawbone/JBChartView/pull/142) ([skywinder](https://github.com/skywinder))
+- Update README.md [\#127](https://github.com/Jawbone/JBChartView/pull/127) ([paal123](https://github.com/paal123))
+- Add ability to have the line start or end at any given point [\#116](https://github.com/Jawbone/JBChartView/pull/116) ([sebastianreloaded](https://github.com/sebastianreloaded))
+
+## [v2.8.10](https://github.com/Jawbone/JBChartView/tree/v2.8.10) (2014-09-23)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.9...v2.8.10)
+
+## [v2.8.9](https://github.com/Jawbone/JBChartView/tree/v2.8.9) (2014-09-22)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.8...v2.8.9)
+
+**Closed issues:**
+
+- JBLineChartView doesn't resize its subviews [\#111](https://github.com/Jawbone/JBChartView/issues/111)
+
+## [v2.8.8](https://github.com/Jawbone/JBChartView/tree/v2.8.8) (2014-09-20)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.7...v2.8.8)
+
+**Fixed bugs:**
+
+- iOS 8 warnings [\#110](https://github.com/Jawbone/JBChartView/issues/110)
+
+**Closed issues:**
+
+- Noob level tutorial [\#109](https://github.com/Jawbone/JBChartView/issues/109)
+- Data points with uneavenly distributed x-values? [\#108](https://github.com/Jawbone/JBChartView/issues/108)
+
+## [v2.8.7](https://github.com/Jawbone/JBChartView/tree/v2.8.7) (2014-09-09)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.6...v2.8.7)
+
+**Implemented enhancements:**
+
+- Add hide custom dot functionality [\#100](https://github.com/Jawbone/JBChartView/issues/100)
+- Add footer padding [\#98](https://github.com/Jawbone/JBChartView/issues/98)
+- DotView is hidden when inside selected table view cell [\#82](https://github.com/Jawbone/JBChartView/issues/82)
+
+**Closed issues:**
+
+- There should be flexibility to change to touch point to nearest data point so vertical selection view just jumps from one data point to another in JBLineChartView. [\#105](https://github.com/Jawbone/JBChartView/issues/105)
+- barWidth Method and  barPadding property should be in JBBarChartView header file. [\#104](https://github.com/Jawbone/JBChartView/issues/104)
+- Why minimum and maximum should be positive? [\#102](https://github.com/Jawbone/JBChartView/issues/102)
+
+**Merged pull requests:**
+
+- iOS Framework Support [\#107](https://github.com/Jawbone/JBChartView/pull/107) ([thefirstnikhil](https://github.com/thefirstnikhil))
+- Only call `numberOfLinesInLineChartView:` once per loop. [\#106](https://github.com/Jawbone/JBChartView/pull/106) ([eventualbuddha](https://github.com/eventualbuddha))
+
+## [v2.8.6](https://github.com/Jawbone/JBChartView/tree/v2.8.6) (2014-08-29)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.5...v2.8.6)
+
+## [v2.8.5](https://github.com/Jawbone/JBChartView/tree/v2.8.5) (2014-08-28)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.4...v2.8.5)
+
+**Implemented enhancements:**
+
+- Invert option for bar charts [\#97](https://github.com/Jawbone/JBChartView/issues/97)
+
+## [v2.8.4](https://github.com/Jawbone/JBChartView/tree/v2.8.4) (2014-08-27)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.3...v2.8.4)
+
+## [v2.8.3](https://github.com/Jawbone/JBChartView/tree/v2.8.3) (2014-08-26)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.2...v2.8.3)
+
+**Implemented enhancements:**
+
+- return type of barPaddingForBarChartView: [\#93](https://github.com/Jawbone/JBChartView/issues/93)
+- Custom dot functionality [\#92](https://github.com/Jawbone/JBChartView/issues/92)
+
+## [v2.8.2](https://github.com/Jawbone/JBChartView/tree/v2.8.2) (2014-08-26)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.1...v2.8.2)
+
+**Fixed bugs:**
+
+- Selection view width should equal bar width [\#96](https://github.com/Jawbone/JBChartView/issues/96)
+
+**Closed issues:**
+
+- Changing dot radius in dotRadiusForLineAtLineIndex has no effect [\#95](https://github.com/Jawbone/JBChartView/issues/95)
+
+## [v2.8.1](https://github.com/Jawbone/JBChartView/tree/v2.8.1) (2014-08-23)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.0...v2.8.1)
+
+## [v2.8.0](https://github.com/Jawbone/JBChartView/tree/v2.8.0) (2014-08-15)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.7.4...v2.8.0)
+
+**Closed issues:**
+
+- Don't bring selection view to front with line view [\#89](https://github.com/Jawbone/JBChartView/issues/89)
+
+**Merged pull requests:**
+
+- Add per-line vertical selection color support. [\#90](https://github.com/Jawbone/JBChartView/pull/90) ([mszaro](https://github.com/mszaro))
+
+## [v2.7.4](https://github.com/Jawbone/JBChartView/tree/v2.7.4) (2014-08-15)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.7.3...v2.7.4)
+
+**Implemented enhancements:**
+
+- Not able to create Y-Axis labels or background grid [\#20](https://github.com/Jawbone/JBChartView/issues/20)
+
+**Closed issues:**
+
+- \[Enhancement\] Provide an option to disable Y-axis normalization for line graphs [\#88](https://github.com/Jawbone/JBChartView/issues/88)
+- Add left padding to the graph for y-axis labels [\#87](https://github.com/Jawbone/JBChartView/issues/87)
+- Error Protocol not implemented [\#86](https://github.com/Jawbone/JBChartView/issues/86)
+- What if I want to animate the LineChartView progression? [\#85](https://github.com/Jawbone/JBChartView/issues/85)
+- Enabling smooth lines in line chart view results in line graph clipping \(Out of bounds\)? [\#83](https://github.com/Jawbone/JBChartView/issues/83)
+
+## [v2.7.3](https://github.com/Jawbone/JBChartView/tree/v2.7.3) (2014-08-07)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.7.2...v2.7.3)
+
+**Closed issues:**
+
+- Can I animate bar charts? [\#79](https://github.com/Jawbone/JBChartView/issues/79)
+- Create generic dataSource and delegate for extensibility.  [\#78](https://github.com/Jawbone/JBChartView/issues/78)
+
+## [v2.7.2](https://github.com/Jawbone/JBChartView/tree/v2.7.2) (2014-08-04)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.7.1...v2.7.2)
+
+## [v2.7.1](https://github.com/Jawbone/JBChartView/tree/v2.7.1) (2014-08-04)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.7.0...v2.7.1)
+
+**Closed issues:**
+
+- Typo in JBBarChartView.h [\#77](https://github.com/Jawbone/JBChartView/issues/77)
+- Refactor datasource and delegate functions [\#76](https://github.com/Jawbone/JBChartView/issues/76)
+
+## [v2.7.0](https://github.com/Jawbone/JBChartView/tree/v2.7.0) (2014-08-02)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.6.3...v2.7.0)
+
+**Closed issues:**
+
+- Incorrect padding on line widths [\#75](https://github.com/Jawbone/JBChartView/issues/75)
+
+## [v2.6.3](https://github.com/Jawbone/JBChartView/tree/v2.6.3) (2014-07-31)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.6.2...v2.6.3)
+
+## [v2.6.2](https://github.com/Jawbone/JBChartView/tree/v2.6.2) (2014-07-25)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.6.1...v2.6.2)
+
+## [v2.6.1](https://github.com/Jawbone/JBChartView/tree/v2.6.1) (2014-07-25)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.6.0...v2.6.1)
+
+**Merged pull requests:**
+
+- iOS 6 support [\#74](https://github.com/Jawbone/JBChartView/pull/74) ([luosheng](https://github.com/luosheng))
+
+## [v2.6.0](https://github.com/Jawbone/JBChartView/tree/v2.6.0) (2014-07-24)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.5.5...v2.6.0)
+
+**Closed issues:**
+
+- Allow setting views for lines as well as bars [\#73](https://github.com/Jawbone/JBChartView/issues/73)
+- Requires iOS 7 or later [\#72](https://github.com/Jawbone/JBChartView/issues/72)
+- How to Know the x,width of each bar [\#70](https://github.com/Jawbone/JBChartView/issues/70)
+- Multiple y-axis [\#69](https://github.com/Jawbone/JBChartView/issues/69)
+- NSInternalInconsistencyException - JBLineChartView // dataSource must implement [\#68](https://github.com/Jawbone/JBChartView/issues/68)
+- Zoom and scrolling? \(Question\) [\#65](https://github.com/Jawbone/JBChartView/issues/65)
+- Support for missing data points rather than going to 0? [\#63](https://github.com/Jawbone/JBChartView/issues/63)
+- Interesting behavior 'barViewAtIndex' and 'colorForBarViewAtIndex'. [\#62](https://github.com/Jawbone/JBChartView/issues/62)
+- In LineChart x-axis, splits into more numbers and not able view x-axis last point [\#60](https://github.com/Jawbone/JBChartView/issues/60)
+- Overlay more than 1 chart? [\#59](https://github.com/Jawbone/JBChartView/issues/59)
+- Footer Views - Can they be perpendicular to the x-axis [\#58](https://github.com/Jawbone/JBChartView/issues/58)
+
+**Merged pull requests:**
+
+- Fill Color on Line Chart [\#71](https://github.com/Jawbone/JBChartView/pull/71) ([legranddamien](https://github.com/legranddamien))
+- Added documentation for usage in a Swift project [\#67](https://github.com/Jawbone/JBChartView/pull/67) ([jonparker](https://github.com/jonparker))
+
+## [v2.5.5](https://github.com/Jawbone/JBChartView/tree/v2.5.5) (2014-05-14)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.5.4...v2.5.5)
+
+**Implemented enhancements:**
+
+- Ability to draw lines with negative values [\#51](https://github.com/Jawbone/JBChartView/issues/51)
+
+**Closed issues:**
+
+- How to adjust selected bar height for LineChart in demo project [\#56](https://github.com/Jawbone/JBChartView/issues/56)
+- Line Chart Collapse Animation Changed? [\#54](https://github.com/Jawbone/JBChartView/issues/54)
+
+**Merged pull requests:**
+
+- Fixed barView's frame. [\#57](https://github.com/Jawbone/JBChartView/pull/57) ([pala](https://github.com/pala))
+- Update sample code in readme [\#55](https://github.com/Jawbone/JBChartView/pull/55) ([pala](https://github.com/pala))
+
+## [v2.5.4](https://github.com/Jawbone/JBChartView/tree/v2.5.4) (2014-05-07)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.5.3...v2.5.4)
+
+**Merged pull requests:**
+
+- Add delegate method barChartView:colorForBarViewAtIndex: to JBBarChartViewDataSource [\#53](https://github.com/Jawbone/JBChartView/pull/53) ([skywinder](https://github.com/skywinder))
+- Compiling warrnings and typos [\#52](https://github.com/Jawbone/JBChartView/pull/52) ([skywinder](https://github.com/skywinder))
+
+## [v2.5.3](https://github.com/Jawbone/JBChartView/tree/v2.5.3) (2014-05-06)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.5.2...v2.5.3)
+
+## [v2.5.2](https://github.com/Jawbone/JBChartView/tree/v2.5.2) (2014-05-06)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.5.1...v2.5.2)
+
+## [v2.5.1](https://github.com/Jawbone/JBChartView/tree/v2.5.1) (2014-05-05)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.5.0...v2.5.1)
+
+**Closed issues:**
+
+- non-evenly distributed plots [\#50](https://github.com/Jawbone/JBChartView/issues/50)
+- Using minimum of 0 as default [\#48](https://github.com/Jawbone/JBChartView/issues/48)
+
+## [v2.5.0](https://github.com/Jawbone/JBChartView/tree/v2.5.0) (2014-05-04)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.4.3...v2.5.0)
+
+## [v2.4.3](https://github.com/Jawbone/JBChartView/tree/v2.4.3) (2014-05-04)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.4.2...v2.4.3)
+
+**Closed issues:**
+
+- Bars not drawn when all have the same height [\#47](https://github.com/Jawbone/JBChartView/issues/47)
+- Moving podspec to root [\#46](https://github.com/Jawbone/JBChartView/issues/46)
+
+**Merged pull requests:**
+
+- fixed typo, renamed mininum -\> minimum [\#49](https://github.com/Jawbone/JBChartView/pull/49) ([simonnickel](https://github.com/simonnickel))
+
+## [v2.4.2](https://github.com/Jawbone/JBChartView/tree/v2.4.2) (2014-05-01)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.4.1...v2.4.2)
+
+## [v2.4.1](https://github.com/Jawbone/JBChartView/tree/v2.4.1) (2014-04-30)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.4.0...v2.4.1)
+
+**Implemented enhancements:**
+
+- Curved line charts [\#23](https://github.com/Jawbone/JBChartView/issues/23)
+
+**Closed issues:**
+
+- JBChartView demo footerview problem [\#44](https://github.com/Jawbone/JBChartView/issues/44)
+
+**Merged pull requests:**
+
+- Smooth curve fix [\#45](https://github.com/Jawbone/JBChartView/pull/45) ([ktran03](https://github.com/ktran03))
+
+## [v2.4.0](https://github.com/Jawbone/JBChartView/tree/v2.4.0) (2014-04-28)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.3.0...v2.4.0)
+
+**Closed issues:**
+
+- Aligning X-axis, padding? [\#43](https://github.com/Jawbone/JBChartView/issues/43)
+- `JBLineChartFooterView` Value Marks are Inaccurate [\#41](https://github.com/Jawbone/JBChartView/issues/41)
+
+**Merged pull requests:**
+
+- smooth curve using bezierpath [\#39](https://github.com/Jawbone/JBChartView/pull/39) ([ktran03](https://github.com/ktran03))
+
+## [v2.3.0](https://github.com/Jawbone/JBChartView/tree/v2.3.0) (2014-04-18)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.2.0...v2.3.0)
+
+**Closed issues:**
+
+- Crash, lineChartView "must implement numberOfPointsInLineChartView" ? [\#38](https://github.com/Jawbone/JBChartView/issues/38)
+
+## [v2.2.0](https://github.com/Jawbone/JBChartView/tree/v2.2.0) (2014-04-14)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.1.6...v2.2.0)
+
+**Closed issues:**
+
+- Typo in readme? [\#36](https://github.com/Jawbone/JBChartView/issues/36)
+- Nav bar background remains black [\#35](https://github.com/Jawbone/JBChartView/issues/35)
+
+**Merged pull requests:**
+
+- Added delegate method to configure the width of the vertical selection bar in a line chart. [\#37](https://github.com/Jawbone/JBChartView/pull/37) ([ghost](https://github.com/ghost))
+
+## [v2.1.6](https://github.com/Jawbone/JBChartView/tree/v2.1.6) (2014-04-11)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.1.5...v2.1.6)
+
+**Closed issues:**
+
+- `showsLineSelection` Does Nothing [\#33](https://github.com/Jawbone/JBChartView/issues/33)
+- cocoapods [\#31](https://github.com/Jawbone/JBChartView/issues/31)
+
+## [v2.1.5](https://github.com/Jawbone/JBChartView/tree/v2.1.5) (2014-04-10)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.1.4...v2.1.5)
+
+**Merged pull requests:**
+
+- JBChartView: needs initWithCoder initializer for inflation from a xib [\#30](https://github.com/Jawbone/JBChartView/pull/30) ([gumbypp](https://github.com/gumbypp))
+
+## [v2.1.4](https://github.com/Jawbone/JBChartView/tree/v2.1.4) (2014-04-10)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.1.3...v2.1.4)
+
+**Closed issues:**
+
+- Stach bars? [\#29](https://github.com/Jawbone/JBChartView/issues/29)
+- Problem with Bar Height [\#28](https://github.com/Jawbone/JBChartView/issues/28)
+- Selection does not work without Auto Layout in iPhone 3.5" [\#27](https://github.com/Jawbone/JBChartView/issues/27)
+
+## [v2.1.3](https://github.com/Jawbone/JBChartView/tree/v2.1.3) (2014-04-03)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.1.2...v2.1.3)
+
+## [v2.1.2](https://github.com/Jawbone/JBChartView/tree/v2.1.2) (2014-04-02)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.1.1...v2.1.2)
+
+## [v2.1.1](https://github.com/Jawbone/JBChartView/tree/v2.1.1) (2014-04-02)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.1.0...v2.1.1)
+
+**Closed issues:**
+
+- representing negative values [\#26](https://github.com/Jawbone/JBChartView/issues/26)
+- Real time [\#25](https://github.com/Jawbone/JBChartView/issues/25)
+
+## [v2.1.0](https://github.com/Jawbone/JBChartView/tree/v2.1.0) (2014-03-31)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.0.2...v2.1.0)
+
+## [v2.0.2](https://github.com/Jawbone/JBChartView/tree/v2.0.2) (2014-03-27)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.0.1...v2.0.2)
+
+**Closed issues:**
+
+- Negative Bars? [\#24](https://github.com/Jawbone/JBChartView/issues/24)
+
+## [v2.0.1](https://github.com/Jawbone/JBChartView/tree/v2.0.1) (2014-03-19)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.0.0...v2.0.1)
+
+**Closed issues:**
+
+- NSAssert on bar height in JBBarChartView, \> 0 when it should be \>= [\#22](https://github.com/Jawbone/JBChartView/issues/22)
+
+## [v2.0.0](https://github.com/Jawbone/JBChartView/tree/v2.0.0) (2014-03-19)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.1.6...v2.0.0)
+
+**Implemented enhancements:**
+
+- Multiple Lines on chart [\#6](https://github.com/Jawbone/JBChartView/issues/6)
+
+**Closed issues:**
+
+- JBBarChartView Bar Height Problem With Storyboard/Autolayout [\#19](https://github.com/Jawbone/JBChartView/issues/19)
+- blank result [\#18](https://github.com/Jawbone/JBChartView/issues/18)
+- Bar Highlight Offset Issue [\#17](https://github.com/Jawbone/JBChartView/issues/17)
+- Following the tutorial creates an empty/blank view  [\#16](https://github.com/Jawbone/JBChartView/issues/16)
+
+**Merged pull requests:**
+
+- Multiple Line Support & Tooltips [\#21](https://github.com/Jawbone/JBChartView/pull/21) ([terryworona](https://github.com/terryworona))
+
+## [v1.1.6](https://github.com/Jawbone/JBChartView/tree/v1.1.6) (2014-03-03)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.1.5...v1.1.6)
+
+**Merged pull requests:**
+
+- Added customization for line width [\#15](https://github.com/Jawbone/JBChartView/pull/15) ([kmcbride](https://github.com/kmcbride))
+- fix spelling mistake [\#14](https://github.com/Jawbone/JBChartView/pull/14) ([Undo1](https://github.com/Undo1))
+
+## [v1.1.5](https://github.com/Jawbone/JBChartView/tree/v1.1.5) (2014-02-12)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.1.4...v1.1.5)
+
+## [v1.1.4](https://github.com/Jawbone/JBChartView/tree/v1.1.4) (2014-02-06)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.1.3...v1.1.4)
+
+**Closed issues:**
+
+- What about ios6 [\#13](https://github.com/Jawbone/JBChartView/issues/13)
+- Could the Bar Chart data be nil ? [\#12](https://github.com/Jawbone/JBChartView/issues/12)
+
+## [v1.1.3](https://github.com/Jawbone/JBChartView/tree/v1.1.3) (2014-01-06)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.1.2...v1.1.3)
+
+**Closed issues:**
+
+- heightForIndex should return CGFloat instead of NSInteger [\#9](https://github.com/Jawbone/JBChartView/issues/9)
+
+**Merged pull requests:**
+
+- Fixes small typos in README [\#11](https://github.com/Jawbone/JBChartView/pull/11) ([sampage](https://github.com/sampage))
+
+## [v1.1.2](https://github.com/Jawbone/JBChartView/tree/v1.1.2) (2014-01-03)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.1.1...v1.1.2)
+
+## [v1.1.1](https://github.com/Jawbone/JBChartView/tree/v1.1.1) (2014-01-02)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.1.0...v1.1.1)
+
+**Closed issues:**
+
+- reloadData is not reducing height of other bars [\#7](https://github.com/Jawbone/JBChartView/issues/7)
+- Add barViewAtIndex: to datasource [\#5](https://github.com/Jawbone/JBChartView/issues/5)
+
+**Merged pull requests:**
+
+- Reset cached max height on data reload Fixes \#7 [\#8](https://github.com/Jawbone/JBChartView/pull/8) ([l4u](https://github.com/l4u))
+
+## [v1.1.0](https://github.com/Jawbone/JBChartView/tree/v1.1.0) (2013-12-26)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.0.3...v1.1.0)
+
+## [v1.0.3](https://github.com/Jawbone/JBChartView/tree/v1.0.3) (2013-12-23)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.0.2...v1.0.3)
+
+**Closed issues:**
+
+- Single press on bar [\#3](https://github.com/Jawbone/JBChartView/issues/3)
+
+## [v1.0.2](https://github.com/Jawbone/JBChartView/tree/v1.0.2) (2013-12-17)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.0.1...v1.0.2)
+
+## [v1.0.1](https://github.com/Jawbone/JBChartView/tree/v1.0.1) (2013-12-15)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v1.0...v1.0.1)
+
+**Merged pull requests:**
+
+- If there is no footer view, bars won't be added to the chart. [\#2](https://github.com/Jawbone/JBChartView/pull/2) ([joelkraut](https://github.com/joelkraut))
+
+## [v1.0](https://github.com/Jawbone/JBChartView/tree/v1.0) (2013-12-11)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/0.2.0...v1.0)
+
+**Merged pull requests:**
+
+- JBChartViewDemo and JBChartView [\#1](https://github.com/Jawbone/JBChartView/pull/1) ([terryworona](https://github.com/terryworona))
+
+## [0.2.0](https://github.com/Jawbone/JBChartView/tree/0.2.0) (2013-08-20)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/1.0...0.2.0)
+
+## [1.0](https://github.com/Jawbone/JBChartView/tree/1.0) (2012-04-23)
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/1.0.0...1.0)
+
+## [1.0.0](https://github.com/Jawbone/JBChartView/tree/1.0.0) (2012-04-23)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Classes/Additions/NSMutableArray+JBStack.h

@@ -0,0 +1,16 @@
+//
+//  NSMutableArray+JBStack.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSMutableArray (JBStack)
+
+- (void)jb_push:(id)object;
+- (id)jb_pop;
+
+@end

Classes/Additions/NSMutableArray+JBStack.m

@@ -0,0 +1,34 @@
+//
+//  NSMutableArray+JBStack.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "NSMutableArray+JBStack.h"
+
+@implementation NSMutableArray (JBStack)
+
+#pragma mark - Operations
+
+- (void)jb_push:(id)object
+{
+	if (object != nil)
+	{
+		[self insertObject:object atIndex:0];
+	}
+}
+
+- (id)jb_pop
+{
+	id object = [self firstObject];
+	if (object != nil)
+	{
+		[self removeObjectAtIndex:0];
+		return object;
+	}
+	return nil;
+}
+
+@end

Classes/Bar/JBBarChartView.h

@@ -9,29 +9,43 @@
 // Views
 #import "JBChartView.h"
 
-@protocol JBBarChartViewDelegate;
-@protocol JBBarChartViewDataSource;
+@class JBBarChartView;
 
-@interface JBBarChartView : JBChartView
-
-@property (nonatomic, weak) id<JBBarChartViewDelegate> delegate;
-@property (nonatomic, weak) id<JBBarChartViewDataSource> dataSource;
-
-/**
- *  Vertical highlight overlayed on bar during touch events.
- *
- *  Default: YES.
- */
-@property (nonatomic, assign) BOOL showsVerticalSelection;
-
-@end
-
-@protocol JBBarChartViewDelegate <NSObject>
+@protocol JBBarChartViewDataSource <JBChartViewDataSource>
 
 @required
 
 /**
- *  Height for a bar at a given index (left to right). There is no ceiling on the the height; 
+ *  The number of bars in a given bar chart is the number of vertical views shown along the x-axis.
+ *
+ *  @param barChartView     The bar chart object requesting this information.
+ *
+ *  @return Number of bars in the given chart, displayed horizontally along the chart's x-axis.
+ */
+- (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView;
+
+@optional
+
+/**
+ *  A UIView subclass representing the bar at a particular index.
+ *
+ *  Default: solid black UIView.
+ *
+ *  @param barChartView     The bar chart object requesting this information.
+ *  @param index            The 0-based index of a given bar (left to right, x-axis).
+ *
+ *  @return A UIView subclass. The view will automatically be resized by the chart during creation (ie. no need to set the frame).
+ */
+- (UIView *)barChartView:(JBBarChartView *)barChartView barViewAtIndex:(NSUInteger)index;
+
+@end
+
+@protocol JBBarChartViewDelegate <JBChartViewDelegate>
+
+@required
+
+/**
+ *  Height for a bar at a given index (left to right). There is no ceiling on the the height;
  *  the chart will automatically normalize all values between the overal min and max heights.
  *
  *  @param barChartView     The bar chart object requesting this information.
@@ -39,7 +53,7 @@
  *
  *  @return The y-axis height of the supplied bar index (x-axis)
  */
-- (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtAtIndex:(NSUInteger)index;
+- (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index;
 
 @optional
 
@@ -58,53 +72,39 @@
  *  Occurs when selection ends by either ending a touch event or selecting an area that is outside the view's bounds.
  *  For selection start events, see: didSelectBarAtIndex...
  *
- *  @param barChartView     A bar chart object informing the delegate about the unselection.
+ *  @param barChartView     A bar chart object informing the delegate about the deselection.
  */
-- (void)didUnselectBarChartView:(JBBarChartView *)barChartView;
-
-@end
-
-@protocol JBBarChartViewDataSource <NSObject>
-
-@required
+- (void)didDeselectBarChartView:(JBBarChartView *)barChartView;
 
 /**
- *  The number of bars in a given bar chart is the number of vertical views shown along the x-axis.
+ *  If you already implement barChartView:barViewAtIndex: delegate - this method has no effect.
+ *  If a custom UIView isn't supplied, a flat bar will be made automatically (default color black).
  *
- *  @param barChartView     The bar chart object requesting this information.
- *
- *  @return Number of bars in the given chart, displayed horizontally along the chart's x-axis.
- */
-- (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView;
-
-@optional
-
-/**
- *  Horizontal padding between bars. 
- *
- *  Default: 'best-guess' algorithm based on the the total number of bars and width of the chart.
- *
- *  @param barChartView     The bar chart object requesting this information.
- *
- *  @return Horizontal width (in pixels) between each bar.
- */
-- (NSUInteger)barPaddingForBarChartView:(JBBarChartView *)barChartView;
-
-/**
- *  A UIView subclass representing the bar at a particular index.
- *
- *  Default: solid black UIView.
+ *  Default: black color.
  *
  *  @param barChartView     The bar chart object requesting this information.
  *  @param index            The 0-based index of a given bar (left to right, x-axis).
  *
- *  @return A UIView subclass. The view will automatically be resized by the chart during creation (ie. no need to set the frame).
+ *  @return The color to be used to color a bar in the chart.
  */
-- (UIView *)barChartView:(JBBarChartView *)barChartView barViewAtIndex:(NSUInteger)index;
+- (UIColor *)barChartView:(JBBarChartView *)barChartView colorForBarViewAtIndex:(NSUInteger)index;
 
 /**
- *  The selection color to be overlayed on a bar during touch events. 
- *  The color is automically faded to transparent (vertically). The property showsVerticalSelection
+ *  If you already implement barChartView:barViewAtIndex: delegate - this method has no effect.
+ *  If a custom UIView isn't supplied and barChartView:colorForBarViewAtIndex: isn't implemented, then
+ *  a gradient layer may be supplied to be used across all bars within the chart.
+ *
+ *  Default: black color.
+ *
+ *  @param barChartView     The bar chart object requesting this information.
+ *
+ *  @return The gradient layer to be used as a mask over all bars within the chart.
+ */
+- (CAGradientLayer *)barGradientForBarChartView:(JBBarChartView *)barChartView;
+
+/**
+ *  The selection color to be overlayed on a bar during touch events.
+ *  The color is automatically faded to transparent (vertically). The property showsVerticalSelection
  *  must be YES for the color to apply.
  *
  *  Default: white color (faded to transparent).
@@ -115,4 +115,70 @@
  */
 - (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView;
 
+/**
+ *  Horizontal padding between bars.
+ *
+ *  Default: 'best-guess' algorithm based on the the total number of bars and width of the chart.
+ *
+ *  @param barChartView     The bar chart object requesting this information.
+ *
+ *  @return Horizontal width (in pixels) between each bar.
+ */
+- (CGFloat)barPaddingForBarChartView:(JBBarChartView *)barChartView;
+
+@end
+
+@interface JBBarChartView : JBChartView
+
+@property (nonatomic, weak) id<JBBarChartViewDataSource> dataSource;
+@property (nonatomic, weak) id<JBBarChartViewDelegate> delegate;
+
+/*
+ *  Bars can be (vertically) positoned top to bottom instead of bottom up.
+ *  If this property is set to YES, both the bar and the selection view will be inverted.
+ *  For the inverted orientation to take effect, reloadData must be called.
+ *
+ *  Default: NO.
+ */
+@property (nonatomic, assign, getter=isInverted) BOOL inverted;
+
+/*
+ *  Reloads the bar chart with a custom animation.
+ *  Adding, removing or modifying existing bars will be animated (collapsing, expanding, etc) if animated = YES.
+ *  Reloading (animated) data is thread safe and can be executed any number of times in succession.
+ *
+ *  Default: a non-animated reload (via reloadData).
+ */
+- (void)reloadDataAnimated:(BOOL)animated;
+
+/*
+ *  When reloadData or reloadDataAnimated: is called, the reloading bit is turned on.
+ *  State changes during a reload will be ignored. As well, subsequent calls to reloadData:
+ *  or reloadDataAnimated: before any previous reloads are complete, will also be ignored.
+ *  Lastly, all touch events will be ignored until a reload has compeleted.
+ *
+ *  Note: the above restrictions apply only to animated reloads, as non-animated reloads are synchronous.
+ *
+ *  Default: NO.
+ */
+@property (nonatomic, readonly) BOOL reloading;
+
+/**
+ *  Vertical highlight overlayed on bar during touch events.
+ *
+ *  Default: YES.
+ */
+@property (nonatomic, assign) BOOL showsVerticalSelection;
+
+/**
+ *  The bar view at a particular index.
+ *
+ *  Default: nil.
+ *
+ *  @param index            The 0-based index of a given bar (left to right, x-axis).
+ *
+ *  @return The UIView representing the bar view at a given index or nil if the index is out of range.
+ */
+- (UIView *)barViewAtIndex:(NSUInteger)index;
+
 @end

Classes/Bar/JBBarChartView.m

@@ -0,0 +1,914 @@
+//
+//  JBBarChartView.m
+//  Nudge
+//
+//  Created by Terry Worona on 9/3/13.
+//  Copyright (c) 2013 Jawbone. All rights reserved.
+//
+
+#import "JBBarChartView.h"
+
+// Views
+#import "JBGradientBarView.h"
+
+// Numerics
+CGFloat const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
+CGFloat const kJBBarChartViewUndefinedCachedHeight = -1.0f;
+CGFloat const kJBBarChartViewStateAnimationDuration = 0.05f;
+CGFloat const kJBBarChartViewReloadDataAnimationDuration = 0.15f;
+CGFloat const kJBBarChartViewStatePopOffset = 10.0f;
+NSInteger const kJBBarChartViewUndefinedBarIndex = -1;
+
+// Colors (JBChartView)
+static UIColor *kJBBarChartViewDefaultBarColor = nil;
+
+@interface JBChartView (Private)
+
+- (BOOL)hasMaximumValue;
+- (BOOL)hasMinimumValue;
+
+@end
+
+@interface JBBarChartView () <JBGradientBarViewDataSource>
+
+@property (nonatomic, strong) NSArray *chartData; // index = column, value = height
+@property (nonatomic, strong) NSArray *barViews;
+@property (nonatomic, strong) NSArray *cachedBarViewHeights;
+@property (nonatomic, assign) CGFloat barPadding;
+@property (nonatomic, assign) CGFloat cachedMaxHeight;
+@property (nonatomic, assign) CGFloat cachedMinHeight;
+@property (nonatomic, strong) JBChartVerticalSelectionView *verticalSelectionView;
+@property (nonatomic, assign) BOOL verticalSelectionViewVisible;
+@property (nonatomic, assign) BOOL reloading;
+
+// Initialization
+- (void)construct;
+
+// View quick accessors
+- (CGFloat)availableHeight;
+- (CGFloat)normalizedHeightForRawHeight:(NSNumber *)rawHeight;
+- (CGFloat)barWidth;
+
+// Touch helpers
+- (NSInteger)barViewIndexForPoint:(CGPoint)point;
+- (UIView *)barViewForForPoint:(CGPoint)point;
+- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches;
+- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches;
+
+// Setters
+- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated;
+
+// Helpers
+- (UIView *)createBarViewForIndex:(NSUInteger)index;
+- (void)insertBarView:(UIView *)barView;
+
+@end
+
+@implementation JBBarChartView
+
+@dynamic dataSource;
+@dynamic delegate;
+
+#pragma mark - Alloc/Init
+
++ (void)initialize
+{
+	if (self == [JBBarChartView class])
+	{
+		kJBBarChartViewDefaultBarColor = [UIColor blackColor];
+	}
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+	self = [super initWithCoder:aDecoder];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (id)init
+{
+	self = [super init];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (void)construct
+{
+	_showsVerticalSelection = YES;
+	_cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
+	_cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
+}
+
+#pragma mark - Memory Management
+
+- (void)dealloc
+{
+	[NSObject cancelPreviousPerformRequestsWithTarget:self];
+}
+
+#pragma mark - Data
+
+- (void)reloadDataAnimated:(BOOL)animated
+{
+	if (self.reloading)
+	{
+		return;
+	}
+	
+	self.reloading = YES;
+	
+	// Reset cached max height
+	self.cachedMinHeight = kJBBarChartViewUndefinedCachedHeight;
+	self.cachedMaxHeight = kJBBarChartViewUndefinedCachedHeight;
+	
+	// Animation check
+	BOOL shouldAnimate = (animated && self.state == JBChartViewStateExpanded);
+	
+	/*
+	 * Final block to refresh state and turn off reloading bit
+	 */
+	dispatch_block_t completionBlock = ^{
+		self.reloading = NO;
+		[self setState:self.state animated:NO force:YES callback:nil];
+	};
+	
+	/*
+	 * The data collection holds all position information:
+	 * constructed via datasource and delegate functions
+	 */
+	dispatch_block_t createDataDictionariesBlock = ^{
+		
+		// Grab the count
+		NSAssert([self.dataSource respondsToSelector:@selector(numberOfBarsInBarChartView:)], @"JBBarChartView // datasource must implement - (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView");
+		NSUInteger dataCount = [self.dataSource numberOfBarsInBarChartView:self];
+		
+		// Build up the data collection
+		NSAssert([self.delegate respondsToSelector:@selector(barChartView:heightForBarViewAtIndex:)], @"JBBarChartView // delegate must implement - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index");
+		NSMutableArray *mutableChartData = [NSMutableArray array];
+		for (NSUInteger index=0; index<dataCount; index++)
+		{
+			CGFloat height = [self.delegate barChartView:self heightForBarViewAtIndex:index];
+			NSAssert(height >= 0, @"JBBarChartView // datasource function - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index must return a CGFloat >= 0");
+			[mutableChartData addObject:[NSNumber numberWithFloat:height]];
+		}
+		self.chartData = [NSArray arrayWithArray:mutableChartData];
+	};
+	
+	/*
+	 * Determines the padding between bars as a function of # of bars
+	 */
+	dispatch_block_t createBarPaddingBlock = ^{
+		if ([self.delegate respondsToSelector:@selector(barPaddingForBarChartView:)])
+		{
+			self.barPadding = [self.delegate barPaddingForBarChartView:self];
+		}
+		else
+		{
+			NSUInteger totalBars = [self.chartData count];
+			self.barPadding = (1/(float)totalBars) * kJBBarChartViewBarBasePaddingMutliplier;
+		}
+	};
+	
+	/*
+	 * Creates a vertical selection view for touch events
+	 */
+	dispatch_block_t createSelectionViewBlock = ^{
+		
+		// Remove old selection bar
+		if (self.verticalSelectionView)
+		{
+			[self.verticalSelectionView removeFromSuperview];
+			self.verticalSelectionView = nil;
+		}
+		
+		CGFloat verticalSelectionViewHeight = self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding - self.footerPadding;
+		
+		if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoHeaderPaddingForChartView:)])
+		{
+			if ([self.dataSource shouldExtendSelectionViewIntoHeaderPaddingForChartView:self])
+			{
+				verticalSelectionViewHeight += self.headerPadding;
+			}
+		}
+		
+		if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoFooterPaddingForChartView:)])
+		{
+			if ([self.dataSource shouldExtendSelectionViewIntoFooterPaddingForChartView:self])
+			{
+				verticalSelectionViewHeight += self.footerPadding;
+			}
+		}
+		
+		self.verticalSelectionView = [[JBChartVerticalSelectionView alloc] initWithFrame:CGRectMake(0, 0, [self barWidth], verticalSelectionViewHeight)];
+		self.verticalSelectionView.alpha = 0.0;
+		self.verticalSelectionView.hidden = !self.showsVerticalSelection;
+		if ([self.delegate respondsToSelector:@selector(barSelectionColorForBarChartView:)])
+		{
+			UIColor *selectionViewBackgroundColor = [self.delegate barSelectionColorForBarChartView:self];
+			NSAssert(selectionViewBackgroundColor != nil, @"JBBarChartView // delegate function - (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView must return a non-nil UIColor");
+			self.verticalSelectionView.bgColor = selectionViewBackgroundColor;
+		}
+		
+		// Add new selection bar
+		if (self.footerView)
+		{
+			[self insertSubview:self.verticalSelectionView belowSubview:self.footerView];
+		}
+		else
+		{
+			[self addSubview:self.verticalSelectionView];
+		}
+		
+		self.verticalSelectionView.transform = self.inverted ? CGAffineTransformMakeScale(1.0, -1.0) : CGAffineTransformIdentity;
+	};
+	
+	/*
+	 * Creates a new bar graph view using the previously calculated data model
+	 */
+	dispatch_block_t createBarViewsBlock = ^{
+		
+		__weak JBBarChartView* weakSelf = self;
+		
+		if (shouldAnimate)
+		{
+			self.cachedBarViewHeights = nil;
+			__block NSUInteger barViewsCount = [self.barViews count];
+			
+			dispatch_block_t updateExistingBarViewsBlock = ^{
+				__block CGFloat xOffset = 0;
+				[weakSelf.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+					CGFloat height = [weakSelf normalizedHeightForRawHeight:(NSNumber *)obj];
+					if (index < [weakSelf.barViews count])
+					{
+						// Update bar
+						UIView *barView = [weakSelf.barViews objectAtIndex:index];
+						if (weakSelf.inverted)
+						{
+							barView.frame = CGRectMake(xOffset, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, [weakSelf barWidth], height);
+						}
+						else
+						{
+							barView.frame = CGRectMake(xOffset, weakSelf.bounds.size.height - height - weakSelf.footerView.frame.size.height, [weakSelf barWidth], height);
+						}
+						xOffset += ([weakSelf barWidth] + weakSelf.barPadding);
+					}
+				}];
+			};
+			
+			dispatch_block_t preAddBarViewsBlock = ^{
+				__block CGFloat xOffset = 0;
+				[self.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+					if (index >= barViewsCount)
+					{
+						// Create bar
+						UIView *barView = [weakSelf createBarViewForIndex:index];
+						if (weakSelf.inverted)
+						{
+							barView.frame = CGRectMake(xOffset, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, [weakSelf barWidth], 0.0f);
+						}
+						else
+						{
+							barView.frame = CGRectMake(xOffset, self.bounds.size.height, [weakSelf barWidth], 0.0f);
+						}
+						
+						// Update stored view
+						weakSelf.barViews = [NSArray arrayWithArray:[weakSelf.barViews arrayByAddingObject:barView]];
+						
+						// Add bar to view
+						[weakSelf insertBarView:barView];
+					}
+					xOffset += ([weakSelf barWidth] + weakSelf.barPadding);
+				}];
+			};
+			
+			dispatch_block_t postAddBarViewsBlock = ^{
+				[self.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+					if (index >= barViewsCount)
+					{
+						CGFloat height = [weakSelf normalizedHeightForRawHeight:(NSNumber *)obj];
+						UIView *barView = [weakSelf.barViews objectAtIndex:index];
+						if (weakSelf.inverted)
+						{
+							barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, [weakSelf barWidth], height);
+						}
+						else
+						{
+							barView.frame = CGRectMake(barView.frame.origin.x, self.bounds.size.height - height - weakSelf.footerView.frame.size.height, [weakSelf barWidth], height);
+						}
+					}
+				}];
+			};
+			
+			dispatch_block_t preRemoveBarViewsBlock = ^{
+				
+				// Move existing (removed) bars down
+				for (NSUInteger index=[weakSelf.chartData count]; index<[weakSelf.barViews count]; index++)
+				{
+					UIView *barView = [weakSelf.barViews objectAtIndex:index];
+					if (weakSelf.inverted)
+					{
+						barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, 0.0f);
+					}
+					else
+					{
+						barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height, barView.frame.size.width, barView.frame.size.height);
+					}
+				}
+			};
+			
+			dispatch_block_t postRemoveBarViewsBlock = ^{
+				
+				// Remove existing (removed) bars
+				for (NSUInteger index=[weakSelf.chartData count]; index<[weakSelf.barViews count]; index++)
+				{
+					UIView *barView = [weakSelf.barViews objectAtIndex:index];
+					[barView removeFromSuperview];
+				}
+				
+				// Update bar view collection
+				NSMutableArray *mutableBarViews = [NSMutableArray arrayWithArray:weakSelf.barViews];
+				[mutableBarViews removeObjectsInRange:(NSRange){[weakSelf.chartData count], [weakSelf.barViews count] - [weakSelf.chartData count]}];
+				weakSelf.barViews = [NSArray arrayWithArray:mutableBarViews];
+			};
+			
+			dispatch_block_t refreshedCachedBarViewHeightsBlock = ^{
+				NSMutableArray *mutableCachedBarViewHeights = [NSMutableArray arrayWithArray:weakSelf.cachedBarViewHeights];
+				for (UIView *barView in weakSelf.barViews)
+				{
+					[mutableCachedBarViewHeights addObject:[NSNumber numberWithFloat:barView.frame.size.height]];
+				}
+				weakSelf.cachedBarViewHeights = [NSArray arrayWithArray:mutableCachedBarViewHeights];
+			};
+			
+			/*
+			 * New data model equal;
+			 * Update existing bars to accomodate new model.
+			 */
+			if ([self.chartData count] == [self.barViews count])
+			{
+				[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration animations:^{
+					updateExistingBarViewsBlock();
+				} completion:^(BOOL finished) {
+					refreshedCachedBarViewHeightsBlock();
+					completionBlock();
+				}];
+			}
+			
+			/*
+			 * New data model greater;
+			 * Update existing bars to accomodate new model & add new bars.
+			 */
+			else if ([self.chartData count] > [self.barViews count])
+			{
+				[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration animations:^{
+					updateExistingBarViewsBlock();
+				} completion:^(BOOL finished) {
+					preAddBarViewsBlock();
+					[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration delay:0 options:UIViewAnimationOptionTransitionNone animations:^{
+						postAddBarViewsBlock();
+					} completion:^(BOOL finished) {
+						refreshedCachedBarViewHeightsBlock();
+						completionBlock();
+					}];
+				}];
+			}
+			
+			/*
+			 * New data model less;
+			 * Update existing bars to accomodate new model & remove legacy bars.
+			 */
+			else if ([self.chartData count] < [self.barViews count])
+			{
+				[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration animations:^{
+					preRemoveBarViewsBlock();
+				} completion:^(BOOL finished) {
+					postRemoveBarViewsBlock();
+					[UIView animateWithDuration:kJBBarChartViewReloadDataAnimationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+						updateExistingBarViewsBlock();
+					} completion:^(BOOL finished) {
+						refreshedCachedBarViewHeightsBlock();
+						completionBlock();
+					}];
+				}];
+			}
+		}
+		else
+		{
+			// Remove old bars
+			for (UIView *barView in self.barViews)
+			{
+				[barView removeFromSuperview];
+			}
+			
+			self.cachedBarViewHeights = nil;
+			
+			__block CGFloat xOffset = 0;
+			__block NSMutableArray *mutableBarViews = [NSMutableArray array];
+			__block NSMutableArray *mutableCachedBarViewHeights = [NSMutableArray array];
+			[self.chartData enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger index, BOOL * _Nonnull stop) {
+				UIView *barView = [weakSelf createBarViewForIndex:index];
+				
+				CGFloat height = [weakSelf normalizedHeightForRawHeight:(NSNumber *)obj];
+				barView.frame = CGRectMake(xOffset, self.bounds.size.height - height - weakSelf.footerView.frame.size.height, [weakSelf barWidth], height);
+				[mutableBarViews addObject:barView];
+				[mutableCachedBarViewHeights addObject:[NSNumber numberWithFloat:height]];
+				
+				[weakSelf insertBarView:barView];
+				
+				xOffset += ([weakSelf barWidth] + weakSelf.barPadding);
+				index++;
+			}];
+			self.barViews = [NSArray arrayWithArray:mutableBarViews];
+			self.cachedBarViewHeights = [NSArray arrayWithArray:mutableCachedBarViewHeights];
+		}
+	};
+	
+	dispatch_block_t layoutHeaderAndFooterBlock = ^{
+		self.headerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, self.headerView.frame.size.height);
+		self.footerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.size.height - self.footerView.frame.size.height, self.bounds.size.width, self.footerView.frame.size.height);
+	};
+	
+	/*
+	 * Reload data is broken down into various smaller units of work:
+	 *
+	 * 1. Create a data model
+	 * 2. Fetch the bar padding
+	 * 3. Create a (vertical) selection view
+	 * 4. Create and position bar view(s)
+	 * 5. Layout header & footer
+	 * 6. Refresh chart state
+	 *
+	 */
+	createDataDictionariesBlock();
+	createBarPaddingBlock();
+	createSelectionViewBlock();
+	createBarViewsBlock();
+	layoutHeaderAndFooterBlock();
+	
+	if (!shouldAnimate)
+	{
+		completionBlock(); // animated versions call this internally
+	}
+}
+
+- (void)reloadData
+{
+	[self reloadDataAnimated:NO];
+}
+
+#pragma mark - View Quick Accessors
+
+- (CGFloat)availableHeight
+{
+	return self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding - self.footerPadding;
+}
+
+- (CGFloat)normalizedHeightForRawHeight:(NSNumber *)rawHeight
+{
+	CGFloat minHeight = [self minimumValue];
+	CGFloat maxHeight = [self maximumValue];
+	CGFloat value = [rawHeight floatValue];
+	
+	if ((maxHeight - minHeight) <= 0)
+	{
+		return [self availableHeight];
+	}
+	
+	return ((value - minHeight) / (maxHeight - minHeight)) * [self availableHeight];
+}
+
+- (CGFloat)barWidth
+{
+	NSUInteger barCount = [self.chartData count];
+	if (barCount > 0)
+	{
+		CGFloat totalPadding = (barCount - 1) * self.barPadding;
+		CGFloat availableWidth = self.bounds.size.width - totalPadding;
+		return availableWidth / barCount;
+	}
+	return 0;
+}
+
+#pragma mark - Setters
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
+{
+	if (self.reloading)
+	{
+		if (callback)
+		{
+			callback();
+		}
+		return; // ignore state changes when reloading
+	}
+	
+	[super setState:state animated:animated force:force callback:callback];
+	
+	__weak JBBarChartView* weakSelf = self;
+	
+	void (^updateBarView)(UIView *barView, BOOL popBar);
+	
+	updateBarView = ^(UIView *barView, BOOL popBar) {
+		if (weakSelf.inverted)
+		{
+			if (weakSelf.state == JBChartViewStateExpanded)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue]);
+				}
+			}
+			else if (weakSelf.state == JBChartViewStateCollapsed)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.headerView.frame.size.height + weakSelf.headerPadding, barView.frame.size.width, 0.0f);
+				}
+			}
+		}
+		else
+		{
+			if (weakSelf.state == JBChartViewStateExpanded)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] - kJBBarChartViewStatePopOffset, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue], barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue]);
+				}
+			}
+			else if (weakSelf.state == JBChartViewStateCollapsed)
+			{
+				if (popBar)
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height - weakSelf.footerView.frame.size.height - weakSelf.footerPadding - [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] - kJBBarChartViewStatePopOffset, barView.frame.size.width, [[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] + kJBBarChartViewStatePopOffset);
+				}
+				else
+				{
+					barView.frame = CGRectMake(barView.frame.origin.x, weakSelf.bounds.size.height, barView.frame.size.width, 0.0f);
+				}
+			}
+		}
+	};
+	
+	dispatch_block_t callbackCopy = [callback copy];
+	
+	if ([self.barViews count] > 0)
+	{
+		if (animated)
+		{
+			dispatch_block_t animationCompletionBlock = ^{
+				if (callbackCopy)
+				{
+					callbackCopy();
+				}
+			};
+			
+			NSUInteger animationDelayIndex = 0;
+			for (UIView *barView in self.barViews)
+			{
+				BOOL lastIndex = ((NSUInteger)barView.tag == [self.barViews count] - 1);
+				if ([[weakSelf.cachedBarViewHeights objectAtIndex:barView.tag] floatValue] > [self minimumValue])
+				{
+					[UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:(kJBBarChartViewStateAnimationDuration * 0.5) * animationDelayIndex options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+						updateBarView(barView, YES);
+					} completion:^(BOOL finished) {
+						[UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+							updateBarView(barView, NO);
+						} completion:^(BOOL lastBarFinished) {
+							if (lastIndex)
+							{
+								animationCompletionBlock();
+							}
+						}];
+					}];
+					animationDelayIndex++;
+				}
+				else if (lastIndex)
+				{
+					animationCompletionBlock();
+				}
+			}
+		}
+		else
+		{
+			for (UIView *barView in self.barViews)
+			{
+				updateBarView(barView, NO);
+			}
+			if (callbackCopy)
+			{
+				callbackCopy();
+			}
+		}
+	}
+	else
+	{
+		if (callbackCopy)
+		{
+			callbackCopy();
+		}
+	}
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+{
+	[self setState:state animated:animated force:NO callback:callback];
+}
+
+- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated
+{
+	_verticalSelectionViewVisible = verticalSelectionViewVisible;
+	
+	if (animated)
+	{
+		[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+			self.verticalSelectionView.alpha = self.verticalSelectionViewVisible ? 1.0 : 0.0;
+		} completion:nil];
+	}
+	else
+	{
+		self.verticalSelectionView.alpha = _verticalSelectionViewVisible ? 1.0 : 0.0;
+	}
+}
+
+- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible
+{
+	[self setVerticalSelectionViewVisible:verticalSelectionViewVisible animated:NO];
+}
+
+- (void)setShowsVerticalSelection:(BOOL)showsVerticalSelection
+{
+	_showsVerticalSelection = showsVerticalSelection;
+	self.verticalSelectionView.hidden = _showsVerticalSelection ? NO : YES;
+}
+
+#pragma mark - Getters
+
+- (CGFloat)cachedMinHeight
+{
+	if(_cachedMinHeight == kJBBarChartViewUndefinedCachedHeight)
+	{
+		NSArray *chartValues = [self.chartData sortedArrayUsingSelector:@selector(compare:)];
+		_cachedMinHeight =  [[chartValues firstObject] floatValue];
+	}
+	return _cachedMinHeight;
+}
+
+- (CGFloat)cachedMaxHeight
+{
+	if (_cachedMaxHeight == kJBBarChartViewUndefinedCachedHeight)
+	{
+		NSArray *chartValues = [self.chartData sortedArrayUsingSelector:@selector(compare:)];
+		_cachedMaxHeight =  [[chartValues lastObject] floatValue];
+	}
+	return _cachedMaxHeight;
+}
+
+- (CGFloat)minimumValue
+{
+	if ([self hasMinimumValue])
+	{
+		return fminf(self.cachedMinHeight, [super minimumValue]);
+	}
+	return self.cachedMinHeight;
+}
+
+- (CGFloat)maximumValue
+{
+	if ([self hasMaximumValue])
+	{
+		return fmaxf(self.cachedMaxHeight, [super maximumValue]);
+	}
+	return self.cachedMaxHeight;
+}
+
+- (UIView *)barViewAtIndex:(NSUInteger)index
+{
+	if (index < [self.barViews count])
+	{
+		return [self.barViews objectAtIndex:index];
+	}
+	return nil;
+}
+
+#pragma mark - Helpers
+
+- (UIView *)createBarViewForIndex:(NSUInteger)index
+{
+	UIView *barView = nil;
+	{
+		// Custom bar
+		if ([self.dataSource respondsToSelector:@selector(barChartView:barViewAtIndex:)])
+		{
+			UIView *customBarView = [self.dataSource barChartView:self barViewAtIndex:index];
+			if (customBarView != nil)
+			{
+				barView = customBarView;
+			}
+		}
+		
+		// Color bar
+		if ([self.delegate respondsToSelector:@selector(barChartView:colorForBarViewAtIndex:)] && barView == nil)
+		{
+			UIColor *backgroundColor = [self.delegate barChartView:self colorForBarViewAtIndex:index];
+			if (backgroundColor != nil)
+			{
+				barView = [[UIView alloc] init];
+				barView.backgroundColor = backgroundColor;
+			}
+		}
+		
+		// Gradient
+		if ([self.delegate respondsToSelector:@selector(barGradientForBarChartView:)] && barView == nil)
+		{
+			CAGradientLayer *gradientLayer = [self.delegate barGradientForBarChartView:self];
+			if (gradientLayer != nil)
+			{
+				barView = [[JBGradientBarView alloc] init];
+				((JBGradientBarView *)barView).delegate = self;
+				((JBGradientBarView *)barView).gradientLayer = gradientLayer;
+			}
+		}
+		
+		// Default
+		if (barView == nil)
+		{
+			barView = [[UIView alloc] init];
+			barView.backgroundColor = kJBBarChartViewDefaultBarColor;
+		}
+	}
+	
+	barView.tag = index;
+	
+	return barView;
+}
+
+- (void)insertBarView:(UIView *)barView
+{
+	(self.footerView != nil) ? [self insertSubview:barView belowSubview:self.footerView] : [self addSubview:barView];
+	[self bringSubviewToFront:self.verticalSelectionView];
+	[self bringSubviewToFront:self.footerView];
+}
+
+#pragma mark - Touch Helpers
+
+- (NSInteger)barViewIndexForPoint:(CGPoint)point
+{
+	NSUInteger index = 0;
+	NSUInteger selectedIndex = kJBBarChartViewUndefinedBarIndex;
+	
+	if (point.x < 0 || point.x > self.bounds.size.width)
+	{
+		return selectedIndex;
+	}
+	
+	CGFloat padding = ceil(self.barPadding * 0.5);
+	for (UIView *barView in self.barViews)
+	{
+		CGFloat minX = CGRectGetMinX(barView.frame) - padding;
+		CGFloat maxX = CGRectGetMaxX(barView.frame) + padding;
+		if ((point.x >= minX) && (point.x <= maxX))
+		{
+			selectedIndex = index;
+			break;
+		}
+		index++;
+	}
+	return selectedIndex;
+}
+
+- (UIView *)barViewForForPoint:(CGPoint)point
+{
+	UIView *barView = nil;
+	NSInteger selectedIndex = [self barViewIndexForPoint:point];
+	if (selectedIndex >= 0)
+	{
+		return [self.barViews objectAtIndex:[self barViewIndexForPoint:point]];
+	}
+	return barView;
+}
+
+- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches
+{
+	if (self.state == JBChartViewStateCollapsed || [self.chartData count] <= 0 || self.reloading)
+	{
+		return;
+	}
+	
+	UITouch *touch = [touches anyObject];
+	CGPoint touchPoint = [touch locationInView:self];
+	UIView *barView = [self barViewForForPoint:touchPoint];
+	if (barView == nil)
+	{
+		[self setVerticalSelectionViewVisible:NO animated:YES];
+		return;
+	}
+	CGRect barViewFrame = barView.frame;
+	CGRect selectionViewFrame = self.verticalSelectionView.frame;
+	selectionViewFrame.origin.x = barViewFrame.origin.x;
+	selectionViewFrame.size.width = barViewFrame.size.width;
+	
+	if ([self.dataSource respondsToSelector:@selector(shouldExtendSelectionViewIntoHeaderPaddingForChartView:)])
+	{
+		if ([self.dataSource shouldExtendSelectionViewIntoHeaderPaddingForChartView:self])
+		{
+			selectionViewFrame.origin.y = self.headerView.frame.size.height;
+		}
+		else
+		{
+			selectionViewFrame.origin.y = self.headerView.frame.size.height + self.headerPadding;
+		}
+	}
+	else
+	{
+		selectionViewFrame.origin.y = self.headerView.frame.size.height + self.headerPadding;
+	}
+	
+	self.verticalSelectionView.frame = selectionViewFrame;
+	[self setVerticalSelectionViewVisible:YES animated:YES];
+	
+	if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:touchPoint:)])
+	{
+		[self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint] touchPoint:touchPoint];
+	}
+	
+	if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:)])
+	{
+		[self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint]];
+	}
+}
+
+- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches
+{
+	if (self.state == JBChartViewStateCollapsed || [self.chartData count] <= 0 || self.reloading)
+	{
+		return;
+	}
+	
+	[self setVerticalSelectionViewVisible:NO animated:YES];
+	
+	if ([self.delegate respondsToSelector:@selector(didDeselectBarChartView:)])
+	{
+		[self.delegate didDeselectBarChartView:self];
+	}
+}
+
+#pragma mark - Touches
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self setVerticalSelectionViewVisible:NO animated:NO];
+	[self touchesBeganOrMovedWithTouches:touches];
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self touchesBeganOrMovedWithTouches:touches];
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self touchesEndedOrCancelledWithTouches:touches];
+}
+
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+	[self touchesEndedOrCancelledWithTouches:touches];
+}
+
+#pragma mark - JBGradientBarViewDataSource
+
+- (CGRect)chartViewBoundsForGradientBarView:(JBGradientBarView *)gradientBarView
+{
+	return self.bounds;
+}
+
+@end

Classes/Bar/Views/JBGradientBarView.h

@@ -0,0 +1,28 @@
+//
+//  JBGradientBarView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class JBGradientBarView;
+
+@protocol JBGradientBarViewDataSource;
+
+@protocol JBGradientBarViewDataSource <NSObject>
+
+@optional
+
+- (CGRect)chartViewBoundsForGradientBarView:(JBGradientBarView *)gradientBarView;
+
+@end
+
+@interface JBGradientBarView: UIView
+
+@property (nonatomic, weak) id<JBGradientBarViewDataSource> delegate;
+@property (nonatomic, strong) CAGradientLayer *gradientLayer;
+
+@end

Classes/Bar/Views/JBGradientBarView.m

@@ -0,0 +1,80 @@
+//
+//  JBGradientBarView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBGradientBarView.h"
+
+@interface JBGradientBarView ()
+
+- (void)construct;
+
+@end
+
+@implementation JBGradientBarView
+
+#pragma mark - Alloc/Init
+
+- (instancetype)init
+{
+	self = [super init];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		[self construct];
+	}
+	return self;
+}
+
+#pragma mark - Setters
+
+- (void)setGradientLayer:(CAGradientLayer *)gradientLayer
+{
+	if (_gradientLayer != nil)
+	{
+		[_gradientLayer removeFromSuperlayer];
+		_gradientLayer = nil;
+	}
+	
+	_gradientLayer = gradientLayer;
+	_gradientLayer.masksToBounds = YES;
+	[self.layer insertSublayer:_gradientLayer atIndex:0];
+}
+
+#pragma mark - Construction
+
+- (void)construct
+{
+	self.clipsToBounds = YES;
+}
+
+#pragma mark - Setters
+
+- (void)setFrame:(CGRect)frame
+{
+	[super setFrame:frame];
+	
+	if ([self.delegate respondsToSelector:@selector(chartViewBoundsForGradientBarView:)])
+	{
+		_gradientLayer.frame = [self.delegate chartViewBoundsForGradientBarView:self]; // gradient is as large as the chart
+		_gradientLayer.frame = CGRectOffset(_gradientLayer.frame, -CGRectGetMinX(frame), 0);
+	}
+	else
+	{
+		_gradientLayer.frame = self.bounds;
+	}
+}
+
+@end

Classes/Base/JBChartView.h

@@ -0,0 +1,170 @@
+//
+//  JBChartView.h
+//  JBChartView
+//
+//  Created by Terry Worona on 9/4/13.
+//  Copyright (c) 2013 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+extern CGFloat const kJBChartViewDefaultAnimationDuration;
+
+@class JBChartView;
+
+/**
+ * At a minimum, a chart can support two states, along with animations to-and-from.
+ */
+typedef NS_ENUM(NSInteger, JBChartViewState){
+	/**
+	 *  Expanded state: chart supports touches, interaction, etc.
+	 */
+	JBChartViewStateExpanded,
+	/**
+	 *  Collapse state: chart is more-or-less disabled at this point.
+	 */
+	JBChartViewStateCollapsed
+};
+
+@protocol JBChartViewDataSource <NSObject>
+
+@optional
+
+/**
+ *  Returns whether or not the chart's selection view should extend into the header padding.
+ *
+ *  Default: NO
+ *
+ *  @param chartView        The chart object requesting this information.
+ *
+ *  @return Whether or not a chart's selection view should extend into the header padding.
+ */
+- (BOOL)shouldExtendSelectionViewIntoHeaderPaddingForChartView:(JBChartView *)chartView;
+
+/**
+ *  Returns whether or not the chart's selection view should extend into the footer padding.
+ *
+ *  Default: NO
+ *
+ *  @param chartView        The chart object requesting this information.
+ *
+ *  @return Whether or not a chart's selection view should extend into the footer padding.
+ */
+- (BOOL)shouldExtendSelectionViewIntoFooterPaddingForChartView:(JBChartView *)chartView;
+
+@end
+
+@protocol JBChartViewDelegate <NSObject>
+
+// Extend (via subclass) to add custom functionality
+
+@end
+
+@interface JBChartView : UIView
+
+/*
+ * Base dataSource and delegate protocols.
+ */
+@property (nonatomic, weak) id<JBChartViewDataSource> dataSource;
+@property (nonatomic, weak) id<JBChartViewDelegate> delegate;
+
+/**
+ *  Header and footer views are shown above and below the chart respectively.
+ *  Each view will be stretched horizontally to fill width of chart.
+ *  Each view's bounds are clipped to support chart state animations.
+ */
+@property (nonatomic, strong) UIView *footerView;
+@property (nonatomic, strong) UIView *headerView;
+
+/**
+ *  The vertical padding between the header and highest chart point (bar, line, etc).
+ *  By default, the selection view will extend into the header padding area. To modify this behaviour,
+ *  implement the dataSource protocol - (BOOL)shouldExtendSelectionViewIntoHeaderPaddingForChartView:(JBChartView *)chartView.
+ */
+@property (nonatomic, assign) CGFloat headerPadding;
+
+/**
+ *  The vertical padding between the footer and lowest chart point (bar, line, etc).
+ *  By default, the selection view will extend into the footer padding area. To modify this behaviour,
+ *  implement the dataSource protocol - (BOOL)shouldExtendSelectionViewIntoFooterPaddingForChartView:(JBChartView *)chartView.
+ */
+@property (nonatomic, assign) CGFloat footerPadding;
+
+/**
+ *  The minimum and maxmimum values of the chart.
+ *  If no value(s) are supplied:
+ *
+ *  minimumValue = chart's data source min value.
+ *  maxmimumValue = chart's data source max value.
+ *
+ *  If value(s) are supplied, they must be >= 0, otherwise an assertion will be thrown.
+ *  The min/max values are clamped to the ceiling and floor of the actual min/max values of the chart's data source;
+ *  for example, if a maximumValue of 20 is supplied & the chart's actual max is 100, then 100 will be used.
+ *
+ *  For min/max modifications to take effect, reloadData must be called.
+ */
+@property (nonatomic, assign) CGFloat minimumValue;
+@property (nonatomic, assign) CGFloat maximumValue;
+
+// reset to default (chart's data source min & max value)
+- (void)resetMinimumValue;
+- (void)resetMaximumValue;
+
+/**
+ *  Charts can either be expanded or contracted.
+ *  By default, a chart should be expanded on initialization.
+ */
+@property (nonatomic, assign) JBChartViewState state;
+
+/**
+ *  Acts similiar to a UITableView's reloadData function.
+ *  The entire chart will be torn down and re-constructed via datasource and delegate protocls.
+ *  If a chart's frame changes, reloadData must be called directly afterwards for the changes to take effect.
+ */
+- (void)reloadData;
+
+/**
+ *  State setter.
+ *
+ *  @param state        Either collapse or expanded.
+ *  @param animated     Whether or not the state should be animated or not.
+ *  @param force        If current state == new state, then setting force to YES will re-configure the chart (default NO).
+ *  @param callback     Called once the animation is completed. If animated == NO, then callback is immediate.
+ */
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback;
+
+/**
+ *  State setter.
+ *
+ *  @param state        Either collapse or expanded.
+ *  @param animated     Whether or not the state should be animated or not.
+ *  @param callback     Called once the animation is completed. If animated == NO, then callback is immediate.
+ */
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback;
+
+/**
+ *  State setter.
+ *
+ *  @param state        Either collapse or expanded.
+ *  @param animated     Whether or not the state should be animated or not.
+ */
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated;
+
+@end
+
+/**
+ * A simple UIView subclass that fades a base color from current alpha to 0.0 (vertically).
+ * Used as a vertical selection view in JBChartView subclasses.
+ */
+@interface JBChartVerticalSelectionView : UIView
+
+/**
+ * Base selection view color. This color will be faded to transparent vertically.
+ *
+ * Default: white color.
+ *
+ */
+@property (nonatomic, strong) UIColor *bgColor;
+
+@end

Classes/Base/JBChartView.m

@@ -0,0 +1,235 @@
+//
+//  JBChartView.m
+//  Nudge
+//
+//  Created by Terry Worona on 9/4/13.
+//  Copyright (c) 2013 Jawbone. All rights reserved.
+//
+
+#import "JBChartView.h"
+
+// Numerics
+CGFloat const kJBChartViewDefaultAnimationDuration = 0.25f;
+
+// Color (JBChartSelectionView)
+static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
+
+@interface JBChartView ()
+
+@property (nonatomic, assign) BOOL hasMaximumValue;
+@property (nonatomic, assign) BOOL hasMinimumValue;
+
+// Construction
+- (void)constructChartView;
+
+// Validation
+- (void)validateHeaderAndFooterHeights;
+
+@end
+
+@implementation JBChartView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+	self = [super initWithCoder:aDecoder];
+	if (self)
+	{
+		[self constructChartView];
+	}
+	return self;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		[self constructChartView];
+	}
+	return self;
+}
+
+- (id)init
+{
+	return [self initWithFrame:CGRectZero];
+}
+
+#pragma mark - Construction
+
+- (void)constructChartView
+{
+	self.clipsToBounds = YES;
+}
+
+#pragma mark - Public
+
+- (void)reloadData
+{
+	// Override
+}
+
+#pragma mark - Validation
+
+- (void)validateHeaderAndFooterHeights
+{
+	NSAssert((self.headerView.bounds.size.height + self.footerView.bounds.size.height) <= self.bounds.size.height, @"JBChartView // the combined height of the footer and header can not be greater than the total height of the chart.");
+}
+
+#pragma mark - Setters
+
+- (void)setHeaderView:(UIView *)headerView
+{
+	if (_headerView)
+	{
+		[_headerView removeFromSuperview];
+		_headerView = nil;
+	}
+	_headerView = headerView;
+	_headerView.clipsToBounds = YES;
+	
+	[self validateHeaderAndFooterHeights];
+	
+	[self addSubview:_headerView];
+	[self reloadData];
+}
+
+- (void)setFooterView:(UIView *)footerView
+{
+	if (_footerView)
+	{
+		[_footerView removeFromSuperview];
+		_footerView = nil;
+	}
+	_footerView = footerView;
+	_footerView.clipsToBounds = YES;
+	
+	[self validateHeaderAndFooterHeights];
+	
+	[self addSubview:_footerView];
+	[self reloadData];
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
+{
+	if ((_state == state) && !force)
+	{
+		return;
+	}
+	
+	_state = state;
+	
+	// Override
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+{
+	[self setState:state animated:animated force:NO callback:callback];
+}
+
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated
+{
+	[self setState:state animated:animated callback:nil];
+}
+
+- (void)setState:(JBChartViewState)state
+{
+	[self setState:state animated:NO];
+}
+
+- (void)setMinimumValue:(CGFloat)minimumValue
+{
+	NSAssert(minimumValue >= 0, @"JBChartView // the minimumValue must be >= 0.");
+	_minimumValue = minimumValue;
+	_hasMinimumValue = YES;
+}
+
+- (void)setMaximumValue:(CGFloat)maximumValue
+{
+	NSAssert(maximumValue >= 0, @"JBChartView // the maximumValue must be >= 0.");
+	_maximumValue = maximumValue;
+	_hasMaximumValue = YES;
+}
+
+- (void)resetMinimumValue
+{
+	_hasMinimumValue = NO; // clears min
+}
+
+- (void)resetMaximumValue
+{
+	_hasMaximumValue = NO; // clears max
+}
+
+@end
+
+@implementation JBChartVerticalSelectionView
+
+#pragma mark - Alloc/Init
+
++ (void)initialize
+{
+	if (self == [JBChartVerticalSelectionView class])
+	{
+		kJBChartVerticalSelectionViewDefaultBgColor = [UIColor whiteColor];
+	}
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		self.backgroundColor = [UIColor clearColor];
+	}
+	return self;
+}
+
+#pragma mark - Drawing
+
+- (void)drawRect:(CGRect)rect
+{
+	CGContextRef context = UIGraphicsGetCurrentContext();
+	[[UIColor clearColor] set];
+	CGContextFillRect(context, rect);
+	
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+	CGFloat locations[] = { 0.0, 1.0 };
+	
+	NSArray *colors = nil;
+	if (self.bgColor != nil)
+	{
+		colors = @[(__bridge id)self.bgColor.CGColor, (__bridge id)[self.bgColor colorWithAlphaComponent:0.0].CGColor];
+	}
+	else
+	{
+		colors = @[(__bridge id)kJBChartVerticalSelectionViewDefaultBgColor.CGColor, (__bridge id)[kJBChartVerticalSelectionViewDefaultBgColor colorWithAlphaComponent:0.0].CGColor];
+	}
+	
+	CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef) colors, locations);
+	
+	CGPoint startPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect));
+	CGPoint endPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect));
+	
+	CGContextSaveGState(context);
+	{
+		CGContextAddRect(context, rect);
+		CGContextClip(context);
+		CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0);
+	}
+	CGContextRestoreGState(context);
+	
+	CGGradientRelease(gradient);
+	CGColorSpaceRelease(colorSpace);
+}
+
+#pragma mark - Setters
+
+- (void)setBgColor:(UIColor *)bgColor
+{
+	_bgColor = bgColor;
+	[self setNeedsDisplay];
+}
+
+@end

Classes/JBBarChartView.m

@@ -1,501 +0,0 @@
-//
-//  JBBarChartView.m
-//  Nudge
-//
-//  Created by Terry Worona on 9/3/13.
-//  Copyright (c) 2013 Jawbone. All rights reserved.
-//
-
-#import "JBBarChartView.h"
-
-// Numerics
-CGFloat static const kJBBarChartViewBarBasePaddingMutliplier = 50.0f;
-CGFloat static const kJBBarChartViewUndefinedMaxHeight = -1.0f;
-CGFloat static const kJBBarChartViewStateAnimationDuration = 0.05f;
-CGFloat static const kJBBarChartViewPopOffset = 10.0f; // used to offset bars for 'pop' animations
-NSInteger static const kJBBarChartViewUndefinedBarIndex = -1;
-
-// Colors (JBChartView)
-static UIColor *kJBBarChartViewDefaultBarColor = nil;
-
-@interface JBBarChartView ()
-
-@property (nonatomic, strong) NSDictionary *chartDataDictionary; // key = column, value = height
-@property (nonatomic, strong) NSArray *barViews;
-@property (nonatomic, assign) CGFloat barPadding;
-@property (nonatomic, assign) CGFloat cachedMaxHeight;
-@property (nonatomic, strong) JBChartVerticalSelectionView *verticalSelectionView;
-@property (nonatomic, assign) BOOL verticalSelectionViewVisible;
-
-// Initialization
-- (void)construct;
-
-// View quick accessors
-- (CGFloat)availableHeight;
-- (CGFloat)normalizedHeightForRawHeight:(NSNumber*)rawHeight;
-- (CGFloat)maxHeight;
-- (CGFloat)minHeight;
-- (CGFloat)barWidth;
-- (CGFloat)popOffset;
-
-// Touch helpers
-- (NSInteger)barViewIndexForPoint:(CGPoint)point;
-- (UIView *)barViewForForPoint:(CGPoint)point;
-- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches;
-- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches;
-
-// Setters
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated;
-
-@end
-
-@implementation JBBarChartView
-
-#pragma mark - Alloc/Init
-
-+ (void)initialize
-{
-	if (self == [JBBarChartView class])
-	{
-		kJBBarChartViewDefaultBarColor = [UIColor blackColor];
-	}
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (id)init
-{
-    self = [super init];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (void)construct
-{
-    self.clipsToBounds = YES;
-    _showsVerticalSelection = YES;
-    _cachedMaxHeight = kJBBarChartViewUndefinedMaxHeight;
-}
-
-#pragma mark - Memory Management
-
-- (void)dealloc
-{
-    [NSObject cancelPreviousPerformRequestsWithTarget:self];
-}
-
-#pragma mark - Data
-
-- (void)reloadData
-{
-    // reset cached max height
-    self.cachedMaxHeight = kJBBarChartViewUndefinedMaxHeight;
-    
-    /*
-     * The data collection holds all position information:
-     * constructed via datasource and delegate functions
-     */
-    dispatch_block_t createDataDictionaries = ^{
-        
-        // Grab the count
-        NSAssert([self.dataSource respondsToSelector:@selector(numberOfBarsInBarChartView:)], @"JBBarChartView // datasource must implement - (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView");
-        NSUInteger dataCount = [self.dataSource numberOfBarsInBarChartView:self];
-
-        // Build up the data collection
-        NSAssert([self.delegate respondsToSelector:@selector(barChartView:heightForBarViewAtAtIndex:)], @"JBBarChartView // delegate must implement - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtAtIndex:(NSUInteger)index");
-        NSMutableDictionary *dataDictionary = [NSMutableDictionary dictionary];
-        for (NSUInteger index=0; index<dataCount; index++)
-        {
-            CGFloat height = [self.delegate barChartView:self heightForBarViewAtAtIndex:index];
-            NSAssert(height > 0, @"JBBarChartView // datasource function - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtAtIndex:(NSUInteger)index must return a CGFloat >= 0");
-            [dataDictionary setObject:[NSNumber numberWithFloat:height] forKey:[NSNumber numberWithInt:(int)index]];
-        }
-        self.chartDataDictionary = [NSDictionary dictionaryWithDictionary:dataDictionary];
-	};
-    
-    /*
-     * Determines the padding between bars as a function of # of bars
-     */
-    dispatch_block_t createBarPadding = ^{
-        if ([self.dataSource respondsToSelector:@selector(barPaddingForBarChartView:)])
-        {
-            self.barPadding = [self.dataSource barPaddingForBarChartView:self];
-        }
-        else
-        {
-            NSUInteger totalBars = [[self.chartDataDictionary allKeys] count];
-            self.barPadding = (1/(float)totalBars) * kJBBarChartViewBarBasePaddingMutliplier;
-        }
-    };
-    
-    /*
-     * Creates a new bar graph view using the previously calculated data model
-     */
-    dispatch_block_t createBars = ^{
-        
-        // Remove old bars
-        for (UIView *barView in self.barViews)
-        {
-            [barView removeFromSuperview];
-        }
-        
-        CGFloat xOffset = 0;
-        NSUInteger index = 0;
-        NSMutableArray *mutableBarViews = [NSMutableArray array];
-        for (NSNumber *key in [[self.chartDataDictionary allKeys] sortedArrayUsingSelector:@selector(compare:)])
-        {
-            UIView *barView = nil; // since all bars are visible at once, no need to cache this view
-            if ([self.dataSource respondsToSelector:@selector(barChartView:barViewAtIndex:)])
-            {
-                barView = [self.dataSource barChartView:self barViewAtIndex:index];
-                NSAssert(barView != nil, @"JBBarChartView // datasource function - (UIView *)barChartView:(JBBarChartView *)barChartView barViewAtIndex:(NSUInteger)index must return a non-nil UIView subclass");
-            }
-            else
-            {
-                barView = [[UIView alloc] init];
-                barView.backgroundColor = kJBBarChartViewDefaultBarColor;
-            }
-            CGFloat height = [self normalizedHeightForRawHeight:[self.chartDataDictionary objectForKey:key]];
-            CGFloat extensionHeight = height > 0.0 ? kJBBarChartViewPopOffset : 0.0;
-            barView.frame = CGRectMake(xOffset, self.bounds.size.height - height - self.footerView.frame.size.height + self.headerPadding, [self barWidth], height + extensionHeight - self.headerPadding);
-            [mutableBarViews addObject:barView];
-			
-            // Add new bar
-            if (self.footerView)
-			{
-				[self insertSubview:barView belowSubview:self.footerView];
-			}
-			else
-			{
-				[self addSubview:barView];
-			}
-            
-            xOffset += ([self barWidth] + self.barPadding);
-            index++;
-        }
-        self.barViews = [NSArray arrayWithArray:mutableBarViews];
-    };
-    
-    /*
-     * Creates a vertical selection view for touch events
-     */
-    dispatch_block_t createSelectionView = ^{
-        
-        // Remove old selection bar
-        if (self.verticalSelectionView)
-        {
-            [self.verticalSelectionView removeFromSuperview];
-            self.verticalSelectionView = nil;
-        }
-        
-        self.verticalSelectionView = [[JBChartVerticalSelectionView alloc] initWithFrame:CGRectMake(0, 0, [self barWidth], self.bounds.size.height - self.footerView.frame.size.height)];
-        self.verticalSelectionView.alpha = 0.0;
-        self.verticalSelectionView.hidden = !self.showsVerticalSelection;
-        if ([self.dataSource respondsToSelector:@selector(barSelectionColorForBarChartView:)])
-        {
-            self.verticalSelectionView.bgColor = [self.dataSource barSelectionColorForBarChartView:self];
-        }
-        
-        // Add new selection bar
-        if (self.footerView)
-        {
-            [self insertSubview:self.verticalSelectionView belowSubview:self.footerView];
-        }
-        else
-        {
-            [self addSubview:self.verticalSelectionView];
-        }
-    };
-    
-    createDataDictionaries();
-    createBarPadding();
-    createBars();
-    createSelectionView();
-    
-    // Position header and footer
-    self.headerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, self.headerView.frame.size.height);
-    self.footerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.size.height - self.footerView.frame.size.height, self.bounds.size.width, self.footerView.frame.size.height);
-}
-
-#pragma mark - View Quick Accessors
-
-- (CGFloat)availableHeight
-{
-    return self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding;
-}
-
-- (CGFloat)normalizedHeightForRawHeight:(NSNumber*)rawHeight
-{
-    CGFloat minHeight = [self minHeight];
-    CGFloat maxHeight = [self maxHeight];
-    CGFloat value = [rawHeight floatValue];
-    
-    if ((maxHeight - minHeight) <= 0)
-    {
-        return 0;
-    }
-    
-    return ((value - minHeight) / (maxHeight - minHeight)) * [self availableHeight];
-}
-
-- (CGFloat)maxHeight
-{
-    if (self.cachedMaxHeight == kJBBarChartViewUndefinedMaxHeight)
-    {
-        // max height is max value across all goals and values
-        NSArray *chartValues = [[[self.chartDataDictionary allValues] arrayByAddingObjectsFromArray:[self.chartDataDictionary allValues]] sortedArrayUsingSelector:@selector(compare:)];
-        self.cachedMaxHeight =  [[chartValues lastObject] floatValue];
-    }
-    return self.cachedMaxHeight;
-}
-
-- (CGFloat)minHeight
-{
-    return 0;
-}
-
-- (CGFloat)barWidth
-{
-    NSUInteger barCount = [[self.chartDataDictionary allKeys] count];
-    if (barCount > 0)
-    {
-        CGFloat totalPadding = (barCount - 1) * self.barPadding;
-        CGFloat availableWidth = self.bounds.size.width - totalPadding;
-        return availableWidth / barCount;
-    }
-    return 0;
-}
-
-- (CGFloat)popOffset
-{
-    return self.bounds.size.height - self.footerView.frame.size.height;
-}
-
-#pragma mark - Setters
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
-{
-    [super setState:state animated:animated callback:callback];
-    
-    dispatch_block_t callbackCopy = [callback copy];
-    
-    if ([self.barViews count] > 0)
-    {
-        if (animated)
-        {
-            CGFloat popOffset = [self popOffset];
-            
-            NSUInteger index = 0;
-            for (UIView *barView in self.barViews)
-            {
-                [UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:(kJBBarChartViewStateAnimationDuration * 0.5) * index options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-                    barView.frame = CGRectMake(barView.frame.origin.x, popOffset - barView.frame.size.height, barView.frame.size.width, barView.frame.size.height);
-                } completion:^(BOOL finished) {
-                    [UIView animateWithDuration:kJBBarChartViewStateAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-                        if (state == JBChartViewStateExpanded)
-                        {
-                            barView.frame = CGRectMake(barView.frame.origin.x, popOffset - barView.frame.size.height + kJBBarChartViewPopOffset, barView.frame.size.width, barView.frame.size.height);
-                        }
-                        else if (state == JBChartViewStateCollapsed)
-                        {
-                            barView.frame = CGRectMake(barView.frame.origin.x, self.bounds.size.height, barView.frame.size.width, barView.frame.size.height);
-                        }
-                    } completion:^(BOOL lastBarFinished) {
-                        if (index == [self.barViews count] - 1)
-                        {
-                            if (callbackCopy)
-                            {
-                                callbackCopy();
-                            }
-                        }
-                    }];
-                }];
-                index++;
-            }
-        }
-        else
-        {
-            for (UIView *barView in self.barViews)
-            {
-                if (state == JBChartViewStateExpanded)
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, (self.bounds.size.height + kJBBarChartViewPopOffset) - (barView.frame.size.height + self.footerView.frame.size.height), barView.frame.size.width, barView.frame.size.height);
-                }
-                else if (state == JBChartViewStateCollapsed)
-                {
-                    barView.frame = CGRectMake(barView.frame.origin.x, self.bounds.size.height, barView.frame.size.width, barView.frame.size.height);
-                }
-            }
-            if (callbackCopy)
-            {
-                callbackCopy();
-            }
-        }   
-    }
-    else
-    {
-        if (callbackCopy)
-        {
-            callbackCopy();
-        }
-    }
-}
-
-#pragma mark - Touch Helpers
-
-- (NSInteger)barViewIndexForPoint:(CGPoint)point
-{
-    NSUInteger index = 0;
-    NSUInteger selectedIndex = kJBBarChartViewUndefinedBarIndex;
-    
-    if (point.x < 0 || point.x > self.bounds.size.width)
-    {
-        return selectedIndex;
-    }
-    
-    CGFloat padding = ceil(self.barPadding * 0.5);
-    for (UIView *barView in self.barViews)
-    {
-        CGFloat minX = CGRectGetMinX(barView.frame) - padding;
-        CGFloat maxX = CGRectGetMaxX(barView.frame) + padding;
-        if ((point.x >= minX) && (point.x <= maxX))
-        {
-            selectedIndex = index;
-            break;
-        }
-        index++;
-    }
-    return selectedIndex;
-}
-
-- (UIView *)barViewForForPoint:(CGPoint)point
-{
-    UIView *barView = nil;
-    NSInteger selectedIndex = [self barViewIndexForPoint:point];
-    if (selectedIndex >= 0)
-    {
-        return [self.barViews objectAtIndex:[self barViewIndexForPoint:point]];
-    }
-    return barView;
-}
-
-- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches
-{
-    if (self.state == JBChartViewStateCollapsed || [[self.chartDataDictionary allKeys] count] <= 0)
-    {
-        return;
-    }
-    
-    UITouch *touch = [touches anyObject];
-    CGPoint touchPoint = [touch locationInView:self];
-    UIView *barView = [self barViewForForPoint:touchPoint];
-    if (barView == nil)
-    {
-        [self setVerticalSelectionViewVisible:NO animated:YES];
-        return;
-    }
-    CGRect barViewFrame = barView.frame;
-    CGRect selectionViewFrame = self.verticalSelectionView.frame;
-    selectionViewFrame.origin.x = barViewFrame.origin.x;
-    self.verticalSelectionView.frame = selectionViewFrame;
-    [self setVerticalSelectionViewVisible:YES animated:YES];
-    
-    if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:touchPoint:)])
-    {
-        [self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint] touchPoint:touchPoint];
-    }
-    
-    if ([self.delegate respondsToSelector:@selector(barChartView:didSelectBarAtIndex:)])
-    {
-        [self.delegate barChartView:self didSelectBarAtIndex:[self barViewIndexForPoint:touchPoint]];
-    }
-}
-
-- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches
-{
-    if (self.state == JBChartViewStateCollapsed || [[self.chartDataDictionary allKeys] count] <= 0)
-    {
-        return;
-    }
-    
-    [self setVerticalSelectionViewVisible:NO animated:YES];
-    
-    if ([self.delegate respondsToSelector:@selector(didUnselectBarChartView:)])
-    {
-        [self.delegate didUnselectBarChartView:self];
-    }
-}
-
-#pragma mark - Setters
-
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated
-{
-    _verticalSelectionViewVisible = verticalSelectionViewVisible;
-    
-    if (animated)
-    {
-        [UIView animateWithDuration:kJBChartViewDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-            self.verticalSelectionView.alpha = self.verticalSelectionViewVisible ? 1.0 : 0.0;
-        } completion:nil];
-    }
-    else
-    {
-        self.verticalSelectionView.alpha = _verticalSelectionViewVisible ? 1.0 : 0.0;
-    }
-}
-
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible
-{
-    [self setVerticalSelectionViewVisible:verticalSelectionViewVisible animated:NO];
-}
-
-- (void)setShowsVerticalSelection:(BOOL)showsVerticalSelection
-{
-    _showsVerticalSelection = showsVerticalSelection;
-    self.verticalSelectionView.hidden = _showsVerticalSelection ? NO : YES;
-}
-
-#pragma mark - Touches
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesBeganOrMovedWithTouches:touches];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesBeganOrMovedWithTouches:touches];
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesEndedOrCancelledWithTouches:touches];
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesEndedOrCancelledWithTouches:touches];
-}
-
-@end

Classes/JBChartView.h

@@ -1,86 +0,0 @@
-//
-//  JBChartView.h
-//  JBChartView
-//
-//  Created by Terry Worona on 9/4/13.
-//  Copyright (c) 2013 Jawbone. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-extern CGFloat const kJBChartViewDefaultAnimationDuration;
-
-/**
- * At a minimum, a chart can support two states, along with animations to-and-from.
- */
-typedef NS_ENUM(NSInteger, JBChartViewState){
-    /**
-     *  Expanded state: chart supports touches, interaction, etc.
-     */
-    JBChartViewStateExpanded,
-    /**
-     *  Collapse state: chart is more-or-less disabled at this point.
-     */
-    JBChartViewStateCollapsed
-};
-
-@interface JBChartView : UIView
-
-/**
- *  Header and footer views are shown above and below the chart respectively.
- *  Each view will be stretched horizontally to fill width of chart.
- */
-@property (nonatomic, strong) UIView *footerView;
-@property (nonatomic, strong) UIView *headerView;
-
-/**
- *  The vertical padding between the header and highest chart point (bar, line, etc).
- */
-@property (nonatomic, assign) CGFloat headerPadding;
-
-/**
- *  Charts can either be expanded or contracted. 
- *  By default, a chart should be expanded on initialization.
- */
-@property (nonatomic, assign) JBChartViewState state;
-
-/**
- *  Acts similiar to a UITableView's reloadData function.
- *  The entire chart will be torn down and re-constructed via datasource and delegate protocls.
- */
-- (void)reloadData;
-
-/**
- *  State setter.
- *
- *  @param state        Either collapse or expanded.
- *  @param animated     Whether or not the state should be animated or not.
- *  @param callback     Called once the animation is completed. If animated == NO, then callback is immediate.
- */
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback;
-
-/**
- *  State setter.
- *
- *  @param state        Either collapse or expanded.
- *  @param animated     Whether or not the state should be animated or not.
- */
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated;
-
-@end
-
-/**
- * A simple UIView subclass that fades a base color from current alpha to 0.0 (vertically).
- * Used as a vertical selection view in JBChartView subclasses.
- */
-@interface JBChartVerticalSelectionView : UIView
-
-/**
- * Base selection view color. This color will be faded to transparent vertically.
- *
- * Default: white color.
- *
- */
-@property (nonatomic, strong) UIColor *bgColor;
-
-@end

Classes/JBChartView.m

@@ -1,179 +0,0 @@
-//
-//  JBChartView.m
-//  Nudge
-//
-//  Created by Terry Worona on 9/4/13.
-//  Copyright (c) 2013 Jawbone. All rights reserved.
-//
-
-#import "JBChartView.h"
-
-CGFloat const kJBChartViewDefaultAnimationDuration = 0.25f;
-
-// Color (JBChartSelectionView)
-static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
-
-@interface JBChartView ()
-
-- (void)validateHeaderAndFooterHeights;
-
-@end
-
-@implementation JBChartView
-
-#pragma mark - Alloc/Init
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        self.clipsToBounds = YES;
-    }
-    return self;
-}
-
-- (id)init
-{
-    return [self initWithFrame:CGRectZero];
-}
-
-#pragma mark - Public
-
-- (void)reloadData
-{
-    // Override
-}
-
-#pragma mark - Helpers
-
-- (void)validateHeaderAndFooterHeights
-{
-    NSAssert((self.headerView.bounds.size.height + self.footerView.bounds.size.height) <= self.bounds.size.height, @"JBChartView // the combined height of the footer and header can not be greater than the total height of the chart.");
-}
-
-#pragma mark - Setters
-
-- (void)setHeaderView:(UIView *)headerView
-{
-    if (_headerView)
-    {
-        [_headerView removeFromSuperview];
-        _headerView = nil;
-    }
-    _headerView = headerView;
-    
-    [self validateHeaderAndFooterHeights];
-    
-    [self addSubview:_headerView];
-    [self reloadData];
-}
-
-- (void)setFooterView:(UIView *)footerView
-{
-    if (_footerView)
-    {
-        [_footerView removeFromSuperview];
-        _footerView = nil;
-    }
-    _footerView = footerView;
-    
-    [self validateHeaderAndFooterHeights];
-    
-    [self addSubview:_footerView];
-    [self reloadData];
-}
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
-{
-    if (_state == state)
-    {
-        return;
-    }
-    
-    _state = state;
-    
-    // Override
-}
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated
-{
-    [self setState:state animated:animated callback:nil];
-}
-
-- (void)setState:(JBChartViewState)state
-{
-    [self setState:state animated:NO];
-}
-
-@end
-
-@implementation JBChartVerticalSelectionView
-
-#pragma mark - Alloc/Init
-
-+ (void)initialize
-{
-	if (self == [JBChartVerticalSelectionView class])
-	{
-		kJBChartVerticalSelectionViewDefaultBgColor = [UIColor whiteColor];
-	}
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        self.backgroundColor = [UIColor clearColor];
-    }
-    return self;
-}
-
-#pragma mark - Drawing
-
-- (void)drawRect:(CGRect)rect
-{
-    CGContextRef context = UIGraphicsGetCurrentContext();
-    [[UIColor clearColor] set];
-    CGContextFillRect(context, rect);
-    
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGFloat locations[] = { 0.0, 1.0 };
-    
-    NSArray *colors = nil;
-    if (self.bgColor != nil)
-    {
-        colors = @[(__bridge id)self.bgColor.CGColor, (__bridge id)[self.bgColor colorWithAlphaComponent:0.0].CGColor];
-    }
-    else
-    {
-        colors = @[(__bridge id)kJBChartVerticalSelectionViewDefaultBgColor.CGColor, (__bridge id)[kJBChartVerticalSelectionViewDefaultBgColor colorWithAlphaComponent:0.0].CGColor];
-    }
-    
-    CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef) colors, locations);
-    
-    CGPoint startPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect));
-    CGPoint endPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect));
-    
-    CGContextSaveGState(context);
-    {
-        CGContextAddRect(context, rect);
-        CGContextClip(context);
-        CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0);
-    }
-    CGContextRestoreGState(context);
-    
-    CGGradientRelease(gradient);
-    CGColorSpaceRelease(colorSpace);
-}
-
-#pragma mark - Setters
-
-- (void)setBgColor:(UIColor *)bgColor
-{
-    _bgColor = bgColor;
-    [self setNeedsDisplay];
-}
-
-@end

Classes/JBLineChartView.h

@@ -1,180 +0,0 @@
-//
-//  JBLineChartView.h
-//  JBChartView
-//
-//  Created by Terry Worona on 9/4/13.
-//  Copyright (c) 2013 Jawbone. All rights reserved.
-//
-
-#import "JBChartView.h"
-
-/**
- * Current support for two line styles: solid (default) and dashed. 
- */
-typedef NS_ENUM(NSInteger, JBLineChartViewLineStyle){
-    /**
-     *  Solid round capped line.
-     */
-    JBLineChartViewLineStyleSolid,
-    /**
-     *  Dashed square capped line with a phase of 3:2 (3 points dashed, 2 points spaced).
-     */
-	JBLineChartViewLineStyleDashed
-};
-
-@protocol JBLineChartViewDelegate;
-@protocol JBLineChartViewDataSource;
-
-@interface JBLineChartView : JBChartView
-
-@property (nonatomic, weak) id<JBLineChartViewDelegate> delegate;
-@property (nonatomic, weak) id<JBLineChartViewDataSource> dataSource;
-
-/**
- *  Vertical highlight overlayed on a line graph during touch events.
- *
- *  Default: YES.
- */
-@property (nonatomic, assign) BOOL showsVerticalSelection;
-
-/**
- *  A highlight shown on a line within the graph during touch events. The highlighted line
- *  is the closest line to the touch point and corresponds to the lineIndex delegatd back via 
- *  didSelectChartAtHorizontalIndex:atLineIndex: and didUnSlectChartAtHorizontalIndex:atLineIndex:
- *
- *  Default: YES.
- */
-@property (nonatomic, assign) BOOL showsLineSelection;
-
-@end
-
-@protocol JBLineChartViewDelegate <NSObject>
-
-@required
-
-/**
- *  Vertical value for a line point at a given index (left to right). There is no ceiling on the the height;
- *  the chart will automatically normalize all values between the overal min and max heights.
- *
- *  @param lineChartView    The line chart object requesting this information.
- *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
- *  @param lineIndex        An index number identifying the closest line in the chart to the current touch point.
- *
- *  @return The y-axis value of the supplied line index (x-axis)
- */
-- (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
-
-@optional
-
-/**
- *  Occurs whenever there is a touch gesture on the chart (chart must be expanded).
- *  The horizontal index is the closest index to the touch point & is clamped to it's max/min value if it moves outside of the view's bounds.
- *  The lineIndex remains constant until the line is unselected and will be highlighted using the (optional) selectionColorForLineAtLineIndex: protocol. 
- *  Futhermore, all other lines that aren't selected will be dimmed to 50% opacity throughout the duration of the touch/move.
- *
- *  @param lineChartView    A line chart object informing the delegate about the new selection.
- *  @param lineIndex        An index number identifying the closest line in the chart to the current touch
- *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).point.
- *  @param touchPoint       The touch point in relation to the chart's bounds (excludes footer and header).
- */
-- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint;
-- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex;
-
-/**
- *  Occurs when selection ends by ending a touch event. For selection start events, see: didSelectChartAtIndex:
- *
- *  @param lineChartView    A line chart object informing the delegate about the unselection.
- */
-- (void)didUnselectLineInLineChartView:(JBLineChartView *)lineChartView;
-
-@end
-
-@protocol JBLineChartViewDataSource <NSObject>
-
-@required
-
-/**
- *  Returns the number of lines for the line chart.
- *
- *  @param lineChartView    The line chart object requesting this information.
- *
- *  @return The number of lines in the line chart.
- */
-- (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView;
-
-/**
- *  Returns the number of vertical values for a particular line at lineIndex within the chart.
- *
- *  @param lineChartView    The line chart object requesting this information.
- *  @param lineIndex        An index number identifying a line in the chart.
- *
- *  @return The number of vertical values for a given line in the line chart.
- */
-- (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex;
-
-@optional
-
-/**
- *  Returns the color of particular line at lineIndex within the chart.
- *
- *  Default: black color.
- *
- *  @param lineChartView    The line chart object requesting this information.
- *  @param lineIndex        An index number identifying a line in the chart.
- *
- *  @return The color to be used to shade a line in the chart.
- */
-- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex;
-
-/**
- *  Returns the width of particular line at lineIndex within the chart.
- *
- *  Default: 5 points.
- *
- *  @param lineChartView    The line chart object requesting this information.
- *  @param lineIndex        An index number identifying a line in the chart.
- *
- *  @return The width to be used to draw a line in the chart.
- */
-- (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex;
-
-/**
- *  Returns the (vertical) selection color to be overlayed on the chart during touch events.
- *  The color is automically faded to transparent (vertically). The property showsVerticalSelection
- *  must be YES for the color to apply.
- *
- *  Default: white color (faded to transparent).
- *
- *  @param lineChartView    The line chart object requesting this information.
- *
- *  @return The color to be used on chart selections.
- */
-- (UIColor *)verticalSelectionColorForLineChartView:(JBLineChartView *)lineChartView;
-
-/**
- *  Returns the selection color to be overlayed on a line within the chart during touch events.
- *  The property showsLineSelection must be YES for the color to apply.
- *
- *  Default: white color.
- *
- *  @param lineChartView    The line chart object requesting this information.
- *  @param lineIndex        An index number identifying a line in the chart.
- *
- *  @return The color to be used to highlight a line during chart selections.
- */
-- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
-
-/**
- *  Returns the line style of a particular line at lineIndex within the chart.
- *  See JBLineChartViewLineStyle for line style descriptions.
- *
- *  Default: JBLineChartViewLineStyleSolid
- *
- *  @param lineChartView    The line chart object requesting this information.
- *  @param lineIndex        An index number identifying a line in the chart.
- *
- *  @return The line style to be used to draw a line in the chart.
- */
-- (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex;
-
-@end

Classes/JBLineChartView.m

@@ -1,897 +0,0 @@
-//
-//  JBLineChartView.m
-//  Nudge
-//
-//  Created by Terry Worona on 9/4/13.
-//  Copyright (c) 2013 Jawbone. All rights reserved.
-//
-
-#import "JBLineChartView.h"
-
-// Drawing
-#import <QuartzCore/QuartzCore.h>
-
-// Enums
-typedef NS_ENUM(NSUInteger, JBLineChartLineViewState){
-	JBLineChartLineViewStateExpanded,
-    JBLineChartLineViewStateCollapsed
-};
-
-typedef NS_ENUM(NSUInteger, JBLineChartHorizontalIndexClamp){
-	JBLineChartHorizontalIndexClampLeft,
-    JBLineChartHorizontalIndexClampRight,
-    JBLineChartHorizontalIndexClampNone
-};
-
-// Numerics (JBLineChartLineView)
-CGFloat static const kJBLineChartLineViewEdgePadding = 10.0;
-CGFloat static const kJBLineChartLineViewStrokeWidth = 5.0;
-CGFloat static const kJBLineChartLineViewMiterLimit = -5.0;
-CGFloat static const kJBLineChartLineViewStateAnimationDuration = 0.25f;
-CGFloat static const kJBLineChartLineViewDefaultLinePhase = 1.0f;
-CGFloat static const kJBLineChartLineViewDefaultDimmedOpacity = 0.5f;
-NSInteger static const kJBLineChartLineViewUnselectedLineIndex = -1;
-
-// Numerics (JBLineSelectionView)
-CGFloat static const kJBLineSelectionViewWidth = 20.0f;
-
-// Numerics (JBLineChartView)
-CGFloat static const kJBLineChartViewUndefinedMaxHeight = -1.0f;
-NSInteger static const kJBLineChartUnselectedLineIndex = -1;
-
-// Collections (JBLineChartLineView)
-static NSArray *kJBLineChartLineViewDefaultDashPattern = nil;
-
-// Colors (JBLineChartView)
-static UIColor *kJBLineChartViewDefaultLineColor = nil;
-static UIColor *kJBLineChartViewDefaultLineSelectionColor = nil;
-
-// Strings (JBLineChartView)
-NSString * const kJBLineChartViewAnimationPathKey = @"path";
-
-@interface JBLineLayer : CAShapeLayer
-
-@property (nonatomic, assign) NSUInteger tag;
-@property (nonatomic, assign) JBLineChartViewLineStyle lineStyle;
-
-@end
-
-@interface JBLineChartPoint : NSObject
-
-@property (nonatomic, assign) CGPoint position;
-
-@end
-
-@protocol JBLineChartLineViewDelegate;
-
-@interface JBLineChartLineView : UIView
-
-@property (nonatomic, assign) id<JBLineChartLineViewDelegate> delegate;
-@property (nonatomic, assign) JBLineChartLineViewState state;
-@property (nonatomic, assign) NSInteger selectedLineIndex; // -1 to unselect
-@property (nonatomic, assign) BOOL animated;
-
-// Data
-- (void)reloadData;
-
-// Setters
-- (void)setState:(JBLineChartLineViewState)state animated:(BOOL)animated callback:(void (^)())callback;
-- (void)setState:(JBLineChartLineViewState)state animated:(BOOL)animated;
-
-// Callback helpers
-- (void)fireCallback:(void (^)())callback;
-
-// View helpers
-- (JBLineLayer *)lineLayerForLineIndex:(NSUInteger)lineIndex;
-
-@end
-
-@protocol JBLineChartLineViewDelegate <NSObject>
-
-- (NSArray *)chartDataForLineChartLineView:(JBLineChartLineView*)lineChartLineView;
-- (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView colorForLineAtLineIndex:(NSUInteger)lineIndex;
-- (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView selectedColorForLineAtLineIndex:(NSUInteger)lineIndex;
-- (CGFloat)lineChartLineView:(JBLineChartLineView *)lineChartLineView widthForLineAtLineIndex:(NSUInteger)lineIndex;
-- (JBLineChartViewLineStyle)lineChartLineView:(JBLineChartLineView *)lineChartLineView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex;
-
-@end
-
-@interface JBLineChartView () <JBLineChartLineViewDelegate>
-
-@property (nonatomic, strong) NSArray *chartData;
-@property (nonatomic, strong) JBLineChartLineView *lineView;
-@property (nonatomic, strong) JBChartVerticalSelectionView *verticalSelectionView;
-@property (nonatomic, assign) CGFloat cachedMaxHeight;
-@property (nonatomic, assign) BOOL verticalSelectionViewVisible;
-
-// Initialization
-- (void)construct;
-
-// View quick accessors
-- (CGFloat)normalizedHeightForRawHeight:(CGFloat)rawHeight;
-- (CGFloat)availableHeight;
-- (CGFloat)maxHeight;
-- (CGFloat)minHeight;
-- (NSUInteger)dataCount;
-
-// Touch helpers
-- (CGPoint)clampPoint:(CGPoint)point toBounds:(CGRect)bounds padding:(CGFloat)padding;
-- (NSInteger)horizontalIndexForPoint:(CGPoint)point indexClamp:(JBLineChartHorizontalIndexClamp)indexClamp lineData:(NSArray *)lineData;
-- (NSInteger)horizontalIndexForPoint:(CGPoint)point indexClamp:(JBLineChartHorizontalIndexClamp)indexClamp; // uses largest line data
-- (NSInteger)horizontalIndexForPoint:(CGPoint)point;
-- (NSInteger)lineIndexForPoint:(CGPoint)point;
-- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches;
-- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches;
-
-// Setters
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated;
-
-@end
-
-@implementation JBLineChartView
-
-#pragma mark - Alloc/Init
-
-+ (void)initialize
-{
-	if (self == [JBLineChartView class])
-	{
-		kJBLineChartViewDefaultLineColor = [UIColor blackColor];
-		kJBLineChartViewDefaultLineSelectionColor = [UIColor whiteColor];
-	}
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (id)init
-{
-    self = [super init];
-    if (self)
-    {
-        [self construct];
-    }
-    return self;
-}
-
-- (void)construct
-{
-    self.clipsToBounds = NO;
-    _showsVerticalSelection = YES;
-    _showsLineSelection = YES;
-    _cachedMaxHeight = kJBLineChartViewUndefinedMaxHeight;
-}
-
-#pragma mark - Data
-
-- (void)reloadData
-{
-    // reset cached max height
-    self.cachedMaxHeight = kJBLineChartViewUndefinedMaxHeight;
-
-    /*
-     * Subview rectangle calculations
-     */
-    CGRect mainViewRect = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, [self availableHeight]);
-
-    /*
-     * The data collection holds all position and marker information:
-     * constructed via datasource and delegate functions
-     */
-    dispatch_block_t createChartData = ^{
-
-        CGFloat pointSpace = (self.bounds.size.width - (kJBLineChartLineViewEdgePadding * 2)) / ([self dataCount] - 1); // Space in between points
-        CGFloat xOffset = kJBLineChartLineViewEdgePadding;
-        CGFloat yOffset = 0;
-       
-        NSMutableArray *mutableChartData = [NSMutableArray array];
-        NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
-        for (NSUInteger lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
-        {
-            NSAssert([self.dataSource respondsToSelector:@selector(lineChartView:numberOfVerticalValuesAtLineIndex:)], @"JBLineChartView // dataSource must implement - (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex");
-            NSUInteger dataCount = [self.dataSource lineChartView:self numberOfVerticalValuesAtLineIndex:lineIndex];
-            NSMutableArray *chartPointData = [NSMutableArray array];
-            for (NSUInteger horizontalIndex=0; horizontalIndex<dataCount; horizontalIndex++)
-            {                
-                NSAssert([self.delegate respondsToSelector:@selector(lineChartView:verticalValueForHorizontalIndex:atLineIndex:)], @"JBLineChartView // delegate must implement - (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
-                CGFloat rawHeight =  [self.delegate lineChartView:self verticalValueForHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
-                NSAssert(rawHeight >= 0, @"JBLineChartView // delegate function - (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex must return a CGFloat >= 0");
-
-                CGFloat normalizedHeight = [self normalizedHeightForRawHeight:rawHeight];
-                yOffset = mainViewRect.size.height - normalizedHeight;
-                
-                JBLineChartPoint *chartPoint = [[JBLineChartPoint alloc] init];
-                chartPoint.position = CGPointMake(xOffset, yOffset);
-                
-                [chartPointData addObject:chartPoint];
-                xOffset += pointSpace;
-            }
-            [mutableChartData addObject:chartPointData];
-            xOffset = kJBLineChartLineViewEdgePadding;
-        }
-        self.chartData = [NSArray arrayWithArray:mutableChartData];
-	};
-
-    /*
-     * Creates a new line graph view using the previously calculated data model
-     */
-    dispatch_block_t createLineGraphView = ^{
-
-        // Remove old line and overlay views
-        if (self.lineView)
-        {
-            [self.lineView removeFromSuperview];
-            self.lineView = nil;
-        }
-
-        // Create new line and overlay subviews
-        self.lineView = [[JBLineChartLineView alloc] initWithFrame:CGRectOffset(mainViewRect, 0, self.headerView.frame.size.height + self.headerPadding)];
-        self.lineView.delegate = self;
-        [self addSubview:self.lineView];
-    };
-
-    /*
-     * Creates a vertical selection view for touch events
-     */
-    dispatch_block_t createSelectionView = ^{
-        if (self.verticalSelectionView)
-        {
-            [self.verticalSelectionView removeFromSuperview];
-            self.verticalSelectionView = nil;
-        }
-
-        self.verticalSelectionView = [[JBChartVerticalSelectionView alloc] initWithFrame:CGRectMake(0, 0, kJBLineSelectionViewWidth, self.bounds.size.height - self.footerView.frame.size.height)];
-        self.verticalSelectionView.alpha = 0.0;
-        self.verticalSelectionView.hidden = !self.showsVerticalSelection;
-        if ([self.dataSource respondsToSelector:@selector(verticalSelectionColorForLineChartView:)])
-        {
-            self.verticalSelectionView.bgColor = [self.dataSource verticalSelectionColorForLineChartView:self];
-        }
-
-        // Add new selection bar
-        if (self.footerView)
-        {
-            [self insertSubview:self.verticalSelectionView belowSubview:self.footerView];
-        }
-        else
-        {
-            [self addSubview:self.verticalSelectionView];
-        }
-    };
-
-    createChartData();
-    createLineGraphView();
-    createSelectionView();
-
-    // Reload views
-    [self.lineView reloadData];
-
-    // Position header and footer
-    self.headerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, self.bounds.size.width, self.headerView.frame.size.height);
-    self.footerView.frame = CGRectMake(self.bounds.origin.x, self.bounds.size.height - self.footerView.frame.size.height, self.bounds.size.width, self.footerView.frame.size.height);
-}
-
-#pragma mark - View Quick Accessors
-
-- (CGFloat)normalizedHeightForRawHeight:(CGFloat)rawHeight
-{
-    CGFloat minHeight = [self minHeight];
-    CGFloat maxHeight = [self maxHeight];
-
-    if ((maxHeight - minHeight) <= 0)
-    {
-        return 0;
-    }
-
-    return ((rawHeight - minHeight) / (maxHeight - minHeight)) * [self availableHeight];
-}
-
-- (CGFloat)availableHeight
-{
-    return self.bounds.size.height - self.headerView.frame.size.height - self.footerView.frame.size.height - self.headerPadding;
-}
-
-- (CGFloat)maxHeight
-{
-    if (self.cachedMaxHeight == kJBLineChartViewUndefinedMaxHeight)
-    {
-        CGFloat maxHeight = 0;
-        NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
-        for (NSUInteger lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
-        {
-            NSAssert([self.dataSource respondsToSelector:@selector(lineChartView:numberOfVerticalValuesAtLineIndex:)], @"JBLineChartView // dataSource must implement - (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex");
-            NSUInteger dataCount = [self.dataSource lineChartView:self numberOfVerticalValuesAtLineIndex:lineIndex];
-            for (NSUInteger horizontalIndex=0; horizontalIndex<dataCount; horizontalIndex++)
-            {
-                NSAssert([self.delegate respondsToSelector:@selector(lineChartView:verticalValueForHorizontalIndex:atLineIndex:)], @"JBLineChartView // delegate must implement - (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
-                CGFloat height = [self.delegate lineChartView:self verticalValueForHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
-                NSAssert(height >= 0, @"JBLineChartView // delegate function - (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex must return a CGFloat >= 0");
-                if (height > maxHeight)
-                {
-                    maxHeight = height;
-                }
-            }
-        }
-        self.cachedMaxHeight = maxHeight;
-    }
-    return self.cachedMaxHeight;
-}
-
-- (CGFloat)minHeight
-{
-    return 0;
-}
-
-- (NSUInteger)dataCount
-{
-    NSUInteger dataCount = 0;
-    NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
-    for (NSUInteger lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
-    {
-        NSAssert([self.dataSource respondsToSelector:@selector(lineChartView:numberOfVerticalValuesAtLineIndex:)], @"JBLineChartView // dataSource must implement - (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex");
-        NSUInteger lineDataCount = [self.dataSource lineChartView:self numberOfVerticalValuesAtLineIndex:lineIndex];
-        if (lineDataCount > dataCount)
-        {
-            dataCount = lineDataCount;
-        }
-    }
-    return dataCount;
-}
-
-#pragma mark - JBLineChartLineViewDelegate
-
-- (NSArray *)chartDataForLineChartLineView:(JBLineChartLineView *)lineChartLineView
-{
-    return self.chartData;
-}
-
-- (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView colorForLineAtLineIndex:(NSUInteger)lineIndex
-{
-    if ([self.dataSource respondsToSelector:@selector(lineChartView:colorForLineAtLineIndex:)])
-    {
-        return [self.dataSource lineChartView:self colorForLineAtLineIndex:lineIndex];
-    }
-    return kJBLineChartViewDefaultLineColor;
-}
-
-- (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView selectedColorForLineAtLineIndex:(NSUInteger)lineIndex
-{
-    if ([self.dataSource respondsToSelector:@selector(lineChartView:selectionColorForLineAtLineIndex:)])
-    {
-        return [self.dataSource lineChartView:self selectionColorForLineAtLineIndex:lineIndex];
-    }
-    return kJBLineChartViewDefaultLineSelectionColor;
-}
-
-- (CGFloat)lineChartLineView:(JBLineChartLineView *)lineChartLineView widthForLineAtLineIndex:(NSUInteger)lineIndex
-{
-    if ([self.dataSource respondsToSelector:@selector(lineChartView:widthForLineAtLineIndex:)])
-    {
-        return [self.dataSource lineChartView:self widthForLineAtLineIndex:lineIndex];
-    }
-    return kJBLineChartLineViewStrokeWidth;
-}
-
-- (JBLineChartViewLineStyle)lineChartLineView:(JBLineChartLineView *)lineChartLineView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
-{
-    if ([self.dataSource respondsToSelector:@selector(lineChartView:lineStyleForLineAtLineIndex:)])
-    {
-        return [self.dataSource lineChartView:self lineStyleForLineAtLineIndex:lineIndex];
-    }
-    return JBLineChartViewLineStyleSolid;
-}
-
-#pragma mark - Setters
-
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
-{
-    [super setState:state animated:animated callback:callback];
-    
-    if ([self.chartData count] > 0)
-    {
-        if (state == JBChartViewStateCollapsed)
-        {
-            [self.lineView setState:JBLineChartLineViewStateCollapsed animated:animated callback:callback];
-        }
-        else if (state == JBChartViewStateExpanded)
-        {
-            [self.lineView setState:JBLineChartLineViewStateExpanded animated:animated callback:callback];
-        }
-    }
-    else
-    {
-        if (callback)
-        {
-            callback();
-        }
-    }
-}
-
-#pragma mark - Touch Helpers
-
-- (CGPoint)clampPoint:(CGPoint)point toBounds:(CGRect)bounds padding:(CGFloat)padding
-{
-    return CGPointMake(MIN(MAX(bounds.origin.x + padding, point.x), bounds.size.width - padding),
-                       MIN(MAX(bounds.origin.y + padding, point.y), bounds.size.height - padding));
-}
-
-- (NSInteger)horizontalIndexForPoint:(CGPoint)point indexClamp:(JBLineChartHorizontalIndexClamp)indexClamp lineData:(NSArray *)lineData
-{
-    NSUInteger index = 0;
-    CGFloat currentDistance = INT_MAX;
-    NSInteger selectedIndex = kJBLineChartUnselectedLineIndex;
-    
-    for (JBLineChartPoint *lineChartPoint in lineData)
-    {
-        BOOL clamped = (indexClamp == JBLineChartHorizontalIndexClampNone) ? YES : (indexClamp == JBLineChartHorizontalIndexClampLeft) ? (point.x - lineChartPoint.position.x >= 0) : (point.x - lineChartPoint.position.x <= 0);
-        if ((abs(point.x - lineChartPoint.position.x)) < currentDistance && clamped == YES)
-        {
-            currentDistance = (abs(point.x - lineChartPoint.position.x));
-            selectedIndex = index;
-        }
-        index++;
-    }
-    
-    return selectedIndex != kJBLineChartUnselectedLineIndex ? selectedIndex : [lineData count] - 1;
-}
-
-- (NSInteger)horizontalIndexForPoint:(CGPoint)point indexClamp:(JBLineChartHorizontalIndexClamp)indexClamp
-{
-    NSArray *largestLineData = nil;
-    for (NSArray *lineData in self.chartData)
-    {
-        if ([lineData count] > [largestLineData count])
-        {
-            largestLineData = lineData;
-        }
-    }
-    return [self horizontalIndexForPoint:point indexClamp:indexClamp lineData:largestLineData];
-}
-
-- (NSInteger)horizontalIndexForPoint:(CGPoint)point
-{
-    return [self horizontalIndexForPoint:point indexClamp:JBLineChartHorizontalIndexClampNone];
-}
-
-- (NSInteger)lineIndexForPoint:(CGPoint)point
-{
-    // Find the horizontal indexes
-    NSInteger leftHorizontalIndex = [self horizontalIndexForPoint:point indexClamp:JBLineChartHorizontalIndexClampLeft];
-    NSInteger rightHorizontalIndex = [self horizontalIndexForPoint:point indexClamp:JBLineChartHorizontalIndexClampRight];
-    
-    NSUInteger shortestDistance = INT_MAX;
-    NSInteger selectedIndex = kJBLineChartUnselectedLineIndex;
-    NSAssert([self.dataSource respondsToSelector:@selector(numberOfLinesInLineChartView:)], @"JBLineChartView // dataSource must implement - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView");
-    
-    // Iterate all lines
-    for (NSUInteger lineIndex=0; lineIndex<[self.dataSource numberOfLinesInLineChartView:self]; lineIndex++)
-    {
-        NSAssert([self.dataSource respondsToSelector:@selector(lineChartView:numberOfVerticalValuesAtLineIndex:)], @"JBLineChartView // dataSource must implement - (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex");
-        if ([self.dataSource lineChartView:self numberOfVerticalValuesAtLineIndex:lineIndex] > rightHorizontalIndex)
-        {
-            NSArray *lineData = [self.chartData objectAtIndex:lineIndex];
-
-            // Left point
-            JBLineChartPoint *leftLineChartPoint = [lineData objectAtIndex:leftHorizontalIndex];
-            CGPoint leftPoint = CGPointMake(leftLineChartPoint.position.x, fmin(fmax(kJBLineChartLineViewEdgePadding, self.lineView.bounds.size.height - leftLineChartPoint.position.y), self.lineView.bounds.size.height - kJBLineChartLineViewEdgePadding));
-            
-            // Right point
-            JBLineChartPoint *rightLineChartPoint = [lineData objectAtIndex:rightHorizontalIndex];
-            CGPoint rightPoint = CGPointMake(rightLineChartPoint.position.x, fmin(fmax(kJBLineChartLineViewEdgePadding, self.lineView.bounds.size.height - rightLineChartPoint.position.y), self.lineView.bounds.size.height - kJBLineChartLineViewEdgePadding));
-            
-            // Touch point
-            CGPoint normalizedTouchPoint = CGPointMake(point.x, self.lineView.bounds.size.height - point.y);
-
-            // Slope
-            CGFloat lineSlope = (CGFloat)(rightPoint.y - leftPoint.y) / (CGFloat)(rightPoint.x - leftPoint.x);
-
-            // Insersection point
-            CGPoint interesectionPoint = CGPointMake(normalizedTouchPoint.x, (lineSlope * (normalizedTouchPoint.x - leftPoint.x)) + leftPoint.y);
-
-            CGFloat currentDistance = abs(interesectionPoint.y - normalizedTouchPoint.y);
-            if (currentDistance < shortestDistance)
-            {
-                shortestDistance = currentDistance;
-                selectedIndex = lineIndex;
-            }
-        }
-    }
-    return selectedIndex;
-}
-
-- (void)touchesBeganOrMovedWithTouches:(NSSet *)touches
-{
-    if (self.state == JBChartViewStateCollapsed || [self.chartData count] <= 0)
-    {
-        return;
-    }
-    
-    UITouch *touch = [touches anyObject];
-    CGPoint touchPoint = [self clampPoint:[touch locationInView:self.lineView] toBounds:self.lineView.bounds padding:kJBLineChartLineViewEdgePadding];
-
-    if ([self.delegate respondsToSelector:@selector(lineChartView:didSelectLineAtIndex:horizontalIndex:touchPoint:)])
-    {
-        NSUInteger lineIndex = self.lineView.selectedLineIndex != kJBLineChartLineViewUnselectedLineIndex ? self.lineView.selectedLineIndex : [self lineIndexForPoint:touchPoint];
-        NSUInteger horizontalIndex = [self horizontalIndexForPoint:touchPoint indexClamp:JBLineChartHorizontalIndexClampNone lineData:[self.chartData objectAtIndex:lineIndex]];
-        [self.delegate lineChartView:self didSelectLineAtIndex:lineIndex horizontalIndex:horizontalIndex touchPoint:[touch locationInView:self]];
-    }
-    
-    if ([self.delegate respondsToSelector:@selector(lineChartView:didSelectLineAtIndex:horizontalIndex:)])
-    {
-        NSUInteger lineIndex = self.lineView.selectedLineIndex != kJBLineChartLineViewUnselectedLineIndex ? self.lineView.selectedLineIndex : [self lineIndexForPoint:touchPoint];
-        [self.delegate lineChartView:self didSelectLineAtIndex:lineIndex horizontalIndex:[self horizontalIndexForPoint:touchPoint indexClamp:JBLineChartHorizontalIndexClampNone lineData:[self.chartData objectAtIndex:lineIndex]]];
-    }
-    
-    CGFloat xOffset = fmin(self.bounds.size.width - self.verticalSelectionView.frame.size.width, fmax(0, touchPoint.x - (ceil(self.verticalSelectionView.frame.size.width * 0.5))));
-    self.verticalSelectionView.frame = CGRectMake(xOffset, self.verticalSelectionView.frame.origin.y, self.verticalSelectionView.frame.size.width, self.verticalSelectionView.frame.size.height);
-    [self setVerticalSelectionViewVisible:YES animated:YES];
-}
-
-- (void)touchesEndedOrCancelledWithTouches:(NSSet *)touches
-{
-    if (self.state == JBChartViewStateCollapsed || [self.chartData count] <= 0)
-    {
-        return;
-    }
-
-    [self setVerticalSelectionViewVisible:NO animated:YES];
-    
-    if ([self.delegate respondsToSelector:@selector(didUnselectLineInLineChartView:)])
-    {
-        [self.delegate didUnselectLineInLineChartView:self];
-    }
-    [self.lineView setSelectedLineIndex:kJBLineChartLineViewUnselectedLineIndex];
-}
-
-#pragma mark - Setters
-
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible animated:(BOOL)animated
-{
-    _verticalSelectionViewVisible = verticalSelectionViewVisible;
-
-    [self bringSubviewToFront:self.verticalSelectionView];
-
-    if (animated)
-    {
-        [UIView animateWithDuration:kJBChartViewDefaultAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-            self.verticalSelectionView.alpha = self.verticalSelectionViewVisible ? 1.0 : 0.0;
-        } completion:nil];
-    }
-    else
-    {
-        self.verticalSelectionView.alpha = _verticalSelectionViewVisible ? 1.0 : 0.0;
-    }
-}
-
-- (void)setVerticalSelectionViewVisible:(BOOL)verticalSelectionViewVisible
-{
-    [self setVerticalSelectionViewVisible:verticalSelectionViewVisible animated:NO];
-}
-
-- (void)setShowsVerticalSelection:(BOOL)showsVerticalSelection
-{
-    _showsVerticalSelection = showsVerticalSelection;
-    self.verticalSelectionView.hidden = _showsVerticalSelection ? NO : YES;
-}
-
-#pragma mark - Gestures
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    UITouch *touch = [touches anyObject];
-    CGPoint touchPoint = [self clampPoint:[touch locationInView:self.lineView] toBounds:self.lineView.bounds padding:kJBLineChartLineViewEdgePadding];
-    [self.lineView setSelectedLineIndex:[self lineIndexForPoint:touchPoint]];
-    [self touchesBeganOrMovedWithTouches:touches];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesBeganOrMovedWithTouches:touches];
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesEndedOrCancelledWithTouches:touches];
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesEndedOrCancelledWithTouches:touches];
-}
-
-@end
-
-@implementation JBLineChartLineView
-
-#pragma mark - Alloc/Init
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        self.clipsToBounds = NO;
-        self.backgroundColor = [UIColor clearColor];
-    }
-    return self;
-}
-
-#pragma mark - Memory Management
-
-- (void)dealloc
-{
-    [NSObject cancelPreviousPerformRequestsWithTarget:self];
-}
-
-#pragma mark - Drawing
-
-- (void)drawRect:(CGRect)rect
-{
-    [super drawRect:rect];
-
-    CGContextRef context = UIGraphicsGetCurrentContext();
-
-    NSAssert([self.delegate respondsToSelector:@selector(chartDataForLineChartLineView:)], @"JBLineChartLineView // delegate must implement - (NSArray *)chartDataForLineChartLineView:(JBLineChartLineView *)lineChartLineView");
-    NSArray *chartData = [self.delegate chartDataForLineChartLineView:self];
-    
-    NSUInteger lineIndex = 0;
-    for (NSArray *lineData in chartData)
-    {
-        UIBezierPath *flatPath = [UIBezierPath bezierPath];
-        flatPath.miterLimit = kJBLineChartLineViewMiterLimit;
-        
-        UIBezierPath *dynamicPath = [UIBezierPath bezierPath];
-        dynamicPath.miterLimit = kJBLineChartLineViewMiterLimit;
-        
-        NSUInteger index = 0;
-        for (JBLineChartPoint *lineChartPoint in [lineData sortedArrayUsingSelector:@selector(compare:)])
-        {
-            if (index == 0)
-            {
-                [dynamicPath moveToPoint:CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - kJBLineChartLineViewEdgePadding, fmax(kJBLineChartLineViewEdgePadding, lineChartPoint.position.y)))];
-                [flatPath moveToPoint:CGPointMake(lineChartPoint.position.x, ceil(self.bounds.size.height * 0.5))];
-            }
-            else
-            {
-                [dynamicPath addLineToPoint:CGPointMake(lineChartPoint.position.x, fmin(self.bounds.size.height - kJBLineChartLineViewEdgePadding, fmax(kJBLineChartLineViewEdgePadding, lineChartPoint.position.y)))];
-                [flatPath addLineToPoint:CGPointMake(lineChartPoint.position.x, ceil(self.bounds.size.height * 0.5))];
-            }
-            
-            index++;
-        }
-        
-        JBLineLayer *shapeLayer = [self lineLayerForLineIndex:lineIndex];
-        if (shapeLayer == nil)
-        {
-            shapeLayer = [JBLineLayer layer];
-        }
-        
-        shapeLayer.tag = lineIndex;
-        
-        NSAssert([self.delegate respondsToSelector:@selector(lineChartLineView:lineStyleForLineAtLineIndex:)], @"JBLineChartLineView // delegate must implement - (JBLineChartViewLineStyle)lineChartLineView:(JBLineChartLineView *)lineChartLineView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex");
-        shapeLayer.lineStyle = [self.delegate lineChartLineView:self lineStyleForLineAtLineIndex:lineIndex];
-        
-        if (self.animated)
-        {
-            NSAssert([self.delegate respondsToSelector:@selector(lineChartLineView:colorForLineAtLineIndex:)], @"JBLineChartLineView // delegate must implement - (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView colorForLineAtLineIndex:(NSUInteger)lineIndex");
-            shapeLayer.strokeColor = [self.delegate lineChartLineView:self colorForLineAtLineIndex:lineIndex].CGColor;
-
-            NSAssert([self.delegate respondsToSelector:@selector(lineChartLineView:widthForLineAtLineIndex:)], @"JBLineChartLineView // delegate must implement - (CGFloat)lineChartLineView:(JBLineChartLineView *)lineChartLineView widthForLineAtLineIndex:(NSUInteger)lineIndex");
-            shapeLayer.lineWidth = [self.delegate lineChartLineView:self widthForLineAtLineIndex:lineIndex];
-            shapeLayer.path = (self.state == JBLineChartLineViewStateCollapsed) ? dynamicPath.CGPath : flatPath.CGPath;
-            shapeLayer.frame = self.bounds;
-            
-            CABasicAnimation *anim = [CABasicAnimation animationWithKeyPath:kJBLineChartViewAnimationPathKey];
-            [anim setRemovedOnCompletion:NO];
-            anim.toValue = self.state == JBLineChartLineViewStateCollapsed ? (id)flatPath.CGPath : (id)dynamicPath.CGPath;
-            anim.duration = kJBLineChartLineViewStateAnimationDuration;
-            anim.removedOnCompletion = NO;
-            anim.fillMode = kCAFillModeForwards;
-            anim.autoreverses = NO;
-            anim.repeatCount = 0;
-            [shapeLayer addAnimation:anim forKey:kJBLineChartViewAnimationPathKey];
-            [self.layer addSublayer:shapeLayer];
-        }
-        else
-        {
-            CGContextSaveGState(context);
-            {
-                NSAssert([self.delegate respondsToSelector:@selector(lineChartLineView:colorForLineAtLineIndex:)], @"JBLineChartLineView // delegate must implement - (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView colorForLineAtLineIndex:(NSUInteger)lineIndex");
-                CGContextSetStrokeColorWithColor(context, [self.delegate lineChartLineView:self colorForLineAtLineIndex:lineIndex].CGColor);
-
-                NSAssert([self.delegate respondsToSelector:@selector(lineChartLineView:widthForLineAtLineIndex:)], @"JBLineChartLineView // delegate must implement - (CGFloat)lineChartLineView:(JBLineChartLineView *)lineChartLineView widthForLineAtLineIndex:(NSUInteger)lineIndex");
-                CGContextSetLineWidth(context, [self.delegate lineChartLineView:self widthForLineAtLineIndex:lineIndex]);
-                
-                CGContextBeginPath(context);
-                CGContextAddPath(context, self.state == JBLineChartLineViewStateCollapsed ? flatPath.CGPath : dynamicPath.CGPath);
-                CGContextDrawPath(context, kCGPathStroke);
-            }
-            CGContextRestoreGState(context);
-        }
-        
-        lineIndex++;
-    }
-    
-    self.animated = NO;
-}
-
-#pragma mark - Data
-
-- (void)reloadData
-{
-    // Drawing is all done with CG (no subviews here)
-    [self setNeedsDisplay];
-}
-
-#pragma mark - Setters
-
-- (void)setState:(JBLineChartLineViewState)state animated:(BOOL)animated callback:(void (^)())callback
-{
-    if (_state == state)
-    {
-        return;
-    }
-
-    dispatch_block_t callbackCopy = [callback copy];
-
-    _state = state;
-    self.animated = animated;
-    [self setNeedsDisplay];
-
-    if (animated)
-    {
-        [self performSelector:@selector(fireCallback:) withObject:callback afterDelay:kJBLineChartLineViewStateAnimationDuration];
-    }
-    else
-    {
-        if (callbackCopy)
-        {
-            callbackCopy();
-        }
-    }
-}
-
-- (void)setState:(JBLineChartLineViewState)state animated:(BOOL)animated
-{
-    [self setState:state animated:animated callback:nil];
-}
-
-- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex
-{
-    _selectedLineIndex = selectedLineIndex;
-    
-    for (CALayer *layer in [self.layer sublayers])
-    {
-        if ([layer isKindOfClass:[JBLineLayer class]])
-        {
-            if (((JBLineLayer *)layer).tag == _selectedLineIndex)
-            {
-                NSAssert([self.delegate respondsToSelector:@selector(lineChartLineView:selectedColorForLineAtLineIndex:)], @"JBLineChartLineView // delegate must implement - (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView selectedColorForLineAtLineIndex:(NSUInteger)lineIndex");
-                ((JBLineLayer *)layer).strokeColor = [self.delegate lineChartLineView:self selectedColorForLineAtLineIndex:((JBLineLayer *)layer).tag].CGColor;
-                ((JBLineLayer *)layer).opacity = 1.0f;
-            }
-            else
-            {
-                NSAssert([self.delegate respondsToSelector:@selector(lineChartLineView:colorForLineAtLineIndex:)], @"JBLineChartLineView // delegate must implement - (UIColor *)lineChartLineView:(JBLineChartLineView *)lineChartLineView colorForLineAtLineIndex:(NSUInteger)lineIndex");
-                ((JBLineLayer *)layer).strokeColor = [self.delegate lineChartLineView:self colorForLineAtLineIndex:((JBLineLayer *)layer).tag].CGColor;
-                ((JBLineLayer *)layer).opacity = (_selectedLineIndex == kJBLineChartLineViewUnselectedLineIndex) ? 1.0f : kJBLineChartLineViewDefaultDimmedOpacity;
-            }
-        }
-    }
-}
-
-#pragma mark - Callback Helpers
-
-- (void)fireCallback:(void (^)())callback
-{
-    dispatch_block_t callbackCopy = [callback copy];
-
-    if (callbackCopy != nil)
-    {
-        callbackCopy();
-    }
-}
-
-- (JBLineLayer *)lineLayerForLineIndex:(NSUInteger)lineIndex
-{
-    for (CALayer *layer in [self.layer sublayers])
-    {
-        if ([layer isKindOfClass:[JBLineLayer class]])
-        {
-            if (((JBLineLayer *)layer).tag == lineIndex)
-            {
-                return (JBLineLayer *)layer;
-            }
-        }
-    }
-    return nil;
-}
-
-@end
-
-@implementation JBLineChartPoint
-
-#pragma mark - Alloc/Init
-
-- (id)init
-{
-    self = [super init];
-    if (self)
-    {
-        _position = CGPointZero;
-    }
-    return self;
-}
-
-#pragma mark - Compare
-
-- (NSComparisonResult)compare:(JBLineChartPoint *)otherObject
-{
-    return self.position.x > otherObject.position.x;
-}
-
-@end
-
-@implementation JBLineLayer
-
-#pragma mark - Alloc/Init
-
-+ (void)initialize
-{
-	if (self == [JBLineLayer class])
-	{
-		kJBLineChartLineViewDefaultDashPattern = @[@(3), @(2)];
-	}
-}
-
-- (id)init
-{
-    self = [super init];
-    if (self)
-    {
-        self.zPosition = 0.0f;
-        self.fillColor = [UIColor clearColor].CGColor;
-    }
-    return self;
-}
-
-#pragma mark - Setters
-
-- (void)setLineStyle:(JBLineChartViewLineStyle)lineStyle
-{
-    _lineStyle = lineStyle;
-    
-    if (_lineStyle == JBLineChartViewLineStyleDashed)
-    {
-        self.lineCap = kCALineCapButt;
-        self.lineJoin = kCALineJoinMiter;
-        self.lineDashPhase = kJBLineChartLineViewDefaultLinePhase;
-        self.lineDashPattern = kJBLineChartLineViewDefaultDashPattern;
-    }
-    else if (_lineStyle == JBLineChartViewLineStyleSolid)
-    {
-        self.lineCap = kCALineCapRound;
-        self.lineJoin = kCALineJoinRound;
-        self.lineDashPhase = 0.0;
-        self.lineDashPattern = nil;
-    }
-}
-
-@end

Classes/Line/JBLineChartView.h

@@ -0,0 +1,490 @@
+//
+//  JBLineChartView.h
+//  JBChartView
+//
+//  Created by Terry Worona on 9/4/13.
+//  Copyright (c) 2013 Jawbone. All rights reserved.
+//
+
+#import "JBChartView.h"
+
+@class JBLineChartView;
+
+/**
+ * Indicates how a line's main path will be drawn.
+ */
+typedef NS_ENUM(NSInteger, JBLineChartViewLineStyle){
+	/**
+	 *  Solid line.
+	 */
+	JBLineChartViewLineStyleSolid,
+	/**
+	 *  Dashed with a 3:2 phase (3 points dashed, 2 points spaced).
+	 */
+	JBLineChartViewLineStyleDashed
+};
+
+/**
+ *  Indicates how a line's main path or fill (including selections)
+ *  will be decorated (via color options).
+ */
+typedef NS_ENUM(NSInteger, JBLineChartViewColorStyle) {
+	/**
+	 *  A solid color (with alpha support via UIColor).
+	 */
+	JBLineChartViewColorStyleSolid,
+	/**
+	 *  a gradient (via CAGradientLayer).
+	 */
+	JBLineChartViewColorStyleGradient
+};
+
+@protocol JBLineChartViewDataSource <JBChartViewDataSource>
+
+@required
+
+/**
+ *  Returns the number of lines for the line chart.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *
+ *  @return The number of lines in the line chart.
+ */
+- (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView;
+
+/**
+ *  Returns the number of vertical values for a particular line at lineIndex within the chart.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The number of vertical values for a given line in the line chart.
+ */
+- (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex;
+
+@optional
+
+/**
+ *  Returns whether or not a line should show a dot for each point.
+ *  Dot size is relative to the line width and not adjustable.
+ *  Dot color is equal to the line color and not adjustable.
+ *
+ *  Default: NO.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return Whether or not a line should show a dot for each chart point.
+ */
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns whether or not a line should be rendered with curved connections and rounded end caps.
+ *
+ *  Default: NO.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return Whether or not a line should smooth it's connections and end caps.
+ */
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView smoothLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the opacity value to be used for dimming the line & fill during selection events.
+ *  This value is applied to the line or fill's opacity anytime it's not selected (but another line is).
+ *  This applies to both solid and gradient color styles.
+ *
+ *  Default: 0.2.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return A value between 0.0 and 1.0 (will be clamped accordingly).
+ */
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns a (custom) UIView instance representing a dot (x,y point) within the chart.
+ *  For this value to apply, showsDotsForLineAtLineIndex: must return YES for the line at lineIndex.
+ *  This protocol supercedes colorForDotAtHorizontalIndex: and dotRadiusForDotAtHorizontalIndex:.
+ *  If nil is returned. the original dot protocols will take precedence. During selection events, a custom
+ *  dot view will not be hidden unless lineChartView:shouldHideDotViewOnSelectionAtHorizontalIndex:atLineIndex:
+ *  is implemented.
+ *
+ *  Default: nil.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return A custom UIView instance representing a dot at a particular horizontal index within a dotted line.
+ */
+- (UIView *)lineChartView:(JBLineChartView *)lineChartView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns whether or not a (custom) dot view should be hidden on selection events.
+ *
+ *  Default: NO.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return Whether or not a (custom) dot view should be hidden on selection events.
+ */
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+@end
+
+@protocol JBLineChartViewDelegate <JBChartViewDelegate>
+
+@required
+
+/**
+ *  Vertical value for a line point at a given index (left to right). There is no ceiling on the the height;
+ *  the chart will automatically normalize all values between the overal min and max heights.
+ *  NAN may able be retuend to indicate missing values. The chart's line will begin at the first non-NAN value and end at the last non-NAN value.
+ *  Furthermore, the line will interopolate any NAN values in between (ie. the line will not be interrupted).
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
+ *  @param lineIndex        An index number identifying the closest line in the chart to the current touch point.
+ *
+ *  @return The y-axis value of the supplied line index (x-axis)
+ */
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+@optional
+
+/**
+ *  Occurs whenever there is a touch gesture on the chart (chart must be expanded).
+ *  The horizontal index is the closest index to the touch point & is clamped to it's max/min value if it moves outside of the view's bounds.
+ *  The lineIndex remains constant until the line is deselected and will be highlighted using the (optional) selectionColorForLineAtLineIndex: protocol.
+ *  Futhermore, all other lines that aren't selected will be dimmed to 20% opacity (default) throughout the duration of the touch/move.
+ *  Any dotted line that isn't the primary selection will have it's dots dimmed to hidden (to avoid transparency issues).
+ *
+ *  @param lineChartView    A line chart object informing the delegate about the new selection.
+ *  @param lineIndex        An index number identifying the closest line in the chart to the current touch
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
+ *  @param touchPoint       The touch point in relation to the chart's bounds (excludes footer and header).
+ */
+- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint;
+- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex;
+
+/**
+ *  Occurs when selection ends by ending a touch event. For selection start events, see: didSelectChartAtIndex:
+ *
+ *  @param lineChartView    A line chart object informing the delegate about the deselection.
+ */
+- (void)didDeselectLineInLineChartView:(JBLineChartView *)lineChartView;
+
+/**
+ *  Returns whether or not a line at a particular index responds to selection events.
+ *
+ *  Default: YES
+ *
+ *  @param lineChartView    A line chart object informing the delegate about the new selection.
+ *  @param lineIndex        An index number identifying the closest line in the chart to the current touch
+ */
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView shouldIgnoreSelectionAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the color of particular line at lineIndex.
+ *  For this to apply, lineChartView:colorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default).
+ *
+ *  Default: black color.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The color to be used to shade a line in the chart.
+ */
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the gradient layer to be used for a particular line at lineIndex within the chart.
+ *  For this to apply, lineChartView:colorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGradient.
+ *
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
+ *
+ *  Default: black to light gray.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The gradient layer to be used to shade a line in the chart.
+ */
+- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView gradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the fill color of particular line at lineIndex within the chart.
+ *  For this to apply, lineChartView:fillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default).
+ *
+ *  Default: clear color (none).
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The fill color to show under a line in the chart.
+ */
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView fillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the gradient layer to be used for a fill of a particular line at lineIndex within the chart.
+ *  For this to apply, lineChartView:fillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGradient.
+ *
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
+ *
+ *  Default: clear gradient (none).
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The fill gradient to show under a line in the chart.
+ */
+- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the color of a particular dot in a line at lineIndex within the chart.
+ *  For this value to apply, showsDotsForLineAtLineIndex: must return YES for the line at lineIndex.
+ *  Any value can be returned for lineIndex's that don't support dots, as it will never be called.
+ *
+ *  Default: black color.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis)
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The color to be used to color a dot within a dotted line in the chart.
+ */
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the width of particular line at lineIndex within the chart.
+ *
+ *  Default: 5 points.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The width to be used to draw a line in the chart.
+ */
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the radius of all dots in a particular line at lineIndex within the chart.
+ *  For this value to apply, showsDotsForLineAtLineIndex: must return YES for the line at lineIndex.
+ *  Any value can be returned for lineIndex's that don't support dots, as it will never be called.
+ *
+ *  Default: line width x 6.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The radius of the dots within a dotted line in the chart.
+ */
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dotRadiusForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the width of the (vertical) selection view to be overlayed on the chart during touch events.
+ *  The property showsVerticalSelection must be YES for the width to apply. The width is clamped to the
+ *  maxmimum width of the chart's bounds.
+ *
+ *  Default: 20px.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *
+ *  @return The width of the selection view used during chart selections.
+ */
+- (CGFloat)verticalSelectionWidthForLineChartView:(JBLineChartView *)lineChartView;
+
+/**
+ *  Returns the (vertical) selection color to be overlayed on the chart during touch events on a given line.
+ *  The color is automically faded to transparent (vertically). The property showsVerticalSelection
+ *  must be YES for the color to apply.
+ *
+ *  Default: white color.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The color of the selection view used during chart selections of the given line.
+ */
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the selection color of a line within the chart during touch events.
+ *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:selectionColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default).
+ *
+ *  Default: matches lineChartView:colorForLineAtLineIndex:.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The color to be used to highlight a line during chart selections.
+ */
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the selection gradient layer of a line within the chart during touch events.
+ *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:selectionColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGradient.
+ *
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
+ *
+ *  Default: matches lineChartView:gradientForLineAtLineIndex:.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The gradient layer to be used to highlight a line during chart selections.
+ */
+- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the selection fill color under a line within the chart during touch events.
+ *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:selectionFillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleSolid (default).
+ *
+ *  Default: matches lineChartView:fillColorForLineAtLineIndex:.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The color to be used to highlight under a line during chart selections.
+ */
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the selection fill gradient layer under a line within the chart during touch events.
+ *  The property showsLineSelection must be YES for the color to apply.
+ *  As well, lineChartView:selectionFillColorStyleForLineAtLineIndex: must return JBLineChartViewColorStyleGrdient.
+ *
+ *  Note: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
+ *
+ *  Default: matches lineChartView:fillGradientForLineAtLineIndex.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The gradient layer to be used to highlight under a line during chart selections.
+ */
+- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the selection color to be overlayed on a line within the chart during touch events.
+ *  The property showsLineSelection must be YES for the color to apply.
+ *
+ *  Default: matches lineChartView:colorForDotAtHorizontalIndex:atLineIndex:(NSUInteger)lineIndex.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis).
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The color to be used to highlight a dot within a dotted line during chart selections.
+ */
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the line style of a particular line at lineIndex within the chart.
+ *  See JBLineChartViewLineStyle for line style descriptions.
+ *
+ *  Default: JBLineChartViewLineStyleSolid.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The line style to be used to draw a line in the chart.
+ */
+- (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the line color style of a particular line at lineIndex within the chart.
+ *  The line color style applies to both selected and non-selected scenarios.
+ *  See JBLineChartViewColorStyle for color style descriptions.
+ *
+ *  Default: JBLineChartViewColorStyleSolid.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The color style to be used to shade a line in the chart.
+ */
+- (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView colorStyleForLineAtLineIndex:(NSUInteger)lineIndex;
+
+/**
+ *  Returns the fill color style of a particular line at lineIndex within the chart.
+ *  The fill color style applies to both selected and non-selected scenarios.
+ *  See JBLineChartViewColorStyle for color style descriptions.
+ *
+ *  Default: JBLineChartViewColorStyleSolid.
+ *
+ *  @param lineChartView    The line chart object requesting this information.
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The fill color style to show under a line in the chart.
+ */
+- (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView fillColorStyleForLineAtLineIndex:(NSUInteger)lineIndex;
+
+@end
+
+@interface JBLineChartView : JBChartView
+
+@property (nonatomic, weak) id<JBLineChartViewDataSource> dataSource;
+@property (nonatomic, weak) id<JBLineChartViewDelegate> delegate;
+
+/*
+ *  Reloads the line chart with a custom animation.
+ *  Adding, removing or modifying existing lines or dot views (via growing/shrinking & fading) if animated = YES;
+ *  Reloading (animated) data is thread safe and can be executed any number of times in succession.
+ *
+ *  Note: fills will not be animated (technical limitation of Apple's CG API). 
+ *
+ *  Default: a non-animated reload (via reloadData).
+ */
+- (void)reloadDataAnimated:(BOOL)animated;
+
+/*
+ *  When reloadData or reloadDataAnimated: is called, the reloading bit is turned on.
+ *  State changes during a reload will be ignored. As well, subsequent calls to reloadData:
+ *  or reloadDataAnimated: before any previous reloads are complete, will also be ignored.
+ *  Lastly, all touch events will be ignored until a reload has compeleted.
+ *
+ *  Note: the above restrictions apply only to animated reloads, as non-animated reloads are synchronous.
+ *
+ *  Default: NO.
+ */
+@property (nonatomic, readonly) BOOL reloading;
+
+/**
+ *  Vertical highlight overlayed on a line graph during touch events.
+ *
+ *  Default: YES.
+ */
+@property (nonatomic, assign) BOOL showsVerticalSelection;
+
+/**
+ *  A highlight shown on a line within the graph during touch events. The highlighted line
+ *  is the closest line to the touch point and corresponds to the lineIndex delegatd back via
+ *  didSelectChartAtHorizontalIndex:atLineIndex: and didUnSlectChartAtHorizontalIndex:atLineIndex:
+ *
+ *  Default: YES.
+ */
+@property (nonatomic, assign) BOOL showsLineSelection;
+
+/**
+ *  The dot view within a particular line at a horizontalIndex.
+ *
+ *  Default: nil.
+ *
+ *  @param horizontalIndex  The 0-based horizontal index of a selection point (left to right, x-axis)
+ *  @param lineIndex        An index number identifying a line in the chart.
+ *
+ *  @return The UIView representing the dot view at a given horizontalIndex within a line or nil if any index is out of range.
+ */
+- (UIView *)dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+@end

Classes/Line/Layers/JBGradientLineLayer.h

@@ -0,0 +1,20 @@
+//
+//  JBGradientLineLayer.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface JBGradientLineLayer : CAGradientLayer
+
+- (instancetype)initWithGradientLayer:(CAGradientLayer *)gradientLayer tag:(NSUInteger)tag filled:(BOOL)filled currentPath:(UIBezierPath *)currentPath;
+
+@property (nonatomic, readonly) NSUInteger tag;
+@property (nonatomic, readonly) BOOL filled;
+@property (nonatomic, strong) UIBezierPath *currentPath;
+@property (nonatomic, readonly) CGFloat alpha; // alpha of gradient, based on first color
+
+@end

Classes/Line/Layers/JBGradientLineLayer.m

@@ -0,0 +1,47 @@
+//
+//  JBGradientLineLayer.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBGradientLineLayer.h"
+
+// Numerics
+static CGFloat const kJBGradientLineLayerDefaultAlpha = 1.0f;
+
+@implementation JBGradientLineLayer
+
+#pragma mark - Alloc/Init
+
+- (instancetype)initWithGradientLayer:(CAGradientLayer *)gradientLayer tag:(NSUInteger)tag filled:(BOOL)filled currentPath:(UIBezierPath *)currentPath
+{
+	self = [super init];
+	if (self)
+	{
+		self.colors = gradientLayer.colors;
+		self.locations = gradientLayer.locations;
+		self.startPoint = gradientLayer.startPoint;
+		self.endPoint = gradientLayer.endPoint;
+		self.type = gradientLayer.type;
+		
+		_tag = tag;
+		_filled = filled;
+		_currentPath = [currentPath copy];
+	}
+	return self;
+}
+
+#pragma mark - Getters
+
+- (CGFloat)alpha
+{
+	if (self.colors.firstObject != nil)
+	{
+		return CGColorGetAlpha((CGColorRef)self.colors.firstObject);
+	}
+	return kJBGradientLineLayerDefaultAlpha;
+}
+
+@end

Classes/Line/Layers/JBShapeLineLayer.h

@@ -0,0 +1,22 @@
+//
+//  JBShapeLineLayer.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// Views
+#import "JBLineChartView.h"
+
+@interface JBShapeLineLayer : CAShapeLayer
+
+- (instancetype)initWithTag:(NSUInteger)tag filled:(BOOL)filled smoothedLine:(BOOL)smoothedLine lineStyle:(JBLineChartViewLineStyle)lineStyle currentPath:(UIBezierPath *)currentPath;
+
+@property (nonatomic, readonly) NSUInteger tag;
+@property (nonatomic, readonly) BOOL filled;
+@property (nonatomic, strong) UIBezierPath *currentPath;
+
+@end

Classes/Line/Layers/JBShapeLineLayer.m

@@ -0,0 +1,92 @@
+//
+//  JBShapeLineLayer.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBShapeLineLayer.h"
+
+// Numerics
+static CGFloat const kJBShapeLineLayerDefaultLinePhase = 1.0f;
+
+// Structures
+static NSArray *kJBShapeLineLayerDefaultDashPattern = nil;
+
+@implementation JBShapeLineLayer
+
+#pragma mark - Alloc/Init
+
++ (void)initialize
+{
+	if (self == [JBShapeLineLayer class])
+	{
+		kJBShapeLineLayerDefaultDashPattern = @[@(3), @(2)];
+	}
+}
+
+- (instancetype)initWithTag:(NSUInteger)tag filled:(BOOL)filled smoothedLine:(BOOL)smoothedLine lineStyle:(JBLineChartViewLineStyle)lineStyle currentPath:(UIBezierPath *)currentPath
+{
+	self = [super init];
+	if (self)
+	{
+		_tag = tag;
+		_filled = filled;
+		_currentPath = [currentPath copy];
+		
+		// Position
+		self.zPosition = filled ? 0.0f : 0.1f;
+		self.fillColor = [UIColor clearColor].CGColor;
+		
+		// Style
+		if (lineStyle == JBLineChartViewLineStyleSolid)
+		{
+			self.lineDashPhase = 0.0;
+			self.lineDashPattern = nil;
+		}
+		else if (lineStyle == JBLineChartViewLineStyleDashed)
+		{
+			self.lineDashPhase = kJBShapeLineLayerDefaultLinePhase;
+			self.lineDashPattern = kJBShapeLineLayerDefaultDashPattern;
+		}
+		
+		// Smoothing
+		if (smoothedLine)
+		{
+			if (filled)
+			{
+				self.lineCap = kCALineCapRound;
+				self.lineJoin = kCALineJoinRound;
+			}
+			else
+			{
+				if (lineStyle == JBLineChartViewLineStyleDashed)
+				{
+					self.lineCap = kCALineCapButt; // smoothed, dashed lines need butt caps
+				}
+				else
+				{
+					self.lineCap = kCALineCapRound;
+				}
+				self.lineJoin = kCALineJoinRound;
+			}
+		}
+		else
+		{
+			if (filled)
+			{
+				self.lineCap = kCALineCapButt;
+				self.lineJoin = kCALineJoinMiter;
+			}
+			else
+			{
+				self.lineCap = kCALineCapButt;
+				self.lineJoin = kCALineJoinMiter;
+			}
+		}
+	}
+	return self;
+}
+
+@end

Classes/Line/Models/JBLineChartLine.h

@@ -0,0 +1,22 @@
+//
+//  JBLineChartLine.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// Charts
+#import "JBLineChartView.h"
+
+@interface JBLineChartLine : NSObject
+
+@property (nonatomic, strong) NSArray *lineChartPoints;
+@property (nonatomic, assign) BOOL smoothedLine;
+@property (nonatomic, assign) JBLineChartViewLineStyle lineStyle;
+@property (nonatomic, assign) JBLineChartViewColorStyle colorStyle;
+@property (nonatomic, assign) JBLineChartViewColorStyle fillColorStyle;
+
+@end

Classes/Line/Models/JBLineChartLine.m

@@ -0,0 +1,29 @@
+//
+//  JBLineChartLine.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartLine.h"
+
+@implementation JBLineChartLine
+
+#pragma mark - Alloc/Init
+
+- (id)init
+{
+	self = [super init];
+	if (self)
+	{
+		_lineChartPoints = [NSArray array];
+		_smoothedLine = NO;
+		_lineStyle = JBLineChartViewLineStyleSolid;
+		_colorStyle = JBLineChartViewColorStyleSolid;
+		_fillColorStyle = JBLineChartViewColorStyleSolid;
+	}
+	return self;
+}
+
+@end

Classes/Line/Models/JBLineChartPoint.h

@@ -0,0 +1,16 @@
+//
+//  JBLineChartPoint.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface JBLineChartPoint : NSObject
+
+@property (nonatomic, assign) CGPoint position;
+@property (nonatomic, assign) BOOL hidden;
+
+@end

Classes/Line/Models/JBLineChartPoint.m

@@ -0,0 +1,32 @@
+//
+//  JBLineChartPoint.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartPoint.h"
+
+@implementation JBLineChartPoint
+
+#pragma mark - Alloc/Init
+
+- (id)init
+{
+	self = [super init];
+	if (self)
+	{
+		_position = CGPointZero;
+	}
+	return self;
+}
+
+#pragma mark - Compare
+
+- (NSComparisonResult)compare:(JBLineChartPoint *)otherObject
+{
+	return self.position.x > otherObject.position.x;
+}
+
+@end

Classes/Line/Views/JBLineChartDotView.h

@@ -0,0 +1,15 @@
+//
+//  JBLineChartDotView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface JBLineChartDotView : UIView
+
+- (id)initWithRadius:(CGFloat)radius;
+
+@end

Classes/Line/Views/JBLineChartDotView.m

@@ -0,0 +1,26 @@
+//
+//  JBLineChartDotView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartDotView.h"
+
+@implementation JBLineChartDotView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithRadius:(CGFloat)radius
+{
+	self = [super initWithFrame:CGRectMake(0, 0, (radius * 2.0f), (radius * 2.0f))];
+	if (self)
+	{
+		self.clipsToBounds = YES;
+		self.layer.cornerRadius = ((radius * 2.0f) * 0.5f);
+	}
+	return self;
+}
+
+@end

Classes/Line/Views/JBLineChartDotsView.h

@@ -0,0 +1,45 @@
+//
+//  JBLineChartDotsView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// Numerics
+extern NSInteger const kJBLineChartDotsViewUnselectedLineIndex;
+
+@protocol JBLineChartDotsViewDataSource;
+
+@interface JBLineChartDotsView : UIView
+
+@property (nonatomic, assign) id<JBLineChartDotsViewDataSource> delegate;
+@property (nonatomic, assign) NSInteger selectedLineIndex;
+@property (nonatomic, strong) NSDictionary *dotViewsDict;
+
+// Data
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback;
+- (void)reloadDataAnimated:(BOOL)animated;
+- (void)reloadData;
+
+// Setters
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated;
+
+// Getters
+- (UIView *)dotViewForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+
+@end
+
+@protocol JBLineChartDotsViewDataSource <NSObject>
+
+- (NSArray *)lineChartLinesForLineChartDotsView:(JBLineChartDotsView*)lineChartDotsView;
+- (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView selectedColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotRadiusForLineAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (UIView *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+- (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
+
+@end

Classes/Line/Views/JBLineChartDotsView.m

@@ -0,0 +1,236 @@
+//
+//  JBLineChartDotsView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/25/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartDotsView.h"
+
+// Additions
+#import "NSMutableArray+JBStack.h"
+
+// Models
+#import "JBLineChartLine.h"
+#import "JBLineChartPoint.h"
+
+// Views
+#import "JBLineChartDotView.h"
+#import "JBLineChartView.h"
+
+// Numerics
+static CGFloat const kJBLineChartDotsViewReloadDataAnimationDuration = 0.15f;
+NSInteger const kJBLineChartDotsViewUnselectedLineIndex = 0.25f;
+
+@implementation JBLineChartDotsView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		self.backgroundColor = [UIColor clearColor];
+	}
+	return self;
+}
+
+#pragma mark - Data
+
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback
+{
+	NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesForLineChartDotsView:)], @"JBLineChartDotsView // delegate must implement - (NSArray *)lineChartLinesForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView");
+	NSArray *lineChartLines = [self.delegate lineChartLinesForLineChartDotsView:self];
+	
+	if (animated)
+	{
+		// Reusable dot views
+		__block NSMutableArray *mutableReusableDotViews = [NSMutableArray array];
+		for (id key in [[self.dotViewsDict allKeys] sortedArrayUsingSelector:@selector(compare:)])
+		{
+			NSArray *dotViews = [self.dotViewsDict objectForKey:key];
+			[mutableReusableDotViews addObjectsFromArray:dotViews];
+		}
+		
+		NSUInteger lineIndex = 0;
+		for (JBLineChartLine *lineChartLine in lineChartLines)
+		{
+			NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:showsDotsForLineAtLineIndex:)], @"JBLineChartDotsView // delegate must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex");
+			if ([self.delegate lineChartDotsView:self showsDotsForLineAtLineIndex:lineIndex]) // line at index contains dots
+			{
+				NSArray *sortedLineChartPoints = [lineChartLine.lineChartPoints sortedArrayUsingSelector:@selector(compare:)];
+				for (NSUInteger horizontalIndex = 0; horizontalIndex < [sortedLineChartPoints count]; horizontalIndex++)
+				{
+					JBLineChartPoint *lineChartPoint = [sortedLineChartPoints objectAtIndex:horizontalIndex];
+					if(lineChartPoint.hidden)
+					{
+						continue;
+					}
+					
+					__block UIView *dotView = [mutableReusableDotViews jb_pop];
+					if (dotView != nil)
+					{
+						[UIView animateWithDuration:kJBLineChartDotsViewReloadDataAnimationDuration animations:^{
+							dotView.center = CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y); // animate move
+						} completion:nil];
+					}
+					
+				}
+			}
+			lineIndex++;
+		}
+		
+		dispatch_after(dispatch_time(DISPATCH_TIME_NOW, kJBLineChartDotsViewReloadDataAnimationDuration * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+			if (callback)
+			{
+				callback();
+			}
+		});
+	}
+	else
+	{
+		// Remove legacy dots
+		for (JBLineChartDotView *dotView in self.subviews)
+		{
+			[dotView removeFromSuperview];
+		}
+		
+		// Create new dots
+		NSUInteger lineIndex = 0;
+		NSMutableDictionary *mutableDotViewsDict = [NSMutableDictionary dictionary];
+		for (JBLineChartLine *lineChartLine in lineChartLines)
+		{
+			NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:showsDotsForLineAtLineIndex:)], @"JBLineChartDotsView // delegate must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex");
+			if ([self.delegate lineChartDotsView:self showsDotsForLineAtLineIndex:lineIndex]) // line at index contains dots
+			{
+				NSMutableArray *mutableDotViews = [NSMutableArray array];
+				NSArray *sortedLineChartPoints = [lineChartLine.lineChartPoints sortedArrayUsingSelector:@selector(compare:)];
+				for (NSUInteger horizontalIndex = 0; horizontalIndex < [sortedLineChartPoints count]; horizontalIndex++)
+				{
+					JBLineChartPoint *lineChartPoint = [sortedLineChartPoints objectAtIndex:horizontalIndex];
+					if(lineChartPoint.hidden)
+					{
+						continue;
+					}
+					
+					UIView *dotView = [self dotViewForHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+					dotView.center = CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y);
+					[mutableDotViews addObject:dotView];
+					[self addSubview:dotView];
+				}
+				[mutableDotViewsDict setObject:[NSArray arrayWithArray:mutableDotViews] forKey:[NSNumber numberWithInteger:lineIndex]];
+			}
+			lineIndex++;
+		}
+		self.dotViewsDict = [NSDictionary dictionaryWithDictionary:mutableDotViewsDict];
+		if (callback)
+		{
+			callback();
+		}
+	}
+}
+
+- (void)reloadDataAnimated:(BOOL)animated
+{
+	[self reloadDataAnimated:animated callback:nil];
+}
+
+- (void)reloadData
+{
+	[self reloadDataAnimated:NO];
+}
+
+#pragma mark - Setters
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated
+{
+	_selectedLineIndex = selectedLineIndex;
+	
+	__weak JBLineChartDotsView* weakSelf = self;
+	
+	dispatch_block_t adjustDots = ^{
+		[weakSelf.dotViewsDict enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+			NSUInteger horizontalIndex = 0;
+			for (UIView *dotView in (NSArray *)obj)
+			{
+				if ([key isKindOfClass:[NSNumber class]])
+				{
+					NSInteger lineIndex = [((NSNumber *)key) intValue];
+					
+					// Internal dot
+					if ([dotView isKindOfClass:[JBLineChartDotView class]])
+					{
+						if (weakSelf.selectedLineIndex == lineIndex)
+						{
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:selectedColorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // delegate must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView selectedColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+							dotView.backgroundColor = [self.delegate lineChartDotsView:self selectedColorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+						}
+						else
+						{
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:colorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // delegate must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+							dotView.backgroundColor = [self.delegate lineChartDotsView:self colorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+							dotView.alpha = (weakSelf.selectedLineIndex == kJBLineChartDotsViewUnselectedLineIndex) ? 1.0f : 0.0f; // hide dots on off-selection
+						}
+					}
+					// Custom dot
+					else
+					{
+						NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:shouldHideDotViewOnSelectionAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // delegate must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+						BOOL hideDotView = [self.delegate lineChartDotsView:self shouldHideDotViewOnSelectionAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+						if (weakSelf.selectedLineIndex == lineIndex)
+						{
+							dotView.alpha = hideDotView ? 0.0f : 1.0f;
+						}
+						else
+						{
+							dotView.alpha = 1.0;
+						}
+					}
+				}
+				horizontalIndex++;
+			}
+		}];
+	};
+	
+	if (animated)
+	{
+		[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration animations:^{
+			adjustDots();
+		}];
+	}
+	else
+	{
+		adjustDots();
+	}
+}
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex
+{
+	[self setSelectedLineIndex:selectedLineIndex animated:NO];
+}
+
+#pragma mark - Getters
+
+- (UIView *)dotViewForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+	NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:dotViewAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // delegate must implement - (UIView *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+	UIView *dotView = [self.delegate lineChartDotsView:self dotViewAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+	
+	// System dot
+	if (dotView == nil)
+	{
+		NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:dotRadiusForLineAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // delegate must implement - (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dotRadiusForLineAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+		CGFloat dotRadius = [self.delegate lineChartDotsView:self dotRadiusForLineAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+		
+		dotView = [[JBLineChartDotView alloc] initWithRadius:dotRadius];
+		
+		NSAssert([self.delegate respondsToSelector:@selector(lineChartDotsView:colorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // delegate must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+		dotView.backgroundColor = [self.delegate lineChartDotsView:self colorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+	}
+	
+	return dotView;
+}
+
+@end

Classes/Line/Views/JBLineChartLinesView.h

@@ -0,0 +1,48 @@
+//
+//  JBLineChartLinesView.h
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/26/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// Numerics
+extern NSInteger const kJBLineChartLinesViewUnselectedLineIndex;
+
+@protocol JBLineChartLinesViewDataSource;
+
+@interface JBLineChartLinesView : UIView
+
+@property (nonatomic, assign) id<JBLineChartLinesViewDataSource> delegate;
+@property (nonatomic, assign) NSInteger selectedLineIndex; // -1 to unselect
+
+// Data
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback;
+- (void)reloadDataAnimated:(BOOL)animated;
+- (void)reloadData;
+
+// Setters
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated;
+
+// Callback helpers
+- (void)fireCallback:(void (^)())callback;
+
+@end
+
+@protocol JBLineChartLinesViewDataSource <NSObject>
+
+- (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView;
+- (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView colorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView gradientForLineAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView widthForLineAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+- (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+- (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+@end

Classes/Line/Views/JBLineChartLinesView.m

@@ -0,0 +1,597 @@
+//
+//  JBLineChartLinesView.m
+//  JBChartViewDemo
+//
+//  Created by Terry Worona on 12/26/15.
+//  Copyright © 2015 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartLinesView.h"
+
+// Layers
+#import "JBGradientLineLayer.h"
+#import "JBShapeLineLayer.h"
+
+// Models
+#import "JBLineChartLine.h"
+#import "JBLineChartPoint.h"
+
+// Numerics
+static CGFloat const kJBLineChartLinesViewMiterLimit = -5.0;
+static CGFloat const kJBLineChartLinesViewSmoothThresholdSlope = 0.01f;
+static CGFloat const kJBLineChartLinesViewReloadDataAnimationDuration = 0.15f;
+static NSInteger const kJBLineChartLinesViewSmoothThresholdVertical = 1;
+NSInteger const kJBLineChartLinesViewUnselectedLineIndex = -1;
+
+@interface JBLineChartLinesView ()
+
+@property (nonatomic, assign) BOOL animated; // for reload
+
+// Getters
+- (UIBezierPath *)bezierPathForLineChartLine:(JBLineChartLine *)lineChartLine filled:(BOOL)filled;
+- (JBShapeLineLayer *)shapeLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled;
+- (JBGradientLineLayer *)gradientLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled;
+- (CABasicAnimation *)basicPathAnimationFromBezierPath:(UIBezierPath *)fromBezierPath toBezierPath:(UIBezierPath *)toBezierPath;
+
+@end
+
+@implementation JBLineChartLinesView
+
+#pragma mark - Alloc/Init
+
+- (id)initWithFrame:(CGRect)frame
+{
+	self = [super initWithFrame:frame];
+	if (self)
+	{
+		self.backgroundColor = [UIColor clearColor];
+	}
+	return self;
+}
+
+#pragma mark - Memory Management
+
+- (void)dealloc
+{
+	[NSObject cancelPreviousPerformRequestsWithTarget:self];
+}
+
+#pragma mark - Drawing
+
+- (void)drawRect:(CGRect)rect
+{
+	[super drawRect:rect];
+	
+	NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesForLineChartLinesView:)], @"JBLineChartLinesView // delegate must implement - (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
+	NSArray *chartData = [self.delegate lineChartLinesForLineChartLinesView:self];
+	
+	for (NSUInteger lineIndex=0; lineIndex<[chartData count]; lineIndex++)
+	{
+		JBLineChartLine *lineChartLine = [chartData objectAtIndex:lineIndex];
+		{
+			UIBezierPath *linePath = [self bezierPathForLineChartLine:lineChartLine filled:NO];
+			UIBezierPath *fillPath = [self bezierPathForLineChartLine:lineChartLine filled:YES];
+			
+			if (linePath == nil || fillPath == nil)
+			{
+				continue;
+			}
+			
+			JBShapeLineLayer *shapeLineLayer = [self shapeLineLayerForLineIndex:lineIndex filled:NO];
+			if (shapeLineLayer == nil)
+			{
+				shapeLineLayer = [[JBShapeLineLayer alloc] initWithTag:lineIndex filled:NO smoothedLine:lineChartLine.smoothedLine lineStyle:lineChartLine.lineStyle currentPath:linePath];
+			}
+			
+			JBShapeLineLayer *shapeLineFillLayer = [self shapeLineLayerForLineIndex:lineIndex filled:YES];
+			if (shapeLineFillLayer == nil)
+			{
+				shapeLineFillLayer = [[JBShapeLineLayer alloc] initWithTag:lineIndex filled:YES smoothedLine:lineChartLine.smoothedLine lineStyle:lineChartLine.lineStyle currentPath:nil]; // path not needed for fills (unsupported)
+			}
+			
+			// Width
+			NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:widthForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView widthForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineLayer.lineWidth = [self.delegate lineChartLinesView:self widthForLineAtLineIndex:lineIndex];
+			
+			NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:widthForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView widthForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineFillLayer.lineWidth = [self.delegate lineChartLinesView:self widthForLineAtLineIndex:lineIndex];
+			
+			// Colors
+			NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:colorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView colorForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineLayer.strokeColor = [self.delegate lineChartLinesView:self colorForLineAtLineIndex:lineIndex].CGColor;
+			
+			NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:fillColorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillColorForLineAtLineIndex:(NSUInteger)lineIndex");
+			shapeLineFillLayer.fillColor = [self.delegate lineChartLinesView:self fillColorForLineAtLineIndex:lineIndex].CGColor;
+			
+			// Bounds
+			shapeLineLayer.frame = self.bounds;
+			shapeLineFillLayer.frame = self.bounds;
+
+			// Note: fills go first because the lines must go on top
+			
+			/*
+			 * Solid fill
+			 */
+			if (lineChartLine.fillColorStyle == JBLineChartViewColorStyleSolid)
+			{
+				shapeLineFillLayer.path = fillPath.CGPath;
+				[self.layer addSublayer:shapeLineFillLayer];
+			}
+			
+			/*
+			 * Gradient fill
+			 */
+			else if (lineChartLine.fillColorStyle == JBLineChartViewColorStyleGradient)
+			{
+				JBGradientLineLayer *gradientLineFillLayer = [self gradientLineLayerForLineIndex:lineIndex filled:YES];
+				if (gradientLineFillLayer == nil)
+				{
+					NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:fillGradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+					gradientLineFillLayer = [[JBGradientLineLayer alloc] initWithGradientLayer:[self.delegate lineChartLinesView:self fillGradientForLineAtLineIndex:lineIndex] tag:lineIndex filled:YES currentPath:nil];
+				}
+				gradientLineFillLayer.frame = shapeLineFillLayer.frame;
+				
+				shapeLineFillLayer.path = fillPath.CGPath;
+				CGColorRef shapeLayerStrokeColor = shapeLineLayer.strokeColor;
+				shapeLineLayer.strokeColor = [UIColor colorWithWhite:1 alpha:[gradientLineFillLayer alpha]].CGColor; // mask uses alpha only
+				shapeLineFillLayer.fillColor = [UIColor colorWithWhite:1 alpha:[gradientLineFillLayer alpha]].CGColor; // mask uses alpha only
+				gradientLineFillLayer.mask = shapeLineFillLayer;
+				[self.layer addSublayer:gradientLineFillLayer];
+				
+				// Refresh shape layer stroke (used below)
+				shapeLineLayer.strokeColor = shapeLayerStrokeColor;
+			}
+			
+			/*
+			 * Solid line
+			 */
+			if (lineChartLine.colorStyle == JBLineChartViewColorStyleSolid)
+			{
+				if (self.animated)
+				{
+					[shapeLineLayer addAnimation:[self basicPathAnimationFromBezierPath:shapeLineLayer.currentPath toBezierPath:linePath] forKey:@"shapeLayerPathAnimation"];
+				}
+				else
+				{
+					shapeLineLayer.path = linePath.CGPath;
+				}
+				
+				shapeLineLayer.currentPath = [linePath copy];
+				[self.layer addSublayer:shapeLineLayer];
+			}
+			
+			/*
+			 * Gradient line
+			 */
+			else if (lineChartLine.colorStyle == JBLineChartViewColorStyleGradient)
+			{
+				JBGradientLineLayer *gradientLineLayer = [self gradientLineLayerForLineIndex:lineIndex filled:NO];
+				if (gradientLineLayer == nil)
+				{
+					NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:gradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView gradientForLineAtLineIndex:(NSUInteger)lineIndex");
+					gradientLineLayer = [[JBGradientLineLayer alloc] initWithGradientLayer:[self.delegate lineChartLinesView:self gradientForLineAtLineIndex:lineIndex] tag:lineIndex filled:NO currentPath:linePath];
+				}
+				gradientLineLayer.frame = shapeLineLayer.frame;
+
+				if (self.animated)
+				{
+					[gradientLineLayer.mask addAnimation:[self basicPathAnimationFromBezierPath:gradientLineLayer.currentPath toBezierPath:linePath] forKey:@"gradientLayerMaskAnimation"];
+				}
+				else
+				{
+					shapeLineLayer.path = linePath.CGPath;
+					shapeLineLayer.strokeColor = [UIColor colorWithWhite:1 alpha:[gradientLineLayer alpha]].CGColor; // mask uses alpha only
+					gradientLineLayer.mask = shapeLineLayer;
+				}
+				
+				gradientLineLayer.currentPath = [linePath copy];
+				[self.layer addSublayer:gradientLineLayer];
+			}
+		}
+	}
+	
+	self.animated = NO;
+}
+
+#pragma mark - Data
+
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback
+{
+	NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesForLineChartLinesView:)], @"JBLineChartLinesView // delegate must implement - (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
+	NSArray *chartData = [self.delegate lineChartLinesForLineChartLinesView:self];
+	
+	NSUInteger lineCount = [chartData count];
+	
+	__weak JBLineChartLinesView* weakSelf = self;
+	
+	dispatch_block_t completionBlock = ^{
+		weakSelf.animated = animated;
+		[weakSelf setNeedsDisplay]; // re-draw layers
+		if (callback)
+		{
+			callback();
+		}
+	};
+	
+	// Mark layers for animation or removal
+	NSMutableArray *mutableRemovedLayers = [NSMutableArray array];
+	for (CALayer *layer in [self.layer sublayers])
+	{
+		BOOL removeLayer = NO;
+		
+		if ([layer isKindOfClass:[JBShapeLineLayer class]])
+		{
+			removeLayer = (((JBShapeLineLayer *)layer).tag >= lineCount);
+		}
+		else if ([layer isKindOfClass:[JBGradientLineLayer class]])
+		{
+			removeLayer = (((JBGradientLineLayer *)layer).tag >= lineCount);
+		}
+		
+		if (removeLayer)
+		{
+			[mutableRemovedLayers addObject:layer];
+		}
+	}
+	
+	// Remove legacy layers
+	NSArray *removedLayers = [NSArray arrayWithArray:mutableRemovedLayers];
+	if ([removedLayers count] > 0)
+	{
+		for (NSUInteger index=0; index<[removedLayers count]; index++)
+		{
+			CALayer *removedLayer = [removedLayers objectAtIndex:index];
+			
+			if (animated)
+			{
+				[CATransaction begin];
+				{
+					CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+					animation.fromValue = [NSNumber numberWithFloat:1.0f];
+					animation.toValue = [NSNumber numberWithFloat:0.0f];
+					animation.duration = kJBLineChartLinesViewReloadDataAnimationDuration;
+					animation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeInEaseOut"];
+					animation.fillMode = kCAFillModeBoth;
+					animation.removedOnCompletion = NO;
+					
+					[CATransaction setCompletionBlock:^{
+						[removedLayer removeFromSuperlayer];
+						if (index == [removedLayers count]-1)
+						{
+							completionBlock();
+						}
+					}];
+					
+					[removedLayer addAnimation:animation forKey:@"removeShapeLayerAnimation"];
+				}
+				[CATransaction commit];
+			}
+			else
+			{
+				[removedLayer removeFromSuperlayer];
+				if (index == [removedLayers count]-1)
+				{
+					completionBlock();
+				}
+			}
+		}
+	}
+	else
+	{
+		completionBlock();
+	}
+}
+
+- (void)reloadDataAnimated:(BOOL)animated
+{
+	[self reloadDataAnimated:animated callback:nil];
+}
+
+- (void)reloadData
+{
+	[self reloadDataAnimated:NO];
+}
+
+#pragma mark - Setters
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated
+{
+	_selectedLineIndex = selectedLineIndex;
+	
+	__weak JBLineChartLinesView* weakSelf = self;
+	
+	dispatch_block_t adjustLines = ^{
+		NSMutableArray *layersToReplace = [NSMutableArray array];
+		
+		NSString * const oldLayerKey = @"oldLayer";
+		NSString * const newLayerKey = @"newLayer";
+		
+		for (CALayer *layer in [weakSelf.layer sublayers])
+		{
+			/*
+			 * Solid line or fill
+			 */
+			if ([layer isKindOfClass:[JBShapeLineLayer class]])
+			{
+				JBShapeLineLayer *shapeLineLayer = (JBShapeLineLayer * )layer;
+				
+				if (shapeLineLayer.filled)
+				{
+					// Selected solid fill
+					if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+					{
+						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionFillColorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.fillColor = [self.delegate lineChartLinesView:self selectionFillColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						shapeLineLayer.opacity = 1.0f;
+					}
+					// Unselected solid fill
+					else
+					{
+						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:fillColorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillColorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.fillColor = [self.delegate lineChartLinesView:self fillColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						
+						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.delegate lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+					}
+				}
+				else
+				{
+					// Selected solid line
+					if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+					{
+						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionColorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.strokeColor = [self.delegate lineChartLinesView:self selectionColorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						shapeLineLayer.opacity = 1.0f;
+					}
+					// Unselected solid line
+					else
+					{
+						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:colorForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (UIColor *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView colorForLineAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.strokeColor = [self.delegate lineChartLinesView:self colorForLineAtLineIndex:shapeLineLayer.tag].CGColor;
+						
+						NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+						shapeLineLayer.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.delegate lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+					}
+				}
+			}
+			
+			/*
+			 * Gradient line or fill
+			 */
+			else if ([layer isKindOfClass:[CAGradientLayer class]])
+			{
+				CAGradientLayer *gradientLayer = (CAGradientLayer * )layer;
+				
+				if ([gradientLayer.mask isKindOfClass:[JBShapeLineLayer class]])
+				{
+					JBShapeLineLayer *shapeLineLayer = (JBShapeLineLayer * )gradientLayer.mask;
+					
+					if (shapeLineLayer.filled)
+					{
+						// Selected gradient fill
+						if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+						{
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionFillGradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *selectedFillGradient = [self.delegate lineChartLinesView:self selectionFillGradientForLineAtLineIndex:shapeLineLayer.tag];
+							selectedFillGradient.frame = layer.frame;
+							selectedFillGradient.mask = layer.mask;
+							selectedFillGradient.opacity = 1.0f;
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: selectedFillGradient}];
+						}
+						// Unselected gradient fill
+						else
+						{
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:fillGradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *unselectedFillGradient = [self.delegate lineChartLinesView:self fillGradientForLineAtLineIndex:shapeLineLayer.tag];
+							unselectedFillGradient.frame = layer.frame;
+							unselectedFillGradient.mask = layer.mask;
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+							unselectedFillGradient.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.delegate lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: unselectedFillGradient}];
+						}
+					}
+					else
+					{
+						// Selected gradient line
+						if (weakSelf.selectedLineIndex >= 0 && ((unsigned)shapeLineLayer.tag == weakSelf.selectedLineIndex))
+						{
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:selectionGradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *selectedGradient = [self.delegate lineChartLinesView:self selectionGradientForLineAtLineIndex:shapeLineLayer.tag];
+							selectedGradient.frame = layer.frame;
+							selectedGradient.mask = layer.mask;
+							selectedGradient.opacity = 1.0f;
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: selectedGradient}];
+						}
+						// Unselected gradient line
+						else
+						{
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:gradientForLineAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CAGradientLayer *)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView gradientForLineAtLineIndex:(NSUInteger)lineIndex");
+							CAGradientLayer *unselectedGradient = [self.delegate lineChartLinesView:self gradientForLineAtLineIndex:shapeLineLayer.tag];
+							unselectedGradient.frame = layer.frame;
+							unselectedGradient.mask = layer.mask;
+							NSAssert([self.delegate respondsToSelector:@selector(lineChartLinesView:dimmedSelectionOpacityAtLineIndex:)], @"JBLineChartLinesView // delegate must implement - (CGFloat)lineChartLinesView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex");
+							shapeLineLayer.opacity = (weakSelf.selectedLineIndex == kJBLineChartLinesViewUnselectedLineIndex) ? 1.0f : [self.delegate lineChartLinesView:self dimmedSelectionOpacityAtLineIndex:shapeLineLayer.tag];
+							[layersToReplace addObject:@{oldLayerKey: layer, newLayerKey: unselectedGradient}];
+						}
+					}
+				}
+			}
+		}
+		
+		for (NSDictionary *layerPair in layersToReplace)
+		{
+			[weakSelf.layer replaceSublayer:layerPair[oldLayerKey] with:layerPair[newLayerKey]];
+		}
+	};
+	
+	if (animated)
+	{
+		[UIView animateWithDuration:kJBChartViewDefaultAnimationDuration animations:^{
+			adjustLines();
+		}];
+	}
+	else
+	{
+		adjustLines();
+	}
+}
+
+- (void)setSelectedLineIndex:(NSInteger)selectedLineIndex
+{
+	[self setSelectedLineIndex:selectedLineIndex animated:NO];
+}
+
+#pragma mark - Getters
+
+- (UIBezierPath *)bezierPathForLineChartLine:(JBLineChartLine *)lineChartLine filled:(BOOL)filled
+{
+	if ([lineChartLine.lineChartPoints count] > 0)
+	{
+		UIBezierPath *bezierPath = [UIBezierPath bezierPath];
+		
+		bezierPath.miterLimit = kJBLineChartLinesViewMiterLimit;
+		
+		JBLineChartPoint *previousLineChartPoint = nil;
+		CGFloat previousSlope = 0.0f;
+		
+		BOOL visiblePointFound = NO;
+		NSArray *sortedLineChartPoints = [lineChartLine.lineChartPoints sortedArrayUsingSelector:@selector(compare:)];
+		CGFloat firstXPosition = 0.0f;
+		CGFloat firstYPosition = 0.0f;
+		CGFloat lastXPosition = 0.0f;
+		CGFloat lastYPosition = 0.0f;
+		
+		for (NSUInteger index=0; index<[sortedLineChartPoints count]; index++)
+		{
+			JBLineChartPoint *lineChartPoint = [sortedLineChartPoints objectAtIndex:index];
+			
+			if (lineChartPoint.hidden)
+			{
+				continue;
+			}
+			
+			if (!visiblePointFound)
+			{
+				[bezierPath moveToPoint:CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y)];
+				firstXPosition = lineChartPoint.position.x;
+				firstYPosition = lineChartPoint.position.y;
+				visiblePointFound = YES;
+			}
+			else
+			{
+				JBLineChartPoint *nextLineChartPoint = nil;
+				if (index != ([lineChartLine.lineChartPoints count] - 1))
+				{
+					nextLineChartPoint = [sortedLineChartPoints objectAtIndex:(index + 1)];
+				}
+				
+				CGFloat nextSlope = (nextLineChartPoint != nil) ? ((nextLineChartPoint.position.y - lineChartPoint.position.y)) / ((nextLineChartPoint.position.x - lineChartPoint.position.x)) : previousSlope;
+				CGFloat currentSlope = ((lineChartPoint.position.y - previousLineChartPoint.position.y)) / (lineChartPoint.position.x-previousLineChartPoint.position.x);
+				
+				BOOL deltaFromNextSlope = ((currentSlope >= (nextSlope + kJBLineChartLinesViewSmoothThresholdSlope)) || (currentSlope <= (nextSlope - kJBLineChartLinesViewSmoothThresholdSlope)));
+				BOOL deltaFromPreviousSlope = ((currentSlope >= (previousSlope + kJBLineChartLinesViewSmoothThresholdSlope)) || (currentSlope <= (previousSlope - kJBLineChartLinesViewSmoothThresholdSlope)));
+				BOOL deltaFromPreviousY = (lineChartPoint.position.y >= previousLineChartPoint.position.y + kJBLineChartLinesViewSmoothThresholdVertical) || (lineChartPoint.position.y <= previousLineChartPoint.position.y - kJBLineChartLinesViewSmoothThresholdVertical);
+				
+				if (lineChartLine.smoothedLine && deltaFromNextSlope && deltaFromPreviousSlope && deltaFromPreviousY)
+				{
+					CGFloat deltaX = lineChartPoint.position.x - previousLineChartPoint.position.x;
+					CGFloat controlPointX = previousLineChartPoint.position.x + (deltaX / 2);
+					
+					CGPoint controlPoint1 = CGPointMake(controlPointX, previousLineChartPoint.position.y);
+					CGPoint controlPoint2 = CGPointMake(controlPointX, lineChartPoint.position.y);
+					
+					[bezierPath addCurveToPoint:CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y) controlPoint1:controlPoint1 controlPoint2:controlPoint2];
+				}
+				else
+				{
+					[bezierPath addLineToPoint:CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y)];
+				}
+				
+				lastXPosition = lineChartPoint.position.x;
+				lastYPosition = lineChartPoint.position.y;
+				previousSlope = currentSlope;
+			}
+			previousLineChartPoint = lineChartPoint;
+		}
+		
+		if (filled)
+		{
+			UIBezierPath *filledBezierPath = [bezierPath copy];
+			
+			if(visiblePointFound)
+			{
+				[filledBezierPath addLineToPoint:CGPointMake(lastXPosition, lastYPosition)];
+				[filledBezierPath addLineToPoint:CGPointMake(lastXPosition, self.bounds.size.height)];
+				
+				[filledBezierPath addLineToPoint:CGPointMake(firstXPosition, self.bounds.size.height)];
+				[filledBezierPath addLineToPoint:CGPointMake(firstXPosition, firstYPosition)];
+			}
+			
+			return filledBezierPath;
+		}
+		else
+		{
+			return bezierPath;
+		}
+	}
+	return nil;
+}
+
+- (JBShapeLineLayer *)shapeLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled
+{
+	for (CALayer *layer in [self.layer sublayers])
+	{
+		if ([layer isKindOfClass:[JBShapeLineLayer class]])
+		{
+			if (((JBShapeLineLayer *)layer).tag == lineIndex && ((JBShapeLineLayer *)layer).filled == filled)
+			{
+				return (JBShapeLineLayer *)layer;
+			}
+		}
+	}
+	return nil;
+}
+
+- (JBGradientLineLayer *)gradientLineLayerForLineIndex:(NSUInteger)lineIndex filled:(BOOL)filled
+{
+	for (CALayer *layer in [self.layer sublayers])
+	{
+		if ([layer isKindOfClass:[JBGradientLineLayer class]])
+		{
+			if (((JBGradientLineLayer *)layer).tag == lineIndex && ((JBGradientLineLayer *)layer).filled == filled)
+			{
+				return (JBGradientLineLayer *)layer;
+			}
+		}
+	}
+	return nil;
+}
+
+- (CABasicAnimation *)basicPathAnimationFromBezierPath:(UIBezierPath *)fromBezierPath toBezierPath:(UIBezierPath *)toBezierPath
+{
+	CABasicAnimation *basicPathAnimation = [CABasicAnimation animationWithKeyPath:@"path"];
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
+	basicPathAnimation.fromValue = (id)fromBezierPath.CGPath;
+	basicPathAnimation.toValue = (id)toBezierPath.CGPath;
+#pragma GCC diagnostic pop
+	basicPathAnimation.duration = kJBLineChartLinesViewReloadDataAnimationDuration;
+	basicPathAnimation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeInEaseOut"];
+	basicPathAnimation.fillMode = kCAFillModeBoth;
+	basicPathAnimation.removedOnCompletion = NO;
+	return basicPathAnimation;
+}
+
+#pragma mark - Callback Helpers
+
+- (void)fireCallback:(void (^)())callback
+{
+	dispatch_block_t callbackCopy = [callback copy];
+	
+	if (callbackCopy != nil)
+	{
+		callbackCopy();
+	}
+}
+
+@end

Customization.md

@@ -0,0 +1,212 @@
+## Customization
+
+Both the line and bar charts support a robust set of customization options. 
+
+The background of a bar or line chart can be set just like any other view:
+	
+	self.barChartView.backgroundColor = ...; // UIColor
+	self.lineChartView.backgroundColor = ...; // UIColor
+	
+Any <i>JBChartView</i> subclass supports the use of headers and footers (similiar to that of <i>UITableView</i>):
+
+	self.barChartView.footerView = ...; // UIView
+	self.lineChartView.headerView = ...; // UIView
+	
+Lastly, any JBChartView subclass can be collapsed or expanded programmatically via the <i>state</i> property. If you chose to animate state changes, a callback helper can be used to notify you when the animation has completed:
+
+	- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback;
+
+#### JBBarChartView
+
+A bar chart can be inverted such that it's orientation is top->down (including the selection view) by setting the following property:
+
+	@property (nonatomic, assign, getter=isInverted) BOOL inverted;
+
+By default, a chart's bars will be black and flat. They can be customized by supplying a UIView subclass through the <i>optional</i> protocol:
+
+	- (UIView *)barChartView:(JBBarChartView *)barChartView barViewAtIndex:(NSUInteger)index
+	{
+		return ...; // color of line in chart
+	}
+	
+If you don't require a custom UIView, simply supply a color for the bar instead:
+
+	- (UIColor *)barChartView:(JBBarChartView *)barChartView colorForBarViewAtIndex:(NSUInteger)index;
+	
+If a solid color isn't your cup of tea, you can expose a gradient to be applied across the entire chart:
+
+	- (CAGradientLayer *)barGradientForBarChartView:(JBBarChartView *)barChartView;
+
+Furthermore, the color of the selection bar (on touch events) can be customized via the <i>optional</i> protocol:
+
+	- (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView
+	{
+		return ...; // color of selection view
+	}
+	
+<b>Note</b>: The delegate will request a custom UIView, followed by a color and lastly a gradient. If nothing is supplied, a plain black bar will be used.
+	
+Lastly, a bar chart's selection events are delegated back via:
+
+	- (void)barChartView:(JBBarChartView *)barChartView didSelectBarAtIndex:(NSUInteger)index touchPoint:(CGPoint)touchPoint
+	{
+		// Update view
+	}
+
+	- (void)didDeselectBarChartView:(JBBarChartView *)barChartView
+	{
+		// Update view
+	}
+
+The <b>touchPoint</b> is especially important as it allows you to add custom elements to your chart during  selection events. Refer to the demo project (<b>JBarChartViewController</b>) to see how a tooltip can be used to display additional information during selection events.
+
+#### JBLineChartView
+
+The color, width and style of each line in the chart can be customized via the <i>optional</i> protocol:
+
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex
+	{
+		return ...; // color of line in chart
+	}
+	
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView fillColorForLineAtLineIndex:(NSUInteger)lineIndex
+	{
+		return ...; // color of area under line in chart
+	}
+	
+	- (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex
+	{
+		return ...; // width of line in chart
+	}
+	
+	- (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
+	{
+		return ...; // style of line in chart (solid or dashed)
+	}
+	
+Additionally, the line and fill color style can be customzized via the <i>optional</i> protocols (below). The line & fill color style apply to both selected and non-selected scenarios, meaning, if your line has a solid style, it's selected style will also be solid. 
+
+    - (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView colorStyleForLineAtLineIndex:(NSUInteger)lineIndex
+    {
+        return ...; // color line style of a line in the chart
+    }
+    
+    - (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView fillColorStyleForLineAtLineIndex:(NSUInteger)lineIndex
+    {
+        return ...; // color style for the area under a line in the chart
+    }
+
+If a solid color style is used, the following <i>optional</i> protocols can be implemented:
+
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView fillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+ 	
+Gradient color styles require a CAGradientLayer to be returned:
+
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView gradientForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView fillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+
+**Note**: gradients do not support multiple alphas. The alpha of gradient's first color be used throughout.
+
+Defining a gradient to use is simple and flexible. For example, this would be a horizontal gradient from blue to green:
+
+    CAGradientLayer *gradient = [CAGradientLayer new];
+    gradient.startPoint = CGPointMake(0.0, 0.0);
+    gradient.endPoint = CGPointMake(1.0, 0.0);
+    gradient.colors = @[(id)[UIColor blueColor].CGColor, (id)[UIColor greenColor].CGColor];
+    
+As mentioned prior, the same color style is duplicated for selection events:
+
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex;
+
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+	- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex;
+  
+The color and width of the selection view along with the color of the selected line can be customized via the <i>optional</i> protocols:
+
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex
+	{
+		return ...; // color of selection view
+	}
+	
+	- (CGFloat)verticalSelectionWidthForLineChartView:(JBLineChartView *)lineChartView
+	{
+		return ...; // width of selection view
+	}
+	
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex
+	{
+		return ...; // color of selected line
+	}
+	
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex
+	{
+		return ...; // color of area under selected line
+	}
+	
+When using a gradient for the line or fill, a different gradient can provided for selection. If the selection gradient is not provided, it will default to the line and fill gradient provided for the line.
+    
+    - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionGradientForLineAtLineIndex:(NSUInteger)lineIndex
+    {
+        return ...; // gradient for selected line
+    }
+
+    - (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView selectionFillGradientForLineAtLineIndex:(NSUInteger)lineIndex
+    {
+        return ...; // gradient for area under selected line
+    }
+	
+By default, each line will not show dots for each point. To enable this on a per-line basis:
+
+	- (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex;
+
+To the radius of each dot (default is 6x the line width, or 3x the diameter), implement:
+
+	- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dotRadiusForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+	
+To customize the color of each dot during selection and non-selection events (default is white and black respectively), implement:
+
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;	
+	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+	
+Alternatively, you can supply your own UIView instead of using the default impelmentation:
+
+	- (UIView *)lineChartView:(JBLineChartView *)lineChartView dotViewAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+	
+Custom dot views are automatically shown when selected unless the following is implemented:
+
+    - (BOOL)lineChartView:(JBLineChartView *)lineChartView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex;
+		
+As well, by default, each line will have squared off end caps and connection points. To enable rounded connections and end caps:
+
+	- (BOOL)lineChartView:(JBLineChartView *)lineChartView smoothLineAtLineIndex:(NSUInteger)lineIndex;
+		
+Furthermore, a line chart's selection events are delegated back via:
+
+	- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint
+	{
+		// Update view
+	}
+
+	- (void)didDeselectLineInLineChartView:(JBLineChartView *)lineChartView
+	{
+		// Update view
+	}
+	
+Upon selection, all other lines (+ fills) will be dimmed to 20% opacity (default). To change this value, implement:
+
+    - (CGFloat)lineChartView:(JBLineChartView *)lineChartView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex
+    {
+        // Return new opacity (0.0 to hide completely, and 1.0 to have no effect)
+    }
+	
+If you don't want a line to be selectable:
+
+	- (BOOL)lineChartView:(JBLineChartView *)lineChartView shouldIgnoreSelectionAtIndex:(NSUInteger)lineIndex
+	{
+		return NO; // Check line index
+	}
+	
+The <b>touchPoint</b> is especially important as it allows you to add custom elements to your chart during  selection events. Refer to the demo project (<b>JBLineChartViewController</b>) to see how a tooltip can be used to display additional information during selection events.
+

JBChartView.podspec

@@ -1,17 +1,19 @@
 Pod::Spec.new do |s|
   s.name         = "JBChartView"
-  s.version      = "2.0.0"
+  s.version      = "3.0.0"
   s.summary      = "Jawbone's iOS-based charting library for both line and bar graphs."
   s.homepage     = "https://github.com/Jawbone/JBChartView"
 
+  s.screenshot   = "https://raw.github.com/Jawbone/JBChartView/master/Screenshots/main.jpg"
+
   s.license      = { :type => 'Apache', :file => 'LICENSE' }
   s.author       = { "Terry Worona" => "tworona@jawbone.com" }
   s.source       = { 
 	:git => "https://github.com/Jawbone/JBChartView.git",
-	:tag => "v2.0.0"
+	:tag => "v3.0.0"
   }
 
-  s.platform     = :ios, '7.0'
-  s.source_files  = 'Classes', 'Classes/**/*.{h,m}'
+  s.platform     = :ios, '6.0'
+  s.source_files = 'Classes/**/*.{h,m}'
   s.requires_arc = true
 end

JBChartViewDemo/JBChartViewDemo.xcodeproj/project.pbxproj

@@ -7,7 +7,21 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		566C73A61C026858000EC785 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 566C73A51C026858000EC785 /* Default-568h@2x.png */; };
+		94BDFC3419F933B2007492F6 /* JBLineChartMissingPointsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94BDFC3319F933B2007492F6 /* JBLineChartMissingPointsViewController.m */; };
 		9B0725211829822A0052109B /* JBChartListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0725201829822A0052109B /* JBChartListViewController.m */; };
+		9B13518F1C31FAB3000D4C92 /* NSMutableArray+JBStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351711C31FAB3000D4C92 /* NSMutableArray+JBStack.m */; };
+		9B1351901C31FAB3000D4C92 /* JBBarChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351741C31FAB3000D4C92 /* JBBarChartView.m */; };
+		9B1351911C31FAB3000D4C92 /* JBGradientBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351771C31FAB3000D4C92 /* JBGradientBarView.m */; };
+		9B1351921C31FAB3000D4C92 /* JBChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13517A1C31FAB3000D4C92 /* JBChartView.m */; };
+		9B1351931C31FAB3000D4C92 /* JBLineChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13517D1C31FAB3000D4C92 /* JBLineChartView.m */; };
+		9B1351941C31FAB3000D4C92 /* JBGradientLineLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351801C31FAB3000D4C92 /* JBGradientLineLayer.m */; };
+		9B1351951C31FAB3000D4C92 /* JBShapeLineLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351821C31FAB3000D4C92 /* JBShapeLineLayer.m */; };
+		9B1351961C31FAB3000D4C92 /* JBLineChartLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351851C31FAB3000D4C92 /* JBLineChartLine.m */; };
+		9B1351971C31FAB3000D4C92 /* JBLineChartPoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1351871C31FAB3000D4C92 /* JBLineChartPoint.m */; };
+		9B1351981C31FAB3000D4C92 /* JBLineChartDotsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13518A1C31FAB3000D4C92 /* JBLineChartDotsView.m */; };
+		9B1351991C31FAB3000D4C92 /* JBLineChartDotView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13518C1C31FAB3000D4C92 /* JBLineChartDotView.m */; };
+		9B13519A1C31FAB3000D4C92 /* JBLineChartLinesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B13518E1C31FAB3000D4C92 /* JBLineChartLinesView.m */; };
 		9B2E530518218CF20079B9D2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B2E530418218CF20079B9D2 /* Foundation.framework */; };
 		9B2E530718218CF20079B9D2 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B2E530618218CF20079B9D2 /* CoreGraphics.framework */; };
 		9B2E530918218CF20079B9D2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B2E530818218CF20079B9D2 /* UIKit.framework */; };
@@ -29,12 +43,12 @@
 		9B698F17182D7DAE003C135F /* icon-bar-chart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B698F13182D7DAE003C135F /* icon-bar-chart@2x.png */; };
 		9B698F18182D7DAE003C135F /* icon-line-chart.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B698F14182D7DAE003C135F /* icon-line-chart.png */; };
 		9B698F19182D7DAE003C135F /* icon-line-chart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B698F15182D7DAE003C135F /* icon-line-chart@2x.png */; };
-		9B6A68D31829AB9F006DB3BF /* JBChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68D21829AB9F006DB3BF /* JBChartView.m */; };
-		9B6A68DB1829ADE1006DB3BF /* JBBarChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68DA1829ADE1006DB3BF /* JBBarChartView.m */; };
 		9B6A68DE1829BE63006DB3BF /* JBBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68DD1829BE63006DB3BF /* JBBarChartViewController.m */; };
 		9B6A68E11829BED5006DB3BF /* JBLineChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6A68E01829BED5006DB3BF /* JBLineChartViewController.m */; };
+		9B7967EC198313E30003A2B0 /* JBAreaChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7967EB198313E30003A2B0 /* JBAreaChartViewController.m */; };
+		9B7967EF198317540003A2B0 /* icon-area-chart.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B7967ED198317540003A2B0 /* icon-area-chart.png */; };
+		9B7967F0198317540003A2B0 /* icon-area-chart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B7967EE198317540003A2B0 /* icon-area-chart@2x.png */; };
 		9BD57BBC18D13D1A00ACFA52 /* JBChartTooltipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD57BBB18D13D1A00ACFA52 /* JBChartTooltipView.m */; };
-		9BE0B0AD182AD26400232023 /* JBLineChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE0B0AC182AD26400232023 /* JBLineChartView.m */; };
 		9BE0B0C7182B161000232023 /* JBChartHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE0B0C6182B161000232023 /* JBChartHeaderView.m */; };
 		9BE0B0CE182B162E00232023 /* JBBarChartFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE0B0CD182B162E00232023 /* JBBarChartFooterView.m */; };
 		9BEBE9D2183167050046E4A8 /* JBChartInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BEBE9D1183167050046E4A8 /* JBChartInformationView.m */; };
@@ -42,8 +56,35 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		566C73A51C026858000EC785 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+		94BDFC3219F933B2007492F6 /* JBLineChartMissingPointsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartMissingPointsViewController.h; sourceTree = "<group>"; };
+		94BDFC3319F933B2007492F6 /* JBLineChartMissingPointsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartMissingPointsViewController.m; sourceTree = "<group>"; };
 		9B07251F1829822A0052109B /* JBChartListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartListViewController.h; sourceTree = "<group>"; };
 		9B0725201829822A0052109B /* JBChartListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartListViewController.m; sourceTree = "<group>"; };
+		9B1351701C31FAB3000D4C92 /* NSMutableArray+JBStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+JBStack.h"; sourceTree = "<group>"; };
+		9B1351711C31FAB3000D4C92 /* NSMutableArray+JBStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+JBStack.m"; sourceTree = "<group>"; };
+		9B1351731C31FAB3000D4C92 /* JBBarChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBBarChartView.h; sourceTree = "<group>"; };
+		9B1351741C31FAB3000D4C92 /* JBBarChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBBarChartView.m; sourceTree = "<group>"; };
+		9B1351761C31FAB3000D4C92 /* JBGradientBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBGradientBarView.h; sourceTree = "<group>"; };
+		9B1351771C31FAB3000D4C92 /* JBGradientBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBGradientBarView.m; sourceTree = "<group>"; };
+		9B1351791C31FAB3000D4C92 /* JBChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartView.h; sourceTree = "<group>"; };
+		9B13517A1C31FAB3000D4C92 /* JBChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartView.m; sourceTree = "<group>"; };
+		9B13517C1C31FAB3000D4C92 /* JBLineChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartView.h; sourceTree = "<group>"; };
+		9B13517D1C31FAB3000D4C92 /* JBLineChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartView.m; sourceTree = "<group>"; };
+		9B13517F1C31FAB3000D4C92 /* JBGradientLineLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBGradientLineLayer.h; sourceTree = "<group>"; };
+		9B1351801C31FAB3000D4C92 /* JBGradientLineLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBGradientLineLayer.m; sourceTree = "<group>"; };
+		9B1351811C31FAB3000D4C92 /* JBShapeLineLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBShapeLineLayer.h; sourceTree = "<group>"; };
+		9B1351821C31FAB3000D4C92 /* JBShapeLineLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBShapeLineLayer.m; sourceTree = "<group>"; };
+		9B1351841C31FAB3000D4C92 /* JBLineChartLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartLine.h; sourceTree = "<group>"; };
+		9B1351851C31FAB3000D4C92 /* JBLineChartLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartLine.m; sourceTree = "<group>"; };
+		9B1351861C31FAB3000D4C92 /* JBLineChartPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartPoint.h; sourceTree = "<group>"; };
+		9B1351871C31FAB3000D4C92 /* JBLineChartPoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartPoint.m; sourceTree = "<group>"; };
+		9B1351891C31FAB3000D4C92 /* JBLineChartDotsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartDotsView.h; sourceTree = "<group>"; };
+		9B13518A1C31FAB3000D4C92 /* JBLineChartDotsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartDotsView.m; sourceTree = "<group>"; };
+		9B13518B1C31FAB3000D4C92 /* JBLineChartDotView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartDotView.h; sourceTree = "<group>"; };
+		9B13518C1C31FAB3000D4C92 /* JBLineChartDotView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartDotView.m; sourceTree = "<group>"; };
+		9B13518D1C31FAB3000D4C92 /* JBLineChartLinesView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartLinesView.h; sourceTree = "<group>"; };
+		9B13518E1C31FAB3000D4C92 /* JBLineChartLinesView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartLinesView.m; sourceTree = "<group>"; };
 		9B2E530118218CF20079B9D2 /* JBChartViewDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JBChartViewDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9B2E530418218CF20079B9D2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9B2E530618218CF20079B9D2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -78,18 +119,16 @@
 		9B698F13182D7DAE003C135F /* icon-bar-chart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-bar-chart@2x.png"; sourceTree = "<group>"; };
 		9B698F14182D7DAE003C135F /* icon-line-chart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-line-chart.png"; sourceTree = "<group>"; };
 		9B698F15182D7DAE003C135F /* icon-line-chart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-line-chart@2x.png"; sourceTree = "<group>"; };
-		9B6A68D11829AB9F006DB3BF /* JBChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBChartView.h; path = ../../Classes/JBChartView.h; sourceTree = "<group>"; };
-		9B6A68D21829AB9F006DB3BF /* JBChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBChartView.m; path = ../../Classes/JBChartView.m; sourceTree = "<group>"; };
-		9B6A68D91829ADE1006DB3BF /* JBBarChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBBarChartView.h; path = ../../Classes/JBBarChartView.h; sourceTree = "<group>"; };
-		9B6A68DA1829ADE1006DB3BF /* JBBarChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBBarChartView.m; path = ../../Classes/JBBarChartView.m; sourceTree = "<group>"; };
 		9B6A68DC1829BE63006DB3BF /* JBBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBBarChartViewController.h; sourceTree = "<group>"; };
 		9B6A68DD1829BE63006DB3BF /* JBBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBBarChartViewController.m; sourceTree = "<group>"; };
 		9B6A68DF1829BED5006DB3BF /* JBLineChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBLineChartViewController.h; sourceTree = "<group>"; };
 		9B6A68E01829BED5006DB3BF /* JBLineChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBLineChartViewController.m; sourceTree = "<group>"; };
+		9B7967EA198313E30003A2B0 /* JBAreaChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBAreaChartViewController.h; sourceTree = "<group>"; };
+		9B7967EB198313E30003A2B0 /* JBAreaChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBAreaChartViewController.m; sourceTree = "<group>"; };
+		9B7967ED198317540003A2B0 /* icon-area-chart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-area-chart.png"; sourceTree = "<group>"; };
+		9B7967EE198317540003A2B0 /* icon-area-chart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-area-chart@2x.png"; sourceTree = "<group>"; };
 		9BD57BBA18D13D1A00ACFA52 /* JBChartTooltipView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartTooltipView.h; sourceTree = "<group>"; };
 		9BD57BBB18D13D1A00ACFA52 /* JBChartTooltipView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartTooltipView.m; sourceTree = "<group>"; };
-		9BE0B0AB182AD26400232023 /* JBLineChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JBLineChartView.h; path = ../../Classes/JBLineChartView.h; sourceTree = "<group>"; };
-		9BE0B0AC182AD26400232023 /* JBLineChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JBLineChartView.m; path = ../../Classes/JBLineChartView.m; sourceTree = "<group>"; };
 		9BE0B0C5182B161000232023 /* JBChartHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBChartHeaderView.h; sourceTree = "<group>"; };
 		9BE0B0C6182B161000232023 /* JBChartHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JBChartHeaderView.m; sourceTree = "<group>"; };
 		9BE0B0CC182B162E00232023 /* JBBarChartFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JBBarChartFooterView.h; sourceTree = "<group>"; };
@@ -117,6 +156,113 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		9B13516F1C31FAB3000D4C92 /* Additions */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351701C31FAB3000D4C92 /* NSMutableArray+JBStack.h */,
+				9B1351711C31FAB3000D4C92 /* NSMutableArray+JBStack.m */,
+			);
+			name = Additions;
+			path = ../../Classes/Additions;
+			sourceTree = "<group>";
+		};
+		9B1351721C31FAB3000D4C92 /* Bar */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351731C31FAB3000D4C92 /* JBBarChartView.h */,
+				9B1351741C31FAB3000D4C92 /* JBBarChartView.m */,
+				9B1351751C31FAB3000D4C92 /* Views */,
+			);
+			name = Bar;
+			path = ../../Classes/Bar;
+			sourceTree = "<group>";
+		};
+		9B1351751C31FAB3000D4C92 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351761C31FAB3000D4C92 /* JBGradientBarView.h */,
+				9B1351771C31FAB3000D4C92 /* JBGradientBarView.m */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		9B1351781C31FAB3000D4C92 /* Base */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351791C31FAB3000D4C92 /* JBChartView.h */,
+				9B13517A1C31FAB3000D4C92 /* JBChartView.m */,
+			);
+			name = Base;
+			path = ../../Classes/Base;
+			sourceTree = "<group>";
+		};
+		9B13517B1C31FAB3000D4C92 /* Line */ = {
+			isa = PBXGroup;
+			children = (
+				9B13517C1C31FAB3000D4C92 /* JBLineChartView.h */,
+				9B13517D1C31FAB3000D4C92 /* JBLineChartView.m */,
+				9B13517E1C31FAB3000D4C92 /* Layers */,
+				9B1351831C31FAB3000D4C92 /* Models */,
+				9B1351881C31FAB3000D4C92 /* Views */,
+			);
+			name = Line;
+			path = ../../Classes/Line;
+			sourceTree = "<group>";
+		};
+		9B13517E1C31FAB3000D4C92 /* Layers */ = {
+			isa = PBXGroup;
+			children = (
+				9B13517F1C31FAB3000D4C92 /* JBGradientLineLayer.h */,
+				9B1351801C31FAB3000D4C92 /* JBGradientLineLayer.m */,
+				9B1351811C31FAB3000D4C92 /* JBShapeLineLayer.h */,
+				9B1351821C31FAB3000D4C92 /* JBShapeLineLayer.m */,
+			);
+			path = Layers;
+			sourceTree = "<group>";
+		};
+		9B1351831C31FAB3000D4C92 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351841C31FAB3000D4C92 /* JBLineChartLine.h */,
+				9B1351851C31FAB3000D4C92 /* JBLineChartLine.m */,
+				9B1351861C31FAB3000D4C92 /* JBLineChartPoint.h */,
+				9B1351871C31FAB3000D4C92 /* JBLineChartPoint.m */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		9B1351881C31FAB3000D4C92 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				9B1351891C31FAB3000D4C92 /* JBLineChartDotsView.h */,
+				9B13518A1C31FAB3000D4C92 /* JBLineChartDotsView.m */,
+				9B13518B1C31FAB3000D4C92 /* JBLineChartDotView.h */,
+				9B13518C1C31FAB3000D4C92 /* JBLineChartDotView.m */,
+				9B13518D1C31FAB3000D4C92 /* JBLineChartLinesView.h */,
+				9B13518E1C31FAB3000D4C92 /* JBLineChartLinesView.m */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		9B13519B1C31FABE000D4C92 /* JBChartView */ = {
+			isa = PBXGroup;
+			children = (
+				9B13516F1C31FAB3000D4C92 /* Additions */,
+				9B1351721C31FAB3000D4C92 /* Bar */,
+				9B1351781C31FAB3000D4C92 /* Base */,
+				9B13517B1C31FAB3000D4C92 /* Line */,
+			);
+			name = JBChartView;
+			sourceTree = "<group>";
+		};
+		9B13519C1C31FAC3000D4C92 /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				9B13519B1C31FABE000D4C92 /* JBChartView */,
+			);
+			name = Libraries;
+			sourceTree = "<group>";
+		};
 		9B2E52F818218CF20079B9D2 = {
 			isa = PBXGroup;
 			children = (
@@ -151,6 +297,7 @@
 				9BE0B0D0182B16DD00232023 /* Constants */,
 				9B2E534018218D560079B9D2 /* Controllers */,
 				9B2E533C18218D310079B9D2 /* Delegate */,
+				9B13519C1C31FAC3000D4C92 /* Libraries */,
 				9B603D43182C7002000A76D0 /* Resources */,
 				9B2E530B18218CF20079B9D2 /* Supporting Files */,
 				9B6A68D01829AB85006DB3BF /* Views */,
@@ -183,10 +330,14 @@
 			isa = PBXGroup;
 			children = (
 				9B603D3B182C6E79000A76D0 /* Base */,
+				9B7967EA198313E30003A2B0 /* JBAreaChartViewController.h */,
+				9B7967EB198313E30003A2B0 /* JBAreaChartViewController.m */,
 				9B6A68DC1829BE63006DB3BF /* JBBarChartViewController.h */,
 				9B6A68DD1829BE63006DB3BF /* JBBarChartViewController.m */,
 				9B07251F1829822A0052109B /* JBChartListViewController.h */,
 				9B0725201829822A0052109B /* JBChartListViewController.m */,
+				94BDFC3219F933B2007492F6 /* JBLineChartMissingPointsViewController.h */,
+				94BDFC3319F933B2007492F6 /* JBLineChartMissingPointsViewController.m */,
 				9B6A68DF1829BED5006DB3BF /* JBLineChartViewController.h */,
 				9B6A68E01829BED5006DB3BF /* JBLineChartViewController.m */,
 			);
@@ -219,6 +370,9 @@
 		9B603D44182C7002000A76D0 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				566C73A51C026858000EC785 /* Default-568h@2x.png */,
+				9B7967ED198317540003A2B0 /* icon-area-chart.png */,
+				9B7967EE198317540003A2B0 /* icon-area-chart@2x.png */,
 				9B698F07182D720E003C135F /* icon-arrow.png */,
 				9B698F08182D720E003C135F /* icon-arrow@2x.png */,
 				9B698F12182D7DAE003C135F /* icon-bar-chart.png */,
@@ -244,7 +398,6 @@
 			isa = PBXGroup;
 			children = (
 				9B698F0E182D7BCF003C135F /* Cells */,
-				9BE0B0C0182B15DB00232023 /* Charts */,
 				9BE0B0CB182B162E00232023 /* Footers */,
 				9BE0B0C4182B161000232023 /* Headers */,
 				9BEBE9CF183167050046E4A8 /* Misc */,
@@ -252,19 +405,6 @@
 			name = Views;
 			sourceTree = "<group>";
 		};
-		9BE0B0C0182B15DB00232023 /* Charts */ = {
-			isa = PBXGroup;
-			children = (
-				9B6A68D91829ADE1006DB3BF /* JBBarChartView.h */,
-				9B6A68DA1829ADE1006DB3BF /* JBBarChartView.m */,
-				9B6A68D11829AB9F006DB3BF /* JBChartView.h */,
-				9B6A68D21829AB9F006DB3BF /* JBChartView.m */,
-				9BE0B0AB182AD26400232023 /* JBLineChartView.h */,
-				9BE0B0AC182AD26400232023 /* JBLineChartView.m */,
-			);
-			name = Charts;
-			sourceTree = "<group>";
-		};
 		9BE0B0C4182B161000232023 /* Headers */ = {
 			isa = PBXGroup;
 			children = (
@@ -336,7 +476,7 @@
 		9B2E52F918218CF20079B9D2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = Jawbone;
 			};
 			buildConfigurationList = 9B2E52FC18218CF20079B9D2 /* Build configuration list for PBXProject "JBChartViewDemo" */;
@@ -368,8 +508,11 @@
 				9B698F18182D7DAE003C135F /* icon-line-chart.png in Resources */,
 				9B2E530F18218CF20079B9D2 /* InfoPlist.strings in Resources */,
 				9B698F17182D7DAE003C135F /* icon-bar-chart@2x.png in Resources */,
+				9B7967EF198317540003A2B0 /* icon-area-chart.png in Resources */,
 				9B603D47182C7002000A76D0 /* icon-jawbone-logo.png in Resources */,
 				9B603D48182C7002000A76D0 /* icon-jawbone-logo@2x.png in Resources */,
+				566C73A61C026858000EC785 /* Default-568h@2x.png in Resources */,
+				9B7967F0198317540003A2B0 /* icon-area-chart@2x.png in Resources */,
 				9B698F19182D7DAE003C135F /* icon-line-chart@2x.png in Resources */,
 				9B698F0A182D720E003C135F /* icon-arrow@2x.png in Resources */,
 			);
@@ -383,22 +526,33 @@
 			buildActionMask = 2147483647;
 			files = (
 				9BE0B0CE182B162E00232023 /* JBBarChartFooterView.m in Sources */,
-				9B6A68D31829AB9F006DB3BF /* JBChartView.m in Sources */,
+				9B13519A1C31FAB3000D4C92 /* JBLineChartLinesView.m in Sources */,
+				9B1351901C31FAB3000D4C92 /* JBBarChartView.m in Sources */,
 				9BEBE9D2183167050046E4A8 /* JBChartInformationView.m in Sources */,
 				9B603D3E182C6E79000A76D0 /* JBBaseNavigationController.m in Sources */,
+				9B1351971C31FAB3000D4C92 /* JBLineChartPoint.m in Sources */,
 				9B698F11182D7BCF003C135F /* JBChartTableCell.m in Sources */,
-				9B6A68DB1829ADE1006DB3BF /* JBBarChartView.m in Sources */,
 				9B2E531118218CF20079B9D2 /* main.m in Sources */,
+				9B1351981C31FAB3000D4C92 /* JBLineChartDotsView.m in Sources */,
 				9B698F01182D5F44003C135F /* JBLineChartFooterView.m in Sources */,
 				9BE0B0C7182B161000232023 /* JBChartHeaderView.m in Sources */,
 				9B603D4E182C7163000A76D0 /* JBBaseTableViewController.m in Sources */,
 				9B6A68DE1829BE63006DB3BF /* JBBarChartViewController.m in Sources */,
 				9B4437AD18D7686800682EF0 /* JBChartTooltipTipView.m in Sources */,
-				9BE0B0AD182AD26400232023 /* JBLineChartView.m in Sources */,
+				94BDFC3419F933B2007492F6 /* JBLineChartMissingPointsViewController.m in Sources */,
 				9BEE694618D2789E005D9BA7 /* JBBaseChartViewController.m in Sources */,
 				9B6A68E11829BED5006DB3BF /* JBLineChartViewController.m in Sources */,
+				9B1351961C31FAB3000D4C92 /* JBLineChartLine.m in Sources */,
+				9B1351911C31FAB3000D4C92 /* JBGradientBarView.m in Sources */,
+				9B1351931C31FAB3000D4C92 /* JBLineChartView.m in Sources */,
+				9B1351991C31FAB3000D4C92 /* JBLineChartDotView.m in Sources */,
+				9B1351921C31FAB3000D4C92 /* JBChartView.m in Sources */,
 				9B2E533F18218D310079B9D2 /* AppDelegate.m in Sources */,
+				9B13518F1C31FAB3000D4C92 /* NSMutableArray+JBStack.m in Sources */,
+				9B1351941C31FAB3000D4C92 /* JBGradientLineLayer.m in Sources */,
+				9B7967EC198313E30003A2B0 /* JBAreaChartViewController.m in Sources */,
 				9BD57BBC18D13D1A00ACFA52 /* JBChartTooltipView.m in Sources */,
+				9B1351951C31FAB3000D4C92 /* JBShapeLineLayer.m in Sources */,
 				9B603D4B182C7117000A76D0 /* JBBaseViewController.m in Sources */,
 				9B0725211829822A0052109B /* JBChartListViewController.m in Sources */,
 			);
@@ -436,6 +590,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -498,7 +653,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JBChartViewDemo/JBChartViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "JBChartViewDemo/JBChartViewDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.jawbone.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -512,7 +668,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JBChartViewDemo/JBChartViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "JBChartViewDemo/JBChartViewDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.jawbone.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

JBChartViewDemo/JBChartViewDemo/Cells/JBChartTableCell.h

@@ -10,7 +10,8 @@
 
 typedef NS_ENUM(NSInteger, JBChartTableCellType){
 	JBChartTableCellTypeLineChart,
-    JBChartTableCellTypeBarChart
+    JBChartTableCellTypeBarChart,
+    JBChartTableCellTypeAreaChart
 };
 
 @interface JBChartTableCell : UITableViewCell

JBChartViewDemo/JBChartViewDemo/Cells/JBChartTableCell.m

@@ -22,7 +22,21 @@
 - (void)setType:(JBChartTableCellType)type
 {
     _type = type;
-    self.accessoryView = [[UIImageView alloc] initWithImage:_type == JBChartTableCellTypeBarChart ? [UIImage imageNamed:kJBImageIconBarChart] : [UIImage imageNamed:kJBImageIconLineChart]];
+    UIImage *image = nil;
+    switch (type) {
+        case JBChartTableCellTypeBarChart:
+            image = [UIImage imageNamed:kJBImageIconBarChart];
+            break;
+        case JBChartTableCellTypeLineChart:
+            image = [UIImage imageNamed:kJBImageIconLineChart];
+            break;
+        case JBChartTableCellTypeAreaChart:
+            image = [UIImage imageNamed:kJBImageIconAreaChart];
+            break;
+        default:
+            break;
+    }
+    self.accessoryView = [[UIImageView alloc] initWithImage:image];
 }
 
 @end

JBChartViewDemo/JBChartViewDemo/Constants/JBColorConstants.h

@@ -29,8 +29,27 @@
 #define kJBColorLineChartHeaderSeparatorColor UIColorFromHex(0x8eb6b7)
 #define kJBColorLineChartDefaultSolidLineColor [UIColor colorWithWhite:1.0 alpha:0.5]
 #define kJBColorLineChartDefaultSolidSelectedLineColor [UIColor colorWithWhite:1.0 alpha:1.0]
-#define kJBColorLineChartDefaultDashedLineColor [UIColor colorWithRed:1.0 green:0.0 blue:0.0 alpha:1.0]
+#define kJBColorLineChartDefaultDashedLineColor [UIColor colorWithRed:0.0 green:0.0 blue:1.0 alpha:1.0]
 #define kJBColorLineChartDefaultDashedSelectedLineColor [UIColor colorWithWhite:1.0 alpha:1.0]
+#define kJBColorLineChartDefaultSolidFillColor [UIColor clearColor]
+#define kJBColorLineChartDefaultDashedFillColor [UIColor colorWithWhite:1.0 alpha:0.3]
+#define kJBColorLineChartDefaultGradientStartColor UIColorFromHex(0x0000FF)
+#define kJBColorLineChartDefaultGradientEndColor UIColorFromHex(0x00FF00)
+
+#define mark - Area Chart
+
+#define kJBColorAreaChartControllerBackground UIColorFromHex(0xb7e3e4)
+#define kJBColorAreaChartBackground UIColorFromHex(0xb7e3e4)
+#define kJBColorAreaChartHeader UIColorFromHex(0x1c474e)
+#define kJBColorAreaChartHeaderSeparatorColor UIColorFromHex(0x8eb6b7)
+#define kJBColorAreaChartDefaultSunLineColor [UIColor clearColor]
+#define kJBColorAreaChartDefaultSunAreaColor [UIColorFromHex(0xfcfb3a) colorWithAlphaComponent:0.5]
+#define kJBColorAreaChartDefaultSunSelectedLineColor [UIColor clearColor]
+#define kJBColorAreaChartDefaultSunSelectedAreaColor UIColorFromHex(0xfcfb3a)
+#define kJBColorAreaChartDefaultMoonLineColor [UIColor clearColor]
+#define kJBColorAreaChartDefaultMoonAreaColor [[UIColor blackColor] colorWithAlphaComponent:0.5]
+#define kJBColorAreaChartDefaultMoonSelectedLineColor [UIColor clearColor]
+#define kJBColorAreaChartDefaultMoonSelectedAreaColor [UIColor blackColor]
 
 #pragma mark - Tooltips
 

JBChartViewDemo/JBChartViewDemo/Constants/JBStringConstants.h

@@ -15,6 +15,7 @@
 #define kJBStringLabel2012 localize(@"label.2012", @"2012")
 #define kJBStringLabelAverageMonthlyTemperature localize(@"label.average.monthly.temperature", @"Average Monthly Temperature")
 #define kJBStringLabelWorldwide2012 localize(@"label.worldwide.2013", @"Worldwide - 2012")
+#define kJBStringLabelWorldwide2011 localize(@"label.worldwide.2013", @"Worldwide - 2011")
 #define kJBStringLabelWorldwideAverage localize(@"label.worldwide.average", @"Worldwide Average")
 #define kJBStringLabelDegreesFahrenheit localize(@"label.degrees.fahrenheit", @"%d%@F")
 #define kJBStringLabelDegreeSymbol localize(@"label.degree.symbol", @"\u00B0")
@@ -27,3 +28,22 @@
 #define kJBStringLabelMm localize(@"label.mm", @"mm")
 #define kJBStringLabelMetropolitanAverage localize(@"label.metropolitan.average", @"Metropolitan Average")
 #define kJBStringLabelNationalAverage localize(@"label.national.average", @"National Average")
+
+#pragma mark - Labels (Area Chart)
+
+#define kJBStringLabel2011 localize(@"label.2011", @"2011")
+#define kJBStringLabelSeattle2014 localize(@"label.seattle.2014", @"Seattle - 2014")
+#define kJBStringLabelAverageShineHoursOfSunMoon localize(@"label.average.shine.hours.of.sun.moon", @"Average Shine Hours of Sun/Moon")
+#define kJBStringLabelAverageShineHours localize(@"label.average.shine.hours", @"Average Shine Hours")
+#define kJBStringLabelHours localize(@"label.hours", @"h")
+#define kJBStringLabelMoon localize(@"label.moon", @"Moon")
+#define kJBStringLabelSun localize(@"label.sun", @"Sun")
+
+#pragma mark - Labels (Missing Points Line Chart)
+
+#define kJBStringLabel2014 localize(@"label.2014", @"2014")
+#define kJBStringLabelCyclingDistances localize(@"label.cycling.distances", @"Cycling Distances")
+#define kJBStringLabelCyclingCurrentLastWeek2014 localize(@"label.cycling.current.last.week.2014", @"Current/Last Week - 2014")
+#define kJBStringLabelKm2014 localize(@"label.km", @"Km")
+#define kJBStringLabelLastWeek localize(@"label.last.week", @"Last Week")
+#define kJBStringLabelCurrentWeek localize(@"label.current.week", @"Current Week")

JBChartViewDemo/JBChartViewDemo/Constants/JBUIConstants.h

@@ -12,3 +12,4 @@
 #define kJBImageIconArrow @"icon-arrow.png"
 #define kJBImageIconLineChart @"icon-line-chart.png"
 #define kJBImageIconBarChart @"icon-bar-chart.png"
+#define kJBImageIconAreaChart @"icon-area-chart.png"

JBChartViewDemo/JBChartViewDemo/Controllers/Base/JBBaseChartViewController.m

@@ -12,7 +12,7 @@
 #import "JBChartTooltipTipView.h"
 
 // Numerics
-CGFloat const kJBBaseChartViewControllerAnimationDuration = 0.25f;
+CGFloat const kJBBaseChartViewControllerAnimationDuration = 0.1f;
 
 @interface JBBaseChartViewController ()
 
@@ -43,6 +43,8 @@ CGFloat const kJBBaseChartViewControllerAnimationDuration = 0.25f;
         [self.view addSubview:self.tooltipView];
     }
     
+    [self.view bringSubviewToFront:self.tooltipView];
+    
     if (!self.tooltipTipView)
     {
         self.tooltipTipView = [[JBChartTooltipTipView alloc] init];
@@ -50,11 +52,14 @@ CGFloat const kJBBaseChartViewControllerAnimationDuration = 0.25f;
         [self.view addSubview:self.tooltipTipView];
     }
     
+    [self.view bringSubviewToFront:self.tooltipTipView];
+    
     dispatch_block_t adjustTooltipPosition = ^{
+		
         CGPoint originalTouchPoint = [self.view convertPoint:touchPoint fromView:chartView];
         CGPoint convertedTouchPoint = originalTouchPoint; // modified
         JBChartView *chartView = [self chartView];
-        if (chartView)
+		if (chartView && !CGPointEqualToPoint(touchPoint, CGPointZero))
         {
             CGFloat minChartX = (chartView.frame.origin.x + ceil(self.tooltipView.frame.size.width * 0.5));
             if (convertedTouchPoint.x < minChartX)
@@ -66,6 +71,7 @@ CGFloat const kJBBaseChartViewControllerAnimationDuration = 0.25f;
             {
                 convertedTouchPoint.x = maxChartX;
             }
+			
             self.tooltipView.frame = CGRectMake(convertedTouchPoint.x - ceil(self.tooltipView.frame.size.width * 0.5), CGRectGetMaxY(chartView.headerView.frame), self.tooltipView.frame.size.width, self.tooltipView.frame.size.height);
             
             CGFloat minTipX = (chartView.frame.origin.x + self.tooltipTipView.frame.size.width);
@@ -79,33 +85,34 @@ CGFloat const kJBBaseChartViewControllerAnimationDuration = 0.25f;
                 originalTouchPoint.x = maxTipX;
             }
             self.tooltipTipView.frame = CGRectMake(originalTouchPoint.x - ceil(self.tooltipTipView.frame.size.width * 0.5), CGRectGetMaxY(self.tooltipView.frame), self.tooltipTipView.frame.size.width, self.tooltipTipView.frame.size.height);
-        }
+		}
     };
     
     dispatch_block_t adjustTooltipVisibility = ^{
         self.tooltipView.alpha = _tooltipVisible ? 1.0 : 0.0;
         self.tooltipTipView.alpha = _tooltipVisible ? 1.0 : 0.0;
 	};
-    
-    if (tooltipVisible)
-    {
-        adjustTooltipPosition();
-    }
-    
+	
     if (animated)
     {
-        [UIView animateWithDuration:kJBBaseChartViewControllerAnimationDuration animations:^{
-            adjustTooltipVisibility();
-        } completion:^(BOOL finished) {
-            if (!tooltipVisible)
-            {
-                adjustTooltipPosition();
-            }
-        }];
+		if (tooltipVisible)
+		{
+			adjustTooltipPosition();
+		}
+		
+		[UIView animateWithDuration:kJBBaseChartViewControllerAnimationDuration delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
+			adjustTooltipVisibility();
+		} completion:^(BOOL finished) {
+			if (!tooltipVisible)
+			{
+				adjustTooltipPosition();
+			}
+		}];
     }
     else
     {
-        adjustTooltipVisibility();
+		adjustTooltipPosition();
+		adjustTooltipVisibility();
     }
 }
 

JBChartViewDemo/JBChartViewDemo/Controllers/Base/JBBaseNavigationController.m

@@ -8,6 +8,10 @@
 
 #import "JBBaseNavigationController.h"
 
+// Numerics
+NSInteger const kJBBaseNavigationControllerBarTintColorMinSystemVersion = 7;
+NSInteger const kJBBaseNavigationControllerTintColorMinSystemVersion = 7;
+
 @implementation JBBaseNavigationController
 
 #pragma mark - Alloc/Init
@@ -18,9 +22,23 @@
     if (self)
     {
         self.navigationBar.translucent = NO;
-        [[UINavigationBar appearance] setBarTintColor:kJBColorNavigationTint];
-        [[UINavigationBar appearance] setTintColor:kJBColorNavigationBarTint];
-        self.interactivePopGestureRecognizer.enabled = NO;
+        
+        // Bar tint (iOS 7)
+        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= kJBBaseNavigationControllerBarTintColorMinSystemVersion)
+        {
+            [[UINavigationBar appearance] setBarTintColor:kJBColorNavigationTint];
+        }
+
+        // Tint (iOS 7)
+        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= kJBBaseNavigationControllerTintColorMinSystemVersion)
+        {
+            [[UINavigationBar appearance] setTintColor:kJBColorNavigationBarTint];
+        }
+        
+        if ([self respondsToSelector:@selector(interactivePopGestureRecognizer)])
+        {
+            self.interactivePopGestureRecognizer.enabled = NO;
+        }
     }
     return self;
 }

JBChartViewDemo/JBChartViewDemo/Controllers/Base/JBBaseTableViewController.m

@@ -28,6 +28,12 @@
     [self.view addSubview:self.tableView];
 }
 
+- (void)dealloc
+{
+    self.tableView.delegate = nil;
+    self.tableView.dataSource = nil;
+}
+
 #pragma mark - UITableViewDataSource
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section

JBChartViewDemo/JBChartViewDemo/Controllers/Base/JBBaseViewController.m

@@ -19,7 +19,9 @@
 - (void)loadView
 {
     [super loadView];
-    self.edgesForExtendedLayout = UIRectEdgeTop;
+    if ([self respondsToSelector:@selector(setEdgesForExtendedLayout:)]) {
+        self.edgesForExtendedLayout = UIRectEdgeTop;
+    }
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:kJBImageIconJawboneLogo]];
 }
@@ -31,7 +33,7 @@
     return YES;
 }
 
-- (NSUInteger)supportedInterfaceOrientations
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
     return UIInterfaceOrientationMaskPortrait;
 }

JBChartViewDemo/JBChartViewDemo/Controllers/JBAreaChartViewController.h

@@ -0,0 +1,13 @@
+//
+//  JBAreaChartViewController.h
+//  JBChartViewDemo
+//
+//  Created by Lars Ott on 21.04.14.
+//  Copyright (c) 2014 Jawbone. All rights reserved.
+//
+
+#import "JBBaseChartViewController.h"
+
+@interface JBAreaChartViewController : JBBaseChartViewController
+
+@end

JBChartViewDemo/JBChartViewDemo/Controllers/JBAreaChartViewController.m

@@ -0,0 +1,305 @@
+//
+//  JBAreaChartViewController.m
+//  JBChartViewDemo
+//
+//  Created by Lars Ott on 21.04.14.
+//  Copyright (c) 2014 Jawbone. All rights reserved.
+//
+
+#import "JBAreaChartViewController.h"
+
+// Views
+#import "JBLineChartView.h"
+#import "JBChartHeaderView.h"
+#import "JBLineChartFooterView.h"
+#import "JBChartInformationView.h"
+
+#define ARC4RANDOM_MAX 0x100000000
+
+typedef NS_ENUM(NSInteger, JBLineChartLine){
+	JBLineChartLineSun,
+    JBLineChartLineMoon,
+    JBLineChartLineCount
+};
+
+// Numerics
+CGFloat const kJBAreaChartViewControllerChartHeight = 250.0f;
+CGFloat const kJBAreaChartViewControllerChartPadding = 10.0f;
+CGFloat const kJBAreaChartViewControllerChartHeaderHeight = 75.0f;
+CGFloat const kJBAreaChartViewControllerChartHeaderPadding = 20.0f;
+CGFloat const kJBAreaChartViewControllerChartFooterHeight = 20.0f;
+CGFloat const kJBAreaChartViewControllerChartLineWidth = 2.0f;
+CGFloat const kJBAreaChartViewControllerChartSunLineDimmedOpacity = 1.0f;
+CGFloat const kJBAreaChartViewControllerChartMoonLineDimmedOpacity = 0.0f;
+NSInteger const kJBAreaChartViewControllerMaxNumChartPoints = 12;
+
+// Strings
+NSString * const kJBAreaChartViewControllerNavButtonViewKey = @"view";
+
+@interface JBAreaChartViewController () <JBLineChartViewDelegate, JBLineChartViewDataSource>
+
+@property (nonatomic, strong) JBLineChartView *lineChartView;
+@property (nonatomic, strong) JBChartInformationView *informationView;
+@property (nonatomic, strong) NSArray *chartData;
+@property (nonatomic, strong) NSArray *monthlySymbols;
+
+// Buttons
+- (void)chartToggleButtonPressed:(id)sender;
+
+// Helpers
+- (void)initFakeData;
+- (NSArray *)largestLineData; // largest collection of fake line data
+
+@end
+
+@implementation JBAreaChartViewController
+
+#pragma mark - Alloc/Init
+
+- (id)init
+{
+    self = [super init];
+    if (self)
+    {
+        [self initFakeData];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self initFakeData];
+    }
+    return self;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self)
+    {
+        [self initFakeData];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    _lineChartView.delegate = nil;
+    _lineChartView.dataSource = nil;
+}
+
+#pragma mark - Data
+
+- (void)initFakeData
+{
+    NSMutableArray *mutableLineCharts = [NSMutableArray array];
+    for (int lineIndex=0; lineIndex<JBLineChartLineCount; lineIndex++)
+    {
+        NSMutableArray *mutableChartData = [NSMutableArray array];
+        for (int i=0; i<kJBAreaChartViewControllerMaxNumChartPoints; i++)
+        {
+            [mutableChartData addObject:[NSNumber numberWithFloat:((double)arc4random() / ARC4RANDOM_MAX) * 12]]; // random number between 0 and 12
+        }
+        [mutableLineCharts addObject:mutableChartData];
+    }
+    _chartData = [NSArray arrayWithArray:mutableLineCharts];
+    _monthlySymbols = [[[NSDateFormatter alloc] init] shortMonthSymbols];
+}
+
+- (NSArray *)largestLineData
+{
+    NSArray *largestLineData = nil;
+    for (NSArray *lineData in self.chartData)
+    {
+        if ([lineData count] > [largestLineData count])
+        {
+            largestLineData = lineData;
+        }
+    }
+    return largestLineData;
+}
+
+#pragma mark - View Lifecycle
+
+- (void)loadView
+{
+    [super loadView];
+    
+    self.view.backgroundColor = kJBColorLineChartControllerBackground;
+    self.navigationItem.rightBarButtonItem = [self chartToggleButtonWithTarget:self action:@selector(chartToggleButtonPressed:)];
+    
+    self.lineChartView = [[JBLineChartView alloc] init];
+    self.lineChartView.frame = CGRectMake(kJBAreaChartViewControllerChartPadding, kJBAreaChartViewControllerChartPadding, self.view.bounds.size.width - (kJBAreaChartViewControllerChartPadding * 2), kJBAreaChartViewControllerChartHeight);
+    self.lineChartView.delegate = self;
+    self.lineChartView.dataSource = self;
+    self.lineChartView.headerPadding =kJBAreaChartViewControllerChartHeaderPadding;
+    self.lineChartView.backgroundColor = kJBColorLineChartBackground;
+    
+    JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBAreaChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBAreaChartViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBAreaChartViewControllerChartPadding * 2), kJBAreaChartViewControllerChartHeaderHeight)];
+    headerView.titleLabel.text = [kJBStringLabelAverageShineHoursOfSunMoon uppercaseString];
+    headerView.titleLabel.textColor = kJBColorLineChartHeader;
+    headerView.titleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+    headerView.titleLabel.shadowOffset = CGSizeMake(0, 1);
+    headerView.subtitleLabel.text = kJBStringLabel2011;
+    headerView.subtitleLabel.textColor = kJBColorLineChartHeader;
+    headerView.subtitleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+    headerView.subtitleLabel.shadowOffset = CGSizeMake(0, 1);
+    headerView.separatorColor = kJBColorLineChartHeaderSeparatorColor;
+    self.lineChartView.headerView = headerView;
+    
+    JBLineChartFooterView *footerView = [[JBLineChartFooterView alloc] initWithFrame:CGRectMake(kJBAreaChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBAreaChartViewControllerChartFooterHeight * 0.5), self.view.bounds.size.width - (kJBAreaChartViewControllerChartPadding * 2), kJBAreaChartViewControllerChartFooterHeight)];
+    footerView.backgroundColor = [UIColor clearColor];
+    footerView.leftLabel.text = [[self.monthlySymbols firstObject] uppercaseString];
+    footerView.leftLabel.textColor = [UIColor whiteColor];
+    footerView.rightLabel.text = [[self.monthlySymbols lastObject] uppercaseString];;
+    footerView.rightLabel.textColor = [UIColor whiteColor];
+    footerView.sectionCount = [[self chartData] count];
+    self.lineChartView.footerView = footerView;
+    
+    [self.view addSubview:self.lineChartView];
+    
+    self.informationView = [[JBChartInformationView alloc] initWithFrame:CGRectMake(self.view.bounds.origin.x, CGRectGetMaxY(self.lineChartView.frame), self.view.bounds.size.width, self.view.bounds.size.height - CGRectGetMaxY(self.lineChartView.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
+    [self.informationView setValueAndUnitTextColor:[UIColor colorWithWhite:1.0 alpha:0.75]];
+    [self.informationView setTitleTextColor:kJBColorLineChartHeader];
+    [self.informationView setTextShadowColor:nil];
+    [self.informationView setSeparatorColor:kJBColorLineChartHeaderSeparatorColor];
+    [self.view addSubview:self.informationView];
+    
+    [self.lineChartView reloadData];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self.lineChartView setState:JBChartViewStateExpanded];
+}
+
+#pragma mark - JBLineChartViewDataSource
+
+- (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView
+{
+    return [self.chartData count];
+}
+
+- (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex
+{
+    return [[self.chartData objectAtIndex:lineIndex] count];
+}
+
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return NO;
+}
+
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView smoothLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return YES;
+}
+
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dimmedSelectionOpacityAtLineIndex:(NSUInteger)lineIndex
+{
+	if (lineIndex == JBLineChartLineMoon)
+	{
+		return kJBAreaChartViewControllerChartMoonLineDimmedOpacity;
+	}
+	else
+	{
+		return kJBAreaChartViewControllerChartSunLineDimmedOpacity;
+	}
+}
+
+#pragma mark - JBLineChartViewDelegate
+
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+    return [[[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex] floatValue];
+}
+
+- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint
+{
+    NSNumber *valueNumber = [[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex];
+    [self.informationView setValueText:[NSString stringWithFormat:@"%.1f", [valueNumber floatValue]] unitText:kJBStringLabelHours];
+    [self.informationView setTitleText:lineIndex == JBLineChartLineSun ? kJBStringLabelSun : kJBStringLabelMoon];
+    [self.informationView setHidden:NO animated:YES];
+    [self setTooltipVisible:YES animated:YES atTouchPoint:touchPoint];
+    [self.tooltipView setText:[[self.monthlySymbols objectAtIndex:horizontalIndex] uppercaseString]];
+}
+
+- (void)didDeselectLineInLineChartView:(JBLineChartView *)lineChartView
+{
+    [self.informationView setHidden:YES animated:YES];
+    [self setTooltipVisible:NO animated:YES];
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSun) ? kJBColorAreaChartDefaultSunLineColor: kJBColorAreaChartDefaultMoonLineColor;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView fillColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSun) ? kJBColorAreaChartDefaultSunAreaColor : kJBColorAreaChartDefaultMoonAreaColor;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSun) ? kJBColorAreaChartDefaultSunLineColor: kJBColorAreaChartDefaultMoonLineColor;
+}
+
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return kJBAreaChartViewControllerChartLineWidth;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return [UIColor whiteColor];
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSun) ? kJBColorAreaChartDefaultSunSelectedLineColor: kJBColorAreaChartDefaultMoonSelectedLineColor;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionFillColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSun) ? kJBColorAreaChartDefaultSunSelectedAreaColor : kJBColorAreaChartDefaultMoonSelectedAreaColor;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSun) ? kJBColorAreaChartDefaultSunSelectedLineColor: kJBColorAreaChartDefaultMoonSelectedLineColor;
+}
+
+- (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return JBLineChartViewLineStyleSolid;
+}
+
+#pragma mark - Buttons
+
+- (void)chartToggleButtonPressed:(id)sender
+{
+	UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBAreaChartViewControllerNavButtonViewKey];
+    buttonImageView.userInteractionEnabled = NO;
+    
+    CGAffineTransform transform = self.lineChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
+    buttonImageView.transform = transform;
+    
+    [self.lineChartView setState:self.lineChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
+        buttonImageView.userInteractionEnabled = YES;
+    }];
+}
+
+#pragma mark - Overrides
+
+- (JBChartView *)chartView
+{
+    return self.lineChartView;
+}
+
+@end

JBChartViewDemo/JBChartViewDemo/Controllers/JBBarChartViewController.m

@@ -18,10 +18,10 @@
 CGFloat const kJBBarChartViewControllerChartHeight = 250.0f;
 CGFloat const kJBBarChartViewControllerChartPadding = 10.0f;
 CGFloat const kJBBarChartViewControllerChartHeaderHeight = 80.0f;
-CGFloat const kJBBarChartViewControllerChartHeaderPadding = 10.0f;
+CGFloat const kJBBarChartViewControllerChartHeaderPadding = 20.0f;
 CGFloat const kJBBarChartViewControllerChartFooterHeight = 25.0f;
 CGFloat const kJBBarChartViewControllerChartFooterPadding = 5.0f;
-CGFloat const kJBBarChartViewControllerBarPadding = 1;
+CGFloat const kJBBarChartViewControllerBarPadding = 1.0f;
 NSInteger const kJBBarChartViewControllerNumBars = 12;
 NSInteger const kJBBarChartViewControllerMaxBarHeight = 10;
 NSInteger const kJBBarChartViewControllerMinBarHeight = 5;
@@ -78,6 +78,12 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
     return self;
 }
 
+- (void)dealloc
+{
+    _barChartView.delegate = nil;
+    _barChartView.dataSource = nil;
+}
+
 #pragma mark - Date
 
 - (void)initFakeData
@@ -85,7 +91,7 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
     NSMutableArray *mutableChartData = [NSMutableArray array];
     for (int i=0; i<kJBBarChartViewControllerNumBars; i++)
     {
-        NSInteger delta = (kJBBarChartViewControllerNumBars - abs((kJBBarChartViewControllerNumBars - i) - i)) + 2;
+        NSInteger delta = (kJBBarChartViewControllerNumBars - labs((kJBBarChartViewControllerNumBars - i) - i)) + 2;
         [mutableChartData addObject:[NSNumber numberWithFloat:MAX((delta * kJBBarChartViewControllerMinBarHeight), arc4random() % (delta * kJBBarChartViewControllerMaxBarHeight))]];
 
     }
@@ -107,6 +113,8 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
     self.barChartView.delegate = self;
     self.barChartView.dataSource = self;
     self.barChartView.headerPadding = kJBBarChartViewControllerChartHeaderPadding;
+    self.barChartView.minimumValue = 0.0f;
+    self.barChartView.inverted = NO;
     self.barChartView.backgroundColor = kJBColorBarChartBackground;
     
     JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBBarChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBBarChartViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBBarChartViewControllerChartPadding * 2), kJBBarChartViewControllerChartHeaderHeight)];
@@ -130,47 +138,29 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
     [self.barChartView reloadData];
 }
 
-- (void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
-    [self.barChartView setState:JBChartViewStateExpanded animated:YES callback:nil];
-}
-
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    [self.barChartView setState:JBChartViewStateCollapsed];
+    [self.barChartView setState:JBChartViewStateExpanded];
 }
 
-#pragma mark - JBBarChartViewDelegate
+#pragma mark - JBChartViewDataSource
 
-- (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtAtIndex:(NSUInteger)index
+- (BOOL)shouldExtendSelectionViewIntoHeaderPaddingForChartView:(JBChartView *)chartView
 {
-    return [[self.chartData objectAtIndex:index] floatValue];
+    return YES;
+}
+
+- (BOOL)shouldExtendSelectionViewIntoFooterPaddingForChartView:(JBChartView *)chartView
+{
+    return NO;
 }
 
 #pragma mark - JBBarChartViewDataSource
 
 - (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView
 {
-    return kJBBarChartViewControllerNumBars;
-}
-
-- (NSUInteger)barPaddingForBarChartView:(JBBarChartView *)barChartView
-{
-    return kJBBarChartViewControllerBarPadding;
-}
-
-- (UIView *)barChartView:(JBBarChartView *)barChartView barViewAtIndex:(NSUInteger)index
-{
-    UIView *barView = [[UIView alloc] init];
-    barView.backgroundColor = (index % 2 == 0) ? kJBColorBarChartBarBlue : kJBColorBarChartBarGreen;
-    return barView;
-}
-
-- (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView
-{
-    return [UIColor whiteColor];
+	return [self.chartData count];
 }
 
 - (void)barChartView:(JBBarChartView *)barChartView didSelectBarAtIndex:(NSUInteger)index touchPoint:(CGPoint)touchPoint
@@ -183,25 +173,50 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
     [self.tooltipView setText:[[self.monthlySymbols objectAtIndex:index] uppercaseString]];
 }
 
-- (void)didUnselectBarChartView:(JBBarChartView *)barChartView
+- (void)didDeselectBarChartView:(JBBarChartView *)barChartView
 {
     [self.informationView setHidden:YES animated:YES];
     [self setTooltipVisible:NO animated:YES];
 }
 
+#pragma mark - JBBarChartViewDelegate
+
+- (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index
+{
+    return [[self.chartData objectAtIndex:index] floatValue];
+}
+
+- (UIColor *)barChartView:(JBBarChartView *)barChartView colorForBarViewAtIndex:(NSUInteger)index
+{
+    return (index % 2 == 0) ? kJBColorBarChartBarBlue : kJBColorBarChartBarGreen;
+}
+
+- (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView
+{
+    return [UIColor whiteColor];
+}
+
+- (CGFloat)barPaddingForBarChartView:(JBBarChartView *)barChartView
+{
+    return kJBBarChartViewControllerBarPadding;
+}
+
 #pragma mark - Buttons
 
 - (void)chartToggleButtonPressed:(id)sender
 {
-    UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBBarChartViewControllerNavButtonViewKey];
-    buttonImageView.userInteractionEnabled = NO;
-    
-    CGAffineTransform transform = self.barChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
-    buttonImageView.transform = transform;
-    
-    [self.barChartView setState:self.barChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
-        buttonImageView.userInteractionEnabled = YES;
-    }];
+	int randomNumber = (-3) + rand() % (3-(-3));
+	
+	NSMutableArray *mutableChartData = [NSMutableArray array];
+	for (int i=0; i<(kJBBarChartViewControllerNumBars + randomNumber ); i++)
+	{
+		NSInteger delta = ((kJBBarChartViewControllerNumBars + randomNumber) - labs(((kJBBarChartViewControllerNumBars + randomNumber) - i) - i)) + 2;
+		[mutableChartData addObject:[NSNumber numberWithFloat:MAX((delta * kJBBarChartViewControllerMinBarHeight), arc4random() % (delta * kJBBarChartViewControllerMaxBarHeight))]];
+		
+	}
+	self.chartData = [NSArray arrayWithArray:mutableChartData];
+	
+	[self.barChartView reloadDataAnimated:YES];
 }
 
 #pragma mark - Overrides

JBChartViewDemo/JBChartViewDemo/Controllers/JBChartListViewController.m

@@ -11,13 +11,17 @@
 // Controllers
 #import "JBBarChartViewController.h"
 #import "JBLineChartViewController.h"
+#import "JBAreaChartViewController.h"
+#import "JBLineChartMissingPointsViewController.h"
 
 // Views
 #import "JBChartTableCell.h"
 
 typedef NS_ENUM(NSInteger, JBChartListViewControllerRow){
 	JBChartListViewControllerRowLineChart,
-    JBChartListViewControllerRowBarChart,
+	JBChartListViewControllerRowLineChartMissingPoints,
+	JBChartListViewControllerRowBarChart,
+    JBChartListViewControllerRowAreaChart,
     JBChartListViewControllerRowCount
 };
 
@@ -50,10 +54,39 @@ NSInteger const kJBChartListViewControllerCellHeight = 100;
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    JBChartTableCell *cell = [tableView dequeueReusableCellWithIdentifier:kJBChartListViewControllerCellIdentifier forIndexPath:indexPath];    
-    cell.textLabel.text = indexPath.row == JBChartListViewControllerRowLineChart ? kJBStringLabelAverageDailyRainfall : kJBStringLabelAverageMonthlyTemperature;
-    cell.detailTextLabel.text = indexPath.row == JBChartListViewControllerRowLineChart ? kJBStringLabelSanFrancisco2013 : kJBStringLabelWorldwide2012;
-    cell.type = indexPath.row == JBChartListViewControllerRowLineChart ? JBChartTableCellTypeLineChart : JBChartTableCellTypeBarChart;
+    JBChartTableCell *cell = [tableView dequeueReusableCellWithIdentifier:kJBChartListViewControllerCellIdentifier forIndexPath:indexPath];
+    
+    NSString *text = nil;
+    NSString *detailText = nil;
+    JBChartTableCellType type = -1;
+    switch (indexPath.row) {
+        case JBChartListViewControllerRowLineChart:
+            text = kJBStringLabelAverageDailyRainfall;
+            detailText = kJBStringLabelSanFrancisco2013;
+            type = JBChartTableCellTypeLineChart;
+            break;
+		case JBChartListViewControllerRowLineChartMissingPoints:
+			text = kJBStringLabelCyclingDistances;
+			detailText = kJBStringLabelCyclingCurrentLastWeek2014;
+			type = JBChartTableCellTypeLineChart;
+			break;
+        case JBChartListViewControllerRowBarChart:
+            text = kJBStringLabelAverageMonthlyTemperature;
+            detailText = kJBStringLabelWorldwide2012;
+            type = JBChartTableCellTypeBarChart;
+            break;
+        case JBChartListViewControllerRowAreaChart:
+            text = kJBStringLabelAverageShineHours;
+            detailText = kJBStringLabelWorldwide2011;
+            type = JBChartTableCellTypeAreaChart;
+            break;
+        default:
+            break;
+    }
+    cell.textLabel.text = text;
+    cell.detailTextLabel.text = detailText;
+    cell.type = type;
+    
     return cell;
 }
 
@@ -73,11 +106,21 @@ NSInteger const kJBChartListViewControllerCellHeight = 100;
         JBLineChartViewController *lineChartController = [[JBLineChartViewController alloc] init];
         [self.navigationController pushViewController:lineChartController animated:YES];
     }
+	else if (indexPath.row == JBChartListViewControllerRowLineChartMissingPoints)
+	{
+		JBLineChartMissingPointsViewController *lineChartController = [[JBLineChartMissingPointsViewController alloc] init];
+		[self.navigationController pushViewController:lineChartController animated:YES];
+	}
     else if (indexPath.row == JBChartListViewControllerRowBarChart)
     {
         JBBarChartViewController *barChartController = [[JBBarChartViewController alloc] init];
         [self.navigationController pushViewController:barChartController animated:YES];
     }
+    else if (indexPath.row == JBChartListViewControllerRowAreaChart)
+    {
+        JBAreaChartViewController *areaChartController = [[JBAreaChartViewController alloc] init];
+        [self.navigationController pushViewController:areaChartController animated:YES];
+    }
 }
 
 @end

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartMissingPointsViewController.h

@@ -0,0 +1,13 @@
+//
+//  JBLineChartMissingPointsViewController.h
+//  JBChartViewDemo
+//
+//  Created by Sebastian Opel on 23.10.14.
+//  Copyright (c) 2014 Jawbone. All rights reserved.
+//
+
+#import "JBBaseChartViewController.h"
+
+@interface JBLineChartMissingPointsViewController : JBBaseChartViewController
+
+@end

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartMissingPointsViewController.m

@@ -0,0 +1,309 @@
+//
+//  JBLineChartMissingPointsViewController.m
+//  JBChartViewDemo
+//
+//  Created by Sebastian Opel on 23.10.14.
+//  Copyright (c) 2014 Jawbone. All rights reserved.
+//
+
+#import "JBLineChartMissingPointsViewController.h"
+
+// Views
+#import "JBLineChartView.h"
+#import "JBChartHeaderView.h"
+#import "JBLineChartFooterView.h"
+#import "JBChartInformationView.h"
+
+#define ARC4RANDOM_MAX 0x010000000
+
+typedef NS_ENUM(NSInteger, JBLineChartLine){
+    JBLineChartLineSolid,
+    JBLineChartLineDashed,
+    JBLineChartLineCount
+};
+
+// Numerics
+CGFloat const kJBLineChartMissingPointsViewControllerChartHeight = 250.0f;
+CGFloat const kJBLineChartMissingPointsViewControllerChartPadding = 10.0f;
+CGFloat const kJBLineChartMissingPointsViewControllerChartHeaderHeight = 75.0f;
+CGFloat const kJBLineChartMissingPointsViewControllerChartHeaderPadding = 20.0f;
+CGFloat const kJBLineChartMissingPointsViewControllerChartFooterHeight = 20.0f;
+CGFloat const kJBLineChartMissingPointsViewControllerChartSolidLineWidth = 6.0f;
+CGFloat const kJBLineChartMissingPointsViewControllerChartSolidLineDotRadius = 5.0f;
+CGFloat const kJBLineChartMissingPointsViewControllerChartDashedLineWidth = 2.0f;
+NSInteger const kJBLineChartMissingPointsViewControllerMaxNumChartPoints = 7;
+
+// Strings
+NSString * const kJBLineChartMissingPointsViewControllerNavButtonViewKey = @"view";
+
+@interface JBLineChartMissingPointsViewController () <JBLineChartViewDelegate, JBLineChartViewDataSource>
+
+@property (nonatomic, strong) JBLineChartView *lineChartView;
+@property (nonatomic, strong) JBChartInformationView *informationView;
+@property (nonatomic, strong) NSArray *chartData;
+@property (nonatomic, strong) NSArray *daysOfWeek;
+
+// Buttons
+- (void)chartToggleButtonPressed:(id)sender;
+
+// Helpers
+- (void)initFakeData;
+- (NSArray *)largestLineData; // largest collection of fake line data
+
+@end
+
+@implementation JBLineChartMissingPointsViewController
+
+#pragma mark - Alloc/Init
+
+- (id)init
+{
+    self = [super init];
+    if (self)
+    {
+        [self initFakeData];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self)
+    {
+        [self initFakeData];
+    }
+    return self;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self)
+    {
+        [self initFakeData];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    _lineChartView.delegate = nil;
+    _lineChartView.dataSource = nil;
+}
+
+#pragma mark - Data
+
+- (void)initFakeData
+{
+    NSMutableArray *mutableLineCharts = [NSMutableArray array];
+    for (int lineIndex=0; lineIndex<JBLineChartLineCount; lineIndex++)
+    {
+        NSMutableArray *mutableChartData = [NSMutableArray array];
+        for (int i=0; i<kJBLineChartMissingPointsViewControllerMaxNumChartPoints; i++)
+        {
+            if(i < 2 || i > 5 || i == 3)
+            {
+                [mutableChartData addObject:[NSNumber numberWithFloat:NAN]];
+            } else {
+                [mutableChartData addObject:[NSNumber numberWithFloat:((double)arc4random() / ARC4RANDOM_MAX)]]; // random number between 0 and 1
+            }
+        }
+        [mutableLineCharts addObject:mutableChartData];
+    }
+    _chartData = [NSArray arrayWithArray:mutableLineCharts];
+    _daysOfWeek = [[[NSDateFormatter alloc] init] shortWeekdaySymbols];
+}
+
+- (NSArray *)largestLineData
+{
+    NSArray *largestLineData = nil;
+    for (NSArray *lineData in self.chartData)
+    {
+        if ([lineData count] > [largestLineData count])
+        {
+            largestLineData = lineData;
+        }
+    }
+    return largestLineData;
+}
+
+#pragma mark - View Lifecycle
+
+- (void)loadView
+{
+    [super loadView];
+    
+    self.view.backgroundColor = kJBColorLineChartControllerBackground;
+    self.navigationItem.rightBarButtonItem = [self chartToggleButtonWithTarget:self action:@selector(chartToggleButtonPressed:)];
+    
+    self.lineChartView = [[JBLineChartView alloc] init];
+    self.lineChartView.frame = CGRectMake(kJBLineChartMissingPointsViewControllerChartPadding, kJBLineChartMissingPointsViewControllerChartPadding, self.view.bounds.size.width - (kJBLineChartMissingPointsViewControllerChartPadding * 2), kJBLineChartMissingPointsViewControllerChartHeight);
+    self.lineChartView.delegate = self;
+    self.lineChartView.dataSource = self;
+    self.lineChartView.headerPadding = kJBLineChartMissingPointsViewControllerChartHeaderPadding;
+    self.lineChartView.backgroundColor = kJBColorLineChartBackground;
+    
+    JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBLineChartMissingPointsViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartMissingPointsViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBLineChartMissingPointsViewControllerChartPadding * 2), kJBLineChartMissingPointsViewControllerChartHeaderHeight)];
+    headerView.titleLabel.text = [kJBStringLabelCyclingDistances uppercaseString];
+    headerView.titleLabel.textColor = kJBColorLineChartHeader;
+    headerView.titleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+    headerView.titleLabel.shadowOffset = CGSizeMake(0, 1);
+    headerView.subtitleLabel.text = kJBStringLabel2014;
+    headerView.subtitleLabel.textColor = kJBColorLineChartHeader;
+    headerView.subtitleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+    headerView.subtitleLabel.shadowOffset = CGSizeMake(0, 1);
+    headerView.separatorColor = kJBColorLineChartHeaderSeparatorColor;
+    self.lineChartView.headerView = headerView;
+    
+    JBLineChartFooterView *footerView = [[JBLineChartFooterView alloc] initWithFrame:CGRectMake(kJBLineChartMissingPointsViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartMissingPointsViewControllerChartFooterHeight * 0.5), self.view.bounds.size.width - (kJBLineChartMissingPointsViewControllerChartPadding * 2), kJBLineChartMissingPointsViewControllerChartFooterHeight)];
+    footerView.backgroundColor = [UIColor clearColor];
+    footerView.leftLabel.text = [[self.daysOfWeek firstObject] uppercaseString];
+    footerView.leftLabel.textColor = [UIColor whiteColor];
+    footerView.rightLabel.text = [[self.daysOfWeek lastObject] uppercaseString];;
+    footerView.rightLabel.textColor = [UIColor whiteColor];
+    footerView.sectionCount = [[self largestLineData] count];
+    self.lineChartView.footerView = footerView;
+    
+    [self.view addSubview:self.lineChartView];
+    
+    self.informationView = [[JBChartInformationView alloc] initWithFrame:CGRectMake(self.view.bounds.origin.x, CGRectGetMaxY(self.lineChartView.frame), self.view.bounds.size.width, self.view.bounds.size.height - CGRectGetMaxY(self.lineChartView.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
+    [self.informationView setValueAndUnitTextColor:[UIColor colorWithWhite:1.0 alpha:0.75]];
+    [self.informationView setTitleTextColor:kJBColorLineChartHeader];
+    [self.informationView setTextShadowColor:nil];
+    [self.informationView setSeparatorColor:kJBColorLineChartHeaderSeparatorColor];
+    [self.view addSubview:self.informationView];
+    
+    [self.lineChartView reloadData];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self.lineChartView setState:JBChartViewStateExpanded];
+}
+
+#pragma mark - JBChartViewDataSource
+
+- (BOOL)shouldExtendSelectionViewIntoHeaderPaddingForChartView:(JBChartView *)chartView
+{
+    return YES;
+}
+
+- (BOOL)shouldExtendSelectionViewIntoFooterPaddingForChartView:(JBChartView *)chartView
+{
+    return NO;
+}
+
+#pragma mark - JBLineChartViewDataSource
+
+- (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView
+{
+    return [self.chartData count];
+}
+
+- (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex
+{
+    return [[self.chartData objectAtIndex:lineIndex] count];
+}
+
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return lineIndex == JBLineChartViewLineStyleDashed;
+}
+
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView smoothLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return lineIndex == JBLineChartViewLineStyleSolid;
+}
+
+#pragma mark - JBLineChartViewDelegate
+
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+    return [[[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex] floatValue];
+}
+
+- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint
+{
+    NSNumber *valueNumber = [[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex];
+    if(isnan([valueNumber floatValue])) {
+        [self.informationView setHidden:YES animated:YES];
+    } else {
+        [self.informationView setValueText:[NSString stringWithFormat:@"%.2f", [valueNumber floatValue]] unitText:kJBStringLabelKm2014];
+        [self.informationView setTitleText:lineIndex == JBLineChartLineSolid ? kJBStringLabelLastWeek : kJBStringLabelCurrentWeek];
+        [self.informationView setHidden:NO animated:YES];
+    }
+    [self setTooltipVisible:YES animated:YES atTouchPoint:touchPoint];
+    [self.tooltipView setText:[[self.daysOfWeek objectAtIndex:horizontalIndex] uppercaseString]];
+}
+
+- (void)didDeselectLineInLineChartView:(JBLineChartView *)lineChartView
+{
+    [self.informationView setHidden:YES animated:YES];
+    [self setTooltipVisible:NO animated:YES];
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: kJBColorLineChartDefaultDashedLineColor;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: kJBColorLineChartDefaultDashedLineColor;
+}
+
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? kJBLineChartMissingPointsViewControllerChartSolidLineWidth: kJBLineChartMissingPointsViewControllerChartDashedLineWidth;
+}
+
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dotRadiusForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? 0.0 : kJBLineChartMissingPointsViewControllerChartSolidLineDotRadius;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return [UIColor whiteColor];
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: kJBColorLineChartDefaultDashedSelectedLineColor;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: kJBColorLineChartDefaultDashedSelectedLineColor;
+}
+
+- (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
+{
+    return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewLineStyleSolid : JBLineChartViewLineStyleDashed;
+}
+
+#pragma mark - Buttons
+
+- (void)chartToggleButtonPressed:(id)sender
+{
+    UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBLineChartMissingPointsViewControllerNavButtonViewKey];
+    buttonImageView.userInteractionEnabled = NO;
+    
+    CGAffineTransform transform = self.lineChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
+    buttonImageView.transform = transform;
+    
+    [self.lineChartView setState:self.lineChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
+        buttonImageView.userInteractionEnabled = YES;
+    }];
+}
+
+#pragma mark - Overrides
+
+- (JBChartView *)chartView
+{
+    return self.lineChartView;
+}
+
+@end

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartViewController.m

@@ -18,8 +18,8 @@
 
 typedef NS_ENUM(NSInteger, JBLineChartLine){
 	JBLineChartLineSolid,
-    JBLineChartLineDashed,
-    JBLineChartLineCount
+	JBLineChartLineDashed,
+	JBLineChartLineCount
 };
 
 // Numerics
@@ -29,6 +29,7 @@ CGFloat const kJBLineChartViewControllerChartHeaderHeight = 75.0f;
 CGFloat const kJBLineChartViewControllerChartHeaderPadding = 20.0f;
 CGFloat const kJBLineChartViewControllerChartFooterHeight = 20.0f;
 CGFloat const kJBLineChartViewControllerChartSolidLineWidth = 6.0f;
+CGFloat const kJBLineChartViewControllerChartSolidLineDotRadius = 5.0f;
 CGFloat const kJBLineChartViewControllerChartDashedLineWidth = 2.0f;
 NSInteger const kJBLineChartViewControllerMaxNumChartPoints = 7;
 
@@ -57,184 +58,247 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
 
 - (id)init
 {
-    self = [super init];
-    if (self)
-    {
-        [self initFakeData];
-    }
-    return self;
+	self = [super init];
+	if (self)
+	{
+		[self initFakeData];
+	}
+	return self;
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        [self initFakeData];
-    }
-    return self;
+	self = [super initWithCoder:aDecoder];
+	if (self)
+	{
+		[self initFakeData];
+	}
+	return self;
 }
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self)
-    {
-        [self initFakeData];
-    }
-    return self;
+	self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+	if (self)
+	{
+		[self initFakeData];
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	_lineChartView.delegate = nil;
+	_lineChartView.dataSource = nil;
 }
 
 #pragma mark - Data
 
 - (void)initFakeData
 {
-    NSMutableArray *mutableLineCharts = [NSMutableArray array];
-    for (int lineIndex=0; lineIndex<JBLineChartLineCount; lineIndex++)
-    {
-        NSMutableArray *mutableChartData = [NSMutableArray array];
-        for (int i=0; i<kJBLineChartViewControllerMaxNumChartPoints; i++)
-        {
-            [mutableChartData addObject:[NSNumber numberWithFloat:((double)arc4random() / ARC4RANDOM_MAX)]]; // random number between 0 and 1
-        }
-        [mutableLineCharts addObject:mutableChartData];
-    }
-    _chartData = [NSArray arrayWithArray:mutableLineCharts];
-    _daysOfWeek = [[[NSDateFormatter alloc] init] shortWeekdaySymbols];
+	NSMutableArray *mutableLineCharts = [NSMutableArray array];
+	for (int lineIndex=0; lineIndex<JBLineChartLineCount; lineIndex++)
+	{
+		NSMutableArray *mutableChartData = [NSMutableArray array];
+		for (int i=0; i<kJBLineChartViewControllerMaxNumChartPoints; i++)
+		{
+			[mutableChartData addObject:[NSNumber numberWithFloat:((double)arc4random() / ARC4RANDOM_MAX)]]; // random number between 0 and 1
+		}
+		[mutableLineCharts addObject:mutableChartData];
+	}
+	_chartData = [NSArray arrayWithArray:mutableLineCharts];
+	_daysOfWeek = [[[NSDateFormatter alloc] init] shortWeekdaySymbols];
 }
 
 - (NSArray *)largestLineData
 {
-    NSArray *largestLineData = nil;
-    for (NSArray *lineData in self.chartData)
-    {
-        if ([lineData count] > [largestLineData count])
-        {
-            largestLineData = lineData;
-        }
-    }
-    return largestLineData;
+	NSArray *largestLineData = nil;
+	for (NSArray *lineData in self.chartData)
+	{
+		if ([lineData count] > [largestLineData count])
+		{
+			largestLineData = lineData;
+		}
+	}
+	return largestLineData;
 }
 
 #pragma mark - View Lifecycle
 
 - (void)loadView
 {
-    [super loadView];
-    
-    self.view.backgroundColor = kJBColorLineChartControllerBackground;
-    self.navigationItem.rightBarButtonItem = [self chartToggleButtonWithTarget:self action:@selector(chartToggleButtonPressed:)];
-        
-    self.lineChartView = [[JBLineChartView alloc] init];
-    self.lineChartView.frame = CGRectMake(kJBLineChartViewControllerChartPadding, kJBLineChartViewControllerChartPadding, self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeight);
-    self.lineChartView.delegate = self;
-    self.lineChartView.dataSource = self;
-    self.lineChartView.headerPadding = kJBLineChartViewControllerChartHeaderPadding;
-    self.lineChartView.backgroundColor = kJBColorLineChartBackground;
-    
-    JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeaderHeight)];
-    headerView.titleLabel.text = [kJBStringLabelAverageDailyRainfall uppercaseString];
-    headerView.titleLabel.textColor = kJBColorLineChartHeader;
-    headerView.titleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
-    headerView.titleLabel.shadowOffset = CGSizeMake(0, 1);
-    headerView.subtitleLabel.text = kJBStringLabel2013;
-    headerView.subtitleLabel.textColor = kJBColorLineChartHeader;
-    headerView.subtitleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
-    headerView.subtitleLabel.shadowOffset = CGSizeMake(0, 1);
-    headerView.separatorColor = kJBColorLineChartHeaderSeparatorColor;
-    self.lineChartView.headerView = headerView;
-    
-    JBLineChartFooterView *footerView = [[JBLineChartFooterView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartFooterHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartFooterHeight)];
-    footerView.backgroundColor = [UIColor clearColor];
-    footerView.leftLabel.text = [[self.daysOfWeek firstObject] uppercaseString];
-    footerView.leftLabel.textColor = [UIColor whiteColor];
-    footerView.rightLabel.text = [[self.daysOfWeek lastObject] uppercaseString];;
-    footerView.rightLabel.textColor = [UIColor whiteColor];
-    footerView.sectionCount = [[self largestLineData] count];
-    self.lineChartView.footerView = footerView;
-    
-    [self.view addSubview:self.lineChartView];
-    
-    self.informationView = [[JBChartInformationView alloc] initWithFrame:CGRectMake(self.view.bounds.origin.x, CGRectGetMaxY(self.lineChartView.frame), self.view.bounds.size.width, self.view.bounds.size.height - CGRectGetMaxY(self.lineChartView.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
-    [self.informationView setValueAndUnitTextColor:[UIColor colorWithWhite:1.0 alpha:0.75]];
-    [self.informationView setTitleTextColor:kJBColorLineChartHeader];
-    [self.informationView setTextShadowColor:nil];
-    [self.informationView setSeparatorColor:kJBColorLineChartHeaderSeparatorColor];
-    [self.view addSubview:self.informationView];
-    
-    [self.lineChartView reloadData];
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
-    [self.lineChartView setState:JBChartViewStateExpanded animated:YES];
+	[super loadView];
+	
+	self.view.backgroundColor = kJBColorLineChartControllerBackground;
+	self.navigationItem.rightBarButtonItem = [self chartToggleButtonWithTarget:self action:@selector(chartToggleButtonPressed:)];
+	
+	self.lineChartView = [[JBLineChartView alloc] init];
+	self.lineChartView.frame = CGRectMake(kJBLineChartViewControllerChartPadding, kJBLineChartViewControllerChartPadding, self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeight);
+	self.lineChartView.delegate = self;
+	self.lineChartView.dataSource = self;
+	self.lineChartView.headerPadding = kJBLineChartViewControllerChartHeaderPadding;
+	self.lineChartView.backgroundColor = kJBColorLineChartBackground;
+	
+	JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartHeaderHeight)];
+	headerView.titleLabel.text = [kJBStringLabelAverageDailyRainfall uppercaseString];
+	headerView.titleLabel.textColor = kJBColorLineChartHeader;
+	headerView.titleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+	headerView.titleLabel.shadowOffset = CGSizeMake(0, 1);
+	headerView.subtitleLabel.text = kJBStringLabel2013;
+	headerView.subtitleLabel.textColor = kJBColorLineChartHeader;
+	headerView.subtitleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
+	headerView.subtitleLabel.shadowOffset = CGSizeMake(0, 1);
+	headerView.separatorColor = kJBColorLineChartHeaderSeparatorColor;
+	self.lineChartView.headerView = headerView;
+	
+	JBLineChartFooterView *footerView = [[JBLineChartFooterView alloc] initWithFrame:CGRectMake(kJBLineChartViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartViewControllerChartFooterHeight * 0.5), self.view.bounds.size.width - (kJBLineChartViewControllerChartPadding * 2), kJBLineChartViewControllerChartFooterHeight)];
+	footerView.backgroundColor = [UIColor clearColor];
+	footerView.leftLabel.text = [[self.daysOfWeek firstObject] uppercaseString];
+	footerView.leftLabel.textColor = [UIColor whiteColor];
+	footerView.rightLabel.text = [[self.daysOfWeek lastObject] uppercaseString];;
+	footerView.rightLabel.textColor = [UIColor whiteColor];
+	footerView.sectionCount = [[self largestLineData] count];
+	self.lineChartView.footerView = footerView;
+	
+	[self.view addSubview:self.lineChartView];
+	
+	self.informationView = [[JBChartInformationView alloc] initWithFrame:CGRectMake(self.view.bounds.origin.x, CGRectGetMaxY(self.lineChartView.frame), self.view.bounds.size.width, self.view.bounds.size.height - CGRectGetMaxY(self.lineChartView.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
+	[self.informationView setValueAndUnitTextColor:[UIColor colorWithWhite:1.0 alpha:0.75]];
+	[self.informationView setTitleTextColor:kJBColorLineChartHeader];
+	[self.informationView setTextShadowColor:nil];
+	[self.informationView setSeparatorColor:kJBColorLineChartHeaderSeparatorColor];
+	[self.view addSubview:self.informationView];
+	
+	[self.lineChartView reloadData];
 }
 
 - (void)viewWillAppear:(BOOL)animated
 {
-    [super viewWillAppear:animated];
-    [self.lineChartView setState:JBChartViewStateCollapsed];
+	[super viewWillAppear:animated];
+	[self.lineChartView setState:JBChartViewStateExpanded];
 }
 
-#pragma mark - JBLineChartViewDelegate
+#pragma mark - JBChartViewDataSource
 
-- (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+- (BOOL)shouldExtendSelectionViewIntoHeaderPaddingForChartView:(JBChartView *)chartView
 {
-    return [[[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex] floatValue];
+	return YES;
 }
 
-- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint
+- (BOOL)shouldExtendSelectionViewIntoFooterPaddingForChartView:(JBChartView *)chartView
 {
-    NSNumber *valueNumber = [[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex];
-    [self.informationView setValueText:[NSString stringWithFormat:@"%.2f", [valueNumber floatValue]] unitText:kJBStringLabelMm];
-    [self.informationView setTitleText:lineIndex == JBLineChartLineSolid ? kJBStringLabelMetropolitanAverage : kJBStringLabelNationalAverage];
-    [self.informationView setHidden:NO animated:YES];
-    [self setTooltipVisible:YES animated:YES atTouchPoint:touchPoint];
-    [self.tooltipView setText:[[self.daysOfWeek objectAtIndex:horizontalIndex] uppercaseString]];
-}
-
-- (void)didUnselectLineInLineChartView:(JBLineChartView *)lineChartView
-{
-    [self.informationView setHidden:YES animated:YES];
-    [self setTooltipVisible:NO animated:YES];
+	return NO;
 }
 
 #pragma mark - JBLineChartViewDataSource
 
 - (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView
 {
-    return [self.chartData count];
+	return [self.chartData count];
 }
 
 - (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex
 {
-    return [[self.chartData objectAtIndex:lineIndex] count];
+	return [[self.chartData objectAtIndex:lineIndex] count];
+}
+
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView showsDotsForLineAtLineIndex:(NSUInteger)lineIndex
+{
+	return lineIndex == JBLineChartViewLineStyleDashed;
+}
+
+- (BOOL)lineChartView:(JBLineChartView *)lineChartView smoothLineAtLineIndex:(NSUInteger)lineIndex
+{
+	return lineIndex == JBLineChartViewLineStyleSolid;
+}
+
+#pragma mark - JBLineChartViewDelegate
+
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+	return [[[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex] floatValue];
+}
+
+- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint
+{
+	NSNumber *valueNumber = [[self.chartData objectAtIndex:lineIndex] objectAtIndex:horizontalIndex];
+	[self.informationView setValueText:[NSString stringWithFormat:@"%.2f", [valueNumber floatValue]] unitText:kJBStringLabelMm];
+	[self.informationView setTitleText:lineIndex == JBLineChartLineSolid ? kJBStringLabelMetropolitanAverage : kJBStringLabelNationalAverage];
+	[self.informationView setHidden:NO animated:YES];
+	[self setTooltipVisible:YES animated:YES atTouchPoint:touchPoint];
+	[self.tooltipView setText:[[self.daysOfWeek objectAtIndex:horizontalIndex] uppercaseString]];
+}
+
+- (void)didDeselectLineInLineChartView:(JBLineChartView *)lineChartView
+{
+	[self.informationView setHidden:YES animated:YES];
+	[self setTooltipVisible:NO animated:YES];
 }
 
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: kJBColorLineChartDefaultDashedLineColor;
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: nil;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView fillColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidFillColor : nil;
+}
+
+- (CAGradientLayer *)lineChartView:(JBLineChartView *)lineChartView gradientForLineAtLineIndex:(NSUInteger)lineIndex
+{
+	if (lineIndex == JBLineChartLineSolid)
+	{
+		return nil;
+	}
+	else
+	{
+		CAGradientLayer *gradient = [CAGradientLayer new];
+		gradient.startPoint = CGPointMake(0.0, 0.0);
+		gradient.endPoint = CGPointMake(1.0, 0.0);
+		gradient.colors = @[(id)kJBColorLineChartDefaultGradientStartColor.CGColor, (id)kJBColorLineChartDefaultGradientEndColor.CGColor];
+		return gradient;
+	}
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidLineColor: kJBColorLineChartDefaultDashedLineColor;
 }
 
 - (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBLineChartViewControllerChartSolidLineWidth: kJBLineChartViewControllerChartDashedLineWidth;
+	return (lineIndex == JBLineChartLineSolid) ? kJBLineChartViewControllerChartSolidLineWidth: kJBLineChartViewControllerChartDashedLineWidth;
 }
 
-- (UIColor *)verticalSelectionColorForLineChartView:(JBLineChartView *)lineChartView
+- (CGFloat)lineChartView:(JBLineChartView *)lineChartView dotRadiusForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
 {
-    return [UIColor whiteColor];
+	return (lineIndex == JBLineChartLineSolid) ? 0.0: kJBLineChartViewControllerChartSolidLineDotRadius;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView verticalSelectionColorForLineAtLineIndex:(NSUInteger)lineIndex
+{
+	return [UIColor whiteColor];
 }
 
 - (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: kJBColorLineChartDefaultDashedSelectedLineColor;
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: nil;
+}
+
+- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex
+{
+	return (lineIndex == JBLineChartLineSolid) ? kJBColorLineChartDefaultSolidSelectedLineColor: kJBColorLineChartDefaultDashedSelectedLineColor;
 }
 
 - (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
 {
-    return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewLineStyleSolid : JBLineChartViewLineStyleDashed;
+	return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewLineStyleSolid : JBLineChartViewLineStyleDashed;
+}
+
+- (JBLineChartViewColorStyle)lineChartView:(JBLineChartView *)lineChartView colorStyleForLineAtLineIndex:(NSUInteger)lineIndex
+{
+	return (lineIndex == JBLineChartLineSolid) ? JBLineChartViewColorStyleSolid : JBLineChartViewColorStyleGradient;
 }
 
 #pragma mark - Buttons
@@ -242,21 +306,21 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
 - (void)chartToggleButtonPressed:(id)sender
 {
 	UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBLineChartViewControllerNavButtonViewKey];
-    buttonImageView.userInteractionEnabled = NO;
-    
-    CGAffineTransform transform = self.lineChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
-    buttonImageView.transform = transform;
-
-    [self.lineChartView setState:self.lineChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
-        buttonImageView.userInteractionEnabled = YES;
-    }];
+	buttonImageView.userInteractionEnabled = NO;
+	
+	CGAffineTransform transform = self.lineChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
+	buttonImageView.transform = transform;
+	
+	[self.lineChartView setState:self.lineChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
+		buttonImageView.userInteractionEnabled = YES;
+	}];
 }
 
 #pragma mark - Overrides
 
 - (JBChartView *)chartView
 {
-    return self.lineChartView;
+	return self.lineChartView;
 }
 
-@end
+@end

JBChartViewDemo/JBChartViewDemo/Footers/JBBarChartFooterView.h

@@ -10,7 +10,6 @@
 
 @interface JBBarChartFooterView : UIView
 
-@property (nonatomic, strong) UIColor *footerBackgroundColor; // footer background (default = black)
 @property (nonatomic, assign) CGFloat padding; // label left & right padding (default = 4.0)
 @property (nonatomic, readonly) UILabel *leftLabel;
 @property (nonatomic, readonly) UILabel *rightLabel;

JBChartViewDemo/JBChartViewDemo/Footers/JBBarChartFooterView.m

@@ -10,30 +10,12 @@
 
 // Numerics
 CGFloat const kJBBarChartFooterPolygonViewDefaultPadding = 4.0f;
-CGFloat const kJBBarChartFooterPolygonViewArrowHeight = 8.0f;
-CGFloat const kJBBarChartFooterPolygonViewArrowWidth = 16.0f;
 
 // Colors
-static UIColor *kJBBarChartFooterPolygonViewDefaultBackgroundColor = nil;
+static UIColor *kJBBarChartFooterViewDefaultBackgroundColor = nil;
 
-@protocol JBBarChartFooterPolygonViewDelegate;
+@interface JBBarChartFooterView ()
 
-@interface JBBarChartFooterPolygonView : UIView
-
-@property (nonatomic, weak) id<JBBarChartFooterPolygonViewDelegate> delegate;
-
-@end
-
-@protocol JBBarChartFooterPolygonViewDelegate <NSObject>
-
-- (UIColor *)backgroundColorForChartFooterPolygonView:(JBBarChartFooterPolygonView *)chartFooterPolygonView;
-- (CGFloat)paddingForChartFooterPolygonView:(JBBarChartFooterPolygonView *)chartFooterPolygonView;
-
-@end
-
-@interface JBBarChartFooterView () <JBBarChartFooterPolygonViewDelegate>
-
-@property (nonatomic, strong) JBBarChartFooterPolygonView *polygonView;
 @property (nonatomic, strong) UILabel *leftLabel;
 @property (nonatomic, strong) UILabel *rightLabel;
 
@@ -47,7 +29,7 @@ static UIColor *kJBBarChartFooterPolygonViewDefaultBackgroundColor = nil;
 {
 	if (self == [JBBarChartFooterView class])
 	{
-		kJBBarChartFooterPolygonViewDefaultBackgroundColor = kJBColorBarChartControllerBackground;
+		kJBBarChartFooterViewDefaultBackgroundColor = kJBColorBarChartControllerBackground;
 	}
 }
 
@@ -56,16 +38,10 @@ static UIColor *kJBBarChartFooterPolygonViewDefaultBackgroundColor = nil;
     self = [super initWithFrame:frame];
     if (self)
     {
-        self.backgroundColor = kJBBarChartFooterPolygonViewDefaultBackgroundColor;
-        self.clipsToBounds = NO;
+        self.backgroundColor = kJBBarChartFooterViewDefaultBackgroundColor;
         
-        _footerBackgroundColor = kJBBarChartFooterPolygonViewDefaultBackgroundColor;
         _padding = kJBBarChartFooterPolygonViewDefaultPadding;
         
-        _polygonView = [[JBBarChartFooterPolygonView alloc] initWithFrame:CGRectMake(self.bounds.origin.x, self.bounds.origin.y - kJBBarChartFooterPolygonViewArrowHeight, self.bounds.size.width, self.bounds.size.height + kJBBarChartFooterPolygonViewArrowHeight)];
-        _polygonView.delegate = self;
-        [self addSubview:_polygonView];
-        
         _leftLabel = [[UILabel alloc] init];
         _leftLabel.adjustsFontSizeToFitWidth = YES;
         _leftLabel.font = kJBFontFooterLabel;
@@ -101,96 +77,4 @@ static UIColor *kJBBarChartFooterPolygonViewDefaultBackgroundColor = nil;
     self.rightLabel.frame = CGRectMake(CGRectGetMaxX(_leftLabel.frame), yOffset, width, self.bounds.size.height);
 }
 
-#pragma mark - JBBarChartFooterPolygonViewDelegate
-
-- (UIColor *)backgroundColorForChartFooterPolygonView:(JBBarChartFooterPolygonView *)chartFooterPolygonView
-{
-    return self.footerBackgroundColor;
-}
-
-- (CGFloat)paddingForChartFooterPolygonView:(JBBarChartFooterPolygonView *)chartFooterPolygonView
-{
-    return self.padding;
-}
-
-@end
-
-@implementation JBBarChartFooterPolygonView
-
-#pragma mark - Alloc/Init
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-    {
-        self.clipsToBounds = NO;
-        self.backgroundColor = [UIColor clearColor];
-    }
-    return self;
-}
-
-#pragma mark - Drawing
-
-- (void)drawRect:(CGRect)rect
-{
-    [super drawRect:rect];
-    
-    CGContextRef context = UIGraphicsGetCurrentContext();
-    
-    // Background gradient
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGFloat locations[] = { 0.0, 1.0 };
-    
-    NSAssert([self.delegate respondsToSelector:@selector(backgroundColorForChartFooterPolygonView:)], @"JBChartFooterPolygonView // delegate must implement - (UIColor *)backgroundColorForChartFooterPolygonView");
-    NSAssert([self.delegate respondsToSelector:@selector(paddingForChartFooterPolygonView:)], @"JBChartFooterPolygonView // delegate must implement - (CGFloat)paddingForChartFooterPolygonView");
-
-    UIColor *bgColor = [self.delegate backgroundColorForChartFooterPolygonView:self];
-    
-    NSArray *colors = @[(__bridge id)bgColor.CGColor, (__bridge id)bgColor.CGColor];
-    CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef) colors, locations);
-    
-    // Polygon shape
-    CGFloat xOffset = self.bounds.origin.x;
-    CGFloat width = self.bounds.size.width;
-    CGFloat height = self.bounds.size.height;
-    CGFloat padding = [self.delegate paddingForChartFooterPolygonView:self];
-    NSArray *polygonPoints = @[[NSValue valueWithCGPoint:CGPointMake(xOffset, height)],
-                               [NSValue valueWithCGPoint:CGPointMake(xOffset, kJBBarChartFooterPolygonViewArrowHeight)],
-                               [NSValue valueWithCGPoint:CGPointMake(xOffset + padding, kJBBarChartFooterPolygonViewArrowHeight)],
-                               [NSValue valueWithCGPoint:CGPointMake(xOffset + padding + ceil(kJBBarChartFooterPolygonViewArrowWidth * 0.5), 0)],
-                               [NSValue valueWithCGPoint:CGPointMake(xOffset + padding + kJBBarChartFooterPolygonViewArrowWidth, kJBBarChartFooterPolygonViewArrowHeight)],
-                               [NSValue valueWithCGPoint:CGPointMake(width - padding - kJBBarChartFooterPolygonViewArrowWidth, kJBBarChartFooterPolygonViewArrowHeight)],
-                               [NSValue valueWithCGPoint:CGPointMake(width - padding - ceil(kJBBarChartFooterPolygonViewArrowWidth * 0.5), 0.0)],
-                               [NSValue valueWithCGPoint:CGPointMake(width - padding, kJBBarChartFooterPolygonViewArrowHeight)],
-                               [NSValue valueWithCGPoint:CGPointMake(width, kJBBarChartFooterPolygonViewArrowHeight)],
-                               [NSValue valueWithCGPoint:CGPointMake(width, height)],
-                               [NSValue valueWithCGPoint:CGPointMake(xOffset, height)]];
-    
-    // Draw polygon
-    NSValue *pointValue = polygonPoints[0];
-    CGContextSaveGState(context);
-    {
-        NSInteger index = 0;
-        for (pointValue in polygonPoints)
-        {
-            CGPoint point = [pointValue CGPointValue];
-            if (index == 0)
-            {
-                CGContextMoveToPoint(context, point.x, point.y);
-            }
-            else
-            {
-                CGContextAddLineToPoint(context, point.x, point.y);
-            }
-            index++;
-        }
-        CGContextClip(context);
-        CGContextDrawLinearGradient(context, gradient, CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect)), CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect)), 0);
-    }
-    CGContextRestoreGState(context);
-	CGGradientRelease(gradient);
-	CGColorSpaceRelease(colorSpace);
-}
-
 @end

JBChartViewDemo/JBChartViewDemo/Footers/JBLineChartFooterView.m

@@ -39,7 +39,6 @@ static UIColor *kJBLineChartFooterViewDefaultSeparatorColor = nil;
     self = [super initWithFrame:frame];
     if (self)
     {
-        self.clipsToBounds = NO;
         self.backgroundColor = [UIColor clearColor];
         
         _footerSeparatorColor = kJBLineChartFooterViewDefaultSeparatorColor;

JBChartViewDemo/JBChartViewDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -5,16 +5,31 @@
       "size" : "29x29",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "40x40",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",

JBChartViewDemo/JBChartViewDemo/JBChartViewDemo-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.jawbone.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

JBChartViewDemo/JBChartViewDemo/Misc/JBChartInformationView.m

@@ -261,8 +261,25 @@ static UIColor *kJBChartInformationViewShadowColor = nil;
 
 - (void)layoutSubviews
 {
-    CGSize valueLabelSize = [self.valueLabel.text sizeWithAttributes:@{NSFontAttributeName:self.valueLabel.font}];
-    CGSize unitLabelSize = [self.unitLabel.text sizeWithAttributes:@{NSFontAttributeName:self.unitLabel.font}];
+    CGSize valueLabelSize = CGSizeZero;
+    if ([self.valueLabel.text respondsToSelector:@selector(sizeWithAttributes:)])
+    {
+        valueLabelSize = [self.valueLabel.text sizeWithAttributes:@{NSFontAttributeName:self.valueLabel.font}];
+    }
+    else
+    {
+        valueLabelSize = [self.valueLabel.text sizeWithFont:self.valueLabel.font];
+    }
+
+    CGSize unitLabelSize = CGSizeZero;
+    if ([self.unitLabel.text respondsToSelector:@selector(sizeWithAttributes:)])
+    {
+        unitLabelSize = [self.unitLabel.text sizeWithAttributes:@{NSFontAttributeName:self.unitLabel.font}];
+    }
+    else
+    {
+        unitLabelSize = [self.unitLabel.text sizeWithFont:self.unitLabel.font];
+    }
     
     CGFloat xOffset = ceil((self.bounds.size.width - (valueLabelSize.width + unitLabelSize.width)) * 0.5);
 

JBChartViewDemo/JBChartViewDemo/Misc/JBChartTooltipView.m

@@ -12,7 +12,7 @@
 #import <QuartzCore/QuartzCore.h>
 
 // Numerics
-CGFloat static const kJBChartTooltipViewCornerRadius = 5.0;
+CGFloat const kJBChartTooltipViewCornerRadius = 5.0;
 CGFloat const kJBChartTooltipViewDefaultWidth = 50.0f;
 CGFloat const kJBChartTooltipViewDefaultHeight = 25.0f;
 

README.md

@@ -1,7 +1,7 @@
 # JBChartView
 <br/>
 <p align="center">	
-	<img src="https://raw.github.com/Jawbone/JBChartView/master/Screenshots/main.png">
+	<img src="https://raw.github.com/Jawbone/JBChartView/master/Screenshots/main.jpg">
 </p>
 
 Introducing <b>JBChartView - </b> Jawbone's iOS-based charting library for both line and bar graphs. It is easy to set-up, and highly customizable. 
@@ -14,15 +14,22 @@ Introducing <b>JBChartView - </b> Jawbone's iOS-based charting library for both
 - Highly customizable.
 - Expand & collapse animation support.
 
+Refer to the <a href="https://github.com/Jawbone/JBChartView/blob/master/CHANGELOG.md"">changelog</a> for an overview of JBChartView's feature history.
+
 ## Requirements
 
-- Requires iOS 7 or later
+- Requires iOS 6 or later
 - Requires Automatic Reference Counting (ARC)
 
-## Demo
+## Demo Project
 
 Build and run the <i>JBChartViewDemo</i> project in Xcode. The demo demonstrates the use of both the line and bar charts. It also outlines how a chart's appearance can be customized. 
 
+## More Demos
+
+- <a href="https://github.com/Jawbone/anscombe-quartet-ios">Amsombe's Quartet</a>: project showcasing the use of JBChartView in the classic data visualization example known as Anscombe's Quartet.
+- <a href="https://github.com/Jawbone/spark-friends-ios">Spark Friends</a>: project showcasing the use of JBChartView in the context of sparklines and (fake) user step data. 
+
 ## Installation
 
 <a href="http://cocoapods.org/" target="_blank">CocoaPods</a> is the recommended method of installing JBChartView.
@@ -31,16 +38,12 @@ Build and run the <i>JBChartViewDemo</i> project in Xcode. The demo demonstrates
 
 Simply add the following line to your <code>Podfile</code>:
 
+	platform :ios, '6.0'
 	pod 'JBChartView'
 	
-Your Podfile should look something like:
-
-	platform :ios, '7.0'
-	pod 'JBChartView', '~> 2.0.0'
-	
 ### The Old School Way
 
-The simpliest way to use JBChartView with your application is to drag and drop the <i>/Classes</i> folder into you're Xcode 5 project. It's also recommended you rename the <i>/Classes</i> folder to something more descriptive (ie. "<i>Jawbone - JBChartView</i>").
+The simplest way to use JBChartView with your application is to drag and drop the <i>/Classes</i> folder into you're Xcode 5 project. It's also recommended you rename the <i>/Classes</i> folder to something more descriptive (ie. "<i>Jawbone - JBChartView</i>").
 
 <center>
 	<img src="https://raw.github.com/Jawbone/JBChartView/master/Screenshots/installation.png">
@@ -50,37 +53,88 @@ The simpliest way to use JBChartView with your application is to drag and drop t
 
 All JBChartView implementations have a similiar data source and delgate pattern to <i>UITableView</i>. If you're familiar with using a <i>UITableView</i> or <i>UITableViewController</i>, using a JBChartView subclass should be a breeze!
 
+#### Swift Projects
+
+To use JBCartView in a Swift project add the following to your bridging header (JBChartView-Bridging-Header.h):
+
+	#import <UIKit/UIKit.h>
+	#import "JBChartView.h"
+	#import "JBBarChartView.h"
+	#import "JBLineChartView.h"
+
+For more information about adding bridging headers see <a href="https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/BuildingCocoaApps/MixandMatch.html" target="_blank">Swift and Objective-C in the Same Project</a>.
+
 #### JBBarChartView
 
 To initialize a <i>JBBarChartView</i>, you only need a few lines of code (see below). Bar charts can also be initialized via a <b>nib</b> or with a <b>frame</b>.
 
 	JBBarChartView *barChartView = [[JBBarChartView alloc] init];
-    barChartView.delegate = self;
     barChartView.dataSource = self;
+    barChartView.delegate = self;
     [self addSubview:barChartView];
+
+Just like you would for a `UITableView`, ensure you clear these properties in your `dealloc`:
+
+	- (void)dealloc
+	{
+		JBBarChartView *barChartView = ...; // i.e. _barChartView
+		barChartView.delegate = nil;
+		barChartView.dataSource = nil;
+	}
     
 At a minimum, you need to inform the data source how many bars are in the chart:
 
-	- (NSInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView
+	- (NSUInteger)numberOfBarsInBarChartView:(JBBarChartView *)barChartView
 	{
 		return ...; // number of bars in chart
 	}
 
 Secondly, you need to inform the delegate the height of each bar (automatically normalized across the entire chart):
     
-    - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtAtIndex:(NSInteger)index
+    - (CGFloat)barChartView:(JBBarChartView *)barChartView heightForBarViewAtIndex:(NSUInteger)index
     {
 		return ...; // height of bar at index
 	}
-    
+	
+Lastly, ensure you have set the *frame* of your barChartView & call *reloadData* at least once:
+
+	barChartView.frame = CGRectMake( ... );
+	[barChartView reloadData];
+
+Subsequent changes to the chart's frame will not invoke *reloadData*; it must be called directly afterwards for any changes to take effect. 
+	
+
+### Animated Reload
+
+Both line and bar charts support *animated* reloads. The delta between the old data model and new data model is calculated and animated appropriately (ie. bars or lines will shrink, expand or morph in size). Due to techinical limitations in Apple's <a href="https://developer.apple.com/library/tvos/documentation/GraphicsImaging/Reference/CAShapeLayer_class/index.html#//apple_ref/occ/instp/CAShapeLayer/path">Quartz Core Framework</a>, line *fills* (both solid and gradient) can not be animated - they will simply 'snap' into place while the rest of the chart continues to animate.
+
+	- (void)reloadDataAnimated:(BOOL)animated;
+
+State changes during a reload will be ignored. As well, subsequent calls to reloadData: or reloadDataAnimated: before any previous reloads are complete, will also be ignored. Lastly, all touch events will be ignored until a reload has completed. You can always check on the state of the animation via the exposed *read-only* property: 
+
+	@property (nonatomic, readonly) BOOL reloading;
+
+By default, the animation will complete in approximately 0.25 seconds. The animation duration is independent from the data model size. 
+
+**Note**: the above restrictions apply only to *animated* reloads, as non-animated reloads are synchronous.
+ 
 #### JBLineChartView
 
 Similiarily, to initialize a JBLineChartView, you only need a few lines of code (see below). Line charts can also be initialized via a <b>nib</b> or with a <b>frame</b>.
 
 	JBLineChartView *lineChartView = [[JBLineChartView alloc] init];
-    lineChartView.delegate = self;
-    lineChartView.dataSource = self;
-    [self addSubview:lineChartView];
+	lineChartView.dataSource = self;
+	lineChartView.delegate = self;
+	[self addSubview:lineChartView];
+
+Just like you would for a `UITableView`, ensure you clear these properties in your `dealloc`:
+
+	- (void)dealloc
+	{
+		JBLineChartView *lineChartView = ...; // i.e. _lineChartView
+		lineChartView.delegate = nil;
+		lineChartView.dataSource = nil;
+	}
 
 At a minimum, you need to inform the data source how many lines and vertical data points (for each line) are in the chart:
 
@@ -100,99 +154,39 @@ Secondly, you need to inform the delegate of the y-position of each point (autom
     {
 		return ...; // y-position (y-axis) of point at horizontalIndex (x-axis)
 	}
+
+**Note**: you can return NAN instead of CGFloat to indicate missing values. The chart's line will begin at the first non-NAN value and end at the last non-NAN value. The line will interopolate any NAN values in between (ie. the line will not be interrupted).
+
+	return [[NSNumber numberWithFloat:NAN] floatValue];
+
+Lastly, ensure you have set the *frame* of your lineChartView & call *reloadData* at least once:
+
+	lineChartView.frame = CGRectMake( ... );
+	[lineChartView reloadData];
+
+**Note**: subsequent changes to the chart's frame will not invoke *reloadData*; it must be called directly afterwards for any changes to take effect. 
 	
 ## Customization
 
-Both the line and bar charts support a robust set of customization options. 
+Both the line and bar charts support a robust set of customization options. Read more about them <a href="Customization.md">here</a>. 
 
-The background of a bar or line chart can be set just like any other view:
+## Minimum & Maximum Values
+
+By default, a chart's minimum and maximum values are equal to the min and max supplied by the dataSource. You can override either value via:
+
+	- (void)setMinimumValue:(CGFloat)minimumValue;
+	- (void)setMaximumValue:(CGFloat)maximumValue;
+
+If value(s) are supplied, they must be >= 0, otherwise an assertion will be thrown. To reset the values back to their original defaults:
+
+	- (void)resetMinimumValue;
+	- (void)resetMaximumValue;
 	
-	self.barChartView.backgroundColor = ...; // UIColor
-	self.lineChartView.backgroundColor = ...; // UIColor
-	
-Any <i>JBChartView</i> subclass supports the use of headers and footers (similiar to that of <i>UITableView</i>):
+The min/max values are clamped to the ceiling and floor of the actual min/max values of the chart's data source; for example, if a maximumValue of 20 is supplied & the chart's actual max is 100, then 100 will be used. For min/max modifications to take effect, reloadData must be called.
 
-	self.barChartView.footerView = ...; // UIView
-	self.lineChartView.headerView = ...; // UIView
-	
-Lastly, any JBChartView subclass can be collapsed or expanded programmatically via the <i>state</i> property. If you chose to animate state changes, a callback helper can be used to notify you when the animation has completed:
+## Performance
 
-	- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback;
-
-#### JBBarChartView
-
-By default, a chart's bars will be black and flat. They can be customized by supplying a UIView subclass through the <i>optional</i> protocol:
-
-	- (UIView *)barChartView:(JBBarChartView *)barChartView barViewAtIndex:(NSUInteger)index
-	{
-		return ...; // color of line in chart
-	}
-
-Furthermore, the color of the selection bar (on touch events) can be customized via the <i>optional</i> protocol:
-
-	- (UIColor *)barSelectionColorForBarChartView:(JBBarChartView *)barChartView
-	{
-		return ...; // color of selection view
-	}
-	
-Lastly, a bar chart's selection events are delegated back via:
-
-	- (void)barChartView:(JBBarChartView *)barChartView didSelectBarAtIndex:(NSUInteger)index touchPoint:(CGPoint)touchPoint
-	{
-		// Update view
-	}
-
-	- (void)didUnselectBarChartView:(JBBarChartView *)barChartView
-	{
-		// Update view
-	}
-
-The <b>touchPoint</b> is especially important as it allows you to add custom elements to your chart during  selection events. Refer to the demo project (<b>JBarChartViewController</b>) to see how a tooltip can be used to display additional information during selection events.
-
-#### JBLineChartView
-
-The color, width and style of each line in the chart can be customized via the <i>optional</i> protocol:
-
-	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView colorForLineAtLineIndex:(NSUInteger)lineIndex
-	{
-		return ...; // color of line in chart
-	}
-	
-	- (CGFloat)lineChartView:(JBLineChartView *)lineChartView widthForLineAtLineIndex:(NSUInteger)lineIndex
-	{
-		return ...; // width of line in chart
-	}
-	
-	- (JBLineChartViewLineStyle)lineChartView:(JBLineChartView *)lineChartView lineStyleForLineAtLineIndex:(NSUInteger)lineIndex
-	{
-		return ...; // style of line in chart
-	}
-	
-Furthermore, the color of the selection bar and line can be customized via the <i>optional</i> protocols:
-
-	- (UIColor *)verticalSelectionColorForLineChartView:(JBLineChartView *)lineChartView
-	{
-		return ...; // color of selection view
-	}
-	
-	- (UIColor *)lineChartView:(JBLineChartView *)lineChartView selectionColorForLineAtLineIndex:(NSUInteger)lineIndex
-	{
-		return ...; // color of selected line
-	}
-		
-Lastly, a line chart's selection events are delegated back via:
-
-	- (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSUInteger)lineIndex horizontalIndex:(NSUInteger)horizontalIndex touchPoint:(CGPoint)touchPoint
-	{
-		// Update view
-	}
-
-	- (void)didUnselectLineInLineChartView:(JBLineChartView *)lineChartView
-	{
-		// Update view
-	}
-	
-The <b>touchPoint</b> is especially important as it allows you to add custom elements to your chart during  selection events. Refer to the demo project (<b>JBLineChartViewController</b>) to see how a tooltip can be used to display additional information during selection events.
+The nature of charting is to display all available information, unlike a UITableView, which can cache rows that are offscreen. JBChartView's performance will suffer if the number of data points exceed the  resolution of the device. The same issue exists with MKMapView, when hundreds of pins are supplied within a certain geographic area.  It's why Apple recommends clustering to avoid performance issues. As such, for large datasets, we recommend that your dataSource to supply a subset of points; clustering those that are close to one another. 
 	
 ## License