gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] replace MWMSearchManager with new SearchOnMapManager

Browse source 
- fix layout of the place page container (configure it programatiacally)
- use the new modal seearch VC everywhere
-

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-02-17 20:56:56 +04:00 • committed by Roman Tsisyk
parent fbc1ebd84d
commit f9fb0e8d7f
11 changed files with 213 additions and 292 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
View file

@ -6,6 +6,7 @@
@class MapViewController;
@class BottomTabBarViewController;
@class TrackRecordingViewController;
@protocol MWMFeatureHolder;
@interface MWMMapViewControlsManager : NSObject
@ -47,7 +48,6 @@
- (void)actionDownloadMaps:(MWMMapDownloaderMode)mode;
- (BOOL)searchText:(NSString *)text forInputLocale:(NSString *)locale;
- (void)searchTextOnMap:(NSString *)text forInputLocale:(NSString *)locale;
- (void)hideSearch;
#pragma mark - MWMFeatureHolder

60
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -5,7 +5,6 @@
#import "MWMNetworkPolicy+UI.h"
#import "MWMPlacePageManager.h"
#import "MWMPlacePageProtocol.h"
#import "MWMSearchManager.h"
#import "MWMSideButtons.h"
#import "MWMTrafficButtonViewController.h"
#import "MWMMapWidgetsHelper.h"
@ -27,8 +26,7 @@ namespace {
NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
} // namespace
@interface MWMMapViewControlsManager () <BottomMenuDelegate,
MWMSearchManagerObserver>
@interface MWMMapViewControlsManager () <BottomMenuDelegate>
@property(nonatomic) MWMSideButtons *sideButtons;
@property(nonatomic) MWMTrafficButtonViewController *trafficButton;
@ -36,7 +34,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
@property(nonatomic) UIViewController *menuController;
@property(nonatomic) id<MWMPlacePageProtocol> placePageManager;
@property(nonatomic) MWMNavigationDashboardManager *navigationManager;
@property(nonatomic) MWMSearchManager *searchManager;
@property(nonatomic) SearchOnMapManager *searchManager;
@property(weak, nonatomic) MapViewController *ownerController;
@ -50,6 +48,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
+ (MWMMapViewControlsManager *)manager {
return [MapViewController sharedController].controlsManager;
}
- (instancetype)initWithParentController:(MapViewController *)controller {
if (!controller)
return nil;
@ -67,6 +66,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
[TrackRecordingManager.shared addObserver:self recordingIsActiveDidChangeHandler:^(TrackRecordingState state, TrackInfo * trackInfo) {
[self setTrackRecordingButtonHidden:state == TrackRecordingStateInactive];
}];
self.searchManager = controller.searchManager;
return self;
}
@ -75,7 +75,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
}
- (UIStatusBarStyle)preferredStatusBarStyle {
BOOL const isSearchUnderStatusBar = (self.searchManager.state != MWMSearchManagerStateHidden);
BOOL const isNavigationUnderStatusBar = self.navigationManager.state != MWMNavigationDashboardStateHidden &&
self.navigationManager.state != MWMNavigationDashboardStateNavigation;
BOOL const isMenuViewUnderStatusBar = self.menuState == MWMBottomMenuStateActive;
@ -83,7 +82,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
BOOL const isAddPlaceUnderStatusBar =
[self.ownerController.view hasSubviewWithViewClass:[MWMAddPlaceNavigationBar class]];
BOOL const isNightMode = [UIColor isNightMode];
BOOL const isSomethingUnderStatusBar = isSearchUnderStatusBar || isNavigationUnderStatusBar ||
BOOL const isSomethingUnderStatusBar = isNavigationUnderStatusBar ||
isDirectionViewUnderStatusBar || isMenuViewUnderStatusBar ||
isAddPlaceUnderStatusBar;
@ -101,7 +100,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
[self.trafficButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
[self.trackRecordingButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
[self.tabBarController viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
[self.searchManager viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
}
#pragma mark - MWMPlacePageViewManager
@ -110,24 +108,19 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
if (![self searchText:text forInputLocale:locale])
return;
self.searchManager.state = MWMSearchManagerStateMapSearch;
[self.searchManager startSearchingWithIsRouting:NO];
}
- (BOOL)searchText:(NSString *)text forInputLocale:(NSString *)locale {
if (text.length == 0)
return NO;
self.searchManager.state = MWMSearchManagerStateTableSearch;
[self.searchManager searchText:text forInputLocale:locale withCategory:NO];
[self.searchManager startSearchingWithIsRouting:NO];
[self.searchManager searchText:text locale:locale isCategory:NO];
return YES;
}
- (void)hideSearch {
self.searchManager.state = MWMSearchManagerStateHidden;
}
#pragma mark - BottomMenuDelegate
#pragma mark - BottomMenu
- (void)actionDownloadMaps:(MWMMapDownloaderMode)mode {
[self.ownerController openMapsDownloader:mode];
}
@ -146,7 +139,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
MapViewController *ownerController = self.ownerController;
self.isAddingPlace = YES;
self.searchManager.state = MWMSearchManagerStateHidden;
[self.searchManager close];
self.menuState = MWMBottomMenuStateHidden;
self.trafficButtonHidden = YES;
@ -181,15 +174,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
[[MapsAppDelegate theApp] enableStandby];
}
#pragma mark - MWMSearchManagerObserver
- (void)onSearchManagerStateChanged {
auto state = [MWMSearchManager manager].state;
if (!IPAD && state == MWMSearchManagerStateHidden) {
self.hidden = NO;
}
}
#pragma mark - Routing
- (void)onRoutePrepare {
@ -201,16 +185,12 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
}
- (void)onRouteRebuild {
if (IPAD)
self.searchManager.state = MWMSearchManagerStateHidden;
[self.ownerController.bookmarksCoordinator close];
[self.navigationManager onRoutePlanning];
self.promoButton.hidden = YES;
}
- (void)onRouteReady:(BOOL)hasWarnings {
self.searchManager.state = MWMSearchManagerStateHidden;
[self.navigationManager onRouteReady:hasWarnings];
self.promoButton.hidden = YES;
}
@ -226,7 +206,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
}
- (void)onRouteStop {
self.searchManager.state = MWMSearchManagerStateHidden;
self.sideButtons.zoomHidden = self.zoomHidden;
[self.navigationManager onRouteStop];
self.disableStandbyOnRouteFollowing = NO;
@ -236,17 +215,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
#pragma mark - Properties
/*
- (UIButton *)promoButton {
if (!_promoButton) {
PromoCoordinator *coordinator = [[PromoCoordinator alloc] initWithViewController:self.ownerController
campaign:_promoDiscoveryCampaign];
_promoButton = [[PromoButton alloc] initWithCoordinator:coordinator];
}
return _promoButton;
}
*/
- (MWMSideButtons *)sideButtons {
if (!_sideButtons)
_sideButtons = [[MWMSideButtons alloc] initWithParentView:self.ownerController.controlsView];
@ -283,14 +251,6 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
return _navigationManager;
}
- (MWMSearchManager *)searchManager {
if (!_searchManager) {
_searchManager = [[MWMSearchManager alloc] init];
[MWMSearchManager addObserver:self];
}
return _searchManager;
}
@synthesize menuState = _menuState;
- (void)setHidden:(BOOL)hidden {

26
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -19,7 +19,7 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
@end
@interface MWMNavigationDashboardManager () <MWMSearchManagerObserver, MWMRoutePreviewDelegate>
@interface MWMNavigationDashboardManager () <SearchOnMapManagerObserver, MWMRoutePreviewDelegate>
@property(copy, nonatomic) NSDictionary *etaAttributes;
@property(copy, nonatomic) NSDictionary *etaSecondaryAttributes;
@ -52,6 +52,10 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
return self;
}
- (SearchOnMapManager *)searchManager {
return [[MapViewController sharedController] searchManager];
}
- (void)loadPreviewWithStatusBoxes {
[NSBundle.mainBundle loadNibNamed:kRoutePreviewIPhoneXibName owner:self options:nil];
auto ownerView = self.ownerView;
@ -236,14 +240,20 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
- (IBAction)stopRoutingButtonAction {
[MWMSearch clear];
[MWMRouter stopRouting];
[self.searchManager close];
}
#pragma mark - MWMSearchManagerObserver
#pragma mark - SearchOnMapManagerObserver
- (void)onSearchManagerStateChanged {
auto state = [MWMSearchManager manager].state;
if (state == MWMSearchManagerStateMapSearch)
[self setMapSearch];
- (void)searchManagerWithDidChangeState:(SearchOnMapState)state {
switch (state) {
case SearchOnMapStateClosed:
[self.navigationInfoView setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
break;
case SearchOnMapStateHidden:
case SearchOnMapStateSearching:
[self setMapSearch];
}
}
#pragma mark - Available area
@ -259,9 +269,9 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
- (void)setState:(MWMNavigationDashboardState)state {
if (state == MWMNavigationDashboardStateHidden)
[MWMSearchManager removeObserver:self];
[self.searchManager removeObserver:self];
else
[MWMSearchManager addObserver:self];
[self.searchManager addObserver:self];
switch (state) {
case MWMNavigationDashboardStateHidden:
[self stateHidden];

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h
View file

@ -25,6 +25,8 @@ typedef NS_ENUM(NSUInteger, MWMNavigationInfoViewState) {
@property(weak, nonatomic) UIView * ownerView;
@property(nonatomic) CGRect availableArea;
- (void)setSearchState:(NavigationSearchState)searchState animated:(BOOL)animated;
- (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)info;
- (void)setMapSearch;

18
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
View file

@ -6,7 +6,6 @@
#import "MWMLocationObserver.h"
#import "MWMMapViewControlsCommon.h"
#import "MWMSearch.h"
#import "MWMSearchManager.h"
#import "MapViewController.h"
#import "SwiftBridge.h"
#import "UIImageView+Coloring.h"
@ -143,13 +142,16 @@ BOOL defaultOrientation(CGSize const &size) {
[toastView configWithIsStart:YES withLocationButton:NO];
}
- (SearchOnMapManager *)searchManager {
return [MapViewController sharedController].searchManager;
}
- (IBAction)openSearch {
BOOL const isStart = self.toastView.isStart;
auto searchManager = [MWMSearchManager manager];
searchManager.routingTooltipSearch =
isStart ? MWMSearchManagerRoutingTooltipSearchStart : MWMSearchManagerRoutingTooltipSearchFinish;
searchManager.state = MWMSearchManagerStateDefault;
[self.searchManager setRoutingTooltip:
isStart ? SearchOnMapRoutingTooltipSearchStart : SearchOnMapRoutingTooltipSearchFinish ];
[self.searchManager startSearchingWithIsRouting:YES];
}
- (IBAction)addLocationRoutePoint {
@ -166,12 +168,12 @@ BOOL defaultOrientation(CGSize const &size) {
- (IBAction)searchMainButtonTouchUpInside {
switch (self.searchState) {
case NavigationSearchState::Maximized:
[MWMSearchManager manager].state = MWMSearchManagerStateDefault;
[self.searchManager startSearchingWithIsRouting:YES];
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
break;
case NavigationSearchState::MinimizedNormal:
if (self.state == MWMNavigationInfoViewStatePrepare) {
[MWMSearchManager manager].state = MWMSearchManagerStateDefault;
[self.searchManager startSearchingWithIsRouting:YES];
} else {
[self setSearchState:NavigationSearchState::Maximized animated:YES];
}
@ -183,7 +185,7 @@ BOOL defaultOrientation(CGSize const &size) {
case NavigationSearchState::MinimizedFood:
case NavigationSearchState::MinimizedATM:
[MWMSearch clear];
[MWMSearchManager manager].state = MWMSearchManagerStateHidden;
[self.searchManager hide];
[self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
break;
}

4
iphone/Maps/Classes/MapViewController.h
View file

@ -6,6 +6,7 @@
@class EAGLView;
@class MWMMapDownloadDialog;
@class BookmarksCoordinator;
@class SearchOnMapManager;
@protocol MWMLocationModeListener;
@interface MapViewController : MWMViewController
@ -46,11 +47,10 @@
@property(nonatomic, readonly) MWMMapViewControlsManager * _Nonnull controlsManager;
@property(nonatomic, readonly) MWMMapDownloadDialog * _Nonnull downloadDialog;
@property(nonatomic, readonly) BookmarksCoordinator * _Nonnull bookmarksCoordinator;
@property(nonatomic, readonly) SearchOnMapManager * _Nonnull searchManager;
@property(nonatomic) MWMMyPositionMode currentPositionMode;
@property(strong, nonatomic) IBOutlet EAGLView * _Nonnull mapView;
@property(strong, nonatomic) IBOutlet UIView * _Nonnull controlsView;
@property(strong, nonatomic) IBOutlet UIView * _Nonnull searchViewContainer;
@property(strong, nonatomic) IBOutlet NSLayoutConstraint * _Nonnull searchViewContainerLeadingConstraint;
@end

117
iphone/Maps/Classes/MapViewController.mm
View file

@ -30,6 +30,9 @@
extern NSString *const kMap2FBLoginSegue = @"Map2FBLogin";
extern NSString *const kMap2GoogleLoginSegue = @"Map2GoogleLogin";
static CGFloat kPlacePageCompactWidth = 350;
static CGFloat kPlacePageLeadingOffset = IPAD ? 20 : 0;
typedef NS_ENUM(NSUInteger, UserTouchesAction) { UserTouchesActionNone, UserTouchesActionDrag, UserTouchesActionScale };
namespace {
@ -72,6 +75,7 @@ NSString *const kSettingsSegue = @"Map2Settings";
UIGestureRecognizerDelegate>
@property(nonatomic, readwrite) MWMMapViewControlsManager *controlsManager;
@property(nonatomic, readwrite) SearchOnMapManager *searchManager;
@property(nonatomic) BOOL disableStandbyOnLocationStateMode;
@ -97,7 +101,11 @@ NSString *const kSettingsSegue = @"Map2Settings";
@property(nonatomic) BOOL needDeferFocusNotification;
@property(nonatomic) BOOL deferredFocusValue;
@property(nonatomic) PlacePageViewController *placePageVC;
@property(nonatomic) IBOutlet UIView *placePageContainer;
@property(nonatomic) UIView *placePageContainer;
@property(nonatomic) NSLayoutConstraint *placePageWidthConstraint;
@property(nonatomic) NSLayoutConstraint *placePageLeadingConstraint;
@property(nonatomic) NSLayoutConstraint *placePageTrailingConstraint;
@end
@ -111,6 +119,9 @@ NSString *const kSettingsSegue = @"Map2Settings";
#pragma mark - Map Navigation
- (void)showOrUpdatePlacePage:(PlacePageData *)data {
if (self.searchManager.isSearching)
[self.searchManager setPlaceOnMapSelected:YES];
self.controlsManager.trafficButtonHidden = YES;
if (self.placePageVC != nil) {
[PlacePageBuilder update:(PlacePageViewController *)self.placePageVC with:data];
@ -120,19 +131,58 @@ NSString *const kSettingsSegue = @"Map2Settings";
}
- (void)showPlacePageFor:(PlacePageData *)data {
self.placePageVC = [PlacePageBuilder buildFor:data];
self.placePageContainer.hidden = NO;
self.placePageVC.view.translatesAutoresizingMaskIntoConstraints = NO;
self.placePageVC = [PlacePageBuilder buildFor:data];
[self.placePageContainer addSubview:self.placePageVC.view];
[self.view bringSubviewToFront:self.placePageContainer];
[NSLayoutConstraint activateConstraints:@[
[self.placePageVC.view.topAnchor constraintEqualToAnchor:self.placePageContainer.safeAreaLayoutGuide.topAnchor],
[self.placePageVC.view.leftAnchor constraintEqualToAnchor:self.placePageContainer.leftAnchor],
[self.placePageVC.view.bottomAnchor constraintEqualToAnchor:self.placePageContainer.bottomAnchor],
[self.placePageVC.view.rightAnchor constraintEqualToAnchor:self.placePageContainer.rightAnchor]
]];
[self addChildViewController:self.placePageVC];
[self.placePageVC didMoveToParentViewController:self];
self.placePageVC.view.translatesAutoresizingMaskIntoConstraints = NO;
[NSLayoutConstraint activateConstraints:@[
[self.placePageVC.view.topAnchor constraintEqualToAnchor:self.placePageContainer.topAnchor],
[self.placePageVC.view.leadingAnchor constraintEqualToAnchor:self.placePageContainer.leadingAnchor],
[self.placePageVC.view.bottomAnchor constraintEqualToAnchor:self.placePageContainer.bottomAnchor],
[self.placePageVC.view.trailingAnchor constraintEqualToAnchor:self.placePageContainer.trailingAnchor]
]];
[self updatePlacePageContainerConstraints];
}
- (void)setupPlacePageContainer {
self.placePageContainer = [[TouchTransparentView alloc] initWithFrame:self.view.bounds];
[self.view addSubview:self.placePageContainer];
[self.view bringSubviewToFront:self.placePageContainer];
self.placePageContainer.translatesAutoresizingMaskIntoConstraints = NO;
self.placePageLeadingConstraint = [self.placePageContainer.leadingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.leadingAnchor constant:kPlacePageLeadingOffset];
self.placePageLeadingConstraint.active = YES;
self.placePageWidthConstraint = [self.placePageContainer.widthAnchor constraintEqualToConstant:0];
self.placePageTrailingConstraint = [self.placePageContainer.trailingAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.trailingAnchor];
[self.placePageContainer.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor].active = YES;
if (IPAD) {
self.placePageLeadingConstraint.priority = UILayoutPriorityDefaultLow;
[self.placePageContainer.bottomAnchor constraintLessThanOrEqualToAnchor:self.view.bottomAnchor].active = YES;
}
else {
[self.placePageContainer.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor].active = YES;
}
[self updatePlacePageContainerConstraints];
}
- (void)updatePlacePageContainerConstraints {
const BOOL isLimitedWidth = IPAD || self.traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact;
[self.placePageWidthConstraint setConstant:kPlacePageCompactWidth];
if (IPAD && self.searchViewContainer != nil) {
NSLayoutConstraint * leadingToSearchConstraint = [self.placePageContainer.leadingAnchor constraintEqualToAnchor:self.searchViewContainer.trailingAnchor constant:kPlacePageLeadingOffset];
leadingToSearchConstraint.priority = UILayoutPriorityDefaultHigh;
leadingToSearchConstraint.active = isLimitedWidth;
}
[self.placePageWidthConstraint setActive:isLimitedWidth];
[self.placePageTrailingConstraint setActive:!isLimitedWidth];
[self.view layoutIfNeeded];
}
- (void)dismissPlacePage {
@ -160,16 +210,10 @@ NSString *const kSettingsSegue = @"Map2Settings";
- (void)onMapObjectDeselected {
[self hidePlacePage];
MWMSearchManager * searchManager = MWMSearchManager.manager;
BOOL const isSearchResult = searchManager.state == MWMSearchManagerStateResult;
BOOL const isSearching = self.searchManager.isSearching;
BOOL const isNavigationDashboardHidden = [MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden;
if (isSearchResult) {
if (isNavigationDashboardHidden) {
searchManager.state = MWMSearchManagerStateMapSearch;
} else {
searchManager.state = MWMSearchManagerStateHidden;
}
}
if (isSearching)
[self.searchManager setPlaceOnMapSelected:!isNavigationDashboardHidden];
// Always show the controls during the navigation or planning mode.
if (!isNavigationDashboardHidden)
self.controlsManager.hidden = NO;
@ -177,8 +221,7 @@ NSString *const kSettingsSegue = @"Map2Settings";
- (void)onSwitchFullScreen {
BOOL const isNavigationDashboardHidden = MWMNavigationDashboardManager.sharedManager.state == MWMNavigationDashboardStateHidden;
BOOL const isSearchHidden = MWMSearchManager.manager.state == MWMSearchManagerStateHidden;
if (isSearchHidden && isNavigationDashboardHidden) {
if (!self.searchManager.isSearching && isNavigationDashboardHidden) {
if (!self.controlsManager.hidden)
[self dismissPlacePage];
self.controlsManager.hidden = !self.controlsManager.hidden;
@ -215,6 +258,10 @@ NSString *const kSettingsSegue = @"Map2Settings";
if ([MWMCarPlayService shared].isCarplayActivated) {
return;
}
if (self.searchManager.isSearching && type == df::TouchEvent::TOUCH_MOVE)
[self.searchManager setMapIsDragging];
NSArray *allTouches = [[event allTouches] allObjects];
if ([allTouches count] < 1)
return;
@ -287,6 +334,12 @@ NSString *const kSettingsSegue = @"Map2Settings";
[self.controlsManager viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
}
- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
[super traitCollectionDidChange:previousTraitCollection];
if (self.traitCollection.verticalSizeClass != previousTraitCollection.verticalSizeClass)
[self updatePlacePageContainerConstraints];
}
- (void)didReceiveMemoryWarning {
GetFramework().MemoryWarning();
[super didReceiveMemoryWarning];
@ -305,8 +358,7 @@ NSString *const kSettingsSegue = @"Map2Settings";
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden &&
[MWMSearchManager manager].state == MWMSearchManagerStateHidden)
if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden)
self.controlsManager.menuState = self.controlsManager.menuRestoreState;
[self updateStatusBarStyle];
@ -319,6 +371,7 @@ NSString *const kSettingsSegue = @"Map2Settings";
- (void)viewDidLoad {
[super viewDidLoad];
[self setupPlacePageContainer];
if (@available(iOS 14.0, *))
[self setupTrackPadGestureRecognizers];
@ -441,8 +494,7 @@ NSString *const kSettingsSegue = @"Map2Settings";
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden &&
[MWMSearchManager manager].state == MWMSearchManagerStateHidden)
if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden)
self.controlsManager.menuRestoreState = self.controlsManager.menuState;
GetFramework().SetRenderingDisabled(false);
}
@ -605,15 +657,13 @@ NSString *const kSettingsSegue = @"Map2Settings";
- (void)performAction:(NSString *)action {
[self.navigationController popToRootViewControllerAnimated:NO];
if (self.isViewLoaded) {
auto searchState = MWMSearchManagerStateHidden;
[MWMRouter stopRouting];
if ([action isEqualToString:@"app.organicmaps.3daction.bookmarks"])
[self.bookmarksCoordinator open];
else if ([action isEqualToString:@"app.organicmaps.3daction.search"])
searchState = MWMSearchManagerStateDefault;
[self.searchManager startSearchingWithIsRouting:NO];
else if ([action isEqualToString:@"app.organicmaps.3daction.route"])
[self.controlsManager onRoutePrepare];
[MWMSearchManager manager].state = searchState;
} else {
dispatch_async(dispatch_get_main_queue(), ^{
[self performAction:action];
@ -674,9 +724,20 @@ NSString *const kSettingsSegue = @"Map2Settings";
return _controlsManager;
}
- (SearchOnMapManager *)searchManager {
if (!_searchManager)
_searchManager = [[SearchOnMapManager alloc] initWithNavigationController:self.navigationController];
return _searchManager;
}
- (UIView * _Nullable)searchViewContainer {
return self.searchManager.viewController.view;
}
- (BOOL)hasNavigationBar {
return NO;
}
- (MWMMapDownloadDialog *)downloadDialog {
if (!_downloadDialog)
_downloadDialog = [MWMMapDownloadDialog dialogForController:self];

11
iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift
View file

@ -11,22 +11,19 @@ class BottomTabBarInteractor {
private weak var viewController: UIViewController?
private weak var mapViewController: MapViewController?
private weak var controlsManager: MWMMapViewControlsManager?
private weak var searchManager = MWMSearchManager.manager()
private let searchManager: SearchOnMapManager
init(viewController: UIViewController, mapViewController: MapViewController, controlsManager: MWMMapViewControlsManager) {
self.viewController = viewController
self.mapViewController = mapViewController
self.controlsManager = controlsManager
self.searchManager = mapViewController.searchManager
}
}
extension BottomTabBarInteractor: BottomTabBarInteractorProtocol {
func openSearch() {
if searchManager?.state == .hidden {
searchManager?.state = .default
} else {
searchManager?.state = .hidden
}
searchManager.isSearching ? searchManager.close() : searchManager.startSearching(isRouting: false)
}
func openHelp() {

14
iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.swift
View file

@ -32,8 +32,6 @@ class BottomTabBarViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
presenter.configure()
MWMSearchManager.add(self)
}
override func viewWillAppear(_ animated: Bool) {
@ -45,10 +43,6 @@ class BottomTabBarViewController: UIViewController {
updateBadge()
}
deinit {
MWMSearchManager.remove(self)
}
static func updateAvailableArea(_ frame: CGRect) {
BottomTabBarViewController.controller?.updateAvailableArea(frame)
}
@ -119,11 +113,3 @@ private extension BottomTabBarViewController {
UserDefaults.standard.set(true, forKey: kUDDidShowFirstTimeRoutingEducationalHint)
}
}
// MARK: - MWMSearchManagerObserver
extension BottomTabBarViewController: MWMSearchManagerObserver {
func onSearchManagerStateChanged() {
let state = MWMSearchManager.manager().state;
self.searchButton.isSelected = state != .hidden
}
}

16
iphone/Maps/UI/Search/MWMSearchManager.mm
View file

@ -61,8 +61,14 @@ const CGFloat kWidthForiPad = 320;
@implementation MWMSearchManager
+ (MWMSearchManager *)manager {
return [MWMMapViewControlsManager manager].searchManager;
static MWMSearchManager * manager;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
manager = [[MWMSearchManager alloc] init];
});
return manager;
}
- (nullable instancetype)init {
self = [super init];
if (self) {
@ -243,7 +249,6 @@ const CGFloat kWidthForiPad = 320;
controlsManager.menuState = controlsManager.menuRestoreState;
}
[self viewHidden:NO];
[MWMSearch setSearchOnMap:NO];
[self.tableViewController reloadData];
if (![self.navigationController.viewControllers containsObject:self.tableViewController])
@ -265,7 +270,6 @@ const CGFloat kWidthForiPad = 320;
[self viewHidden:navigationManagerState != MWMNavigationDashboardStateHidden];
self.controlsManager.menuState = MWMBottomMenuStateHidden;
GetFramework().DeactivateMapSelection();
[MWMSearch setSearchOnMap:YES];
[self.tableViewController reloadData];
[self.searchTextField resignFirstResponder];
@ -523,10 +527,12 @@ const CGFloat kWidthForiPad = 320;
return [MapViewController sharedController];
}
- (UIView *)searchViewContainer {
return [MapViewController sharedController].searchViewContainer;
// return [MapViewController sharedController].searchViewContainer;
return nil;
}
- (NSLayoutConstraint *)searchViewContainerLeadingConstraint {
return [MapViewController sharedController].searchViewContainerLeadingConstraint;
// return [MapViewController sharedController].searchViewContainerLeadingConstraint;
return nil;
}
- (UIView *)actionBarContainer {
return [MapViewController sharedController].controlsView;

235
iphone/Maps/UI/Storyboard/Main.storyboard
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
<device id="retina6_72" orientation="landscape" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
<device id="iPad13_0rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -14,26 +14,26 @@
<objects>
<viewController id="xTf-lf-yxN" customClass="MapViewController" sceneMemberID="viewController">
<view key="view" clearsContextBeforeDrawing="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" id="USG-6L-Uhw">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ixC-IZ-Pvs" userLabel="CarPlayPlaceholderView" customClass="CarplayPlaceholderView" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aPn-pa-nCx" customClass="EAGLView">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rL1-9E-4b7">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<subviews>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65S-M4-TnM" customClass="NavigationInfoArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="814" height="409"/>
<rect key="frame" x="0.0" y="24" width="1032" height="1332"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TdT-ia-GP9">
<rect key="frame" x="59" y="0.0" width="350" height="409"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1356"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="350" id="XLL-zv-Bym"/>
@ -50,7 +50,7 @@
</variation>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aVk-ab-LFJ" customClass="TabBarArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="361" width="350" height="69"/>
<rect key="frame" x="0.0" y="1308" width="1032" height="68"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" priority="100" constant="350" id="aj4-lb-h52"/>
@ -67,26 +67,26 @@
</variation>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="814" height="409"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1356"/>
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FFY-Dy-Wou" customClass="VisibleArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="814" height="409"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1356"/>
<color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NI8-tV-i2B" customClass="WidgetsArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="814" height="409"/>
<rect key="frame" x="0.0" y="24" width="1032" height="1332"/>
<color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xJx-UU-IdV" customClass="SideButtonsArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="814" height="409"/>
<rect key="frame" x="0.0" y="24" width="1032" height="1332"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QKu-4A-UgP" customClass="TrafficButtonArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="814" height="409"/>
<rect key="frame" x="0.0" y="24" width="1032" height="1332"/>
</view>
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yto-Gu-Ugz" userLabel="Track Recording Button Area" customClass="TrackRecordingButtonArea" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="0.0" y="59" width="430" height="839"/>
<rect key="frame" x="0.0" y="24" width="1032" height="1332"/>
<color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
</view>
</subviews>
@ -98,64 +98,8 @@
<constraint firstItem="FFY-Dy-Wou" firstAttribute="top" secondItem="rL1-9E-4b7" secondAttribute="top" priority="100" id="svT-Vi-vvC"/>
</constraints>
</view>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="jio-3T-E6G" customClass="TouchTransparentView" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="350" height="430"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="350" id="Dd0-x6-7gc">
<variation key="heightClass=regular-widthClass=regular" constant="320"/>
</constraint>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="Dd0-x6-7gc"/>
</mask>
</variation>
<variation key="heightClass=compact-widthClass=compact">
<mask key="constraints">
<include reference="Dd0-x6-7gc"/>
</mask>
</variation>
<variation key="heightClass=compact-widthClass=regular">
<mask key="constraints">
<include reference="Dd0-x6-7gc"/>
</mask>
</variation>
<variation key="heightClass=regular-widthClass=regular">
<mask key="constraints">
<include reference="Dd0-x6-7gc"/>
</mask>
</variation>
</view>
<view hidden="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-Oj-jeo" customClass="TouchTransparentView" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="0.0" width="350" height="430"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="350" id="6h8-a6-LWn"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="6h8-a6-LWn"/>
</mask>
</variation>
<variation key="heightClass=compact-widthClass=compact">
<mask key="constraints">
<include reference="6h8-a6-LWn"/>
</mask>
</variation>
<variation key="heightClass=compact-widthClass=regular">
<mask key="constraints">
<include reference="6h8-a6-LWn"/>
</mask>
</variation>
<variation key="heightClass=regular-widthClass=regular">
<mask key="constraints">
<include reference="6h8-a6-LWn"/>
</mask>
</variation>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="at1-V1-pzl" customClass="TouchTransparentView" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="59" y="209" width="814" height="152"/>
<rect key="frame" x="0.0" y="722" width="440" height="152"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<gestureRecognizers/>
<constraints>
@ -171,14 +115,11 @@
<constraints>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="65S-M4-TnM" secondAttribute="bottom" priority="100" id="2E3-5i-6An"/>
<constraint firstAttribute="bottom" secondItem="rL1-9E-4b7" secondAttribute="bottom" id="4fw-Xu-gAG"/>
<constraint firstItem="rbx-Oj-jeo" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="5Sh-l6-Icd"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="QKu-4A-UgP" secondAttribute="bottom" priority="100" id="6ko-rI-S5u"/>
<constraint firstAttribute="bottom" secondItem="ixC-IZ-Pvs" secondAttribute="bottom" id="7eh-og-Mpe"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="aVk-ab-LFJ" secondAttribute="trailing" id="85b-Do-jO7"/>
<constraint firstItem="at1-V1-pzl" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="bottom" priority="250" id="8JV-dP-iYZ"/>
<constraint firstItem="TdT-ia-GP9" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="8YH-dJ-lHZ"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="rbx-Oj-jeo" secondAttribute="trailing" id="9M9-8P-Hzb"/>
<constraint firstAttribute="bottom" secondItem="rbx-Oj-jeo" secondAttribute="bottom" id="9rR-QQ-c1P"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="xJx-UU-IdV" secondAttribute="top" priority="100" id="BMq-jc-qfO"/>
<constraint firstItem="ixC-IZ-Pvs" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="DSJ-0D-hwO"/>
<constraint firstItem="rL1-9E-4b7" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="E89-WV-ZTh"/>
@ -187,8 +128,6 @@
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="at1-V1-pzl" secondAttribute="trailing" id="GKG-4Y-2Pq"/>
<constraint firstAttribute="trailing" secondItem="aPn-pa-nCx" secondAttribute="trailing" id="GKJ-zm-8xb"/>
<constraint firstItem="awj-9E-eBS" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="Hfm-gb-37H"/>
<constraint firstItem="rbx-Oj-jeo" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" id="J0B-xe-sNj"/>
<constraint firstItem="jio-3T-E6G" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="K9r-P1-yFI"/>
<constraint firstAttribute="trailing" secondItem="ixC-IZ-Pvs" secondAttribute="trailing" id="O7f-qU-UN2"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="at1-V1-pzl" secondAttribute="bottom" priority="750" constant="48" id="O8L-nd-nOa"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="FFY-Dy-Wou" secondAttribute="bottom" priority="100" id="OE7-Qb-J0v"/>
@ -196,13 +135,11 @@
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="awj-9E-eBS" secondAttribute="bottom" id="PFs-sL-oVA"/>
<constraint firstAttribute="trailing" secondItem="rL1-9E-4b7" secondAttribute="trailing" id="QdS-Yx-ADV"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="TdT-ia-GP9" secondAttribute="trailing" id="Rsb-fB-8bn"/>
<constraint firstItem="jio-3T-E6G" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" constant="-320" id="SAj-bF-qrr"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="SDX-4J-Jz5"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="FFY-Dy-Wou" secondAttribute="bottom" id="TZk-MH-pMV"/>
<constraint firstItem="yto-Gu-Ugz" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="TgS-dg-g9B"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="yto-Gu-Ugz" secondAttribute="trailing" id="URB-3l-JiC"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" priority="100" id="VfU-Zk-8IU"/>
<constraint firstItem="rbx-Oj-jeo" firstAttribute="leading" secondItem="jio-3T-E6G" secondAttribute="trailing" constant="20" id="W0l-NG-7lt"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="QKu-4A-UgP" secondAttribute="top" priority="100" id="X96-y7-5oI"/>
<constraint firstItem="aPn-pa-nCx" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" id="YFX-ma-vAf"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="FFY-Dy-Wou" secondAttribute="bottom" id="YUs-MJ-9w8"/>
@ -217,18 +154,14 @@
<constraint firstItem="xJx-UU-IdV" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="gn8-NV-oAa"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="aVk-ab-LFJ" secondAttribute="top" priority="100" constant="48" id="jQI-62-O5O"/>
<constraint firstItem="65S-M4-TnM" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="kan-ei-cIg"/>
<constraint firstAttribute="bottom" secondItem="jio-3T-E6G" secondAttribute="bottom" id="l6r-eW-Dbi"/>
<constraint firstItem="NI8-tV-i2B" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="lwX-Xm-J8A"/>
<constraint firstItem="ixC-IZ-Pvs" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" id="m7B-SH-DDh"/>
<constraint firstItem="FFY-Dy-Wou" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="pc3-CW-vyV"/>
<constraint firstItem="aPn-pa-nCx" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="pwE-hX-IML"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="TdT-ia-GP9" secondAttribute="bottom" priority="100" id="pwZ-Fm-mHR"/>
<constraint firstItem="aVk-ab-LFJ" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="qtc-CV-Hae"/>
<constraint firstAttribute="top" secondItem="jio-3T-E6G" secondAttribute="top" id="rYG-px-wH5"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="NI8-tV-i2B" secondAttribute="top" priority="100" id="sSU-QE-9zI"/>
<constraint firstAttribute="trailing" secondItem="jio-3T-E6G" secondAttribute="trailing" id="t9l-Ud-h6j"/>
<constraint firstAttribute="bottom" secondItem="aPn-pa-nCx" secondAttribute="bottom" id="tB3-eX-gUV"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="rbx-Oj-jeo" secondAttribute="bottom" constant="70" id="u9s-KY-yCt"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="veF-Rn-BEm"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="65S-M4-TnM" secondAttribute="top" priority="100" id="vfQ-ZT-Dlc"/>
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="awj-9E-eBS" secondAttribute="trailing" id="wGo-EW-X9f"/>
@ -240,10 +173,6 @@
<exclude reference="SDX-4J-Jz5"/>
<exclude reference="TZk-MH-pMV"/>
<exclude reference="veF-Rn-BEm"/>
<exclude reference="u9s-KY-yCt"/>
<exclude reference="K9r-P1-yFI"/>
<exclude reference="SAj-bF-qrr"/>
<exclude reference="W0l-NG-7lt"/>
</mask>
</variation>
<variation key="heightClass=compact">
@ -252,7 +181,6 @@
<exclude reference="Rsb-fB-8bn"/>
<include reference="TZk-MH-pMV"/>
<include reference="veF-Rn-BEm"/>
<include reference="K9r-P1-yFI"/>
</mask>
</variation>
<variation key="heightClass=regular">
@ -260,34 +188,6 @@
<include reference="SDX-4J-Jz5"/>
</mask>
</variation>
<variation key="widthClass=compact">
<mask key="constraints">
<include reference="K9r-P1-yFI"/>
</mask>
</variation>
<variation key="heightClass=compact-widthClass=compact">
<mask key="constraints">
<exclude reference="9M9-8P-Hzb"/>
<exclude reference="t9l-Ud-h6j"/>
</mask>
</variation>
<variation key="heightClass=compact-widthClass=regular">
<mask key="constraints">
<exclude reference="9M9-8P-Hzb"/>
<exclude reference="t9l-Ud-h6j"/>
</mask>
</variation>
<variation key="heightClass=regular-widthClass=regular">
<mask key="constraints">
<exclude reference="9M9-8P-Hzb"/>
<include reference="u9s-KY-yCt"/>
<exclude reference="t9l-Ud-h6j"/>
<include reference="SAj-bF-qrr"/>
<exclude reference="9rR-QQ-c1P"/>
<include reference="W0l-NG-7lt"/>
<exclude reference="5Sh-l6-Icd"/>
</mask>
</variation>
</view>
<navigationItem key="navigationItem" id="8E8-0f-UV9"/>
<connections>
@ -295,9 +195,6 @@
<outlet property="controlsView" destination="rL1-9E-4b7" id="sfV-7X-WlR"/>
<outlet property="mapView" destination="aPn-pa-nCx" id="tCi-LW-1ll"/>
<outlet property="placePageAreaKeyboard" destination="PFs-sL-oVA" id="O3P-ia-ZlX"/>
<outlet property="placePageContainer" destination="rbx-Oj-jeo" id="aFM-qm-QHB"/>
<outlet property="searchViewContainer" destination="jio-3T-E6G" id="Rjn-UE-zFx"/>
<outlet property="searchViewContainerLeadingConstraint" destination="SAj-bF-qrr" id="LJL-dW-eMM"/>
<outlet property="sideButtonsAreaBottom" destination="VfU-Zk-8IU" id="MvP-Ki-4wP"/>
<outlet property="sideButtonsAreaKeyboard" destination="SDX-4J-Jz5" id="kv9-zX-hbD"/>
<outlet property="visibleAreaBottom" destination="OE7-Qb-J0v" id="isp-aT-LtA"/>
@ -342,7 +239,7 @@
<objects>
<tableViewController storyboardIdentifier="MWMEditBookmarkController" id="lFr-lA-JTW" customClass="MWMEditBookmarkController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Rb3-ea-7LJ">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
@ -362,7 +259,7 @@
<navigationController id="Psz-BY-Fy4" customClass="MWMNavigationController" sceneMemberID="viewController">
<value key="contentSizeForViewInPopover" type="size" width="600" height="600"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="SUN-3A-xgM">
<rect key="frame" x="0.0" y="0.0" width="932" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="600" height="56"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
@ -378,7 +275,7 @@
<objects>
<tableViewController id="Lfa-Zp-orR" customClass="MWMEditorViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="HU6-ak-Eu1">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
@ -404,11 +301,11 @@
<objects>
<viewController id="Ld6-gM-2hk" customClass="MWMOpeningHoursEditorViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="U1f-hD-9rl">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="X1H-IB-Nv1">
<rect key="frame" x="0.0" y="0.0" width="932" height="365"/>
<rect key="frame" x="0.0" y="24" width="1032" height="1288"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/>
@ -419,10 +316,10 @@
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aQv-7U-zAP">
<rect key="frame" x="59" y="0.0" width="814" height="365"/>
<rect key="frame" x="0.0" y="24" width="1032" height="1288"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="PrH-u2-IEv" userLabel="Editor View" customClass="MWMTextView">
<rect key="frame" x="0.0" y="36" width="814" height="88"/>
<rect key="frame" x="0.0" y="36" width="1032" height="88"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="88" id="oAE-yX-hVe"/>
@ -439,7 +336,7 @@
</connections>
</textView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="z2Z-G2-Np7">
<rect key="frame" x="0.0" y="35" width="814" height="1"/>
<rect key="frame" x="0.0" y="35" width="1032" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="xUX-ck-MQb"/>
</constraints>
@ -448,7 +345,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="ebA-fW-ddJ">
<rect key="frame" x="0.0" y="123" width="814" height="1"/>
<rect key="frame" x="0.0" y="123" width="1032" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="HOj-tZ-b3F"/>
</constraints>
@ -457,7 +354,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="5T5-Pp-hb5">
<rect key="frame" x="0.0" y="320" width="814" height="1"/>
<rect key="frame" x="0.0" y="1243" width="1032" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ZXK-zv-uSz"/>
</constraints>
@ -466,7 +363,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="IX2-yp-0oa">
<rect key="frame" x="0.0" y="164" width="814" height="1"/>
<rect key="frame" x="0.0" y="164" width="1032" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="rD4-fE-ez2"/>
</constraints>
@ -475,13 +372,13 @@
</userDefinedRuntimeAttributes>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="85Z-MR-kUV" userLabel="Help View">
<rect key="frame" x="0.0" y="164" width="814" height="328"/>
<rect key="frame" x="0.0" y="164" width="1032" height="324"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n79-h1-Nk3" userLabel="Button">
<rect key="frame" x="0.0" y="0.0" width="814" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="44"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Example values" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="dAM-iT-fzu">
<rect key="frame" x="16.000000000000007" y="12" width="117.66666666666669" height="20"/>
<rect key="frame" x="16" y="12" width="117.5" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -491,7 +388,7 @@
</userDefinedRuntimeAttributes>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_down" translatesAutoresizingMaskIntoConstraints="NO" id="m7d-sG-5LN">
<rect key="frame" x="782" y="10" width="24" height="24"/>
<rect key="frame" x="1000" y="10" width="24" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="2aF-WV-ER2"/>
<constraint firstAttribute="width" constant="24" id="eak-KY-Xaa"/>
@ -501,7 +398,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="Suj-t5-ZWs">
<rect key="frame" x="16" y="44" width="798" height="1"/>
<rect key="frame" x="16" y="44" width="1016" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="cv8-Tg-Oin"/>
</constraints>
@ -510,7 +407,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MiP-Du-s3i">
<rect key="frame" x="0.0" y="0.0" width="814" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="44"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<action selector="toggleExample" destination="Ld6-gM-2hk" eventType="touchUpInside" id="BGK-Ap-YBq"/>
@ -537,7 +434,7 @@
</userDefinedRuntimeAttributes>
</view>
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gff-2B-vhp">
<rect key="frame" x="10" y="54" width="373" height="260"/>
<rect key="frame" x="10" y="54" width="1012" height="260"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="260" id="NdE-kI-erk"/>
@ -587,10 +484,10 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SZQ-ra-FC3" userLabel="Mode Switch">
<rect key="frame" x="0.0" y="365" width="932" height="44"/>
<rect key="frame" x="0.0" y="1312" width="1032" height="44"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fB1-w2-lJI">
<rect key="frame" x="0.0" y="0.0" width="932" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="44"/>
<inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Simple Mode"/>
<userDefinedRuntimeAttributes>
@ -601,7 +498,7 @@
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_right" translatesAutoresizingMaskIntoConstraints="NO" id="z8F-55-5rJ">
<rect key="frame" x="900" y="10" width="24" height="24"/>
<rect key="frame" x="1000" y="10" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="ypP-17-bfX"/>
<constraint firstAttribute="height" constant="24" id="zE5-1N-qvh"/>
@ -611,7 +508,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="onT-vv-01i">
<rect key="frame" x="0.0" y="-1" width="932" height="1"/>
<rect key="frame" x="0.0" y="-1" width="1032" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="UUW-c4-eNA"/>
</constraints>
@ -679,26 +576,26 @@
<objects>
<tableViewController id="ocL-kj-jxR" customClass="MWMEditorAdditionalNamesTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="tQ2-XI-QWd">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ListCellIdentifier" textLabel="JcK-nR-UGw" detailTextLabel="Cmi-x5-6Vt" style="IBUITableViewCellStyleSubtitle" id="RXe-xp-xlR" customClass="MWMTableViewCell">
<rect key="frame" x="0.0" y="50" width="932" height="44"/>
<rect key="frame" x="0.0" y="50" width="1032" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RXe-xp-xlR" id="g0x-Vt-1FI">
<rect key="frame" x="59" y="0.0" width="814" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JcK-nR-UGw">
<rect key="frame" x="20" y="6" width="31.666666666666668" height="19.333333333333332"/>
<rect key="frame" x="20" y="6" width="31.5" height="19.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Cmi-x5-6Vt">
<rect key="frame" x="20" y="25.333333333333332" width="30.333333333333332" height="13.333333333333334"/>
<rect key="frame" x="20" y="25.5" width="30.5" height="13.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -723,7 +620,7 @@
<objects>
<tableViewController id="Heu-QR-M0N" customClass="MWMStreetEditorViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="rJJ-UB-6u2">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="scrollIndicatorInsets" minX="0.0" minY="44" maxX="0.0" maxY="0.0"/>
@ -742,11 +639,11 @@
<objects>
<viewController id="QlF-CJ-cEG" customClass="MWMObjectsCategorySelectorController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="MIY-NW-Joh">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="JbV-y9-HBo">
<rect key="frame" x="0.0" y="56" width="932" height="353"/>
<rect key="frame" x="0.0" y="80" width="1032" height="1276"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/>
@ -757,7 +654,7 @@
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rI9-RR-sKP" userLabel="Status Bar Background">
<rect key="frame" x="0.0" y="-52" width="932" height="108"/>
<rect key="frame" x="0.0" y="-28" width="1032" height="108"/>
<color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
@ -768,7 +665,7 @@
</userDefinedRuntimeAttributes>
</view>
<searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="gzF-B7-8pj">
<rect key="frame" x="59" y="0.0" width="873" height="56"/>
<rect key="frame" x="0.0" y="24" width="1032" height="56"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="2uI-k6-ahr"/>
@ -813,11 +710,11 @@
<objects>
<viewController id="da4-KT-kzF" customClass="MWMCuisineEditorViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="iTG-qE-svw">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="ina-WD-kps">
<rect key="frame" x="0.0" y="56" width="932" height="353"/>
<rect key="frame" x="0.0" y="80" width="1032" height="1276"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/>
@ -828,7 +725,7 @@
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HEU-Bu-3wh" userLabel="Status Bar Background">
<rect key="frame" x="0.0" y="-52" width="932" height="108"/>
<rect key="frame" x="0.0" y="-28" width="1032" height="108"/>
<color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
@ -839,7 +736,7 @@
</userDefinedRuntimeAttributes>
</view>
<searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="z6s-26-dP6">
<rect key="frame" x="59" y="0.0" width="814" height="56"/>
<rect key="frame" x="0.0" y="24" width="1032" height="56"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="UAk-z1-2EY"/>
@ -883,11 +780,11 @@
<objects>
<viewController storyboardIdentifier="DownloadMapsViewController" id="h4a-ne-bSJ" customClass="MWMDownloadMapsViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="XQZ-0V-SyR">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="CwW-x8-G3j">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<userDefinedRuntimeAttributes>
@ -899,13 +796,13 @@
</connections>
</tableView>
<containerView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kXO-Oh-2vO" userLabel="No Maps Container View">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<connections>
<segue destination="b8o-rZ-x0k" kind="embed" identifier="MapDownloaderNoResultsEmbedViewControllerSegue" id="ish-dC-mkH"/>
</connections>
</containerView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CDj-ol-HRP">
<rect key="frame" x="0.0" y="345" width="932" height="85"/>
<rect key="frame" x="0.0" y="1292" width="1032" height="84"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/>
@ -948,20 +845,20 @@
<objects>
<viewController storyboardIdentifier="MWMNoMapsViewController" id="3el-Zi-2E4" customClass="MWMNoMapsViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="4WP-vj-Alg">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gmw-e3-n53" userLabel="Container" customClass="MWMNoMapsView">
<rect key="frame" x="258.33333333333326" y="0.0" width="415.66666666666674" height="409"/>
<rect key="frame" x="13" y="24" width="367" height="804"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dCZ-PN-2Ob" userLabel="BoundsView">
<rect key="frame" x="16" y="0.0" width="383.66666666666669" height="409"/>
<rect key="frame" x="16" y="0.0" width="335" height="804"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87G-jh-N8H" userLabel="CenteredView">
<rect key="frame" x="0.0" y="149.66666666666666" width="383.66666666666669" height="109.66666666666666"/>
<rect key="frame" x="0.0" y="347.5" width="335" height="109.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="У вас нет загруженных карт" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="abh-G0-Alr" userLabel="Title">
<rect key="frame" x="0.0" y="40" width="383.66666666666669" height="24"/>
<rect key="frame" x="0.0" y="40" width="335" height="24"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -971,7 +868,7 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaW-Ad-mYI" userLabel="Text">
<rect key="frame" x="0.0" y="76" width="383.66666666666669" height="33.666666666666657"/>
<rect key="frame" x="0.0" y="76" width="335" height="33.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -1029,7 +926,7 @@
</connections>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Moj-UK-oyl" userLabel="DownloadMaps" customClass="MWMButton">
<rect key="frame" x="346" y="325" width="240" height="44"/>
<rect key="frame" x="76.5" y="748" width="240" height="44"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="49x-bx-JJj"/>
@ -1074,11 +971,11 @@
<objects>
<viewController storyboardIdentifier="SearchNoResultsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0VQ-EO-9Sv" customClass="SearchNoResultsViewController" customModule="Organic_Maps" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="9jm-RW-DZK">
<rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="1032" height="1376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EbW-Mp-c6s">
<rect key="frame" x="0.0" y="0.0" width="932" height="409"/>
<rect key="frame" x="0.0" y="172" width="1032" height="1032"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" secondItem="EbW-Mp-c6s" secondAttribute="height" multiplier="1:1" id="tBC-sb-Q3g"/>