Skip to content

Commit

Permalink
16 allow custom toolbaritems (#17)
Browse files Browse the repository at this point in the history
* WIP: Opening up toolbar for customizations

Add McPickerBarButtonItems and tests

* Start using McPickerBarButtonItem’s

* Use McPickerBarButtonItem in example

Update README

* Bump release version to 0.5.0 🚀
  • Loading branch information
kmcgill88 committed Sep 18, 2017
1 parent ec8c218 commit 9fdac4a
Show file tree
Hide file tree
Showing 11 changed files with 363 additions and 48 deletions.
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
line_length: 200
cyclomatic_complexity: 5
file_length:
warning: 500
error: 1200
4 changes: 4 additions & 0 deletions Example/McPicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
607FACEC1AFB9204008FA782 /* McPickerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* McPickerTests.swift */; };
D1E12A0ABE0D9540DA0C439E /* Pods_McPicker_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B6C05EDB200F71455915F2A /* Pods_McPicker_Example.framework */; };
E7E851651F6B755400BC6A21 /* McPickerBarButtonItemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7E851631F6B736000BC6A21 /* McPickerBarButtonItemTests.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -45,6 +46,7 @@
72A6ECE6754F0D53A01840EE /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
ABDF864FC68406B6ADCF5DB4 /* Pods-McPicker_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-McPicker_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-McPicker_Tests/Pods-McPicker_Tests.debug.xcconfig"; sourceTree = "<group>"; };
D9855A22F5DA80A1D2B923E0 /* Pods_McPicker_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_McPicker_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E7E851631F6B736000BC6A21 /* McPickerBarButtonItemTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = McPickerBarButtonItemTests.swift; sourceTree = "<group>"; };
EC9DECD62B7A481490DA18FF /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
ED86DD62AC5C0FB422C21828 /* Pods-McPicker_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-McPicker_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-McPicker_Example/Pods-McPicker_Example.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -127,6 +129,7 @@
isa = PBXGroup;
children = (
607FACEB1AFB9204008FA782 /* McPickerTests.swift */,
E7E851631F6B736000BC6A21 /* McPickerBarButtonItemTests.swift */,
607FACE91AFB9204008FA782 /* Supporting Files */,
);
path = Tests;
Expand Down Expand Up @@ -384,6 +387,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E7E851651F6B755400BC6A21 /* McPickerBarButtonItemTests.swift in Sources */,
607FACEC1AFB9204008FA782 /* McPickerTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACE41AFB9204008FA782"
BuildableName = "McPicker_Tests.xctest"
BlueprintName = "McPicker_Tests"
ReferencedContainer = "container:McPicker.xcodeproj">
</BuildableReference>
</TestableReference>
</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">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion Example/McPicker/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="zqw-fC-zaf">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="zqw-fC-zaf">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
Expand Down
7 changes: 7 additions & 0 deletions Example/McPicker/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ class ViewController: UIViewController {
let mcPicker = McPicker(data: data)
mcPicker.label = customLabel // Set your custom label
mcPicker.toolbarItemsFont = UIFont(name:"American Typewriter", size: 17)!

let fixedSpace = McPickerBarButtonItem.fixedSpace(width: 20.0)
let flexibleSpace = McPickerBarButtonItem.flexibleSpace()
let fireButton = McPickerBarButtonItem.done(mcPicker: mcPicker, title: "Fire!!!") // Set custom Text
let cancelButton = McPickerBarButtonItem.cancel(mcPicker: mcPicker, barButtonSystemItem: .cancel) // or system items
mcPicker.setToolbarItems(items: [fixedSpace, cancelButton, flexibleSpace, fireButton, fixedSpace])

mcPicker.toolbarButtonsColor = .white
mcPicker.toolbarBarTintColor = .darkGray
mcPicker.pickerBackgroundColor = .gray
Expand Down
107 changes: 107 additions & 0 deletions Example/Tests/McPickerBarButtonItemTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/*
Copyright (c) 2017 Kevin McGill <[email protected]>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import UIKit
import XCTest
@testable import McPicker

// swiftlint:disable nesting
// swiftlint:disable force_cast
class McPickerBarButtonItemTests: XCTestCase {

let mcPicker = McPicker(data: [["Bob", "Bill"]])

func testInitDone_noTitleDefaultStyle() {
let item = McPickerBarButtonItem.done(mcPicker: mcPicker)

XCTAssertNil(item.title)
XCTAssertTrue(item.style == .done)
XCTAssertTrue(item.target as! McPicker == mcPicker)
XCTAssertTrue(item.action == #selector(McPicker.done))
}

func testInitDone_noTitleCustomStyle() {
let item = McPickerBarButtonItem.done(mcPicker: mcPicker, barButtonSystemItem: UIBarButtonSystemItem.save)

XCTAssertNil(item.title)
XCTAssertTrue(item.style == .plain)
XCTAssertTrue(item.target as! McPicker == mcPicker)
XCTAssertTrue(item.action == #selector(McPicker.done))
}

func testInitDone_withTitle() {
let title = "My Custom Title"
let item = McPickerBarButtonItem.done(mcPicker: mcPicker, title: title)

XCTAssertTrue(item.title == title)
XCTAssertTrue(item.style == .plain)
XCTAssertTrue(item.target as! McPicker == mcPicker)
XCTAssertTrue(item.action == #selector(McPicker.done))
}

func testInitCancel_noTitle() {
let item = McPickerBarButtonItem.cancel(mcPicker: mcPicker)

XCTAssertNil(item.title)
XCTAssertTrue(item.style == .plain)
XCTAssertTrue(item.target as! McPicker == mcPicker)
XCTAssertTrue(item.action == #selector(McPicker.cancel))
}

func testInitCancel_noTitleCustomStyle() {
let item = McPickerBarButtonItem.cancel(mcPicker: mcPicker, barButtonSystemItem: UIBarButtonSystemItem.save)

XCTAssertNil(item.title)
XCTAssertTrue(item.style == .plain)
XCTAssertTrue(item.target as! McPicker == mcPicker)
XCTAssertTrue(item.action == #selector(McPicker.cancel))
}

func testInitCancel_withTitle() {
let title = "My Custom Title"
let item = McPickerBarButtonItem.cancel(mcPicker: mcPicker, title: title)

XCTAssertTrue(item.title == title)
XCTAssertTrue(item.style == .plain)
XCTAssertTrue(item.target as! McPicker == mcPicker)
XCTAssertTrue(item.action == #selector(McPicker.cancel))
}

func testInitFlexibleSpace() {
let item = McPickerBarButtonItem.flexibleSpace()

XCTAssertTrue(item.style == .plain)
XCTAssertNil(item.target)
XCTAssertNil(item.action)
}

func testInitFixedSpace() {
let expectedWidth: CGFloat = 2.0
let item = McPickerBarButtonItem.fixedSpace(width: expectedWidth)

XCTAssertTrue(item.width == expectedWidth)
XCTAssertTrue(item.style == .plain)
XCTAssertNil(item.title)
XCTAssertNil(item.target)
XCTAssertNil(item.action)
}
}
60 changes: 47 additions & 13 deletions Example/Tests/McPickerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,22 @@ class McPickerTests: XCTestCase {

XCTAssertEqual(1, mcPicker.gestureRecognizers?.count)
XCTAssertEqual(5, mcPicker.toolbar.items?.count)
XCTAssertEqual(mcPicker.fixedSpace.style, mcPicker.toolbar.items?[0].style)
XCTAssertEqual(mcPicker.cancelBarButton, mcPicker.toolbar.items?[1])
XCTAssertEqual(mcPicker.flexibleSpace.style, mcPicker.toolbar.items?[2].style)
XCTAssertEqual(mcPicker.doneBarButton, mcPicker.toolbar.items?[3])
XCTAssertEqual(mcPicker.fixedSpace.style, mcPicker.toolbar.items?[0].style)

let fixedSpace = mcPicker.toolbar.items?[0] as! McPickerBarButtonItem
XCTAssertNil(fixedSpace.target)
XCTAssertNil(fixedSpace.action)

let cancelBarButton = mcPicker.toolbar.items?[1] as! McPickerBarButtonItem
XCTAssertEqual(cancelBarButton.target as! TestMcPicker, mcPicker)
XCTAssertEqual(cancelBarButton.action!, #selector(TestMcPicker.cancel))

let flexibleSpace = mcPicker.toolbar.items?[2] as! McPickerBarButtonItem
XCTAssertNil(flexibleSpace.target)
XCTAssertNil(flexibleSpace.action)

let doneBarButton = mcPicker.toolbar.items?[3] as! McPickerBarButtonItem
XCTAssertEqual(doneBarButton.target as! TestMcPicker, mcPicker)
XCTAssertEqual(doneBarButton.action!, #selector(TestMcPicker.done))

XCTAssertEqual(mcPicker.backgroundColor, UIColor.black.withAlphaComponent(0.75))
XCTAssertEqual(mcPicker.backgroundView.backgroundColor, UIColor.white)
Expand All @@ -74,51 +85,58 @@ class McPickerTests: XCTestCase {
XCTAssertEqual(data.first?.first, mcPicker.pickerSelection[0])

XCTAssertNil(mcPicker.mcPickerPopoverViewController)
XCTAssertNil(mcPicker.showsSelectionIndicator)
}

func testSetToolbarButtonsColorSetsCancelAndDone() {
// Given
//
let mcPicker = McPicker(data: data)
let cancelBarButton = mcPicker.toolbar.items?[1] as! McPickerBarButtonItem
let doneBarButton = mcPicker.toolbar.items?[3] as! McPickerBarButtonItem

// When
//
mcPicker.toolbarButtonsColor = UIColor.purple

// Then
//
XCTAssertEqual(UIColor.purple, mcPicker.cancelBarButton.tintColor)
XCTAssertEqual(UIColor.purple, mcPicker.doneBarButton.tintColor)
XCTAssertEqual(UIColor.purple, cancelBarButton.tintColor)
XCTAssertEqual(UIColor.purple, doneBarButton.tintColor)
}

func testSetToolbarDoneButtonsColorSetsDone() {
// Given
//
let mcPicker = McPicker(data: data)
let cancelBarButton = mcPicker.toolbar.items?[1] as! McPickerBarButtonItem
let doneBarButton = mcPicker.toolbar.items?[3] as! McPickerBarButtonItem

// When
//
mcPicker.toolbarDoneButtonColor = UIColor.purple

// Then
//
XCTAssertNil(mcPicker.cancelBarButton.tintColor)
XCTAssertEqual(UIColor.purple, mcPicker.doneBarButton.tintColor)
XCTAssertNil(cancelBarButton.tintColor)
XCTAssertEqual(UIColor.purple, doneBarButton.tintColor)
}

func testSetToolbarCancelButtonsColorSetsCancel() {
// Given
//
let mcPicker = McPicker(data: data)
let cancelBarButton = mcPicker.toolbar.items?[1] as! McPickerBarButtonItem
let doneBarButton = mcPicker.toolbar.items?[3] as! McPickerBarButtonItem

// When
//
mcPicker.toolbarCancelButtonColor = UIColor.purple

// Then
//
XCTAssertEqual(UIColor.purple, mcPicker.cancelBarButton.tintColor)
XCTAssertNil(mcPicker.doneBarButton.tintColor)
XCTAssertEqual(UIColor.purple, cancelBarButton.tintColor)
XCTAssertNil(doneBarButton.tintColor)
}

func testSetToolbarCancelButtonColor() {
Expand All @@ -140,6 +158,8 @@ class McPickerTests: XCTestCase {
// Given
//
let mcPicker = McPicker(data: data)
let cancelBarButton = mcPicker.toolbar.items?[1] as! McPickerBarButtonItem
let doneBarButton = mcPicker.toolbar.items?[3] as! McPickerBarButtonItem
let expectedFont = UIFont(name:"American Typewriter", size: 17)!

// When
Expand All @@ -148,8 +168,8 @@ class McPickerTests: XCTestCase {

// Then
//
XCTAssertEqual(expectedFont, mcPicker.cancelBarButton.titleTextAttributes(for: .normal)?[NSFontAttributeName] as! UIFont)
XCTAssertEqual(expectedFont, mcPicker.doneBarButton.titleTextAttributes(for: .normal)?[NSFontAttributeName] as! UIFont)
XCTAssertEqual(expectedFont, cancelBarButton.titleTextAttributes(for: .normal)?[NSFontAttributeName] as! UIFont)
XCTAssertEqual(expectedFont, doneBarButton.titleTextAttributes(for: .normal)?[NSFontAttributeName] as! UIFont)
}

func testSetPickerBackgroundColor() {
Expand Down Expand Up @@ -251,4 +271,18 @@ class McPickerTests: XCTestCase {
XCTAssertEqual("Miss", mcPicker.pickerSelection[0]!)
XCTAssertEqual("Kibby", mcPicker.pickerSelection[1]!)
}

func testPickerCanSetShowsSelectionIndicator() {
// Given
//
let mcPicker = McPicker(data: data)

// When
//
mcPicker.showsSelectionIndicator = true

// Then
//
XCTAssertTrue(mcPicker.showsSelectionIndicator!)
}
}
2 changes: 1 addition & 1 deletion McPicker.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'McPicker'
s.version = '0.4.0'
s.version = '0.5.0'
s.summary = 'McPicker is a UIPickerView drop-in solution with animations that is rotation ready.'

s.description = <<-DESC
Expand Down
Loading

0 comments on commit 9fdac4a

Please sign in to comment.