From 42636459662730ff6d9e8f4860bb4fdc02d23769 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Fri, 4 Sep 2020 21:54:00 -0700 Subject: [PATCH] Adds top level nav elements to the tab bar. --- MonsterCards.xcodeproj/project.pbxproj | 66 +++++-- MonsterCards/Base.lproj/Main.storyboard | 175 ++++++++++-------- MonsterCards/FirstViewController.h | 15 -- MonsterCards/FirstViewController.m | 23 --- MonsterCards/SecondViewController.h | 15 -- MonsterCards/SecondViewController.m | 23 --- .../Views/CollectionsViewController.h | 17 ++ .../Views/CollectionsViewController.m | 32 ++++ MonsterCards/Views/DashboardViewController.h | 17 ++ MonsterCards/Views/DashboardViewController.m | 32 ++++ MonsterCards/Views/LibraryViewController.h | 17 ++ MonsterCards/Views/LibraryViewController.m | 32 ++++ MonsterCards/Views/MonsterViewController.h | 17 ++ MonsterCards/Views/MonsterViewController.m | 32 ++++ MonsterCards/Views/SearchViewController.h | 17 ++ MonsterCards/Views/SearchViewController.m | 32 ++++ 16 files changed, 397 insertions(+), 165 deletions(-) delete mode 100644 MonsterCards/FirstViewController.h delete mode 100644 MonsterCards/FirstViewController.m delete mode 100644 MonsterCards/SecondViewController.h delete mode 100644 MonsterCards/SecondViewController.m create mode 100644 MonsterCards/Views/CollectionsViewController.h create mode 100644 MonsterCards/Views/CollectionsViewController.m create mode 100644 MonsterCards/Views/DashboardViewController.h create mode 100644 MonsterCards/Views/DashboardViewController.m create mode 100644 MonsterCards/Views/LibraryViewController.h create mode 100644 MonsterCards/Views/LibraryViewController.m create mode 100644 MonsterCards/Views/MonsterViewController.h create mode 100644 MonsterCards/Views/MonsterViewController.m create mode 100644 MonsterCards/Views/SearchViewController.h create mode 100644 MonsterCards/Views/SearchViewController.m diff --git a/MonsterCards.xcodeproj/project.pbxproj b/MonsterCards.xcodeproj/project.pbxproj index bac0f59..da2e0f5 100644 --- a/MonsterCards.xcodeproj/project.pbxproj +++ b/MonsterCards.xcodeproj/project.pbxproj @@ -7,10 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + E20D032425031B9D00FB6E43 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E20D032325031B9D00FB6E43 /* SearchViewController.m */; }; + E20D032825031BDA00FB6E43 /* MonsterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E20D032725031BDA00FB6E43 /* MonsterViewController.m */; }; + E20D032B25031BE500FB6E43 /* LibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E20D032A25031BE500FB6E43 /* LibraryViewController.m */; }; + E20D032E25031BEF00FB6E43 /* CollectionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E20D032D25031BEF00FB6E43 /* CollectionsViewController.m */; }; + E20D033125031BFD00FB6E43 /* DashboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E20D033025031BFD00FB6E43 /* DashboardViewController.m */; }; E2F7247525005E89007D87ED /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E2F7247425005E89007D87ED /* AppDelegate.m */; }; E2F7247825005E89007D87ED /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E2F7247725005E89007D87ED /* SceneDelegate.m */; }; - E2F7247B25005E89007D87ED /* FirstViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2F7247A25005E89007D87ED /* FirstViewController.m */; }; - E2F7247E25005E89007D87ED /* SecondViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2F7247D25005E89007D87ED /* SecondViewController.m */; }; E2F7248125005E89007D87ED /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E2F7247F25005E89007D87ED /* Main.storyboard */; }; E2F7248425005E89007D87ED /* MonsterCards.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E2F7248225005E89007D87ED /* MonsterCards.xcdatamodeld */; }; E2F7248625005E8A007D87ED /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2F7248525005E8A007D87ED /* Assets.xcassets */; }; @@ -38,15 +41,21 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + E20D032225031B9D00FB6E43 /* SearchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = ""; }; + E20D032325031B9D00FB6E43 /* SearchViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = ""; }; + E20D032625031BDA00FB6E43 /* MonsterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonsterViewController.h; sourceTree = ""; }; + E20D032725031BDA00FB6E43 /* MonsterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonsterViewController.m; sourceTree = ""; }; + E20D032925031BE500FB6E43 /* LibraryViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibraryViewController.h; sourceTree = ""; }; + E20D032A25031BE500FB6E43 /* LibraryViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LibraryViewController.m; sourceTree = ""; }; + E20D032C25031BEF00FB6E43 /* CollectionsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CollectionsViewController.h; sourceTree = ""; }; + E20D032D25031BEF00FB6E43 /* CollectionsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CollectionsViewController.m; sourceTree = ""; }; + E20D032F25031BFD00FB6E43 /* DashboardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DashboardViewController.h; sourceTree = ""; }; + E20D033025031BFD00FB6E43 /* DashboardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DashboardViewController.m; sourceTree = ""; }; E2F7247025005E89007D87ED /* Monster Cards.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Monster Cards.app"; sourceTree = BUILT_PRODUCTS_DIR; }; E2F7247325005E89007D87ED /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; E2F7247425005E89007D87ED /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; E2F7247625005E89007D87ED /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = ""; }; E2F7247725005E89007D87ED /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = ""; }; - E2F7247925005E89007D87ED /* FirstViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirstViewController.h; sourceTree = ""; }; - E2F7247A25005E89007D87ED /* FirstViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FirstViewController.m; sourceTree = ""; }; - E2F7247C25005E89007D87ED /* SecondViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecondViewController.h; sourceTree = ""; }; - E2F7247D25005E89007D87ED /* SecondViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecondViewController.m; sourceTree = ""; }; E2F7248025005E89007D87ED /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; E2F7248325005E89007D87ED /* MonsterCards.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MonsterCards.xcdatamodel; sourceTree = ""; }; E2F7248525005E8A007D87ED /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -86,6 +95,37 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + E20D032525031BA700FB6E43 /* Views */ = { + isa = PBXGroup; + children = ( + E20D032225031B9D00FB6E43 /* SearchViewController.h */, + E20D032325031B9D00FB6E43 /* SearchViewController.m */, + E20D032625031BDA00FB6E43 /* MonsterViewController.h */, + E20D032725031BDA00FB6E43 /* MonsterViewController.m */, + E20D032925031BE500FB6E43 /* LibraryViewController.h */, + E20D032A25031BE500FB6E43 /* LibraryViewController.m */, + E20D032C25031BEF00FB6E43 /* CollectionsViewController.h */, + E20D032D25031BEF00FB6E43 /* CollectionsViewController.m */, + E20D032F25031BFD00FB6E43 /* DashboardViewController.h */, + E20D033025031BFD00FB6E43 /* DashboardViewController.m */, + ); + path = Views; + sourceTree = ""; + }; + E20D033225034C0700FB6E43 /* Models */ = { + isa = PBXGroup; + children = ( + ); + path = Models; + sourceTree = ""; + }; + E20D033325034C0C00FB6E43 /* Helpers */ = { + isa = PBXGroup; + children = ( + ); + path = Helpers; + sourceTree = ""; + }; E2F7246725005E89007D87ED = { isa = PBXGroup; children = ( @@ -109,14 +149,13 @@ E2F7247225005E89007D87ED /* MonsterCards */ = { isa = PBXGroup; children = ( + E20D033325034C0C00FB6E43 /* Helpers */, + E20D033225034C0700FB6E43 /* Models */, + E20D032525031BA700FB6E43 /* Views */, E2F7247325005E89007D87ED /* AppDelegate.h */, E2F7247425005E89007D87ED /* AppDelegate.m */, E2F7247625005E89007D87ED /* SceneDelegate.h */, E2F7247725005E89007D87ED /* SceneDelegate.m */, - E2F7247925005E89007D87ED /* FirstViewController.h */, - E2F7247A25005E89007D87ED /* FirstViewController.m */, - E2F7247C25005E89007D87ED /* SecondViewController.h */, - E2F7247D25005E89007D87ED /* SecondViewController.m */, E2F7247F25005E89007D87ED /* Main.storyboard */, E2F7248525005E8A007D87ED /* Assets.xcassets */, E2F7248725005E8A007D87ED /* LaunchScreen.storyboard */, @@ -275,12 +314,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E2F7247E25005E89007D87ED /* SecondViewController.m in Sources */, + E20D032825031BDA00FB6E43 /* MonsterViewController.m in Sources */, E2F7247525005E89007D87ED /* AppDelegate.m in Sources */, - E2F7247B25005E89007D87ED /* FirstViewController.m in Sources */, + E20D032B25031BE500FB6E43 /* LibraryViewController.m in Sources */, + E20D033125031BFD00FB6E43 /* DashboardViewController.m in Sources */, E2F7248425005E89007D87ED /* MonsterCards.xcdatamodeld in Sources */, + E20D032E25031BEF00FB6E43 /* CollectionsViewController.m in Sources */, E2F7248C25005E8A007D87ED /* main.m in Sources */, E2F7247825005E89007D87ED /* SceneDelegate.m in Sources */, + E20D032425031B9D00FB6E43 /* SearchViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MonsterCards/Base.lproj/Main.storyboard b/MonsterCards/Base.lproj/Main.storyboard index 710644b..80435d2 100644 --- a/MonsterCards/Base.lproj/Main.storyboard +++ b/MonsterCards/Base.lproj/Main.storyboard @@ -1,81 +1,12 @@ - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -86,17 +17,107 @@ - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + diff --git a/MonsterCards/FirstViewController.h b/MonsterCards/FirstViewController.h deleted file mode 100644 index 5230f4c..0000000 --- a/MonsterCards/FirstViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// FirstViewController.h -// MonsterCards -// -// Created by Tom Hicks on 9/2/20. -// Copyright © 2020 Tom Hicks. All rights reserved. -// - -#import - -@interface FirstViewController : UIViewController - - -@end - diff --git a/MonsterCards/FirstViewController.m b/MonsterCards/FirstViewController.m deleted file mode 100644 index aea746b..0000000 --- a/MonsterCards/FirstViewController.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// FirstViewController.m -// MonsterCards -// -// Created by Tom Hicks on 9/2/20. -// Copyright © 2020 Tom Hicks. All rights reserved. -// - -#import "FirstViewController.h" - -@interface FirstViewController () - -@end - -@implementation FirstViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - - -@end diff --git a/MonsterCards/SecondViewController.h b/MonsterCards/SecondViewController.h deleted file mode 100644 index ae9025c..0000000 --- a/MonsterCards/SecondViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// SecondViewController.h -// MonsterCards -// -// Created by Tom Hicks on 9/2/20. -// Copyright © 2020 Tom Hicks. All rights reserved. -// - -#import - -@interface SecondViewController : UIViewController - - -@end - diff --git a/MonsterCards/SecondViewController.m b/MonsterCards/SecondViewController.m deleted file mode 100644 index 7a77b12..0000000 --- a/MonsterCards/SecondViewController.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// SecondViewController.m -// MonsterCards -// -// Created by Tom Hicks on 9/2/20. -// Copyright © 2020 Tom Hicks. All rights reserved. -// - -#import "SecondViewController.h" - -@interface SecondViewController () - -@end - -@implementation SecondViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. -} - - -@end diff --git a/MonsterCards/Views/CollectionsViewController.h b/MonsterCards/Views/CollectionsViewController.h new file mode 100644 index 0000000..065f296 --- /dev/null +++ b/MonsterCards/Views/CollectionsViewController.h @@ -0,0 +1,17 @@ +// +// CollectionsViewController.h +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface CollectionsViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/MonsterCards/Views/CollectionsViewController.m b/MonsterCards/Views/CollectionsViewController.m new file mode 100644 index 0000000..1b89b26 --- /dev/null +++ b/MonsterCards/Views/CollectionsViewController.m @@ -0,0 +1,32 @@ +// +// CollectionsViewController.m +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import "CollectionsViewController.h" + +@interface CollectionsViewController () + +@end + +@implementation CollectionsViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/MonsterCards/Views/DashboardViewController.h b/MonsterCards/Views/DashboardViewController.h new file mode 100644 index 0000000..26ce296 --- /dev/null +++ b/MonsterCards/Views/DashboardViewController.h @@ -0,0 +1,17 @@ +// +// DashboardViewController.h +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface DashboardViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/MonsterCards/Views/DashboardViewController.m b/MonsterCards/Views/DashboardViewController.m new file mode 100644 index 0000000..a069e29 --- /dev/null +++ b/MonsterCards/Views/DashboardViewController.m @@ -0,0 +1,32 @@ +// +// DashboardViewController.m +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import "DashboardViewController.h" + +@interface DashboardViewController () + +@end + +@implementation DashboardViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/MonsterCards/Views/LibraryViewController.h b/MonsterCards/Views/LibraryViewController.h new file mode 100644 index 0000000..aa2ac87 --- /dev/null +++ b/MonsterCards/Views/LibraryViewController.h @@ -0,0 +1,17 @@ +// +// LibraryViewController.h +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface LibraryViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/MonsterCards/Views/LibraryViewController.m b/MonsterCards/Views/LibraryViewController.m new file mode 100644 index 0000000..eac9069 --- /dev/null +++ b/MonsterCards/Views/LibraryViewController.m @@ -0,0 +1,32 @@ +// +// LibraryViewController.m +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import "LibraryViewController.h" + +@interface LibraryViewController () + +@end + +@implementation LibraryViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/MonsterCards/Views/MonsterViewController.h b/MonsterCards/Views/MonsterViewController.h new file mode 100644 index 0000000..837043c --- /dev/null +++ b/MonsterCards/Views/MonsterViewController.h @@ -0,0 +1,17 @@ +// +// MonsterViewController.h +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MonsterViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/MonsterCards/Views/MonsterViewController.m b/MonsterCards/Views/MonsterViewController.m new file mode 100644 index 0000000..f6214bc --- /dev/null +++ b/MonsterCards/Views/MonsterViewController.m @@ -0,0 +1,32 @@ +// +// MonsterViewController.m +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import "MonsterViewController.h" + +@interface MonsterViewController () + +@end + +@implementation MonsterViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/MonsterCards/Views/SearchViewController.h b/MonsterCards/Views/SearchViewController.h new file mode 100644 index 0000000..8102ab3 --- /dev/null +++ b/MonsterCards/Views/SearchViewController.h @@ -0,0 +1,17 @@ +// +// SearchViewController.h +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface SearchViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/MonsterCards/Views/SearchViewController.m b/MonsterCards/Views/SearchViewController.m new file mode 100644 index 0000000..79a2a5e --- /dev/null +++ b/MonsterCards/Views/SearchViewController.m @@ -0,0 +1,32 @@ +// +// SearchViewController.m +// MonsterCards +// +// Created by Tom Hicks on 9/4/20. +// Copyright © 2020 Tom Hicks. All rights reserved. +// + +#import "SearchViewController.h" + +@interface SearchViewController () + +@end + +@implementation SearchViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end