diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h index 833a5110b9..32b23e48e6 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h @@ -9,7 +9,6 @@ @property(weak, nonatomic, readonly) UIViewController *_Null_unspecified ownerViewController; - (nonnull instancetype)initWithViewController:(nonnull UIViewController *)viewController; -- (void)presentAuthErrorAlertWithRetryBlock:(nonnull MWMVoidBlock)retryBlock; - (void)presentPoint2PointAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock needToRebuild:(BOOL)needToRebuild; - (void)presentRoutingDisclaimerAlertWithOkBlock:(nonnull nonnull MWMVoidBlock)block; - (void)presentDisabledLocationAlert; @@ -17,21 +16,17 @@ - (void)presentLocationServicesDisabledAlert; - (void)presentLocationServiceNotSupportedAlert; - (void)presentNoConnectionAlert; -- (void)presentSearchQuickFilterNoConnectionAlert; - (void)presentDeleteMapProhibitedAlert; - (void)presentUnsavedEditsAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock; - (void)presentNoWiFiAlertWithOkBlock:(nullable MWMVoidBlock)okBlock andCancelBlock:(nullable MWMVoidBlock)cancelBlock; - (void)presentIncorrectFeauturePositionAlert; -- (void)presentInternalErrorAlert; - (void)presentNotEnoughSpaceAlert; - (void)presentInvalidUserNameOrPasswordAlert; -- (void)presentDisableAutoDownloadAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock; - (void)presentDownloaderNoConnectionAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock cancelBlock:(nonnull MWMVoidBlock)cancelBlock; - (void)presentDownloaderNotEnoughSpaceAlert; - (void)presentDownloaderInternalErrorAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock cancelBlock:(nonnull MWMVoidBlock)cancelBlock; -- (void)presentDownloaderNeedUpdateAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock; - (void)presentPlaceDoesntExistAlertWithBlock:(nonnull MWMStringBlock)block; - (void)presentResetChangesAlertWithBlock:(nonnull MWMVoidBlock)block; - (void)presentDeleteFeatureAlertWithBlock:(nonnull MWMVoidBlock)block; @@ -47,18 +42,8 @@ minCharacterNum:(NSUInteger)min callback:(nonnull MWMCheckStringBlock)callback; -- (void)presentConvertBookmarksAlertWithCount:(NSUInteger)count block:(nonnull MWMVoidBlock)block; - -- (void)presentSpinnerAlertWithTitle:(nonnull NSString *)title cancel:(nullable MWMVoidBlock)cancel; - (void)presentBookmarkConversionErrorAlert; -- (void)presentRestoreBookmarkAlertWithMessage:(nonnull NSString *)message - rightButtonAction:(nonnull MWMVoidBlock)rightButton - leftButtonAction:(nonnull MWMVoidBlock)leftButton; - -- (void)presentTagsLoadingErrorAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock - cancelBlock:(nonnull MWMVoidBlock)cancelBlock; - - (void)presentDefaultAlertWithTitle:(nonnull NSString *)title message:(nullable NSString *)message rightButtonTitle:(nonnull NSString *)rightButtonTitle diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index 51fa923cdf..ee13bfb52d 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -45,10 +45,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" #pragma mark - Actions -- (void)presentAuthErrorAlertWithRetryBlock:(nonnull MWMVoidBlock)retryBlock { - [self displayAlert:[MWMAlert authErrorAlertWithRetryBlock:retryBlock]]; -} - - (void)presentLocationAlertWithCancelBlock:(MWMVoidBlock)cancelBlock { [self displayAlert:[MWMAlert locationAlertWithCancelBlock:cancelBlock]]; } @@ -62,9 +58,7 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" - (void)presentNoConnectionAlert { [self displayAlert:[MWMAlert noConnectionAlert]]; } -- (void)presentSearchQuickFilterNoConnectionAlert { - [self displayAlert:[MWMAlert searchQuickFilterNoConnectionAlert]]; -} + - (void)presentDeleteMapProhibitedAlert { [self displayAlert:[MWMAlert deleteMapProhibitedAlert]]; } @@ -80,9 +74,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" [self displayAlert:[MWMAlert incorrectFeaturePositionAlert]]; } -- (void)presentInternalErrorAlert { - [self displayAlert:[MWMAlert internalErrorAlert]]; -} - (void)presentNotEnoughSpaceAlert { [self displayAlert:[MWMAlert notEnoughSpaceAlert]]; } @@ -118,10 +109,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" [self displayAlert:[MWMAlert alert:type]]; } -- (void)presentDisableAutoDownloadAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock { - [self displayAlert:[MWMAlert disableAutoDownloadAlertWithOkBlock:okBlock]]; -} - - (void)presentDownloaderNoConnectionAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock cancelBlock:(nonnull MWMVoidBlock)cancelBlock { [self displayAlert:[MWMAlert downloaderNoConnectionAlertWithOkBlock:okBlock cancelBlock:cancelBlock]]; @@ -136,10 +123,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" [self displayAlert:[MWMAlert downloaderInternalErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock]]; } -- (void)presentDownloaderNeedUpdateAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock { - [self displayAlert:[MWMAlert downloaderNeedUpdateAlertWithOkBlock:okBlock]]; -} - - (void)presentPlaceDoesntExistAlertWithBlock:(MWMStringBlock)block { [self displayAlert:[MWMAlert placeDoesntExistAlertWithBlock:block]]; } @@ -196,11 +179,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" }); } -- (void)presentConvertBookmarksAlertWithCount:(NSUInteger)count block:(nonnull MWMVoidBlock)block { - auto alert = [MWMAlert convertBookmarksAlertWithCount:count block:block]; - [self displayAlert:alert]; -} - - (void)presentSpinnerAlertWithTitle:(nonnull NSString *)title cancel:(nullable MWMVoidBlock)cancel { [self displayAlert:[MWMAlert spinnerAlertWithTitle:title cancel:cancel]]; } @@ -209,14 +187,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" [self displayAlert:[MWMAlert bookmarkConversionErrorAlert]]; } -- (void)presentRestoreBookmarkAlertWithMessage:(nonnull NSString *)message - rightButtonAction:(nonnull MWMVoidBlock)rightButton - leftButtonAction:(nonnull MWMVoidBlock)leftButton { - [self displayAlert:[MWMAlert restoreBookmarkAlertWithMessage:message - rightButtonAction:rightButton - leftButtonAction:leftButton]]; -} - - (void)presentTagsLoadingErrorAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock cancelBlock:(nonnull MWMVoidBlock)cancelBlock { [self displayAlert:[MWMAlert tagsLoadingErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock]]; diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h index ec68985145..0da9878921 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h @@ -3,27 +3,22 @@ @property(weak, nonatomic) MWMAlertViewController *alertController; -+ (MWMAlert *)authErrorAlertWithRetryBlock:(MWMVoidBlock)retryBlock; + (MWMAlert *)locationAlertWithCancelBlock:(MWMVoidBlock)cancelBlock; + (MWMAlert *)routingDisclaimerAlertWithOkBlock:(MWMVoidBlock)block; + (MWMAlert *)disabledLocationAlert; + (MWMAlert *)locationServicesDisabledAlert; + (MWMAlert *)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock; + (MWMAlert *)noConnectionAlert; -+ (MWMAlert *)searchQuickFilterNoConnectionAlert; + (MWMAlert *)deleteMapProhibitedAlert; + (MWMAlert *)unsavedEditsAlertWithOkBlock:(MWMVoidBlock)okBlock; + (MWMAlert *)locationServiceNotSupportedAlert; + (MWMAlert *)incorrectFeaturePositionAlert; -+ (MWMAlert *)internalErrorAlert; + (MWMAlert *)notEnoughSpaceAlert; + (MWMAlert *)invalidUserNameOrPasswordAlert; + (MWMAlert *)point2PointAlertWithOkBlock:(MWMVoidBlock)okBlock needToRebuild:(BOOL)needToRebuild; -+ (MWMAlert *)disableAutoDownloadAlertWithOkBlock:(MWMVoidBlock)okBlock; + (MWMAlert *)downloaderNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock; + (MWMAlert *)downloaderNotEnoughSpaceAlert; + (MWMAlert *)downloaderInternalErrorAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock; -+ (MWMAlert *)downloaderNeedUpdateAlertWithOkBlock:(MWMVoidBlock)okBlock; + (MWMAlert *)placeDoesntExistAlertWithBlock:(MWMStringBlock)block; + (MWMAlert *)resetChangesAlertWithBlock:(MWMVoidBlock)block; + (MWMAlert *)deleteFeatureAlertWithBlock:(MWMVoidBlock)block; @@ -36,12 +31,8 @@ + (MWMAlert *)createBookmarkCategoryAlertWithMaxCharacterNum:(NSUInteger)max minCharacterNum:(NSUInteger)min callback:(MWMCheckStringBlock)callback; -+ (MWMAlert *)convertBookmarksAlertWithCount:(NSUInteger)count block:(MWMVoidBlock)block; + (MWMAlert *)spinnerAlertWithTitle:(NSString *)title cancel:(MWMVoidBlock)cancel; + (MWMAlert *)bookmarkConversionErrorAlert; -+ (MWMAlert *)restoreBookmarkAlertWithMessage:(NSString *)message - rightButtonAction:(MWMVoidBlock)rightButton - leftButtonAction:(MWMVoidBlock)leftButton; + (MWMAlert *)tagsLoadingErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock; + (MWMAlert *)defaultAlertWithTitle:(NSString *)title diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index a38b3aebf4..13d02f71af 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -13,10 +13,6 @@ @implementation MWMAlert -+ (MWMAlert *)authErrorAlertWithRetryBlock:(MWMVoidBlock)retryBlock { - return [MWMDefaultAlert authErrorAlertWithRetryBlock:retryBlock]; -} - + (MWMAlert *)locationAlertWithCancelBlock:(MWMVoidBlock)cancelBlock { return [MWMLocationAlert alertWithCancelBlock:cancelBlock]; } @@ -44,13 +40,7 @@ + (MWMAlert *)noConnectionAlert { return [MWMDefaultAlert noConnectionAlert]; } -+ (MWMAlert *)searchQuickFilterNoConnectionAlert { - return [MWMDefaultAlert searchQuickFilterNoConnectionAlertWithOkBlock:^{ - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] - options:@{} - completionHandler:NULL]; - }]; -} + + (MWMAlert *)deleteMapProhibitedAlert { return [MWMDefaultAlert deleteMapProhibitedAlert]; } @@ -111,9 +101,6 @@ return [MWMDefaultAlert incorrectFeaturePositionAlert]; } -+ (MWMAlert *)internalErrorAlert { - return [MWMDefaultAlert internalErrorAlert]; -} + (MWMAlert *)notEnoughSpaceAlert { return [MWMDefaultAlert notEnoughSpaceAlert]; } @@ -121,10 +108,6 @@ return [MWMDefaultAlert invalidUserNameOrPasswordAlert]; } -+ (MWMAlert *)disableAutoDownloadAlertWithOkBlock:(MWMVoidBlock)okBlock { - return [MWMDefaultAlert disableAutoDownloadAlertWithOkBlock:okBlock]; -} - + (MWMAlert *)downloaderNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock { return [MWMDefaultAlert downloaderNoConnectionAlertWithOkBlock:okBlock cancelBlock:cancelBlock]; } @@ -137,10 +120,6 @@ return [MWMDefaultAlert downloaderInternalErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock]; } -+ (MWMAlert *)downloaderNeedUpdateAlertWithOkBlock:(MWMVoidBlock)okBlock { - return [MWMDefaultAlert downloaderNeedUpdateAlertWithOkBlock:okBlock]; -} - + (MWMAlert *)placeDoesntExistAlertWithBlock:(MWMStringBlock)block { return [MWMPlaceDoesntExistAlert alertWithBlock:block]; } @@ -180,10 +159,6 @@ return [MWMBCCreateCategoryAlert alertWithMaxCharachersNum:max minCharactersNum:min callback:callback]; } -+ (MWMAlert *)convertBookmarksAlertWithCount:(NSUInteger)count block:(MWMVoidBlock)block { - return [MWMDefaultAlert convertBookmarksWithCount:count okBlock:block]; -} - + (MWMAlert *)spinnerAlertWithTitle:(NSString *)title cancel:(MWMVoidBlock)cancel { return [MWMSpinnerAlert alertWithTitle:title cancel:cancel]; } @@ -192,14 +167,6 @@ return [MWMDefaultAlert bookmarkConversionErrorAlert]; } -+ (MWMAlert *)restoreBookmarkAlertWithMessage:(NSString *)message - rightButtonAction:(MWMVoidBlock)rightButton - leftButtonAction:(MWMVoidBlock)leftButton { - return [MWMDefaultAlert restoreBookmarkAlertWithMessage:message - rightButtonAction:rightButton - leftButtonAction:leftButton]; -} - + (MWMAlert *)tagsLoadingErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock { return [MWMDefaultAlert tagsLoadingErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock]; } diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h index 623b5aa0b0..4d91d6b229 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h @@ -2,7 +2,6 @@ @interface MWMDefaultAlert : MWMAlert -+ (instancetype)authErrorAlertWithRetryBlock:(MWMVoidBlock)retryBlock; + (instancetype)routeNotFoundAlert; + (instancetype)routeNotFoundNoPublicTransportAlert; + (instancetype)routeNotFoundTooLongPedestrianAlert; @@ -12,7 +11,6 @@ + (instancetype)intermediatePointNotFoundAlert; + (instancetype)internalRoutingErrorAlert; + (instancetype)incorrectFeaturePositionAlert; -+ (instancetype)internalErrorAlert; + (instancetype)notEnoughSpaceAlert; + (instancetype)invalidUserNameOrPasswordAlert; + (instancetype)noCurrentPositionAlert; @@ -20,16 +18,13 @@ + (instancetype)disabledLocationAlert; + (instancetype)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock; + (instancetype)noConnectionAlert; -+ (instancetype)searchQuickFilterNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock; + (instancetype)deleteMapProhibitedAlert; + (instancetype)unsavedEditsAlertWithOkBlock:(MWMVoidBlock)okBlock; + (instancetype)locationServiceNotSupportedAlert; + (instancetype)point2PointAlertWithOkBlock:(MWMVoidBlock)okBlock needToRebuild:(BOOL)needToRebuild; -+ (instancetype)disableAutoDownloadAlertWithOkBlock:(MWMVoidBlock)okBlock; + (instancetype)downloaderNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock; + (instancetype)downloaderNotEnoughSpaceAlert; + (instancetype)downloaderInternalErrorAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock; -+ (instancetype)downloaderNeedUpdateAlertWithOkBlock:(MWMVoidBlock)okBlock; + (instancetype)resetChangesAlertWithBlock:(MWMVoidBlock)block; + (instancetype)deleteFeatureAlertWithBlock:(MWMVoidBlock)block; + (instancetype)personalInfoWarningAlertWithBlock:(MWMVoidBlock)block; @@ -38,10 +33,6 @@ + (instancetype)convertBookmarksWithCount:(NSUInteger)count okBlock:(MWMVoidBlock)okBlock; + (instancetype)bookmarkConversionErrorAlert; -+ (instancetype)restoreBookmarkAlertWithMessage:(NSString *)message - rightButtonAction:(MWMVoidBlock)rightButton - leftButtonAction:(MWMVoidBlock)leftButton; - + (instancetype)tagsLoadingErrorAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock; + (instancetype)defaultAlertWithTitle:(NSString *)title diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm index f1e2eaa345..488d939ef1 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm @@ -22,15 +22,6 @@ static NSString *const kDefaultAlertNibName = @"MWMDefaultAlert"; @implementation MWMDefaultAlert -+ (instancetype)authErrorAlertWithRetryBlock:(MWMVoidBlock)retryBlock { - return [self defaultAlertWithTitle:L(@"profile_authorization_error") - message:nil - rightButtonTitle:L(@"downloader_retry") - leftButtonTitle:L(@"cancel") - rightButtonAction:retryBlock - log:@"Authorization Error Alert"]; -} - + (instancetype)routeFileNotExistAlert { return [self defaultAlertWithTitle:L(@"dialog_routing_download_files") message:L(@"dialog_routing_download_and_update_all") @@ -87,17 +78,6 @@ static NSString *const kDefaultAlertNibName = @"MWMDefaultAlert"; return alert; } -+ (instancetype)searchQuickFilterNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock { - MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"choose_dates_online_only_dialog_message") - message:nil - rightButtonTitle:L(@"choose_dates_online_only_dialog_cta") - leftButtonTitle:L(@"cancel") - rightButtonAction:okBlock - log:@"No Connection Alert"]; - [alert setNeedsCloseAlertAfterEnterBackground]; - return alert; -} - + (instancetype)deleteMapProhibitedAlert { MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"downloader_delete_map") message:L(@"downloader_delete_map_while_routing_dialog") @@ -181,15 +161,6 @@ static NSString *const kDefaultAlertNibName = @"MWMDefaultAlert"; log:@"Incorrect Feature Possition Alert"]; } -+ (instancetype)internalErrorAlert { - return [self defaultAlertWithTitle:L(@"dialog_routing_system_error") - message:L(@"error_system_message") - rightButtonTitle:L(@"ok") - leftButtonTitle:nil - rightButtonAction:nil - log:@"Internal Error Alert"]; -} - + (instancetype)notEnoughSpaceAlert { MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"downloader_no_space_title") message:L(@"migration_no_space_message") @@ -260,17 +231,6 @@ static NSString *const kDefaultAlertNibName = @"MWMDefaultAlert"; } } -+ (instancetype)disableAutoDownloadAlertWithOkBlock:(MWMVoidBlock)okBlock { - MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"disable_auto_download") - message:nil - rightButtonTitle:L(@"_disable") - leftButtonTitle:L(@"cancel") - rightButtonAction:okBlock - log:@"Disable Auto Download Alert"]; - [alert setNeedsCloseAlertAfterEnterBackground]; - return alert; -} - + (instancetype)downloaderNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock { MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"downloader_status_failed") message:L(@"common_check_internet_connection_dialog") @@ -306,17 +266,6 @@ static NSString *const kDefaultAlertNibName = @"MWMDefaultAlert"; return alert; } -+ (instancetype)downloaderNeedUpdateAlertWithOkBlock:(MWMVoidBlock)okBlock { - MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"downloader_need_update_title") - message:L(@"downloader_need_update_message") - rightButtonTitle:L(@"downloader_status_outdated") - leftButtonTitle:L(@"not_now") - rightButtonAction:okBlock - log:@"Downloader Need Update Alert"]; - [alert setNeedsCloseAlertAfterEnterBackground]; - return alert; -} - + (instancetype)resetChangesAlertWithBlock:(MWMVoidBlock)block { MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"editor_reset_edits_message") message:nil @@ -377,19 +326,6 @@ static NSString *const kDefaultAlertNibName = @"MWMDefaultAlert"; log:nil]; } -+ (instancetype)restoreBookmarkAlertWithMessage:(NSString *)message - rightButtonAction:(MWMVoidBlock)rightButton - leftButtonAction:(MWMVoidBlock)leftButton { - MWMDefaultAlert *alert = [NSBundle.mainBundle loadNibNamed:kDefaultAlertNibName owner:self options:nil].firstObject; - alert.titleLabel.text = L(@"bookmarks_restore_title"); - alert.messageLabel.text = message; - [alert.rightButton setTitle:L(@"restore") forState:UIControlStateNormal]; - [alert.leftButton setTitle:L(@"cancel") forState:UIControlStateNormal]; - alert.leftButtonAction = leftButton; - alert.rightButtonAction = rightButton; - return alert; -} - + (instancetype)bookmarkConversionErrorAlert { return [self defaultAlertWithTitle:L(@"bookmarks_convert_error_title") message:L(@"bookmarks_convert_error_message")