diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h index 004b100ba..e0bd0a904 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h @@ -30,7 +30,6 @@ - (void)presentPlaceDoesntExistAlertWithBlock:(nonnull MWMStringBlock)block; - (void)presentResetChangesAlertWithBlock:(nonnull MWMVoidBlock)block; - (void)presentDeleteFeatureAlertWithBlock:(nonnull MWMVoidBlock)block; -- (void)presentEditorViralAlert; - (void)presentPersonalInfoWarningAlertWithBlock:(nonnull MWMVoidBlock)block; - (void)presentTrackWarningAlertWithCancelBlock:(nonnull MWMVoidBlock)block; - (void)presentMobileInternetAlertWithBlock:(nonnull MWMMobileInternetAlertCompletionBlock)block; diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index e2ed87ea8..3a9e3f6c6 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -155,10 +155,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" [self displayAlert:[MWMAlert infoAlert:title text:nil]]; } -- (void)presentEditorViralAlert { - [self displayAlert:[MWMAlert editorViralAlert]]; -} - - (void)presentCreateBookmarkCategoryAlertWithMaxCharacterNum:(NSUInteger)max minCharacterNum:(NSUInteger)min callback:(nonnull MWMCheckStringBlock)callback { diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h index de3e72d0e..6f8ff1291 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h @@ -22,7 +22,6 @@ + (MWMAlert *)placeDoesntExistAlertWithBlock:(MWMStringBlock)block; + (MWMAlert *)resetChangesAlertWithBlock:(MWMVoidBlock)block; + (MWMAlert *)deleteFeatureAlertWithBlock:(MWMVoidBlock)block; -+ (MWMAlert *)editorViralAlert; + (MWMAlert *)personalInfoWarningAlertWithBlock:(MWMVoidBlock)block; + (MWMAlert *)trackWarningAlertWithCancelBlock:(MWMVoidBlock)block; + (MWMAlert *)infoAlert:(NSString *)title text:(NSString *)text; diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index d197bad2f..99289dcc7 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -2,7 +2,6 @@ #import "MWMAlertViewController.h" #import "MWMDefaultAlert.h" #import "MWMDownloadTransitMapAlert.h" -#import "MWMEditorViralAlert.h" #import "MWMLocationAlert.h" #import "MWMPlaceDoesntExistAlert.h" #import "MWMRoutingDisclaimerAlert.h" @@ -130,9 +129,6 @@ return [MWMDefaultAlert deleteFeatureAlertWithBlock:block]; } -+ (MWMAlert *)editorViralAlert { - return [MWMEditorViralAlert alert]; -} + (MWMAlert *)personalInfoWarningAlertWithBlock:(MWMVoidBlock)block { return [MWMDefaultAlert personalInfoWarningAlertWithBlock:block]; } diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.h b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.h deleted file mode 100644 index 335c11df4..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.h +++ /dev/null @@ -1,7 +0,0 @@ -#import "MWMAlert.h" - -@interface MWMEditorViralAlert : MWMAlert - -+ (nonnull instancetype)alert; - -@end diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm deleted file mode 100644 index abae056c7..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm +++ /dev/null @@ -1,30 +0,0 @@ -#import "MWMEditorViralAlert.h" -#import "MWMActivityViewController.h" -#import "MWMAlertViewController.h" -#import "SwiftBridge.h" - -@interface MWMEditorViralAlert () - -@property(weak, nonatomic) IBOutlet UIButton* shareButton; - -@end - -@implementation MWMEditorViralAlert - -+ (nonnull instancetype)alert { - return [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject; -} - -- (IBAction)shareTap { - [self close:^{ - MWMActivityViewController* shareVC = [MWMActivityViewController shareControllerForEditorViral]; - [shareVC presentInParentViewController:self.alertController.ownerViewController - anchorView:[BottomTabBarViewController controller].view]; - }]; -} - -- (IBAction)cancelTap { - [self close:nil]; -} - -@end diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib deleted file mode 100644 index 2380e83ab..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 50bf98252..6696ea445 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -37,7 +37,6 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) { UserTouchesActionNone, UserTouc namespace { NSString *const kDownloaderSegue = @"Map2MapDownloaderSegue"; NSString *const kEditorSegue = @"Map2EditorSegue"; -NSString *const kUDViralAlertWasShown = @"ViralAlertWasShown"; NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; NSString *const kSettingsSegue = @"Map2Settings"; NSString *const kAboutSegue = @"Map2About"; @@ -383,7 +382,6 @@ NSString *const kAboutSegue = @"Map2About"; [self updateStatusBarStyle]; GetFramework().SetRenderingEnabled(); GetFramework().InvalidateRendering(); - [self showViralAlertIfNeeded]; [self checkAuthorization]; [MWMRouter updateRoute]; } @@ -492,23 +490,6 @@ NSString *const kAboutSegue = @"Map2About"; [self.view addGestureRecognizer:hoverRecognizer]; } -- (void)showViralAlertIfNeeded { - NSUserDefaults *ud = NSUserDefaults.standardUserDefaults; - - if (!Profile.needsReauthorization || [ud objectForKey:kUDViralAlertWasShown] || !Profile.isExisting) - return; - - if (osm::Editor::Instance().GetStats().m_edits.size() < 2) - return; - - if (!Platform::IsConnected()) - return; - - [self.alertController presentEditorViralAlert]; - - [ud setObject:[NSDate date] forKey:kUDViralAlertWasShown]; -} - - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; diff --git a/iphone/Maps/Classes/Share/MWMActivityViewController.h b/iphone/Maps/Classes/Share/MWMActivityViewController.h index 6eabdde97..a4c2faca0 100644 --- a/iphone/Maps/Classes/Share/MWMActivityViewController.h +++ b/iphone/Maps/Classes/Share/MWMActivityViewController.h @@ -6,8 +6,6 @@ NS_ASSUME_NONNULL_BEGIN NS_SWIFT_NAME(ActivityViewController) @interface MWMActivityViewController : UIActivityViewController -+ (instancetype)shareControllerForEditorViral; - + (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location; + (instancetype)shareControllerForPlacePage:(PlacePageData *)data; diff --git a/iphone/Maps/Classes/Share/MWMActivityViewController.mm b/iphone/Maps/Classes/Share/MWMActivityViewController.mm index 224a6f530..02fc4b703 100644 --- a/iphone/Maps/Classes/Share/MWMActivityViewController.mm +++ b/iphone/Maps/Classes/Share/MWMActivityViewController.mm @@ -53,14 +53,6 @@ return shareVC; } -+ (instancetype)shareControllerForEditorViral { - MWMEditorViralActivityItem *item = [[MWMEditorViralActivityItem alloc] init]; - UIImage *image = [UIImage imageNamed:@"img_sharing_editor"]; - MWMActivityViewController *vc = [[self alloc] initWithActivityItems:@[item, image]]; - vc.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionDown; - return vc; -} - - (void)presentInParentViewController:(UIViewController *)parentVC anchorView:(UIView *)anchorView { self.ownerViewController = parentVC; self.anchorView = anchorView; diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_sharing_editor.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_sharing_editor.imageset/Contents.json deleted file mode 100644 index f0b7b3033..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_sharing_editor.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "img_sharing_editor.png", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "original" - } -} diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_sharing_editor.imageset/img_sharing_editor.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_sharing_editor.imageset/img_sharing_editor.png deleted file mode 100644 index c1c96dbef..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_sharing_editor.imageset/img_sharing_editor.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/Contents.json deleted file mode 100644 index 2ded38626..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_socializing.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_socializing@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_socializing@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing.png deleted file mode 100644 index f573fabd6..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing@2x.png deleted file mode 100644 index d1e97988a..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing@3x.png deleted file mode 100644 index 16fb14ea6..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_socializing.imageset/img_socializing@3x.png and /dev/null differ diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 2ba6fbbbc..4e744f764 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -555,8 +555,6 @@ F62607FF207B83C400176C5A /* MWMSpinnerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F62607FE207B83C400176C5A /* MWMSpinnerAlert.xib */; }; F626D52F1C3E83F800C17D15 /* MWMTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F626D52D1C3E6CAA00C17D15 /* MWMTableViewCell.m */; }; F6381BF61CD12045004CA943 /* LocaleTranslator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6381BF41CD12045004CA943 /* LocaleTranslator.mm */; }; - F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64D9C9E1C899C350063FA30 /* MWMEditorViralAlert.mm */; }; - F64D9CA31C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64D9CA11C899C760063FA30 /* MWMEditorViralAlert.xib */; }; F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F653CE151C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm */; }; F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */ = {isa = PBXBuildFile; fileRef = F660DEE31EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift */; }; F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */ = {isa = PBXBuildFile; fileRef = F6791B121C43DEA7007A8A6E /* MWMStartButton.m */; }; @@ -1566,9 +1564,6 @@ F63774E81B59376F00BCF54D /* MWMRoutingDisclaimerAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMRoutingDisclaimerAlert.h; sourceTree = ""; tabWidth = 2; }; F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMRoutingDisclaimerAlert.m; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6381BF41CD12045004CA943 /* LocaleTranslator.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = LocaleTranslator.mm; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - F64D9C9D1C899C350063FA30 /* MWMEditorViralAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMEditorViralAlert.h; sourceTree = ""; tabWidth = 2; }; - F64D9C9E1C899C350063FA30 /* MWMEditorViralAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMEditorViralAlert.mm; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - F64D9CA11C899C760063FA30 /* MWMEditorViralAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorViralAlert.xib; sourceTree = ""; }; F64F19811AB81A00006EAF7E /* MWMAlertViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMAlertViewController.h; sourceTree = ""; tabWidth = 2; }; F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAlertViewController.mm; sourceTree = ""; tabWidth = 2; }; F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAlertViewController.xib; sourceTree = ""; }; @@ -3485,16 +3480,6 @@ path = RoutingDisclaimerAlert; sourceTree = ""; }; - F64D9C9C1C899BEA0063FA30 /* EditorAlert */ = { - isa = PBXGroup; - children = ( - F64D9C9D1C899C350063FA30 /* MWMEditorViralAlert.h */, - F64D9C9E1C899C350063FA30 /* MWMEditorViralAlert.mm */, - F64D9CA11C899C760063FA30 /* MWMEditorViralAlert.xib */, - ); - name = EditorAlert; - sourceTree = ""; - }; F64F195F1AB8125C006EAF7E /* CustomAlert */ = { isa = PBXGroup; children = ( @@ -3504,7 +3489,6 @@ 349B92691DF0516C007779DD /* Toast */, 349A137E1DEC138C00C7DB60 /* MobileInternetAlert */, F6FE3C351CC50FDF00A73196 /* PlaceDoesntExist */, - F64D9C9C1C899BEA0063FA30 /* EditorAlert */, F63774E51B59374F00BCF54D /* RoutingDisclaimerAlert */, F6BBF2C31B4FFB56000CF8E2 /* LocationAlert */, F64F19801AB81A00006EAF7E /* AlertController */, @@ -4273,7 +4257,6 @@ 467F341B2BCA928B00CDC7DE /* MWMEditorSegmentedTableViewCell.xib in Resources */, 34D3B0451E389D05004100F9 /* MWMEditorTextTableViewCell.xib in Resources */, ED0B1C312BC2951F00FB8EDD /* PrivacyInfo.xcprivacy in Resources */, - F64D9CA31C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */, 6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */, 3406FA191C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */, A630D1EA207CA95900976DEA /* Localizable.stringsdict in Resources */, @@ -4498,7 +4481,6 @@ F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */, 9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */, 471527372491C20500E91BBA /* SelectBookmarkGroupViewController.swift in Sources */, - F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */, 34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */, CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */, 99A906F323FA95AB0005872B /* PlacePageStyleSheet.swift in Sources */,