Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Add a segmented control accessory type #141

Merged
merged 3 commits into from
Feb 14, 2019
Merged

Add a segmented control accessory type #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f953e0c
Add a .segmentedControl accessory
yeahphil Jan 19, 2019
76ca552
Add segmented control row to example app
yeahphil Jan 19, 2019
b1e1835
Make SegmentedControlAccessory open
yeahphil Jan 19, 2019
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
3 changes: 3 additions & 0 deletions Example/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ class ViewController: TableViewController {
Row(text: "UISwitch", accessory: .switchToggle(value: false) { [unowned self] newValue in
self.showAlert(title: "Switch Toggled: \(newValue ? "On" : "Off")")
}),
Row(text: "Segmented control", accessory: .segmentedControl(items: ["Left", "Middle", "Right"], selectedIndex: 1) { [unowned self] (i, str) in
self.showAlert(title: "Segment \"\(str!)\" at index \(i) selected")
}),
Row(text: "Custom View", accessory: .view(customAccessory), accessibilityIdentifier: "CustomView")
], footer: "Try tapping the ⓘ buttons."),
Section(header: "Selection", rows: [
Expand Down
4 changes: 4 additions & 0 deletions Static.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
36748D591B5034EC0046F207 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 36748D581B5034EC0046F207 /* Assets.xcassets */; };
36748D5C1B5034EC0046F207 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 36748D5A1B5034EC0046F207 /* LaunchScreen.storyboard */; };
39DC804A1BD96BB0001F04CD /* NibTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39DC80491BD96BB0001F04CD /* NibTableViewCell.swift */; };
4AEF73EB21F2B802004927DA /* SegmentedControlAccessory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AEF73EA21F2B802004927DA /* SegmentedControlAccessory.swift */; };
A706253D1BC81C1400E471EF /* CustomTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A706253B1BC81C1400E471EF /* CustomTableViewCell.swift */; };
A706253E1BC81C1400E471EF /* NibTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A706253C1BC81C1400E471EF /* NibTableViewCell.xib */; };
B84E13F720555E26001D6C99 /* SwitchAccessory.swift in Sources */ = {isa = PBXBuildFile; fileRef = B84E13F620555E26001D6C99 /* SwitchAccessory.swift */; };
Expand Down Expand Up @@ -89,6 +90,7 @@
36799F981B41C857009A9D16 /* Cell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cell.swift; sourceTree = "<group>"; };
36C8FE9A1B4EECF30004DA5B /* TableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = "<group>"; };
39DC80491BD96BB0001F04CD /* NibTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NibTableViewCell.swift; sourceTree = "<group>"; };
4AEF73EA21F2B802004927DA /* SegmentedControlAccessory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegmentedControlAccessory.swift; sourceTree = "<group>"; };
A706253B1BC81C1400E471EF /* CustomTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTableViewCell.swift; sourceTree = "<group>"; };
A706253C1BC81C1400E471EF /* NibTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NibTableViewCell.xib; sourceTree = "<group>"; };
B84E13F620555E26001D6C99 /* SwitchAccessory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchAccessory.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -150,6 +152,7 @@
21826AC61B3F51D000AA9641 /* Section.swift */,
21826AC51B3F51D000AA9641 /* Row.swift */,
B84E13F620555E26001D6C99 /* SwitchAccessory.swift */,
4AEF73EA21F2B802004927DA /* SegmentedControlAccessory.swift */,
366AB2E91B4DFCDD002C4717 /* Cells */,
21826AAF1B3F51A100AA9641 /* Info.plist */,
366AB2ED1B4EE1A7002C4717 /* Tests */,
Expand Down Expand Up @@ -342,6 +345,7 @@
files = (
21F219631D10B7B9001EC0F5 /* SubtitleCell.swift in Sources */,
21F219611D10B7A9001EC0F5 /* Value1Cell.swift in Sources */,
4AEF73EB21F2B802004927DA /* SegmentedControlAccessory.swift in Sources */,
B84E13F720555E26001D6C99 /* SwitchAccessory.swift in Sources */,
21826ACA1B3F51D000AA9641 /* Row.swift in Sources */,
21F219671D10B7CF001EC0F5 /* Section.swift in Sources */,
Expand Down
8 changes: 8 additions & 0 deletions Static.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
6 changes: 6 additions & 0 deletions Static/Row.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import UIKit
/// Row or Accessory selection callback.
public typealias Selection = () -> Void
public typealias ValueChange = (Bool) -> ()
public typealias SegmentedControlValueChange = (Int, Any?) -> ()

/// Representation of a table row.
public struct Row: Hashable, Equatable {
Expand Down Expand Up @@ -32,6 +33,9 @@ public struct Row: Hashable, Equatable {

/// Switch. Handles value change.
case switchToggle(value: Bool, ValueChange)

/// Segmented control. Handles value change.
case segmentedControl(items: [Any], selectedIndex: Int, SegmentedControlValueChange)

/// Custom view
case view(UIView)
Expand All @@ -55,6 +59,8 @@ public struct Row: Hashable, Equatable {
return SwitchAccessory(initialValue: value, valueChange: valueChange)
case .checkmarkPlaceholder:
return UIView(frame: CGRect(x: 0, y: 0, width: 24, height: 24))
case .segmentedControl(let items, let selectedIndex, let valueChange):
return SegmentedControlAccessory(items: items, selectedIndex: selectedIndex, valueChange: valueChange)
default: return nil
}
}
Expand Down
26 changes: 26 additions & 0 deletions Static/SegmentedControlAccessory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import UIKit

open class SegmentedControlAccessory: UISegmentedControl {
public typealias ValueChange = (Int, Any?) -> ()
var valueChange: ValueChange? = nil

public init(items: [Any], selectedIndex: Int, valueChange: (ValueChange)? = nil) {
super.init(items: items)

self.valueChange = valueChange
self.selectedSegmentIndex = selectedIndex
addTarget(self, action: #selector(valueChanged), for: .valueChanged)
}

public init() {super.init(frame: .zero)}
public override init(frame: CGRect) {super.init(frame: frame)}

public required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

@objc func valueChanged() {
let segmentContents: Any? = titleForSegment(at: selectedSegmentIndex) ?? imageForSegment(at: selectedSegmentIndex)
valueChange?(selectedSegmentIndex, segmentContents)
}
}