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

Settings: simplify 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-11-03 19:48:10 +01:00
parent 955de09c9e
commit e43de890e0
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
View File

@ -40,19 +40,11 @@ class SettingsTableViewController: UITableViewController {
self.tableView.register(TunnelSettingsTableViewKeyValueCell.self, forCellReuseIdentifier: TunnelSettingsTableViewKeyValueCell.id) self.tableView.register(TunnelSettingsTableViewKeyValueCell.self, forCellReuseIdentifier: TunnelSettingsTableViewKeyValueCell.id)
self.tableView.register(TunnelSettingsTableViewButtonCell.self, forCellReuseIdentifier: TunnelSettingsTableViewButtonCell.id) self.tableView.register(TunnelSettingsTableViewButtonCell.self, forCellReuseIdentifier: TunnelSettingsTableViewButtonCell.id)
let wireguardCaptionedImage = UIImage(named: "wireguard.pdf", in: Bundle.main, compatibleWith: nil)! let logo = UIImageView(image: UIImage(named: "wireguard.pdf", in: Bundle.main, compatibleWith: nil)!)
let wireguardCaptionedImageView = UIImageView(image: wireguardCaptionedImage) logo.contentMode = .scaleAspectFit
wireguardCaptionedImageView.contentMode = .scaleAspectFit //TODO(roopesh): limit size to 1.5 * rowheight, and anchor to bottom
let wireguardCaptionedImageContainerView = UIView() self.tableView.tableFooterView = logo
wireguardCaptionedImageContainerView.addSubview(wireguardCaptionedImageView)
wireguardCaptionedImageView.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([
wireguardCaptionedImageView.topAnchor.constraint(equalTo: wireguardCaptionedImageContainerView.layoutMarginsGuide.topAnchor),
wireguardCaptionedImageView.bottomAnchor.constraint(equalTo: wireguardCaptionedImageContainerView.layoutMarginsGuide.bottomAnchor),
wireguardCaptionedImageView.leftAnchor.constraint(equalTo: wireguardCaptionedImageContainerView.layoutMarginsGuide.leftAnchor),
wireguardCaptionedImageView.rightAnchor.constraint(equalTo: wireguardCaptionedImageContainerView.layoutMarginsGuide.rightAnchor),
])
self.wireguardCaptionedImage = (view: wireguardCaptionedImageContainerView, size: wireguardCaptionedImage.size)
} }
@objc func doneTapped() { @objc func doneTapped() {
@ -156,17 +148,6 @@ extension SettingsTableViewController {
return cell return cell
} }
} }
override func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
guard (section == 1) else { return nil }
return self.wireguardCaptionedImage?.view
}
override func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
guard (section == 1) else { return 0 }
guard let imageSize = self.wireguardCaptionedImage?.size else { return 0 }
return min(tableView.rowHeight * 1.5, (tableView.bounds.width / imageSize.width) * imageSize.height)
}
} }
class TunnelSettingsTableViewKeyValueCell: UITableViewCell { class TunnelSettingsTableViewKeyValueCell: UITableViewCell {