Skip to content

Commit 7ee9455

Browse files
Merge pull request #2 from camdenwebster/week11
Week11
2 parents a7f58f4 + 5c40ff4 commit 7ee9455

6 files changed

Lines changed: 300 additions & 242 deletions

File tree

TaskBlock.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
192C7D2D2B85A30000DBA8FB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 192C7D2B2B85A30000DBA8FB /* LaunchScreen.storyboard */; };
1515
199782232B85B5BC00BCA16F /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 199782222B85B5BC00BCA16F /* SettingsViewController.swift */; };
1616
199782252B85B5CC00BCA16F /* TasksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 199782242B85B5CC00BCA16F /* TasksViewController.swift */; };
17-
19DA03162B8EE1E900303FE2 /* NewEditTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DA03152B8EE1E900303FE2 /* NewEditTableViewController.swift */; };
17+
19DA03162B8EE1E900303FE2 /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DA03152B8EE1E900303FE2 /* DetailViewController.swift */; };
1818
19DD8C232B8621D700239601 /* ToDoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DD8C222B8621D700239601 /* ToDoModel.swift */; };
1919
19DD8C252B86D1F800239601 /* EventProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DD8C242B86D1F800239601 /* EventProtocol.swift */; };
2020
19ED78572B9AC32700BDA1A7 /* ToDoModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 19ED78552B9AC32700BDA1A7 /* ToDoModel.xcdatamodeld */; };
@@ -30,7 +30,7 @@
3030
192C7D2E2B85A30000DBA8FB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3131
199782222B85B5BC00BCA16F /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
3232
199782242B85B5CC00BCA16F /* TasksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TasksViewController.swift; sourceTree = "<group>"; };
33-
19DA03152B8EE1E900303FE2 /* NewEditTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewEditTableViewController.swift; sourceTree = "<group>"; };
33+
19DA03152B8EE1E900303FE2 /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
3434
19DD8C222B8621D700239601 /* ToDoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToDoModel.swift; sourceTree = "<group>"; };
3535
19DD8C242B86D1F800239601 /* EventProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventProtocol.swift; sourceTree = "<group>"; };
3636
19ED78562B9AC32700BDA1A7 /* ToDoModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ToDoModel.xcdatamodel; sourceTree = "<group>"; };
@@ -74,7 +74,7 @@
7474
199782242B85B5CC00BCA16F /* TasksViewController.swift */,
7575
19DD8C222B8621D700239601 /* ToDoModel.swift */,
7676
192C7D262B85A2FB00DBA8FB /* Main.storyboard */,
77-
19DA03152B8EE1E900303FE2 /* NewEditTableViewController.swift */,
77+
19DA03152B8EE1E900303FE2 /* DetailViewController.swift */,
7878
192C7D292B85A30000DBA8FB /* Assets.xcassets */,
7979
192C7D2B2B85A30000DBA8FB /* LaunchScreen.storyboard */,
8080
192C7D2E2B85A30000DBA8FB /* Info.plist */,
@@ -156,7 +156,7 @@
156156
19DD8C252B86D1F800239601 /* EventProtocol.swift in Sources */,
157157
192C7D212B85A2FB00DBA8FB /* AppDelegate.swift in Sources */,
158158
199782232B85B5BC00BCA16F /* SettingsViewController.swift in Sources */,
159-
19DA03162B8EE1E900303FE2 /* NewEditTableViewController.swift in Sources */,
159+
19DA03162B8EE1E900303FE2 /* DetailViewController.swift in Sources */,
160160
192C7D232B85A2FB00DBA8FB /* SceneDelegate.swift in Sources */,
161161
19ED78572B9AC32700BDA1A7 /* ToDoModel.xcdatamodeld in Sources */,
162162
199782252B85B5CC00BCA16F /* TasksViewController.swift in Sources */,

TaskBlock/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UITabBarControllerDelegat
3131
}
3232

3333
func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {
34-
if viewController is NewEditTableViewController {
34+
if viewController is DetailViewController {
3535
if let newVC = tabBarController.storyboard?.instantiateViewController(withIdentifier: "NewEditTableViewController") {
3636
tabBarController.present(newVC, animated: true)
3737
return false

0 commit comments

Comments
 (0)