passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Dynamic Type in cells 

Also fix activity cell layout.
This commit is contained in:
Davide De Rosa 2019-11-20 01:31:20 +01:00
parent 0657ae3b92
commit 816c7ca575
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout-iOS/Cells/ActivityTableViewCell.swift
View File

@ -30,7 +30,7 @@ extension Cells {
}
class ActivityTableViewCell: UITableViewCell {
private lazy var activityIndicator = UIActivityIndicatorView()
private lazy var activityIndicator = UIActivityIndicatorView(style: .gray)
}
extension ActivityTableViewCell {

2
Passepartout-iOS/Cells/DestructiveTableViewCell.swift
View File

@ -30,7 +30,7 @@ extension Cells {
}
class DestructiveTableViewCell: UITableViewCell {
@IBOutlet private lazy var labelCaption: UILabel? = {
@IBOutlet private(set) lazy var labelCaption: UILabel? = {
let label = UILabel()
label.textAlignment = .center
contentView.addSubview(label)

15
Passepartout-iOS/Global/Theme+Cells.swift
View File

@ -30,6 +30,7 @@ import Convenience
extension UITableViewCell {
func applyChecked(_ checked: Bool, _ theme: Theme) {
textLabel?.font = .preferredFont(forTextStyle: .body)
accessoryType = checked ? .checkmark : .none
tintColor = theme.palette.accessory
}
@ -45,20 +46,25 @@ extension SingleOptionViewController {
extension DestructiveTableViewCell {
func apply(_ theme: Theme) {
labelCaption?.font = .preferredFont(forTextStyle: .body)
captionColor = theme.palette.destructive
accessoryType = .none
selectionStyle = .default
captionColor = theme.palette.destructive
}
}
extension FieldTableViewCell {
func apply(_ theme: Theme) {
textLabel?.font = .preferredFont(forTextStyle: .body)
field.font = .preferredFont(forTextStyle: .body)
captionColor = theme.palette.primaryText
}
}
extension SettingTableViewCell {
func apply(_ theme: Theme) {
textLabel?.font = .preferredFont(forTextStyle: .body)
detailTextLabel?.font = .preferredFont(forTextStyle: .body)
leftTextColor = theme.palette.primaryText
rightTextColor = theme.palette.secondaryText
}
@ -66,12 +72,14 @@ extension SettingTableViewCell {
extension ToggleTableViewCell {
func apply(_ theme: Theme) {
textLabel?.font = .preferredFont(forTextStyle: .body)
captionColor = theme.palette.primaryText
}
}
extension ActivityTableViewCell {
func apply(_ theme: Theme) {
textLabel?.font = .preferredFont(forTextStyle: .body)
textLabel?.text = nil
detailTextLabel?.text = nil
}
@ -79,12 +87,17 @@ extension ActivityTableViewCell {
extension SettingTableViewCell {
func applyAction(_ theme: Theme) {
textLabel?.font = .preferredFont(forTextStyle: .body)
detailTextLabel?.font = .preferredFont(forTextStyle: .body)
leftTextColor = theme.palette.action
rightTextColor = nil
accessoryType = .none
}
func applyVPN(_ theme: Theme, with vpnStatus: VPNStatus?, error: OpenVPNTunnelProvider.ProviderError?) {
textLabel?.font = .preferredFont(forTextStyle: .body)
detailTextLabel?.font = .preferredFont(forTextStyle: .body)
leftTextColor = theme.palette.primaryText
guard let vpnStatus = vpnStatus else {
rightText = L10n.Core.Vpn.disabled