Unverified Commit 9e724105 authored by Zach Knox's avatar Zach Knox
Browse files

Moved detail view to Framework

parent 60844473
......@@ -11,13 +11,11 @@
3BF943DF148D3237C16DEB97 /* Pods_WhatsOpen___AppStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 857A9086C28DB736094E251F /* Pods_WhatsOpen___AppStore.framework */; };
7F4743271E11D1BC00E6E3D1 /* MainTableViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F4743261E11D1BC00E6E3D1 /* MainTableViewControllerTests.swift */; };
9203CB862023D51A006ACC3B /* FilterSelectionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B2D2FE1FF8599500349E90 /* FilterSelectionTableViewController.swift */; };
9203CB872023D51A006ACC3B /* FacilityDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92182EC31E95C38400192ABA /* FacilityDetailViewController.swift */; };
9203CB892023D51A006ACC3B /* AlertCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FF6C721FFEEEE900D836AE /* AlertCollectionViewCell.swift */; };
9203CB8A2023D51A006ACC3B /* CheckingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92108A321ED755F100675E16 /* CheckingTableViewCell.swift */; };
9203CB8B2023D51A006ACC3B /* FacilitiesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92182EBF1E95BD2C00192ABA /* FacilitiesListViewController.swift */; };
9203CB8C2023D51A006ACC3B /* AlertDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B89E2D20093E3600928284 /* AlertDetailViewController.swift */; };
9203CB8E2023D51A006ACC3B /* AboutScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9265F3A21F2C0B1500A54A21 /* AboutScreenViewController.swift */; };
9203CB8F2023D51A006ACC3B /* PaddedUILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */; };
9203CB912023D51A006ACC3B /* SetIconTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9281AD7B2002CF1700D09203 /* SetIconTableViewController.swift */; };
9203CB922023D51A006ACC3B /* FacilityCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924840F71EA915F200DBFF4E /* FacilityCollectionViewCell.swift */; };
9203CB932023D51A006ACC3B /* SettingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9265F3A01F2969E500A54A21 /* SettingTableViewCell.swift */; };
......@@ -34,7 +32,6 @@
9203CBA52023D51A006ACC3B /* Pods-WhatsOpen-acknowledgements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 92F681571FC1353700393DF4 /* Pods-WhatsOpen-acknowledgements.plist */; };
92108A331ED755F100675E16 /* CheckingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92108A321ED755F100675E16 /* CheckingTableViewCell.swift */; };
92182EC01E95BD2C00192ABA /* FacilitiesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92182EBF1E95BD2C00192ABA /* FacilitiesListViewController.swift */; };
92182EC41E95C38400192ABA /* FacilityDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92182EC31E95C38400192ABA /* FacilityDetailViewController.swift */; };
924840F81EA915F200DBFF4E /* FacilityCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924840F71EA915F200DBFF4E /* FacilityCollectionViewCell.swift */; };
924E0E312085851400C1F2AF /* DetailViewButtonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924E0E302085851400C1F2AF /* DetailViewButtonsViewController.swift */; };
924E0E322085851500C1F2AF /* DetailViewButtonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924E0E302085851400C1F2AF /* DetailViewButtonsViewController.swift */; };
......@@ -48,6 +45,9 @@
9265F3A11F2969E500A54A21 /* SettingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9265F3A01F2969E500A54A21 /* SettingTableViewCell.swift */; };
9265F3A31F2C0B1500A54A21 /* AboutScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9265F3A21F2C0B1500A54A21 /* AboutScreenViewController.swift */; };
9270A4DB1EB5565400DFBDA3 /* SwitchingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9270A4DA1EB5565400DFBDA3 /* SwitchingTableViewCell.swift */; };
9273EEC221658B0200CE63DC /* WOPSharedUI.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9273EEC121658B0200CE63DC /* WOPSharedUI.storyboard */; };
9273EEC321658BCC00CE63DC /* FacilityDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92182EC31E95C38400192ABA /* FacilityDetailViewController.swift */; };
9273EEC421658BF000CE63DC /* PaddedUILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */; };
927C80DA1EB02566009079AD /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 927C80D91EB02566009079AD /* SettingsTableViewController.swift */; };
927C80DC1EB18B89009079AD /* FiltersTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 927C80DB1EB18B89009079AD /* FiltersTableViewController.swift */; };
9281AD7C2002CF1700D09203 /* SetIconTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9281AD7B2002CF1700D09203 /* SetIconTableViewController.swift */; };
......@@ -62,7 +62,6 @@
92B2D2FF1FF8599500349E90 /* FilterSelectionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B2D2FE1FF8599500349E90 /* FilterSelectionTableViewController.swift */; };
92B89E2E20093E3600928284 /* AlertDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B89E2D20093E3600928284 /* AlertDetailViewController.swift */; };
92B89E302009444E00928284 /* PullingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B89E2F2009444E00928284 /* PullingViewController.swift */; };
92EA81971FB7D1B500B1F6E3 /* PaddedUILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */; };
92F681581FC1353700393DF4 /* Pods-WhatsOpen-acknowledgements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 92F681571FC1353700393DF4 /* Pods-WhatsOpen-acknowledgements.plist */; };
92F6815A1FC137CF00393DF4 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 92F681591FC137CF00393DF4 /* Settings.bundle */; };
92FF6C731FFEEEE900D836AE /* AlertCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FF6C721FFEEEE900D836AE /* AlertCollectionViewCell.swift */; };
......@@ -165,6 +164,7 @@
9265F3A21F2C0B1500A54A21 /* AboutScreenViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutScreenViewController.swift; sourceTree = "<group>"; };
9270A4DA1EB5565400DFBDA3 /* SwitchingTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwitchingTableViewCell.swift; sourceTree = "<group>"; };
9270A4DC1EC0010300DFBDA3 /* Filters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Filters.swift; path = ../WhatsOpen/Filters.swift; sourceTree = "<group>"; };
9273EEC121658B0200CE63DC /* WOPSharedUI.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = WOPSharedUI.storyboard; sourceTree = "<group>"; };
927A8466141434969CE74044 /* Pods_WhatsOpen.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WhatsOpen.framework; sourceTree = BUILT_PRODUCTS_DIR; };
927C80D91EB02566009079AD /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = "<group>"; };
927C80DB1EB18B89009079AD /* FiltersTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FiltersTableViewController.swift; sourceTree = "<group>"; };
......@@ -175,7 +175,7 @@
92B89E2D20093E3600928284 /* AlertDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertDetailViewController.swift; sourceTree = "<group>"; };
92B89E2F2009444E00928284 /* PullingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PullingViewController.swift; sourceTree = "<group>"; };
92DA57CC20C99C0C00EFDE7C /* WhatsOpen - AppStore.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WhatsOpen - AppStore.entitlements"; sourceTree = "<group>"; };
92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaddedUILabel.swift; path = WhatsOpen/PaddedUILabel.swift; sourceTree = SOURCE_ROOT; };
92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaddedUILabel.swift; path = WhatsOpenKit/PaddedUILabel.swift; sourceTree = SOURCE_ROOT; };
92F681571FC1353700393DF4 /* Pods-WhatsOpen-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Pods-WhatsOpen-acknowledgements.plist"; path = "Pods/Target Support Files/Pods-WhatsOpen/Pods-WhatsOpen-acknowledgements.plist"; sourceTree = SOURCE_ROOT; };
92F681591FC137CF00393DF4 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
92FF6C721FFEEEE900D836AE /* AlertCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AlertCollectionViewCell.swift; path = WhatsOpen/Views/CollectionViewCells/AlertCollectionViewCell.swift; sourceTree = SOURCE_ROOT; };
......@@ -305,6 +305,8 @@
9255C5A921556E410094C947 /* WhatsOpenKit */ = {
isa = PBXGroup;
children = (
92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */,
92182EC31E95C38400192ABA /* FacilityDetailViewController.swift */,
928EC26621611E5900D8F9FE /* DatabaseController.swift */,
CD3C97481DC18AB300A84434 /* DownloadController.swift */,
9270A4DC1EC0010300DFBDA3 /* Filters.swift */,
......@@ -312,6 +314,7 @@
CD763A7D1DE253B900ADFD6B /* Utilities.swift */,
9255C5AA21556E410094C947 /* WhatsOpenKit.h */,
9255C5AB21556E410094C947 /* Info.plist */,
9273EEC121658B0200CE63DC /* WOPSharedUI.storyboard */,
);
path = WhatsOpenKit;
sourceTree = "<group>";
......@@ -339,7 +342,6 @@
isa = PBXGroup;
children = (
92B89E2D20093E3600928284 /* AlertDetailViewController.swift */,
92182EC31E95C38400192ABA /* FacilityDetailViewController.swift */,
92182EBF1E95BD2C00192ABA /* FacilitiesListViewController.swift */,
);
path = "Primary Views";
......@@ -384,7 +386,6 @@
isa = PBXGroup;
children = (
CD81F51C1DC0334600009FBD /* AppDelegate.swift */,
92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */,
CD81F5201DC0334600009FBD /* Main.storyboard */,
920D17961F6C5CD200D63295 /* Views */,
CD81F5231DC0334600009FBD /* Assets.xcassets */,
......@@ -637,6 +638,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9273EEC221658B0200CE63DC /* WOPSharedUI.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -937,14 +939,12 @@
buildActionMask = 2147483647;
files = (
9203CB862023D51A006ACC3B /* FilterSelectionTableViewController.swift in Sources */,
9203CB872023D51A006ACC3B /* FacilityDetailViewController.swift in Sources */,
9203CB892023D51A006ACC3B /* AlertCollectionViewCell.swift in Sources */,
9203CB8A2023D51A006ACC3B /* CheckingTableViewCell.swift in Sources */,
9203CB8B2023D51A006ACC3B /* FacilitiesListViewController.swift in Sources */,
9203CB8C2023D51A006ACC3B /* AlertDetailViewController.swift in Sources */,
924E0E322085851500C1F2AF /* DetailViewButtonsViewController.swift in Sources */,
9203CB8E2023D51A006ACC3B /* AboutScreenViewController.swift in Sources */,
9203CB8F2023D51A006ACC3B /* PaddedUILabel.swift in Sources */,
9203CB912023D51A006ACC3B /* SetIconTableViewController.swift in Sources */,
9203CB922023D51A006ACC3B /* FacilityCollectionViewCell.swift in Sources */,
9203CB932023D51A006ACC3B /* SettingTableViewCell.swift in Sources */,
......@@ -974,6 +974,8 @@
928EC26421604DD800D8F9FE /* DownloadController.swift in Sources */,
928EC26321604ADD00D8F9FE /* Utilities.swift in Sources */,
928EC262216049F900D8F9FE /* Filters.swift in Sources */,
9273EEC421658BF000CE63DC /* PaddedUILabel.swift in Sources */,
9273EEC321658BCC00CE63DC /* FacilityDetailViewController.swift in Sources */,
928EC26521605CD700D8F9FE /* Model.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -983,14 +985,12 @@
buildActionMask = 2147483647;
files = (
92B2D2FF1FF8599500349E90 /* FilterSelectionTableViewController.swift in Sources */,
92182EC41E95C38400192ABA /* FacilityDetailViewController.swift in Sources */,
92FF6C731FFEEEE900D836AE /* AlertCollectionViewCell.swift in Sources */,
92108A331ED755F100675E16 /* CheckingTableViewCell.swift in Sources */,
92182EC01E95BD2C00192ABA /* FacilitiesListViewController.swift in Sources */,
92B89E2E20093E3600928284 /* AlertDetailViewController.swift in Sources */,
924E0E312085851400C1F2AF /* DetailViewButtonsViewController.swift in Sources */,
9265F3A31F2C0B1500A54A21 /* AboutScreenViewController.swift in Sources */,
92EA81971FB7D1B500B1F6E3 /* PaddedUILabel.swift in Sources */,
9281AD7C2002CF1700D09203 /* SetIconTableViewController.swift in Sources */,
924840F81EA915F200DBFF4E /* FacilityCollectionViewCell.swift in Sources */,
9265F3A11F2969E500A54A21 /* SettingTableViewCell.swift in Sources */,
......
......@@ -180,7 +180,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Open" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DEx-BH-Fun" customClass="PaddedUILabel" customModule="WhatsOpen" customModuleProvider="target">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Open" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DEx-BH-Fun" customClass="WOPPaddedUILabel" customModule="WhatsOpenKit">
<rect key="frame" x="217" y="94" width="72" height="28"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
......@@ -619,119 +619,6 @@
</objects>
<point key="canvasLocation" x="-7327.1999999999998" y="-1887.7061469265368"/>
</scene>
<!--Facility Detail View Controller-->
<scene sceneID="PSR-07-q3V">
<objects>
<viewController storyboardIdentifier="detailView" id="40z-Tl-yYT" customClass="FacilityDetailViewController" customModule="WhatsOpen" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="vOM-a7-AE3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OPEN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LmU-tN-3Nq" customClass="PaddedUILabel" customModule="WhatsOpen" customModuleProvider="target">
<rect key="frame" x="289" y="118" width="70" height="34"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="34" id="9W6-hU-MSZ"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="leftTextInset">
<real key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="rightTextInset">
<real key="value" value="8"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Johnson Center" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2ce-lS-NfW">
<rect key="frame" x="8" y="82.5" width="359" height="27.5"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="23"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RESTAURANT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SCx-pT-eVq">
<rect key="frame" x="8" y="22" width="359" height="20"/>
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="16"/>
<color key="textColor" white="0.13039822049999999" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Panera Bread" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" minimumScaleFactor="0.60000002384185791" translatesAutoresizingMaskIntoConstraints="NO" id="hPi-Bj-D4L">
<rect key="frame" x="8" y="37.5" width="359" height="49"/>
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="41"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EFr-sK-Oua">
<rect key="frame" x="0.0" y="160" width="375" height="508"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="LocationDetailCell" textLabel="ZON-E8-nep" detailTextLabel="mCu-om-Ac6" style="IBUITableViewCellStyleValue1" id="7ju-Kj-S2Y">
<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="7ju-Kj-S2Y" id="FHq-Qm-SCW">
<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="Wednesday" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZON-E8-nep">
<rect key="frame" x="15" y="11" width="106.5" height="23"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="19"/>
<nil key="textColor"/>
<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="mCu-om-Ac6">
<rect key="frame" x="201" y="13" width="159" height="20.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="40z-Tl-yYT" id="OB7-bj-1fJ"/>
<outlet property="delegate" destination="40z-Tl-yYT" id="Etz-9k-CqV"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="SCx-pT-eVq" firstAttribute="top" secondItem="0iA-yA-TUz" secondAttribute="top" constant="2" id="7tl-O1-iS3"/>
<constraint firstItem="SCx-pT-eVq" firstAttribute="centerX" secondItem="0iA-yA-TUz" secondAttribute="centerX" id="Akz-sy-WAt"/>
<constraint firstItem="LmU-tN-3Nq" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="0iA-yA-TUz" secondAttribute="leading" constant="8" id="DdP-f9-QWm"/>
<constraint firstItem="EFr-sK-Oua" firstAttribute="centerX" secondItem="0iA-yA-TUz" secondAttribute="centerX" id="Ezv-za-EcD"/>
<constraint firstItem="EFr-sK-Oua" firstAttribute="top" secondItem="LmU-tN-3Nq" secondAttribute="bottom" constant="8" id="H5o-yK-bUj"/>
<constraint firstItem="EFr-sK-Oua" firstAttribute="width" secondItem="vOM-a7-AE3" secondAttribute="width" id="HPb-Hd-ULg"/>
<constraint firstItem="hPi-Bj-D4L" firstAttribute="centerX" secondItem="0iA-yA-TUz" secondAttribute="centerX" id="NV5-11-lY8"/>
<constraint firstItem="EFr-sK-Oua" firstAttribute="bottom" secondItem="0iA-yA-TUz" secondAttribute="bottom" constant="1" id="R6A-E2-69c"/>
<constraint firstItem="2ce-lS-NfW" firstAttribute="top" secondItem="hPi-Bj-D4L" secondAttribute="bottom" constant="-4" id="SIh-tP-Vwb"/>
<constraint firstItem="hPi-Bj-D4L" firstAttribute="leading" secondItem="0iA-yA-TUz" secondAttribute="leading" constant="8" id="XdB-Nv-hr4"/>
<constraint firstItem="hPi-Bj-D4L" firstAttribute="top" secondItem="SCx-pT-eVq" secondAttribute="bottom" constant="-4.5" id="arY-iF-Gnx"/>
<constraint firstItem="2ce-lS-NfW" firstAttribute="width" secondItem="hPi-Bj-D4L" secondAttribute="width" id="ceM-fT-kDM"/>
<constraint firstItem="SCx-pT-eVq" firstAttribute="width" secondItem="hPi-Bj-D4L" secondAttribute="width" id="exI-g2-Tec"/>
<constraint firstItem="LmU-tN-3Nq" firstAttribute="top" secondItem="2ce-lS-NfW" secondAttribute="bottom" constant="8" id="fSq-dp-y4o"/>
<constraint firstItem="0iA-yA-TUz" firstAttribute="trailing" secondItem="hPi-Bj-D4L" secondAttribute="trailing" constant="8" id="fuT-qT-1IL"/>
<constraint firstItem="0iA-yA-TUz" firstAttribute="trailing" secondItem="LmU-tN-3Nq" secondAttribute="trailing" constant="16" id="mzw-Z6-eT6"/>
<constraint firstItem="2ce-lS-NfW" firstAttribute="centerX" secondItem="0iA-yA-TUz" secondAttribute="centerX" id="wwG-8O-tQ7"/>
</constraints>
<viewLayoutGuide key="safeArea" id="0iA-yA-TUz"/>
</view>
<connections>
<outlet property="CategoryLabel" destination="SCx-pT-eVq" id="zKU-0R-wNV"/>
<outlet property="NameLabel" destination="hPi-Bj-D4L" id="qh6-qa-8T6"/>
<outlet property="OpenLabel" destination="LmU-tN-3Nq" id="3i1-Xg-FtQ"/>
<outlet property="OpenTimesList" destination="EFr-sK-Oua" id="uTF-US-Oh4"/>
<outlet property="PlaceLabel" destination="2ce-lS-NfW" id="rkF-DE-fAD"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Hze-Fg-ydT" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-6655.1999999999998" y="-1883.2083958020992"/>
</scene>
<!--Pulling View Controller-->
<scene sceneID="9g0-2V-iaL">
<objects>
......@@ -857,7 +744,6 @@
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="setFavButton:" destination="40z-Tl-yYT" eventType="touchUpInside" id="CXZ-AS-yBG"/>
<action selector="setFavButton:" destination="NAf-lT-JCD" eventType="touchUpInside" id="QKk-0C-GDD"/>
</connections>
</button>
......@@ -869,7 +755,6 @@
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="getDirections:" destination="40z-Tl-yYT" eventType="touchUpInside" id="UzN-J5-uhx"/>
<action selector="getDirections:" destination="NAf-lT-JCD" eventType="touchUpInside" id="hNO-dV-uVE"/>
</connections>
</button>
......@@ -891,7 +776,6 @@
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="shareFacility:" destination="40z-Tl-yYT" eventType="touchUpInside" id="AwW-zf-pf5"/>
<action selector="shareFacility:" destination="NAf-lT-JCD" eventType="touchUpInside" id="mdd-wn-v6b"/>
</connections>
</button>
......
......@@ -13,7 +13,7 @@ import WhatsOpenKit
class FacilityCollectionViewCell: UICollectionViewCell {
@IBOutlet var nameLabel: UILabel!
@IBOutlet var timeDescriptionLabel: UILabel!
@IBOutlet var openClosedLabel: PaddedUILabel!
@IBOutlet var openClosedLabel: WOPPaddedUILabel!
@IBOutlet var categoryLabel: UILabel!
var facility: WOPFacility!
internal let tapRecognizer: UITapGestureRecognizer = UITapGestureRecognizer()
......
......@@ -13,7 +13,7 @@ import WhatsOpenKit
class DetailViewButtonsViewController: UIViewController {
@IBOutlet var facilityDetailView: UIView!
var detailViewController: FacilityDetailViewController?
var detailViewController: WOPFacilityDetailViewController?
var facility: WOPFacility!
@IBOutlet var favoritesButton: UIButton!
......
......@@ -150,7 +150,8 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
if(indexPath != nil) {
if(indexPath?.section == 1 || currentAlerts.count == 0) {
let destination = self.storyboard?.instantiateViewController(withIdentifier: "detailView") as? FacilityDetailViewController
let storyboard = UIStoryboard(name: "WOPSharedUI", bundle: Bundle(for: WOPFacilityDetailViewController.self))
let destination = storyboard.instantiateViewController(withIdentifier: "detailView") as? WOPFacilityDetailViewController
let tapped = self.LocationsList.cellForItem(at: indexPath!) as! FacilityCollectionViewCell
destination?.facility = tapped.facility
self.presentDetailView(destination!, tapped: tapped)
......@@ -168,7 +169,8 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
var goodToGo = false
@objc func toDetailFromSearch(_ notification: Notification) {
func toDetailCompletion() {
let dest = self.storyboard?.instantiateViewController(withIdentifier: "detailView") as! FacilityDetailViewController
let storyboard = UIStoryboard(name: "WOPSharedUI", bundle: Bundle(for: WOPFacilityDetailViewController.self))
let dest = storyboard.instantiateViewController(withIdentifier: "detailView") as! WOPFacilityDetailViewController
let userActivity = notification.object as? NSUserActivity
if(userActivity == nil) {
return // don't do anything
......@@ -215,7 +217,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
return // don't do anything
}
let dest = self.storyboard?.instantiateViewController(withIdentifier: "detailView") as! FacilityDetailViewController
let dest = self.storyboard?.instantiateViewController(withIdentifier: "detailView") as! WOPFacilityDetailViewController
dest.facility = facility!
let detailViewWithButtons = self.storyboard?.instantiateViewController(withIdentifier: "detailViewButtons") as? DetailViewButtonsViewController
......@@ -240,10 +242,10 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
func presentDetailView(_ destination: UIViewController, tapped: UICollectionViewCell) {
var trueDest: UIViewController
if destination is FacilityDetailViewController {
if destination is WOPFacilityDetailViewController {
let detailViewWithButtons = self.storyboard?.instantiateViewController(withIdentifier: "detailViewButtons") as? DetailViewButtonsViewController
detailViewWithButtons?.detailViewController = (destination as! FacilityDetailViewController)
detailViewWithButtons?.facility = (destination as! FacilityDetailViewController).facility
detailViewWithButtons?.detailViewController = (destination as! WOPFacilityDetailViewController)
detailViewWithButtons?.facility = (destination as! WOPFacilityDetailViewController).facility
trueDest = detailViewWithButtons!
}
else {
......@@ -921,8 +923,8 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
// Get the new view controller using segue.destinationViewController.
if(segue.identifier == "toDetailView") {
let destination = segue.destination as! PullingViewController
var destChild = destination.children[0] as! FacilityDetailViewController
destChild = self.storyboard?.instantiateViewController(withIdentifier: "detailView") as! FacilityDetailViewController
var destChild = destination.children[0] as! WOPFacilityDetailViewController
destChild = self.storyboard?.instantiateViewController(withIdentifier: "detailView") as! WOPFacilityDetailViewController
let destDelegate = DeckTransitioningDelegate()
destination.transitioningDelegate = destDelegate
let tapped = sender as! FacilityCollectionViewCell //this is probably a bad idea just FYI future me
......@@ -954,7 +956,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
guard let indexPath = LocationsList?.indexPathForItem(at: location) else { return nil }
if(indexPath.section == 1 || currentAlerts.count == 0) {
let cell = LocationsList?.cellForItem(at: indexPath) as? FacilityCollectionViewCell
guard let detailView = storyboard?.instantiateViewController(withIdentifier: "detailView") as? FacilityDetailViewController else { return nil }
guard let detailView = storyboard?.instantiateViewController(withIdentifier: "detailView") as? WOPFacilityDetailViewController else { return nil }
detailView.facility = cell?.facility
return detailView
}
......@@ -968,7 +970,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
}
func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController) {
guard let facilityDetailView = viewControllerToCommit as? FacilityDetailViewController
guard let facilityDetailView = viewControllerToCommit as? WOPFacilityDetailViewController
else {
let finalDestination = self.storyboard?.instantiateViewController(withIdentifier: "pulling") as? PullingViewController // Fox only, no items
finalDestination?.currentViewController = viewControllerToCommit
......
......@@ -9,21 +9,20 @@
import UIKit
import StoreKit
import MapKit
import WhatsOpenKit
class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
public class WOPFacilityDetailViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
@IBOutlet var NameLabel: UILabel!
@IBOutlet var PlaceLabel: UILabel!
@IBOutlet var OpenLabel: PaddedUILabel!
@IBOutlet var CategoryLabel: UILabel!
@IBOutlet var OpenTimesList: UITableView!
let activity = NSUserActivity(activityType: "facility")
@IBOutlet public var NameLabel: UILabel!
@IBOutlet public var PlaceLabel: UILabel!
@IBOutlet public var OpenLabel: WOPPaddedUILabel!
@IBOutlet public var CategoryLabel: UILabel!
@IBOutlet public var OpenTimesList: UITableView!
public let activity = NSUserActivity(activityType: "facility")
var facility: WOPFacility!
public var facility: WOPFacility!
override var previewActionItems: [UIPreviewActionItem] {
override public var previewActionItems: [UIPreviewActionItem] {
var title: String
if(WOPUtilities.isFavoriteFacility(facility)) {
title = "Remove from Favorites"
......@@ -37,15 +36,15 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
override var preferredStatusBarStyle: UIStatusBarStyle {
override public var preferredStatusBarStyle: UIStatusBarStyle {
return .lightContent
}
override func viewDidDisappear(_ animated: Bool) {
override public func viewDidDisappear(_ animated: Bool) {
activity.resignCurrent()
}
override func viewDidLoad() {
override public func viewDidLoad() {
super.viewDidLoad()
modalPresentationCapturesStatusBarAppearance = true
......@@ -101,21 +100,21 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
activity.becomeCurrent()
}
override func didReceiveMemoryWarning() {
override public func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
func numberOfSections(in tableView: UITableView) -> Int {
public func numberOfSections(in tableView: UITableView) -> Int {
// #warning Incomplete implementation, return the number of sections
return 1
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return WOPUtilities.getCurrentSchedule(facility)!.openTimes.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = OpenTimesList.dequeueReusableCell(withIdentifier: "LocationDetailCell", for: indexPath)
cell.selectionStyle = .none
......@@ -131,7 +130,7 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
return cell
}
func markAsFavoritePreviewAction(_ sendingAction: UIPreviewAction, sender: UIViewController) {
public func markAsFavoritePreviewAction(_ sendingAction: UIPreviewAction, sender: UIViewController) {
if(WOPUtilities.isFavoriteFacility(facility)) {
_ = WOPUtilities.removeFavoriteFacility(facility)
}
......
......@@ -12,13 +12,13 @@ import UIKit
// Based on this
// https://stackoverflow.com/questions/21167226/resizing-a-uilabel-to-accommodate-insets/21267507#21267507
// The entire reason for this subclass of UILabel is for the openClosedLabel in FacilityCollectionViewCell
class PaddedUILabel: UILabel {
public class WOPPaddedUILabel: UILabel {
var textInsets = UIEdgeInsets.zero {
public var textInsets = UIEdgeInsets.zero {
didSet { invalidateIntrinsicContentSize() }
}
override func textRect(forBounds bounds: CGRect, limitedToNumberOfLines numberOfLines: Int) -> CGRect {
override public func textRect(forBounds bounds: CGRect, limitedToNumberOfLines numberOfLines: Int) -> CGRect {
let insetRect = bounds.inset(by: textInsets)
let textRect = super.textRect(forBounds: insetRect, limitedToNumberOfLines: numberOfLines)
let invertedInsets = UIEdgeInsets(top: -textInsets.top,
......@@ -28,25 +28,25 @@ class PaddedUILabel: UILabel {
return textRect.inset(by: invertedInsets)
}
override func drawText(in rect: CGRect) {
override public func drawText(in rect: CGRect) {
super.drawText(in: rect.inset(by: textInsets))
}
}
@IBDesignable
extension PaddedUILabel {
public extension WOPPaddedUILabel {
// currently UIEdgeInsets is no supported IBDesignable type,
// so we have to fan it out here:
@IBInspectable
var leftTextInset: CGFloat {
public var leftTextInset: CGFloat {
set { textInsets.left = newValue }
get { return textInsets.left }
}
@IBInspectable
var rightTextInset: CGFloat {
public var rightTextInset: CGFloat {
set { textInsets.right = newValue }
get { return textInsets.right }
}
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Facility Detail View Controller-->
<scene sceneID="ubk-Vc-bw9">
<objects>
<viewController storyboardIdentifier="detailView" id="8Rc-hI-Z9z" customClass="WOPFacilityDetailViewController" customModule="WhatsOpenKit" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="iQ8-nN-fIC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OPEN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMX-ia-qYw" customClass="WOPPaddedUILabel" customModule="WhatsOpenKit" customModuleProvider="target">
<rect key="frame" x="305" y="118" width="54" height="34"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="34" id="0Cd-jQ-rfJ"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="leftTextInset">
<real key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="rightTextInset">
<real key="value" value="8"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Johnson Center" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bSu-t2-QCF">
<rect key="frame" x="8" y="82.5" width="359" height="27.5"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="23"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RESTAURANT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cOj-cj-QZk">
<rect key="frame" x="8" y="22" width="359" height="20"/>
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="16"/>