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

[iOS] fix some deprecated method calls, remove some obsolete and dead code

Browse source
This commit is contained in:
Aleksey Belouosv 2019-01-18 15:07:52 +03:00 • committed by Roman Kuznetsov
parent 15df3276fb
commit 57ef44ff3b
22 changed files with 35 additions and 372 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Categories/UIKitCategories.mm
View file

@ -106,7 +106,7 @@
{
NSString * urlString = @"https://itunes.apple.com/app/id510623322?action=write-review";
NSURL * url = [NSURL URLWithString:urlString];
[self openURL:url];
[self openURL:url options:@{} completionHandler:nil];
}
@end

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

@ -10,7 +10,6 @@
- (nonnull instancetype)initWithViewController:(nonnull UIViewController *)viewController;
- (void)presentRoutingMigrationAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock;
- (void)presentRateAlert;
- (void)presentFacebookAlert;
- (void)presentPoint2PointAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock
needToRebuild:(BOOL)needToRebuild;
- (void)presentRoutingDisclaimerAlertWithOkBlock:(nonnull nonnull MWMVoidBlock)block;

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

@ -62,7 +62,6 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
[self displayAlert:[MWMAlert point2PointAlertWithOkBlock:okBlock needToRebuild:needToRebuild]];
}
- (void)presentFacebookAlert { [self displayAlert:[MWMAlert facebookAlert]]; }
- (void)presentLocationServiceNotSupportedAlert
{
[self displayAlert:[MWMAlert locationServiceNotSupportedAlert]];

1
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
View file

@ -5,7 +5,6 @@
+ (MWMAlert *)routingMigrationAlertWithOkBlock:(MWMVoidBlock)okBlock;
+ (MWMAlert *)rateAlert;
+ (MWMAlert *)facebookAlert;
+ (MWMAlert *)locationAlert;
+ (MWMAlert *)routingDisclaimerAlertWithOkBlock:(MWMVoidBlock)block;
+ (MWMAlert *)disabledLocationAlert;

2
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
View file

@ -4,7 +4,6 @@
#import "MWMDefaultAlert.h"
#import "MWMDownloadTransitMapAlert.h"
#import "MWMEditorViralAlert.h"
#import "MWMFacebookAlert.h"
#import "MWMLocationAlert.h"
#import "MWMOsmAuthAlert.h"
#import "MWMPlaceDoesntExistAlert.h"
@ -17,7 +16,6 @@
+ (MWMAlert *)rateAlert { return [MWMRateAlert alert]; }
+ (MWMAlert *)locationAlert { return [MWMLocationAlert alert]; }
+ (MWMAlert *)facebookAlert { return [MWMFacebookAlert alert]; }
+ (MWMAlert *)point2PointAlertWithOkBlock:(MWMVoidBlock)block needToRebuild:(BOOL)needToRebuild
{
return [MWMDefaultAlert point2PointAlertWithOkBlock:block needToRebuild:needToRebuild];

7
iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.h
View file

@ -1,7 +0,0 @@
#import "MWMAlert.h"
@interface MWMFacebookAlert : MWMAlert
+ (MWMFacebookAlert *)alert;
@end

51
iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.mm
View file

@ -1,51 +0,0 @@
#import "MWMAlertViewController.h"
#import "MWMFacebookAlert.h"
#import "Statistics.h"
#import <FBSDKShareKit/FBSDKShareKit.h>
#import "3party/Alohalytics/src/alohalytics_objc.h"
static NSString * const kFacebookAlertNibName = @"MWMFacebookAlert";
static NSString * const kFacebookAppName = @"https://fb.me/958251974218933";
static NSString * const kFacebookURL = @"http://www.facebook.com/MapsWithMe";
static NSString * const kFacebookScheme = @"fb://profile/111923085594432";
static NSString * const kFacebookAlertPreviewImage = @"http://maps.me/images/fb_app_invite_banner.png";
static NSString * const kFacebookInviteEventName = @"facebookInviteEvent";
extern NSString * const kUDAlreadySharedKey;
static NSString * const kStatisticsEvent = @"Facebook Alert";
@implementation MWMFacebookAlert
+ (MWMFacebookAlert *)alert
{
[Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatOpen}];
MWMFacebookAlert * alert =
[NSBundle.mainBundle loadNibNamed:kFacebookAlertNibName owner:self options:nil].firstObject;
return alert;
}
#pragma mark - Actions
- (IBAction)shareButtonTap:(id)sender
{
[Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatApply}];
[Alohalytics logEvent:kFacebookInviteEventName withValue:@"shareTap"];
[self close:nil];
[NSUserDefaults.standardUserDefaults setBool:YES forKey:kUDAlreadySharedKey];
[NSUserDefaults.standardUserDefaults synchronize];
FBSDKAppInviteContent * const content = [[FBSDKAppInviteContent alloc] init];
content.appLinkURL = [NSURL URLWithString:kFacebookAppName];
content.appInvitePreviewImageURL = [NSURL URLWithString:kFacebookAlertPreviewImage];
[FBSDKAppInviteDialog showFromViewController:self.alertController.ownerViewController withContent:content delegate:nil];
}
- (IBAction)notNowButtonTap:(id)sender
{
[Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatClose}];
[Alohalytics logEvent:kFacebookInviteEventName withValue:@"notNowTap"];
[self close:nil];
}
@end

170
iphone/Maps/Classes/CustomAlert/FacebookAlert/MWMFacebookAlert.xib
View file

@ -1,170 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
<string>HelveticaNeue-Medium</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="Eeb-Gs-Fip" customClass="MWMFacebookAlert" propertyAccessControl="all">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z0H-Rd-9cG" userLabel="ContainerView">
<rect key="frame" x="47.5" y="264.5" width="280" height="138"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wP3-As-2xi" userLabel="Title">
<rect key="frame" x="20" y="20" width="240" height="22"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="BzP-sL-4rY"/>
<constraint firstAttribute="width" constant="240" id="E62-zt-CmQ"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rating_do_like_maps"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b0r-sd-kA8" userLabel="Message">
<rect key="frame" x="20" y="53" width="240" height="20"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="3IZ-v6-CRJ"/>
<constraint firstAttribute="width" constant="240" id="jJb-tA-140"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="share_on_facebook_text"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="27o-Pr-5r5" userLabel="hDivider">
<rect key="frame" x="0.0" y="93" width="280" height="1"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ItN-PG-PAr"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
</userDefinedRuntimeAttributes>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wp2-fW-sfI" userLabel="left">
<rect key="frame" x="0.0" y="94" width="140" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="140" id="VDv-Qe-qnS"/>
<constraint firstAttribute="height" constant="44" id="q1N-JQ-1lI"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="left">
<color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="highlighted" backgroundImage="dialog_btn_press"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="later"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="notNowButtonTap:" destination="Eeb-Gs-Fip" eventType="touchUpInside" id="FEJ-y8-uMY"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KKf-Om-1Qn" userLabel="right">
<rect key="frame" x="140" y="94" width="140" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="A9k-kj-upS"/>
<constraint firstAttribute="width" constant="140" id="BkJ-6q-bGV"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="right">
<color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="highlighted" backgroundImage="dialog_btn_press"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="share"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="shareButtonTap:" destination="Eeb-Gs-Fip" eventType="touchUpInside" id="NBE-Bo-lM3"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RGP-EG-eOe" userLabel="vDivider">
<rect key="frame" x="139" y="93" width="1" height="44"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="1TF-2b-jo4"/>
<constraint firstAttribute="height" constant="44" id="2ZE-1w-Yd9"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="0.88" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="RGP-EG-eOe" secondAttribute="bottom" constant="1" id="2L1-qn-SL5"/>
<constraint firstAttribute="bottom" secondItem="Wp2-fW-sfI" secondAttribute="bottom" id="2cC-jr-6fM"/>
<constraint firstAttribute="centerX" secondItem="b0r-sd-kA8" secondAttribute="centerX" id="64L-mE-9bY"/>
<constraint firstAttribute="centerX" secondItem="27o-Pr-5r5" secondAttribute="centerX" id="8t7-qm-bqZ"/>
<constraint firstAttribute="width" secondItem="27o-Pr-5r5" secondAttribute="width" id="98g-U6-i3D"/>
<constraint firstAttribute="centerX" secondItem="wP3-As-2xi" secondAttribute="centerX" id="DMb-KY-vWG"/>
<constraint firstItem="Wp2-fW-sfI" firstAttribute="leading" secondItem="z0H-Rd-9cG" secondAttribute="leading" id="DgF-Z3-5hp"/>
<constraint firstAttribute="bottom" secondItem="KKf-Om-1Qn" secondAttribute="bottom" id="IYt-QN-Rl6"/>
<constraint firstItem="Wp2-fW-sfI" firstAttribute="top" secondItem="27o-Pr-5r5" secondAttribute="bottom" id="Jhh-W8-HfW"/>
<constraint firstItem="KKf-Om-1Qn" firstAttribute="leading" secondItem="RGP-EG-eOe" secondAttribute="trailing" id="Kiw-20-8VV"/>
<constraint firstItem="KKf-Om-1Qn" firstAttribute="top" secondItem="27o-Pr-5r5" secondAttribute="bottom" id="Ske-bQ-cdA"/>
<constraint firstAttribute="trailing" secondItem="KKf-Om-1Qn" secondAttribute="trailing" id="fAQ-xu-4W9"/>
<constraint firstItem="b0r-sd-kA8" firstAttribute="top" secondItem="wP3-As-2xi" secondAttribute="bottom" constant="11.5" id="k6R-zk-BeK"/>
<constraint firstItem="wP3-As-2xi" firstAttribute="top" secondItem="z0H-Rd-9cG" secondAttribute="top" constant="20" id="lk1-pP-I7f"/>
<constraint firstItem="27o-Pr-5r5" firstAttribute="top" secondItem="b0r-sd-kA8" secondAttribute="bottom" constant="20" id="n4x-On-Sxg"/>
<constraint firstAttribute="width" constant="280" id="pee-7K-mwu"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset">
<size key="value" width="0.0" height="3"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius">
<integer key="value" value="6"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="12"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="alertBackground"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="centerY" secondItem="z0H-Rd-9cG" secondAttribute="centerY" id="EwN-vC-oZ1"/>
<constraint firstAttribute="centerX" secondItem="z0H-Rd-9cG" secondAttribute="centerX" id="fQG-1v-223"/>
</constraints>
<viewLayoutGuide key="safeArea" id="IbR-um-e6O"/>
<point key="canvasLocation" x="462" y="155"/>
</view>
</objects>
<resources>
<image name="dialog_btn_press" width="280" height="44"/>
</resources>
</document>

2
iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm
View file

@ -30,7 +30,7 @@ static NSString * const kStatisticsEvent = @"Location Alert";
NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
UIApplication * a = UIApplication.sharedApplication;
if ([a canOpenURL:url])
[a openURL:url];
[a openURL:url options:@{} completionHandler:nil];
}];
}

2
iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm
View file

@ -53,7 +53,7 @@ static NSString * const kKeyPath = @"subviews";
auto & bmManager = f.GetBookmarkManager();
bmManager.GetEditSession().ClearGroup(UserMark::Type::API);
NSURL * url = [NSURL URLWithString:@(f.GetApiDataHolder().GetGlobalBackUrl().c_str())];
[UIApplication.sharedApplication openURL:url];
[UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
}
@end

69
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -401,8 +401,7 @@ using namespace osm_auth_ios;
[GIDSignIn sharedInstance].clientID =
[[NSBundle mainBundle] loadWithPlist:@"GoogleService-Info"][@"CLIENT_ID"];
if (@available(iOS 10, *))
[UNUserNotificationCenter currentNotificationCenter].delegate = self;
[UNUserNotificationCenter currentNotificationCenter].delegate = self;
if ([MWMFrameworkHelper canUseNetwork]) {
[[SubscriptionManager shared] validate];
@ -941,66 +940,20 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showRateAlert) object:nil];
[self performSelector:@selector(showRateAlert) withObject:nil afterDelay:30.0];
}
else if ([self shouldShowFacebookAlert])
{
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showFacebookAlert) object:nil];
[self performSelector:@selector(showFacebookAlert) withObject:nil afterDelay:30.0];
}
}
- (void)showAlert:(BOOL)isRate
{
if (!Platform::IsConnected() || [MWMRouter isRoutingActive])
return;
if (isRate)
[[MWMAlertViewController activeAlertController] presentRateAlert];
else
[[MWMAlertViewController activeAlertController] presentFacebookAlert];
[NSUserDefaults.standardUserDefaults
setObject:NSDate.date
forKey:isRate ? kUDLastRateRequestDate : kUDLastShareRequstDate];
}
#pragma mark - Facebook
- (void)showFacebookAlert { [self showAlert:NO]; }
- (BOOL)shouldShowFacebookAlert
{
NSUInteger const kMaximumSessionCountForShowingShareAlert = 50;
NSUserDefaults const * const standartDefaults = NSUserDefaults.standardUserDefaults;
if ([standartDefaults boolForKey:kUDAlreadySharedKey])
return NO;
NSUInteger const sessionCount = [standartDefaults integerForKey:kUDSessionsCountKey];
if (sessionCount > kMaximumSessionCountForShowingShareAlert)
return NO;
NSDate * const lastShareRequestDate = [standartDefaults objectForKey:kUDLastShareRequstDate];
NSUInteger const daysFromLastShareRequest =
[MapsAppDelegate daysBetweenNowAndDate:lastShareRequestDate];
if (lastShareRequestDate != nil && daysFromLastShareRequest == 0)
return NO;
if (sessionCount == 30 || sessionCount == kMaximumSessionCountForShowingShareAlert)
return YES;
if (self.userIsNew)
{
if (sessionCount == 12)
return YES;
}
else
{
if (sessionCount == 5)
return YES;
}
return NO;
}
#pragma mark - Rate
- (void)showRateAlert { [self showAlert:YES]; }
- (void)showRateAlert
{
if (!Platform::IsConnected() || [MWMRouter isRoutingActive])
return;
[[MWMAlertViewController activeAlertController] presentRateAlert];
[NSUserDefaults.standardUserDefaults setObject:NSDate.date
forKey:kUDLastRateRequestDate];
}
- (BOOL)shouldShowRateAlert
{
NSUInteger const kMaximumSessionCountForShowingAlert = 21;

2
iphone/Maps/Common/WebViewController.mm
View file

@ -164,7 +164,7 @@
&& ![inRequest.URL.scheme isEqualToString:@"applewebdata"]) // do not try to open local links in Safari
{
NSURL * url = [inRequest URL];
[UIApplication.sharedApplication openURL:url];
[UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
decisionHandler(WKNavigationActionPolicyCancel);
return;
}

2
iphone/Maps/Core/Notifications/MWMPushNotifications.mm
View file

@ -70,7 +70,7 @@ NSString * const kPushDeviceTokenLogEvent = @"iOSPushDeviceToken";
return NO;
NSURL * url = [NSURL URLWithString:openLink];
[app openURL:url];
[app openURL:url options:@{} completionHandler:nil];
return YES;
}

2
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -153,7 +153,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
}
[taxiDataSource taxiURL:^(NSURL * url) {
[UIApplication.sharedApplication openURL:url];
[UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
}];
}

21
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -474,14 +474,12 @@
6741A9881BF340DE002C974C /* MWMAPIBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */; };
6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; };
6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; };
6741A9911BF340DE002C974C /* MWMFacebookAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BC1E531ACBF9AB00EF0360 /* MWMFacebookAlert.xib */; };
6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */; };
6741A9981BF340DE002C974C /* resources-xhdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_clear */; };
6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; };
6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; };
6741A9A31BF340DE002C974C /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; };
6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; };
6741A9A81BF340DE002C974C /* MWMFacebookAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BC1E511ACBF98600EF0360 /* MWMFacebookAlert.mm */; };
6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F198B1AB81A00006EAF7E /* MWMDefaultAlert.mm */; };
6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */; };
6741A9B11BF340DE002C974C /* MWMAPIBarView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 341522BE1B666A550077AA8F /* MWMAPIBarView.mm */; };
@ -1695,9 +1693,6 @@
F6BBF2C41B4FFB72000CF8E2 /* MWMLocationAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationAlert.h; sourceTree = "<group>"; };
F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMLocationAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLocationAlert.xib; sourceTree = "<group>"; };
F6BC1E501ACBF98600EF0360 /* MWMFacebookAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFacebookAlert.h; sourceTree = "<group>"; };
F6BC1E511ACBF98600EF0360 /* MWMFacebookAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMFacebookAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
F6BC1E531ACBF9AB00EF0360 /* MWMFacebookAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMFacebookAlert.xib; sourceTree = "<group>"; };
F6BD1D1E1CA412920047B8E8 /* MWMOsmAuthAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOsmAuthAlert.h; sourceTree = "<group>"; };
F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMOsmAuthAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMOsmAuthAlert.xib; sourceTree = "<group>"; };
@ -3584,7 +3579,6 @@
F6BBF2C31B4FFB56000CF8E2 /* LocationAlert */,
346B42A81DD5E3D20094EBEE /* LocationNotFoundAlert */,
F64F19801AB81A00006EAF7E /* AlertController */,
F6BC1E4F1ACBF97000EF0360 /* FacebookAlert */,
F64F19841AB81A00006EAF7E /* BaseAlert */,
F61579301AC2CE760032D8E9 /* RateAlert */,
F64F19871AB81A00006EAF7E /* DefaultAlert */,
@ -3741,16 +3735,6 @@
path = LocationAlert;
sourceTree = "<group>";
};
F6BC1E4F1ACBF97000EF0360 /* FacebookAlert */ = {
isa = PBXGroup;
children = (
F6BC1E501ACBF98600EF0360 /* MWMFacebookAlert.h */,
F6BC1E511ACBF98600EF0360 /* MWMFacebookAlert.mm */,
F6BC1E531ACBF9AB00EF0360 /* MWMFacebookAlert.xib */,
);
path = FacebookAlert;
sourceTree = "<group>";
};
F6BD1D1D1CA412700047B8E8 /* AuthAlert */ = {
isa = PBXGroup;
children = (
@ -4654,7 +4638,6 @@
F64D9CA31C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */,
340FDC0A2031C39E00F140AD /* BMCPermissionsPendingCell.xib in Resources */,
346DB8311E5C4F6700E3123E /* GalleryItemViewController.xib in Resources */,
6741A9911BF340DE002C974C /* MWMFacebookAlert.xib in Resources */,
6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */,
3406FA191C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */,
A630D1EA207CA95900976DEA /* Localizable.stringsdict in Resources */,
@ -4872,7 +4855,6 @@
F6664BFA1E6459CB00E703C2 /* PPFacilityCell.swift in Sources */,
348B926D1FF3B5E100379009 /* UIView+Animation.swift in Sources */,
F6E2FDE91E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */,
6741A9A81BF340DE002C974C /* MWMFacebookAlert.mm in Sources */,
34AB665F1FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */,
34B846A82029E8110081ECCD /* BMCDefaultViewModel.swift in Sources */,
470F5A7F2189C30800754295 /* InAppPurchase.swift in Sources */,
@ -5540,7 +5522,6 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
@ -5591,7 +5572,6 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
@ -5645,7 +5625,6 @@
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};

17
iphone/Maps/TipsAndTricks/TutorialBlurView.swift
View file

@ -72,9 +72,7 @@ class TutorialBlurView: UIVisualEffectView {
func animateFadeOut(_ duration: TimeInterval, completion: @escaping () -> Void) {
UIView.animate(withDuration: duration, animations: {
if #available(iOS 10.0, *) {
self.effect = nil
}
self.effect = nil
self.contentView.alpha = 0
}) { _ in
self.contentView.backgroundColor = .clear
@ -83,15 +81,10 @@ class TutorialBlurView: UIVisualEffectView {
}
func animateAppearance(_ duration: TimeInterval) {
contentView.alpha = 0
UIView.animate(withDuration: duration) {
self.contentView.alpha = 1
if #available(iOS 10.0, *) {
self.effect = UIBlurEffect(style: UIColor.isNightMode() ? .light : .dark)
} else {
let bgColor = UIColor.isNightMode() ? UIColor.gray : UIColor.black
self.contentView.backgroundColor = bgColor.withAlphaComponent(0.5)
}
contentView.alpha = 0
UIView.animate(withDuration: duration) {
self.contentView.alpha = 1
self.effect = UIBlurEffect(style: UIColor.isNightMode() ? .light : .dark)
}
}

1
iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
View file

@ -14,7 +14,6 @@ typedef UIView * _Nullable (^MWMPlacePageButtonsDismissBlock)(NSInteger);
- (void)book:(BOOL)isDescription;
- (void)editBookmark;
- (void)orderTaxi:(MWMPlacePageTaxiProvider)provider;
- (void)showAllReviews;
- (void)showAllFacilities;
- (void)showPhotoAtIndex:(NSInteger)index
referenceView:(UIView * _Nullable)referenceView

40
iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
View file

@ -503,14 +503,14 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
if (!isDescription && data.isPartnerAppInstalled)
{
[UIApplication.sharedApplication openURL:data.deepLink];
[UIApplication.sharedApplication openURL:data.deepLink options:@{} completionHandler:nil];
return;
}
NSURL * url = isDescription ? data.sponsoredDescriptionURL : data.sponsoredURL;
NSAssert(url, @"Sponsored url can't be nil!");
[UIApplication.sharedApplication openURL:url];
[UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
}
- (void)searchBookingHotels
@ -521,7 +521,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
logSponsoredEvent(data, kStatPlacePageHotelSearch);
NSURL * url = data.bookingSearchURL;
NSAssert(url, @"Search url can't be nil!");
[UIApplication.sharedApplication openURL:url];
[UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
}
- (void)openPartner
@ -532,39 +532,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
logSponsoredEvent(data, kStatPlacePageSponsoredActionButtonClick);
NSURL * url = data.sponsoredURL;
NSAssert(url, @"Partner url can't be nil!");
[UIApplication.sharedApplication openURL:url];
}
- (void)call
{
auto data = self.data;
if (!data)
return;
NSAssert(data.phoneNumber, @"Phone number can't be nil!");
NSString * phoneNumber = [[@"telprompt:" stringByAppendingString:data.phoneNumber]
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSURL * url = [NSURL URLWithString:phoneNumber];
[UIApplication.sharedApplication openURL:url];
}
- (void)apiBack
{
auto data = self.data;
if (!data)
return;
[Statistics logEvent:kStatEventName(kStatPlacePage, kStatAPI)];
NSURL * url = [NSURL URLWithString:data.apiURL];
[UIApplication.sharedApplication openURL:url];
[self.ownerViewController.apiBar back];
}
- (void)showAllReviews
{
auto data = self.data;
if (!data)
return;
logSponsoredEvent(data, kStatPlacePageHotelReviews);
[UIApplication.sharedApplication openURL:data.URLToAllReviews];
[UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
}
- (void)showPhotoAtIndex:(NSInteger)index

5
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm
View file

@ -119,8 +119,9 @@
}
- (BOOL)textView:(UITextView *)textView
shouldInteractWithURL:(NSURL *)URL
inRange:(NSRange)characterRange
shouldInteractWithURL:(NSURL *)URL
inRange:(NSRange)characterRange
interaction:(UITextItemInteraction)interaction
{
NSString * scheme = URL.scheme;
if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"])

2
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
View file

@ -68,7 +68,7 @@ extension SearchCategoriesViewController: SearchBannerCellDelegate {
assertionFailure()
return
}
UIApplication.shared.openURL(url)
UIApplication.shared.open(url)
}
func cellDidPressClose(_ cell: SearchBannerCell) {

5
iphone/Maps/UI/Settings/MWMSettingsViewController.mm
View file

@ -371,7 +371,10 @@ extern NSString * const kAlohalyticsTapEventKey;
}
else if (cell == self.manageSubscriptionsCell)
{
[UIApplication.sharedApplication openURL:[NSURL URLWithString:@"https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/manageSubscriptions"]];
[UIApplication.sharedApplication
openURL:[NSURL URLWithString:@"https://buy.itunes.apple.com/WebObjects/MZFinance.woa/wa/manageSubscriptions"]
options:@{}
completionHandler:nil];
}
}

2
iphone/Maps/UI/Welcome/WhatsNewController.swift
View file

@ -63,7 +63,7 @@ final class WhatsNewController: WelcomeViewController {
@IBAction func onCta() {
let config = pageConfig as! WhatsNewConfig
if let url = URL(string: config.ctaButtonUrl!) {
UIApplication.shared.openURL(url)
UIApplication.shared.open(url)
} else {
assertionFailure()
}