master..5f83cb5 · huekit

git.iko.soy/huekit

13 files changed+15−167

unifiedsplit

.swift-version+1−1 .travis.yml−49 Example/Example.xcodeproj/project.pbxproj−2 Example/Example/Base.lproj/Main.storyboard+1−1 HueKit.podspec−14 HueKit.xcodeproj/project.pbxproj+5−12 HueKit.xcodeproj/xcshareddata/xcschemes/iOS.xcscheme−80 HueKit/Info.plist+1−1 HueKit/Model/HSV.swift+1−1 HueKit/Model/RGB.swift+1−1 HueKit/View/ColorBarPicker.swift+1−1 HueKit/View/ColorSquarePicker.swift+1−1 README.md+3−3

.swift-version+1−1

@@ -1 +1 @@

1−4.1

1+4.0

.travis.ymldeleted−49

@@ -1,49 +0,0 @@

1−language: objective-c

2−osx_image: xcode9.3

3−branches:

4− only:

5− - master

6−env:

7− global:

8− - LC_CTYPE=en_US.UTF-8

9− - LANG=en_US.UTF-8

10− - WORKSPACE=HueKit.xcworkspace

11− - IOS_FRAMEWORK_SCHEME="HueKit"

12− - EXAMPLE_SCHEME="Example"

13− matrix:

14−

15− - DESTINATION="OS=10.0,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="YES" CODE_COV="NO"

16− - DESTINATION="OS=11.3,name=iPad Pro (9.7-inch)" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="YES" CODE_COV="NO"

17−

18−script:

19− - set -o pipefail

20− - xcodebuild -version

21− - xcodebuild -showsdks

22−

23− # Build Framework in Debug and Run Tests if specified

24− - if [ $RUN_TESTS == "YES" ]; then

25− travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;

26− else

27− travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;

28− fi

29−

30− # Build Framework in Release and Run Tests if specified

31− - if [ $RUN_TESTS == "YES" ]; then

32− travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;

33− else

34− travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;

35− fi

36−

37− # Build Example in Debug if specified

38− - if [ $BUILD_EXAMPLE == "YES" ]; then

39− travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;

40− fi

41−

42− # Build and report code coverage if specified

43− - if [ $CODE_COV == "YES" ]; then

44− xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=YES ENABLE_TESTABILITY=YES -enableCodeCoverage YES test;

45− fi

46−

47−after_success:

48− - bash <(curl -s https://codecov.io/bash)

49−

Example/Example.xcodeproj/project.pbxproj−2

@@ -303,7 +303,6 @@

303303 CODE_SIGN_STYLE = Automatic;

304304 DEVELOPMENT_TEAM = 6G5LMQ72D8;

305305 INFOPLIST_FILE = Example/Info.plist;

306− IPHONEOS_DEPLOYMENT_TARGET = 10.0;

307306 LD_RUNPATH_SEARCH_PATHS = (

308307 "$(inherited)",

309308 "@executable_path/Frameworks",

@@ -322,7 +321,6 @@

322321 CODE_SIGN_STYLE = Automatic;

323322 DEVELOPMENT_TEAM = 6G5LMQ72D8;

324323 INFOPLIST_FILE = Example/Info.plist;

325− IPHONEOS_DEPLOYMENT_TARGET = 10.0;

326324 LD_RUNPATH_SEARCH_PATHS = (

327325 "$(inherited)",

328326 "@executable_path/Frameworks",

Example/Example/Base.lproj/Main.storyboard+1−1

@@ -1,5 +1,5 @@

11<?xml version="1.0" encoding="UTF-8"?>

2−<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8Fw-bv-Lqp">

2+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8Fw-bv-Lqp">

33 <device id="retina4_7" orientation="portrait">

44 <adaptation id="fullscreen"/>

55 </device>

HueKit.podspecdeleted−14

@@ -1,14 +0,0 @@

1−Pod::Spec.new do |s|

2− s.name = 'HueKit'

3− s.version = '1.0.1'

4− s.license = 'MIT'

5− s.summary = 'A UI framework for iOS that provides components and utilities for building color pickers.'

6− s.homepage = 'https://github.com/louisdh/huekit'

7− s.social_media_url = 'http://twitter.com/LouisDhauwe'

8− s.authors = { 'Louis D\'hauwe' => 'louisdhauwe@silverfox.be' }

9− s.source = { :git => 'https://github.com/louisdh/huekit.git', :tag => s.version }

10−

11− s.ios.deployment_target = '10.0'

12−

13− s.source_files = 'HueKit/**/*.swift'

14−end

HueKit.xcodeproj/project.pbxproj+5−12

@@ -151,13 +151,14 @@

151151 isa = PBXProject;

152152 attributes = {

153153 LastSwiftUpdateCheck = 0930;

154− LastUpgradeCheck = 0930;

154+ LastUpgradeCheck = 0900;

155155 ORGANIZATIONNAME = "Silver Fox";

156156 TargetAttributes = {

157157 BE5C1E161F3266B600B0080C = {

158158 CreatedOnToolsVersion = 8.3.3;

159+ DevelopmentTeam = 6G5LMQ72D8;

159160 LastSwiftMigration = 0900;

160− ProvisioningStyle = Manual;

161+ ProvisioningStyle = Automatic;

161162 };

162163 };

163164 };

@@ -226,7 +227,6 @@

226227 CLANG_WARN_BOOL_CONVERSION = YES;

227228 CLANG_WARN_COMMA = YES;

228229 CLANG_WARN_CONSTANT_CONVERSION = YES;

229− CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;

230230 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

231231 CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

232232 CLANG_WARN_EMPTY_BODY = YES;

@@ -234,7 +234,6 @@

234234 CLANG_WARN_INFINITE_RECURSION = YES;

235235 CLANG_WARN_INT_CONVERSION = YES;

236236 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;

237− CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;

238237 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;

239238 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

240239 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

@@ -288,7 +287,6 @@

288287 CLANG_WARN_BOOL_CONVERSION = YES;

289288 CLANG_WARN_COMMA = YES;

290289 CLANG_WARN_CONSTANT_CONVERSION = YES;

291− CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;

292290 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

293291 CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

294292 CLANG_WARN_EMPTY_BODY = YES;

@@ -296,7 +294,6 @@

296294 CLANG_WARN_INFINITE_RECURSION = YES;

297295 CLANG_WARN_INT_CONVERSION = YES;

298296 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;

299− CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;

300297 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;

301298 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

302299 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

@@ -334,10 +331,9 @@

334331 buildSettings = {

335332 CLANG_ENABLE_MODULES = YES;

336333 CODE_SIGN_IDENTITY = "";

337− CODE_SIGN_STYLE = Manual;

338334 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

339335 DEFINES_MODULE = YES;

340− DEVELOPMENT_TEAM = "";

336+ DEVELOPMENT_TEAM = 6G5LMQ72D8;

341337 DYLIB_COMPATIBILITY_VERSION = 1;

342338 DYLIB_CURRENT_VERSION = 1;

343339 DYLIB_INSTALL_NAME_BASE = "@rpath";

@@ -347,7 +343,6 @@

347343 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

348344 PRODUCT_BUNDLE_IDENTIFIER = be.silverfox.HueKit;

349345 PRODUCT_NAME = "$(TARGET_NAME)";

350− PROVISIONING_PROFILE_SPECIFIER = "";

351346 SKIP_INSTALL = YES;

352347 SWIFT_OPTIMIZATION_LEVEL = "-Onone";

353348 SWIFT_SWIFT3_OBJC_INFERENCE = Default;

@@ -360,9 +355,8 @@

360355 buildSettings = {

361356 CLANG_ENABLE_MODULES = YES;

362357 CODE_SIGN_IDENTITY = "";

363− CODE_SIGN_STYLE = Manual;

364358 DEFINES_MODULE = YES;

365− DEVELOPMENT_TEAM = "";

359+ DEVELOPMENT_TEAM = 6G5LMQ72D8;

366360 DYLIB_COMPATIBILITY_VERSION = 1;

367361 DYLIB_CURRENT_VERSION = 1;

368362 DYLIB_INSTALL_NAME_BASE = "@rpath";

@@ -372,7 +366,6 @@

372366 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

373367 PRODUCT_BUNDLE_IDENTIFIER = be.silverfox.HueKit;

374368 PRODUCT_NAME = "$(TARGET_NAME)";

375− PROVISIONING_PROFILE_SPECIFIER = "";

376369 SKIP_INSTALL = YES;

377370 SWIFT_SWIFT3_OBJC_INFERENCE = Default;

378371 SWIFT_VERSION = 4.0;

HueKit.xcodeproj/xcshareddata/xcschemes/iOS.xcschemedeleted−80

@@ -1,80 +0,0 @@

1−<?xml version="1.0" encoding="UTF-8"?>

2−<Scheme

3− LastUpgradeVersion = "0930"

4− version = "1.3">

5− <BuildAction

6− parallelizeBuildables = "YES"

7− buildImplicitDependencies = "YES">

8− <BuildActionEntries>

9− <BuildActionEntry

10− buildForTesting = "YES"

11− buildForRunning = "YES"

12− buildForProfiling = "YES"

13− buildForArchiving = "YES"

14− buildForAnalyzing = "YES">

15− <BuildableReference

16− BuildableIdentifier = "primary"

17− BlueprintIdentifier = "BE5C1E161F3266B600B0080C"

18− BuildableName = "HueKit.framework"

19− BlueprintName = "HueKit"

20− ReferencedContainer = "container:HueKit.xcodeproj">

21− </BuildableReference>

22− </BuildActionEntry>

23− </BuildActionEntries>

24− </BuildAction>

25− <TestAction

26− buildConfiguration = "Debug"

27− selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"

28− selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"

29− shouldUseLaunchSchemeArgsEnv = "YES">

30− <Testables>

31− </Testables>

32− <AdditionalOptions>

33− </AdditionalOptions>

34− </TestAction>

35− <LaunchAction

36− buildConfiguration = "Debug"

37− selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"

38− selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"

39− launchStyle = "0"

40− useCustomWorkingDirectory = "NO"

41− ignoresPersistentStateOnLaunch = "NO"

42− debugDocumentVersioning = "YES"

43− debugServiceExtension = "internal"

44− allowLocationSimulation = "YES">

45− <MacroExpansion>

46− <BuildableReference

47− BuildableIdentifier = "primary"

48− BlueprintIdentifier = "BE5C1E161F3266B600B0080C"

49− BuildableName = "HueKit.framework"

50− BlueprintName = "HueKit"

51− ReferencedContainer = "container:HueKit.xcodeproj">

52− </BuildableReference>

53− </MacroExpansion>

54− <AdditionalOptions>

55− </AdditionalOptions>

56− </LaunchAction>

57− <ProfileAction

58− buildConfiguration = "Release"

59− shouldUseLaunchSchemeArgsEnv = "YES"

60− savedToolIdentifier = ""

61− useCustomWorkingDirectory = "NO"

62− debugDocumentVersioning = "YES">

63− <MacroExpansion>

64− <BuildableReference

65− BuildableIdentifier = "primary"

66− BlueprintIdentifier = "BE5C1E161F3266B600B0080C"

67− BuildableName = "HueKit.framework"

68− BlueprintName = "HueKit"

69− ReferencedContainer = "container:HueKit.xcodeproj">

70− </BuildableReference>

71− </MacroExpansion>

72− </ProfileAction>

73− <AnalyzeAction

74− buildConfiguration = "Debug">

75− </AnalyzeAction>

76− <ArchiveAction

77− buildConfiguration = "Release"

78− revealArchiveInOrganizer = "YES">

79− </ArchiveAction>

80−</Scheme>

HueKit/Info.plist+1−1

@@ -15,7 +15,7 @@

1515 <key>CFBundlePackageType</key>

1616 <string>FMWK</string>

1717 <key>CFBundleShortVersionString</key>

18− <string>1.0.1</string>

18+ <string>1.0</string>

1919 <key>CFBundleVersion</key>

2020 <string>$(CURRENT_PROJECT_VERSION)</string>

2121 <key>NSPrincipalClass</key>

HueKit/Model/HSV.swift+1−1

@@ -9,7 +9,7 @@

99import Foundation

1010import CoreGraphics

1111

12−public struct HSV: Hashable {

12+public struct HSV {

1313 /// In degrees (range 0...360)

1414 public var h: CGFloat

1515

HueKit/Model/RGB.swift+1−1

@@ -9,7 +9,7 @@

99import Foundation

1010import CoreGraphics

1111

12−public struct RGB: Hashable {

12+public struct RGB {

1313 /// In range 0...1

1414 public var r: CGFloat

1515

HueKit/View/ColorBarPicker.swift+1−1

@@ -62,7 +62,7 @@ open class ColorBarPicker: UIControl {

6262 }

6363 }

6464

65− open lazy var colorBarView: ColorBarView = {

65+ private lazy var colorBarView: ColorBarView = {

6666 return ColorBarView()

6767 }()

6868

HueKit/View/ColorSquarePicker.swift+1−1

@@ -22,7 +22,7 @@ open class ColorSquarePicker: UIControl {

2222 return ColorSquareView()

2323 }()

2424

25− open lazy var indicator: ColorIndicatorView = {

25+ private lazy var indicator: ColorIndicatorView = {

2626

2727 let size = CGSize(width: self.indicatorSizeInactive, height: self.indicatorSizeInactive)

2828 let indicatorRect = CGRect(origin: .zero, size: size)

README.md+3−3

@@ -5,7 +5,7 @@

55<p align="center">

66<a href="https://travis-ci.org/louisdh/huekit"><img src="https://travis-ci.org/louisdh/huekit.svg?branch=master" style="max-height: 300px;" alt="Build Status"/></a>

77<br>

8−<a href="https://developer.apple.com/swift/"><img src="https://img.shields.io/badge/Swift-4.1-orange.svg?style=flat" style="max-height: 300px;" alt="Swift"/></a>

8+<a href="https://developer.apple.com/swift/"><img src="https://img.shields.io/badge/Swift-4.0-orange.svg?style=flat" style="max-height: 300px;" alt="Swift"/></a>

99<a href="https://cocoapods.org/pods/HueKit"><img src="https://img.shields.io/cocoapods/v/HueKit.svg" style="max-height: 300px;" alt="Pod Version"/></a>

1010<a href="https://github.com/Carthage/Carthage"><img src="https://img.shields.io/badge/Carthage-compatible-4bc51d.svg?style=flat" style="max-height: 300px;" alt="Carthage Compatible"/></a>

1111<img src="https://img.shields.io/badge/platform-iOS-lightgrey.svg" style="max-height: 300px;" alt="Platform: iOS">

@@ -23,7 +23,7 @@

2323HueKit is a UI framework for iOS that provides components and utilities for building color pickers. Since each app may want a custom color picker, the design of this framework is geared towards reusability and allows for great customization.

2424

2525### Components

26−All components are marked `open`, so they can be subclassed. Also, all components are marked `@IBDesignable`, so they can be previewed in Interface Builder. Components that provide user interaction are subclassed from `UIControl`, you can observe a change in value by using `@IBAction`.

26+All components are marked `open`, so they can be inherited from. Also, all components are marked `@IBDesignable`, so they can be previewed in Interface Builder. Components that provide user interaction are subclassed from `UIControl`, you can observe a change in value by using `@IBAction`.

2727

2828#### ColorBarPicker

2929![](readme-resources/components/ColorBarPicker.png)

@@ -67,7 +67,7 @@ Run ```carthage update``` to build the framework and drag the built ```HueKit.fr

6767## Requirements

6868

6969* iOS 10.0+

70−* Xcode 9.3+

70+* Xcode 9.0+

7171

7272## Todo

7373