Skip to content

GitLab

Unverified Commit 3d5c11c3 authored by Zach Knox's avatar Zach Knox
Browse files

reorganized project, removed lagacy code, and maybe fixed #41?

parent 07f9a8f5
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 315 deletions
WhatsOpen/WhatsOpen.xcodeproj/project.pbxproj
View file @ 3d5c11c3
......@@ -12,7 +12,6 @@
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 */; };
9203CB882023D51A006ACC3B /* PickingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929157211FF4662F00ED63C7 /* PickingTableViewCell.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 */; };
......@@ -20,17 +19,15 @@
9203CB8D2023D51A006ACC3B /* examplejson.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A791DE24EF100ADFD6B /* examplejson.swift */; };
9203CB8E2023D51A006ACC3B /* AboutScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9265F3A21F2C0B1500A54A21 /* AboutScreenViewController.swift */; };
9203CB8F2023D51A006ACC3B /* PaddedUILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */; };
9203CB902023D51A006ACC3B /* MainTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD466DD11DC12E1200E44DF5 /* MainTableViewController.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 */; };
9203CB942023D51A006ACC3B /* Filters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9270A4DC1EC0010300DFBDA3 /* Filters.swift */; };
9203CB952023D51A006ACC3B /* FiltersTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 927C80DB1EB18B89009079AD /* FiltersTableViewController.swift */; };
9203CB962023D51A006ACC3B /* PullingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B89E2F2009444E00928284 /* PullingViewController.swift */; };
9203CB972023D51A006ACC3B /* SRCTUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A7D1DE253B900ADFD6B /* SRCTUtilities.swift */; };
9203CB972023D51A006ACC3B /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A7D1DE253B900ADFD6B /* Utilities.swift */; };
9203CB982023D51A006ACC3B /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 927C80D91EB02566009079AD /* SettingsTableViewController.swift */; };
9203CB992023D51A006ACC3B /* SRCTNetworkController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD3C97481DC18AB300A84434 /* SRCTNetworkController.swift */; };
9203CB9A2023D51A006ACC3B /* SRCTSimpleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A7B1DE251C400ADFD6B /* SRCTSimpleTableViewCell.swift */; };
9203CB9B2023D51A006ACC3B /* IconSelectionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FF6C7420016CF900D836AE /* IconSelectionTableViewCell.swift */; };
9203CB9C2023D51A006ACC3B /* SwitchingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9270A4DA1EB5565400DFBDA3 /* SwitchingTableViewCell.swift */; };
9203CB9D2023D51A006ACC3B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD81F51C1DC0334600009FBD /* AppDelegate.swift */; };
......@@ -52,7 +49,6 @@
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 */; };
929157221FF4662F00ED63C7 /* PickingTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929157211FF4662F00ED63C7 /* PickingTableViewCell.swift */; };
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 */; };
......@@ -63,10 +59,8 @@
92FF6C7520016CF900D836AE /* IconSelectionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FF6C7420016CF900D836AE /* IconSelectionTableViewCell.swift */; };
A59CFF110A3F520FC73EF32E /* Pods_WhatsOpen.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 927A8466141434969CE74044 /* Pods_WhatsOpen.framework */; };
CD3C97491DC18AB300A84434 /* SRCTNetworkController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD3C97481DC18AB300A84434 /* SRCTNetworkController.swift */; };
CD466DD21DC12E1200E44DF5 /* MainTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD466DD11DC12E1200E44DF5 /* MainTableViewController.swift */; };
CD763A7A1DE24EF100ADFD6B /* examplejson.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A791DE24EF100ADFD6B /* examplejson.swift */; };
CD763A7C1DE251C400ADFD6B /* SRCTSimpleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A7B1DE251C400ADFD6B /* SRCTSimpleTableViewCell.swift */; };
CD763A7E1DE253B900ADFD6B /* SRCTUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A7D1DE253B900ADFD6B /* SRCTUtilities.swift */; };
CD763A7E1DE253B900ADFD6B /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD763A7D1DE253B900ADFD6B /* Utilities.swift */; };
CD81F51D1DC0334600009FBD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD81F51C1DC0334600009FBD /* AppDelegate.swift */; };
CD81F5221DC0334600009FBD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD81F5201DC0334600009FBD /* Main.storyboard */; };
CD81F5241DC0334600009FBD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD81F5231DC0334600009FBD /* Assets.xcassets */; };
......@@ -104,20 +98,17 @@
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>"; };
9281AD7B2002CF1700D09203 /* SetIconTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetIconTableViewController.swift; sourceTree = "<group>"; };
929157211FF4662F00ED63C7 /* PickingTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickingTableViewCell.swift; sourceTree = "<group>"; };
92B2D2FE1FF8599500349E90 /* FilterSelectionTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterSelectionTableViewController.swift; sourceTree = "<group>"; };
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>"; };
92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaddedUILabel.swift; path = WhatsOpen/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/AlertCollectionViewCell.swift; sourceTree = SOURCE_ROOT; };
92FF6C721FFEEEE900D836AE /* AlertCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AlertCollectionViewCell.swift; path = WhatsOpen/Views/CollectionViewCells/AlertCollectionViewCell.swift; sourceTree = SOURCE_ROOT; };
92FF6C7420016CF900D836AE /* IconSelectionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconSelectionTableViewCell.swift; sourceTree = "<group>"; };
CD3C97481DC18AB300A84434 /* SRCTNetworkController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SRCTNetworkController.swift; sourceTree = "<group>"; };
CD466DD11DC12E1200E44DF5 /* MainTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainTableViewController.swift; sourceTree = "<group>"; };
CD763A791DE24EF100ADFD6B /* examplejson.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = examplejson.swift; path = "Object Model/examplejson.swift"; sourceTree = "<group>"; };
CD763A7B1DE251C400ADFD6B /* SRCTSimpleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SRCTSimpleTableViewCell.swift; sourceTree = "<group>"; };
CD763A7D1DE253B900ADFD6B /* SRCTUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SRCTUtilities.swift; sourceTree = "<group>"; };
CD763A7D1DE253B900ADFD6B /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
CD81F5191DC0334600009FBD /* WhatsOpen.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WhatsOpen.app; sourceTree = BUILT_PRODUCTS_DIR; };
CD81F51C1DC0334600009FBD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
CD81F5211DC0334600009FBD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
......@@ -173,6 +164,8 @@
920D17961F6C5CD200D63295 /* Views */ = {
isa = PBXGroup;
children = (
9255418520857CF40058E420 /* CollectionViewCells */,
9255418420857CE40058E420 /* TableViewCells */,
92B89E2F2009444E00928284 /* PullingViewController.swift */,
92B89E2D20093E3600928284 /* AlertDetailViewController.swift */,
9281AD7B2002CF1700D09203 /* SetIconTableViewController.swift */,
......@@ -187,6 +180,26 @@
path = Views;
sourceTree = "<group>";
};
9255418420857CE40058E420 /* TableViewCells */ = {
isa = PBXGroup;
children = (
9270A4DA1EB5565400DFBDA3 /* SwitchingTableViewCell.swift */,
9265F3A01F2969E500A54A21 /* SettingTableViewCell.swift */,
92108A321ED755F100675E16 /* CheckingTableViewCell.swift */,
92FF6C7420016CF900D836AE /* IconSelectionTableViewCell.swift */,
);
path = TableViewCells;
sourceTree = "<group>";
};
9255418520857CF40058E420 /* CollectionViewCells */ = {
isa = PBXGroup;
children = (
924840F71EA915F200DBFF4E /* FacilityCollectionViewCell.swift */,
92FF6C721FFEEEE900D836AE /* AlertCollectionViewCell.swift */,
);
path = CollectionViewCells;
sourceTree = "<group>";
};
928794021FA27C8A008860FF /* Recovered References */ = {
isa = PBXGroup;
children = (
......@@ -222,18 +235,9 @@
CD81F5301DC03AA700009FBD /* DataModel */,
CD81F51C1DC0334600009FBD /* AppDelegate.swift */,
9270A4DC1EC0010300DFBDA3 /* Filters.swift */,
9270A4DA1EB5565400DFBDA3 /* SwitchingTableViewCell.swift */,
9265F3A01F2969E500A54A21 /* SettingTableViewCell.swift */,
92108A321ED755F100675E16 /* CheckingTableViewCell.swift */,
CD466DD11DC12E1200E44DF5 /* MainTableViewController.swift */,
CD763A7D1DE253B900ADFD6B /* SRCTUtilities.swift */,
CD763A7B1DE251C400ADFD6B /* SRCTSimpleTableViewCell.swift */,
924840F71EA915F200DBFF4E /* FacilityCollectionViewCell.swift */,
CD763A7D1DE253B900ADFD6B /* Utilities.swift */,
92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */,
CD81F5201DC0334600009FBD /* Main.storyboard */,
92FF6C7420016CF900D836AE /* IconSelectionTableViewCell.swift */,
929157211FF4662F00ED63C7 /* PickingTableViewCell.swift */,
92FF6C721FFEEEE900D836AE /* AlertCollectionViewCell.swift */,
920D17961F6C5CD200D63295 /* Views */,
CD81F5231DC0334600009FBD /* Assets.xcassets */,
CD81F5251DC0334600009FBD /* LaunchScreen.storyboard */,
......@@ -630,7 +634,6 @@
files = (
9203CB862023D51A006ACC3B /* FilterSelectionTableViewController.swift in Sources */,
9203CB872023D51A006ACC3B /* FacilityDetailViewController.swift in Sources */,
9203CB882023D51A006ACC3B /* PickingTableViewCell.swift in Sources */,
9203CB892023D51A006ACC3B /* AlertCollectionViewCell.swift in Sources */,
9203CB8A2023D51A006ACC3B /* CheckingTableViewCell.swift in Sources */,
9203CB8B2023D51A006ACC3B /* FacilitiesListViewController.swift in Sources */,
......@@ -638,18 +641,16 @@
9203CB8D2023D51A006ACC3B /* examplejson.swift in Sources */,
9203CB8E2023D51A006ACC3B /* AboutScreenViewController.swift in Sources */,
9203CB8F2023D51A006ACC3B /* PaddedUILabel.swift in Sources */,
9203CB902023D51A006ACC3B /* MainTableViewController.swift in Sources */,
9203CB912023D51A006ACC3B /* SetIconTableViewController.swift in Sources */,
9203CB922023D51A006ACC3B /* FacilityCollectionViewCell.swift in Sources */,
9203CB932023D51A006ACC3B /* SettingTableViewCell.swift in Sources */,
9203CB942023D51A006ACC3B /* Filters.swift in Sources */,
9203CB952023D51A006ACC3B /* FiltersTableViewController.swift in Sources */,
9203CB962023D51A006ACC3B /* PullingViewController.swift in Sources */,
9203CB972023D51A006ACC3B /* SRCTUtilities.swift in Sources */,
9203CB972023D51A006ACC3B /* Utilities.swift in Sources */,
92554183207ECEC30058E420 /* SelectOneDefaultTableViewController.swift in Sources */,
9203CB982023D51A006ACC3B /* SettingsTableViewController.swift in Sources */,
9203CB992023D51A006ACC3B /* SRCTNetworkController.swift in Sources */,
9203CB9A2023D51A006ACC3B /* SRCTSimpleTableViewCell.swift in Sources */,
9203CB9B2023D51A006ACC3B /* IconSelectionTableViewCell.swift in Sources */,
9203CB9C2023D51A006ACC3B /* SwitchingTableViewCell.swift in Sources */,
9203CB9D2023D51A006ACC3B /* AppDelegate.swift in Sources */,
......@@ -662,7 +663,6 @@
files = (
92B2D2FF1FF8599500349E90 /* FilterSelectionTableViewController.swift in Sources */,
92182EC41E95C38400192ABA /* FacilityDetailViewController.swift in Sources */,
929157221FF4662F00ED63C7 /* PickingTableViewCell.swift in Sources */,
92FF6C731FFEEEE900D836AE /* AlertCollectionViewCell.swift in Sources */,
92108A331ED755F100675E16 /* CheckingTableViewCell.swift in Sources */,
92182EC01E95BD2C00192ABA /* FacilitiesListViewController.swift in Sources */,
......@@ -670,18 +670,16 @@
CD763A7A1DE24EF100ADFD6B /* examplejson.swift in Sources */,
9265F3A31F2C0B1500A54A21 /* AboutScreenViewController.swift in Sources */,
92EA81971FB7D1B500B1F6E3 /* PaddedUILabel.swift in Sources */,
CD466DD21DC12E1200E44DF5 /* MainTableViewController.swift in Sources */,
9281AD7C2002CF1700D09203 /* SetIconTableViewController.swift in Sources */,
924840F81EA915F200DBFF4E /* FacilityCollectionViewCell.swift in Sources */,
9265F3A11F2969E500A54A21 /* SettingTableViewCell.swift in Sources */,
9270A4DD1EC0010300DFBDA3 /* Filters.swift in Sources */,
927C80DC1EB18B89009079AD /* FiltersTableViewController.swift in Sources */,
92B89E302009444E00928284 /* PullingViewController.swift in Sources */,
CD763A7E1DE253B900ADFD6B /* SRCTUtilities.swift in Sources */,
CD763A7E1DE253B900ADFD6B /* Utilities.swift in Sources */,
9259134520784D66002E50B1 /* SelectOneDefaultTableViewController.swift in Sources */,
927C80DA1EB02566009079AD /* SettingsTableViewController.swift in Sources */,
CD3C97491DC18AB300A84434 /* SRCTNetworkController.swift in Sources */,
CD763A7C1DE251C400ADFD6B /* SRCTSimpleTableViewCell.swift in Sources */,
92FF6C7520016CF900D836AE /* IconSelectionTableViewCell.swift in Sources */,
9270A4DB1EB5565400DFBDA3 /* SwitchingTableViewCell.swift in Sources */,
CD81F51D1DC0334600009FBD /* AppDelegate.swift in Sources */,
......
WhatsOpen/WhatsOpen/Base.lproj/Main.storyboard
View file @ 3d5c11c3
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="DGD-49-9Ue">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="DGD-49-9Ue">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
......@@ -64,28 +64,6 @@
<segue destination="yIT-AR-gdn" kind="show" identifier="toSelection" id="lwF-fe-hI5"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="picking" rowHeight="157" id="Qzo-pS-g9l" customClass="PickingTableViewCell" customModule="WhatsOpen" customModuleProvider="target">
<rect key="frame" x="0.0" y="187.5" width="375" height="157"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Qzo-pS-g9l" id="gyt-MF-bQ2">
<rect key="frame" x="0.0" y="0.0" width="375" height="156.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rpt-Of-2BY">
<rect key="frame" x="0.0" y="-30" width="375" height="216"/>
</pickerView>
</subviews>
<constraints>
<constraint firstItem="Rpt-Of-2BY" firstAttribute="top" secondItem="gyt-MF-bQ2" secondAttribute="topMargin" constant="-41" id="7mi-Wh-JBQ"/>
<constraint firstItem="Rpt-Of-2BY" firstAttribute="centerY" secondItem="gyt-MF-bQ2" secondAttribute="centerY" id="NoV-nt-cIb"/>
<constraint firstItem="Rpt-Of-2BY" firstAttribute="leading" secondItem="gyt-MF-bQ2" secondAttribute="leading" id="eka-9S-DfO"/>
<constraint firstAttribute="trailing" secondItem="Rpt-Of-2BY" secondAttribute="trailing" id="tBC-fA-0Nf"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="pickerView" destination="Rpt-Of-2BY" id="ek7-I8-MFW"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="jkQ-vu-LQa" id="DbO-38-R86"/>
......@@ -673,7 +651,7 @@
<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">
<rect key="frame" x="8" y="118" width="359" height="38"/>
<rect key="frame" x="8" y="117.5" width="359" height="38"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="38" id="9W6-hU-MSZ"/>
......@@ -683,7 +661,7 @@
<nil key="highlightedColor"/>
</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" width="359" height="28"/>
<rect key="frame" x="8" y="82" width="359" height="27.5"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="23"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -701,7 +679,7 @@
<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="164" width="375" height="373"/>
<rect key="frame" x="0.0" y="163.5" width="375" height="373.5"/>
<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">
......@@ -953,7 +931,7 @@
<image name="major" width="266" height="266"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="FRf-a6-Dgs"/>
<segue reference="lwF-fe-hI5"/>
</inferredMetricsTieBreakers>
<color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</document>
WhatsOpen/WhatsOpen/MainTableViewController.swift deleted 100644 → 0
View file @ 07f9a8f5
//
// MainTableViewController.swift
// WhatsOpen
//
// Created by Patrick Murray on 25/10/2016.
// Copyright © 2016 SRCT. Some rights reserved.
//
import UIKit
import RealmSwift
class MainTableViewController: UITableViewController {
var facilitiesArray = Array<Facility>()
@IBOutlet var mainNavigationBar: UINavigationItem!
override func viewWillAppear(_ animated: Bool) {
mainNavigationBar.titleView = UIImageView(image: #imageLiteral(resourceName: "Navigation Bar TitleView"))
}
override var preferredStatusBarStyle: UIStatusBarStyle {
return .default
}
override func viewDidLoad() {
super.viewDidLoad()
// Uncomment the following line to preserve selection between presentations
// self.clearsSelectionOnViewWillAppear = false
// Uncomment the following line to display an Edit button in the navigation bar for this view controller.
// self.navigationItem.rightBarButtonItem = self.editButtonItem()
SRCTNetworkController.performDownload { (facilities) in
self.facilitiesArray = Array(facilities!)
self.tableView.reloadData()
}
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
// MARK: - Table view data source
override func numberOfSections(in tableView: UITableView) -> Int {
// #warning Incomplete implementation, return the number of sections
//Will want to have two sections (for some parts) eventually, to add headings
//for open and closed
return 2
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
// #warning Incomplete implementation, return the number of rows
let count = countForOpenAndClosedFacilities(facilitiesArray)
if(section == 1) {
return count.open
}
else {
return count.closed
}
}
//Returns an array which has the open locations listed first
//Could be improved in the future because currently this means you're checking
//open status twice per cell
func placeOpenFacilitiesFirstInArray(_ facilitiesArray: [Facility]) -> [Facility] {
var open = [Facility]()
var closed = [Facility]()
for i in facilitiesArray {
if(Utilities.isOpen(facility: i)) {
open.append(i)
}
else {
closed.append(i)
}
}
// Test
return open + closed
}
func countForOpenAndClosedFacilities(_ facilitiesArray: [Facility]) -> (open: Int, closed: Int) {
var open = 0
var closed = 0
for i in facilitiesArray {
if(Utilities.isOpen(facility: i)) {
open += 1
}
else {
closed += 1
}
}
return (open, closed)
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! SRCTSimpleTableViewCell
let dataArray = placeOpenFacilitiesFirstInArray(facilitiesArray)
let facility = dataArray[indexPath.row]
cell.nameLabel.text = facility.facilityName
let open = Utilities.isOpen(facility: facility);
if(open == true){
cell.openClosedLabel.text = "Open"
cell.openClosedLabel.backgroundColor = UIColor(red:0.00, green:0.40, blue:0.20, alpha:1.0)
}else{
cell.openClosedLabel.text = "Closed"
cell.openClosedLabel.backgroundColor = UIColor.red
}
cell.timeDescriptionLabel.text = Utilities.timeUntilFacility(facility)
self.reloadInputViews()
return cell
}
@IBAction func SearchButton(_ sender: Any) {
print("Hello")
}
/*
// Override to support conditional editing of the table view.
override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
// Return false if you do not want the specified item to be editable.
return true
}
*/
/*
// Override to support editing the table view.
override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
if editingStyle == .delete {
// Delete the row from the data source
tableView.deleteRows(at: [indexPath], with: .fade)
} else if editingStyle == .insert {
// Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
}
}
*/
/*
// Override to support rearranging the table view.
override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) {
}
*/
/*
// Override to support conditional rearranging of the table view.
override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
// Return false if you do not want the item to be re-orderable.
return true
}
*/
/*
// 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.
// Pass the selected object to the new view controller.
}
*/
}
WhatsOpen/WhatsOpen/PickingTableViewCell.swift deleted 100644 → 0
View file @ 07f9a8f5
//
// PickingTableViewCell.swift
// WhatsOpen
//
// Created by Zach Knox on 12/27/17.
// Copyright © 2017 SRCT. All rights reserved.
//
import UIKit
class PickingTableViewCell: UITableViewCell, UIPickerViewDelegate, UIPickerViewDataSource {
@IBOutlet var pickerView: UIPickerView!
var pickerStrings: [String] = [String]()
var pickerItems: [Any?]! //literally just here for convienence
var pickerChecked = [Bool]() //Should I use a dictionary? maybe, but this is way easier
var pickFunc: ((String?, Bool) -> Bool)!
override func awakeFromNib() {
self.selectionStyle = .none
pickerView.dataSource = self
pickerView.delegate = self
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
func numberOfComponents(in pickerView: UIPickerView) -> Int {
return 1
}
func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
return pickerStrings.count
}
func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
return pickerStrings[row]
}
func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
pickerChecked[row] = !pickerChecked[row]
_ = pickFunc(pickerStrings[row], pickerChecked[row])
pickerView.reloadComponent(component)
}
}
WhatsOpen/WhatsOpen/SRCTSimpleTableViewCell.swift deleted 100644 → 0
View file @ 07f9a8f5
//
// SRCTSimpleTableViewCell.swift
// WhatsOpen
//
// Created by Patrick Murray on 20/11/2016.
// Copyright © 2016 SRCT. Some rights reserved.
//
import UIKit
class SRCTSimpleTableViewCell: UITableViewCell {
@IBOutlet weak var openClosedLabel: UILabel!
@IBOutlet weak var nameLabel: UILabel!
@IBOutlet weak var timeDescriptionLabel: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
WhatsOpen/WhatsOpen/Views/FacilitiesListViewController.swift
View file @ 3d5c11c3
......@@ -433,6 +433,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
}
updateFiltersLists()
checkFilterState()
reloadWithFilters()
refreshControl.endRefreshing()
......
WhatsOpen/WhatsOpen/SwitchingTableViewCell.swift → WhatsOpen/WhatsOpen/Views/TableViewCells/SwitchingTableViewCell.swift
View file @ 3d5c11c3
......@@ -28,8 +28,6 @@ class SwitchingTableViewCell: UITableViewCell {
}
@objc func toggleSwitch(_ sender: Any) {
print("toggle")
let res = toggleFunc(self.switchControl.isOn)
if( res == false ) {
// Probably should do some error handling here
......
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