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

Fix SwitchRow subtitles #1392

Merged
merged 5 commits into from
Jul 22, 2020
+5 −6
Merged

Fix SwitchRow subtitles #1392

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
8d791fe
Update QuickTableViewController to v1.2.3
dnicolson Jun 21, 2020
936a76d
Make grammar consistent
dnicolson Jun 24, 2020
f97da98
Fix capitalisation
dnicolson Jun 24, 2020
6d393d6
Update QuickTableViewController
dnicolson Jun 26, 2020
10a0310
Remove leading new line feed
dnicolson Jun 26, 2020
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
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ github "RxSwiftCommunity/RxGesture" "3.0.0"
github "RxSwiftCommunity/RxRealm" "1.0.1"
github "ZipArchive/ZipArchive" "v2.2.2"
github "ashleymills/Reachability.swift" "v5.0.0"
github "bcylin/QuickTableViewController" "v1.2.0"
github "bcylin/QuickTableViewController" "v1.2.4"
github "bitstadium/HockeySDK-tvOS" "5.1.0"
github "fpillet/NSLogger" "v1.9.7"
github "nsoperations/HockeySDK-iOS" "030990bf3c370e4b5d66fb0d3e9d1256193511f9"
Expand Down
2 changes: 1 addition & 1 deletion Carthage/Checkouts/QuickTableViewController
Open in desktop
Submodule QuickTableViewController updated 64 files
+3 −0 .codecov.yml
+41 −0 .github/workflows/run_tests.yml
+7 −3 .jazzy.yml
+1 −1 .swiftlint.yml
+1 −11 .travis.yml
+24 −0 CHANGELOG.md
+0 −24 Dangerfile
+1 −1 Example-iOS/Info.plist
+89 −0 Example-iOS/ViewControllers/DynamicTableView.swift
+79 −0 Example-iOS/ViewControllers/DynamicTableViewController.swift
+1 −1 Example-iOS/ViewControllers/ExampleViewController.swift
+6 −0 Example-iOS/ViewControllers/RootViewController.swift
+2 −2 Example-iOSUITests/ExampleUITests.swift
+1 −1 Example-iOSUITests/Info.plist
+1 −1 Example-tvOS/Info.plist
+1 −1 Example-tvOSUITests/Info.plist
+1 −2 Gemfile
+189 −74 Gemfile.lock
+4 −9 Makefile
+45 −0 Package.swift
+4 −18 Podfile
+8 −28 Podfile.lock
+4 −4 QuickTableViewController.podspec
+105 −174 QuickTableViewController.xcodeproj/project.pbxproj
+1 −1 QuickTableViewController/Info-iOS.plist
+1 −1 QuickTableViewController/Info-iOSTests.plist
+1 −1 QuickTableViewController/Info-tvOS.plist
+1 −1 QuickTableViewController/Info-tvOSTests.plist
+11 −8 README.md
+0 −103 Rakefile
+1 −1 Source/Model/Deprecated.swift
+2 −2 Source/Rows/NavigationRow.swift
+8 −4 Source/Rows/OptionRow.swift
+8 −4 Source/Rows/SwitchRow.swift
+1 −0 Tests/CustomTypes.swift
+0 −108 Tests/Model/DetailTextSpec.swift
+103 −0 Tests/Model/DetailTextTests.swift
+0 −105 Tests/Model/IconSpec.swift
+116 −0 Tests/Model/IconTests.swift
+0 −230 Tests/Model/RadioSectionSpec.swift
+253 −0 Tests/Model/RadioSectionTests.swift
+15 −15 Tests/Model/SectionTests.swift
+0 −138 Tests/Model/SubtitleSpec.swift
+146 −0 Tests/Model/SubtitleTests.swift
+0 −176 Tests/Row/NavigationRowSpec.swift
+239 −0 Tests/Row/NavigationRowTests.swift
+0 −135 Tests/Row/OptionRowSpec.swift
+206 −0 Tests/Row/OptionRowTests.swift
+0 −126 Tests/Row/SwitchRowSpec.swift
+210 −0 Tests/Row/SwitchRowTests.swift
+0 −77 Tests/Row/TapActionRowSpec.swift
+96 −0 Tests/Row/TapActionRowTests.swift
+0 −149 Tests/View/ConfigurableSpec.swift
+146 −0 Tests/View/ConfigurableTests.swift
+0 −80 Tests/View/ReusableSpec.swift
+85 −0 Tests/View/ReusableTests.swift
+25 −30 Tests/ViewController/QuickTableViewControllerTests.swift
+0 −326 Tests/ViewController/QuickTableViewDataSourceSpec.swift
+349 −0 Tests/ViewController/QuickTableViewDataSourceTests.swift
+0 −298 Tests/ViewController/QuickTableViewDelegateSpec.swift
+312 −0 Tests/ViewController/QuickTableViewDelegateTests.swift
+2 −0 fastlane/.gitignore
+32 −0 fastlane/Fastfile
+4 −4 scripts/swiftlint.rb
7 changes: 3 additions & 4 deletions Provenance/Settings/PVSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ final class PVSettingsViewController: PVQuickTableViewController {
key: \PVSettingsModel.webDavAlwaysOn,
customization: { cell, _ in
if PVSettingsModel.shared.webDavAlwaysOn {
let subTitleText = "\nWebDav: \(PVWebServer.shared.webDavURLString)"

let subTitleText = "WebDAV: \(PVWebServer.shared.webDavURLString)"
let subTitleAttributes = [NSAttributedString.Key.font: UIFont.systemFont(ofSize: 26), NSAttributedString.Key.foregroundColor: UIColor.gray]
let subTitleAttrString = NSMutableAttributedString(string: subTitleText, attributes: subTitleAttributes)
cell.detailTextLabel?.attributedText = subTitleAttrString
Expand Down Expand Up @@ -224,11 +223,11 @@ final class PVSettingsViewController: PVQuickTableViewController {
// Beta options
let betaRows: [TableRow] = [
PVSettingsSwitchRow(text: "Missing Buttons Always On-Screen",
detailText: .subtitle("Supports: SNES, SMS, SG, GG, SCD, PSX"),
detailText: .subtitle("Supports: SNES, SMS, SG, GG, SCD, PSX."),
key: \PVSettingsModel.missingButtonsAlwaysOn),

PVSettingsSwitchRow(text: "iCloud Sync",
detailText: .subtitle("Sync core & battery saves, screenshots and BIOS's to iCloud"),
detailText: .subtitle("Sync core & battery saves, screenshots and BIOS's to iCloud."),
key: \PVSettingsModel.debugOptions.iCloudSync),

PVSettingsSwitchRow(text: "Multi-threaded GL",
Expand Down