Commit 75786e3a authored by Zach Knox's avatar Zach Knox
Browse files

about screens are cool, even if they do nothing yet

parent 71f33364
......@@ -14,6 +14,7 @@
92182EC41E95C38400192ABA /* LocationDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92182EC31E95C38400192ABA /* LocationDetailViewController.swift */; };
924840F81EA915F200DBFF4E /* SRCTSimpleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924840F71EA915F200DBFF4E /* SRCTSimpleCollectionViewCell.swift */; };
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 */; };
9270A4DD1EC0010300DFBDA3 /* Filters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9270A4DC1EC0010300DFBDA3 /* Filters.swift */; };
927C80DA1EB02566009079AD /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 927C80D91EB02566009079AD /* SettingsTableViewController.swift */; };
......@@ -64,6 +65,7 @@
92182EC31E95C38400192ABA /* LocationDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationDetailViewController.swift; sourceTree = "<group>"; };
924840F71EA915F200DBFF4E /* SRCTSimpleCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SRCTSimpleCollectionViewCell.swift; sourceTree = "<group>"; };
9265F3A01F2969E500A54A21 /* SettingTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingTableViewCell.swift; sourceTree = "<group>"; };
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; path = Filters.swift; sourceTree = "<group>"; };
927C80D91EB02566009079AD /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = "<group>"; };
......@@ -154,6 +156,7 @@
924840F71EA915F200DBFF4E /* SRCTSimpleCollectionViewCell.swift */,
CD81F5201DC0334600009FBD /* Main.storyboard */,
927C80D91EB02566009079AD /* SettingsTableViewController.swift */,
9265F3A21F2C0B1500A54A21 /* AboutScreenViewController.swift */,
92182EC31E95C38400192ABA /* LocationDetailViewController.swift */,
92182EBF1E95BD2C00192ABA /* LocationsListViewController.swift */,
CD81F5231DC0334600009FBD /* Assets.xcassets */,
......@@ -350,6 +353,7 @@
92108A331ED755F100675E16 /* CheckingTableViewCell.swift in Sources */,
92182EC01E95BD2C00192ABA /* LocationsListViewController.swift in Sources */,
CD763A7A1DE24EF100ADFD6B /* examplejson.swift in Sources */,
9265F3A31F2C0B1500A54A21 /* AboutScreenViewController.swift in Sources */,
CD466DD21DC12E1200E44DF5 /* MainTableViewController.swift in Sources */,
924840F81EA915F200DBFF4E /* SRCTSimpleCollectionViewCell.swift in Sources */,
9265F3A11F2969E500A54A21 /* SettingTableViewCell.swift in Sources */,
......
//
// AboutScreenViewController.swift
// WhatsOpen
//
// Created by Zach Knox on 7/28/17.
// Copyright © 2017 SRCT. All rights reserved.
//
import UIKit
class AboutScreenViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
/*
// 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.
}
*/
}
{
"images" : [
{
"idiom" : "universal",
"filename" : "WO_Black_TextLight.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
......@@ -354,6 +354,72 @@
</objects>
<point key="canvasLocation" x="-7706" y="-349"/>
</scene>
<!--About-->
<scene sceneID="tgj-ov-KFi">
<objects>
<viewController storyboardIdentifier="about" title="About" useStoryboardIdentifierAsRestorationIdentifier="YES" id="kJM-Pj-1AE" customClass="AboutScreenViewController" customModule="WhatsOpen" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="RHc-Uq-40O"/>
<viewControllerLayoutGuide type="bottom" id="xIs-Se-pN8"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="VoZ-nV-Wve">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WO_Black_TextLight" translatesAutoresizingMaskIntoConstraints="NO" id="tzw-Ro-L8p">
<rect key="frame" x="16" y="72" width="343" height="105"/>
</imageView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="FR0-qX-jnd">
<rect key="frame" x="0.0" y="219" width="375" height="448"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="448" id="Uxj-Pv-2Wp"/>
</constraints>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="vNs-gw-3rv">
<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="vNs-gw-3rv" id="SMa-15-IiV">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
</tableView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.75" translatesAutoresizingMaskIntoConstraints="NO" id="WT6-Th-cbL">
<rect key="frame" x="16" y="174" width="343" height="37"/>
<attributedString key="attributedText">
<fragment content="Version 1.0 (10)">
<attributes>
<font key="NSFont" size="18" name=".SFNSText"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="truncatingTail" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints>
<constraint firstItem="FR0-qX-jnd" firstAttribute="leading" secondItem="VoZ-nV-Wve" secondAttribute="leading" id="03B-JT-efa"/>
<constraint firstItem="FR0-qX-jnd" firstAttribute="top" secondItem="WT6-Th-cbL" secondAttribute="bottom" constant="8" symbolic="YES" id="1Ls-kB-eGL"/>
<constraint firstItem="WT6-Th-cbL" firstAttribute="leading" secondItem="VoZ-nV-Wve" secondAttribute="leadingMargin" id="Dwi-j1-MJu"/>
<constraint firstItem="tzw-Ro-L8p" firstAttribute="leading" secondItem="WT6-Th-cbL" secondAttribute="leading" id="KhP-Sg-VNL"/>
<constraint firstItem="FR0-qX-jnd" firstAttribute="bottom" secondItem="xIs-Se-pN8" secondAttribute="top" id="MgS-Df-onW"/>
<constraint firstItem="FR0-qX-jnd" firstAttribute="top" secondItem="tzw-Ro-L8p" secondAttribute="bottom" constant="42" id="MnP-iC-wV7"/>
<constraint firstItem="WT6-Th-cbL" firstAttribute="top" secondItem="RHc-Uq-40O" secondAttribute="bottom" constant="110" id="RU4-rS-uLl"/>
<constraint firstItem="tzw-Ro-L8p" firstAttribute="trailing" secondItem="WT6-Th-cbL" secondAttribute="trailing" id="Sdr-wJ-TzH"/>
<constraint firstAttribute="trailing" secondItem="FR0-qX-jnd" secondAttribute="trailing" id="Sxh-yE-N5L"/>
<constraint firstItem="tzw-Ro-L8p" firstAttribute="top" secondItem="RHc-Uq-40O" secondAttribute="bottom" constant="8" symbolic="YES" id="ZGe-ml-5d1"/>
<constraint firstItem="tzw-Ro-L8p" firstAttribute="centerX" secondItem="FR0-qX-jnd" secondAttribute="centerX" id="cs6-s4-1Tf"/>
</constraints>
</view>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="N7e-vM-hJi" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-6852" y="-349.47526236881561"/>
</scene>
<!--Location Detail View Controller-->
<scene sceneID="O6o-IK-A4J">
<objects>
......@@ -545,5 +611,8 @@
<point key="canvasLocation" x="-8599" y="-1066"/>
</scene>
</scenes>
<resources>
<image name="WO_Black_TextLight" width="2355" height="692"/>
</resources>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</document>
......@@ -30,8 +30,10 @@ class SettingTableViewCell: UITableViewCell {
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
if(selected) {
super.setSelected(false, animated: animated)
}
// Configure the view for the selected state
}
}
......@@ -44,7 +44,7 @@ class SettingsTableViewController: UITableViewController {
return 1
}
else if(section == 1) {
return 2
return 3
}
else {
return 0
......@@ -58,12 +58,22 @@ class SettingsTableViewController: UITableViewController {
case 0:
cell.textLabel!.text = "Are Our Hours Wrong?"
case 1:
if indexPath.row == 0 {
switch indexPath.row {
case 0:
cell.textLabel!.text = "Review on the App Store"
case 1:
cell.textLabel!.text = "About SRCT"
cell.linkURL = URL(string: "https://srct.gmu.edu")
case 2:
cell.textLabel!.text = "About What's Open"
default:
cell.textLabel!.text = "rip"
}
if indexPath.row == 0 {
}
else if indexPath.row == 1 {
cell.textLabel!.text = "About What's Open"
}
default:
break
......@@ -81,8 +91,11 @@ class SettingsTableViewController: UITableViewController {
self.showDetailViewController(SFSafariViewController(url: settingcell.linkURL!), sender: settingcell)
}
else if settingcell.textLabel?.text == "Are Our Hours Wrong?" {
let mailto = settingcell.initMail(subject: "What's Open - Your Hours are Wrong", to: "srct@gmu.edu")
print(mailto)
settingcell.initMail(subject: "What's Open - Your Hours are Wrong", to: "srct@gmu.edu")
}
else if settingcell.textLabel!.text == "About What's Open" {
let avc = self.storyboard?.instantiateViewController(withIdentifier: "about")
self.show(avc!, sender: settingcell)
}
}
else {
......
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