[place-page] [ios] Added Rich place page gallery with AlamofireImage.place-page

14 files changed, 706 insertions, 4 deletions

diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h
index 438e21c5fb..5a375fa5f6 100644
--- a/iphone/Maps/Bridging-Header.h
+++ b/iphone/Maps/Bridging-Header.h
@@ -7,6 +7,7 @@
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
 #import "AppInfo.h"
+#import "MWMCollectionViewController.h"
 #import "MWMConsts.h"
 #import "MWMController.h"
 #import "MWMFrameworkHelper.h"
diff --git a/iphone/Maps/Classes/Components/MWMCollectionViewController.h b/iphone/Maps/Classes/Components/MWMCollectionViewController.h
new file mode 100644
index 0000000000..baaed0c726
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMCollectionViewController.h
@@ -0,0 +1,5 @@
+#import "MWMController.h"
+
+@interface MWMCollectionViewController : UICollectionViewController<MWMController>
+
+@end
diff --git a/iphone/Maps/Classes/Components/MWMCollectionViewController.mm b/iphone/Maps/Classes/Components/MWMCollectionViewController.mm
new file mode 100644
index 0000000000..93375e22ac
--- /dev/null
+++ b/iphone/Maps/Classes/Components/MWMCollectionViewController.mm
@@ -0,0 +1,55 @@
+#import "MWMCollectionViewController.h"
+#import "MWMAlertViewController.h"
+#import "MapViewController.h"
+
+@interface MWMCollectionViewController ()
+
+@property(nonatomic, readwrite) MWMAlertViewController * alertController;
+
+@end
+
+@implementation MWMCollectionViewController
+
+- (BOOL)prefersStatusBarHidden { return NO; }
+- (void)mwm_refreshUI
+{
+  [self.navigationController.navigationBar mwm_refreshUI];
+  MapViewController * mapViewController = [MapViewController controller];
+  for (UIViewController * vc in self.navigationController.viewControllers.reverseObjectEnumerator)
+  {
+    if (![vc isEqual:mapViewController])
+      [vc.view mwm_refreshUI];
+  }
+  [mapViewController mwm_refreshUI];
+}
+
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+  self.collectionView.backgroundColor = [UIColor pressBackground];
+  [self.navigationController.navigationBar setTranslucent:NO];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+  [Alohalytics logEvent:@"$viewWillAppear" withValue:NSStringFromClass([self class])];
+  [super viewWillAppear:animated];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+  [Alohalytics logEvent:@"$viewWillDisappear" withValue:NSStringFromClass([self class])];
+  [super viewWillDisappear:animated];
+}
+
+#pragma mark - Properties
+
+- (BOOL)hasNavigationBar { return YES; }
+- (MWMAlertViewController *)alertController
+{
+  if (!_alertController)
+    _alertController = [[MWMAlertViewController alloc] initWithViewController:self];
+  return _alertController;
+}
+
+@end
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 41b237a60c..b0e3b17d2d 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -144,6 +144,9 @@
 		3432E1851E49BF5C008477E9 /* FBAdsBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3432E1841E49BF5C008477E9 /* FBAdsBanner.xib */; };
 		3432E1861E49BF5C008477E9 /* FBAdsBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3432E1841E49BF5C008477E9 /* FBAdsBanner.xib */; };
 		3432E1871E49BF5C008477E9 /* FBAdsBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3432E1841E49BF5C008477E9 /* FBAdsBanner.xib */; };
+		343E75971E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */; };
+		343E75981E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */; };
+		343E75991E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */; };
 		3446C6771DDCA9A200146687 /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3446C6761DDCA9A200146687 /* libtraffic.a */; };
 		3454D7B81E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; };
 		3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; };
@@ -208,6 +211,32 @@
 		3465E7D81B6658C000854C4D /* MWMAPIBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */; };
 		346B42AB1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346B42AA1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm */; };
 		346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346B42AA1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm */; };
+		346DB7FF1E5C4C6D00E3123E /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */; };
+		346DB8001E5C4C6D00E3123E /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		346DB8271E5C4F6700E3123E /* GalleryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB81E1E5C4F6700E3123E /* GalleryCell.swift */; };
+		346DB8281E5C4F6700E3123E /* GalleryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB81E1E5C4F6700E3123E /* GalleryCell.swift */; };
+		346DB8291E5C4F6700E3123E /* GalleryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB81E1E5C4F6700E3123E /* GalleryCell.swift */; };
+		346DB82A1E5C4F6700E3123E /* GalleryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB81F1E5C4F6700E3123E /* GalleryCell.xib */; };
+		346DB82B1E5C4F6700E3123E /* GalleryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB81F1E5C4F6700E3123E /* GalleryCell.xib */; };
+		346DB82C1E5C4F6700E3123E /* GalleryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB81F1E5C4F6700E3123E /* GalleryCell.xib */; };
+		346DB82D1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8201E5C4F6700E3123E /* GalleryItemViewController.swift */; };
+		346DB82E1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8201E5C4F6700E3123E /* GalleryItemViewController.swift */; };
+		346DB82F1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8201E5C4F6700E3123E /* GalleryItemViewController.swift */; };
+		346DB8301E5C4F6700E3123E /* GalleryItemViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB8211E5C4F6700E3123E /* GalleryItemViewController.xib */; };
+		346DB8311E5C4F6700E3123E /* GalleryItemViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB8211E5C4F6700E3123E /* GalleryItemViewController.xib */; };
+		346DB8321E5C4F6700E3123E /* GalleryItemViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB8211E5C4F6700E3123E /* GalleryItemViewController.xib */; };
+		346DB8331E5C4F6700E3123E /* GalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8221E5C4F6700E3123E /* GalleryViewController.swift */; };
+		346DB8341E5C4F6700E3123E /* GalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8221E5C4F6700E3123E /* GalleryViewController.swift */; };
+		346DB8351E5C4F6700E3123E /* GalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8221E5C4F6700E3123E /* GalleryViewController.swift */; };
+		346DB8361E5C4F6700E3123E /* GalleryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB8231E5C4F6700E3123E /* GalleryViewController.xib */; };
+		346DB8371E5C4F6700E3123E /* GalleryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB8231E5C4F6700E3123E /* GalleryViewController.xib */; };
+		346DB8381E5C4F6700E3123E /* GalleryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB8231E5C4F6700E3123E /* GalleryViewController.xib */; };
+		346DB8391E5C4F6700E3123E /* GalleryItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8251E5C4F6700E3123E /* GalleryItemModel.swift */; };
+		346DB83A1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8251E5C4F6700E3123E /* GalleryItemModel.swift */; };
+		346DB83B1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8251E5C4F6700E3123E /* GalleryItemModel.swift */; };
+		346DB83C1E5C4F6700E3123E /* GalleryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8261E5C4F6700E3123E /* GalleryModel.swift */; };
+		346DB83D1E5C4F6700E3123E /* GalleryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8261E5C4F6700E3123E /* GalleryModel.swift */; };
+		346DB83E1E5C4F6700E3123E /* GalleryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8261E5C4F6700E3123E /* GalleryModel.swift */; };
 		346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; };
 		3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; };
 		3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; };
@@ -298,6 +327,15 @@
 		349D1CE31E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */; };
 		349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */; };
 		349D1CE51E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */; };
+		34A71F971E5DC69E0067933A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; };
+		34A71F981E5DC6C80067933A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; };
+		34A71F991E5DC6C90067933A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; };
+		34A71F9A1E5DC6DF0067933A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; };
+		34A71F9B1E5DC6DF0067933A /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		34A71F9C1E5DC6EE0067933A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; };
+		34A71F9D1E5DC6EE0067933A /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		34A71F9E1E5DC6F80067933A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; };
+		34A71F9F1E5DC6F80067933A /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34A71F961E5DC69E0067933A /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		34AB39C11D2BD8310021857D /* MWMStopButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.mm */; };
 		34AB39C21D2BD8310021857D /* MWMStopButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.mm */; };
 		34ABA6161C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */; };
@@ -399,6 +437,10 @@
 		34D4FA661E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; };
 		34D4FA671E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; };
 		34D4FA681E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; };
+		34DF99B41E5C6891005D79D7 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */; };
+		34DF99B51E5C6891005D79D7 /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		34DF99C41E5C689A005D79D7 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */; };
+		34DF99C51E5C689A005D79D7 /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		34ED298A1E3BB9B40054D003 /* RoutePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ED29891E3BB9B40054D003 /* RoutePoint.swift */; };
 		34ED298B1E3BB9B40054D003 /* RoutePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ED29891E3BB9B40054D003 /* RoutePoint.swift */; };
 		34ED298C1E3BB9B40054D003 /* RoutePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34ED29891E3BB9B40054D003 /* RoutePoint.swift */; };
@@ -1309,7 +1351,116 @@
 		FAFF422A1347F101009BBB14 /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FAFF42291347F101009BBB14 /* World.mwm */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		346DB7F11E5C4C3D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4C9043771AABBFC5001B4E60;
+			remoteInfo = "AlamofireImage iOS";
+		};
+		346DB7F31E5C4C3D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4C9043821AABBFC5001B4E60;
+			remoteInfo = "AlamofireImage iOS Tests";
+		};
+		346DB7F51E5C4C3D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4CE611321AABC24E00D35044;
+			remoteInfo = "AlamofireImage macOS";
+		};
+		346DB7F71E5C4C3D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4CE611471AABC5C900D35044;
+			remoteInfo = "AlamofireImage macOS Tests";
+		};
+		346DB7F91E5C4C3D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4C16B37D1BA9399500A66EF0;
+			remoteInfo = "AlamofireImage tvOS";
+		};
+		346DB7FB1E5C4C3D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4C16B3861BA9399500A66EF0;
+			remoteInfo = "AlamofireImage tvOS Tests";
+		};
+		346DB7FD1E5C4C3D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 4C4D4EC11B92976900C96855;
+			remoteInfo = "AlamofireImage watchOS";
+		};
+		346DB8011E5C4C6D00E3123E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 4C9043761AABBFC5001B4E60;
+			remoteInfo = "AlamofireImage iOS";
+		};
+		34DF99B61E5C6891005D79D7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 4C9043761AABBFC5001B4E60;
+			remoteInfo = "AlamofireImage iOS";
+		};
+		34DF99C61E5C689A005D79D7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 4C9043761AABBFC5001B4E60;
+			remoteInfo = "AlamofireImage iOS";
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
+		346DB8071E5C4C6E00E3123E /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				346DB8001E5C4C6D00E3123E /* AlamofireImage.framework in Embed Frameworks */,
+				34A71F9D1E5DC6EE0067933A /* Alamofire.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		34DF99C31E5C6892005D79D7 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				34DF99B51E5C6891005D79D7 /* AlamofireImage.framework in Embed Frameworks */,
+				34A71F9B1E5DC6DF0067933A /* Alamofire.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		34DF99CC1E5C689B005D79D7 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				34DF99C51E5C689A005D79D7 /* AlamofireImage.framework in Embed Frameworks */,
+				34A71F9F1E5DC6F80067933A /* Alamofire.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		6741AA521BF340DE002C974C /* Embed App Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1437,6 +1588,8 @@
 		3432E17B1E49B484008477E9 /* FBAudienceNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FBAudienceNetwork.framework; sourceTree = "<group>"; };
 		3432E1801E49BF09008477E9 /* FBAdsBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FBAdsBanner.swift; sourceTree = "<group>"; };
 		3432E1841E49BF5C008477E9 /* FBAdsBanner.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FBAdsBanner.xib; sourceTree = "<group>"; };
+		343E75951E5B1EE20041226A /* MWMCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCollectionViewController.h; sourceTree = "<group>"; };
+		343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCollectionViewController.mm; sourceTree = "<group>"; };
 		3446C6761DDCA9A200146687 /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../omim-build/xcode/Debug/libtraffic.a"; sourceTree = "<group>"; };
 		345050211E028B8000A8DC59 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
 		3454D7991E07F045004AF2AD /* CALayer+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+RuntimeAttributes.h"; sourceTree = "<group>"; };
@@ -1483,6 +1636,15 @@
 		346B42A91DD5E3D20094EBEE /* MWMLocationNotFoundAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationNotFoundAlert.h; sourceTree = "<group>"; };
 		346B42AA1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationNotFoundAlert.mm; sourceTree = "<group>"; };
 		346B42AD1DD5E5450094EBEE /* MWMDefaultAlert_Protected.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDefaultAlert_Protected.h; sourceTree = "<group>"; };
+		346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AlamofireImage.xcodeproj; path = AlamofireImage/AlamofireImage.xcodeproj; sourceTree = "<group>"; };
+		346DB81E1E5C4F6700E3123E /* GalleryCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryCell.swift; sourceTree = "<group>"; };
+		346DB81F1E5C4F6700E3123E /* GalleryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GalleryCell.xib; sourceTree = "<group>"; };
+		346DB8201E5C4F6700E3123E /* GalleryItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryItemViewController.swift; sourceTree = "<group>"; };
+		346DB8211E5C4F6700E3123E /* GalleryItemViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GalleryItemViewController.xib; sourceTree = "<group>"; };
+		346DB8221E5C4F6700E3123E /* GalleryViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryViewController.swift; sourceTree = "<group>"; };
+		346DB8231E5C4F6700E3123E /* GalleryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GalleryViewController.xib; sourceTree = "<group>"; };
+		346DB8251E5C4F6700E3123E /* GalleryItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryItemModel.swift; sourceTree = "<group>"; };
+		346DB8261E5C4F6700E3123E /* GalleryModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryModel.swift; 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>"; };
 		347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../../xcode/common-debug.xcconfig"; sourceTree = "<group>"; };
@@ -1544,6 +1706,7 @@
 		349D1ACC1E2E325B004A2006 /* MWMBottomMenuViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMBottomMenuViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		349D1ACD1E2E325B004A2006 /* MWMBottomMenuViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuViewController.xib; sourceTree = "<group>"; };
 		349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Hierarchy.swift"; sourceTree = "<group>"; };
+		34A71F961E5DC69E0067933A /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = "../../../../Library/Developer/Xcode/DerivedData/omim-heemohwtaquexyfyvgekdlvzdgxx/Build/Products/Debug-iphoneos/Alamofire.framework"; sourceTree = "<group>"; };
 		34AB39BF1D2BD8310021857D /* MWMStopButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStopButton.h; sourceTree = "<group>"; };
 		34AB39C01D2BD8310021857D /* MWMStopButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStopButton.mm; sourceTree = "<group>"; };
 		34ABA6141C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationOSMLoginViewController.h; sourceTree = "<group>"; };
@@ -2129,17 +2292,20 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				34A71F971E5DC69E0067933A /* Alamofire.framework in Frameworks */,
 				67B78B4B1E422E2E0018E590 /* CoreSpotlight.framework in Frameworks */,
 				67B78B4D1E422E2E0018E590 /* CoreData.framework in Frameworks */,
 				340475111E08199E00C92850 /* Pushwoosh.framework in Frameworks */,
 				340474FC1E08199D00C92850 /* FBSDKShareKit.framework in Frameworks */,
 				340474F91E08199D00C92850 /* FBSDKLoginKit.framework in Frameworks */,
 				67B78B491E422E2E0018E590 /* iAd.framework in Frameworks */,
+				34A71F9A1E5DC6DF0067933A /* Alamofire.framework in Frameworks */,
 				3432E17C1E49B484008477E9 /* FBAudienceNetwork.framework in Frameworks */,
 				3404750B1E08199E00C92850 /* MyTargetSDK.framework in Frameworks */,
 				340474F61E08199D00C92850 /* FBSDKCoreKit.framework in Frameworks */,
 				340474F01E08199D00C92850 /* Crashlytics.framework in Frameworks */,
 				34570A3B1B13222600E6D4FD /* libz.dylib in Frameworks */,
+				34DF99B41E5C6891005D79D7 /* AlamofireImage.framework in Frameworks */,
 				340474FF1E08199D00C92850 /* libFlurry_7.8.2.a in Frameworks */,
 				67B78B4A1E422E2E0018E590 /* MessageUI.framework in Frameworks */,
 				3404750E1E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */,
@@ -2170,6 +2336,7 @@
 				340474FA1E08199D00C92850 /* FBSDKLoginKit.framework in Frameworks */,
 				6741AABE1BF356BA002C974C /* libalohalitics.a in Frameworks */,
 				340475001E08199D00C92850 /* libFlurry_7.8.2.a in Frameworks */,
+				34A71F981E5DC6C80067933A /* Alamofire.framework in Frameworks */,
 				6741AAC01BF356BA002C974C /* libapi.a in Frameworks */,
 				6741AAC11BF356BA002C974C /* libbase.a in Frameworks */,
 				6741AAC21BF356BA002C974C /* libcoding.a in Frameworks */,
@@ -2185,7 +2352,9 @@
 				340474F11E08199D00C92850 /* Crashlytics.framework in Frameworks */,
 				6741AACC1BF356BA002C974C /* libmap.a in Frameworks */,
 				6741AACD1BF356BA002C974C /* libminizip.a in Frameworks */,
+				346DB7FF1E5C4C6D00E3123E /* AlamofireImage.framework in Frameworks */,
 				6741AACE1BF356BA002C974C /* libopening_hours.a in Frameworks */,
+				34A71F9C1E5DC6EE0067933A /* Alamofire.framework in Frameworks */,
 				347A4C5E1C4E76C9006BA66E /* liboauthcpp.a in Frameworks */,
 				6741AACF1BF356BA002C974C /* libosrm.a in Frameworks */,
 				6741AAD01BF356BA002C974C /* libplatform.a in Frameworks */,
@@ -2216,13 +2385,16 @@
 				67B78B531E422E300018E590 /* CoreData.framework in Frameworks */,
 				340475131E08199E00C92850 /* Pushwoosh.framework in Frameworks */,
 				340474FE1E08199D00C92850 /* FBSDKShareKit.framework in Frameworks */,
+				34A71F991E5DC6C90067933A /* Alamofire.framework in Frameworks */,
 				340474FB1E08199D00C92850 /* FBSDKLoginKit.framework in Frameworks */,
 				67B78B4F1E422E300018E590 /* iAd.framework in Frameworks */,
+				34A71F9E1E5DC6F80067933A /* Alamofire.framework in Frameworks */,
 				3432E17E1E49B484008477E9 /* FBAudienceNetwork.framework in Frameworks */,
 				3404750D1E08199E00C92850 /* MyTargetSDK.framework in Frameworks */,
 				340474F81E08199D00C92850 /* FBSDKCoreKit.framework in Frameworks */,
 				340474F21E08199D00C92850 /* Crashlytics.framework in Frameworks */,
 				849CF7861DE842290024A8A5 /* libz.dylib in Frameworks */,
+				34DF99C41E5C689A005D79D7 /* AlamofireImage.framework in Frameworks */,
 				340475011E08199D00C92850 /* libFlurry_7.8.2.a in Frameworks */,
 				67B78B501E422E300018E590 /* MessageUI.framework in Frameworks */,
 				340475101E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */,
@@ -2324,6 +2496,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				34A71F961E5DC69E0067933A /* Alamofire.framework */,
 				340474DB1E08199D00C92850 /* 3party */,
 				3462FD8A1DC1DF3A00906FD7 /* SDK */,
 				3446C6761DDCA9A200146687 /* libtraffic.a */,
@@ -2364,6 +2537,7 @@
 		340474DB1E08199D00C92850 /* 3party */ = {
 			isa = PBXGroup;
 			children = (
+				346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */,
 				3432E1771E49B3A2008477E9 /* Bolts.framework */,
 				340474DC1E08199D00C92850 /* Crashlytics.framework */,
 				340474DD1E08199D00C92850 /* Fabric.framework */,
@@ -2610,12 +2784,12 @@
 				3454D7B31E07F045004AF2AD /* UITextField+RuntimeAttributes.mm */,
 				3454D7B41E07F045004AF2AD /* UITextView+RuntimeAttributes.h */,
 				3454D7B51E07F045004AF2AD /* UITextView+RuntimeAttributes.mm */,
+				34F5E0D21E3F254800B1C415 /* UIView+Hierarchy.swift */,
 				3454D7B61E07F045004AF2AD /* UIView+RuntimeAttributes.h */,
 				3454D7B71E07F045004AF2AD /* UIView+RuntimeAttributes.mm */,
+				349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */,
 				34F7422F1E0834F400AC1FD6 /* UIViewController+Navigation.h */,
 				34F742301E0834F400AC1FD6 /* UIViewController+Navigation.mm */,
-				34F5E0D21E3F254800B1C415 /* UIView+Hierarchy.swift */,
-				349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
@@ -2696,6 +2870,51 @@
 			path = LocationNotFoundAlert;
 			sourceTree = "<group>";
 		};
+		346DB7E61E5C4C3D00E3123E /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */,
+				346DB7F41E5C4C3D00E3123E /* AlamofireImage iOS Tests.xctest */,
+				346DB7F61E5C4C3D00E3123E /* AlamofireImage.framework */,
+				346DB7F81E5C4C3D00E3123E /* AlamofireImage macOS Tests.xctest */,
+				346DB7FA1E5C4C3D00E3123E /* AlamofireImage.framework */,
+				346DB7FC1E5C4C3D00E3123E /* AlamofireImage tvOS Tests.xctest */,
+				346DB7FE1E5C4C3D00E3123E /* AlamofireImage.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		346DB81C1E5C4F6700E3123E /* Gallery */ = {
+			isa = PBXGroup;
+			children = (
+				346DB81D1E5C4F6700E3123E /* Cells */,
+				346DB8201E5C4F6700E3123E /* GalleryItemViewController.swift */,
+				346DB8211E5C4F6700E3123E /* GalleryItemViewController.xib */,
+				346DB8221E5C4F6700E3123E /* GalleryViewController.swift */,
+				346DB8231E5C4F6700E3123E /* GalleryViewController.xib */,
+				346DB8241E5C4F6700E3123E /* Models */,
+			);
+			path = Gallery;
+			sourceTree = "<group>";
+		};
+		346DB81D1E5C4F6700E3123E /* Cells */ = {
+			isa = PBXGroup;
+			children = (
+				346DB81E1E5C4F6700E3123E /* GalleryCell.swift */,
+				346DB81F1E5C4F6700E3123E /* GalleryCell.xib */,
+			);
+			path = Cells;
+			sourceTree = "<group>";
+		};
+		346DB8241E5C4F6700E3123E /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				346DB8251E5C4F6700E3123E /* GalleryItemModel.swift */,
+				346DB8261E5C4F6700E3123E /* GalleryModel.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
 		346EDAD81B9F0E15004F8DB5 /* Components */ = {
 			isa = PBXGroup;
 			children = (
@@ -2718,6 +2937,8 @@
 				34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */,
 				34B924401DC8A29C0008D971 /* MWMMailViewController.h */,
 				34B924411DC8A29C0008D971 /* MWMMailViewController.mm */,
+				343E75951E5B1EE20041226A /* MWMCollectionViewController.h */,
+				343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -3470,6 +3691,7 @@
 		F6E2FCA81E097B9F0083EBEC /* Content */ = {
 			isa = PBXGroup;
 			children = (
+				346DB81C1E5C4F6700E3123E /* Gallery */,
 				F6E2FCA91E097B9F0083EBEC /* BookmarkCell */,
 				F6E2FCAF1E097B9F0083EBEC /* ButtonCell */,
 				F6E2FCB31E097B9F0083EBEC /* OpeningHoursCell */,
@@ -3836,10 +4058,12 @@
 				1D60588F0D05DD3D006BFB54 /* Frameworks */,
 				F6D434721AD2AB97007C7728 /* Embed App Extensions */,
 				34A62D4A1C9034D0007FDCB7 /* ShellScript */,
+				34DF99C31E5C6892005D79D7 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				34DF99B71E5C6891005D79D7 /* PBXTargetDependency */,
 			);
 			name = MAPS.ME;
 			productName = Maps;
@@ -3855,10 +4079,12 @@
 				6741AA311BF340DE002C974C /* Frameworks */,
 				6741AA521BF340DE002C974C /* Embed App Extensions */,
 				34F7422E1E08328300AC1FD6 /* ShellScript */,
+				346DB8071E5C4C6E00E3123E /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				346DB8021E5C4C6D00E3123E /* PBXTargetDependency */,
 			);
 			name = xcMAPS.ME;
 			productName = Maps;
@@ -3875,10 +4101,12 @@
 				849CF7721DE842290024A8A5 /* Frameworks */,
 				849CF79A1DE842290024A8A5 /* Embed App Extensions */,
 				849CF79B1DE842290024A8A5 /* ShellScript */,
+				34DF99CC1E5C689B005D79D7 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				34DF99C71E5C689A005D79D7 /* PBXTargetDependency */,
 			);
 			name = cmMAPS.ME;
 			productName = Maps;
@@ -3976,6 +4204,12 @@
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* Maps */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 346DB7E61E5C4C3D00E3123E /* Products */;
+					ProjectRef = 346DB7E51E5C4C3D00E3123E /* AlamofireImage.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				1D6058900D05DD3D006BFB54 /* MAPS.ME */,
@@ -3985,6 +4219,58 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		346DB7F21E5C4C3D00E3123E /* AlamofireImage.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = AlamofireImage.framework;
+			remoteRef = 346DB7F11E5C4C3D00E3123E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		346DB7F41E5C4C3D00E3123E /* AlamofireImage iOS Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "AlamofireImage iOS Tests.xctest";
+			remoteRef = 346DB7F31E5C4C3D00E3123E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		346DB7F61E5C4C3D00E3123E /* AlamofireImage.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = AlamofireImage.framework;
+			remoteRef = 346DB7F51E5C4C3D00E3123E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		346DB7F81E5C4C3D00E3123E /* AlamofireImage macOS Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "AlamofireImage macOS Tests.xctest";
+			remoteRef = 346DB7F71E5C4C3D00E3123E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		346DB7FA1E5C4C3D00E3123E /* AlamofireImage.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = AlamofireImage.framework;
+			remoteRef = 346DB7F91E5C4C3D00E3123E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		346DB7FC1E5C4C3D00E3123E /* AlamofireImage tvOS Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "AlamofireImage tvOS Tests.xctest";
+			remoteRef = 346DB7FB1E5C4C3D00E3123E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		346DB7FE1E5C4C3D00E3123E /* AlamofireImage.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = AlamofireImage.framework;
+			remoteRef = 346DB7FD1E5C4C3D00E3123E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		1D60588D0D05DD3D006BFB54 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -4059,6 +4345,7 @@
 				34D3B0381E389D05004100F9 /* MWMEditorSelectTableViewCell.xib in Resources */,
 				34D3B03E1E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib in Resources */,
 				34D3B0441E389D05004100F9 /* MWMEditorTextTableViewCell.xib in Resources */,
+				346DB8301E5C4F6700E3123E /* GalleryItemViewController.xib in Resources */,
 				F64D9CA21C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */,
 				F6BC1E541ACBF9AB00EF0360 /* MWMFacebookAlert.xib in Resources */,
 				F6172FA51BBD5A3E0081D325 /* MWMiPadRoutePreview.xib in Resources */,
@@ -4110,6 +4397,7 @@
 				F6E2FF411E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
 				F6E2FEED1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
 				3490D2E21CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
+				346DB82A1E5C4F6700E3123E /* GalleryCell.xib in Resources */,
 				F6E2FE2D1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
 				F68FCB8C1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.xib in Resources */,
 				349B92701DF0526D007779DD /* MWMToast.xib in Resources */,
@@ -4141,6 +4429,7 @@
 				FAFF422A1347F101009BBB14 /* World.mwm in Resources */,
 				FA459EB414327AF700B5BB3C /* WorldCoasts.mwm in Resources */,
 				671182E31C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
+				346DB8361E5C4F6700E3123E /* GalleryViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4217,6 +4506,7 @@
 				34D3B03F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib in Resources */,
 				34D3B0451E389D05004100F9 /* MWMEditorTextTableViewCell.xib in Resources */,
 				F64D9CA31C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */,
+				346DB8311E5C4F6700E3123E /* GalleryItemViewController.xib in Resources */,
 				6741A9911BF340DE002C974C /* MWMFacebookAlert.xib in Resources */,
 				6741A9701BF340DE002C974C /* MWMiPadRoutePreview.xib in Resources */,
 				6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */,
@@ -4268,6 +4558,7 @@
 				F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
 				F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
 				3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
+				346DB82B1E5C4F6700E3123E /* GalleryCell.xib in Resources */,
 				F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
 				F68FCB8D1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.xib in Resources */,
 				349B92711DF0526D007779DD /* MWMToast.xib in Resources */,
@@ -4299,6 +4590,7 @@
 				6741A9521BF340DE002C974C /* World.mwm in Resources */,
 				6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */,
 				671182E41C7F0DD800CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
+				346DB8371E5C4F6700E3123E /* GalleryViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4375,6 +4667,7 @@
 				34D3B0401E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib in Resources */,
 				34D3B0461E389D05004100F9 /* MWMEditorTextTableViewCell.xib in Resources */,
 				849CF66D1DE842290024A8A5 /* MWMEditorViralAlert.xib in Resources */,
+				346DB8321E5C4F6700E3123E /* GalleryItemViewController.xib in Resources */,
 				849CF66F1DE842290024A8A5 /* MWMFacebookAlert.xib in Resources */,
 				849CF6381DE842290024A8A5 /* MWMiPadRoutePreview.xib in Resources */,
 				849CF6301DE842290024A8A5 /* MWMLocationAlert.xib in Resources */,
@@ -4426,6 +4719,7 @@
 				F6E2FF431E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
 				F6E2FEEF1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
 				849CF6471DE842290024A8A5 /* MWMSideButtonsView.xib in Resources */,
+				346DB82C1E5C4F6700E3123E /* GalleryCell.xib in Resources */,
 				F6E2FE2F1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
 				849CF5FA1DE842290024A8A5 /* MWMTaxiPreviewCell.xib in Resources */,
 				349B92721DF0526D007779DD /* MWMToast.xib in Resources */,
@@ -4457,6 +4751,7 @@
 				849CF6021DE842290024A8A5 /* World.mwm in Resources */,
 				849CF6401DE842290024A8A5 /* WorldCoasts.mwm in Resources */,
 				849CF63D1DE842290024A8A5 /* WorldCoasts_obsolete.mwm in Resources */,
+				346DB8381E5C4F6700E3123E /* GalleryViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4596,6 +4891,7 @@
 				3454D7E51E07F045004AF2AD /* UIView+RuntimeAttributes.mm in Sources */,
 				34FE4C451BCC013500066718 /* MWMMapWidgets.mm in Sources */,
 				F6E2FE4B1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
+				346DB8391E5C4F6700E3123E /* GalleryItemModel.swift in Sources */,
 				3404757D1E081B3300C92850 /* iosOGLContext.mm in Sources */,
 				34D3AFF11E37945B004100F9 /* UITableView+Cells.swift in Sources */,
 				34D3B02F1E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */,
@@ -4618,11 +4914,13 @@
 				F6E2FE541E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */,
 				34C9BD091C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */,
 				34D3B0171E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift in Sources */,
+				346DB8271E5C4F6700E3123E /* GalleryCell.swift in Sources */,
 				3406FA151C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */,
 				3432E1811E49BF09008477E9 /* FBAdsBanner.swift in Sources */,
 				F6E2FECC1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
 				F6E2FF111E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
 				34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */,
+				346DB8331E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
 				F6E2FDFD1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */,
 				F6E2FEDB1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */,
 				34943BB61E26222300B14F84 /* WelcomeProtocol.swift in Sources */,
@@ -4653,6 +4951,7 @@
 				349D1AD71E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
 				3462258E1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */,
 				F6E2FEBD1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
+				343E75971E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */,
 				3454D7DF1E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */,
 				3486B50C1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */,
 				F6E2FEF91E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */,
@@ -4687,6 +4986,7 @@
 				F6E2FF3B1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */,
 				F6E2FF651E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
 				F6381BF51CD12045004CA943 /* LocaleTranslator.mm in Sources */,
+				346DB82D1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */,
 				340475551E081A4600C92850 /* Statistics.mm in Sources */,
 				F68FCB851DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm in Sources */,
 				F653CE161C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */,
@@ -4773,6 +5073,7 @@
 				F6E2FE2A1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.mm in Sources */,
 				340475641E081A4600C92850 /* MWMRouter.mm in Sources */,
 				3454D7D61E07F045004AF2AD /* UIKitCategories.mm in Sources */,
+				346DB83C1E5C4F6700E3123E /* GalleryModel.swift in Sources */,
 				34B924421DC8A29C0008D971 /* MWMMailViewController.mm in Sources */,
 				F6E2FF171E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.mm in Sources */,
 				F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */,
@@ -4856,6 +5157,7 @@
 				3454D7E61E07F045004AF2AD /* UIView+RuntimeAttributes.mm in Sources */,
 				F6E2FE4C1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
 				3404757E1E081B3300C92850 /* iosOGLContext.mm in Sources */,
+				346DB83A1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */,
 				F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.mm in Sources */,
 				34D3AFF21E37945B004100F9 /* UITableView+Cells.swift in Sources */,
 				34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */,
@@ -4878,11 +5180,13 @@
 				6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */,
 				F6E2FECD1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
 				34D3B0181E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift in Sources */,
+				346DB8281E5C4F6700E3123E /* GalleryCell.swift in Sources */,
 				F6E2FF121E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
 				3432E1821E49BF09008477E9 /* FBAdsBanner.swift in Sources */,
 				F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */,
 				F6E2FDFE1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */,
 				F6E2FEDC1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */,
+				346DB8341E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
 				34943BB71E26222300B14F84 /* WelcomeProtocol.swift in Sources */,
 				F6E2FD5F1E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */,
 				F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */,
@@ -4913,6 +5217,7 @@
 				349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
 				F6E2FEBE1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
 				3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */,
+				343E75981E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */,
 				F6E2FEFA1E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */,
 				F6E2FE431E097BA00083EBEC /* MWMDirectionView.mm in Sources */,
 				3486B50D1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */,
@@ -4947,6 +5252,7 @@
 				F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
 				3454D7C21E07F045004AF2AD /* NSString+Categories.mm in Sources */,
 				6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */,
+				346DB82E1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */,
 				340475561E081A4600C92850 /* Statistics.mm in Sources */,
 				F6381BF61CD12045004CA943 /* LocaleTranslator.mm in Sources */,
 				F68FCB861DA7BBA6007CC7D7 /* MWMTaxiPreviewDataSource.mm in Sources */,
@@ -5033,6 +5339,7 @@
 				34B924431DC8A29C0008D971 /* MWMMailViewController.mm in Sources */,
 				340475651E081A4600C92850 /* MWMRouter.mm in Sources */,
 				F6E2FF181E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.mm in Sources */,
+				346DB83D1E5C4F6700E3123E /* GalleryModel.swift in Sources */,
 				3454D7D71E07F045004AF2AD /* UIKitCategories.mm in Sources */,
 				34AB39C21D2BD8310021857D /* MWMStopButton.mm in Sources */,
 				6741AA281BF340DE002C974C /* MWMAlert.mm in Sources */,
@@ -5116,6 +5423,7 @@
 				849CF6AF1DE842290024A8A5 /* MWMTextView.mm in Sources */,
 				849CF6B11DE842290024A8A5 /* MWMMapWidgets.mm in Sources */,
 				F6E2FE4D1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
+				346DB83B1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */,
 				340475631E081A4600C92850 /* MWMNetworkPolicy.mm in Sources */,
 				34D3AFF31E37945B004100F9 /* UITableView+Cells.swift in Sources */,
 				34D3B0311E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */,
@@ -5138,11 +5446,13 @@
 				F6E2FE561E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */,
 				849CF6CF1DE842290024A8A5 /* MWMAlertViewController.mm in Sources */,
 				34D3B0191E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift in Sources */,
+				346DB8291E5C4F6700E3123E /* GalleryCell.swift in Sources */,
 				340475781E081A4600C92850 /* MWMTrafficManager.mm in Sources */,
 				3432E1831E49BF09008477E9 /* FBAdsBanner.swift in Sources */,
 				F6E2FECE1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
 				F6E2FF131E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
 				849CF6D21DE842290024A8A5 /* MWMNavigationController.mm in Sources */,
+				346DB8351E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
 				F6E2FDFF1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */,
 				F6E2FEDD1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */,
 				34943BB81E26222300B14F84 /* WelcomeProtocol.swift in Sources */,
@@ -5173,6 +5483,7 @@
 				349D1AD91E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
 				849CF6DF1DE842290024A8A5 /* MWMAuthorizationCommon.mm in Sources */,
 				F6E2FEBF1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
+				343E75991E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */,
 				3454D7CF1E07F045004AF2AD /* UIFont+MapsMeFonts.mm in Sources */,
 				3486B50E1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */,
 				F6E2FEFB1E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */,
@@ -5207,6 +5518,7 @@
 				F6E2FF3D1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */,
 				F6E2FF671E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
 				3454D7D81E07F045004AF2AD /* UIKitCategories.mm in Sources */,
+				346DB82F1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */,
 				849CF6FB1DE842290024A8A5 /* BookmarksVC.mm in Sources */,
 				849CF6FC1DE842290024A8A5 /* MWMSideButtonsView.mm in Sources */,
 				3454D7C01E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */,
@@ -5293,6 +5605,7 @@
 				F6E2FE2C1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.mm in Sources */,
 				849CF75C1DE842290024A8A5 /* MWMNavigationView.mm in Sources */,
 				849CF7601DE842290024A8A5 /* MWMStopButton.mm in Sources */,
+				346DB83E1E5C4F6700E3123E /* GalleryModel.swift in Sources */,
 				849CF7611DE842290024A8A5 /* MWMMailViewController.mm in Sources */,
 				F6E2FF191E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.mm in Sources */,
 				3404754E1E081A4600C92850 /* MWMKeyboard.mm in Sources */,
@@ -5315,6 +5628,24 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		346DB8021E5C4C6D00E3123E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "AlamofireImage iOS";
+			targetProxy = 346DB8011E5C4C6D00E3123E /* PBXContainerItemProxy */;
+		};
+		34DF99B71E5C6891005D79D7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "AlamofireImage iOS";
+			targetProxy = 34DF99B61E5C6891005D79D7 /* PBXContainerItemProxy */;
+		};
+		34DF99C71E5C689A005D79D7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "AlamofireImage iOS";
+			targetProxy = 34DF99C61E5C689A005D79D7 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		34F73F5F1E082FF700AC1FD6 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
@@ -5394,6 +5725,7 @@
 		6741AA551BF340DE002C974C /* Simulator */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				ENABLE_BITCODE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5404,6 +5736,7 @@
 		6741AA561BF340DE002C974C /* Simulator Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				ENABLE_BITCODE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5414,6 +5747,7 @@
 		6741AA571BF340DE002C974C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				ENABLE_BITCODE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5425,6 +5759,7 @@
 		6741AA591BF340DE002C974C /* AdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				ENABLE_BITCODE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5435,6 +5770,7 @@
 		6741AA5A1BF340DE002C974C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				ENABLE_BITCODE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5446,6 +5782,7 @@
 		6741AA5C1BF340DE002C974C /* Production Full */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				ENABLE_BITCODE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5456,6 +5793,7 @@
 		849CF79D1DE842290024A8A5 /* Simulator */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -5501,6 +5839,7 @@
 		849CF79E1DE842290024A8A5 /* Simulator Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -5546,6 +5885,7 @@
 		849CF79F1DE842290024A8A5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -5591,6 +5931,7 @@
 		849CF7A01DE842290024A8A5 /* AdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -5636,6 +5977,7 @@
 		849CF7A11DE842290024A8A5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -5681,6 +6023,7 @@
 		849CF7A21DE842290024A8A5 /* Production Full */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -5736,6 +6079,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party",
 					"$(PROJECT_DIR)/3party/MyTarget",
+					"$(SYMROOT)/Release-$(PLATFORM_NAME)",
 				);
 				GCC_ENABLE_PASCAL_STRINGS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -5779,6 +6123,7 @@
 		FAAB411A149BA83500C245B1 /* Simulator */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				CLANG_ENABLE_MODULES = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5834,6 +6179,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party",
 					"$(PROJECT_DIR)/3party/MyTarget",
+					"$(SYMROOT)/Debug-$(PLATFORM_NAME)",
 				);
 				GCC_ENABLE_PASCAL_STRINGS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -5874,6 +6220,7 @@
 		FAAB411C149BA84700C245B1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				CLANG_ENABLE_MODULES = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -5930,6 +6277,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party",
 					"$(PROJECT_DIR)/3party/MyTarget",
+					"$(SYMROOT)/Release-$(PLATFORM_NAME)",
 				);
 				GCC_ENABLE_PASCAL_STRINGS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -5972,6 +6320,7 @@
 		FAAB411E149BA85500C245B1 /* AdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				CLANG_ENABLE_MODULES = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -6028,6 +6377,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party",
 					"$(PROJECT_DIR)/3party/MyTarget",
+					"$(SYMROOT)/Release-$(PLATFORM_NAME)",
 				);
 				GCC_ENABLE_PASCAL_STRINGS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -6070,6 +6420,7 @@
 		FAAB4120149BA86000C245B1 /* Production Full */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				CLANG_ENABLE_MODULES = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -6125,6 +6476,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party",
 					"$(PROJECT_DIR)/3party/MyTarget",
+					"$(SYMROOT)/Release-$(PLATFORM_NAME)",
 				);
 				GCC_ENABLE_PASCAL_STRINGS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -6168,6 +6520,7 @@
 		FABB561F149CD957006969C0 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				CLANG_ENABLE_MODULES = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -6223,6 +6576,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party",
 					"$(PROJECT_DIR)/3party/MyTarget",
+					"$(SYMROOT)/Release-$(PLATFORM_NAME)",
 				);
 				GCC_ENABLE_PASCAL_STRINGS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -6267,6 +6621,7 @@
 		FACFE54515F8F35600CE8B20 /* Simulator Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUILD_DIR = "$(BUILD_ROOT)";
 				CLANG_ENABLE_MODULES = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift
new file mode 100644
index 0000000000..6ed43e02bb
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift
@@ -0,0 +1,18 @@
+import AlamofireImage
+
+final class GalleryCell: UICollectionViewCell {
+  typealias Model = GalleryItemModel
+
+  @IBOutlet weak var imageView: UIImageView!
+
+  var model: Model! {
+    didSet {
+      imageView.af_setImage(withURL: model.previewURL,
+                            placeholderImage: UIImage(named: "ic_placeholder"))
+    }
+  }
+
+  override func prepareForReuse() {
+    imageView.af_cancelImageRequest()
+  }
+}
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.xib
new file mode 100644
index 0000000000..5920b52b9c
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.xib
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="GalleryCell" id="gTV-IL-0wX" customClass="GalleryCell" customModule="cm_beta" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="120" height="90"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="120" height="90"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ouG-7c-ePd">
+                        <rect key="frame" x="0.0" y="0.0" width="120" height="90"/>
+                    </imageView>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="ouG-7c-ePd" secondAttribute="bottom" id="Vp7-9P-bVf"/>
+                <constraint firstItem="ouG-7c-ePd" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="aBo-I0-lTb"/>
+                <constraint firstAttribute="trailing" secondItem="ouG-7c-ePd" secondAttribute="trailing" id="v1V-2N-4Sm"/>
+                <constraint firstItem="ouG-7c-ePd" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="zLx-Mk-v7n"/>
+            </constraints>
+            <connections>
+                <outlet property="imageView" destination="ouG-7c-ePd" id="ZCJ-zP-ppD"/>
+            </connections>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift
new file mode 100644
index 0000000000..15b7bf2599
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift
@@ -0,0 +1,55 @@
+import AlamofireImage
+
+@objc(MWMGalleryItemViewController)
+final class GalleryItemViewController: MWMViewController {
+  typealias Model = GalleryItemModel
+
+  static func instance(model: Model) -> GalleryItemViewController {
+    let vc = GalleryItemViewController(nibName: toString(self), bundle: nil)
+    vc.model = model
+    return vc
+  }
+
+  private var model: Model!
+
+  @IBOutlet private weak var scrollView: UIScrollView!
+  fileprivate var imageView: UIImageView!
+
+  override var hasNavigationBar: Bool {
+    return false
+  }
+
+  override var preferredStatusBarStyle: UIStatusBarStyle {
+    return .lightContent
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    imageView = UIImageView(frame: scrollView.bounds)
+    imageView.contentMode = .scaleAspectFit
+    scrollView.addSubview(imageView)
+    imageView.af_setImage(withURL: model.imageURL,
+                          placeholderImage: UIImage(named: "ic_placeholder"))
+  }
+
+  override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
+    imageView.frame = scrollView.bounds
+  }
+
+  override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+    coordinator.animate(alongsideTransition: { [unowned self] _ in
+      self.imageView.frame = CGRect(origin: CGPoint.zero, size: size)
+    })
+  }
+
+  @IBAction func backAction() {
+    _ = navigationController?.popViewController(animated: true)
+  }
+}
+
+extension GalleryItemViewController: UIScrollViewDelegate {
+  func viewForZooming(in scrollView: UIScrollView) -> UIView? {
+    return imageView
+  }
+}
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.xib
new file mode 100644
index 0000000000..30821af68d
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.xib
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GalleryItemViewController" customModule="cm_beta" customModuleProvider="target">
+            <connections>
+                <outlet property="scrollView" destination="xya-Ci-VEQ" id="1x3-sL-sQQ"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" indicatorStyle="black" maximumZoomScale="3" translatesAutoresizingMaskIntoConstraints="NO" id="xya-Ci-VEQ">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <connections>
+                        <outlet property="delegate" destination="-1" id="7tK-dL-0BA"/>
+                    </connections>
+                </scrollView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y4C-b2-RC1" userLabel="Back">
+                    <rect key="frame" x="0.0" y="20" width="44" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="UrT-CR-zfv"/>
+                        <constraint firstAttribute="width" constant="44" id="ljT-Wf-zy5"/>
+                    </constraints>
+                    <state key="normal" image="ic_nav_bar_back"/>
+                    <connections>
+                        <action selector="backAction" destination="-1" eventType="touchUpInside" id="lq8-QI-GIs"/>
+                    </connections>
+                </button>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="xya-Ci-VEQ" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="7SD-yk-9dF"/>
+                <constraint firstItem="xya-Ci-VEQ" firstAttribute="height" secondItem="i5M-Pr-FkT" secondAttribute="height" id="Q4p-Pe-yuT"/>
+                <constraint firstItem="xya-Ci-VEQ" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="UVN-YK-2tj"/>
+                <constraint firstItem="Y4C-b2-RC1" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="XEU-ul-t6m"/>
+                <constraint firstItem="xya-Ci-VEQ" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="lrk-Tc-EkL"/>
+                <constraint firstItem="Y4C-b2-RC1" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="uPB-Xp-KDY"/>
+            </constraints>
+            <point key="canvasLocation" x="34.5" y="54.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="ic_nav_bar_back" width="14" height="22"/>
+    </resources>
+</document>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryViewController.swift
new file mode 100644
index 0000000000..0b814ffa51
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryViewController.swift
@@ -0,0 +1,68 @@
+@objc(MWMGalleryViewController)
+final class GalleryViewController: MWMCollectionViewController {
+  typealias Cell = GalleryCell
+  typealias Model = GalleryModel
+
+  static func instance(model: Model) -> GalleryViewController {
+    let vc = GalleryViewController(nibName: toString(self), bundle: nil)
+    vc.model = model
+    return vc
+  }
+
+  private var model: Model!
+
+  private var lastViewSize = CGSize.zero {
+    didSet { configLayout() }
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    title = model.title
+    collectionView!.register(cellClass: Cell.self)
+  }
+
+  override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
+    lastViewSize = view.size
+  }
+
+  private func configLayout() {
+    let minItemsPerRow: CGFloat = 3
+    let maxItemWidth: CGFloat = 120
+    let ratio: CGFloat = 3.0 / 4.0
+    let viewWidth = view.size.width
+    let spacing: CGFloat = 4
+
+    let itemsPerRow = floor(max(viewWidth / maxItemWidth, minItemsPerRow))
+    let itemWidth = (viewWidth - (itemsPerRow + 1) * spacing) / itemsPerRow
+    let itemHeight = itemWidth * ratio
+
+    let layout = collectionView!.collectionViewLayout as! UICollectionViewFlowLayout
+    layout.minimumLineSpacing = spacing
+    layout.minimumInteritemSpacing = spacing
+    layout.itemSize = CGSize(width: itemWidth, height: itemHeight)
+  }
+
+  override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+    coordinator.animate(alongsideTransition: { [unowned self] _ in
+      self.lastViewSize = size
+    })
+  }
+
+  // MARK: UICollectionViewDataSource
+  override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+    return model.items.count
+  }
+
+  override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+    let cell = collectionView.dequeueReusableCell(withCellClass: Cell.self,
+                                                  indexPath: indexPath) as! Cell
+    cell.model = model.items[indexPath.item]
+    return cell
+  }
+
+  // MARK: UICollectionViewDelegate
+  override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+    show(GalleryItemViewController.instance(model: model.items[indexPath.item]), sender: nil)
+  }
+}
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryViewController.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryViewController.xib
new file mode 100644
index 0000000000..183b1059c5
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryViewController.xib
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GalleryViewController" customModule="cm_beta" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="4" minimumInteritemSpacing="4" id="c7k-ch-oGk">
+                <size key="itemSize" width="120" height="90"/>
+                <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                <inset key="sectionInset" minX="4" minY="4" maxX="4" maxY="4"/>
+            </collectionViewFlowLayout>
+            <connections>
+                <outlet property="dataSource" destination="-1" id="Tng-2m-Rnh"/>
+                <outlet property="delegate" destination="-1" id="9aC-8N-iBw"/>
+            </connections>
+        </collectionView>
+    </objects>
+</document>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryItemModel.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryItemModel.swift
new file mode 100644
index 0000000000..6e977345ab
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryItemModel.swift
@@ -0,0 +1,10 @@
+@objc(MWMGalleryItemModel)
+final class GalleryItemModel: NSObject {
+  let imageURL: URL
+  let previewURL: URL
+
+  init(imageURL: URL, previewURL: URL) {
+    self.imageURL = imageURL
+    self.previewURL = previewURL
+  }
+}
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryModel.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryModel.swift
new file mode 100644
index 0000000000..428a6c7c3d
--- /dev/null
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Models/GalleryModel.swift
@@ -0,0 +1,10 @@
+@objc(MWMGalleryModel)
+final class GalleryModel: NSObject {
+  let title: String
+  let items: [GalleryItemModel]
+
+  init(title: String, items: [GalleryItemModel]) {
+    self.title = title
+    self.items = items
+  }
+}
diff --git a/xcode/api/api.xcodeproj/project.pbxproj b/xcode/api/api.xcodeproj/project.pbxproj
index 4417fadddf..c124d533a8 100644
--- a/xcode/api/api.xcodeproj/project.pbxproj
+++ b/xcode/api/api.xcodeproj/project.pbxproj
@@ -211,7 +211,6 @@
 		3496AB8A1DC1F6CE00C5DDBA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.api_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -221,7 +220,6 @@
 		3496AB8B1DC1F6CE00C5DDBA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.api_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig
index 61b4be5480..b06d3051d5 100644
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@@ -59,3 +59,4 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES
 ONLY_ACTIVE_ARCH = YES
 VALID_ARCHS = i386 x86_64 armv7 armv7s arm64
 PRODUCT_NAME = $(TARGET_NAME)
+ALWAYS_SEARCH_USER_PATHS = NO