Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorigrechuhin <i.grechuhin@gmail.com>2016-01-08 16:28:31 +0300
committerigrechuhin <i.grechuhin@gmail.com>2016-01-08 16:28:31 +0300
commite1f6e5272a58275d7e3fced735147c0c87ceb642 (patch)
treee239bce0f2a2a6edb133ccc2686d7931d006d655
parent77fb28eb425d51f576a336e812fdf43625e8e215 (diff)
parent6fe9b3d2d6c9f3e7c3b02f2247824dfb9917076d (diff)
Merge pull request #1292 from VladiMihaylenko/masterandroid-release-55
[ios] Fixed what's new.
-rw-r--r--iphone/Maps/Classes/MapViewController.mm2
-rw-r--r--iphone/Maps/Mapsme.storyboard4
2 files changed, 4 insertions, 2 deletions
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 9a2d3c0edf..9bd81a5b18 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -410,6 +410,8 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction)
- (void)showWhatsNewIfNeeded
{
+ if (isIOSVersionLessThan(8))
+ return;
NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];
BOOL const whatsNewWasShown = [ud boolForKey:kUDWhatsNewWasShown];
if (whatsNewWasShown)
diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard
index 3c46f99804..b274d28eae 100644
--- a/iphone/Maps/Mapsme.storyboard
+++ b/iphone/Maps/Mapsme.storyboard
@@ -730,7 +730,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
@@ -773,7 +773,7 @@
<constraint firstItem="oRc-M5-KT8" firstAttribute="leading" secondItem="D7d-Qb-2An" secondAttribute="leading" constant="16" id="Lq4-9h-Qmh"/>
<constraint firstAttribute="trailing" secondItem="oRc-M5-KT8" secondAttribute="trailing" constant="16" id="VTi-wm-ggu"/>
<constraint firstAttribute="bottom" secondItem="eUZ-Ui-GVQ" secondAttribute="bottom" constant="36" id="bUn-Gh-Rlr"/>
- <constraint firstItem="89l-86-0xk" firstAttribute="height" secondItem="D7d-Qb-2An" secondAttribute="height" multiplier="0.3" priority="750" id="eDv-46-dEZ"/>
+ <constraint firstItem="89l-86-0xk" firstAttribute="height" secondItem="D7d-Qb-2An" secondAttribute="height" multiplier="0.2" priority="750" id="eDv-46-dEZ"/>
<constraint firstAttribute="height" constant="600" id="iuE-gX-na2"/>
<constraint firstAttribute="width" constant="520" id="ooZ-hL-8Wc"/>
<constraint firstItem="eUZ-Ui-GVQ" firstAttribute="centerX" secondItem="D7d-Qb-2An" secondAttribute="centerX" id="wiT-zA-c6e"/>