diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift
index 7090baa996..e6e781133e 100644
--- a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.swift
@@ -8,7 +8,8 @@ class AllPassSubscriptionViewController: BaseSubscriptionViewController {
@IBOutlet private var monthlySubscriptionButton: BookmarksSubscriptionButton!
@IBOutlet private var pageIndicator: PageIndicator!
@IBOutlet private var descriptionPageScrollView: UIScrollView!
-
+ @IBOutlet private var contentView: UIView!
+
//MARK: locals
private var pageWidth: CGFloat {
return self.descriptionPageScrollView.frame.width;
@@ -74,6 +75,8 @@ class AllPassSubscriptionViewController: BaseSubscriptionViewController {
discountLabels:[
.year: annualDiscountLabel])
+ self.preferredContentSize = CGSize(width: 414, height: contentView.frame.height)
+
Statistics.logEvent(kStatInappShow, withParameters: [kStatVendor: MWMPurchaseManager.allPassProductIds,
kStatPurchase: MWMPurchaseManager.allPassSubscriptionServerId(),
kStatProduct: BOOKMARKS_SUBSCRIPTION_YEARLY_PRODUCT_ID, //FIXME
diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib
index f758eed875..2b3a942ce0 100644
--- a/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib
+++ b/iphone/Maps/Bookmarks/Catalog/Subscription/AllPassSubscriptionViewController.xib
@@ -18,6 +18,7 @@
+
diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/BaseSubscriptionViewController.swift b/iphone/Maps/Bookmarks/Catalog/Subscription/BaseSubscriptionViewController.swift
index 8078979ab9..2c25e257c4 100644
--- a/iphone/Maps/Bookmarks/Catalog/Subscription/BaseSubscriptionViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/Subscription/BaseSubscriptionViewController.swift
@@ -24,7 +24,8 @@ class BaseSubscriptionViewController: MWMViewController {
override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
- subscriptionManager?.addListener(self)
+ self.modalTransitionStyle = .coverVertical
+ self.modalPresentationStyle = .formSheet
}
required init?(coder aDecoder: NSCoder) {
@@ -37,6 +38,7 @@ class BaseSubscriptionViewController: MWMViewController {
override func viewDidLoad() {
super.viewDidLoad()
+ subscriptionManager?.addListener(self)
self.presentationController?.delegate = self;
}
diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift
index becc5f35ea..a521bf0112 100644
--- a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.swift
@@ -5,7 +5,8 @@ import SafariServices
@IBOutlet private var annualSubscriptionButton: BookmarksSubscriptionButton!
@IBOutlet private var annualDiscountLabel: BookmarksSubscriptionDiscountLabel!
@IBOutlet private var monthlySubscriptionButton: BookmarksSubscriptionButton!
-
+ @IBOutlet private var contentView: UIView!
+
override var subscriptionManager: ISubscriptionManager? {
get { return InAppPurchase.bookmarksSubscriptionManager }
}
@@ -51,6 +52,8 @@ import SafariServices
discountLabels:[
.year: annualDiscountLabel])
+ self.preferredContentSize = CGSize(width: 414, height: contentView.frame.height)
+
Statistics.logEvent(kStatInappShow, withParameters: [kStatVendor: MWMPurchaseManager.bookmarksSubscriptionVendorId(),
kStatPurchase: MWMPurchaseManager.bookmarksSubscriptionServerId(),
kStatProduct: BOOKMARKS_SUBSCRIPTION_YEARLY_PRODUCT_ID,
diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib
index e75355171b..dbcf5a98a7 100644
--- a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib
+++ b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib
@@ -12,6 +12,7 @@
+