Skip to content

Add Cartage support and x label width fix #4

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add Cartage support and x label width fix #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2936ba
Add frameworkds
Igor-Palaguta Jan 31, 2016
19e7a2b
Fix Carthage build
Igor-Palaguta Jan 31, 2016
7e57702
Fix xLabel width
Igor-Palaguta Feb 1, 2016
8b0d62c
xLabel origin fix
Igor-Palaguta Feb 1, 2016
43e1fcd
Fixing umbrella headers
Igor-Palaguta Feb 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions NKWatchChart-iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
26 changes: 26 additions & 0 deletions NKWatchChart-watchOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
402 changes: 379 additions & 23 deletions NKWatchChartDemo.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions NKWatchChartDemo.xcodeproj/xcshareddata/xcschemes/NKWatchChart-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "785BBE321C5EAEF4001B6DD4"
BuildableName = "NKWatchChart.framework"
BlueprintName = "NKWatchChart-iOS"
ReferencedContainer = "container:NKWatchChartDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "785BBE321C5EAEF4001B6DD4"
BuildableName = "NKWatchChart.framework"
BlueprintName = "NKWatchChart-iOS"
ReferencedContainer = "container:NKWatchChartDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "785BBE321C5EAEF4001B6DD4"
BuildableName = "NKWatchChart.framework"
BlueprintName = "NKWatchChart-iOS"
ReferencedContainer = "container:NKWatchChartDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
80 changes: 80 additions & 0 deletions NKWatchChartDemo.xcodeproj/xcshareddata/xcschemes/NKWatchChart-watchOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "785BBE211C5EAED2001B6DD4"
BuildableName = "NKWatchChart.framework"
BlueprintName = "NKWatchChart-watchOS"
ReferencedContainer = "container:NKWatchChartDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "785BBE211C5EAED2001B6DD4"
BuildableName = "NKWatchChart.framework"
BlueprintName = "NKWatchChart-watchOS"
ReferencedContainer = "container:NKWatchChartDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "785BBE211C5EAED2001B6DD4"
BuildableName = "NKWatchChart.framework"
BlueprintName = "NKWatchChart-watchOS"
ReferencedContainer = "container:NKWatchChartDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
6 changes: 3 additions & 3 deletions NKWatchChartDemo/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
Expand Down
53 changes: 26 additions & 27 deletions WatchChart Extension/NKWatchChart/NKBarChart.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,41 +60,40 @@ - (void)setupDefaultValues
- (void)drawXLabels
{
_xLabelWidth = (_frame.size.width - _chartMargin * 2) / [_xLabels count];
int labelAddCount = 0;

int xValuesCount = ceilf((float)[_xLabels count] / (_xLabelSkip + 1));
CGFloat labelWidth = (_frame.size.width - _chartMargin * 2) / xValuesCount;
for (int index = 0; index < _xLabels.count; index++) {
labelAddCount += 1;

if (labelAddCount == _xLabelSkip) {
NSString *labelText = [_xLabels[index] description];

NSMutableParagraphStyle *priceParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
priceParagraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
priceParagraphStyle.alignment = NSTextAlignmentLeft;

NSMutableDictionary *attributesDictionary = [NSMutableDictionary dictionary];
[attributesDictionary setObject:_labelFont forKey:NSFontAttributeName];
[attributesDictionary setObject:_labelTextColor forKey:NSForegroundColorAttributeName];
[attributesDictionary setObject:priceParagraphStyle forKey:NSParagraphStyleAttributeName];

CGFloat labelXPosition = (index * _xLabelWidth + _chartMargin + _xLabelWidth /2.0 );

CGRect labelRect = CGRectMake(labelXPosition,
_frame.size.height - kXLabelHeight - _chartMargin + _labelMarginTop,
_xLabelWidth,
kXLabelHeight);
[labelText drawInRect:labelRect withAttributes:attributesDictionary];

labelAddCount = 0;

if ((index + 1) % _xLabelSkip != 0) {
continue;
}

NSString *labelText = [_xLabels[index] description];

NSMutableParagraphStyle *priceParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
priceParagraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
priceParagraphStyle.alignment = NSTextAlignmentCenter;

NSMutableDictionary *attributesDictionary = [NSMutableDictionary dictionary];
[attributesDictionary setObject:_labelFont forKey:NSFontAttributeName];
[attributesDictionary setObject:_labelTextColor forKey:NSForegroundColorAttributeName];
[attributesDictionary setObject:priceParagraphStyle forKey:NSParagraphStyleAttributeName];

CGFloat labelXPosition = index * _xLabelWidth + _chartMargin + _xLabelWidth / 2 - labelWidth / 2;

CGRect labelRect = CGRectMake(labelXPosition,
_frame.size.height - kXLabelHeight - _chartMargin + _labelMarginTop,
labelWidth,
kXLabelHeight);
[labelText drawInRect:labelRect withAttributes:attributesDictionary];
}

}

- (void)drawYLabels
{
[self processYMaxValue];

float sectionHeight = (_frame.size.height - _chartMargin * 2 - kXLabelHeight) / _yLabelSum;
for (int i = 0; i <= _yLabelSum; i++)
{
Expand Down
16 changes: 7 additions & 9 deletions WatchChart Extension/NKWatchChart/NKWatchChart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
//
// NKWatchChart.h
// NKWatchChartDemo
//
// Created by Peng on 8/6/15.
// Copyright © 2015 Peng. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

//! Project version number for NKWatchChart.
FOUNDATION_EXPORT double NKWatchChartVersionNumber;

//! Project version string for NKWatchChart.
FOUNDATION_EXPORT const unsigned char NKWatchChartVersionString[];

#import "NKColor.h"

Expand Down