AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Replace location dialog with default dialog.

Browse source
This commit is contained in:
v.mikhaylenko 2015-07-15 18:39:31 +03:00 • committed by Alex Zolotarev
parent caf44785aa
commit b5a05b66f9
1 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -9,10 +9,11 @@
#import "Common.h"
#import "MWMAlertViewController.h"
#import "MWMDownloadTransitMapAlert.h"
#import "UIKitCategories.h"
static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController";
@interface MWMAlertViewController () <UIGestureRecognizerDelegate>
@interface MWMAlertViewController () <UIGestureRecognizerDelegate, UIAlertViewDelegate>
@property (weak, nonatomic, readwrite) UIViewController * ownerViewController;
@ -44,12 +45,30 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
- (void)presentLocationAlert
{
dispatch_async(dispatch_get_main_queue(), ^
NSString * title = L(@"location_is_disabled_long_text");
NSString * cancel = L(@"cancel");
NSString * openSettings = L(@"settings");
if (isIOSVersionLessThan(8))
{
// @TODO Remove dispatch on LocationManager -> MWMLocationManager
// Test case when location is denied by user on app launch/relaunch
[self displayAlert:MWMAlert.locationAlert];
});
UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:title message:nil delegate:self cancelButtonTitle:cancel otherButtonTitles:openSettings, nil];
[alertView show];
return;
}
UIAlertController * alertController = [UIAlertController alertControllerWithTitle:title message:nil preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction * cancelAction = [UIAlertAction actionWithTitle:cancel style:UIAlertActionStyleCancel handler:nil];
UIAlertAction * openSettingsAction = [UIAlertAction actionWithTitle:openSettings style:UIAlertActionStyleDefault handler:^(UIAlertAction *action)
{
[self openSettings];
}];
[alertController addAction:cancelAction];
[alertController addAction:openSettingsAction];
[self.ownerViewController presentViewController:alertController animated:YES completion:nil];
// dispatch_async(dispatch_get_main_queue(), ^
// {
// // @TODO Remove dispatch on LocationManager -> MWMLocationManager
// // Test case when location is denied by user on app launch/relaunch
// [self displayAlert:MWMAlert.locationAlert];
// });
}
- (void)presentFacebookAlert
@ -123,4 +142,21 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
[self removeFromParentViewController];
}
- (void)openSettings
{
NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
UIApplication * a = [UIApplication sharedApplication];
if ([a canOpenURL:url])
[a openURL:url];
}
#pragma mark - UIAlertViewDelegate
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
{
if (buttonIndex == 1)
[self openSettings];
}
@end