diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m index 5642bd6..2aee69b 100644 --- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m +++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m @@ -321,12 +321,6 @@ NSString * const KeyActionTypeOpen = @"openPage"; [delegateObject.actionDelegate willShowPopupWithAlertObject:alertObject alertJson:actionInformation]; } - NSDictionary *alertDictionary = [actionInformation dict:@"alert"]; - NSNumber *style = [alertDictionary optionalNumberForKey:@"style"]; - if ([style isEqual:@0]) { - alertObject.alertStyle = UIAlertControllerStyleActionSheet; - } - if (alertObject) { [[MVMCoreAlertHandler sharedAlertHandler] showAlertWithAlertObject:alertObject]; } else { diff --git a/MVMCore/MVMCore/AlertHandling/MVMCoreAlertObject+Swift.swift b/MVMCore/MVMCore/AlertHandling/MVMCoreAlertObject+Swift.swift index b5cd66f..1e65c97 100644 --- a/MVMCore/MVMCore/AlertHandling/MVMCoreAlertObject+Swift.swift +++ b/MVMCore/MVMCore/AlertHandling/MVMCoreAlertObject+Swift.swift @@ -30,10 +30,15 @@ public extension MVMCoreAlertObject { } actionsForAlert.append(alertAction) } - - return MVMCoreAlertObject(popupAlertWithTitle: alertJson.optionalStringForKey(KeyTitle), - message: alertJson.optionalStringForKey(KeyMessage), - actions: actionsForAlert, - isGreedy: false) + + let alertObject = MVMCoreAlertObject(popupAlertWithTitle: alertJson.optionalStringForKey(KeyTitle), + message: alertJson.optionalStringForKey(KeyMessage), + actions: actionsForAlert, + isGreedy: false) + + let alertStyle = alertJson.int32ForKey("style") + alertObject?.alertStyle = alertStyle == 0 ? .actionSheet : .alert + + return alertObject } }