diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index fc302b5..5a64495 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -38,8 +38,6 @@ 8876D5F31FB50AB000EB2E3D /* UIFont+MFSpacing.m in Sources */ = {isa = PBXBuildFile; fileRef = 8876D5E51FB50AB000EB2E3D /* UIFont+MFSpacing.m */; }; 8876D5F41FB50AB000EB2E3D /* UILabel+MFCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 8876D5E61FB50AB000EB2E3D /* UILabel+MFCustom.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8876D5F51FB50AB000EB2E3D /* UILabel+MFCustom.m in Sources */ = {isa = PBXBuildFile; fileRef = 8876D5E71FB50AB000EB2E3D /* UILabel+MFCustom.m */; }; - 88D1FBE11FCCCBA100338A3A /* MVMCoreMainSplitViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D1FBDF1FCCCADC00338A3A /* MVMCoreMainSplitViewProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 88D1FBE21FCCCBA500338A3A /* PanelProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D1FBE01FCCCB2C00338A3A /* PanelProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; A332F33F20C7231700DCD9D9 /* MVMCoreViewControllerAnimatedTransitioning.h in Headers */ = {isa = PBXBuildFile; fileRef = A332F33E20C7231600DCD9D9 /* MVMCoreViewControllerAnimatedTransitioning.h */; settings = {ATTRIBUTES = (Public, ); }; }; AF1201832108C9B400E2F592 /* MVMCoreViewManagerViewControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = AF1201812108C9B400E2F592 /* MVMCoreViewManagerViewControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; AF26DDAE1FCE6A37004E8F65 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AF26DDB01FCE6A37004E8F65 /* Localizable.strings */; }; @@ -165,8 +163,6 @@ 8876D5E51FB50AB000EB2E3D /* UIFont+MFSpacing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIFont+MFSpacing.m"; sourceTree = ""; }; 8876D5E61FB50AB000EB2E3D /* UILabel+MFCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+MFCustom.h"; sourceTree = ""; }; 8876D5E71FB50AB000EB2E3D /* UILabel+MFCustom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+MFCustom.m"; sourceTree = ""; }; - 88D1FBDF1FCCCADC00338A3A /* MVMCoreMainSplitViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreMainSplitViewProtocol.h; sourceTree = ""; }; - 88D1FBE01FCCCB2C00338A3A /* PanelProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PanelProtocol.h; sourceTree = ""; }; A332F33E20C7231600DCD9D9 /* MVMCoreViewControllerAnimatedTransitioning.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreViewControllerAnimatedTransitioning.h; sourceTree = ""; }; AF1201812108C9B400E2F592 /* MVMCoreViewManagerViewControllerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreViewManagerViewControllerProtocol.h; sourceTree = ""; }; AF26DDAF1FCE6A37004E8F65 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -318,7 +314,6 @@ AFBB96DE1FBA48CE0008D868 /* Singletons */, AF43A70C1FC4F42B008E9347 /* Session */, AFBB96D41FBA48240008D868 /* OtherHandlers */, - AF43A5941FBB700D008E9347 /* MainStructure */, AF26DDAB1FCE5CF2004E8F65 /* Strings */, 8876D5CC1FB50A9E00EB2E3D /* MVMCore.h */, 8876D5CD1FB50A9E00EB2E3D /* Info.plist */, @@ -366,15 +361,6 @@ path = Strings; sourceTree = ""; }; - AF43A5941FBB700D008E9347 /* MainStructure */ = { - isa = PBXGroup; - children = ( - 88D1FBE01FCCCB2C00338A3A /* PanelProtocol.h */, - 88D1FBDF1FCCCADC00338A3A /* MVMCoreMainSplitViewProtocol.h */, - ); - path = MainStructure; - sourceTree = ""; - }; AF43A6FC1FBE2F2A008E9347 /* Reachability */ = { isa = PBXGroup; children = ( @@ -622,7 +608,6 @@ AF43A7201FC5D2BA008E9347 /* MVMCoreViewManagerProtocol.h in Headers */, 881D26951FCC9D180079C521 /* MVMCoreErrorObject.h in Headers */, AFBB96341FBA34310008D868 /* MVMCoreErrorConstants.h in Headers */, - 88D1FBE21FCCCBA500338A3A /* PanelProtocol.h in Headers */, A332F33F20C7231700DCD9D9 /* MVMCoreViewControllerAnimatedTransitioning.h in Headers */, AFBB968D1FBA3A9A0008D868 /* MVMCoreNavigationHandler.h in Headers */, AFBB96A51FBA3A9A0008D868 /* MVMCoreTopAlertOperation.h in Headers */, @@ -647,7 +632,6 @@ AFEEE81E1FCDF3CA00B5EDD0 /* MVMCoreLoggingHandler.h in Headers */, AF43A7011FC4B227008E9347 /* MVMCoreGlobalLoadProtocol.h in Headers */, AF43A5771FBA5B7C008E9347 /* MVMCoreJSONConstants.h in Headers */, - 88D1FBE11FCCCBA100338A3A /* MVMCoreMainSplitViewProtocol.h in Headers */, AFBB96631FBA3A570008D868 /* MVMCoreLoadRequestOperation.h in Headers */, AFC5FA1D1FFC39C700C244CF /* MVMCoreTopAlertViewProtocol.h in Headers */, AFBB969D1FBA3A9A0008D868 /* MVMCoreAlertObject.h in Headers */, diff --git a/MVMCore/MVMCore/MVMCore.h b/MVMCore/MVMCore/MVMCore.h index 2fd8fae..f5db9c6 100644 --- a/MVMCore/MVMCore/MVMCore.h +++ b/MVMCore/MVMCore/MVMCore.h @@ -43,10 +43,6 @@ FOUNDATION_EXPORT const unsigned char MVMCoreVersionString[]; #import #import -// Main Structure -#import -#import - // Load Handling #import #import diff --git a/MVMCore/MVMCore/MainProtocols/MVMCoreViewControllerProtocol.h b/MVMCore/MVMCore/MainProtocols/MVMCoreViewControllerProtocol.h index 641c630..d951d03 100644 --- a/MVMCore/MVMCore/MainProtocols/MVMCoreViewControllerProtocol.h +++ b/MVMCore/MVMCore/MainProtocols/MVMCoreViewControllerProtocol.h @@ -12,24 +12,10 @@ @protocol MVMCoreViewControllerProtocol -// TODO: need to be moved out when core is completely finished -@property (nonatomic) BOOL masterShouldBeAccessible; -@property (nonatomic) BOOL supportShouldBeAccessible; -@property (nonatomic) BOOL cartShouldBeAccessible; -@property (nonatomic) BOOL communityShouldBeAccessible; -@property (nonatomic) BOOL closeButtonAccessible; -@property (nullable, nonatomic, readonly) NSDictionary *closeButtonActionMap; - - @property (nullable, strong, nonatomic) NSString *pageType; // This view controller should subclass this function and check the load to make sure it has all the needed data. Fills the error object if there are any errors. Returns if we should finish the load or not. Ideally error should use code ErrorCodeViewControllerProcessingJSON. - (BOOL)shouldFinishProcessingLoad:(nonnull MVMCoreLoadObject *)loadObject error:(MVMCoreErrorObject *_Nonnull *_Nonnull)error; -@optional - -// Called when the back button is pressed. Overwrite for special functionality. Default is to just popviewcontroller. -- (void)backButtonPressed; - @end diff --git a/MVMCore/MVMCore/MainStructure/MVMCoreMainSplitViewProtocol.h b/MVMCore/MVMCore/MainStructure/MVMCoreMainSplitViewProtocol.h deleted file mode 100644 index 7de9c9e..0000000 --- a/MVMCore/MVMCore/MainStructure/MVMCoreMainSplitViewProtocol.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MainSplitViewProtocol.h -// MVMCore -// -// Created by Pfeil, Scott Robert on 11/14/17. -// Copyright © 2017 myverizon. All rights reserved. -// - -#import -#import - -@protocol MVMCoreMainSplitViewProtocol - -// Provide the panels that you would like to use. -- (nullable UIViewController *)getLeftPanel; -- (nullable UIViewController *)getRightPanel; - -@end diff --git a/MVMCore/MVMCore/MainStructure/PanelProtocol.h b/MVMCore/MVMCore/MainStructure/PanelProtocol.h deleted file mode 100644 index 2db89c7..0000000 --- a/MVMCore/MVMCore/MainStructure/PanelProtocol.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// PanelProtocol.h -// mobilefirst -// -// Created by Seshamani, Shreyas on 6/2/17. -// Copyright © 2017 Verizon Wireless. All rights reserved. -// - -#import -#import -@protocol PanelProtocol - -#pragma mark - life cycle - -@optional - -// The panel can return if it should be available or not. -- (BOOL)panelAvailable; - -- (void)panel:(UIViewController *_Nullable)panel viewWillAppear:(BOOL)animated; -- (void)panel:(UIViewController *_Nullable)panel viewDidAppear:(BOOL)animated; -- (void)panel:(UIViewController *_Nullable)panel viewWillDisappear:(BOOL)animated; -- (void)panel:(UIViewController *_Nullable)panel viewDidDisappear:(BOOL)animated; - -- (void)showArrow; -- (void)hideArrow; - -- (void)willOpenWithActionInformation:(nullable NSDictionary *)actionInformation; - -- (void)clearData; -- (void)resetIconToDefault; - -- (void)getCurrentDetailViewController:(nullable UIViewController *)currentViewController;//in menu - -@end diff --git a/MVMCore/MVMCore/Singletons/MVMCoreObject.h b/MVMCore/MVMCore/Singletons/MVMCoreObject.h index 5868069..fb2621d 100644 --- a/MVMCore/MVMCore/Singletons/MVMCoreObject.h +++ b/MVMCore/MVMCore/Singletons/MVMCoreObject.h @@ -14,7 +14,6 @@ #import #import #import -#import #import #import #import @@ -28,7 +27,6 @@ @property (nullable, strong, nonatomic) MVMCoreSessionTimeHandler *sessionHandler; // The delegates -@property (nullable, weak, nonatomic) NSObject *splitViewDelegate; @property (nullable, weak, nonatomic) id globalLoadDelegate; @property (nullable, weak, nonatomic) id loadingProtocol; @property (nullable, weak, nonatomic) MVMCoreLoggingHandler *loggingDelegate;