diff --git a/RPI Tours/.DS_Store b/RPI Tours/.DS_Store index 43fa8fd..d93b06f 100644 Binary files a/RPI Tours/.DS_Store and b/RPI Tours/.DS_Store differ diff --git a/RPI Tours/RPI Tours.xcodeproj/project.pbxproj b/RPI Tours/RPI Tours.xcodeproj/project.pbxproj index 7e3e34e..a891df9 100644 --- a/RPI Tours/RPI Tours.xcodeproj/project.pbxproj +++ b/RPI Tours/RPI Tours.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 5299A2191C66AF7E0072F8D3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5299A2171C66AF7E0072F8D3 /* LaunchScreen.storyboard */; }; 5299A2241C66AF7E0072F8D3 /* RPI_ToursTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5299A2231C66AF7E0072F8D3 /* RPI_ToursTests.swift */; }; 5299A22F1C66AF7E0072F8D3 /* RPI_ToursUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5299A22E1C66AF7E0072F8D3 /* RPI_ToursUITests.swift */; }; + 5299A64E1CE022A100F57D76 /* LicensesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5299A64D1CE022A100F57D76 /* LicensesViewController.swift */; }; 52BDD9581CAF526600EEEE7A /* Tours.json in Resources */ = {isa = PBXBuildFile; fileRef = 52BDD9571CAF526600EEEE7A /* Tours.json */; }; 52C3FFEE1C9A384A00562190 /* GeneralMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52C3FFED1C9A384A00562190 /* GeneralMapViewController.swift */; }; 52E2F9261CCAC77800048FA5 /* mapBoxAPIKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E2F9251CCAC77800048FA5 /* mapBoxAPIKeys.swift */; }; @@ -79,6 +80,7 @@ 5299A22A1C66AF7E0072F8D3 /* RPI ToursUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "RPI ToursUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 5299A22E1C66AF7E0072F8D3 /* RPI_ToursUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RPI_ToursUITests.swift; sourceTree = ""; }; 5299A2301C66AF7E0072F8D3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5299A64D1CE022A100F57D76 /* LicensesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LicensesViewController.swift; sourceTree = ""; }; 52BDD9571CAF526600EEEE7A /* Tours.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Tours.json; sourceTree = ""; }; 52C3FFED1C9A384A00562190 /* GeneralMapViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralMapViewController.swift; sourceTree = ""; }; 52E2F9251CCAC77800048FA5 /* mapBoxAPIKeys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = mapBoxAPIKeys.swift; path = ../../../../../../Temporary/mapBoxAPIKeys.swift; sourceTree = ""; }; @@ -212,6 +214,7 @@ 52C3FFED1C9A384A00562190 /* GeneralMapViewController.swift */, 5264201A1CB2D54A00F7EEE2 /* SelectedTourViewController.swift */, 5264201C1CB2E16800F7EEE2 /* DirectionsViewController.swift */, + 5299A64D1CE022A100F57D76 /* LicensesViewController.swift */, ); name = "View Controllers"; sourceTree = ""; @@ -444,6 +447,7 @@ 52E2F9261CCAC77800048FA5 /* mapBoxAPIKeys.swift in Sources */, 52762DA31CAF6E040051F338 /* TourCat.swift in Sources */, 5264201B1CB2D54A00F7EEE2 /* SelectedTourViewController.swift in Sources */, + 5299A64E1CE022A100F57D76 /* LicensesViewController.swift in Sources */, 52762DA41CAF6E040051F338 /* Tour.swift in Sources */, 52762DA51CAF6E040051F338 /* Landmarks.swift in Sources */, ); diff --git a/RPI Tours/RPI Tours/Base.lproj/Main.storyboard b/RPI Tours/RPI Tours/Base.lproj/Main.storyboard index 975d48a..c47a337 100644 --- a/RPI Tours/RPI Tours/Base.lproj/Main.storyboard +++ b/RPI Tours/RPI Tours/Base.lproj/Main.storyboard @@ -274,7 +274,7 @@ - + @@ -326,59 +326,169 @@ - - + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -708,13 +818,13 @@ diff --git a/RPI Tours/RPI Tours/LicensesViewController.swift b/RPI Tours/RPI Tours/LicensesViewController.swift new file mode 100644 index 0000000..772c9cd --- /dev/null +++ b/RPI Tours/RPI Tours/LicensesViewController.swift @@ -0,0 +1,90 @@ +// +// LicensesViewController.swift +// RPI Tours +// +// Created by John Behnke on 5/8/16. +// Copyright © 2016 RPI Web Tech. All rights reserved. +// + +import UIKit + +class LicensesViewController: UITableViewController { + + 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() + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + // MARK: - Table view data source + + override func numberOfSectionsInTableView(tableView: UITableView) -> Int { + // #warning Incomplete implementation, return the number of sections + return 3 + } + + override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + // #warning Incomplete implementation, return the number of rows + return 1 + } + + + + + /* + // Override to support conditional editing of the table view. + override func tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> 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, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) { + if editingStyle == .Delete { + // Delete the row from the data source + tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .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, moveRowAtIndexPath fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) { + + } + */ + + /* + // Override to support conditional rearranging of the table view. + override func tableView(tableView: UITableView, canMoveRowAtIndexPath indexPath: NSIndexPath) -> 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 prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { + // Get the new view controller using segue.destinationViewController. + // Pass the selected object to the new view controller. + } + */ + +}