From 75eaf1eb468cdee386330290967a9bde16369dd4 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 4 Mar 2019 18:36:33 -0500 Subject: [PATCH] Name fix --- MVMCoreUI.xcodeproj/project.pbxproj | 16 ++++++++-------- MVMCoreUI/BaseControllers/MFViewController.m | 2 +- ...troller.h => MVMCoreUINavigationController.h} | 4 ++-- ...troller.m => MVMCoreUINavigationController.m} | 12 ++++++------ .../MVMCoreUISplitViewController.h | 4 ++-- .../MVMCoreUISplitViewController.m | 6 +++--- MVMCoreUI/MVMCoreUI.h | 2 +- MVMCoreUI/OtherHandlers/MVMCoreUISession.h | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) rename MVMCoreUI/Containers/{MVMCoreUINavigationControllerViewController.h => MVMCoreUINavigationController.h} (86%) rename MVMCoreUI/Containers/{MVMCoreUINavigationControllerViewController.m => MVMCoreUINavigationController.m} (81%) diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 964bedfc..856b15bb 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -9,8 +9,8 @@ /* Begin PBXBuildFile section */ 01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */; }; 01DF567021FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF566F21FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift */; }; - D206997721FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.m */; }; + D206997721FB8A0B00CAE0DE /* MVMCoreUINavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationController.m */; }; D22D1F1A220341F60077CEC0 /* MVMCoreUICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = D22D1F18220341F50077CEC0 /* MVMCoreUICheckBox.h */; settings = {ATTRIBUTES = (Public, ); }; }; D22D1F1B220341F60077CEC0 /* MVMCoreUICheckBox.m in Sources */ = {isa = PBXBuildFile; fileRef = D22D1F19220341F50077CEC0 /* MVMCoreUICheckBox.m */; }; D22D1F1E220343560077CEC0 /* MVMCoreUICheckMarkView.h in Headers */ = {isa = PBXBuildFile; fileRef = D22D1F1C220343560077CEC0 /* MVMCoreUICheckMarkView.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -164,8 +164,8 @@ /* Begin PBXFileReference section */ 01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MFTextFieldListView.swift; sourceTree = ""; }; 01DF566F21FA5AB300CC099B /* MVMCoreUITextFieldListFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MVMCoreUITextFieldListFormViewController.swift; sourceTree = ""; }; - D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUINavigationControllerViewController.h; sourceTree = ""; }; - D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUINavigationControllerViewController.m; sourceTree = ""; }; + D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUINavigationController.h; sourceTree = ""; }; + D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUINavigationController.m; sourceTree = ""; }; D22D1F18220341F50077CEC0 /* MVMCoreUICheckBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreUICheckBox.h; sourceTree = ""; }; D22D1F19220341F50077CEC0 /* MVMCoreUICheckBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUICheckBox.m; sourceTree = ""; }; D22D1F1C220343560077CEC0 /* MVMCoreUICheckMarkView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreUICheckMarkView.h; sourceTree = ""; }; @@ -464,8 +464,8 @@ children = ( D29DF2B721E7BE79003B2FB9 /* TabBarController */, D29DF2B621E7BE66003B2FB9 /* SplitViewController */, - D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.h */, - D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.m */, + D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */, + D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationController.m */, ); path = Containers; sourceTree = ""; @@ -704,7 +704,7 @@ D29DF26421E6A9D9003B2FB9 /* MFTransparentGIFView.h in Headers */, D29DF27921E7A533003B2FB9 /* MVMCoreUISession.h in Headers */, D29DF25C21E6A2B6003B2FB9 /* DashLine.h in Headers */, - D206997721FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.h in Headers */, + D206997721FB8A0B00CAE0DE /* MVMCoreUINavigationController.h in Headers */, D29DF29D21E7AE38003B2FB9 /* MFStyler.h in Headers */, D29DF2B021E7B3A4003B2FB9 /* MFTextView.h in Headers */, D29DF2A921E7B2F9003B2FB9 /* MVMCoreUIConstants.h in Headers */, @@ -889,7 +889,7 @@ D29DF2BF21E7BEA4003B2FB9 /* MVMCoreUITabBarPageControlViewController.m in Sources */, D29DF28321E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.m in Sources */, D29DF28A21E7AC2B003B2FB9 /* MFLabel.m in Sources */, - D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationControllerViewController.m in Sources */, + D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationController.m in Sources */, D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */, 01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */, D2A5146B2214905000345BFB /* ThreeLayerViewController.swift in Sources */, diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index cd245630..6bcd4984 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -35,7 +35,7 @@ #import "MVMCoreUISession.h" #import "MVMCoreUILoggingHandler.h" #import "MVMCoreUITabBarPageControlViewController.h" -#import "MVMCoreUINavigationControllerViewController.h" +#import "MVMCoreUINavigationController.h" @import MVMAnimationFramework; @interface MFViewController () diff --git a/MVMCoreUI/Containers/MVMCoreUINavigationControllerViewController.h b/MVMCoreUI/Containers/MVMCoreUINavigationController.h similarity index 86% rename from MVMCoreUI/Containers/MVMCoreUINavigationControllerViewController.h rename to MVMCoreUI/Containers/MVMCoreUINavigationController.h index 2fe06d1e..abe6efa7 100644 --- a/MVMCoreUI/Containers/MVMCoreUINavigationControllerViewController.h +++ b/MVMCoreUI/Containers/MVMCoreUINavigationController.h @@ -1,5 +1,5 @@ // -// MVMCoreUINavigationControllerViewController.h +// MVMCoreUINavigationController.h // MVMCoreUI // // Created by Scott Pfeil on 1/25/19. @@ -10,7 +10,7 @@ @class SeparatorView; NS_ASSUME_NONNULL_BEGIN -@interface MVMCoreUINavigationControllerViewController : UINavigationController +@interface MVMCoreUINavigationController : UINavigationController // Convenience getter + (nullable instancetype)navigationController; diff --git a/MVMCoreUI/Containers/MVMCoreUINavigationControllerViewController.m b/MVMCoreUI/Containers/MVMCoreUINavigationController.m similarity index 81% rename from MVMCoreUI/Containers/MVMCoreUINavigationControllerViewController.m rename to MVMCoreUI/Containers/MVMCoreUINavigationController.m index f0143315..bbfe856e 100644 --- a/MVMCoreUI/Containers/MVMCoreUINavigationControllerViewController.m +++ b/MVMCoreUI/Containers/MVMCoreUINavigationController.m @@ -1,12 +1,12 @@ // -// MVMCoreUINavigationControllerViewController.m +// MVMCoreUINavigationController.m // MVMCoreUI // // Created by Scott Pfeil on 1/25/19. // Copyright © 2019 Verizon Wireless. All rights reserved. // -#import "MVMCoreUINavigationControllerViewController.h" +#import "MVMCoreUINavigationController.h" #import "UIColor+MFConvenience.h" #import "SeparatorView.h" #import "MFFonts.h" @@ -14,18 +14,18 @@ #import "MVMCoreUISession.h" @import MVMCore.MVMCoreActionUtility; @import MVMCore.MVMCoreNavigationHandler; -@interface MVMCoreUINavigationControllerViewController () +@interface MVMCoreUINavigationController () @end -@implementation MVMCoreUINavigationControllerViewController +@implementation MVMCoreUINavigationController + (nullable instancetype)navigationController { return [MVMCoreActionUtility initializerClassCheck:[MVMCoreUISession sharedGlobal].navigationController classToVerify:self]; } + (nullable instancetype)setupNavigationController { - MVMCoreUINavigationControllerViewController *navigationController = [[MVMCoreUINavigationControllerViewController alloc] init]; + MVMCoreUINavigationController *navigationController = [[MVMCoreUINavigationController alloc] init]; [UIColor mfSetBackgroundColorForNavigationBar:[UIColor whiteColor] navigationBar:navigationController.navigationBar transparent:NO]; [navigationController.navigationBar setShadowImage:[[UIImage alloc] init]]; navigationController.navigationBar.translucent = NO; @@ -44,7 +44,7 @@ } + (nullable instancetype)setupWithNavigationControllerAsMainController { - MVMCoreUINavigationControllerViewController *navigationController = [self setupNavigationController]; + MVMCoreUINavigationController *navigationController = [self setupNavigationController]; [[MVMCoreUISession sharedGlobal] setupAsStandardLoadViewDelegate:navigationController]; return navigationController; } diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h index a5e5b6a9..432a674b 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h @@ -12,7 +12,7 @@ #import #import -@class MVMCoreUINavigationControllerViewController; +@class MVMCoreUINavigationController; @class MVMCoreUITopAlertView; @class MFViewController; @@ -34,7 +34,7 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) { @property (nullable, strong, nonatomic) UIBarButtonItem *backButton; -@property (nullable, weak, nonatomic, readonly) MVMCoreUINavigationControllerViewController *navigationController; +@property (nullable, weak, nonatomic, readonly) MVMCoreUINavigationController *navigationController; // Reference to the top alert view @property (nullable, weak, nonatomic) MVMCoreUITopAlertView *topAlertView; diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index 7dfb97e0..d70bdb6e 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -23,7 +23,7 @@ #import "MVMCoreUIConstants.h" #import "MVMCoreUICommonViewsUtility.h" #import "MVMCoreUITopAlertView.h" -#import "MVMCoreUINavigationControllerViewController.h" +#import "MVMCoreUINavigationController.h" @interface MVMCoreUISplitViewController () @@ -40,7 +40,7 @@ @property (weak, nonatomic, readwrite) UIViewController *leftPanel; @property (weak, nonatomic, readwrite) UIViewController *rightPanel; -@property (weak, nonatomic, readwrite) MVMCoreUINavigationControllerViewController *navigationController; +@property (weak, nonatomic, readwrite) MVMCoreUINavigationController *navigationController; // A view that covers the detail view when the master is out. @property (weak, nonatomic) IBOutlet UIView *mainViewCoverView; @@ -694,7 +694,7 @@ CGFloat const PanelAnimationDuration = 0.2; } // The main view. - MVMCoreUINavigationControllerViewController *navigationController = [MVMCoreUINavigationControllerViewController setupNavigationController]; + MVMCoreUINavigationController *navigationController = [MVMCoreUINavigationController setupNavigationController]; self.navigationController = navigationController; self.automaticallyAdjustsScrollViewInsets = NO; diff --git a/MVMCoreUI/MVMCoreUI.h b/MVMCoreUI/MVMCoreUI.h index 9fa02348..f1fdd0b9 100644 --- a/MVMCoreUI/MVMCoreUI.h +++ b/MVMCoreUI/MVMCoreUI.h @@ -56,7 +56,7 @@ FOUNDATION_EXPORT const unsigned char MVMCoreUIVersionString[]; #import #pragma mark - Containers -#import +#import #import #import diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUISession.h b/MVMCoreUI/OtherHandlers/MVMCoreUISession.h index 72e7728e..a5ce493c 100644 --- a/MVMCoreUI/OtherHandlers/MVMCoreUISession.h +++ b/MVMCoreUI/OtherHandlers/MVMCoreUISession.h @@ -11,7 +11,7 @@ @class MVMCoreUITopAlertView; @class MVMCoreUISplitViewController; @class MFViewController; -@class MVMCoreUINavigationControllerViewController; +@class MVMCoreUINavigationController; @class MFLoadingViewController; NS_ASSUME_NONNULL_BEGIN @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @property (weak, nonatomic, nullable) MVMCoreUITopAlertView *topAlertView; @property (weak, nonatomic, nullable) MVMCoreUISplitViewController *splitViewController; -@property (weak, nonatomic, nullable) MVMCoreUINavigationControllerViewController *navigationController; +@property (weak, nonatomic, nullable) MVMCoreUINavigationController *navigationController; @property (weak, nonatomic, nullable) MFLoadingViewController *loadingViewController; // for handscroll Animation on subclasses of MFScrollingViewController