diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index e7706a6d..63689c74 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 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 */; }; + D28B4F8A21FF967C00712C7A /* MVMCoreUIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D28B4F8B21FF967C00712C7A /* MVMCoreUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */; }; D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */; }; D29770C921F7C4AE00B2F0D0 /* TopLabelsView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */; settings = {ATTRIBUTES = (Public, ); }; }; D29770F221F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */; }; @@ -146,6 +148,8 @@ /* Begin PBXFileReference section */ 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 = ""; }; + D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIObject.h; sourceTree = ""; }; + D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIObject.m; sourceTree = ""; }; D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsView.m; sourceTree = ""; }; D29770C721F7C4AE00B2F0D0 /* TopLabelsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopLabelsView.h; sourceTree = ""; }; D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsAndBottomButtonsTableViewController.m; sourceTree = ""; }; @@ -319,7 +323,6 @@ children = ( D29DF31421ECECA7003B2FB9 /* SupportingFiles */, D29DF27021E79B2C003B2FB9 /* OtherHandlers */, - D29DF14E21E693BB003B2FB9 /* Session */, D29DF13A21E68682003B2FB9 /* Utility */, D29DF13321E68604003B2FB9 /* Styles */, D29DF11021E6805F003B2FB9 /* Categories */, @@ -472,15 +475,6 @@ path = Sizing; sourceTree = ""; }; - D29DF14E21E693BB003B2FB9 /* Session */ = { - isa = PBXGroup; - children = ( - D29DF27721E7A533003B2FB9 /* MVMCoreUISession.h */, - D29DF27821E7A533003B2FB9 /* MVMCoreUISession.m */, - ); - path = Session; - sourceTree = ""; - }; D29DF16821E69E1F003B2FB9 /* Buttons */ = { isa = PBXGroup; children = ( @@ -574,6 +568,10 @@ D29DF27021E79B2C003B2FB9 /* OtherHandlers */ = { isa = PBXGroup; children = ( + D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */, + D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */, + D29DF27721E7A533003B2FB9 /* MVMCoreUISession.h */, + D29DF27821E7A533003B2FB9 /* MVMCoreUISession.m */, D29DF27321E79E81003B2FB9 /* MVMCoreUILoggingHandler.h */, D29DF27421E79E81003B2FB9 /* MVMCoreUILoggingHandler.m */, D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */, @@ -689,6 +687,7 @@ D29DF16221E69996003B2FB9 /* MFViewController.h in Headers */, D29DF13121E6851E003B2FB9 /* MVMCoreUITopAlertExpandableView.h in Headers */, D29DF2C421E7BF57003B2FB9 /* MFTabBarSwipeAnimator.h in Headers */, + D28B4F8A21FF967C00712C7A /* MVMCoreUIObject.h in Headers */, D29DF2CA21E7BFC8003B2FB9 /* MFSizeThreshold.h in Headers */, D29770F821F7C73800B2F0D0 /* PrimaryButtonView.h in Headers */, D29DF28021E7AA51003B2FB9 /* MVMCoreUIDetailViewProtocol.h in Headers */, @@ -813,6 +812,7 @@ D29DF25421E6A177003B2FB9 /* MFMdnTextField.m in Sources */, D29DF26521E6A9D9003B2FB9 /* MFTransparentGIFView.m in Sources */, D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */, + D28B4F8B21FF967C00712C7A /* MVMCoreUIObject.m in Sources */, D29DF26D21E6AA0B003B2FB9 /* FLAnimatedImageView.m in Sources */, D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */, D29DF2AE21E7B3A4003B2FB9 /* MFTextView.m in Sources */, diff --git a/MVMCoreUI/MVMCoreUI.h b/MVMCoreUI/MVMCoreUI.h index 6e2f0ea3..7821c746 100644 --- a/MVMCoreUI/MVMCoreUI.h +++ b/MVMCoreUI/MVMCoreUI.h @@ -25,6 +25,7 @@ FOUNDATION_EXPORT const unsigned char MVMCoreUIVersionString[]; #import #pragma mark - OtherHandlers +#import #import #import diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIObject.h b/MVMCoreUI/OtherHandlers/MVMCoreUIObject.h new file mode 100644 index 00000000..f9a3510d --- /dev/null +++ b/MVMCoreUI/OtherHandlers/MVMCoreUIObject.h @@ -0,0 +1,17 @@ +// +// MVMCoreUIObject.h +// MVMCoreUI +// +// Created by Scott Pfeil on 1/28/19. +// Copyright © 2019 Verizon Wireless. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MVMCoreUIObject : MVMCoreObject + +@end + +NS_ASSUME_NONNULL_END diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIObject.m new file mode 100644 index 00000000..4c601e46 --- /dev/null +++ b/MVMCoreUI/OtherHandlers/MVMCoreUIObject.m @@ -0,0 +1,26 @@ +// +// MVMCoreUIObject.m +// MVMCoreUI +// +// Created by Scott Pfeil on 1/28/19. +// Copyright © 2019 Verizon Wireless. All rights reserved. +// + +#import "MVMCoreUIObject.h" +#import "MVMCoreUISession.h" +#import "MVMCoreUIViewControllerMappingObject.h" +#import "MVMCoreUILoggingHandler.h" + +@implementation MVMCoreUIObject + +- (void)defaultInitialSetup { + self.cache = [[MVMCoreCache alloc] init]; + self.sessionHandler = [[MVMCoreSessionTimeHandler alloc] init]; + self.actionHandler = [[MVMCoreActionHandler alloc] init]; + + self.session = [[MVMCoreUISession alloc] init]; + self.viewControllerMapping = [[MVMCoreUIViewControllerMappingObject alloc] init]; + self.loggingDelegate = [[MVMCoreUILoggingHandler alloc] init]; +} + +@end diff --git a/MVMCoreUI/Session/MVMCoreUISession.h b/MVMCoreUI/OtherHandlers/MVMCoreUISession.h similarity index 100% rename from MVMCoreUI/Session/MVMCoreUISession.h rename to MVMCoreUI/OtherHandlers/MVMCoreUISession.h diff --git a/MVMCoreUI/Session/MVMCoreUISession.m b/MVMCoreUI/OtherHandlers/MVMCoreUISession.m similarity index 100% rename from MVMCoreUI/Session/MVMCoreUISession.m rename to MVMCoreUI/OtherHandlers/MVMCoreUISession.m