From c7afc959e59136842d7871382a1f991dac64898d Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Thu, 10 Jan 2019 14:23:14 -0500 Subject: [PATCH] Migration --- .../AlertHandling/MVMCoreTopAlertDelegateProtocol.h | 3 +++ MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h | 2 ++ MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m | 4 ++++ MVMCore/MVMCore/Singletons/MVMCoreObject.h | 3 ++- MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.h | 3 +++ MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m | 8 ++++++++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertDelegateProtocol.h b/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertDelegateProtocol.h index 4e3158f..af09483 100644 --- a/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertDelegateProtocol.h +++ b/MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertDelegateProtocol.h @@ -17,4 +17,7 @@ - (void)topAlertViewShown:(nonnull id)topAlert topAlertObject:(nonnull MVMCoreTopAlertObject *)topAlertObject; - (void)topAlertViewDismissed:(nonnull id)topAlert; +// Called when the top alert is pressed. Determines if we should load the option the default way or not. +- (BOOL)shouldLoadTopAlertAction:(nullable NSDictionary *)actionMap additionalData:(nullable NSDictionary *)additionalData; + @end diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h index 12d0e2a..557ac8e 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.h @@ -17,6 +17,8 @@ @interface MVMCoreLoggingHandler : NSObject ++ (nullable instancetype)sharedLoggingHandler; + + (void)addErrorToLog:(nonnull MVMCoreErrorObject *)errorObject; + (void)logDebugMessageWithDelegate:(nullable NSString *)message; + (void)logWithDelegateWithObject:(nullable id)object withName:(nullable NSString *)name withExtraInfo:(nullable NSDictionary *)extra; diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m index 65e2659..be86730 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m @@ -11,6 +11,10 @@ @implementation MVMCoreLoggingHandler ++ (nullable instancetype)sharedLoggingHandler { + return [MVMCoreObject sharedInstance].loggingDelegate; +} + + (void)addErrorToLog:(nonnull MVMCoreErrorObject *)errorObject { if (errorObject && [[MVMCoreObject sharedInstance].loggingDelegate respondsToSelector:@selector(addErrorToLog:)]) { [[MVMCoreObject sharedInstance].loggingDelegate addErrorToLog:errorObject]; diff --git a/MVMCore/MVMCore/Singletons/MVMCoreObject.h b/MVMCore/MVMCore/Singletons/MVMCoreObject.h index 1e4d9b0..5868069 100644 --- a/MVMCore/MVMCore/Singletons/MVMCoreObject.h +++ b/MVMCore/MVMCore/Singletons/MVMCoreObject.h @@ -17,6 +17,7 @@ #import #import #import +#import @interface MVMCoreObject : NSObject @@ -30,7 +31,7 @@ @property (nullable, weak, nonatomic) NSObject *splitViewDelegate; @property (nullable, weak, nonatomic) id globalLoadDelegate; @property (nullable, weak, nonatomic) id loadingProtocol; -@property (nullable, weak, nonatomic) id loggingDelegate; +@property (nullable, weak, nonatomic) MVMCoreLoggingHandler *loggingDelegate; @property (nullable, weak, nonatomic) id globalTopAlertDelegate; // A singleton. diff --git a/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.h b/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.h index ef653c4..262cc75 100644 --- a/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.h +++ b/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.h @@ -25,4 +25,7 @@ // Returns a UIColor + (nonnull UIColor *)getColorForHexString:(nonnull NSString *)hexString; +// Returns if the device is an ipad ++ (BOOL)isOnIPad; + @end diff --git a/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m b/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m index b2a3e11..b48f34e 100644 --- a/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m +++ b/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m @@ -50,4 +50,12 @@ alpha:1]; } ++ (BOOL)isOnIPad { + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + return YES; + } else { + return NO; + } +} + @end