Merged everything to ViewController + got sample entry in table (5cd0fa13) · Commits · Chris / hackathonsp18_dms_swift

GuardianAngelSwift/GuardianAngelSwift.xcodeproj/project.pbxproj

+4 −8

Original line number	Diff line number	Diff line
		@@ -7,14 +7,13 @@
		objects = {

		/* Begin PBXBuildFile section */
		7A6282A7207C9C4B00B0F8B5 /* DMSEntryListView.swift in Sources / = {isa = PBXBuildFile; fileRef = 7A6282A6207C9C4B00B0F8B5 / DMSEntryListView.swift */; };
		7AD653C62079877F0058ADE4 /* AppDelegate.swift in Sources / = {isa = PBXBuildFile; fileRef = 7AD653C52079877F0058ADE4 / AppDelegate.swift */; };
		7AD653C82079877F0058ADE4 /* ViewController.swift in Sources / = {isa = PBXBuildFile; fileRef = 7AD653C72079877F0058ADE4 / ViewController.swift */; };
		7AD653CB2079877F0058ADE4 /* Main.storyboard in Resources / = {isa = PBXBuildFile; fileRef = 7AD653C92079877F0058ADE4 / Main.storyboard */; };
		7AD653CD2079877F0058ADE4 /* Assets.xcassets in Resources / = {isa = PBXBuildFile; fileRef = 7AD653CC2079877F0058ADE4 / Assets.xcassets */; };
		7AD653D02079877F0058ADE4 /* LaunchScreen.storyboard in Resources / = {isa = PBXBuildFile; fileRef = 7AD653CE2079877F0058ADE4 / LaunchScreen.storyboard */; };
		7AD653DB2079877F0058ADE4 /* GuardianAngelSwiftTests.swift in Sources / = {isa = PBXBuildFile; fileRef = 7AD653DA2079877F0058ADE4 / GuardianAngelSwiftTests.swift */; };
		7AD92CEE207A021A008A73AA /* DMSEntry.swift in Sources / = {isa = PBXBuildFile; fileRef = 7AD92CED207A021A008A73AA / DMSEntry.swift */; };
		7AD92CF0207A080A008A73AA /* DMSEntryListView.swift in Sources / = {isa = PBXBuildFile; fileRef = 7AD92CEF207A080A008A73AA / DMSEntryListView.swift */; };
		/* End PBXBuildFile section */

		/* Begin PBXContainerItemProxy section */
		@@ -28,6 +27,7 @@
		/* End PBXContainerItemProxy section */

		/* Begin PBXFileReference section */
		7A6282A6207C9C4B00B0F8B5 /* DMSEntryListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DMSEntryListView.swift; path = ../../../../../.Trash/DMSEntryListView.swift; sourceTree = "<group>"; };
		7AD653C22079877F0058ADE4 /* GuardianAngelSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GuardianAngelSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
		7AD653C52079877F0058ADE4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
		7AD653C72079877F0058ADE4 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
		@@ -38,8 +38,6 @@
		7AD653D62079877F0058ADE4 /* GuardianAngelSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GuardianAngelSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
		7AD653DA2079877F0058ADE4 /* GuardianAngelSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuardianAngelSwiftTests.swift; sourceTree = "<group>"; };
		7AD653DC207987800058ADE4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
		7AD92CED207A021A008A73AA /* DMSEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMSEntry.swift; sourceTree = "<group>"; };
		7AD92CEF207A080A008A73AA /* DMSEntryListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMSEntryListView.swift; sourceTree = "<group>"; };
		/* End PBXFileReference section */

		/* Begin PBXFrameworksBuildPhase section */
		@@ -83,10 +81,9 @@
		children = (
		7AD653C52079877F0058ADE4 /* AppDelegate.swift */,
		7AD653C72079877F0058ADE4 /* ViewController.swift */,
		7AD92CED207A021A008A73AA /* DMSEntry.swift */,
		7AD92CEF207A080A008A73AA /* DMSEntryListView.swift */,
		7AD653C92079877F0058ADE4 /* Main.storyboard */,
		7AD653CC2079877F0058ADE4 /* Assets.xcassets */,
		7A6282A6207C9C4B00B0F8B5 /* DMSEntryListView.swift */,
		7AD653CE2079877F0058ADE4 /* LaunchScreen.storyboard */,
		7AD653D12079877F0058ADE4 /* Info.plist */,
		);
		@@ -205,8 +202,7 @@
		files = (
		7AD653C82079877F0058ADE4 /* ViewController.swift in Sources */,
		7AD653C62079877F0058ADE4 /* AppDelegate.swift in Sources */,
		7AD92CF0207A080A008A73AA /* DMSEntryListView.swift in Sources */,
		7AD92CEE207A021A008A73AA /* DMSEntry.swift in Sources */,
		7A6282A7207C9C4B00B0F8B5 /* DMSEntryListView.swift in Sources */,
		);
		runOnlyForDeploymentPostprocessing = 0;
		};

GuardianAngelSwift/GuardianAngelSwift.xcodeproj/project.xcworkspace/xcuserdata/gspbirel56.xcuserdatad/UserInterfaceState.xcuserstate

+15.2 KiB (66.2 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

GuardianAngelSwift/GuardianAngelSwift/Base.lproj/Main.storyboard

+15 −7

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@
		<!--View Controller-->
		<scene sceneID="xj3-JM-aFc">
		<objects>
		<viewController id="B4C-07-lOU" sceneMemberID="viewController">
		<viewController id="B4C-07-lOU" customClass="ViewController" customModule="GuardianAngelSwift" customModuleProvider="target" sceneMemberID="viewController">
		<view key="view" contentMode="scaleToFill" id="TFs-9x-RlW">
		<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
		<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
		@@ -59,15 +59,20 @@
		<segue destination="suB-40-Rzp" kind="show" animates="NO" id="OsB-wu-6FR"/>
		</connections>
		</button>
		<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="owO-mf-B5Q" customClass="DMSEntryListView" customModule="GuardianAngelSwift" customModuleProvider="target">
		<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="90" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="owO-mf-B5Q" customClass="DMSEntryListView" customModule="GuardianAngelSwift" customModuleProvider="target">
		<rect key="frame" x="16" y="85" width="343" height="693"/>
		<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
		<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
		<view key="tableFooterView" contentMode="scaleToFill" id="mcs-F0-vao">
		<rect key="frame" x="0.0" y="118" width="343" height="44"/>
		<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
		<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
		</view>
		<prototypes>
		<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="DMSEntryCell" rowHeight="90" id="SLE-dg-zGM" customClass="DMSEntry" customModule="GuardianAngelSwift" customModuleProvider="target">
		<rect key="frame" x="0.0" y="28" width="343" height="90"/>
		<autoresizingMask key="autoresizingMask"/>
		<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="SLE-dg-zGM" id="9a2-sU-Kr6">
		<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="SLE-dg-zGM" id="9a2-sU-Kr6" customClass="DMSEntry" customModule="GuardianAngelSwift" customModuleProvider="target">
		<rect key="frame" x="0.0" y="0.0" width="343" height="89.666666666666671"/>
		<autoresizingMask key="autoresizingMask"/>
		<subviews>
		@@ -90,12 +95,12 @@
		<nil key="highlightedColor"/>
		</label>
		</subviews>
		<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
		</tableViewCellContentView>
		<connections>
		<outlet property="dateTimeLabel" destination="oRS-qN-k6h" id="38D-6Z-U8h"/>
		<outlet property="enabledSwitch" destination="FaQ-B7-Rf2" id="CMX-u1-oqU"/>
		<outlet property="labelDateTime" destination="oRS-qN-k6h" id="fze-r6-1Xs"/>
		<outlet property="titleLabel" destination="tCK-eS-KT3" id="RJC-Wx-wvb"/>
		<outlet property="dateTimeLabel" destination="oRS-qN-k6h" id="M04-lz-1z0"/>
		<outlet property="enabledSwitch" destination="FaQ-B7-Rf2" id="hPd-is-Fnp"/>
		<outlet property="titleLabel" destination="tCK-eS-KT3" id="F2p-mL-cGJ"/>
		</connections>
		</tableViewCell>
		</prototypes>
		@@ -104,6 +109,9 @@
		<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
		<viewLayoutGuide key="safeArea" id="8Jg-9I-Zyw"/>
		</view>
		<connections>
		<outlet property="DMSEntries" destination="owO-mf-B5Q" id="Sk2-K1-nfM"/>
		</connections>
		</viewController>
		<placeholder placeholderIdentifier="IBFirstResponder" id="Uua-C7-TzK" userLabel="First Responder" sceneMemberID="firstResponder"/>
		</objects>

GuardianAngelSwift/GuardianAngelSwift/DMSEntry.swift

deleted100644 → 0

+0 −44

Original line number	Diff line number	Diff line
		//
		// DMSEntry.swift
		// GuardianAngelSwift
		//
		// Created by Chris Shula on 4/8/18.
		// Copyright © 2018 Chris Morris. All rights reserved.
		//

		import UIKit

		class DMSEntry: UITableViewCell {

		//MARK: Properties
		@IBOutlet weak var titleLabel: UILabel!
		@IBOutlet weak var dateTimeLabel: UILabel!
		@IBOutlet weak var enabledSwitch: UISwitch!

		/*
		init(title: String, dateTime: String, enabledSwitch: Bool)
		{

		titleLabel.text = title
		dateTimeLabel.text = dateTime
		self.enabledSwitch.isOn = enabledSwitch
		}
		required init?(coder aDecoder: NSCoder) {
		fatalError("init(coder:) has not been implemented")
		}
		*/


		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
		}


		}

GuardianAngelSwift/GuardianAngelSwift/DMSEntryListView.swift

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		//
		// DMSEntryListView.swift
		// GuardianAngelSwift
		//
		// Created by Chris Shula on 4/8/18.
		// Copyright © 2018 Chris Morris. All rights reserved.
		//

		import UIKit

		class DMSEntryListView: UITableView {

		/*
		// Only override draw() if you perform custom drawing.
		// An empty implementation adversely affects performance during animation.
		override func draw(_ rect: CGRect) {
		// Drawing code
		}
		*/
		// Table view cells are reused and should be dequeued using a cell identifier.

		}