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

moved settings button and removed bottom toolbar from main view

parent 2e8a7fea
......@@ -3,9 +3,6 @@
<plist version="1.0">
<dict>
<key>com.apple.developer.associated-domains</key>
<array>
<string>whatsopen.gmu.edu</string>
<string>whatsopen.gmu.io</string>
</array>
<array/>
</dict>
</plist>
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49O-ie-MPO">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49O-ie-MPO">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -16,25 +16,7 @@
<view key="view" contentMode="scaleToFill" id="v6Q-ll-llg">
<rect key="frame" x="0.0" y="0.0" width="375" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<toolbar clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLQ-LD-ZYN">
<rect key="frame" x="0.0" y="507" width="375" height="44"/>
<items>
<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 systemItem="refresh" id="Sxw-4d-pD1"/>
</items>
<color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</toolbar>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="S6o-JX-Hs6" firstAttribute="trailing" secondItem="dLQ-LD-ZYN" secondAttribute="trailing" id="5dW-Pp-BXz"/>
<constraint firstItem="dLQ-LD-ZYN" firstAttribute="leading" secondItem="S6o-JX-Hs6" secondAttribute="leading" id="DgE-50-feH"/>
<constraint firstItem="S6o-JX-Hs6" firstAttribute="bottom" secondItem="dLQ-LD-ZYN" secondAttribute="bottom" id="vxR-Lb-0T3"/>
</constraints>
<viewLayoutGuide key="safeArea" id="S6o-JX-Hs6"/>
</view>
<navigationItem key="navigationItem" id="oR9-Bj-2qk">
......@@ -74,7 +56,4 @@
<point key="canvasLocation" x="-476" y="475"/>
</scene>
</scenes>
<resources>
<image name="Gear" width="25" height="25"/>
</resources>
</document>
......@@ -154,7 +154,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="naC-sZ-bcy">
<rect key="frame" x="0.0" y="116" width="375" height="507"/>
<rect key="frame" x="0.0" y="116" width="375" height="551"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="eqw-AF-DSB">
......@@ -287,36 +287,12 @@
<outlet property="delegate" destination="aaB-Go-aWd" id="dre-Tj-BHj"/>
</connections>
</collectionView>
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8FA-yc-q3z">
<rect key="frame" x="0.0" y="623" width="375" height="44"/>
<items>
<barButtonItem image="Gear" id="MHZ-t0-Moj">
<connections>
<segue destination="Uxx-wt-GfY" kind="presentation" identifier="toSettings" modalPresentationStyle="pageSheet" id="3zr-0o-7IB"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="VZM-tF-lkq"/>
<barButtonItem title="Last Updated: never" style="plain" id="y4Z-i6-UYu">
<color key="tintColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="NJ5-TN-F4n"/>
<barButtonItem systemItem="refresh" id="YxN-nx-PTc">
<connections>
<action selector="RefreshButton:" destination="aaB-Go-aWd" id="Kds-HJ-kNI"/>
</connections>
</barButtonItem>
</items>
<color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</toolbar>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="naC-sZ-bcy" firstAttribute="leading" secondItem="uyS-pc-zem" secondAttribute="leading" id="8qe-8Q-n4N"/>
<constraint firstItem="uyS-pc-zem" firstAttribute="bottom" secondItem="8FA-yc-q3z" secondAttribute="bottom" id="HZe-Pq-6Jf"/>
<constraint firstItem="8FA-yc-q3z" firstAttribute="leading" secondItem="avG-8M-sVI" secondAttribute="leading" id="Hbe-dA-GI7"/>
<constraint firstItem="uyS-pc-zem" firstAttribute="trailing" secondItem="naC-sZ-bcy" secondAttribute="trailing" id="Txw-xY-c0f"/>
<constraint firstAttribute="trailing" secondItem="8FA-yc-q3z" secondAttribute="trailing" id="Zqb-Sf-oE3"/>
<constraint firstItem="naC-sZ-bcy" firstAttribute="bottom" secondItem="8FA-yc-q3z" secondAttribute="top" id="uPG-sr-fLJ"/>
<constraint firstAttribute="bottom" secondItem="naC-sZ-bcy" secondAttribute="bottom" id="kkT-WV-Rlb"/>
<constraint firstItem="naC-sZ-bcy" firstAttribute="top" secondItem="uyS-pc-zem" secondAttribute="top" id="wgO-7q-0zE"/>
</constraints>
<viewLayoutGuide key="safeArea" id="uyS-pc-zem"/>
......@@ -342,9 +318,13 @@
<action selector="favoritesControlChanges:" destination="aaB-Go-aWd" eventType="valueChanged" id="5Ij-Z9-Gsa"/>
</connections>
</segmentedControl>
<barButtonItem key="rightBarButtonItem" image="Gear" id="MHZ-t0-Moj">
<connections>
<segue destination="Uxx-wt-GfY" kind="presentation" identifier="toSettings" modalPresentationStyle="pageSheet" id="3zr-0o-7IB"/>
</connections>
</barButtonItem>
</navigationItem>
<connections>
<outlet property="LastUpdatedLabel" destination="y4Z-i6-UYu" id="zCz-7O-cP3"/>
<outlet property="LeftButton" destination="v4j-oA-7Fa" id="EdI-if-QoB"/>
<outlet property="LocationsList" destination="naC-sZ-bcy" id="Wk4-kY-TeR"/>
<outlet property="LocationsListLayout" destination="eqw-AF-DSB" id="kLH-bz-bdn"/>
......
......@@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>1.1</string>
<key>CFBundleVersion</key>
<string>24</string>
<string>27</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
......
......@@ -63,7 +63,8 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
@IBOutlet var favoritesControl: UISegmentedControl!
var showFavorites = false
@IBOutlet var LastUpdatedLabel: UIBarButtonItem!
// TODO: Put this in a new place
var LastUpdatedLabel = UIBarButtonItem()
let refreshControl = UIRefreshControl()
......
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