Skip to content

GitLab

Commit daa5c707 authored by Zach Knox's avatar Zach Knox
Browse files

updated constraints and added segues

parent a8e3b786
Hide whitespace changes
Inline Side-by-side
WhatsOpen/WhatsOpen/Base.lproj/Main.storyboard
View file @ daa5c707
......@@ -109,7 +109,7 @@
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="Switching" id="2Dt-e5-bMw" customClass="SwitchingTableViewCell" customModule="WhatsOpen" customModuleProvider="target">
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
<rect key="frame" x="0.0" y="56" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2Dt-e5-bMw" id="SM7-SZ-S5h">
<rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
......@@ -117,7 +117,7 @@
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="Checkbox Filter" textLabel="rYu-5q-2u8" style="IBUITableViewCellStyleDefault" id="x5H-BH-cVX">
<rect key="frame" x="0.0" y="99.5" width="375" height="44"/>
<rect key="frame" x="0.0" y="100" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="x5H-BH-cVX" id="xf1-yc-ynP">
<rect key="frame" x="0.0" y="0.0" width="336" height="43.5"/>
......@@ -303,12 +303,21 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="uHy-SO-4Zr">
<rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Setting" textLabel="YYL-gW-pTv" style="IBUITableViewCellStyleDefault" id="uHy-SO-4Zr">
<rect key="frame" x="0.0" y="56" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uHy-SO-4Zr" id="fwy-U7-SfD">
<rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YYL-gW-pTv">
<rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
......@@ -342,7 +351,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iGy-3K-QIj">
<rect key="frame" x="0.0" y="0.0" width="375" height="66.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="67"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Panera Bread" textAlignment="natural" lineBreakMode="tailTruncation" minimumScaleFactor="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="W3q-KN-OAm">
<rect key="frame" x="8" y="6" width="274" height="31"/>
......@@ -386,14 +395,14 @@
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="N1f-XR-xpn">
<rect key="frame" x="0.0" y="66.5" width="375" height="536.5"/>
<rect key="frame" x="0.0" y="67" width="375" height="536"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="LocationDetailCell" textLabel="dvE-Be-8y6" detailTextLabel="fSJ-Gc-VIw" style="IBUITableViewCellStyleValue1" id="bCL-Iy-li3">
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bCL-Iy-li3" id="ObA-SL-u3j">
<rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Wednesday" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dvE-Be-8y6">
......@@ -404,7 +413,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="12:00 AM - 11:59 PM" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fSJ-Gc-VIw">
<rect key="frame" x="201" y="13" width="159" height="21"/>
<rect key="frame" x="201" y="13" width="159" height="20"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
......@@ -421,8 +430,8 @@
</tableView>
</subviews>
<constraints>
<constraint firstItem="N1f-XR-xpn" firstAttribute="top" secondItem="al7-z8-0L5" secondAttribute="bottom" constant="66.5" id="21k-Fb-9RI"/>
<constraint firstItem="6Rj-zF-6m7" firstAttribute="top" secondItem="N1f-XR-xpn" secondAttribute="bottom" id="Snu-Pp-aYW"/>
<constraint firstItem="6Rj-zF-6m7" firstAttribute="top" secondItem="N1f-XR-xpn" secondAttribute="bottom" id="6wD-rS-YRw"/>
<constraint firstItem="N1f-XR-xpn" firstAttribute="top" secondItem="al7-z8-0L5" secondAttribute="bottom" constant="67" id="Nhx-pg-ahN"/>
</constraints>
</stackView>
<extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
......
WhatsOpen/WhatsOpen/FiltersTableViewController.swift
View file @ daa5c707
......@@ -14,6 +14,7 @@ class FiltersTableViewController: UITableViewController {
self.dismiss(animated: true, completion: nil)
}
var filters: Filters!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -105,14 +106,19 @@ class FiltersTableViewController: UITableViewController {
}
*/
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destinationViewController.
if(segue.identifier == "toFilters") {
let destination = segue.destination as! LocationsListViewController
destination.filters = self.filters
}
// Pass the selected object to the new view controller.
}
*/
}
WhatsOpen/WhatsOpen/LocationDetailViewController.swift
View file @ daa5c707
......@@ -24,11 +24,10 @@ class LocationDetailViewController: UIViewController, UITableViewDelegate, UITab
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(true)
//SET STACK VIEW DISTRIBUTION HERE
}
override func viewDidLoad() {
super.viewDidLoad()
NameLabel.text = facility.name
PlaceLabel.text = facility.location
let open = Utilities.isOpen(facility: facility)
......@@ -47,9 +46,6 @@ class LocationDetailViewController: UIViewController, UITableViewDelegate, UITab
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
@IBAction func MiddleButton(_ sender: Any) {
}
func numberOfSections(in tableView: UITableView) -> Int {
// #warning Incomplete implementation, return the number of sections
......
WhatsOpen/WhatsOpen/LocationsListViewController.swift
View file @ daa5c707
......@@ -181,7 +181,10 @@ class LocationsListViewController: UIViewController, UICollectionViewDelegate, U
destination.facility = tapped.facility
}
else if(segue.identifier == "toFilters") {
let destination = segue.destination as! FiltersTableViewController
destination.filters = self.filters
}
// Pass the selected object to the new view controller.
}
......
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