Skip to content

Commit bc193c7

Browse files
bcylinbcylin
committed
Merge branch 'release/0.9.1'
2 parents 21c3aaf + a444f17 commit bc193c7

29 files changed

+214
-104
lines changed

‎.codecov.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
coverage:
2-
ignore:
3-
- "Carthage/**/*"
4-
- "Example*/**/*"
5-
- "*Tests/**/*"
6-
- "Pods/**/*"
2+
status:
3+
patch: off
4+
ignore:
5+
- "Carthage/**/*"
6+
- "Example*/**/*"
7+
- "*Tests/**/*"
8+
- "Pods/**/*"

‎.jazzy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ github_url: https://github.com/bcylin/QuickTableViewController
55
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/develop
66
xcodebuild_arguments: [-project, QuickTableViewController.xcodeproj, -scheme, QuickTableViewController-iOS]
77
module: QuickTableViewController
8-
module_version: 0.9.0
8+
module_version: 0.9.1
99
output: docs/output
1010
theme: fullwidth
1111
skip_undocumented: true

‎.slather.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.3
1+
4.1

‎.swiftlint.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ disabled_rules:
22
- cyclomatic_complexity
33
- force_cast
44
- function_body_length
5-
- valid_docs
5+
- identifier_name
66
- vertical_whitespace
77
opt_in_rules:
8-
- attributes
98
- closure_end_indentation
109
- closure_spacing
1110
- conditional_returns_on_newline
@@ -29,10 +28,11 @@ opt_in_rules:
2928
- unneeded_parentheses_in_closure_argument
3029
- vertical_parameter_alignment_on_call
3130
included:
32-
- Example
33-
- ExampleUITests
34-
- QuickTableViewControllerTests
35-
- Source
31+
- "Example-iOS"
32+
- "Example-iOSUITests"
33+
- "QuickTableViewController-iOS"
34+
- "QuickTableViewController-iOSTests"
35+
- "Source"
3636
excluded:
3737
- Carthage
3838
- Pods

‎.travis.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9.2
2+
osx_image: xcode9.3beta
33
matrix:
44
include:
55
- env: VERSION=latest
@@ -16,9 +16,10 @@ install:
1616
before_script:
1717
- if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
1818
script:
19-
- bundle exec rake ci:test[QuickTableViewController-iOS]
19+
- bundle exec rake "ci:build[QuickTableViewController-iOS, 3.0]"
20+
- bundle exec rake "ci:test[QuickTableViewController-iOS]"
2021
- bash <(curl -s https://codecov.io/bash) -cF ios -J "QuickTableViewController"
21-
- bundle exec rake ci:test[Example-iOS]
22+
- bundle exec rake "ci:test[Example-iOS]"
2223
- make -B carthage
2324
- make -B docs
2425
after_success:

‎Brewfile‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## v0.9.1
4+
5+
#### Fixes
6+
7+
* Fix the property setter in `RadioSection` and change `Row` to a class protocol, [#14](https://github.com/bcylin/QuickTableViewController/pull/14) by [@z3bi](https://github.com/z3bi)
8+
39
## v0.9.0
410

511
#### Breaking

‎Example-iOS/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.9.0</string>
20+
<string>0.9.1</string>
2121
<key>CFBundleVersion</key>
2222
<string>101</string>
2323
<key>LSRequiresIPhoneOS</key>

‎Example-iOS/ViewControllers/CustomizationViewController.swift‎

Lines changed: 70 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,30 +56,83 @@ internal final class CustomizationViewController: QuickTableViewController {
5656
debugging,
5757

5858
Section(title: "Switch", rows: [
59-
SwitchRow<CustomSwitchCell>(title: "SwitchRow\n<CustomSwitchCell>", switchValue: true, action: weakify(self, type(of: self).log)),
60-
CustomSwitchRow<SwitchCell>(title: "CustomSwitchRow\n<SwitchCell>", switchValue: false, action: weakify(self, type(of: self).log))
59+
SwitchRow<CustomSwitchCell>(
60+
title: "SwitchRow\n<CustomSwitchCell>",
61+
switchValue: true,
62+
customization: set(label: "0-0"),
63+
action: weakify(self, type(of: self).log)
64+
),
65+
CustomSwitchRow<SwitchCell>(
66+
title: "CustomSwitchRow\n<SwitchCell>",
67+
switchValue: false,
68+
customization: set(label: "0-1"),
69+
action: weakify(self, type(of: self).log)
70+
)
6171
]),
6272

6373
Section(title: "Tap Action", rows: [
64-
TapActionRow<CustomTapActionCell>(title: "TapActionRow\n<CustomTapActionCell>", action: weakify(self, type(of: self).log)),
65-
CustomTapActionRow<TapActionCell>(title: "CustomTapActionRow\n<TapActionCell>", action: weakify(self, type(of: self).log))
74+
TapActionRow<CustomTapActionCell>(
75+
title: "TapActionRow\n<CustomTapActionCell>",
76+
customization: set(label: "1-0"),
77+
action: weakify(self, type(of: self).log)
78+
),
79+
CustomTapActionRow<TapActionCell>(
80+
title: "CustomTapActionRow\n<TapActionCell>",
81+
customization: set(label: "1-1"),
82+
action: weakify(self, type(of: self).log)
83+
)
6684
]),
6785

6886
Section(title: "Navigation", rows: [
69-
NavigationRow(title: "NavigationRow", subtitle: .none, action: weakify(self, type(of: self).log)),
70-
NavigationRow<CustomCell>(title: "NavigationRow<CustomCell>", subtitle: .belowTitle(".subtitle"), action: weakify(self, type(of: self).log)),
71-
CustomNavigationRow(title: "CustomNavigationRow", subtitle: .rightAligned(".value1"), action: weakify(self, type(of: self).log)),
72-
CustomNavigationRow<CustomCell>(title: "CustomNavigationRow<CustomCell>", subtitle: .leftAligned(".value2"), action: weakify(self, type(of: self).log))
87+
NavigationRow(
88+
title: "NavigationRow",
89+
subtitle: .none,
90+
customization: set(label: "2-0"),
91+
action: weakify(self, type(of: self).log)),
92+
NavigationRow<CustomCell>(
93+
title: "NavigationRow<CustomCell>",
94+
subtitle: .belowTitle(".subtitle"),
95+
customization: set(label: "2-1"),
96+
action: weakify(self, type(of: self).log)
97+
),
98+
CustomNavigationRow(
99+
title: "CustomNavigationRow",
100+
subtitle: .rightAligned(".value1"),
101+
customization: set(label: "2-2"),
102+
action: weakify(self, type(of: self).log)
103+
),
104+
CustomNavigationRow<CustomCell>(
105+
title: "CustomNavigationRow<CustomCell>",
106+
subtitle: .leftAligned(".value2"),
107+
customization: set(label: "2-3"),
108+
action: weakify(self, type(of: self).log)
109+
)
73110
]),
74111

75112
RadioSection(title: "Radio Buttons", options: [
76-
OptionRow(title: "OptionRow", isSelected: false, action: weakify(self, type(of: self).log)),
77-
CustomOptionRow(title: "CustomOptionRow", isSelected: false, action: weakify(self, type(of: self).log)),
78-
CustomOptionRow<CustomOptionCell>(title: "CustomOptionRow<CustomOptionCell>", isSelected: false, action: weakify(self, type(of: self).log))
113+
OptionRow(
114+
title: "OptionRow",
115+
isSelected: false,
116+
customization: set(label: "3-0"),
117+
action: weakify(self, type(of: self).log)
118+
),
119+
CustomOptionRow(
120+
title: "CustomOptionRow",
121+
isSelected: false,
122+
customization: set(label: "3-1"),
123+
action: weakify(self, type(of: self).log)
124+
),
125+
CustomOptionRow<CustomOptionCell>(
126+
title: "CustomOptionRow<CustomOptionCell>",
127+
isSelected: false,
128+
customization: set(label: "3-2"),
129+
action: weakify(self, type(of: self).log)
130+
)
79131
]),
80132

81133
Section(title: nil, rows: [
82134
NavigationRow(title: "Customization closure", subtitle: .none, customization: { cell, _ in
135+
cell.accessibilityLabel = "4-0"
83136
cell.accessoryView = UIImageView(image: #imageLiteral(resourceName: "iconmonstr-x-mark"))
84137
})
85138
])
@@ -96,6 +149,12 @@ internal final class CustomizationViewController: QuickTableViewController {
96149

97150
// MARK: - Private
98151

152+
private func set(label: String) -> ((UITableViewCell, Row & RowStyle) -> Void) {
153+
return { cell, _ in
154+
cell.accessibilityLabel = label
155+
}
156+
}
157+
99158
private func log(_ sender: Row) {
100159
if let option = sender as? OptionRowCompatible, !option.isSelected {
101160
return

0 commit comments

Comments
 (0)