Unverified Commit 74851260 authored by Zach Knox's avatar Zach Knox
Browse files

the popover works on iPads

doesn't look quite right though
parent 20e8d297
...@@ -18,19 +18,19 @@ ...@@ -18,19 +18,19 @@
<viewControllerLayoutGuide type="bottom" id="uEj-Wh-tIe"/> <viewControllerLayoutGuide type="bottom" id="uEj-Wh-tIe"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="v6Q-ll-llg"> <view key="view" contentMode="scaleToFill" id="v6Q-ll-llg">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<toolbar clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLQ-LD-ZYN"> <toolbar clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLQ-LD-ZYN">
<rect key="frame" x="0.0" y="623" width="375" height="44"/> <rect key="frame" x="0.0" y="507" width="375" height="44"/>
<color key="backgroundColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
<items> <items>
<barButtonItem image="Gear" style="plain" id="UZb-P7-xWV"/> <barButtonItem image="Gear" style="plain" id="UZb-P7-xWV">
<color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="Cjx-w1-vgo"/> <barButtonItem style="plain" systemItem="flexibleSpace" id="Cjx-w1-vgo"/>
<barButtonItem systemItem="refresh" id="Sxw-4d-pD1"/> <barButtonItem systemItem="refresh" id="Sxw-4d-pD1"/>
</items> </items>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="barTintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</toolbar> </toolbar>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<segment title=""/> <segment title=""/>
<segment title=""/> <segment title=""/>
</segments> </segments>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</segmentedControl> </segmentedControl>
</navigationItem> </navigationItem>
</viewController> </viewController>
...@@ -62,12 +62,11 @@ ...@@ -62,12 +62,11 @@
<objects> <objects>
<navigationController id="49O-ie-MPO" sceneMemberID="viewController"> <navigationController id="49O-ie-MPO" sceneMemberID="viewController">
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/> <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" barStyle="black" id="lQp-4M-AdE"> <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" translucent="NO" largeTitles="YES" id="lQp-4M-AdE">
<rect key="frame" x="0.0" y="20" width="375" height="44"/> <rect key="frame" x="0.0" y="20" width="375" height="96"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> <color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="barTintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</navigationBar> </navigationBar>
<connections> <connections>
<segue destination="rgX-hK-Yk9" kind="relationship" relationship="rootViewController" id="PjG-Yg-Yf2"/> <segue destination="rgX-hK-Yk9" kind="relationship" relationship="rootViewController" id="PjG-Yg-Yf2"/>
......
...@@ -669,5 +669,5 @@ ...@@ -669,5 +669,5 @@
<image name="Gear" width="25" height="25"/> <image name="Gear" width="25" height="25"/>
<image name="WO_Black_TextLight" width="2355" height="692"/> <image name="WO_Black_TextLight" width="2355" height="692"/>
</resources> </resources>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</document> </document>
...@@ -17,6 +17,10 @@ class MainTableViewController: UITableViewController { ...@@ -17,6 +17,10 @@ class MainTableViewController: UITableViewController {
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
mainNavigationBar.titleView = UIImageView(image: #imageLiteral(resourceName: "Navigation Bar TitleView")) mainNavigationBar.titleView = UIImageView(image: #imageLiteral(resourceName: "Navigation Bar TitleView"))
} }
override var preferredStatusBarStyle: UIStatusBarStyle {
return .default
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
......
...@@ -100,6 +100,12 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate, ...@@ -100,6 +100,12 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
if(self.view.traitCollection.horizontalSizeClass == .regular && self.view.traitCollection.verticalSizeClass == .regular) { if(self.view.traitCollection.horizontalSizeClass == .regular && self.view.traitCollection.verticalSizeClass == .regular) {
//do a popover here for the iPad //do a popover here for the iPad
//iPads are cool right? //iPads are cool right?
destination.modalPresentationStyle = .popover
let popoverController = destination.popoverPresentationController
popoverController?.permittedArrowDirections = .any
popoverController?.sourceView = destination.view
present(destination, animated: true, completion: nil)
} }
else { else {
let destDelegate = DeckTransitioningDelegate() let destDelegate = DeckTransitioningDelegate()
......
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