[ios] add downloaded bookmarks screen, implement download from catalog, refactoring

2018-06-15 20:31:19 +03:00 · 2018-06-15 20:31:19 +03:00 · 4856f9c5d0
commit 4856f9c5d0
parent b8201e757b
15 changed files with 429 additions and 22 deletions
--- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
@ -0,0 +1,37 @@
+class CatalogWebViewController: WebViewController {
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+  }
+
+  override func webView(_ webView: WKWebView,
+                        decidePolicyFor navigationAction: WKNavigationAction,
+                        decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+    if let url = navigationAction.request.url {
+      if url.scheme == "mapsme" {
+        processDeeplink(url)
+        decisionHandler(.cancel)
+        return
+      }
+    }
+    super.webView(webView, decidePolicyFor: navigationAction, decisionHandler: decisionHandler)
+  }
+
+  func processDeeplink(_ url: URL) {
+    let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+    var id = ""
+    var name = ""
+    components?.queryItems?.forEach({ (item) in
+      if (item.name == "name") {
+        name = item.value ?? ""
+      }
+      if (item.name == "id") {
+        id = item.value ?? ""
+      }
+    })
+    MWMBookmarksManager.downloadItem(withId: id, name: name) { (error) in
+      
+    }
+  }
+}
--- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
@ -0,0 +1,35 @@
+class DownloadedBookmarksViewController: UITableViewController {
+
+  @IBOutlet weak var topView: UIView!
+  @IBOutlet weak var bottomView: UIView!
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    tableView.tableHeaderView = topView
+    tableView.tableFooterView = bottomView
+  }
+
+  override func numberOfSections(in tableView: UITableView) -> Int {
+    return 0
+  }
+
+  override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    return 0
+  }
+
+  override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    let cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifier", for: indexPath)
+
+    return cell
+  }
+
+
+  @IBAction func onDownloadBookmarks(_ sender: Any) {
+    if let url = MWMBookmarksManager.catalogFrontendUrl(),
+      let webViewController = CatalogWebViewController(url: url, andTitleOrNil: L("routes_and_bookmarks")) {
+      MapViewController.topViewController().navigationController?.pushViewController(webViewController,
+                                                                                     animated: true)
+    }
+  }
+}
--- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib
+++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib
@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <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" customClass="DownloadedBookmarksViewController" customModule="maps_me" customModuleProvider="target">
+            <connections>
+                <outlet property="bottomView" destination="A19-bw-qEr" id="kih-zB-eh4"/>
+                <outlet property="topView" destination="EF0-Bq-c6F" id="P2B-zS-paE"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <viewLayoutGuide key="safeArea" id="vLr-E1-eTs"/>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="Tng-2m-Rnh"/>
+                <outlet property="delegate" destination="-1" id="9aC-8N-iBw"/>
+            </connections>
+        </tableView>
+        <view contentMode="scaleToFill" id="A19-bw-qEr">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="76"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yjf-3F-Ewf" userLabel="NotNow">
+                    <rect key="frame" x="16" y="16" width="343" 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="I5l-6h-e83"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
+                    <state key="normal" title="DOWNLOAD BOOKMARKS">
+                        <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="textColorHighlightedName" value="white"/>
+                        <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
+                        <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>
+                    <connections>
+                        <action selector="onDownloadBookmarks:" destination="-1" eventType="touchUpInside" id="sde-zI-dEe"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="mHu-Y0-fCQ" firstAttribute="bottom" secondItem="Yjf-3F-Ewf" secondAttribute="bottom" constant="16" id="9ps-Bp-5C5"/>
+                <constraint firstItem="Yjf-3F-Ewf" firstAttribute="leading" secondItem="mHu-Y0-fCQ" secondAttribute="leading" constant="16" id="LCM-df-yqM"/>
+                <constraint firstItem="mHu-Y0-fCQ" firstAttribute="trailing" secondItem="Yjf-3F-Ewf" secondAttribute="trailing" constant="16" id="P85-sm-grd"/>
+                <constraint firstItem="Yjf-3F-Ewf" firstAttribute="top" secondItem="mHu-Y0-fCQ" secondAttribute="top" constant="16" id="n9w-00-rYO"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <viewLayoutGuide key="safeArea" id="mHu-Y0-fCQ"/>
+            <point key="canvasLocation" x="483" y="492"/>
+        </view>
+        <view contentMode="scaleToFill" id="EF0-Bq-c6F">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="347"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_empty_bookmarks" translatesAutoresizingMaskIntoConstraints="NO" id="ahy-M3-meH">
+                    <rect key="frame" x="87" y="40" width="200" height="200"/>
+                </imageView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Download new places" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="13b-uj-bGK">
+                    <rect key="frame" x="16" y="256" width="343" height="24"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                    <color key="textColor" white="0.0" alpha="0.87371575342465757" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cached_bookmarks_placeholder_title"/>
+                    </userDefinedRuntimeAttributes>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gY-vv-QfN">
+                    <rect key="frame" x="16" y="288" width="343" height="50.5"/>
+                    <string key="text">Press the button to download thousands of intresting places and routes created by MAPS.ME users. You will need the internet connection.</string>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <color key="textColor" white="0.0" alpha="0.53735017123287676" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cached_bookmarks_placeholder_subtitle"/>
+                    </userDefinedRuntimeAttributes>
+                </label>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="1gY-vv-QfN" firstAttribute="trailing" secondItem="13b-uj-bGK" secondAttribute="trailing" id="24k-XV-fh7"/>
+                <constraint firstItem="13b-uj-bGK" firstAttribute="leading" secondItem="jiO-QA-gWD" secondAttribute="leading" constant="16" id="JLq-wb-chA"/>
+                <constraint firstItem="1gY-vv-QfN" firstAttribute="top" secondItem="13b-uj-bGK" secondAttribute="bottom" constant="8" id="TND-0r-7FO"/>
+                <constraint firstItem="ahy-M3-meH" firstAttribute="centerX" secondItem="jiO-QA-gWD" secondAttribute="centerX" id="VjC-b4-t1W"/>
+                <constraint firstItem="jiO-QA-gWD" firstAttribute="bottom" secondItem="1gY-vv-QfN" secondAttribute="bottom" constant="8" id="Xa8-RL-OhU"/>
+                <constraint firstItem="1gY-vv-QfN" firstAttribute="leading" secondItem="13b-uj-bGK" secondAttribute="leading" id="Yju-ZI-ayo"/>
+                <constraint firstItem="jiO-QA-gWD" firstAttribute="trailing" secondItem="13b-uj-bGK" secondAttribute="trailing" constant="16" id="a1y-O4-QFn"/>
+                <constraint firstItem="13b-uj-bGK" firstAttribute="top" secondItem="ahy-M3-meH" secondAttribute="bottom" constant="16" id="fjL-BN-m8O"/>
+                <constraint firstItem="ahy-M3-meH" firstAttribute="top" secondItem="jiO-QA-gWD" secondAttribute="top" constant="40" id="tdz-sP-cyI"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <viewLayoutGuide key="safeArea" id="jiO-QA-gWD"/>
+            <point key="canvasLocation" x="450.5" y="157.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="img_empty_bookmarks" width="200" height="200"/>
+    </resources>
+</document>
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@ -359,7 +359,7 @@ BOOL gIsFirstMyPositionMode = YES;
 - (void)openBookmarks
 {
  BMCViewController * bookmarks = [[BMCViewController alloc] init];
-  MWMViewController * catalog = [[MWMViewController alloc] init];
+  DownloadedBookmarksViewController * catalog = [[DownloadedBookmarksViewController alloc] init];
  bookmarks.title = L(@"bookmarks_page_my");
  catalog.title = L(@"bookmarks_page_downloaded");

--- a/iphone/Maps/Common/WebViewController.h
+++ b/iphone/Maps/Common/WebViewController.h
@ -1,7 +1,8 @@
+#import <WebKit/WebKit.h>
 #import "MWMViewController.h"
 #import "MWMTypes.h"

-@interface WebViewController : MWMViewController <UIWebViewDelegate>
+@interface WebViewController : MWMViewController <WKNavigationDelegate>

@property (nonatomic) NSURL * m_url;
@property (copy, nonatomic) NSString * m_htmlText;
--- a/iphone/Maps/Common/WebViewController.mm
+++ b/iphone/Maps/Common/WebViewController.mm
@ -58,7 +58,9 @@
  UIView * view = self.view;
  view.backgroundColor = UIColor.whiteColor;

-  UIWebView * webView = [[UIWebView alloc] initWithFrame:{}];
+  WKWebViewConfiguration * configuration = [[WKWebViewConfiguration alloc] init];
+  WKWebView * webView = [[WKWebView alloc] initWithFrame:{} configuration:configuration];
+  webView.navigationDelegate = self;
  [view addSubview:webView];

  webView.translatesAutoresizingMaskIntoConstraints = NO;
@ -82,7 +84,6 @@
  [webView.trailingAnchor constraintEqualToAnchor:trailingAnchor].active = YES;

  webView.backgroundColor = UIColor.whiteColor;
-  webView.delegate = self;

  if (self.m_htmlText)
    [webView loadHTMLString:self.m_htmlText baseURL:self.m_url];
@ -103,8 +104,8 @@
  [self.navigationController popViewControllerAnimated:YES];
 }

- (BOOL)webView:(UIWebView *)inWeb shouldStartLoadWithRequest:(NSURLRequest *)inRequest navigationType:(UIWebViewNavigationType)inType
-{
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
+  NSURLRequest * inRequest = navigationAction.request;
  if ([inRequest.URL.host isEqualToString:@"localhost"])
  {
    auto query = inRequest.URL.query;
@ -114,23 +115,37 @@
      ASSERT(false, ("Incorrect query:", query.UTF8String));
      [self pop];
      self.onFailure();
-      return NO;
+      decisionHandler(WKNavigationActionPolicyCancel);
+      return;
    }

    [self pop];
    self.onSuccess(components[1]);
-    return NO;
+    decisionHandler(WKNavigationActionPolicyCancel);
+    return;
  }

-  if (self.openInSafari && inType == UIWebViewNavigationTypeLinkClicked
+  if (self.openInSafari && navigationAction.navigationType == WKNavigationTypeLinkActivated
      && ![inRequest.URL.scheme isEqualToString:@"applewebdata"]) // do not try to open local links in Safari
  {
    NSURL * url = [inRequest URL];
    [UIApplication.sharedApplication openURL:url];
-    return NO;
+    decisionHandler(WKNavigationActionPolicyCancel);
+    return;
  }

-  return YES;
+  decisionHandler(WKNavigationActionPolicyAllow);
+  return;
 }

+#if DEBUG
+- (void)webView:(WKWebView *)webView
+didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition,
+                            NSURLCredential * _Nullable credential))completionHandler {
+  NSURLCredential * credential = [[NSURLCredential alloc] initWithTrust:[challenge protectionSpace].serverTrust];
+  completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
+}
+#endif
+
@end
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
@ -44,6 +44,11 @@
 + (void)applyRestoring;
 + (void)cancelRestoring;

+ (NSURL * _Nullable)catalogFrontendUrl;
+ (void)downloadItemWithId:(NSString * _Nonnull)itemId
+                      name:(NSString * _Nonnull)name
+                completion:(void (^_Nullable)(NSError * _Nullable error))completion;
+
 - (instancetype)init __attribute__((unavailable("call +manager instead")));
 - (instancetype)copy __attribute__((unavailable("call +manager instead")));
 - (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +manager instead")));
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
@ -31,12 +31,61 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
 }
 }  // namespace

+@interface CatalogObserver : NSObject
+@property (copy, nonatomic) NSString * categoryId;
+@property (copy, nonatomic) void(^progressBlock)();
+@property (copy, nonatomic) void(^completionBlock)(NSError * error);
+- (void)onDownloadStart;
+- (void)onDownloadCompleteSuccessful:(BOOL)success;
+- (void)onImportStart;
+- (void)onImportCompleteSuccessful:(BOOL)success;
+@end
+@implementation CatalogObserver
+
+- (void)onDownloadStart
+{
+  if (self.progressBlock)
+    self.progressBlock();
+}
+
+- (void)onDownloadCompleteSuccessful:(BOOL)success
+{
+  if (success)
+  {
+    if (self.progressBlock)
+      self.progressBlock();
+  }
+  else
+  {
+    if (self.completionBlock)
+      self.completionBlock([[NSError alloc] init]);
+  }
+}
+
+- (void)onImportStart
+{
+  if (self.progressBlock)
+    self.progressBlock();
+}
+
+- (void)onImportCompleteSuccessful:(BOOL)success
+{
+  if (self.completionBlock) {
+    NSError * error = success ? nil : [[NSError alloc] init];
+    self.completionBlock(error);
+  }
+}
+
+@end
+
@interface MWMBookmarksManager ()

@property(nonatomic) Observers * observers;
@property(nonatomic) BOOL areBookmarksLoaded;
@property(nonatomic) NSURL * shareCategoryURL;

+@property(nonatomic) NSMutableDictionary * catalogObservers;
+
@end

@implementation MWMBookmarksManager
@ -441,4 +490,57 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
  return GetFramework().GetBookmarkManager().AreNotificationsEnabled();
 }

+ (NSURL * _Nullable )catalogFrontendUrl {
+  NSString *urlString = @(GetFramework().GetBookmarkManager().GetCatalogFrontendUrl().c_str());
+  return urlString ? [NSURL URLWithString:urlString] : nil;
+}
+
+ (void)downloadItemWithId:(NSString *)itemId name:(NSString *)name completion:(void (^)(NSError * error))completion {
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    [MWMBookmarksManager manager].catalogObservers = [NSMutableDictionary dictionary];
+    auto onDownloadStarted = [](std::string const & catId)
+    {
+      CatalogObserver *observer = [MWMBookmarksManager manager].catalogObservers[@(catId.c_str())];
+      if (observer)
+        [observer onDownloadStart];
+    };
+    auto onDownloadFinished = [](std::string const & catId, platform::RemoteFile::Result const & result)
+    {
+      CatalogObserver *observer = [MWMBookmarksManager manager].catalogObservers[@(catId.c_str())];
+      if (observer)
+      {
+        [observer onDownloadCompleteSuccessful:result.m_status == platform::RemoteFile::Status::Ok];
+        if (result.m_status != platform::RemoteFile::Status::Ok) {
+          [[MWMBookmarksManager manager].catalogObservers removeObjectForKey:observer.categoryId];
+        }
+      }
+    };
+    auto onImportStarted = [](std::string const & catId)
+    {
+      CatalogObserver *observer = [MWMBookmarksManager manager].catalogObservers[@(catId.c_str())];
+      if (observer)
+        [observer onImportStart];
+    };
+    auto onImportFinished = [](std::string const & catId, bool successful)
+    {
+      CatalogObserver *observer = [MWMBookmarksManager manager].catalogObservers[@(catId.c_str())];
+      if (observer)
+      {
+        [observer onImportCompleteSuccessful:successful];
+        [[MWMBookmarksManager manager].catalogObservers removeObjectForKey:observer.categoryId];
+      }
+    };
+    GetFramework().GetBookmarkManager().SetCatalogHandlers(std::move(onDownloadStarted),
+                                                           std::move(onDownloadFinished),
+                                                           std::move(onImportStarted),
+                                                           std::move(onImportFinished));
+  });
+  CatalogObserver *observer = [[CatalogObserver alloc] init];
+  observer.categoryId = itemId;
+  observer.completionBlock = completion;
+  [[MWMBookmarksManager manager].catalogObservers setObject:observer forKey:itemId];
+  GetFramework().GetBookmarkManager().DownloadFromCatalogAndImport(itemId.UTF8String, name.UTF8String);
+}
+
@end
--- a/iphone/Maps/Images.xcassets/Catalog/Contents.json
+++ b/iphone/Maps/Images.xcassets/Catalog/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/Contents.json
@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "img_empty_bookmarks.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "img_empty_bookmarks@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "img_empty_bookmarks@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/img_empty_bookmarks.png
+++ b/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/img_empty_bookmarks.png
--- a/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/img_empty_bookmarks@2x.png
+++ b/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/img_empty_bookmarks@2x.png
--- a/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/img_empty_bookmarks@3x.png
+++ b/iphone/Maps/Images.xcassets/Catalog/img_empty_bookmarks.imageset/img_empty_bookmarks@3x.png
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@ -465,6 +465,9 @@
 		6B653B951C7F2DE4007BEFC5 /* cuisine-strings in Resources */ = {isa = PBXBuildFile; fileRef = 6B653B931C7F2DE4007BEFC5 /* cuisine-strings */; };
 		6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; };
 		A630D1EA207CA95900976DEA /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = A630D1E8207CA95900976DEA /* Localizable.stringsdict */; };
+		B32FE74020D2844600EF7446 /* DownloadedBookmarksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B32FE73E20D2844600EF7446 /* DownloadedBookmarksViewController.swift */; };
+		B32FE74120D2844600EF7446 /* DownloadedBookmarksViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B32FE73F20D2844600EF7446 /* DownloadedBookmarksViewController.xib */; };
+		B32FE74320D2B09600EF7446 /* CatalogWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B32FE74220D2B09600EF7446 /* CatalogWebViewController.swift */; };
 		BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = BB25B1A51FB32767007276FA /* transit_colors.txt */; };
 		BB7626B61E85599C0031D71C /* icudt57l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BB7626B41E8559980031D71C /* icudt57l.dat */; };
 		EBDA7B7820B370B40054165B /* GoogleMobileAds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDA7B7320B3576D0054165B /* GoogleMobileAds.framework */; };
@ -1381,6 +1384,9 @@
 		A630D204207CAA3400976DEA /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = vi; path = vi.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		A630D205207CAA3A00976DEA /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		A630D206207CAA5800976DEA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		B32FE73E20D2844600EF7446 /* DownloadedBookmarksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadedBookmarksViewController.swift; sourceTree = "<group>"; };
+		B32FE73F20D2844600EF7446 /* DownloadedBookmarksViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DownloadedBookmarksViewController.xib; sourceTree = "<group>"; };
+		B32FE74220D2B09600EF7446 /* CatalogWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogWebViewController.swift; sourceTree = "<group>"; };
 		BB25B1A51FB32767007276FA /* transit_colors.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = transit_colors.txt; path = ../../data/transit_colors.txt; sourceTree = "<group>"; };
 		BB7626B41E8559980031D71C /* icudt57l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt57l.dat; path = ../../data/icudt57l.dat; sourceTree = "<group>"; };
 		EBDA7B7320B3576D0054165B /* GoogleMobileAds.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMobileAds.framework; path = MoPubSDK/AdNetworkSupport/AdMob/SDK/GoogleMobileAds.framework; sourceTree = "<group>"; };
@ -3124,6 +3130,16 @@
 			name = "Custom Views";
 			sourceTree = "<group>";
 		};
+		B32FE73D20D283D600EF7446 /* Catalog */ = {
+			isa = PBXGroup;
+			children = (
+				B32FE73E20D2844600EF7446 /* DownloadedBookmarksViewController.swift */,
+				B32FE73F20D2844600EF7446 /* DownloadedBookmarksViewController.xib */,
+				B32FE74220D2B09600EF7446 /* CatalogWebViewController.swift */,
+			);
+			path = Catalog;
+			sourceTree = "<group>";
+		};
 		F607C18B1C047FCA00B53A87 /* Segue */ = {
 			isa = PBXGroup;
 			children = (
@ -4060,6 +4076,7 @@
 		FA36B8011540388B004560CC /* Bookmarks */ = {
 			isa = PBXGroup;
 			children = (
+				B32FE73D20D283D600EF7446 /* Catalog */,
 				FA36B80515403A4F004560CC /* BookmarksVC.h */,
 				FA36B80615403A4F004560CC /* BookmarksVC.mm */,
 				3404F4A02028A6C00090E401 /* Categories */,
@ -4385,6 +4402,7 @@
 				3404F49E2028A2430090E401 /* BMCActionsCreateCell.xib in Resources */,
 				6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */,
 				340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
+				B32FE74120D2844600EF7446 /* DownloadedBookmarksViewController.xib in Resources */,
 				F682249F1E5B105900BC1C18 /* PPHotelDescriptionCell.xib in Resources */,
 				340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */,
 				6741A9421BF340DE002C974C /* sound-strings in Resources */,
@ -4538,6 +4556,7 @@
 				F6E2FDE01E097BA00083EBEC /* MWMEditorViewController.mm in Sources */,
 				F69739DC1FD6ECCE00FDA07D /* DiscoveryLocalExpertCell.swift in Sources */,
 				6741A9C01BF340DE002C974C /* MWMTextView.mm in Sources */,
+				B32FE74320D2B09600EF7446 /* CatalogWebViewController.swift in Sources */,
 				F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.mm in Sources */,
 				F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.mm in Sources */,
 				F6E2FD651E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */,
@ -4753,6 +4772,7 @@
 				F655C027207278300048A241 /* DiscoveryMoreCell.swift in Sources */,
 				F6E2FEC41E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */,
 				34AB66621FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */,
+				B32FE74020D2844600EF7446 /* DownloadedBookmarksViewController.swift in Sources */,
 				340416541E7C09C200E2B6D6 /* PhotoScalingView.swift in Sources */,
 				4767CDA820AB401000BD8166 /* LinkTextView.swift in Sources */,
 				34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */,
--- a/platform/http_client_apple.mm
+++ b/platform/http_client_apple.mm
@ -26,16 +26,7 @@ SOFTWARE.
 #error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag
 #endif

-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSURLError.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSStream.h>
-#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURLResponse.h>
-#import <Foundation/NSURLConnection.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSFileManager.h>
+#import <Foundation/Foundation.h>

 #include <TargetConditionals.h> // TARGET_OS_IPHONE
 #if (TARGET_OS_IPHONE > 0)  // Works for all iOS devices, including iPad.
@ -46,6 +37,59 @@ extern NSString * gBrowserUserAgent;

 #include "base/logging.hpp"

+@interface Connection: NSObject<NSURLSessionDelegate>
+ (nullable NSData *)sendSynchronousRequest:(NSURLRequest *)request
+                          returningResponse:(NSURLResponse **)response
+                                      error:(NSError **)error;
+@end
+
+@implementation Connection
+
+ (NSData *)sendSynchronousRequest:(NSURLRequest *)request
+                 returningResponse:(NSURLResponse *__autoreleasing *)response
+                             error:(NSError *__autoreleasing *)error {
+  Connection * connection = [[Connection alloc] init];
+  return [connection sendSynchronousRequest:request returningResponse:response error:error];
+}
+
+- (NSData *)sendSynchronousRequest:(NSURLRequest *)request
+                 returningResponse:(NSURLResponse *__autoreleasing *)response
+                             error:(NSError *__autoreleasing *)error {
+  NSURLSession * session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration]
+                                                        delegate:self
+                                                   delegateQueue:nil];
+  __block NSData * resultData = nil;
+  __block NSURLResponse * resultResponse = nil;
+  __block NSError * resultError = nil;
+
+  dispatch_group_t group = dispatch_group_create();
+  dispatch_group_enter(group);
+  [[session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data,
+                                                            NSURLResponse * _Nullable response,
+                                                            NSError * _Nullable error) {
+    resultData = data;
+    resultResponse = response;
+    resultError = error;
+    dispatch_group_leave(group);
+  }] resume];
+
+  dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
+  *response = resultResponse;
+  *error = resultError;
+  return resultData;
+}
+
+#if DEBUG
+- (void)URLSession:(NSURLSession *)session
+didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
+ completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition,
+                             NSURLCredential * _Nullable credential))completionHandler {
+  NSURLCredential * credential = [[NSURLCredential alloc] initWithTrust:[challenge protectionSpace].serverTrust];
+  completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
+}
+#endif
+@end
+
 namespace platform
 {
 bool HttpClient::RunHttpRequest()
@ -93,7 +137,7 @@ bool HttpClient::RunHttpRequest()

  NSHTTPURLResponse * response = nil;
  NSError * err = nil;
-  NSData * url_data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&err];
+  NSData * url_data = [Connection sendSynchronousRequest:request returningResponse:&response error:&err];

  m_headers.clear();