forked from organicmaps/organicmaps
[ios] Removed unnecessary Rate dialog
We already have a question mark to rate us non-intrusively and to avoid frustration. Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk
Alexander Borsuk
parent
c1e1db0f03
commit
fe14c1589c
14 changed files with 9 additions and 699 deletions
|
|
@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
+ (instancetype)sharedInfo;
|
||||
- (instancetype)init __attribute__((unavailable("init is not available")));
|
||||
|
||||
@property(nonatomic, readonly) NSString * countryCode;
|
||||
@property(nonatomic, readonly) NSString * bundleVersion;
|
||||
@property(nonatomic, readonly) NSString * buildNumber;
|
||||
@property(nonatomic, readonly) NSString * languageId;
|
||||
|
|
|
|||
|
|
@ -10,14 +10,8 @@
|
|||
#import <CoreTelephony/CTCarrier.h>
|
||||
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
|
||||
|
||||
namespace
|
||||
{
|
||||
std::string const kCountryCodeKey = "CountryCode";
|
||||
} // namespace
|
||||
|
||||
@interface AppInfo ()
|
||||
|
||||
@property(nonatomic) NSString * countryCode;
|
||||
@property(nonatomic) NSString * bundleVersion;
|
||||
@property(nonatomic) NSString * buildNumber;
|
||||
@property(nonatomic) NSString * deviceModel;
|
||||
|
|
@ -44,39 +38,6 @@ std::string const kCountryCodeKey = "CountryCode";
|
|||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (NSString *)countryCode
|
||||
{
|
||||
if (!_countryCode)
|
||||
{
|
||||
CTTelephonyNetworkInfo * networkInfo = [[CTTelephonyNetworkInfo alloc] init];
|
||||
CTCarrier * carrier = networkInfo.subscriberCellularProvider;
|
||||
if ([carrier.isoCountryCode length]) // if device can access sim card info
|
||||
_countryCode = [carrier.isoCountryCode uppercaseString];
|
||||
else // else, getting system country code
|
||||
_countryCode = [[NSLocale.currentLocale objectForKey:NSLocaleCountryCode] uppercaseString];
|
||||
|
||||
std::string codeString;
|
||||
if (settings::Get(kCountryCodeKey, codeString)) // if country code stored in settings
|
||||
{
|
||||
if (carrier.isoCountryCode) // if device can access sim card info
|
||||
settings::Set(kCountryCodeKey,
|
||||
std::string(_countryCode.UTF8String)); // then save new code instead
|
||||
else
|
||||
_countryCode =
|
||||
@(codeString.c_str()); // if device can NOT access sim card info then using saved code
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_countryCode)
|
||||
settings::Set(kCountryCodeKey,
|
||||
std::string(_countryCode.UTF8String)); // saving code first time
|
||||
else
|
||||
_countryCode = @"";
|
||||
}
|
||||
}
|
||||
return _countryCode;
|
||||
}
|
||||
|
||||
- (NSString *)bundleVersion
|
||||
{
|
||||
if (!_bundleVersion)
|
||||
|
|
@ -133,9 +94,14 @@ std::string const kCountryCodeKey = "CountryCode";
|
|||
NSURL * telURL = [NSURL URLWithString:@"tel://"];
|
||||
if (![UIApplication.sharedApplication canOpenURL:telURL])
|
||||
return NO;
|
||||
NSString * networkCode =
|
||||
[[CTTelephonyNetworkInfo alloc] init].subscriberCellularProvider.mobileNetworkCode;
|
||||
return networkCode != nil && networkCode.length > 0 && ![networkCode isEqualToString:@"65535"];
|
||||
NSDictionary<NSString *,CTCarrier *> * dict = [[CTTelephonyNetworkInfo alloc] init].serviceSubscriberCellularProviders;
|
||||
for (id key in dict)
|
||||
{
|
||||
NSString * networkCode = [dict objectForKey:key].mobileNetworkCode;
|
||||
if (networkCode != nil && networkCode.length > 0 && ![networkCode isEqualToString:@"65535"])
|
||||
return YES;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
@property(weak, nonatomic, readonly) UIViewController *_Null_unspecified ownerViewController;
|
||||
|
||||
- (nonnull instancetype)initWithViewController:(nonnull UIViewController *)viewController;
|
||||
- (void)presentRateAlert;
|
||||
- (void)presentAuthErrorAlertWithRetryBlock:(nonnull MWMVoidBlock)retryBlock;
|
||||
- (void)presentPoint2PointAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock needToRebuild:(BOOL)needToRebuild;
|
||||
- (void)presentRoutingDisclaimerAlertWithOkBlock:(nonnull nonnull MWMVoidBlock)block;
|
||||
|
|
|
|||
|
|
@ -46,10 +46,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController"
|
|||
|
||||
#pragma mark - Actions
|
||||
|
||||
- (void)presentRateAlert {
|
||||
[self displayAlert:[MWMAlert rateAlert]];
|
||||
}
|
||||
|
||||
- (void)presentAuthErrorAlertWithRetryBlock:(nonnull MWMVoidBlock)retryBlock {
|
||||
[self displayAlert:[MWMAlert authErrorAlertWithRetryBlock:retryBlock]];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
@property(weak, nonatomic) MWMAlertViewController *alertController;
|
||||
|
||||
+ (MWMAlert *)rateAlert;
|
||||
+ (MWMAlert *)authErrorAlertWithRetryBlock:(MWMVoidBlock)retryBlock;
|
||||
+ (MWMAlert *)locationAlertWithCancelBlock:(MWMVoidBlock)cancelBlock;
|
||||
+ (MWMAlert *)routingDisclaimerAlertWithOkBlock:(MWMVoidBlock)block;
|
||||
|
|
|
|||
|
|
@ -6,17 +6,12 @@
|
|||
#import "MWMLocationAlert.h"
|
||||
#import "MWMOsmAuthAlert.h"
|
||||
#import "MWMPlaceDoesntExistAlert.h"
|
||||
#import "MWMRateAlert.h"
|
||||
#import "MWMRoutingDisclaimerAlert.h"
|
||||
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
@implementation MWMAlert
|
||||
|
||||
+ (MWMAlert *)rateAlert {
|
||||
return [MWMRateAlert alert];
|
||||
}
|
||||
|
||||
+ (MWMAlert *)authErrorAlertWithRetryBlock:(MWMVoidBlock)retryBlock {
|
||||
return [MWMDefaultAlert authErrorAlertWithRetryBlock:retryBlock];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,117 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="SqL-OZ-441" customClass="MWMFeedbackAlert">
|
||||
<rect key="frame" x="0.0" y="0.0" width="280" height="227"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Get transit maps" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="29g-Hq-RFn">
|
||||
<rect key="frame" x="23" y="20" width="232" height="20"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="20"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.81999999999999995" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<size key="shadowOffset" width="0.0" height="0.0"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rating_thanks"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" id="Ptx-1H-RaZ">
|
||||
<rect key="frame" x="0.0" y="126" width="280" height="49"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7A9-TZ-0Um">
|
||||
<rect key="frame" x="0.0" y="0.0" width="284" height="49"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<connections>
|
||||
<action selector="writeFeedbackButtonTap:" destination="SqL-OZ-441" eventType="touchUpInside" id="F8I-WZ-Lyb"/>
|
||||
</connections>
|
||||
</button>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rate-send" id="w6k-xO-9ZG">
|
||||
<rect key="frame" x="25" y="13" width="48" height="24"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Champagne-Ardenne" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2kS-eR-ehT">
|
||||
<rect key="frame" x="81" y="15" width="188" height="19"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.81999999999999995" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rating_send_feedback"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.96862745100000003" green="0.96078431369999995" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="HRW-BJ-Ehj">
|
||||
<rect key="frame" x="140" y="175" width="140" height="52"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="15"/>
|
||||
<state key="normal" title="NOT NOW">
|
||||
<color key="titleColor" red="0.090196078430000007" green="0.61960784310000006" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="later"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="notNowButtonTap:" destination="SqL-OZ-441" eventType="touchUpInside" id="lhK-29-lWb"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Creating routes between regions
is only possible when all the transit maps are downloaded and updated." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fup-8E-4dg">
|
||||
<rect key="frame" x="23" y="54" width="234" height="52"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.81999999999999995" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rating_share_ideas"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor">
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius">
|
||||
<integer key="value" value="12"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset">
|
||||
<size key="value" width="0.0" height="3"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="4"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="messageLabel" destination="fup-8E-4dg" id="r6f-09-JET"/>
|
||||
<outlet property="notNowButton" destination="HRW-BJ-Ehj" id="EsR-Yc-RxB"/>
|
||||
<outlet property="specsView" destination="Ptx-1H-RaZ" id="kPN-Gi-Sct"/>
|
||||
<outlet property="titleLabel" destination="29g-Hq-RFn" id="PJb-B5-EeM"/>
|
||||
<outlet property="writeFeedbackButton" destination="7A9-TZ-0Um" id="O7a-R9-Nsm"/>
|
||||
<outlet property="writeFeedbackLabel" destination="2kS-eR-ehT" id="81B-cW-p4b"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="342" y="260.5"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="rate-send" width="48" height="24"/>
|
||||
</resources>
|
||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
||||
<simulatedStatusBarMetrics key="statusBar"/>
|
||||
<simulatedOrientationMetrics key="orientation"/>
|
||||
<simulatedScreenMetrics key="destination" type="retina4"/>
|
||||
</simulatedMetricsContainer>
|
||||
</document>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#import "MWMAlert.h"
|
||||
|
||||
@interface MWMRateAlert : MWMAlert
|
||||
|
||||
+ (instancetype)alert;
|
||||
|
||||
@end
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
#import "MWMRateAlert.h"
|
||||
|
||||
#import <CoreApi/AppInfo.h>
|
||||
|
||||
#import "MWMAlertViewController.h"
|
||||
#import "MWMMailViewController.h"
|
||||
|
||||
|
||||
#include "platform/platform.hpp"
|
||||
|
||||
extern NSString * const kUDAlreadyRatedKey;
|
||||
|
||||
static NSString * const kRateAlertEventName = @"rateAlertEvent";
|
||||
static NSString * const kRateAlertNibName = @"MWMRateAlert";
|
||||
static NSString * const kRateEmail = @"rating@organicmaps.app";
|
||||
|
||||
@interface MWMRateAlert ()<MFMailComposeViewControllerDelegate>
|
||||
|
||||
@property(nonatomic) IBOutletCollection(UIButton) NSArray * buttons;
|
||||
@property(nonatomic, weak) IBOutlet UIButton * rateButton;
|
||||
@property(nonatomic, weak) IBOutlet UILabel * title;
|
||||
@property(nonatomic, weak) IBOutlet UILabel * message;
|
||||
@property(nonatomic) NSUInteger selectedTag;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMRateAlert
|
||||
|
||||
+ (instancetype)alert
|
||||
{
|
||||
MWMRateAlert * alert =
|
||||
[NSBundle.mainBundle loadNibNamed:kRateAlertNibName owner:self options:nil].firstObject;
|
||||
[alert configureButtons];
|
||||
return alert;
|
||||
}
|
||||
|
||||
#pragma mark - Actions
|
||||
|
||||
- (void)configureButtons
|
||||
{
|
||||
UIImage * i = [self.buttons.firstObject imageForState:UIControlStateSelected];
|
||||
for (UIButton * b in self.buttons)
|
||||
[b setImage:i forState:(UIControlStateHighlighted | UIControlStateSelected)];
|
||||
}
|
||||
|
||||
- (IBAction)starTap:(UIButton *)sender
|
||||
{
|
||||
if (!self.rateButton.enabled)
|
||||
{
|
||||
self.rateButton.enabled = YES;
|
||||
auto color = UIColor.linkBlue;
|
||||
self.rateButton.layer.borderColor = color.CGColor;
|
||||
[self.rateButton setTitleColor:color forState:UIControlStateNormal];
|
||||
}
|
||||
|
||||
NSUInteger const tag = sender.tag;
|
||||
if (tag == 5)
|
||||
{
|
||||
[self.rateButton setTitle:L(@"rate_the_app") forState:UIControlStateNormal];
|
||||
self.message.text = L(@"rate_alert_five_star_message");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (tag == 4)
|
||||
self.message.text = L(@"rate_alert_four_star_message");
|
||||
else
|
||||
self.message.text = L(@"rate_alert_less_than_four_star_message");
|
||||
[self.rateButton setTitle:L(@"leave_a_review") forState:UIControlStateNormal];
|
||||
}
|
||||
[self setNeedsLayout];
|
||||
for (UIButton * b in self.buttons)
|
||||
{
|
||||
if (b.tag > tag)
|
||||
b.selected = NO;
|
||||
else
|
||||
b.selected = YES;
|
||||
}
|
||||
self.selectedTag = tag;
|
||||
}
|
||||
|
||||
- (IBAction)starHighlighted:(UIButton *)sender { [self setHighlighted:sender.tag]; }
|
||||
- (IBAction)starTouchCanceled
|
||||
{
|
||||
for (UIButton * b in self.buttons)
|
||||
b.highlighted = NO;
|
||||
}
|
||||
|
||||
- (IBAction)starDragInside:(UIButton *)sender { [self setHighlighted:sender.tag]; }
|
||||
- (void)setHighlighted:(NSUInteger)tag
|
||||
{
|
||||
for (UIButton * b in self.buttons)
|
||||
{
|
||||
if (b.tag > tag)
|
||||
b.highlighted = NO;
|
||||
else
|
||||
b.highlighted = !b.selected;
|
||||
}
|
||||
}
|
||||
|
||||
- (IBAction)doneTap
|
||||
{
|
||||
[self close:nil];
|
||||
}
|
||||
|
||||
- (IBAction)rateTap
|
||||
{
|
||||
NSUInteger const tag = self.selectedTag;
|
||||
if (tag == 5)
|
||||
{
|
||||
[UIApplication.sharedApplication rateApp];
|
||||
[self close:^{
|
||||
auto ud = NSUserDefaults.standardUserDefaults;
|
||||
[ud setBool:YES forKey:kUDAlreadyRatedKey];
|
||||
[ud synchronize];
|
||||
}];
|
||||
}
|
||||
else
|
||||
{
|
||||
[self sendFeedback];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)sendFeedback
|
||||
{
|
||||
UIViewController * ownerVC = self.alertController.ownerViewController;
|
||||
if ([MWMMailViewController canSendMail])
|
||||
{
|
||||
NSString * deviceModel = [AppInfo sharedInfo].deviceModel;
|
||||
NSString * languageCode = NSLocale.preferredLanguages.firstObject;
|
||||
NSString * language = [[NSLocale localeWithLocaleIdentifier:kLocaleUsedInSupportEmails]
|
||||
displayNameForKey:NSLocaleLanguageCode
|
||||
value:languageCode];
|
||||
NSString * locale = [NSLocale.currentLocale objectForKey:NSLocaleCountryCode];
|
||||
NSString * country = [[NSLocale localeWithLocaleIdentifier:kLocaleUsedInSupportEmails]
|
||||
displayNameForKey:NSLocaleCountryCode
|
||||
value:locale];
|
||||
NSString * bundleVersion = AppInfo.sharedInfo.bundleVersion;
|
||||
NSString * text = [NSString stringWithFormat:@"\n\n\n\n- %@ (%@)\n- OMaps %@\n- %@/%@",
|
||||
deviceModel, UIDevice.currentDevice.systemVersion,
|
||||
bundleVersion, language, country];
|
||||
MWMMailViewController * mailController = [[MWMMailViewController alloc] init];
|
||||
mailController.mailComposeDelegate = self;
|
||||
[mailController setSubject:[NSString stringWithFormat:@"%@ : %@", L(@"rating_just_rated"),
|
||||
@(self.selectedTag)]];
|
||||
[mailController setToRecipients:@[ kRateEmail ]];
|
||||
[mailController setMessageBody:text isHTML:NO];
|
||||
mailController.navigationBar.tintColor = UIColor.blackColor;
|
||||
[ownerVC presentViewController:mailController animated:YES completion:nil];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSString * text = [NSString stringWithFormat:L(@"email_error_body"), kRateEmail];
|
||||
UIAlertController * alert = [UIAlertController alertControllerWithTitle:L(@"email_error_title")
|
||||
message:text
|
||||
preferredStyle:UIAlertControllerStyleAlert];
|
||||
[alert addAction:[UIAlertAction actionWithTitle:L(@"ok")
|
||||
style:UIAlertActionStyleDefault
|
||||
handler:^(UIAlertAction * action) {}]];
|
||||
[ownerVC presentViewController:alert animated:YES completion:nil];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - MFMailComposeViewControllerDelegate
|
||||
|
||||
- (void)mailComposeController:(MFMailComposeViewController *)controller
|
||||
didFinishWithResult:(MFMailComposeResult)result
|
||||
error:(NSError *)error
|
||||
{
|
||||
[self.alertController.ownerViewController
|
||||
dismissViewControllerAnimated:YES
|
||||
completion:^{
|
||||
[self close:nil];
|
||||
}];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,269 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="xqS-d4-Cm7" customClass="MWMRateAlert" propertyAccessControl="none">
|
||||
<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 opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ecm-mK-5iV" userLabel="ContainerView">
|
||||
<rect key="frame" x="47.5" y="190.5" width="280" height="285"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8dQ-Vo-xwe" userLabel="Done" customClass="MWMButton">
|
||||
<rect key="frame" x="240" y="0.0" width="40" height="40"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="40" id="7d0-Ox-KVv"/>
|
||||
<constraint firstAttribute="height" constant="40" id="rAh-AS-UMC"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<state key="normal" image="ic_cancel">
|
||||
<color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" 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>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="doneTap" destination="xqS-d4-Cm7" eventType="touchUpInside" id="l7v-bf-FLp"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Оцените нашу работу" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pFt-mm-wUl">
|
||||
<rect key="frame" x="40" y="12" width="200" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="200" id="fCS-vI-z7G"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="w6i-mI-DNF"/>
|
||||
</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="styleName" value="medium18:blackPrimaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_alert_title"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Спасибо что пользуетесь картами OMaps. Пожалуйста, оцените приложение. Ваши оценки и отзывы помогают нам становиться лучше." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aP7-fq-KaH" userLabel="Message">
|
||||
<rect key="frame" x="20" y="45" width="240" height="82"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="240" id="HJM-e9-0wo"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="v4x-De-gsX"/>
|
||||
</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="styleName" value="regular14:blackSecondaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_alert_default_message"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ftg-qc-aFl" userLabel="Star box">
|
||||
<rect key="frame" x="20" y="138" width="240" height="59"/>
|
||||
<subviews>
|
||||
<button opaque="NO" tag="1" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xu8-rO-3BP">
|
||||
<rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal" image="ic_rate_star_off">
|
||||
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<state key="selected" image="ic_rate_star_on"/>
|
||||
<state key="highlighted" image="ic_rate_star_pressed"/>
|
||||
<connections>
|
||||
<action selector="starDragInside:" destination="xqS-d4-Cm7" eventType="touchDragInside" id="99m-Xy-hho"/>
|
||||
<action selector="starHighlighted:" destination="xqS-d4-Cm7" eventType="touchDown" id="L02-GB-uCs"/>
|
||||
<action selector="starTap:" destination="xqS-d4-Cm7" eventType="touchUpInside" id="yPA-9h-GTL"/>
|
||||
<action selector="starTouchCanceled" destination="xqS-d4-Cm7" eventType="touchDragOutside" id="mBJ-ST-BKG"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" tag="2" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VHf-Kq-sRr">
|
||||
<rect key="frame" x="48" y="0.0" width="48" height="48"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal" image="ic_rate_star_off">
|
||||
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<state key="selected" image="ic_rate_star_on"/>
|
||||
<state key="highlighted" image="ic_rate_star_pressed"/>
|
||||
<connections>
|
||||
<action selector="starDragInside:" destination="xqS-d4-Cm7" eventType="touchDragInside" id="Dbf-SL-VyI"/>
|
||||
<action selector="starHighlighted:" destination="xqS-d4-Cm7" eventType="touchDown" id="Ves-R9-ppR"/>
|
||||
<action selector="starTap:" destination="xqS-d4-Cm7" eventType="touchUpInside" id="ICT-FI-avs"/>
|
||||
<action selector="starTouchCanceled" destination="xqS-d4-Cm7" eventType="touchDragOutside" id="OeS-dr-LsK"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" tag="3" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gM3-vi-PTK">
|
||||
<rect key="frame" x="96" y="0.0" width="48" height="48"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal" image="ic_rate_star_off">
|
||||
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<state key="selected" image="ic_rate_star_on"/>
|
||||
<state key="highlighted" image="ic_rate_star_pressed"/>
|
||||
<connections>
|
||||
<action selector="starDragInside:" destination="xqS-d4-Cm7" eventType="touchDragInside" id="wIn-Ty-2CX"/>
|
||||
<action selector="starHighlighted:" destination="xqS-d4-Cm7" eventType="touchDown" id="5Uk-wg-dqb"/>
|
||||
<action selector="starTap:" destination="xqS-d4-Cm7" eventType="touchUpInside" id="4yh-ag-YaF"/>
|
||||
<action selector="starTouchCanceled" destination="xqS-d4-Cm7" eventType="touchDragOutside" id="a7T-Ir-WZj"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" tag="4" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p68-lV-IVJ">
|
||||
<rect key="frame" x="144" y="0.0" width="48" height="48"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal" image="ic_rate_star_off">
|
||||
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<state key="selected" image="ic_rate_star_on"/>
|
||||
<state key="highlighted" image="ic_rate_star_pressed"/>
|
||||
<connections>
|
||||
<action selector="starDragInside:" destination="xqS-d4-Cm7" eventType="touchDragInside" id="bPm-GK-Ai5"/>
|
||||
<action selector="starHighlighted:" destination="xqS-d4-Cm7" eventType="touchDown" id="Saf-Ix-UD7"/>
|
||||
<action selector="starTap:" destination="xqS-d4-Cm7" eventType="touchUpInside" id="XVz-ak-XqB"/>
|
||||
<action selector="starTouchCanceled" destination="xqS-d4-Cm7" eventType="touchDragOutside" id="x5k-sK-gij"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" tag="5" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nh7-Fc-Xxp">
|
||||
<rect key="frame" x="192" y="0.0" width="48" height="48"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal" image="ic_rate_star_off">
|
||||
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<state key="selected" image="ic_rate_star_on"/>
|
||||
<state key="highlighted" image="ic_rate_star_pressed"/>
|
||||
<connections>
|
||||
<action selector="starDragInside:" destination="xqS-d4-Cm7" eventType="touchDragInside" id="9JJ-Em-WZd"/>
|
||||
<action selector="starHighlighted:" destination="xqS-d4-Cm7" eventType="touchDown" id="fG3-HM-YxH"/>
|
||||
<action selector="starTap:" destination="xqS-d4-Cm7" eventType="touchUpInside" id="vyJ-qW-a9t"/>
|
||||
<action selector="starTouchCanceled" destination="xqS-d4-Cm7" eventType="touchDragOutside" id="F0l-TP-SU2"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xMo-h5-ZhH">
|
||||
<rect key="frame" x="0.0" y="48" width="48" height="11"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="10"/>
|
||||
<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="styleName" value="regular10:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a6h-xZ-4kL">
|
||||
<rect key="frame" x="48" y="48" width="48" height="11"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="10"/>
|
||||
<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="styleName" value="regular10:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="3" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u3c-7R-fKb">
|
||||
<rect key="frame" x="96" y="48" width="48" height="11"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="10"/>
|
||||
<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="styleName" value="regular10:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="4" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Chn-mM-h8X">
|
||||
<rect key="frame" x="144" y="48" width="48" height="11"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="10"/>
|
||||
<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="styleName" value="regular10:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="5" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s2o-QH-kdH">
|
||||
<rect key="frame" x="192" y="48" width="48" height="11"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="10"/>
|
||||
<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="styleName" value="regular10:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="59" id="2C4-0p-zGE"/>
|
||||
<constraint firstAttribute="width" constant="240" id="4Ar-TF-nEe"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kfl-QR-Dkk" userLabel="Share">
|
||||
<rect key="frame" x="20" y="221" width="240" height="44"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="O3d-0W-SpN"/>
|
||||
<constraint firstAttribute="width" constant="240" id="wTo-pg-6DX"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<state key="normal" title="Leave a Review">
|
||||
<color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" 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="disabled" title="Оценить"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="RateAppButton"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_the_app"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="rateTap" destination="xqS-d4-Cm7" eventType="touchUpInside" id="lqd-4T-LF7"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.84705882349999995" green="0.84705882349999995" blue="0.84705882349999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="centerX" secondItem="aP7-fq-KaH" secondAttribute="centerX" id="GI2-sL-76K"/>
|
||||
<constraint firstAttribute="centerX" secondItem="pFt-mm-wUl" secondAttribute="centerX" id="Hq8-IR-S13"/>
|
||||
<constraint firstItem="ftg-qc-aFl" firstAttribute="top" secondItem="aP7-fq-KaH" secondAttribute="bottom" constant="11" id="J6l-3E-sf0"/>
|
||||
<constraint firstItem="8dQ-Vo-xwe" firstAttribute="top" secondItem="ecm-mK-5iV" secondAttribute="top" id="OY3-cW-0lX"/>
|
||||
<constraint firstAttribute="centerX" secondItem="kfl-QR-Dkk" secondAttribute="centerX" id="Y5V-cP-MXg"/>
|
||||
<constraint firstItem="pFt-mm-wUl" firstAttribute="top" secondItem="ecm-mK-5iV" secondAttribute="top" constant="12" id="Zvg-l6-vuI"/>
|
||||
<constraint firstItem="aP7-fq-KaH" firstAttribute="top" secondItem="pFt-mm-wUl" secondAttribute="bottom" constant="11" id="cTd-t9-gKm"/>
|
||||
<constraint firstItem="kfl-QR-Dkk" firstAttribute="top" secondItem="ftg-qc-aFl" secondAttribute="bottom" constant="24" id="ea5-e9-0jF"/>
|
||||
<constraint firstAttribute="centerX" secondItem="ftg-qc-aFl" secondAttribute="centerX" id="l3c-Tr-Jcp"/>
|
||||
<constraint firstAttribute="trailing" secondItem="8dQ-Vo-xwe" secondAttribute="trailing" id="nBF-K4-mMl"/>
|
||||
<constraint firstAttribute="width" constant="280" id="oXG-YH-byd"/>
|
||||
<constraint firstAttribute="bottom" secondItem="kfl-QR-Dkk" secondAttribute="bottom" constant="20" id="y6i-Ea-kjD"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AlertView"/>
|
||||
</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="centerX" secondItem="ecm-mK-5iV" secondAttribute="centerX" id="LYH-qW-kdN"/>
|
||||
<constraint firstAttribute="centerY" secondItem="ecm-mK-5iV" secondAttribute="centerY" constant="0.5" id="un4-ij-LG6"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="22i-YS-iu3"/>
|
||||
<connections>
|
||||
<outlet property="message" destination="aP7-fq-KaH" id="4wq-2c-cAB"/>
|
||||
<outlet property="rateButton" destination="kfl-QR-Dkk" id="SPX-XQ-OlM"/>
|
||||
<outlet property="title" destination="pFt-mm-wUl" id="ahg-gJ-R3w"/>
|
||||
<outletCollection property="buttons" destination="xu8-rO-3BP" id="Ejn-zo-ZMt"/>
|
||||
<outletCollection property="buttons" destination="VHf-Kq-sRr" id="ywN-VZ-K6c"/>
|
||||
<outletCollection property="buttons" destination="gM3-vi-PTK" id="z3S-Fr-8h2"/>
|
||||
<outletCollection property="buttons" destination="p68-lV-IVJ" id="RTF-SR-MR9"/>
|
||||
<outletCollection property="buttons" destination="Nh7-Fc-Xxp" id="Zyf-tB-Lxs"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="523" y="144"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="ic_cancel" width="40" height="40"/>
|
||||
<image name="ic_rate_star_off" width="29" height="29"/>
|
||||
<image name="ic_rate_star_on" width="29" height="29"/>
|
||||
<image name="ic_rate_star_pressed" width="29" height="29"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -30,7 +30,6 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
- (void)enableDownloadIndicator;
|
||||
|
||||
- (void)showMap;
|
||||
- (void)showAlertIfRequired;
|
||||
|
||||
- (NSUInteger)badgeNumber;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,14 +35,10 @@
|
|||
// If you have a "missing header error" here, then please run configure.sh script in the root repo
|
||||
// folder.
|
||||
|
||||
// Alert keys.
|
||||
extern NSString *const kUDAlreadyRatedKey = @"UserAlreadyRatedApp";
|
||||
|
||||
namespace {
|
||||
NSString *const kUDLastLaunchDateKey = @"LastLaunchDate";
|
||||
NSString *const kUDSessionsCountKey = @"SessionsCount";
|
||||
NSString *const kUDFirstVersionKey = @"FirstVersion";
|
||||
NSString *const kUDLastRateRequestDate = @"LastRateRequestDate";
|
||||
NSString *const kUDLastShareRequstDate = @"LastShareRequestDate";
|
||||
NSString *const kUDAutoNightModeOff = @"AutoNightModeOff";
|
||||
NSString *const kIOSIDFA = @"IFA";
|
||||
|
|
@ -99,11 +95,6 @@ using namespace osm_auth_ios;
|
|||
forInputLocale:[MWMSettings spotlightLocaleLanguageId]];
|
||||
}
|
||||
|
||||
- (void)incrementSessionsCountAndCheckForAlert {
|
||||
[self incrementSessionCount];
|
||||
[self showAlertIfRequired];
|
||||
}
|
||||
|
||||
- (void)commonInit {
|
||||
[HttpThreadImpl setDownloadIndicatorProtocol:self];
|
||||
InitLocalizedStrings();
|
||||
|
|
@ -130,7 +121,7 @@ using namespace osm_auth_ios;
|
|||
if ([FirstSession isFirstSession]) {
|
||||
[self firstLaunchSetup];
|
||||
} else {
|
||||
[self incrementSessionsCountAndCheckForAlert];
|
||||
[self incrementSessionCount];
|
||||
}
|
||||
[self enableTTSForTheFirstTime];
|
||||
|
||||
|
|
@ -401,54 +392,8 @@ using namespace osm_auth_ios;
|
|||
}
|
||||
}
|
||||
|
||||
- (void)showAlertIfRequired {
|
||||
if ([self shouldShowRateAlert]) {
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showRateAlert) object:nil];
|
||||
[self performSelector:@selector(showRateAlert) withObject:nil afterDelay:30.0];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Rate
|
||||
|
||||
- (void)showRateAlert {
|
||||
if (!Platform::IsConnected() || [MWMRouter isRoutingActive])
|
||||
return;
|
||||
|
||||
[[MWMAlertViewController activeAlertController] presentRateAlert];
|
||||
[NSUserDefaults.standardUserDefaults setObject:NSDate.date forKey:kUDLastRateRequestDate];
|
||||
}
|
||||
|
||||
- (BOOL)shouldShowRateAlert {
|
||||
/// @todo Uncomment in follow-up release.
|
||||
/*
|
||||
NSUInteger const kMaximumSessionCountForShowingAlert = 21;
|
||||
NSUserDefaults const *const standartDefaults = NSUserDefaults.standardUserDefaults;
|
||||
if ([standartDefaults boolForKey:kUDAlreadyRatedKey])
|
||||
return NO;
|
||||
|
||||
NSUInteger const sessionCount = [standartDefaults integerForKey:kUDSessionsCountKey];
|
||||
if (sessionCount > kMaximumSessionCountForShowingAlert)
|
||||
return NO;
|
||||
|
||||
NSDate *const lastRateRequestDate = [standartDefaults objectForKey:kUDLastRateRequestDate];
|
||||
NSInteger const daysFromLastRateRequest = lastRateRequestDate.daysToNow;
|
||||
// Do not show more than one alert per day.
|
||||
if (lastRateRequestDate != nil && daysFromLastRateRequest == 0)
|
||||
return NO;
|
||||
|
||||
if (self.userIsNew) {
|
||||
// It's new user.
|
||||
if (sessionCount == 3 || sessionCount == 10 || sessionCount == kMaximumSessionCountForShowingAlert)
|
||||
return YES;
|
||||
} else {
|
||||
// User just got updated. Show alert, if it first session or if 90 days spent.
|
||||
if (daysFromLastRateRequest >= 90 || daysFromLastRateRequest == 0)
|
||||
return YES;
|
||||
}
|
||||
*/
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL)userIsNew {
|
||||
NSString *currentVersion = [NSBundle.mainBundle objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
|
||||
NSString *firstVersion = [NSUserDefaults.standardUserDefaults stringForKey:kUDFirstVersionKey];
|
||||
|
|
|
|||
|
|
@ -325,7 +325,6 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
|
|||
if (removeRoutePoints)
|
||||
GetFramework().GetRoutingManager().DeleteSavedRoutePoints();
|
||||
[MWMThemeManager setAutoUpdates:NO];
|
||||
[[MapsAppDelegate theApp] showAlertIfRequired];
|
||||
}
|
||||
|
||||
- (void)updateFollowingInfo {
|
||||
|
|
|
|||
|
|
@ -299,7 +299,6 @@
|
|||
6741A97D1BF340DE002C974C /* synonyms.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAEA7D0161BD26600CCD661 /* synonyms.txt */; };
|
||||
6741A97E1BF340DE002C974C /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */; };
|
||||
6741A97F1BF340DE002C974C /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_clear */; };
|
||||
6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F61579351AC2CEB60032D8E9 /* MWMRateAlert.xib */; };
|
||||
6741A9871BF340DE002C974C /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */; };
|
||||
6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; };
|
||||
6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; };
|
||||
|
|
@ -313,7 +312,6 @@
|
|||
6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */; };
|
||||
6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; };
|
||||
6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
|
||||
6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */; };
|
||||
6741A9C01BF340DE002C974C /* MWMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6588E2B1B15C26700EE1E58 /* MWMTextView.m */; };
|
||||
6741A9CF1BF340DE002C974C /* MWMLocationAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.m */; };
|
||||
6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19821AB81A00006EAF7E /* MWMAlertViewController.mm */; };
|
||||
|
|
@ -1357,9 +1355,6 @@
|
|||
F607C1841C032A8800B53A87 /* resources-hdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_dark"; path = "../../data/resources-hdpi_dark"; sourceTree = "<group>"; };
|
||||
F607C18C1C047FDC00B53A87 /* MWMSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSegue.h; sourceTree = "<group>"; };
|
||||
F607C18D1C047FDC00B53A87 /* MWMSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSegue.m; sourceTree = "<group>"; };
|
||||
F61579321AC2CE9A0032D8E9 /* MWMRateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRateAlert.h; sourceTree = "<group>"; };
|
||||
F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMRateAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
F61579351AC2CEB60032D8E9 /* MWMRateAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRateAlert.xib; sourceTree = "<group>"; };
|
||||
F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = opening_hours_how_to_edit.html; path = ../../data/opening_hours_how_to_edit.html; sourceTree = "<group>"; };
|
||||
F62607FC207B790300176C5A /* SpinnerAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerAlert.swift; sourceTree = "<group>"; };
|
||||
F62607FE207B83C400176C5A /* MWMSpinnerAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMSpinnerAlert.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -2955,16 +2950,6 @@
|
|||
name = MapViewController;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F61579301AC2CE760032D8E9 /* RateAlert */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F61579321AC2CE9A0032D8E9 /* MWMRateAlert.h */,
|
||||
F61579331AC2CE9A0032D8E9 /* MWMRateAlert.mm */,
|
||||
F61579351AC2CEB60032D8E9 /* MWMRateAlert.xib */,
|
||||
);
|
||||
path = RateAlert;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F62607FB207B78E300176C5A /* SpinnerAlert */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -3009,7 +2994,6 @@
|
|||
346B42A81DD5E3D20094EBEE /* LocationNotFoundAlert */,
|
||||
F64F19801AB81A00006EAF7E /* AlertController */,
|
||||
F64F19841AB81A00006EAF7E /* BaseAlert */,
|
||||
F61579301AC2CE760032D8E9 /* RateAlert */,
|
||||
F64F19871AB81A00006EAF7E /* DefaultAlert */,
|
||||
F64F19931AB81A00006EAF7E /* DownloadTransitMapsAlert */,
|
||||
);
|
||||
|
|
@ -3852,7 +3836,6 @@
|
|||
34AB66711FC5AA330078E451 /* TransportTransitTrain.xib in Resources */,
|
||||
47DF72BB225356BF0004AB10 /* DrivingOptions.storyboard in Resources */,
|
||||
F6E2FE851E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
|
||||
6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */,
|
||||
6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */,
|
||||
B3E3B4FD20D463B700DA8C13 /* BMCCategoriesHeader.xib in Resources */,
|
||||
F6E2FF001E097BA00083EBEC /* SearchCategoryCell.xib in Resources */,
|
||||
|
|
@ -4014,7 +3997,6 @@
|
|||
6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */,
|
||||
6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */,
|
||||
34AB662C1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */,
|
||||
6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */,
|
||||
3404F48B202894EA0090E401 /* BMCViewController.swift in Sources */,
|
||||
349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */,
|
||||
F6E2FF3F1E097BA00083EBEC /* MWMSearchTableViewController.mm in Sources */,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue