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

[iOS] Disable isolines on error

Browse source 
https://jira.mail.ru/browse/MAPSME-13295
https://jira.mail.ru/browse/MAPSME-13459
This commit is contained in:
Alexander Boriskov 2020-08-19 11:21:26 +03:00 • committed by Maksim Andrianov
parent 6b0b4049d6
commit b05dc63f19
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
View file

@ -42,6 +42,7 @@
- (void)presentSearchNoResultsAlert;
- (void)presentMobileInternetAlertWithBlock:(nonnull MWMMobileInternetAlertCompletionBlock)block;
- (void)presentInfoAlert:(nonnull NSString *)title text:(nonnull NSString *)text;
- (void)presentInfoAlert:(nonnull NSString *)title;
- (void)presentCreateBookmarkCategoryAlertWithMaxCharacterNum:(NSUInteger)max
minCharacterNum:(NSUInteger)min
callback:(nonnull MWMCheckStringBlock)callback;

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

@ -189,6 +189,10 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController"
[self displayAlert:[MWMAlert infoAlert:title text:text]];
}
- (void)presentInfoAlert:(nonnull NSString *)title {
[self displayAlert:[MWMAlert infoAlert:title text:nil]];
}
- (void)presentEditorViralAlert {
[self displayAlert:[MWMAlert editorViralAlert]];
}

31
iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
View file

@ -149,6 +149,27 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
}
}
- (void)handleIsolinesState:(MWMMapOverlayIsolinesState)state {
switch (state) {
case MWMMapOverlayIsolinesStateDisabled:
break;
case MWMMapOverlayIsolinesStateEnabled:
if (![MWMMapOverlayManager isolinesVisible]) {
[[MWMToast toastWithText:L(@"isolines_toast_zooms_1_10")] show];
[Statistics logEvent:kStatMapToastShow withParameters:@{kStatType: kStatIsolines}];
}
break;
case MWMMapOverlayIsolinesStateExpiredData:
[MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_activation_error_dialog")];
[MWMMapOverlayManager setIsoLinesEnabled:NO];
break;
case MWMMapOverlayIsolinesStateNoData:
[MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_location_error_dialog")];
[MWMMapOverlayManager setIsoLinesEnabled:NO];
break;
}
}
- (void)applyTheme {
MWMButton *btn = static_cast<MWMButton *>(self.view);
UIImageView *iv = btn.imageView;
@ -163,15 +184,7 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
[[MWMToast toastWithText:L(@"subway_data_unavailable")] show];
} else if ([MWMMapOverlayManager isoLinesEnabled]) {
btn.imageName = @"btn_isoMap_on";
if ([MWMMapOverlayManager isolinesState] == MWMMapOverlayIsolinesStateEnabled &&
![MWMMapOverlayManager isolinesVisible]) {
[[MWMToast toastWithText:L(@"isolines_toast_zooms_1_10")] show];
[Statistics logEvent:kStatMapToastShow withParameters:@{kStatType : kStatIsolines}];
} else if ([MWMMapOverlayManager isolinesState] == MWMMapOverlayIsolinesStateNoData) {
[[MWMToast toastWithText:L(@"isolines_location_error_dialog")] show];
}
else if ([MWMMapOverlayManager isolinesState] == MWMMapOverlayIsolinesStateExpiredData)
[MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_activation_error_dialog") text:@""];
[self handleIsolinesState:[MWMMapOverlayManager isolinesState]];
} else if ([MWMMapOverlayManager guidesEnabled]) {
btn.imageName = @"btn_layers_off";
[self handleGuidesState:[MWMMapOverlayManager guidesState]];