forked from organicmaps/organicmaps
[ios] Added downloader/editor/search what's new.
This commit is contained in:
Ilya Grechuhin
Sergey Yershov
parent
89c87a15c7
commit
e5359919d9
5 changed files with 252 additions and 19 deletions
|
|
@ -0,0 +1,5 @@
|
|||
#import "MWMWelcomeController.h"
|
||||
|
||||
@interface MWMWhatsNewDownloaderEditorController : MWMWelcomeController
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
#import "MWMPageController.h"
|
||||
#import "MWMWhatsNewDownloaderEditorController.h"
|
||||
|
||||
@interface MWMWhatsNewDownloaderEditorController ()
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UIView * containerView;
|
||||
@property (weak, nonatomic) IBOutlet UIImageView * image;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * alertTitle;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * alertText;
|
||||
@property (weak, nonatomic) IBOutlet UIButton * nextPageButton;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerWidth;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * containerHeight;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset;
|
||||
|
||||
@end
|
||||
|
||||
namespace
|
||||
{
|
||||
NSArray<TMWMWelcomeConfigBlock> * pagesConfigBlocks = @[
|
||||
[^(MWMWhatsNewDownloaderEditorController * controller) {
|
||||
controller.image.image = [UIImage imageNamed:@"img_whatsnew_migration"];
|
||||
controller.alertTitle.text = L(@"whats_new_migration_title");
|
||||
controller.alertText.text = L(@"whats_new_migration_text");
|
||||
[controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal];
|
||||
[controller.nextPageButton addTarget:controller.pageController
|
||||
action:@selector(nextPage)
|
||||
forControlEvents:UIControlEventTouchUpInside];
|
||||
} copy],
|
||||
[^(MWMWhatsNewDownloaderEditorController * controller) {
|
||||
controller.image.image = [UIImage imageNamed:@"img_whatsnew_editdata"];
|
||||
controller.alertTitle.text = L(@"whats_new_editdata_title");
|
||||
controller.alertText.text = L(@"whats_new_editdata_text");
|
||||
[controller.nextPageButton setTitle:L(@"whats_new_next_button") forState:UIControlStateNormal];
|
||||
[controller.nextPageButton addTarget:controller.pageController
|
||||
action:@selector(nextPage)
|
||||
forControlEvents:UIControlEventTouchUpInside];
|
||||
} copy],
|
||||
[^(MWMWhatsNewDownloaderEditorController * controller) {
|
||||
controller.image.image = [UIImage imageNamed:@"img_whatsnew_update_search"];
|
||||
controller.alertTitle.text = L(@"whats_new_search_title");
|
||||
controller.alertText.text = L(@"whats_new_search_text");
|
||||
[controller.nextPageButton setTitle:L(@"done") forState:UIControlStateNormal];
|
||||
[controller.nextPageButton addTarget:controller.pageController
|
||||
action:@selector(close)
|
||||
forControlEvents:UIControlEventTouchUpInside];
|
||||
} copy]
|
||||
];
|
||||
} // namespace
|
||||
|
||||
@implementation MWMWhatsNewDownloaderEditorController
|
||||
|
||||
+ (NSString *)udWelcomeWasShownKey
|
||||
{
|
||||
return @"WhatsNewWithDownloaderEditorSearchWasShown";
|
||||
}
|
||||
|
||||
+ (NSArray<TMWMWelcomeConfigBlock> *)pagesConfig
|
||||
{
|
||||
return pagesConfigBlocks;
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (void)setSize:(CGSize)size
|
||||
{
|
||||
super.size = size;
|
||||
CGSize const newSize = super.size;
|
||||
CGFloat const width = newSize.width;
|
||||
CGFloat const height = newSize.height;
|
||||
BOOL const hideImage = (self.imageHeight.multiplier * height <= self.imageMinHeight.constant);
|
||||
self.titleImageOffset.priority = hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
|
||||
self.image.hidden = hideImage;
|
||||
self.containerWidth.constant = width;
|
||||
self.containerHeight.constant = height;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
<mutableArray key="HelveticaNeue.ttc">
|
||||
<string>HelveticaNeue-Medium</string>
|
||||
<string>HelveticaNeue-Medium</string>
|
||||
<string>HelveticaNeue-Medium</string>
|
||||
</mutableArray>
|
||||
</customFonts>
|
||||
<scenes>
|
||||
|
|
@ -32,10 +33,10 @@
|
|||
<rect key="frame" x="16" y="40" width="488" height="456"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KYa-do-R0L" userLabel="CenteredView">
|
||||
<rect key="frame" x="44" y="79" width="400" height="297"/>
|
||||
<rect key="frame" x="44" y="59" width="400" height="337"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_perspective_view" translatesAutoresizingMaskIntoConstraints="NO" id="9EX-CE-PRs">
|
||||
<rect key="frame" x="110" y="0.0" width="180" height="180"/>
|
||||
<rect key="frame" x="90" y="0.0" width="220" height="220"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="120" id="Vf0-P1-t3t"/>
|
||||
<constraint firstAttribute="width" secondItem="9EX-CE-PRs" secondAttribute="height" multiplier="1:1" id="pgq-ox-chU"/>
|
||||
|
|
@ -43,7 +44,7 @@
|
|||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAPS.ME подскажет куда поворачивать" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="geS-K2-Efv" userLabel="Title">
|
||||
<rect key="frame" x="0.0" y="200" width="400" height="48"/>
|
||||
<rect key="frame" x="0.0" y="240" width="400" height="48"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -53,7 +54,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<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="cK0-L8-zCK" userLabel="Text">
|
||||
<rect key="frame" x="0.0" y="264" width="400" height="33"/>
|
||||
<rect key="frame" x="0.0" y="304" width="400" height="33"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -185,10 +186,10 @@
|
|||
<rect key="frame" x="16" y="40" width="488" height="456"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y7O-d8-Zqv" userLabel="CenteredView">
|
||||
<rect key="frame" x="44" y="79" width="400" height="297"/>
|
||||
<rect key="frame" x="44" y="59" width="400" height="337"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_perspective_view" translatesAutoresizingMaskIntoConstraints="NO" id="3yX-3O-NmI">
|
||||
<rect key="frame" x="110" y="0.0" width="180" height="180"/>
|
||||
<rect key="frame" x="90" y="0.0" width="220" height="220"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="0jq-yV-Ew3"/>
|
||||
<constraint firstAttribute="width" secondItem="3yX-3O-NmI" secondAttribute="height" multiplier="1:1" id="OJT-CV-liK"/>
|
||||
|
|
@ -196,7 +197,7 @@
|
|||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAPS.ME подскажет куда поворачивать" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbU-5I-7cc" userLabel="Title">
|
||||
<rect key="frame" x="0.0" y="200" width="400" height="48"/>
|
||||
<rect key="frame" x="0.0" y="240" width="400" height="48"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -206,7 +207,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<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="qXz-kN-Ik2" userLabel="Text">
|
||||
<rect key="frame" x="0.0" y="264" width="400" height="33"/>
|
||||
<rect key="frame" x="0.0" y="304" width="400" height="33"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -257,17 +258,13 @@
|
|||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="layer.borderColorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
|
||||
<integer key="value" value="1"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="8"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</button>
|
||||
</subviews>
|
||||
|
|
@ -309,7 +306,148 @@
|
|||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="Tm5-G5-Xsm" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="2549" y="1224"/>
|
||||
<point key="canvasLocation" x="2563" y="1224"/>
|
||||
</scene>
|
||||
<!--Whats New Downloader Editor Controller-->
|
||||
<scene sceneID="FaV-hQ-DSI">
|
||||
<objects>
|
||||
<viewController storyboardIdentifier="MWMWhatsNewDownloaderEditorController" id="911-k6-fWi" customClass="MWMWhatsNewDownloaderEditorController" sceneMemberID="viewController">
|
||||
<layoutGuides>
|
||||
<viewControllerLayoutGuide type="top" id="GjL-ED-XGn"/>
|
||||
<viewControllerLayoutGuide type="bottom" id="ZGH-fX-kmZ"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="oVB-IG-dvL">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yss-Sh-6Az" userLabel="Container">
|
||||
<rect key="frame" x="40" y="0.0" width="520" height="600"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x7x-NE-mqP" userLabel="BoundsView">
|
||||
<rect key="frame" x="16" y="40" width="488" height="456"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3e1-HO-MaJ" userLabel="CenteredView">
|
||||
<rect key="frame" x="44" y="59" width="400" height="337"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_perspective_view" translatesAutoresizingMaskIntoConstraints="NO" id="mm5-FP-Hug">
|
||||
<rect key="frame" x="90" y="0.0" width="220" height="220"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="120" id="bky-HI-LEh"/>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="dic-5i-JP2"/>
|
||||
<constraint firstAttribute="width" secondItem="mm5-FP-Hug" secondAttribute="height" multiplier="1:1" id="fIc-Uw-ijH"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAPS.ME подскажет куда поворачивать" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9lh-sL-HGk" userLabel="Title">
|
||||
<rect key="frame" x="0.0" y="240" width="400" height="48"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<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="FYP-Wb-Mbo" userLabel="Text">
|
||||
<rect key="frame" x="0.0" y="304" width="400" height="33"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
|
||||
<constraints>
|
||||
<constraint firstItem="FYP-Wb-Mbo" firstAttribute="top" secondItem="9lh-sL-HGk" secondAttribute="bottom" constant="16" id="0Q8-gv-OIt"/>
|
||||
<constraint firstItem="9lh-sL-HGk" firstAttribute="centerX" secondItem="3e1-HO-MaJ" secondAttribute="centerX" id="EHw-0E-0M3"/>
|
||||
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="J9X-O9-sTI"/>
|
||||
<constraint firstAttribute="bottom" secondItem="FYP-Wb-Mbo" secondAttribute="bottom" id="OfN-I2-fNF"/>
|
||||
<constraint firstItem="FYP-Wb-Mbo" firstAttribute="width" secondItem="3e1-HO-MaJ" secondAttribute="width" id="WXv-sQ-nMF"/>
|
||||
<constraint firstItem="9lh-sL-HGk" firstAttribute="top" secondItem="3e1-HO-MaJ" secondAttribute="top" priority="740" constant="40" id="WaK-1v-VyX"/>
|
||||
<constraint firstItem="9lh-sL-HGk" firstAttribute="width" secondItem="3e1-HO-MaJ" secondAttribute="width" id="akT-qD-5Qq"/>
|
||||
<constraint firstItem="mm5-FP-Hug" firstAttribute="top" secondItem="3e1-HO-MaJ" secondAttribute="top" id="cwU-La-Ojm"/>
|
||||
<constraint firstItem="9lh-sL-HGk" firstAttribute="top" secondItem="mm5-FP-Hug" secondAttribute="bottom" priority="750" constant="20" id="jPn-A7-huj"/>
|
||||
<constraint firstItem="mm5-FP-Hug" firstAttribute="centerX" secondItem="3e1-HO-MaJ" secondAttribute="centerX" id="q1j-bQ-dpv"/>
|
||||
<constraint firstItem="FYP-Wb-Mbo" firstAttribute="centerX" secondItem="3e1-HO-MaJ" secondAttribute="centerX" id="t0R-ku-uBg"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
|
||||
<constraints>
|
||||
<constraint firstItem="3e1-HO-MaJ" firstAttribute="centerY" secondItem="x7x-NE-mqP" secondAttribute="centerY" id="4Mm-5L-pn2"/>
|
||||
<constraint firstAttribute="trailing" secondItem="3e1-HO-MaJ" secondAttribute="trailing" priority="999" id="7HI-D9-RSB"/>
|
||||
<constraint firstItem="3e1-HO-MaJ" firstAttribute="height" relation="lessThanOrEqual" secondItem="x7x-NE-mqP" secondAttribute="height" id="Fo2-jb-JlM"/>
|
||||
<constraint firstItem="3e1-HO-MaJ" firstAttribute="centerX" secondItem="x7x-NE-mqP" secondAttribute="centerX" id="wGQ-X6-cST"/>
|
||||
<constraint firstItem="3e1-HO-MaJ" firstAttribute="leading" secondItem="x7x-NE-mqP" secondAttribute="leading" priority="999" id="xaM-9p-3jX"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lkc-EG-p2i" userLabel="NotNow">
|
||||
<rect key="frame" x="140" y="516" width="240" height="44"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="GGc-uG-5F4"/>
|
||||
<constraint firstAttribute="width" constant="240" id="jn3-7K-EtC"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<state key="normal" title="Next">
|
||||
<color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="8"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="lkc-EG-p2i" secondAttribute="bottom" constant="40" id="2nR-yP-ini"/>
|
||||
<constraint firstItem="x7x-NE-mqP" firstAttribute="top" secondItem="yss-Sh-6Az" secondAttribute="top" constant="40" id="3Re-Fs-3VQ"/>
|
||||
<constraint firstAttribute="height" constant="600" id="EvJ-mU-HY0"/>
|
||||
<constraint firstAttribute="trailing" secondItem="x7x-NE-mqP" secondAttribute="trailing" constant="16" id="MEO-Yt-BxH"/>
|
||||
<constraint firstItem="lkc-EG-p2i" firstAttribute="top" secondItem="x7x-NE-mqP" secondAttribute="bottom" constant="20" id="OOQ-OK-opi"/>
|
||||
<constraint firstItem="x7x-NE-mqP" firstAttribute="leading" secondItem="yss-Sh-6Az" secondAttribute="leading" constant="16" id="fTY-ZX-CR9"/>
|
||||
<constraint firstItem="mm5-FP-Hug" firstAttribute="height" secondItem="yss-Sh-6Az" secondAttribute="height" multiplier="0.3" priority="750" id="hpQ-Jm-0x7"/>
|
||||
<constraint firstItem="lkc-EG-p2i" firstAttribute="centerX" secondItem="yss-Sh-6Az" secondAttribute="centerX" id="ohc-ZW-Ma3"/>
|
||||
<constraint firstAttribute="width" constant="520" id="rRG-og-lXC"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="yss-Sh-6Az" firstAttribute="centerY" secondItem="oVB-IG-dvL" secondAttribute="centerY" id="HFd-5O-RMF"/>
|
||||
<constraint firstItem="yss-Sh-6Az" firstAttribute="centerX" secondItem="oVB-IG-dvL" secondAttribute="centerX" id="QTJ-y9-e4f"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="alertText" destination="FYP-Wb-Mbo" id="zhb-a0-D4d"/>
|
||||
<outlet property="alertTitle" destination="9lh-sL-HGk" id="kmj-B8-43f"/>
|
||||
<outlet property="containerHeight" destination="EvJ-mU-HY0" id="DTx-kd-ppJ"/>
|
||||
<outlet property="containerView" destination="yss-Sh-6Az" id="zCl-bd-w40"/>
|
||||
<outlet property="containerWidth" destination="rRG-og-lXC" id="kap-Y0-pM0"/>
|
||||
<outlet property="image" destination="mm5-FP-Hug" id="l17-MZ-bgY"/>
|
||||
<outlet property="imageHeight" destination="hpQ-Jm-0x7" id="0Pz-9q-5J9"/>
|
||||
<outlet property="imageMinHeight" destination="bky-HI-LEh" id="zC5-9e-0EW"/>
|
||||
<outlet property="nextPageButton" destination="lkc-EG-p2i" id="uRt-ws-enV"/>
|
||||
<outlet property="titleImageOffset" destination="jPn-A7-huj" id="836-ku-soC"/>
|
||||
<outlet property="titleTopOffset" destination="WaK-1v-VyX" id="9Wj-Pz-7rG"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="1bl-Gb-Pt1" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="3230" y="1224"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#import "MWMPlacePageEntity.h"
|
||||
#import "MWMTableViewController.h"
|
||||
#import "MWMTextToSpeech.h"
|
||||
#import "MWMWhatsNewNightModeController.h"
|
||||
#import "MWMWhatsNewDownloaderEditorController.h"
|
||||
#import "RouteState.h"
|
||||
#import "Statistics.h"
|
||||
#import "UIColor+MapsMeColor.h"
|
||||
|
|
@ -408,7 +408,7 @@ NSString * const kReportSegue = @"Map2ReportSegue";
|
|||
|
||||
BOOL const isFirstSession = [Alohalytics isFirstSession];
|
||||
Class<MWMWelcomeControllerProtocol> welcomeClass =
|
||||
isFirstSession ? [MWMFirstLaunchController class] : [MWMWhatsNewNightModeController class];
|
||||
isFirstSession ? [MWMFirstLaunchController class] : [MWMWhatsNewDownloaderEditorController class];
|
||||
|
||||
NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];
|
||||
if ([ud boolForKey:[welcomeClass udWelcomeWasShownKey]])
|
||||
|
|
|
|||
|
|
@ -108,6 +108,8 @@
|
|||
345FDD271C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345FDD251C3BB3AF0070C459 /* MWMEditorViewController.mm */; };
|
||||
34634B1B1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34634B1A1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib */; };
|
||||
3465E7D81B6658C000854C4D /* MWMAPIBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */; };
|
||||
34679F3D1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34679F3C1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm */; };
|
||||
34679F3E1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34679F3C1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm */; };
|
||||
346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; };
|
||||
347274731B0F4EE000756B37 /* me.maps.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 347274721B0F4EE000756B37 /* me.maps.entitlements */; };
|
||||
3472EC051B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */; };
|
||||
|
|
@ -965,6 +967,8 @@
|
|||
34634B1A1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuCollectionViewLandscapeCell.xib; sourceTree = "<group>"; };
|
||||
3465E7D61B6658C000854C4D /* MWMAPIBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAPIBar.h; sourceTree = "<group>"; };
|
||||
3465E7D71B6658C000854C4D /* MWMAPIBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAPIBar.mm; sourceTree = "<group>"; };
|
||||
34679F3B1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMWhatsNewDownloaderEditorController.h; path = Welcome/MWMWhatsNewDownloaderEditorController.h; sourceTree = "<group>"; };
|
||||
34679F3C1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMWhatsNewDownloaderEditorController.mm; path = Welcome/MWMWhatsNewDownloaderEditorController.mm; sourceTree = "<group>"; };
|
||||
346EDAD91B9F0E35004F8DB5 /* MWMMultilineLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMultilineLabel.h; sourceTree = "<group>"; };
|
||||
346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMultilineLabel.mm; sourceTree = "<group>"; };
|
||||
346F27931BD12AA80092D801 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||
|
|
@ -2786,13 +2790,15 @@
|
|||
isa = PBXGroup;
|
||||
children = (
|
||||
34CD81C91C92A884007D2A60 /* PageController */,
|
||||
34CD81D21C92AD4D007D2A60 /* Welcome.storyboard */,
|
||||
34CD81B91C91C24D007D2A60 /* MWMWelcomeController.h */,
|
||||
34CD81BA1C91C24D007D2A60 /* MWMWelcomeController.mm */,
|
||||
34CD81D51C92D96F007D2A60 /* MWMFirstLaunchController.h */,
|
||||
34CD81D61C92D96F007D2A60 /* MWMFirstLaunchController.mm */,
|
||||
34CD81BF1C91C281007D2A60 /* MWMWhatsNewNightModeController.h */,
|
||||
34CD81C01C91C281007D2A60 /* MWMWhatsNewNightModeController.mm */,
|
||||
34CD81D21C92AD4D007D2A60 /* Welcome.storyboard */,
|
||||
34679F3B1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.h */,
|
||||
34679F3C1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm */,
|
||||
);
|
||||
name = Welcome;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -3704,6 +3710,7 @@
|
|||
ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */,
|
||||
340E10631B949D1900D975D5 /* MWMSearchBookmarksManager.mm in Sources */,
|
||||
34D15BA81BD8F93C00C8BCBE /* AddSetTableViewCell.mm in Sources */,
|
||||
34679F3D1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm in Sources */,
|
||||
34CFFE901B7DE83D009D0C9F /* MWMSearchView.mm in Sources */,
|
||||
F62F1D951C3281F1006CF38E /* UIImageView+Coloring.mm in Sources */,
|
||||
F6FE2C151B04A44E009814AA /* MWMPlacePageEntity.mm in Sources */,
|
||||
|
|
@ -3919,6 +3926,7 @@
|
|||
6741AA2B1BF340DE002C974C /* CircleView.mm in Sources */,
|
||||
56D545631C74A41900E3719C /* Framework.cpp in Sources */,
|
||||
6741AA2C1BF340DE002C974C /* MWMSearchBookmarksManager.mm in Sources */,
|
||||
34679F3E1C92FE3700114F20 /* MWMWhatsNewDownloaderEditorController.mm in Sources */,
|
||||
6741AA2D1BF340DE002C974C /* AddSetTableViewCell.mm in Sources */,
|
||||
6741AA2E1BF340DE002C974C /* MWMSearchView.mm in Sources */,
|
||||
6741AA2F1BF340DE002C974C /* MWMPlacePageEntity.mm in Sources */,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue