Commit a5b67569 authored by Zac Wood's avatar Zac Wood
Browse files

Dynamic text in menus

parent a3cde1ee
...@@ -37,6 +37,10 @@ class AlertDetailViewController: UIViewController { ...@@ -37,6 +37,10 @@ class AlertDetailViewController: UIViewController {
} }
self.messageView.text = alert.message self.messageView.text = alert.message
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
// dynamic font sizes
self.nameLabel.font = UIFont.preferredFont(forTextStyle: .title1)
self.messageView.font = UIFont.preferredFont(forTextStyle: .body)
} }
override func didReceiveMemoryWarning() { override func didReceiveMemoryWarning() {
......
...@@ -99,12 +99,17 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab ...@@ -99,12 +99,17 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
favoritesButton.backgroundColor = UIColor(red:0.00, green:0.40, blue:0.20, alpha:1.0) favoritesButton.backgroundColor = UIColor(red:0.00, green:0.40, blue:0.20, alpha:1.0)
favoritesButton.layer.cornerRadius = 10 favoritesButton.layer.cornerRadius = 10
OpenTimesList.bounces = false OpenTimesList.bounces = true
if #available(iOS 11.0, *) { if #available(iOS 11.0, *) {
navigationItem.largeTitleDisplayMode = .never navigationItem.largeTitleDisplayMode = .never
} }
// Do any additional setup after loading the view.
// NameLabel.font = UIFont.preferredFont(forTextStyle: .headline)
// PlaceLabel.font = UIFont.preferredFont(forTextStyle: .subheadline)
// OpenLabel.font = UIFont.preferredFont(forTextStyle: .body)
// favoritesButton.titleLabel?.font = UIFont.preferredFont(forTextStyle: .body)
} }
override func didReceiveMemoryWarning() { override func didReceiveMemoryWarning() {
...@@ -143,8 +148,8 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab ...@@ -143,8 +148,8 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
cell.detailTextLabel?.text = Utilities.getFormattedStartandEnd(openTime!) cell.detailTextLabel?.text = Utilities.getFormattedStartandEnd(openTime!)
} }
cell.textLabel?.font = UIFont.preferredFont(forTextStyle: .headline)
// Configure the cell... cell.detailTextLabel?.font = UIFont.preferredFont(forTextStyle: .body)
return cell return cell
} }
......
...@@ -52,7 +52,8 @@ class FiltersTableViewController: UITableViewController { ...@@ -52,7 +52,8 @@ class FiltersTableViewController: UITableViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
tableView.estimatedRowHeight = 50
tableView.rowHeight = UITableViewAutomaticDimension
/* /*
for f in facilities { for f in facilities {
if(!allLocations.contains(f.facilityLocation!)) { if(!allLocations.contains(f.facilityLocation!)) {
......
...@@ -84,8 +84,8 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr ...@@ -84,8 +84,8 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr
let cell = tableView.dequeueReusableCell(withIdentifier: "settingSelection", for: indexPath) let cell = tableView.dequeueReusableCell(withIdentifier: "settingSelection", for: indexPath)
cell.accessoryType = .disclosureIndicator cell.accessoryType = .disclosureIndicator
cell.textLabel?.text = "Show Alerts" cell.textLabel?.text = "Show Alerts"
cell.textLabel?.font = UIFont.preferredFont(forTextStyle: UIFontTextStyle.body, compatibleWith: nil) cell.textLabel?.font = UIFont.preferredFont(forTextStyle: .body)
cell.detailTextLabel?.font = UIFont.preferredFont(forTextStyle: UIFontTextStyle.footnote, compatibleWith: nil) cell.detailTextLabel?.font = UIFont.preferredFont(forTextStyle: .footnote)
/* /*
let defaults = UserDefaults.standard let defaults = UserDefaults.standard
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment