forked from organicmaps/organicmaps
[iOS] Add new filter and map/list UI control
https://jira.mail.ru/browse/MAPSME-14172
This commit is contained in:
Alexander Boriskov
Aleksey Belousov
parent
bec8adbb75
commit
2b1b551878
33 changed files with 461 additions and 387 deletions
|
|
@ -40,6 +40,8 @@ struct ProductInfo;
|
|||
+ (BOOL)isHotelResults;
|
||||
|
||||
+ (BOOL)hasFilter;
|
||||
+ (BOOL)hasAvailability;
|
||||
+ (int)filterCount;
|
||||
+ (MWMHotelParams *)getFilter;
|
||||
+ (void)clearFilter;
|
||||
|
||||
|
|
|
|||
|
|
@ -358,9 +358,21 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params && availab
|
|||
auto filter = [MWMSearch manager].filter;
|
||||
if (!filter)
|
||||
return NO;
|
||||
auto const hasRules = [filter rules] != nullptr;
|
||||
auto const hasBookingParams = ![filter availabilityParams].IsEmpty();
|
||||
return hasRules || hasBookingParams;
|
||||
return [filter rules] != nullptr;
|
||||
}
|
||||
|
||||
+ (BOOL)hasAvailability {
|
||||
auto filter = [MWMSearch manager].filter;
|
||||
if (!filter)
|
||||
return NO;
|
||||
return !filter.availabilityParams.IsEmpty();
|
||||
}
|
||||
+ (int)filterCount {
|
||||
auto filter = [MWMSearch manager].filter;
|
||||
if (filter && [filter rules]) {
|
||||
return [filter rulesCount];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
+ (MWMHotelParams *)getFilter
|
||||
|
|
|
|||
|
|
@ -33,43 +33,28 @@ class SearchStyleSheet: IStyleSheet {
|
|||
s.shadowOpacity = 1
|
||||
s.shadowOffset = CGSize.zero
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchFilterButtonActive") { (s) -> (Void) in
|
||||
|
||||
theme.add(styleName: "SearchActionBarView") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.linkBlue
|
||||
s.backgroundColorHighlighted = colors.linkBlueHighlighted
|
||||
s.fontColor = colors.white
|
||||
s.cornerRadius = 4
|
||||
s.font = fonts.regular17
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchFilterButtonInActive") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.clear
|
||||
s.backgroundColorHighlighted = colors.clear
|
||||
s.fontColor = colors.linkBlue
|
||||
s.cornerRadius = 4
|
||||
s.font = fonts.regular17
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchCancelButtonActive") { (s) -> (Void) in
|
||||
s.tintColor = colors.white
|
||||
s.image = "ic_clear_filters"
|
||||
s.coloring = MWMButtonColoring.white
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchCancelButtonInActive") { (s) -> (Void) in
|
||||
s.tintColor = colors.linkBlueHighlighted
|
||||
s.image = "ic_filter"
|
||||
s.coloring = MWMButtonColoring.blue
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchChangeModeView") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.pressBackground
|
||||
s.shadowRadius = 2
|
||||
s.cornerRadius = 20
|
||||
s.shadowRadius = 1
|
||||
s.shadowColor = UIColor(0, 0, 0, 0.24);
|
||||
s.shadowOffset = CGSize.zero
|
||||
s.shadowOffset = CGSize(width: 0, height: 2)
|
||||
s.shadowOpacity = 1
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchActionBarButton") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.clear
|
||||
s.fontColor = colors.whitePrimaryText
|
||||
s.font = fonts.semibold14
|
||||
s.coloring = .whiteText
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchFilterAppliedIndicator") { (s) -> (Void) in
|
||||
s.round = true
|
||||
s.clip = true
|
||||
}
|
||||
|
||||
theme.add(styleName: "SearchSearchTextField") { (s) -> (Void) in
|
||||
s.fontColor = colors.blackSecondaryText
|
||||
s.backgroundColor = colors.white
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 151 B |
Binary file not shown.
|
Before Width: | Height: | Size: 225 B |
Binary file not shown.
|
Before Width: | Height: | Size: 295 B |
|
|
@ -2,17 +2,17 @@
|
|||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_filter.png",
|
||||
"filename" : "Filter.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_filter@2x.png",
|
||||
"filename" : "Filter@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_filter@3x.png",
|
||||
"filename" : "Filter@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
|
|
|
|||
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_filter.imageset/Filter.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_filter.imageset/Filter.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 231 B |
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_filter.imageset/Filter@2x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_filter.imageset/Filter@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 299 B |
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_filter.imageset/Filter@3x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_filter.imageset/Filter@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 393 B |
Binary file not shown.
|
Before Width: | Height: | Size: 172 B |
Binary file not shown.
|
Before Width: | Height: | Size: 250 B |
Binary file not shown.
|
Before Width: | Height: | Size: 410 B |
|
|
@ -2,17 +2,17 @@
|
|||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_clear_filters.png",
|
||||
"filename" : "Manager.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_clear_filters@2x.png",
|
||||
"filename" : "Manager@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_clear_filters@3x.png",
|
||||
"filename" : "Manager@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_list.imageset/Manager.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_list.imageset/Manager.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 251 B |
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_list.imageset/Manager@2x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_list.imageset/Manager@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 378 B |
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_list.imageset/Manager@3x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_list.imageset/Manager@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 436 B |
26
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Contents.json
vendored
Normal file
26
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Map.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Map@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "Map@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Map.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Map.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 288 B |
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Map@2x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Map@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 410 B |
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Map@3x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Search/Cells/ic_search_mode_map.imageset/Map@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 643 B |
|
|
@ -549,6 +549,7 @@
|
|||
99012852244732DB00C72B10 /* BottomTabBarBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */; };
|
||||
99012853244732DB00C72B10 /* BottomTabBarInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */; };
|
||||
990128562449A82500C72B10 /* BottomTabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990128552449A82400C72B10 /* BottomTabBarView.swift */; };
|
||||
990F33B624BC915200D0F426 /* SearchActionBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990F33B524BC915200D0F426 /* SearchActionBarView.swift */; };
|
||||
9917D17D2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17C2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift */; };
|
||||
9917D17F2397B1D600A7E06E /* IPadModalPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */; };
|
||||
991CE2BF2371D349009EB02A /* PromoCampaignManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BA2371D349009EB02A /* PromoCampaignManager.swift */; };
|
||||
|
|
@ -868,7 +869,6 @@
|
|||
F6E2FE851E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC01E097B9F0083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib */; };
|
||||
F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCEE1E097B9F0083EBEC /* MWMSearchFilterViewController.mm */; };
|
||||
F6E2FED31E097BA00083EBEC /* MWMSearchHotelsFilterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF11E097B9F0083EBEC /* MWMSearchHotelsFilterViewController.mm */; };
|
||||
F6E2FED61E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF31E097B9F0083EBEC /* MWMSearchChangeModeView.mm */; };
|
||||
F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */; };
|
||||
F6E2FEDC1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF71E097B9F0083EBEC /* MWMSearchManager+Filter.mm */; };
|
||||
F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */; };
|
||||
|
|
@ -1643,6 +1643,7 @@
|
|||
9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarBuilder.swift; sourceTree = "<group>"; };
|
||||
9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarInteractor.swift; sourceTree = "<group>"; };
|
||||
990128552449A82400C72B10 /* BottomTabBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarView.swift; sourceTree = "<group>"; };
|
||||
990F33B524BC915200D0F426 /* SearchActionBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchActionBarView.swift; sourceTree = "<group>"; };
|
||||
9917D17C2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRoutesSubscriptionCampaign.swift; sourceTree = "<group>"; };
|
||||
9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPadModalPresentationController.swift; sourceTree = "<group>"; };
|
||||
991CE2BA2371D349009EB02A /* PromoCampaignManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PromoCampaignManager.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -2110,8 +2111,6 @@
|
|||
F6E2FCEF1E097B9F0083EBEC /* MWMSearchFilterViewController_Protected.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFilterViewController_Protected.h; sourceTree = "<group>"; };
|
||||
F6E2FCF01E097B9F0083EBEC /* MWMSearchHotelsFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchHotelsFilterViewController.h; sourceTree = "<group>"; };
|
||||
F6E2FCF11E097B9F0083EBEC /* MWMSearchHotelsFilterViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchHotelsFilterViewController.mm; sourceTree = "<group>"; };
|
||||
F6E2FCF21E097B9F0083EBEC /* MWMSearchChangeModeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchChangeModeView.h; sourceTree = "<group>"; };
|
||||
F6E2FCF31E097B9F0083EBEC /* MWMSearchChangeModeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchChangeModeView.mm; sourceTree = "<group>"; };
|
||||
F6E2FCF41E097B9F0083EBEC /* MWMSearchContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchContentView.h; sourceTree = "<group>"; };
|
||||
F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchContentView.m; sourceTree = "<group>"; };
|
||||
F6E2FCF61E097B9F0083EBEC /* MWMSearchManager+Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMSearchManager+Filter.h"; sourceTree = "<group>"; };
|
||||
|
|
@ -4722,8 +4721,6 @@
|
|||
isa = PBXGroup;
|
||||
children = (
|
||||
F6E2FCE51E097B9F0083EBEC /* Filters */,
|
||||
F6E2FCF21E097B9F0083EBEC /* MWMSearchChangeModeView.h */,
|
||||
F6E2FCF31E097B9F0083EBEC /* MWMSearchChangeModeView.mm */,
|
||||
F6E2FCF41E097B9F0083EBEC /* MWMSearchContentView.h */,
|
||||
F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */,
|
||||
F6E2FCF61E097B9F0083EBEC /* MWMSearchManager+Filter.h */,
|
||||
|
|
@ -4744,6 +4741,7 @@
|
|||
34B3806B1F1E46E20087D65B /* MWMSearchManagerState.h */,
|
||||
347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */,
|
||||
47A13CA824BE881000027D4F /* DatePickerViewController.swift */,
|
||||
990F33B524BC915200D0F426 /* SearchActionBarView.swift */,
|
||||
47A13CA924BE881000027D4F /* DatePickerViewController.xib */,
|
||||
);
|
||||
path = Search;
|
||||
|
|
@ -5439,6 +5437,7 @@
|
|||
4767CDA420AAF66B00BD8166 /* NSAttributedString+HTML.swift in Sources */,
|
||||
47B06DFE21B965950094CCAD /* Geo.swift in Sources */,
|
||||
6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */,
|
||||
990F33B624BC915200D0F426 /* SearchActionBarView.swift in Sources */,
|
||||
3DBD7B9F242363E500ED9FE8 /* PartnerBannerViewController.swift in Sources */,
|
||||
99514BBA23E82B450085D3A7 /* ElevationProfileViewController.swift in Sources */,
|
||||
340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */,
|
||||
|
|
@ -6014,7 +6013,6 @@
|
|||
3454D7E31E07F045004AF2AD /* UITextView+RuntimeAttributes.m in Sources */,
|
||||
F6A2184A1CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */,
|
||||
993DF10923F6BDB100AC231A /* IFonts.swift in Sources */,
|
||||
F6E2FED61E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */,
|
||||
33603C85219F0F6300B11FFE /* SharingPropertiesViewController.swift in Sources */,
|
||||
47699A0821F08E37009E6585 /* NSDate+TimeDistance.m in Sources */,
|
||||
34845DB31E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ enum class Price {
|
|||
|
||||
- (instancetype)initWithPlacePageData:(PlacePageData *)data;
|
||||
- (std::shared_ptr<search::hotels_filter::Rule>)rules;
|
||||
- (int)rulesCount;
|
||||
- (booking::filter::Params)availabilityParams;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -66,6 +66,27 @@ static int8_t kAgeOfChild = 5;
|
|||
return And(And(ratingRule, priceRule), typeRule);
|
||||
}
|
||||
|
||||
- (int)rulesCount {
|
||||
int result = 0;
|
||||
using namespace search::hotels_filter;
|
||||
using namespace place_page::rating;
|
||||
|
||||
if (self.rating != FilterRating::Any) {
|
||||
result += 1;
|
||||
}
|
||||
|
||||
for (auto const filter : self.price) {
|
||||
if (filter != Price::Any) {
|
||||
result += 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
result += self.types.size();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
unsigned makeMask(std::unordered_set<ftypes::IsHotelChecker::Type> const & items)
|
||||
{
|
||||
unsigned mask = 0;
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#import "MWMSearchTableViewController.h"
|
||||
|
||||
@interface MWMSearchChangeModeView : UIView
|
||||
|
||||
- (void)updateForState:(MWMSearchManagerState)state;
|
||||
|
||||
@end
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
#import "MWMSearchChangeModeView.h"
|
||||
#import "MWMButton.h"
|
||||
#import "UIButton+RuntimeAttributes.h"
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
@interface MWMSearchChangeModeView ()<MWMSearchObserver>
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UIButton * changeModeButton;
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UIButton * filterButton;
|
||||
@property(weak, nonatomic) IBOutlet MWMButton * cancelFilterButton;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * filterButtoniPadX;
|
||||
@property(weak, nonatomic) IBOutlet UIView * changeModeBackground;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSearchChangeModeView
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
[super awakeFromNib];
|
||||
[MWMSearch addObserver:self];
|
||||
self.changeModeButton.titleLabel.textAlignment = NSTextAlignmentNatural;
|
||||
self.filterButton.titleLabel.textAlignment = NSTextAlignmentNatural;
|
||||
self.filterButtoniPadX.priority = IPAD ? UILayoutPriorityDefaultHigh : UILayoutPriorityDefaultLow;
|
||||
}
|
||||
|
||||
- (void)updateForState:(MWMSearchManagerState)state
|
||||
{
|
||||
UIButton * changeModeButton = self.changeModeButton;
|
||||
if (IPAD)
|
||||
{
|
||||
changeModeButton.hidden = YES;
|
||||
return;
|
||||
}
|
||||
switch (state)
|
||||
{
|
||||
case MWMSearchManagerStateTableSearch:
|
||||
[self setStyleAndApply: @"PressBackground"];
|
||||
[changeModeButton setTitle:L(@"search_show_on_map") forState:UIControlStateNormal];
|
||||
break;
|
||||
case MWMSearchManagerStateMapSearch:
|
||||
[self setStyleAndApply: @"Background"];
|
||||
[changeModeButton setTitle:L(@"search_in_table") forState:UIControlStateNormal];
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)updateFilterButtons:(BOOL)isFilterResults
|
||||
{
|
||||
BOOL const hasFilter = [MWMSearch hasFilter];
|
||||
BOOL const hide = !(isFilterResults || hasFilter);
|
||||
self.filterButton.hidden = hide;
|
||||
self.cancelFilterButton.hidden = hide;
|
||||
if (hide)
|
||||
return;
|
||||
if (hasFilter)
|
||||
{
|
||||
[self.filterButton setStyleAndApply:@"SearchFilterButtonActive"];
|
||||
[self.cancelFilterButton setStyleAndApply:@"SearchCancelButtonActive"];
|
||||
[self bringSubviewToFront:self.cancelFilterButton];
|
||||
}
|
||||
else
|
||||
{
|
||||
[self.filterButton setStyleAndApply:@"SearchFilterButtonInActive"];
|
||||
[self.cancelFilterButton setStyleAndApply:@"SearchCancelButtonInActive"];
|
||||
[self sendSubviewToBack:self.cancelFilterButton];
|
||||
}
|
||||
[self sendSubviewToBack:self.changeModeBackground];
|
||||
}
|
||||
|
||||
#pragma mark - MWMSearchObserver
|
||||
|
||||
- (void)onSearchStarted { [self updateFilterButtons:[MWMSearch isHotelResults]]; }
|
||||
- (void)onSearchCompleted { [self updateFilterButtons:[MWMSearch isHotelResults]]; }
|
||||
|
||||
@end
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
@interface MWMSearchManager ()
|
||||
|
||||
@property(weak, nonatomic, readonly) UIViewController * ownerController;
|
||||
@property(weak, nonatomic) IBOutlet UIButton * actionBarViewFilterButton;
|
||||
@property(weak, nonatomic) IBOutlet UIButton * actionBarView;
|
||||
|
||||
@property(nonatomic, copy) MWMVoidBlock onFinishCallback;
|
||||
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
{
|
||||
navController.modalPresentationStyle = UIModalPresentationPopover;
|
||||
UIPopoverPresentationController * popover = navController.popoverPresentationController;
|
||||
popover.sourceView = self.actionBarViewFilterButton;
|
||||
popover.sourceRect = self.actionBarViewFilterButton.bounds;
|
||||
popover.sourceView = self.actionBarView;
|
||||
popover.sourceRect = self.actionBarView.bounds;
|
||||
popover.permittedArrowDirections = UIPopoverArrowDirectionLeft;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
#import <CoreApi/MWMCommon.h>
|
||||
|
||||
static CGFloat const kWidthForiPad = 320.0;
|
||||
static CGFloat const changeModeViewOffsetNormal = -24;
|
||||
static CGFloat const changeModeViewOffsetKeyboard = -12;
|
||||
|
||||
@interface MWMSearchManager ()
|
||||
|
||||
|
|
@ -10,7 +12,9 @@ static CGFloat const kWidthForiPad = 320.0;
|
|||
@property(nonatomic) IBOutlet UIView * actionBarView;
|
||||
@property(nonatomic) IBOutlet UIView * contentView;
|
||||
|
||||
@property(nonatomic) NSLayoutConstraint * actionBarViewBottom;
|
||||
@property(nonatomic) NSLayoutConstraint * contentViewTopHidden;
|
||||
@property(nonatomic) NSLayoutConstraint * actionBarViewBottomKeyboard;
|
||||
@property(nonatomic) NSLayoutConstraint * actionBarViewBottomNormal;
|
||||
|
||||
@property(weak, nonatomic, readonly) UIView * searchViewContainer;
|
||||
|
||||
|
|
@ -21,12 +25,12 @@ static CGFloat const kWidthForiPad = 320.0;
|
|||
- (void)layoutTopViews
|
||||
{
|
||||
UIView * searchBarView = self.searchBarView;
|
||||
UIView * actionBarView = self.actionBarView;
|
||||
UIView * changeModeView = self.actionBarView;
|
||||
UIView * contentView = self.contentView;
|
||||
UIView * parentView = self.searchViewContainer;
|
||||
|
||||
searchBarView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
actionBarView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
changeModeView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
contentView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
|
||||
NSLayoutXAxisAnchor * leadingAnchor = parentView.leadingAnchor;
|
||||
|
|
@ -41,29 +45,63 @@ static CGFloat const kWidthForiPad = 320.0;
|
|||
else
|
||||
[searchBarView.trailingAnchor constraintEqualToAnchor:trailingAnchor].active = YES;
|
||||
|
||||
NSLayoutConstraint * actionBarViewTop =
|
||||
[actionBarView.topAnchor constraintEqualToAnchor:searchBarView.bottomAnchor];
|
||||
actionBarViewTop.priority = UILayoutPriorityDefaultLow + 10;
|
||||
actionBarViewTop.active = YES;
|
||||
[changeModeView.centerXAnchor constraintEqualToAnchor:parentView.centerXAnchor].active = YES;
|
||||
self.actionBarViewBottomNormal = [changeModeView.bottomAnchor constraintEqualToAnchor:bottomAnchor constant:changeModeViewOffsetNormal];
|
||||
self.actionBarViewBottomNormal.priority = UILayoutPriorityDefaultLow + 10;
|
||||
self.actionBarViewBottomNormal.active = YES;
|
||||
|
||||
[actionBarView.leadingAnchor constraintEqualToAnchor:searchBarView.leadingAnchor].active = YES;
|
||||
[actionBarView.trailingAnchor constraintEqualToAnchor:searchBarView.trailingAnchor].active = YES;
|
||||
self.actionBarViewBottom = [actionBarView.bottomAnchor constraintEqualToAnchor:bottomAnchor];
|
||||
self.actionBarViewBottom.priority = UILayoutPriorityDefaultLow;
|
||||
self.actionBarViewBottom.active = YES;
|
||||
self.actionBarViewBottomKeyboard = [changeModeView.bottomAnchor constraintEqualToAnchor:parentView.bottomAnchor constant:changeModeViewOffsetKeyboard];
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultLow;
|
||||
self.actionBarViewBottomKeyboard.active = YES;
|
||||
|
||||
NSLayoutConstraint * contentViewTop =
|
||||
[contentView.topAnchor constraintEqualToAnchor:actionBarView.bottomAnchor];
|
||||
contentViewTop.priority = UILayoutPriorityDefaultLow;
|
||||
[contentView.topAnchor constraintEqualToAnchor:searchBarView.bottomAnchor];
|
||||
contentViewTop.priority = UILayoutPriorityDefaultLow+10;
|
||||
contentViewTop.active = YES;
|
||||
|
||||
NSLayoutConstraint * contentViewBottom =
|
||||
[contentView.bottomAnchor constraintEqualToAnchor:bottomAnchor];
|
||||
[contentView.bottomAnchor constraintEqualToAnchor:parentView.bottomAnchor];
|
||||
contentViewBottom.priority = UILayoutPriorityDefaultLow + 10;
|
||||
contentViewBottom.active = YES;
|
||||
|
||||
self.contentViewTopHidden = [contentView.topAnchor constraintEqualToAnchor:parentView.bottomAnchor];
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultLow;
|
||||
self.contentViewTopHidden.active = YES;
|
||||
|
||||
[contentView.leadingAnchor constraintEqualToAnchor:searchBarView.leadingAnchor].active = YES;
|
||||
[contentView.trailingAnchor constraintEqualToAnchor:searchBarView.trailingAnchor].active = YES;
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
|
||||
}
|
||||
|
||||
#pragma mark - keyboard movements
|
||||
- (void)keyboardWillShow:(NSNotification *)notification
|
||||
{
|
||||
CGSize keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue].size;
|
||||
CGFloat offset = IPAD ? changeModeViewOffsetNormal : changeModeViewOffsetKeyboard;
|
||||
if (self.actionBarView.isHidden) {
|
||||
self.actionBarViewBottomKeyboard.constant = -keyboardSize.height+offset;
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultHigh;
|
||||
} else {
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration animations:^{
|
||||
self.actionBarViewBottomKeyboard.constant = -keyboardSize.height+offset;
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultHigh;
|
||||
[self.actionBarView.superview layoutIfNeeded];
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
-(void)keyboardWillHide:(NSNotification *)notification
|
||||
{
|
||||
if (self.actionBarView.isHidden) {
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultLow;
|
||||
} else {
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration animations:^{
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultLow;
|
||||
[self.actionBarView.superview layoutIfNeeded];
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#import "MWMNoMapsViewController.h"
|
||||
#import "MWMRoutePoint+CPP.h"
|
||||
#import "MWMRouter.h"
|
||||
#import "MWMSearchChangeModeView.h"
|
||||
#import "MWMSearchTableViewController.h"
|
||||
#import "MWMSearchManager+Filter.h"
|
||||
#import "MWMSearchManager+Layout.h"
|
||||
#import "MapViewController.h"
|
||||
|
|
@ -38,23 +38,16 @@ using Observers = NSHashTable<Observer>;
|
|||
@property(weak, nonatomic, readonly) UIViewController *ownerController;
|
||||
@property(weak, nonatomic, readonly) UIView *searchViewContainer;
|
||||
@property(weak, nonatomic, readonly) UIView *actionBarContainer;
|
||||
@property(weak, nonatomic, readonly) MWMMapViewControlsManager *controlsManager;
|
||||
|
||||
@property(nonatomic) IBOutlet SearchBar *searchBarView;
|
||||
|
||||
@property(nonatomic) IBOutlet UIView *actionBarView;
|
||||
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *actionBarViewHeight;
|
||||
@property(nonatomic) MWMSearchManagerActionBarState actionBarState;
|
||||
@property(weak, nonatomic) IBOutlet UIButton *actionBarViewFilterButton;
|
||||
@property(nonatomic) IBOutlet UIView *tabBarView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *tabBarViewHeight;
|
||||
@property(nonatomic) IBOutlet MWMSearchChangeModeView *changeModeView;
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint *changeModeViewHeight;
|
||||
@property(weak, nonatomic) IBOutlet UIButton *filterButton;
|
||||
|
||||
@property(weak, nonatomic) IBOutlet SearchActionBarView* actionBarView;
|
||||
@property(nonatomic) IBOutlet UIView *contentView;
|
||||
@property (strong, nonatomic) IBOutlet UIView *tableViewContainer;
|
||||
|
||||
@property(nonatomic) NSLayoutConstraint *actionBarViewBottom;
|
||||
@property(nonatomic) NSLayoutConstraint * contentViewTopHidden;
|
||||
@property(nonatomic) NSLayoutConstraint * actionBarViewBottomKeyboard;
|
||||
@property(nonatomic) NSLayoutConstraint * actionBarViewBottomNormal;
|
||||
|
||||
@property(nonatomic) UINavigationController *navigationController;
|
||||
@property(nonatomic) MWMSearchTableViewController *tableViewController;
|
||||
|
|
@ -227,17 +220,22 @@ using Observers = NSHashTable<Observer>;
|
|||
self.routingTooltipSearch = MWMSearchManagerRoutingTooltipSearchNone;
|
||||
[self endSearch];
|
||||
|
||||
MWMMapViewControlsManager* controlsManager = self.controlsManager;
|
||||
controlsManager.menuState = controlsManager.menuRestoreState;
|
||||
[self viewHidden:YES];
|
||||
}
|
||||
|
||||
- (void)changeToDefaultState {
|
||||
MWMMapViewControlsManager* controlsManager = self.controlsManager;
|
||||
|
||||
[self.navigationController popToRootViewControllerAnimated:NO];
|
||||
|
||||
self.searchBarView.state = SearchBarStateReady;
|
||||
GetFramework().DeactivateMapSelection(true);
|
||||
[self animateConstraints:^{
|
||||
self.actionBarViewBottom.priority = UILayoutPriorityDefaultLow;
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultLow;
|
||||
}];
|
||||
controlsManager.menuState = controlsManager.menuRestoreState;
|
||||
[self viewHidden:NO];
|
||||
self.searchBarView.isBookingSearchViewHidden = ![MWMSearch isHotelResults];
|
||||
self.actionBarState = MWMSearchManagerActionBarStateHidden;
|
||||
|
|
@ -246,11 +244,14 @@ using Observers = NSHashTable<Observer>;
|
|||
}
|
||||
|
||||
- (void)changeToTableSearchState {
|
||||
MWMMapViewControlsManager* controlsManager = self.controlsManager;
|
||||
|
||||
[self.navigationController popToRootViewControllerAnimated:NO];
|
||||
|
||||
self.searchBarView.state = SearchBarStateReady;
|
||||
GetFramework().DeactivateMapSelection(true);
|
||||
[self updateTableSearchActionBar];
|
||||
controlsManager.menuState = controlsManager.menuRestoreState;
|
||||
[self viewHidden:NO];
|
||||
[MWMSearch setSearchOnMap:NO];
|
||||
[self.tableViewController reloadData];
|
||||
|
|
@ -266,11 +267,12 @@ using Observers = NSHashTable<Observer>;
|
|||
self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
|
||||
if (!IPAD) {
|
||||
[self animateConstraints:^{
|
||||
self.actionBarViewBottom.priority = UILayoutPriorityDefaultHigh;
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultHigh;
|
||||
}];
|
||||
}
|
||||
auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
|
||||
[self viewHidden:navigationManagerState != MWMNavigationDashboardStateHidden];
|
||||
self.controlsManager.menuState = MWMBottomMenuStateHidden;
|
||||
[MWMSearch setSearchOnMap:YES];
|
||||
[self.tableViewController reloadData];
|
||||
|
||||
|
|
@ -289,7 +291,7 @@ using Observers = NSHashTable<Observer>;
|
|||
self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
|
||||
if (!IPAD) {
|
||||
[self animateConstraints:^{
|
||||
self.actionBarViewBottom.priority = UILayoutPriorityDefaultHigh;
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultHigh;
|
||||
}];
|
||||
}
|
||||
auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
|
||||
|
|
@ -321,19 +323,24 @@ using Observers = NSHashTable<Observer>;
|
|||
} else {
|
||||
self.searchBarView.state = SearchBarStateReady;
|
||||
}
|
||||
|
||||
self.searchBarView.isBookingSearchViewHidden = !([MWMSearch isHotelResults] || [MWMSearch hasAvailability]);
|
||||
[self.actionBarView updateFilterButtonWithShowFilter:[MWMSearch isHotelResults] || [MWMSearch hasFilter]
|
||||
filterCount:[MWMSearch filterCount]];
|
||||
if (self.state != MWMSearchManagerStateTableSearch)
|
||||
return;
|
||||
[self.tableViewController onSearchCompleted];
|
||||
[self updateTableSearchActionBar];
|
||||
self.searchBarView.isBookingSearchViewHidden = ![MWMSearch isHotelResults];
|
||||
}
|
||||
|
||||
- (void)onSearchStarted {
|
||||
self.searchBarView.state = SearchBarStateSearching;
|
||||
self.searchBarView.isBookingSearchViewHidden = !([MWMSearch isHotelResults] || [MWMSearch hasAvailability]);
|
||||
[self.actionBarView updateFilterButtonWithShowFilter:[MWMSearch isHotelResults] || [MWMSearch hasFilter]
|
||||
filterCount:[MWMSearch filterCount]];
|
||||
if (self.state != MWMSearchManagerStateTableSearch)
|
||||
return;
|
||||
self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
|
||||
self.searchBarView.isBookingSearchViewHidden = ![MWMSearch isHotelResults];
|
||||
}
|
||||
|
||||
- (void)onSearchResultsUpdated {
|
||||
|
|
@ -354,7 +361,7 @@ using Observers = NSHashTable<Observer>;
|
|||
self.actionBarState =
|
||||
hideActionBar ? MWMSearchManagerActionBarStateHidden : MWMSearchManagerActionBarStateModeFilter;
|
||||
|
||||
self.actionBarViewBottom.priority = UILayoutPriorityDefaultLow;
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultLow;
|
||||
}];
|
||||
}
|
||||
|
||||
|
|
@ -482,7 +489,7 @@ didSelectStartDate:(NSDate *)startDate
|
|||
break;
|
||||
}
|
||||
[self onSearchManagerStateChanged];
|
||||
[self.changeModeView updateForState:state];
|
||||
[self.actionBarView updateForState:state];
|
||||
[[MapViewController sharedController] updateStatusBarStyle];
|
||||
}
|
||||
|
||||
|
|
@ -491,18 +498,17 @@ didSelectStartDate:(NSDate *)startDate
|
|||
UIView *actionBarView = self.actionBarView;
|
||||
UIView *contentView = self.contentView;
|
||||
UIView *parentView = self.searchViewContainer;
|
||||
UIView *actionBarContaner = self.actionBarContainer;
|
||||
|
||||
if (!hidden) {
|
||||
if (searchBarView.superview) {
|
||||
[parentView bringSubviewToFront:searchBarView];
|
||||
[actionBarContaner bringSubviewToFront:actionBarView];
|
||||
[parentView bringSubviewToFront:contentView];
|
||||
[parentView bringSubviewToFront:actionBarView];
|
||||
return;
|
||||
}
|
||||
[parentView addSubview:searchBarView];
|
||||
[actionBarContaner addSubview:actionBarView];
|
||||
[parentView addSubview:contentView];
|
||||
[parentView addSubview:actionBarView];
|
||||
[self layoutTopViews];
|
||||
}
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
|
|
@ -521,34 +527,16 @@ didSelectStartDate:(NSDate *)startDate
|
|||
}];
|
||||
}
|
||||
|
||||
- (void)setChangeModeView:(MWMSearchChangeModeView *)changeModeView {
|
||||
_changeModeView = changeModeView;
|
||||
[changeModeView updateForState:self.state];
|
||||
}
|
||||
|
||||
- (void)setActionBarState:(MWMSearchManagerActionBarState)actionBarState {
|
||||
_actionBarState = actionBarState;
|
||||
switch (actionBarState) {
|
||||
case MWMSearchManagerActionBarStateHidden:
|
||||
self.tabBarView.hidden = YES;
|
||||
self.changeModeView.hidden = YES;
|
||||
self.actionBarViewHeight.priority = UILayoutPriorityDefaultHigh;
|
||||
self.tabBarViewHeight.priority = UILayoutPriorityDefaultLow;
|
||||
self.changeModeViewHeight.priority = UILayoutPriorityDefaultLow;
|
||||
self.actionBarView.hidden = YES;
|
||||
break;
|
||||
case MWMSearchManagerActionBarStateTabBar:
|
||||
self.tabBarView.hidden = NO;
|
||||
self.changeModeView.hidden = YES;
|
||||
self.actionBarViewHeight.priority = UILayoutPriorityDefaultLow;
|
||||
self.tabBarViewHeight.priority = UILayoutPriorityDefaultHigh;
|
||||
self.changeModeViewHeight.priority = UILayoutPriorityDefaultLow;
|
||||
self.actionBarView.hidden = YES;
|
||||
break;
|
||||
case MWMSearchManagerActionBarStateModeFilter:
|
||||
self.tabBarView.hidden = YES;
|
||||
self.changeModeView.hidden = NO;
|
||||
self.actionBarViewHeight.priority = UILayoutPriorityDefaultLow;
|
||||
self.tabBarViewHeight.priority = UILayoutPriorityDefaultLow;
|
||||
self.changeModeViewHeight.priority = UILayoutPriorityDefaultHigh;
|
||||
self.actionBarView.hidden = NO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -562,4 +550,8 @@ didSelectStartDate:(NSDate *)startDate
|
|||
- (UIView *)actionBarContainer {
|
||||
return [MapViewController sharedController].controlsView;
|
||||
}
|
||||
|
||||
-(MWMMapViewControlsManager *)controlsManager {
|
||||
return [MWMMapViewControlsManager manager];
|
||||
}
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,26 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMSearchManager">
|
||||
<connections>
|
||||
<outlet property="actionBarView" destination="j3Y-13-kVB" id="bK1-Q3-bqK"/>
|
||||
<outlet property="actionBarViewFilterButton" destination="hzG-6h-WLq" id="Fty-3F-vdv"/>
|
||||
<outlet property="actionBarViewHeight" destination="d2f-Ky-6ce" id="c7u-nA-Gyt"/>
|
||||
<outlet property="changeModeView" destination="Ysx-Oh-UYF" id="FpT-aA-52q"/>
|
||||
<outlet property="changeModeViewHeight" destination="RoV-rx-XeQ" id="CwN-02-N5r"/>
|
||||
<outlet property="actionBarView" destination="d2A-Id-T62" id="UKk-U2-Mwl"/>
|
||||
<outlet property="contentView" destination="u9y-bx-NGd" id="A03-AI-DbY"/>
|
||||
<outlet property="filterButton" destination="hzG-6h-WLq" id="GuU-HC-7iC"/>
|
||||
<outlet property="searchBarView" destination="g9f-m8-RFv" id="opS-Ll-3Fn"/>
|
||||
<outlet property="tabBarView" destination="Smx-UL-Mcd" id="yDV-Kv-Lui"/>
|
||||
<outlet property="tabBarViewHeight" destination="JxX-35-uQe" id="O94-IB-u3E"/>
|
||||
<outletCollection property="topViews" destination="j3Y-13-kVB" id="s8E-zl-SfH"/>
|
||||
<outlet property="searchTextField" destination="ySb-oA-ZeW" id="Awu-Z4-EdK"/>
|
||||
<outlet property="tableViewContainer" destination="QQn-4W-Y0s" id="5hb-b3-y8Q"/>
|
||||
<outletCollection property="topViews" destination="u9y-bx-NGd" id="mAw-CD-QQV"/>
|
||||
<outletCollection property="topViews" destination="d2A-Id-T62" id="Q0C-Eb-VyX"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g9f-m8-RFv" customClass="SearchBar" customModule="maps_me" customModuleProvider="target">
|
||||
|
|
@ -260,6 +254,7 @@
|
|||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<viewLayoutGuide key="safeArea" id="VX9-29-j2Z"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBar"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
|
|
@ -276,142 +271,145 @@
|
|||
<point key="canvasLocation" x="225.59999999999999" y="-211.39430284857573"/>
|
||||
</view>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j3Y-13-kVB" userLabel="ActionBar" customClass="SolidTouchView" propertyAccessControl="none">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
|
||||
<view contentMode="scaleToFill" id="d2A-Id-T62" customClass="SearchActionBarView" customModule="maps_me" customModuleProvider="target" propertyAccessControl="none">
|
||||
<rect key="frame" x="0.0" y="0.0" width="361" height="36"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Smx-UL-Mcd" userLabel="TabBar">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2gF-Kc-0a7">
|
||||
<rect key="frame" x="0.0" y="0.0" width="361" height="36"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gPn-bf-cPr" customClass="SolidTouchView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="164"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" priority="750" constant="64" id="JxX-35-uQe">
|
||||
<variation key="heightClass=compact" constant="44"/>
|
||||
</constraint>
|
||||
<constraint firstItem="gPn-bf-cPr" firstAttribute="top" secondItem="Smx-UL-Mcd" secondAttribute="top" id="UER-Ty-xhx"/>
|
||||
<constraint firstItem="gPn-bf-cPr" firstAttribute="leading" secondItem="Smx-UL-Mcd" secondAttribute="leading" id="b86-tJ-SqB">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="trailing" secondItem="gPn-bf-cPr" secondAttribute="trailing" id="pkz-a1-2QA">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="bottom" secondItem="gPn-bf-cPr" secondAttribute="bottom" constant="-100" id="y3i-4D-GKo">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view hidden="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="400" translatesAutoresizingMaskIntoConstraints="NO" id="Ysx-Oh-UYF" customClass="MWMSearchChangeModeView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KRD-Q7-fQP" customClass="SolidTouchView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="148"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchChangeModeView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="240" verticalCompressionResistancePriority="400" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JhV-gM-MgM">
|
||||
<rect key="frame" x="0.0" y="0.0" width="207" height="48"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="viewOnMapButton"/>
|
||||
<inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<state key="normal" title="Search on map"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:linkBlueText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_show_on_map"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="changeMode" destination="-1" eventType="touchUpInside" id="nbm-wH-tyA"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hzG-6h-WLq" customClass="MWMStartButton">
|
||||
<rect key="frame" x="215" y="6" width="99" height="36"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="36" id="2Ex-Nf-Iig"/>
|
||||
</constraints>
|
||||
<inset key="contentEdgeInsets" minX="42" minY="0.0" maxX="16" maxY="0.0"/>
|
||||
<state key="normal" title="Filter">
|
||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<button clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lYs-dz-sgz" customClass="MWMButton">
|
||||
<rect key="frame" x="0.0" y="0.0" width="104" height="36"/>
|
||||
<inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
|
||||
<state key="normal" title="Filter" image="ic_filter"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarButton"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="booking_filters"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="updateTap" destination="-1" eventType="touchUpInside" id="HXM-IS-ykz"/>
|
||||
<action selector="updateTap" destination="-1" eventType="touchUpInside" id="jMg-em-DE8"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vUE-KN-mbf" customClass="MWMButton">
|
||||
<rect key="frame" x="215" y="6" width="36" height="36"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oZt-RA-fCr">
|
||||
<rect key="frame" x="104" y="0.0" width="81" height="36"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6hB-eY-IVM">
|
||||
<rect key="frame" x="10" y="8" width="20" height="20"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bvF-ys-O9K">
|
||||
<rect key="frame" x="5" y="0.0" width="10.5" height="20.5"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold12:linkBlueText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstItem="bvF-ys-O9K" firstAttribute="centerY" secondItem="6hB-eY-IVM" secondAttribute="centerY" id="bwe-TN-blG"/>
|
||||
<constraint firstAttribute="width" constant="20" id="dmL-gU-dqY"/>
|
||||
<constraint firstItem="bvF-ys-O9K" firstAttribute="centerX" secondItem="6hB-eY-IVM" secondAttribute="centerX" id="neV-JQ-VXg"/>
|
||||
<constraint firstAttribute="height" constant="20" id="vK0-Ke-boE"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchFilterAppliedIndicator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZcU-oK-0nT" customClass="MWMButton">
|
||||
<rect key="frame" x="36" y="0.0" width="35" height="36"/>
|
||||
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" title="Filter">
|
||||
<color key="titleColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarButton"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="booking_filters"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="updateTap" destination="-1" eventType="touchUpInside" id="qlT-UA-pMa"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="vUE-KN-mbf" secondAttribute="height" multiplier="1:1" id="UHQ-XS-Sxz"/>
|
||||
<constraint firstItem="6hB-eY-IVM" firstAttribute="centerY" secondItem="oZt-RA-fCr" secondAttribute="centerY" id="27S-JQ-QBT"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ZcU-oK-0nT" secondAttribute="bottom" id="B6s-2d-Gu2"/>
|
||||
<constraint firstItem="ZcU-oK-0nT" firstAttribute="leading" secondItem="6hB-eY-IVM" secondAttribute="trailing" constant="6" id="a6M-Td-WAd"/>
|
||||
<constraint firstItem="6hB-eY-IVM" firstAttribute="leading" secondItem="oZt-RA-fCr" secondAttribute="leading" constant="10" id="dOM-od-paG"/>
|
||||
<constraint firstAttribute="trailing" secondItem="ZcU-oK-0nT" secondAttribute="trailing" constant="10" id="nLC-1a-Yvb"/>
|
||||
<constraint firstItem="ZcU-oK-0nT" firstAttribute="top" secondItem="oZt-RA-fCr" secondAttribute="top" id="yid-B0-6VB"/>
|
||||
</constraints>
|
||||
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<state key="normal" image="ic_clear_filters"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AFm-9N-yUF">
|
||||
<rect key="frame" x="185" y="0.0" width="1" height="36"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="1" id="5vR-im-QtG"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a8x-P8-Y8p" customClass="MWMButton">
|
||||
<rect key="frame" x="186" y="0.0" width="90" height="36"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="viewOnMapButton"/>
|
||||
<inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
|
||||
<state key="normal" title="Map" image="ic_search_mode_map"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarButton"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_show_on_map"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="clearFilter" destination="-1" eventType="touchUpInside" id="7mj-0w-Qch"/>
|
||||
<action selector="changeMode" destination="-1" eventType="touchUpInside" id="uAW-Mp-BVp"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enq-yv-2XZ" customClass="MWMButton">
|
||||
<rect key="frame" x="276" y="0.0" width="85" height="36"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="viewOnMapButton"/>
|
||||
<inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
|
||||
<state key="normal" title="List" image="ic_search_mode_list"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarButton"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_in_table"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="changeMode" destination="-1" eventType="touchUpInside" id="yqV-vF-c3I"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="hzG-6h-WLq" firstAttribute="centerY" secondItem="Ysx-Oh-UYF" secondAttribute="centerY" id="1N7-rG-2fp"/>
|
||||
<constraint firstItem="vUE-KN-mbf" firstAttribute="leading" secondItem="hzG-6h-WLq" secondAttribute="leading" id="5Wx-qc-fqQ"/>
|
||||
<constraint firstItem="JhV-gM-MgM" firstAttribute="height" secondItem="Ysx-Oh-UYF" secondAttribute="height" id="Bfm-GU-HJ9"/>
|
||||
<constraint firstAttribute="height" priority="250" constant="48" id="RoV-rx-XeQ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="hzG-6h-WLq" secondAttribute="trailing" priority="500" constant="6" id="VY6-c5-vkY"/>
|
||||
<constraint firstItem="KRD-Q7-fQP" firstAttribute="top" secondItem="Ysx-Oh-UYF" secondAttribute="top" id="eAA-LM-Mrl"/>
|
||||
<constraint firstItem="vUE-KN-mbf" firstAttribute="top" secondItem="hzG-6h-WLq" secondAttribute="top" id="fK9-QU-t1N"/>
|
||||
<constraint firstItem="hzG-6h-WLq" firstAttribute="centerX" secondItem="Ysx-Oh-UYF" secondAttribute="centerX" priority="250" id="ff5-qG-Ys6"/>
|
||||
<constraint firstItem="vUE-KN-mbf" firstAttribute="bottom" secondItem="hzG-6h-WLq" secondAttribute="bottom" id="hsI-F8-c35"/>
|
||||
<constraint firstItem="hzG-6h-WLq" firstAttribute="leading" secondItem="JhV-gM-MgM" secondAttribute="trailing" priority="500" constant="8" id="iMA-u6-5S9"/>
|
||||
<constraint firstItem="JhV-gM-MgM" firstAttribute="leading" secondItem="Ysx-Oh-UYF" secondAttribute="leading" id="iwa-86-Rhh"/>
|
||||
<constraint firstAttribute="trailing" secondItem="KRD-Q7-fQP" secondAttribute="trailing" id="oJj-4y-uvN">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="bottom" secondItem="KRD-Q7-fQP" secondAttribute="bottom" constant="-100" id="pJU-Qh-4tn">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstItem="KRD-Q7-fQP" firstAttribute="leading" secondItem="Ysx-Oh-UYF" secondAttribute="leading" id="sMT-St-iws">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstItem="JhV-gM-MgM" firstAttribute="top" secondItem="Ysx-Oh-UYF" secondAttribute="top" id="y3t-5r-CMa"/>
|
||||
<constraint firstAttribute="bottom" secondItem="oZt-RA-fCr" secondAttribute="bottom" id="ehp-eb-Q4U"/>
|
||||
<constraint firstItem="oZt-RA-fCr" firstAttribute="top" secondItem="2gF-Kc-0a7" secondAttribute="top" id="jL3-vZ-Bhb"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchChangeModeView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="cancelFilterButton" destination="vUE-KN-mbf" id="dwF-9p-lgq"/>
|
||||
<outlet property="changeModeBackground" destination="KRD-Q7-fQP" id="Z1C-MK-IWT"/>
|
||||
<outlet property="changeModeButton" destination="JhV-gM-MgM" id="LFr-bo-q9U"/>
|
||||
<outlet property="filterButton" destination="hzG-6h-WLq" id="sHx-Ku-nSw"/>
|
||||
<outlet property="filterButtoniPadX" destination="ff5-qG-Ys6" id="Qan-eT-VF9"/>
|
||||
</connections>
|
||||
</view>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="Smx-UL-Mcd" secondAttribute="bottom" priority="400" id="45d-2I-giP"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Smx-UL-Mcd" secondAttribute="trailing" id="8o3-5l-8dh"/>
|
||||
<constraint firstItem="Smx-UL-Mcd" firstAttribute="top" secondItem="j3Y-13-kVB" secondAttribute="top" id="MUE-ck-4aX"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Ysx-Oh-UYF" secondAttribute="bottom" priority="400" id="aBS-8P-zF4"/>
|
||||
<constraint firstAttribute="height" priority="250" id="d2f-Ky-6ce"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Ysx-Oh-UYF" secondAttribute="trailing" id="dJU-g3-WqH"/>
|
||||
<constraint firstItem="Ysx-Oh-UYF" firstAttribute="leading" secondItem="j3Y-13-kVB" secondAttribute="leading" id="rHd-Vw-BK1"/>
|
||||
<constraint firstItem="Ysx-Oh-UYF" firstAttribute="top" secondItem="j3Y-13-kVB" secondAttribute="top" id="vZg-em-Rn2"/>
|
||||
<constraint firstItem="Smx-UL-Mcd" firstAttribute="leading" secondItem="j3Y-13-kVB" secondAttribute="leading" id="xn7-7r-8VD"/>
|
||||
<constraint firstAttribute="trailing" secondItem="2gF-Kc-0a7" secondAttribute="trailing" id="Fdx-hX-coi"/>
|
||||
<constraint firstItem="2gF-Kc-0a7" firstAttribute="top" secondItem="d2A-Id-T62" secondAttribute="top" id="Y62-Rf-LAh"/>
|
||||
<constraint firstAttribute="height" constant="36" id="eLk-al-10m"/>
|
||||
<constraint firstItem="2gF-Kc-0a7" firstAttribute="leading" secondItem="d2A-Id-T62" secondAttribute="leading" id="itE-d4-hzw"/>
|
||||
<constraint firstAttribute="bottom" secondItem="2gF-Kc-0a7" secondAttribute="bottom" id="s4H-Jq-xk9"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<point key="canvasLocation" x="236" y="-58"/>
|
||||
<viewLayoutGuide key="safeArea" id="Bgt-hj-RpB"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="changeFilterButton" destination="ZcU-oK-0nT" id="wWs-QV-3pQ"/>
|
||||
<outlet property="changeFilterView" destination="oZt-RA-fCr" id="zsu-91-1ic"/>
|
||||
<outlet property="filterAppliedLabel" destination="bvF-ys-O9K" id="eUo-Kt-7rq"/>
|
||||
<outlet property="filterButton" destination="lYs-dz-sgz" id="HQh-f9-gne"/>
|
||||
<outlet property="filterDivider" destination="AFm-9N-yUF" id="11q-IG-dQh"/>
|
||||
<outlet property="listButton" destination="Enq-yv-2XZ" id="DUY-wh-ohq"/>
|
||||
<outlet property="mapButton" destination="a8x-P8-Y8p" id="Rtu-DA-x6c"/>
|
||||
<outlet property="stackView" destination="2gF-Kc-0a7" id="08D-2t-Cpt"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="193" y="-58"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" id="u9y-bx-NGd" userLabel="Content" customClass="MWMSearchContentView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
|
||||
|
|
@ -424,22 +422,31 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QQn-4W-Y0s">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="jHn-5d-yXG" firstAttribute="leading" secondItem="u9y-bx-NGd" secondAttribute="leading" id="1Qk-kN-iT5">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstItem="wvK-7O-o3d" firstAttribute="bottom" secondItem="QQn-4W-Y0s" secondAttribute="bottom" id="5UL-RM-PTF"/>
|
||||
<constraint firstItem="jHn-5d-yXG" firstAttribute="top" secondItem="u9y-bx-NGd" secondAttribute="top" id="Bgm-2G-pSD"/>
|
||||
<constraint firstItem="QQn-4W-Y0s" firstAttribute="leading" secondItem="u9y-bx-NGd" secondAttribute="leading" id="CFW-pd-Qj7"/>
|
||||
<constraint firstItem="QQn-4W-Y0s" firstAttribute="top" secondItem="u9y-bx-NGd" secondAttribute="top" id="T8W-hj-ces"/>
|
||||
<constraint firstAttribute="trailing" secondItem="jHn-5d-yXG" secondAttribute="trailing" id="aKt-MM-Csi">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="bottom" secondItem="jHn-5d-yXG" secondAttribute="bottom" id="hm3-xK-oys">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="trailing" secondItem="QQn-4W-Y0s" secondAttribute="trailing" id="pBX-G3-gBz"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<viewLayoutGuide key="safeArea" id="wvK-7O-o3d"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
|
|
@ -449,8 +456,10 @@
|
|||
<resources>
|
||||
<image name="ic_booking_date" width="20" height="20"/>
|
||||
<image name="ic_booking_group" width="20" height="20"/>
|
||||
<image name="ic_clear_filters" width="36" height="36"/>
|
||||
<image name="ic_filter" width="20" height="20"/>
|
||||
<image name="ic_search" width="28" height="28"/>
|
||||
<image name="ic_search_back" width="24" height="24"/>
|
||||
<image name="ic_search_mode_list" width="20" height="20"/>
|
||||
<image name="ic_search_mode_map" width="20" height="20"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
74
iphone/Maps/UI/Search/SearchActionBarView.swift
Normal file
74
iphone/Maps/UI/Search/SearchActionBarView.swift
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
@objc class SearchActionBarView: SolidTouchView {
|
||||
@IBOutlet private var filterButton: MWMButton!
|
||||
@IBOutlet private var changeFilterButton: MWMButton!
|
||||
@IBOutlet private var changeFilterView: UIView!
|
||||
@IBOutlet private var filterAppliedLabel: UILabel!
|
||||
@IBOutlet private var mapButton: MWMButton!
|
||||
@IBOutlet private var listButton: MWMButton!
|
||||
@IBOutlet private var filterDivider: UIView!
|
||||
@IBOutlet private var stackView: UIStackView!
|
||||
|
||||
override func awakeFromNib() {
|
||||
super.awakeFromNib()
|
||||
|
||||
hideView(filterButton, isHidden: true, animated: false)
|
||||
hideView(changeFilterView, isHidden: true, animated: false)
|
||||
hideView(mapButton, isHidden: true, animated: false)
|
||||
hideView(listButton, isHidden: true, animated: false)
|
||||
hideView(filterDivider, isHidden: true, animated: false)
|
||||
}
|
||||
|
||||
@objc func updateForState(_ state: MWMSearchManagerState) {
|
||||
hideView(mapButton, isHidden: true, animated: false)
|
||||
hideView(listButton, isHidden: true, animated: false)
|
||||
|
||||
iPhoneSpecific {
|
||||
switch state {
|
||||
case .tableSearch:
|
||||
hideView(mapButton, isHidden: false, animated: true)
|
||||
case .mapSearch:
|
||||
hideView(listButton, isHidden: false, animated: true)
|
||||
case .default:
|
||||
break
|
||||
@unknown default:
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@objc func updateFilterButton(showFilter:Bool, filterCount: Int){
|
||||
filterAppliedLabel.text = "\(filterCount)"
|
||||
if showFilter {
|
||||
hideView(filterButton, isHidden: filterCount > 0, animated: true)
|
||||
hideView(changeFilterView, isHidden: filterCount == 0, animated: true)
|
||||
hideView(filterDivider, isHidden: listButton.isHidden && mapButton.isHidden, animated: false)
|
||||
} else {
|
||||
hideView(filterButton, isHidden: true, animated: false)
|
||||
hideView(changeFilterView, isHidden: true, animated: false)
|
||||
hideView(filterDivider, isHidden: true, animated: false)
|
||||
}
|
||||
}
|
||||
|
||||
private func hideView(_ view: UIView, isHidden: Bool, animated: Bool) {
|
||||
view.isHidden = isHidden
|
||||
if animated {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration/2,
|
||||
delay: 0,
|
||||
options: [.beginFromCurrentState],
|
||||
animations: {
|
||||
self.layoutIfNeeded()
|
||||
}, completion: {complete in
|
||||
if complete {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration/2,
|
||||
delay: 0, options: [.beginFromCurrentState],
|
||||
animations: {
|
||||
view.alpha = isHidden ? 0 : 1
|
||||
}, completion: nil)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
view.alpha = isHidden ? 0 : 1
|
||||
view.isHidden = isHidden
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -48,6 +48,7 @@ NSString * GetLocalizedTypeName(search::Result const & result)
|
|||
{
|
||||
[super viewWillAppear:animated];
|
||||
self.tableView.hidden = NO;
|
||||
self.tableView.insetsContentViewsToSafeArea = YES;
|
||||
[(MWMSearchTableView *)self.view hideNoResultsView:YES];
|
||||
[self reloadData];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
|
||||
<device id="retina6_1" orientation="portrait" appearance="light"/>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
|
||||
<device id="ipad12_9" orientation="portrait" layout="fullscreen" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
|
|
@ -13,29 +13,29 @@
|
|||
<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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_carplay_activated" translatesAutoresizingMaskIntoConstraints="NO" id="Tqh-46-Yrm">
|
||||
<rect key="frame" x="127" y="373" width="160" height="160"/>
|
||||
<rect key="frame" x="432" y="603" width="160" height="160"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="160" id="dkE-Cj-sE5"/>
|
||||
<constraint firstAttribute="width" constant="160" id="pz7-lu-Ocm"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aPn-pa-nCx" customClass="EAGLView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<subviews>
|
||||
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65S-M4-TnM" customClass="NavigationInfoArea" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="0.0" y="0.0" width="414" height="862"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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"/>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
</variation>
|
||||
</view>
|
||||
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aVk-ab-LFJ" customClass="TabBarArea" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="814" width="414" height="82"/>
|
||||
<rect key="frame" x="0.0" y="1318" width="1024" height="48"/>
|
||||
<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"/>
|
||||
|
|
@ -69,23 +69,23 @@
|
|||
</variation>
|
||||
</view>
|
||||
<view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="862"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="862"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
|
||||
</view>
|
||||
</subviews>
|
||||
|
|
@ -122,10 +122,10 @@
|
|||
</variation>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="jio-3T-E6G" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="1366"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="350" id="Dd0-x6-7gc"/>
|
||||
<constraint firstAttribute="width" constant="320" id="Dd0-x6-7gc"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
|
|
@ -149,7 +149,7 @@
|
|||
</variation>
|
||||
</view>
|
||||
<view hidden="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-Oj-jeo" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="852"/>
|
||||
<rect key="frame" x="8" y="0.0" width="350" height="500"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="350" id="6h8-a6-LWn"/>
|
||||
|
|
@ -176,7 +176,7 @@
|
|||
</variation>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="at1-V1-pzl" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="662" width="414" height="152"/>
|
||||
<rect key="frame" x="0.0" y="1166" width="1024" height="152"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<gestureRecognizers/>
|
||||
<constraints>
|
||||
|
|
@ -319,7 +319,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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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>
|
||||
|
|
@ -339,7 +339,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="414" height="56"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</navigationBar>
|
||||
<connections>
|
||||
|
|
@ -355,7 +355,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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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>
|
||||
|
|
@ -381,11 +381,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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="44" width="414" height="774"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1322"/>
|
||||
<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"/>
|
||||
|
|
@ -396,10 +396,10 @@
|
|||
</connections>
|
||||
</tableView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aQv-7U-zAP">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="774"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1322"/>
|
||||
<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="414" height="88"/>
|
||||
<rect key="frame" x="0.0" y="36" width="1024" 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"/>
|
||||
|
|
@ -416,7 +416,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="414" height="1"/>
|
||||
<rect key="frame" x="0.0" y="35" width="1024" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="xUX-ck-MQb"/>
|
||||
</constraints>
|
||||
|
|
@ -425,7 +425,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="414" height="1"/>
|
||||
<rect key="frame" x="0.0" y="123" width="1024" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="HOj-tZ-b3F"/>
|
||||
</constraints>
|
||||
|
|
@ -434,7 +434,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="729" width="414" height="1"/>
|
||||
<rect key="frame" x="0.0" y="1277" width="1024" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="ZXK-zv-uSz"/>
|
||||
</constraints>
|
||||
|
|
@ -443,7 +443,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="414" height="1"/>
|
||||
<rect key="frame" x="0.0" y="164" width="1024" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="rD4-fE-ez2"/>
|
||||
</constraints>
|
||||
|
|
@ -452,10 +452,10 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="85Z-MR-kUV" userLabel="Help View">
|
||||
<rect key="frame" x="0.0" y="164" width="414" height="328"/>
|
||||
<rect key="frame" x="0.0" y="164" width="1024" height="328"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n79-h1-Nk3" userLabel="Button">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" 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" y="12" width="120" height="20"/>
|
||||
|
|
@ -468,7 +468,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="382" y="10" width="24" height="24"/>
|
||||
<rect key="frame" x="992" 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"/>
|
||||
|
|
@ -478,7 +478,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="398" height="1"/>
|
||||
<rect key="frame" x="16" y="44" width="1008" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="cv8-Tg-Oin"/>
|
||||
</constraints>
|
||||
|
|
@ -487,7 +487,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="414" height="44"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" 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"/>
|
||||
|
|
@ -514,7 +514,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j5R-JF-iCs">
|
||||
<rect key="frame" x="10" y="56" width="394" height="260"/>
|
||||
<rect key="frame" x="10" y="56" width="1004" height="260"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" priority="750" constant="260" id="sfy-fK-VSx"/>
|
||||
|
|
@ -560,10 +560,10 @@
|
|||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SZQ-ra-FC3" userLabel="Mode Switch">
|
||||
<rect key="frame" x="0.0" y="818" width="414" height="44"/>
|
||||
<rect key="frame" x="0.0" y="1322" width="1024" 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="414" height="44"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="44"/>
|
||||
<inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<state key="normal" title="Simple Mode"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
|
|
@ -574,7 +574,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="382" y="10" width="24" height="24"/>
|
||||
<rect key="frame" x="992" 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"/>
|
||||
|
|
@ -584,7 +584,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="414" height="1"/>
|
||||
<rect key="frame" x="0.0" y="-1" width="1024" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="UUW-c4-eNA"/>
|
||||
</constraints>
|
||||
|
|
@ -652,15 +652,15 @@
|
|||
<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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="28" width="414" height="44"/>
|
||||
<rect key="frame" x="0.0" y="28" width="1024" 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="0.0" y="0.0" width="414" height="44"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" 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">
|
||||
|
|
@ -696,7 +696,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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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"/>
|
||||
|
|
@ -715,11 +715,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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="100" width="414" height="762"/>
|
||||
<rect key="frame" x="0.0" y="56" width="1024" height="1310"/>
|
||||
<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"/>
|
||||
|
|
@ -730,7 +730,7 @@
|
|||
</connections>
|
||||
</tableView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rI9-RR-sKP" userLabel="Status Bar Background">
|
||||
<rect key="frame" x="0.0" y="-8" width="414" height="108"/>
|
||||
<rect key="frame" x="0.0" y="-52" width="1024" 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>
|
||||
|
|
@ -741,7 +741,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="gzF-B7-8pj">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="56"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" 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"/>
|
||||
|
|
@ -786,11 +786,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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="100" width="414" height="762"/>
|
||||
<rect key="frame" x="0.0" y="56" width="1024" height="1310"/>
|
||||
<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"/>
|
||||
|
|
@ -801,7 +801,7 @@
|
|||
</connections>
|
||||
</tableView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HEU-Bu-3wh" userLabel="Status Bar Background">
|
||||
<rect key="frame" x="0.0" y="-8" width="414" height="108"/>
|
||||
<rect key="frame" x="0.0" y="-52" width="1024" 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>
|
||||
|
|
@ -812,7 +812,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="z6s-26-dP6">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="56"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" 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"/>
|
||||
|
|
@ -856,11 +856,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="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<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="100" width="414" height="762"/>
|
||||
<rect key="frame" x="0.0" y="56" width="1024" height="1310"/>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<gestureRecognizers/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
|
|
@ -872,7 +872,7 @@
|
|||
</connections>
|
||||
</tableView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xxz-fq-71r" userLabel="Status Bar Background">
|
||||
<rect key="frame" x="0.0" y="-8" width="414" height="108"/>
|
||||
<rect key="frame" x="0.0" y="-52" width="1024" 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>
|
||||
|
|
@ -883,7 +883,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<searchBar contentMode="redraw" text="" translatesAutoresizingMaskIntoConstraints="NO" id="DPt-gs-efn">
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="56"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="56"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="9M7-y1-RSU"/>
|
||||
</constraints>
|
||||
|
|
@ -893,13 +893,13 @@
|
|||
</connections>
|
||||
</searchBar>
|
||||
<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="100" width="414" height="762"/>
|
||||
<rect key="frame" x="0.0" y="56" width="1024" height="1310"/>
|
||||
<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="798" width="414" height="64"/>
|
||||
<rect key="frame" x="0.0" y="1302" width="1024" height="64"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="64" id="YoQ-gr-frN"/>
|
||||
|
|
@ -957,13 +957,13 @@
|
|||
<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="3.5" y="44" width="407" height="674"/>
|
||||
<rect key="frame" x="3.5" y="0.0" width="407" height="762"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dCZ-PN-2Ob" userLabel="BoundsView">
|
||||
<rect key="frame" x="16" y="0.0" width="375" height="570"/>
|
||||
<rect key="frame" x="16" y="0.0" width="375" height="658"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87G-jh-N8H" userLabel="CenteredView">
|
||||
<rect key="frame" x="0.0" y="160.5" width="375" height="249"/>
|
||||
<rect key="frame" x="0.0" y="204.5" width="375" height="249"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_no_maps" translatesAutoresizingMaskIntoConstraints="NO" id="vI9-fc-FO2">
|
||||
<rect key="frame" x="107.5" y="0.0" width="160" height="160"/>
|
||||
|
|
@ -1024,7 +1024,7 @@
|
|||
</constraints>
|
||||
</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="83.5" y="590" width="240" height="44"/>
|
||||
<rect key="frame" x="83.5" y="678" 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"/>
|
||||
|
|
@ -1095,11 +1095,11 @@
|
|||
<objects>
|
||||
<viewController storyboardIdentifier="SearchNoResultsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0VQ-EO-9Sv" customClass="SearchNoResultsViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="9jm-RW-DZK">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EbW-Mp-c6s">
|
||||
<rect key="frame" x="0.0" y="241" width="414" height="414"/>
|
||||
<rect key="frame" x="0.0" y="171" width="1024" height="1024"/>
|
||||
<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"/>
|
||||
|
|
@ -1183,7 +1183,7 @@
|
|||
</resources>
|
||||
<inferredMetricsTieBreakers>
|
||||
<segue reference="sMq-pa-AId"/>
|
||||
<segue reference="urr-1u-jhn"/>
|
||||
<segue reference="4Cc-99-mlN"/>
|
||||
<segue reference="OEF-kR-jKi"/>
|
||||
<segue reference="0A8-4b-0A2"/>
|
||||
</inferredMetricsTieBreakers>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue