From 68f5096487e813d4d21e1735f63dd3f52e41fbed Mon Sep 17 00:00:00 2001
From: Alexander Boriskov <a.boriskov@corp.mail.ru>
Date: Mon, 9 Dec 2019 15:30:19 +0300
Subject: [PATCH] [iOS] Fixed present/dismiss order of All Pass subscription
 view from promo screen

https://jira.mail.ru/browse/MAPSME-12611
---
 .../Subscription/AllPassSubscriptionViewController.xib     | 3 +++
 iphone/Maps/Categories/UIColor+MapsMeColor.h               | 1 +
 iphone/Maps/Categories/UIColor+MapsMeColor.m               | 7 +++++++
 .../UI/Welcome/PromoDiscovery/PromoDiscoveryRouter.swift   | 7 ++++---
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib
index 5d1aa245fa..b10341ca9c 100644
--- a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib
+++ b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib
@@ -275,6 +275,8 @@
                                     <nil key="highlightedColor"/>
                                     <userDefinedRuntimeAttributes>
                                         <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="allPassSubscriptionDiscountBackground"/>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="discountText"/>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/>
                                     </userDefinedRuntimeAttributes>
                                 </label>
                                 <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wL2-uQ-ivp" userLabel="Restore">
@@ -400,6 +402,7 @@
                             </constraints>
                         </view>
                     </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstItem="TaY-K1-Hdb" firstAttribute="width" secondItem="OgE-tu-SWu" secondAttribute="width" id="5EU-Ae-NUs"/>
                         <constraint firstAttribute="bottom" secondItem="TaY-K1-Hdb" secondAttribute="bottom" id="R5w-2Q-dOF"/>
diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.h b/iphone/Maps/Categories/UIColor+MapsMeColor.h
index 1e4e7685b4..04eb88e84a 100644
--- a/iphone/Maps/Categories/UIColor+MapsMeColor.h
+++ b/iphone/Maps/Categories/UIColor+MapsMeColor.h
@@ -61,6 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (UIColor *)subscriptionCellBackground;
 + (UIColor *)subscriptionCellTitle;
 + (UIColor *)discountBackground;
++ (UIColor *)discountText;
 + (UIColor *)bookmarkSubscriptionScrollBackground;
 + (UIColor *)bookmarkSubscriptionBackground;
 + (UIColor *)bookmarkSubscriptionFooterBackground;
diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.m b/iphone/Maps/Categories/UIColor+MapsMeColor.m
index b9bb928f9a..320567aafa 100644
--- a/iphone/Maps/Categories/UIColor+MapsMeColor.m
+++ b/iphone/Maps/Categories/UIColor+MapsMeColor.m
@@ -60,6 +60,7 @@ static UIColor * color(SEL cmd) {
     @"bannerBackground" : [UIColor colorWithRed:scaled(249) green:scaled(251) blue:scaled(231) alpha:alpha100],
     @"border" : [UIColor colorWithWhite:0. alpha:alpha04],
     @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100],
+    @"discountText" : [UIColor colorWithRed:scaled(60) green:scaled(64) blue:scaled(68) alpha:alpha100],
     @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(240) green:scaled(252) blue:scaled(255) alpha:alpha100],
     @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100],
     @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100],
@@ -114,6 +115,7 @@ static UIColor * color(SEL cmd) {
     @"bannerBackground" : [UIColor colorWithRed:scaled(71) green:scaled(75) blue:scaled(79) alpha:alpha100],
     @"border" : [UIColor colorWithWhite:1. alpha:alpha04],
     @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100],
+    @"discountText" : [UIColor colorWithRed:scaled(60) green:scaled(64) blue:scaled(68) alpha:alpha100],
     @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha100],
     @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100],
     @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100],
@@ -428,6 +430,11 @@ static UIColor * color(SEL cmd) {
   return color(_cmd);
 }
 
++ (UIColor *)discountText
+{
+  return color(_cmd);
+}
+
 + (UIColor *)bookmarkSubscriptionScrollBackground
 {
   return color(_cmd);
diff --git a/iphone/Maps/UI/Welcome/PromoDiscovery/PromoDiscoveryRouter.swift b/iphone/Maps/UI/Welcome/PromoDiscovery/PromoDiscoveryRouter.swift
index bb0413dc47..af0651e331 100644
--- a/iphone/Maps/UI/Welcome/PromoDiscovery/PromoDiscoveryRouter.swift
+++ b/iphone/Maps/UI/Welcome/PromoDiscovery/PromoDiscoveryRouter.swift
@@ -40,15 +40,16 @@ extension PromoDiscoveryRouter: IPromoDiscoveryRouter {
   }
 
   private func presentPromoDiscoverySubscribe() {
-    guard let viewController = viewController else {
+    guard let rootViewController = rootViewController else {
       return;
     }
+    dissmiss()
     let subscribeViewController = SubscriptionViewBuilder.build(type: .allPass,
-                                                                parentViewController: viewController,
+                                                                parentViewController: rootViewController,
                                                                 source: kStatOnboardingGuidesSubscription,
                                                                 successDialog: .goToCatalog,
                                                                 completion: nil)
-    viewController.present(subscribeViewController, animated: true)
+    rootViewController.present(subscribeViewController, animated: true)
   }
 
   private func presentPromoDiscoveryFree() {