forked from organicmaps/organicmaps
Merge pull request #5114 from igrechuhin/MAPSME-3388
[MAPSME-3388] [ios] Added no results screen to search in downloader.
This commit is contained in:
Sergey Yershov
GitHub
commit
3a5233c6c5
10 changed files with 215 additions and 47 deletions
|
|
@ -4,6 +4,11 @@
|
|||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
#import "MWMKeyboard.h"
|
||||
#import "MWMNoMapsViewController.h"
|
||||
#import "MWMSearchNoResults.h"
|
||||
#import "MWMTableViewCell.h"
|
||||
#import "MWMViewController.h"
|
||||
#import "UIColor+MapsMeColor.h"
|
||||
#import "UIFont+MapsMeFonts.h"
|
||||
#import "UIViewController+Navigation.h"
|
||||
|
|
|
|||
3
iphone/Maps/Common/Common.swift
Normal file
3
iphone/Maps/Common/Common.swift
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
import Foundation
|
||||
|
||||
func L(_ key: String) -> String { return NSLocalizedString(key, comment: "") }
|
||||
|
|
@ -205,6 +205,15 @@
|
|||
3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; };
|
||||
3476B8E11BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; };
|
||||
347A4C5E1C4E76C9006BA66E /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 340DC82B1C4E72C700EAA2CC /* liboauthcpp.a */; };
|
||||
34845DAE1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; };
|
||||
34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; };
|
||||
34845DB01E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; };
|
||||
34845DB21E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */; };
|
||||
34845DB31E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */; };
|
||||
34845DB41E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */; };
|
||||
34845DB61E166084003D55B9 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB51E166084003D55B9 /* Common.swift */; };
|
||||
34845DB71E166084003D55B9 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB51E166084003D55B9 /* Common.swift */; };
|
||||
34845DB81E166084003D55B9 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB51E166084003D55B9 /* Common.swift */; };
|
||||
3490D2DE1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */; };
|
||||
3490D2DF1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */; };
|
||||
3490D2E01CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */; };
|
||||
|
|
@ -1550,6 +1559,9 @@
|
|||
3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "tts-how-to-set-up-voice.html"; path = "../../data/tts-how-to-set-up-voice.html"; sourceTree = "<group>"; };
|
||||
3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "tts-how-to-set-up-voice-img"; path = "../../data/tts-how-to-set-up-voice-img"; sourceTree = "<group>"; };
|
||||
348320CC1B6A2C52007EC039 /* MWMNavigationViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNavigationViewProtocol.h; sourceTree = "<group>"; };
|
||||
34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloaderNoResultsEmbedViewController.swift; sourceTree = "<group>"; };
|
||||
34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNoResultsViewController.swift; sourceTree = "<group>"; };
|
||||
34845DB51E166084003D55B9 /* Common.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = "<group>"; };
|
||||
348E57981B0F49D8000FA02A /* maps.me dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "maps.me dbg.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
3490D2D91CE9DD2500D0B838 /* MWMSideButtons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideButtons.h; sourceTree = "<group>"; };
|
||||
3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideButtons.mm; sourceTree = "<group>"; };
|
||||
|
|
@ -2579,6 +2591,7 @@
|
|||
3404751E1E081A4600C92850 /* Statistics */,
|
||||
340475261E081A4600C92850 /* WebViewController.h */,
|
||||
340475271E081A4600C92850 /* WebViewController.mm */,
|
||||
34845DB51E166084003D55B9 /* Common.swift */,
|
||||
);
|
||||
path = Common;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -3381,6 +3394,7 @@
|
|||
F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.mm */,
|
||||
F6E2FC271E097B9F0083EBEC /* MWMNoMapsViewController.h */,
|
||||
F6E2FC281E097B9F0083EBEC /* MWMNoMapsViewController.mm */,
|
||||
34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */,
|
||||
);
|
||||
path = NoMaps;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -3741,6 +3755,7 @@
|
|||
F6E2FD021E097B9F0083EBEC /* TabbedView */,
|
||||
F6E2FD241E097BA00083EBEC /* TabButtons */,
|
||||
F6E2FD281E097BA00083EBEC /* TableView */,
|
||||
34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */,
|
||||
);
|
||||
path = Search;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -4722,6 +4737,7 @@
|
|||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
34845DB61E166084003D55B9 /* Common.swift in Sources */,
|
||||
1D60589B0D05DD56006BFB54 /* main.mm in Sources */,
|
||||
340837161B72451A00B5C185 /* MWMShareActivityItem.mm in Sources */,
|
||||
F6E2FF0B1E097BA00083EBEC /* MWMSearchHistoryMyPositionCell.mm in Sources */,
|
||||
|
|
@ -4786,6 +4802,7 @@
|
|||
F64D9C9F1C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */,
|
||||
34ABA62C1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */,
|
||||
F6E2FEF61E097BA00083EBEC /* MWMSearchBookmarksManager.mm in Sources */,
|
||||
34845DAE1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */,
|
||||
34ABA6161C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */,
|
||||
F6E2FEDE1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */,
|
||||
3454D7D31E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */,
|
||||
|
|
@ -4966,6 +4983,7 @@
|
|||
34D15BA81BD8F93C00C8BCBE /* AddSetTableViewCell.mm in Sources */,
|
||||
F6E2FED51E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */,
|
||||
F6A218491CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */,
|
||||
34845DB21E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
|
||||
34A759CD1DC795140078C3AE /* MWMWhatsNewEditorController.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -4974,6 +4992,7 @@
|
|||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
34845DB71E166084003D55B9 /* Common.swift in Sources */,
|
||||
6741A9A31BF340DE002C974C /* main.mm in Sources */,
|
||||
F67E751E1DB76DFC00D6741F /* MWMTaxiCollectionLayout.mm in Sources */,
|
||||
F6E2FF0C1E097BA00083EBEC /* MWMSearchHistoryMyPositionCell.mm in Sources */,
|
||||
|
|
@ -5038,6 +5057,7 @@
|
|||
342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */,
|
||||
34479C7D1C60C6130065D261 /* MWMFrameworkListener.mm in Sources */,
|
||||
F6E2FEF71E097BA00083EBEC /* MWMSearchBookmarksManager.mm in Sources */,
|
||||
34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */,
|
||||
F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */,
|
||||
F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */,
|
||||
34A759DF1DC797960078C3AE /* MWMWhatsNewEditorController.mm in Sources */,
|
||||
|
|
@ -5218,6 +5238,7 @@
|
|||
F6A2184A1CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */,
|
||||
F6E2FED61E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */,
|
||||
6741AA2D1BF340DE002C974C /* AddSetTableViewCell.mm in Sources */,
|
||||
34845DB31E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
|
||||
34A759E31DC797CB0078C3AE /* MWMPageController.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -5226,6 +5247,7 @@
|
|||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
34845DB81E166084003D55B9 /* Common.swift in Sources */,
|
||||
849CF6821DE842290024A8A5 /* main.mm in Sources */,
|
||||
3454D7D51E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */,
|
||||
F6E2FF0D1E097BA00083EBEC /* MWMSearchHistoryMyPositionCell.mm in Sources */,
|
||||
|
|
@ -5290,6 +5312,7 @@
|
|||
849CF6BF1DE842290024A8A5 /* MWMFrameworkListener.mm in Sources */,
|
||||
849CF6C31DE842290024A8A5 /* MWMEditorViralAlert.mm in Sources */,
|
||||
F6E2FEF81E097BA00083EBEC /* MWMSearchBookmarksManager.mm in Sources */,
|
||||
34845DB01E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */,
|
||||
3454D7E11E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */,
|
||||
F6E2FEE01E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */,
|
||||
849CF6C61DE842290024A8A5 /* MWMInputPasswordValidator.mm in Sources */,
|
||||
|
|
@ -5470,6 +5493,7 @@
|
|||
849CF76D1DE842290024A8A5 /* AddSetTableViewCell.mm in Sources */,
|
||||
F6E2FED71E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */,
|
||||
849CF76E1DE842290024A8A5 /* MWMEditorViralActivityItem.mm in Sources */,
|
||||
34845DB41E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
|
||||
849CF7711DE842290024A8A5 /* MWMWhatsNewEditorController.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
@interface MWMMapDownloaderSearchDataSource : MWMMapDownloaderDataSource
|
||||
|
||||
@property(nonatomic, readonly) BOOL isEmpty;
|
||||
|
||||
- (instancetype)initWithSearchResults:(DownloaderSearchResults const &)results delegate:(id<MWMMapDownloaderProtocol, MWMMapDownloaderButtonTableViewCellProtocol>)delegate;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -91,4 +91,7 @@ extern NSString * const kLargeCountryCellIdentifier;
|
|||
return self.searchMatchedResults[countryId];
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (BOOL)isEmpty { return self.searchCountryIds.count == 0; }
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
#import "MWMMapDownloaderExtendedDataSourceWithAds.h"
|
||||
#import "MWMMapDownloaderSearchDataSource.h"
|
||||
#import "MWMNoMapsViewController.h"
|
||||
#import "SwiftBridge.h"
|
||||
#import "UIColor+MapsMeColor.h"
|
||||
#import "UIKitCategories.h"
|
||||
|
||||
|
|
@ -12,7 +13,8 @@
|
|||
|
||||
namespace
|
||||
{
|
||||
NSString * const kNoMapsSegue = @"MapDownloaderEmbedNoMapsSegue";
|
||||
NSString * const kMapDownloaderNoResultsEmbedViewControllerSegue =
|
||||
@"MapDownloaderNoResultsEmbedViewControllerSegue";
|
||||
} // namespace
|
||||
|
||||
using namespace storage;
|
||||
|
|
@ -42,9 +44,11 @@ using namespace storage;
|
|||
@property(weak, nonatomic) IBOutlet UIView * statusBarBackground;
|
||||
@property(weak, nonatomic) IBOutlet UISearchBar * searchBar;
|
||||
@property(weak, nonatomic) IBOutlet UIView * noMapsContainer;
|
||||
@property(nonatomic) MWMNoMapsViewController * noMapsController;
|
||||
@property(nonatomic) MWMDownloaderNoResultsEmbedViewController * noResultsEmbedViewController;
|
||||
|
||||
@property(nonatomic) MWMMapDownloaderDataSource * searchDataSource;
|
||||
@property(nonatomic) MWMMapDownloaderSearchDataSource * searchDataSource;
|
||||
|
||||
@property(nonatomic) NSTimeInterval lastSearchTimestamp;
|
||||
|
||||
@end
|
||||
|
||||
|
|
@ -57,7 +61,6 @@ using namespace storage;
|
|||
{
|
||||
[super viewDidLoad];
|
||||
self.searchBar.placeholder = L(@"downloader_search_field_hint");
|
||||
[self setupSearchParams];
|
||||
}
|
||||
|
||||
- (void)viewWillAppear:(BOOL)animated
|
||||
|
|
@ -81,19 +84,30 @@ using namespace storage;
|
|||
auto const & s = GetFramework().GetStorage();
|
||||
if (![self.parentCountryId isEqualToString:@(s.GetRootId().c_str())])
|
||||
return;
|
||||
if (self.mode == mwm::DownloaderMode::Available || self.dataSource == self.searchDataSource ||
|
||||
s.HaveDownloadedCountries() || s.IsDownloadInProgress())
|
||||
{
|
||||
|
||||
auto const showResults = ^{
|
||||
[self configAllMapsView];
|
||||
self.tableView.hidden = NO;
|
||||
self.noMapsContainer.hidden = YES;
|
||||
}
|
||||
else
|
||||
{
|
||||
};
|
||||
auto const showNoResults = ^(MWMDownloaderNoResultsScreen screen) {
|
||||
self.showAllMapsButtons = NO;
|
||||
self.tableView.hidden = YES;
|
||||
self.noMapsContainer.hidden = NO;
|
||||
}
|
||||
self.noResultsEmbedViewController.screen = screen;
|
||||
};
|
||||
|
||||
BOOL const noResults =
|
||||
self.dataSource == self.searchDataSource && self.searchDataSource.isEmpty;
|
||||
BOOL const isModeAvailable = self.mode == mwm::DownloaderMode::Available;
|
||||
BOOL const haveActiveMaps = s.HaveDownloadedCountries() || s.IsDownloadInProgress();
|
||||
|
||||
if (noResults)
|
||||
showNoResults(MWMDownloaderNoResultsScreenNoSearchResults);
|
||||
else if (isModeAvailable || haveActiveMaps)
|
||||
showResults();
|
||||
else
|
||||
showNoResults(MWMDownloaderNoResultsScreenNoMaps);
|
||||
}
|
||||
|
||||
#pragma mark - UISearchBarDelegate
|
||||
|
|
@ -124,20 +138,13 @@ using namespace storage;
|
|||
|
||||
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
|
||||
{
|
||||
if (searchText.length == 0)
|
||||
{
|
||||
self.dataSource = self.defaultDataSource;
|
||||
[self reloadTable];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSString * primaryLanguage = self.searchBar.textInputMode.primaryLanguage;
|
||||
if (primaryLanguage)
|
||||
m_searchParams.m_inputLocale = primaryLanguage.UTF8String;
|
||||
NSString * primaryLanguage = self.searchBar.textInputMode.primaryLanguage;
|
||||
if (primaryLanguage)
|
||||
m_searchParams.m_inputLocale = primaryLanguage.UTF8String;
|
||||
|
||||
m_searchParams.m_query = searchText.precomposedStringWithCompatibilityMapping.UTF8String;
|
||||
GetFramework().SearchInDownloader(m_searchParams);
|
||||
}
|
||||
m_searchParams.m_query = searchText.precomposedStringWithCompatibilityMapping.UTF8String;
|
||||
[self updateSearchCallback];
|
||||
GetFramework().SearchInDownloader(m_searchParams);
|
||||
}
|
||||
|
||||
#pragma mark - UIBarPositioningDelegate
|
||||
|
|
@ -145,19 +152,26 @@ using namespace storage;
|
|||
- (UIBarPosition)positionForBar:(id<UIBarPositioning>)bar { return UIBarPositionTopAttached; }
|
||||
#pragma mark - Search
|
||||
|
||||
- (void)setupSearchParams
|
||||
- (void)updateSearchCallback
|
||||
{
|
||||
__weak auto weakSelf = self;
|
||||
m_searchParams.m_onResults = ^(DownloaderSearchResults const & results) {
|
||||
NSTimeInterval const timestamp = [NSDate date].timeIntervalSince1970;
|
||||
self.lastSearchTimestamp = timestamp;
|
||||
m_searchParams.m_onResults = [weakSelf, timestamp](DownloaderSearchResults const & results) {
|
||||
__strong auto self = weakSelf;
|
||||
if (!self || results.m_endMarker)
|
||||
if (!self || timestamp != self.lastSearchTimestamp)
|
||||
return;
|
||||
self.searchDataSource =
|
||||
[[MWMMapDownloaderSearchDataSource alloc] initWithSearchResults:results delegate:self];
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (results.m_query.empty())
|
||||
{
|
||||
self.dataSource = self.defaultDataSource;
|
||||
}
|
||||
else
|
||||
{
|
||||
self.searchDataSource =
|
||||
[[MWMMapDownloaderSearchDataSource alloc] initWithSearchResults:results delegate:self];
|
||||
self.dataSource = self.searchDataSource;
|
||||
[self reloadTable];
|
||||
});
|
||||
}
|
||||
[self reloadTable];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -176,8 +190,8 @@ using namespace storage;
|
|||
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
|
||||
{
|
||||
[super prepareForSegue:segue sender:sender];
|
||||
if ([segue.identifier isEqualToString:kNoMapsSegue])
|
||||
self.noMapsController = segue.destinationViewController;
|
||||
if ([segue.identifier isEqualToString:kMapDownloaderNoResultsEmbedViewControllerSegue])
|
||||
self.noResultsEmbedViewController = segue.destinationViewController;
|
||||
}
|
||||
|
||||
#pragma mark - Configuration
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
import UIKit
|
||||
|
||||
@objc(MWMDownloaderNoResultsEmbedViewController)
|
||||
final class DownloaderNoResultsEmbed: UINavigationController {
|
||||
|
||||
@objc(MWMDownloaderNoResultsScreen)
|
||||
enum Screen: Int {
|
||||
|
||||
case noMaps
|
||||
case noSearchResults
|
||||
|
||||
}
|
||||
|
||||
var screen = Screen.noMaps {
|
||||
didSet {
|
||||
let controller: MWMViewController
|
||||
switch screen {
|
||||
case .noMaps: controller = MWMNoMapsViewController.controller()
|
||||
case .noSearchResults: controller = SearchNoResultsViewController.controller
|
||||
}
|
||||
setViewControllers([controller], animated: false)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
@interface MWMNoMapsViewController : MWMViewController
|
||||
|
||||
+ (MWMNoMapsViewController *)controller;
|
||||
+ (MWMNoMapsViewController *)controller NS_SWIFT_NAME(controller());
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
|
||||
<device id="retina4_0" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
|
||||
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
|
||||
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
|
||||
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
|
||||
|
|
@ -771,7 +771,7 @@
|
|||
<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="64" width="320" height="504"/>
|
||||
<connections>
|
||||
<segue destination="3el-Zi-2E4" kind="embed" identifier="MapDownloaderEmbedNoMapsSegue" id="ish-dC-mkH"/>
|
||||
<segue destination="b8o-rZ-x0k" kind="embed" identifier="MapDownloaderNoResultsEmbedViewControllerSegue" id="ish-dC-mkH"/>
|
||||
</connections>
|
||||
</containerView>
|
||||
</subviews>
|
||||
|
|
@ -972,7 +972,7 @@
|
|||
</connections>
|
||||
</pongPressGestureRecognizer>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="4438" y="951"/>
|
||||
<point key="canvasLocation" x="4680" y="951"/>
|
||||
</scene>
|
||||
<!--No Maps View Controller-->
|
||||
<scene sceneID="bz6-ac-EbZ">
|
||||
|
|
@ -987,16 +987,16 @@
|
|||
<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="96.5" y="0.0" width="407" height="536"/>
|
||||
<rect key="frame" x="6" y="0.0" width="308" height="504"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dCZ-PN-2Ob" userLabel="BoundsView">
|
||||
<rect key="frame" x="16" y="0.0" width="375" height="432"/>
|
||||
<rect key="frame" x="16" y="0.0" width="276" height="400"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87G-jh-N8H" userLabel="CenteredView">
|
||||
<rect key="frame" x="0.0" y="92" width="375" height="249"/>
|
||||
<rect key="frame" x="0.0" y="68" width="276" height="265"/>
|
||||
<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"/>
|
||||
<rect key="frame" x="58" y="0.0" width="160" height="160"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="vI9-fc-FO2" secondAttribute="height" multiplier="1:1" id="f4J-1R-ewM"/>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="160" id="jwh-bM-u0p"/>
|
||||
|
|
@ -1004,7 +1004,7 @@
|
|||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="У вас нет загруженных карт" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="abh-G0-Alr" userLabel="Title">
|
||||
<rect key="frame" x="0.0" y="180" width="375" height="24"/>
|
||||
<rect key="frame" x="0.0" y="180" width="276" height="24"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -1015,7 +1015,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaW-Ad-mYI" userLabel="Text">
|
||||
<rect key="frame" x="0.0" y="216" width="375" height="33"/>
|
||||
<rect key="frame" x="0.0" y="216" width="276" height="49"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -1056,7 +1056,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="452" width="240" height="44"/>
|
||||
<rect key="frame" x="34" y="420" 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"/>
|
||||
|
|
@ -1122,10 +1122,51 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<navigationItem key="navigationItem" id="DHE-Sb-Bfs"/>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="o0Q-NP-TIw" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="3780" y="2228"/>
|
||||
<point key="canvasLocation" x="4680" y="2228"/>
|
||||
</scene>
|
||||
<!--Search No Results View Controller-->
|
||||
<scene sceneID="LUt-iU-iyq">
|
||||
<objects>
|
||||
<viewController storyboardIdentifier="SearchNoResultsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0VQ-EO-9Sv" customClass="SearchNoResultsViewController" customModule="cmMAPS_ME" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<layoutGuides>
|
||||
<viewControllerLayoutGuide type="top" id="h4O-Rs-0da"/>
|
||||
<viewControllerLayoutGuide type="bottom" id="nMB-gc-Hho"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="9jm-RW-DZK">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EbW-Mp-c6s">
|
||||
<rect key="frame" x="0.0" y="124" width="320" height="320"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="EbW-Mp-c6s" secondAttribute="height" multiplier="1:1" id="tBC-sb-Q3g"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="EbW-Mp-c6s" firstAttribute="centerY" secondItem="9jm-RW-DZK" secondAttribute="centerY" priority="250" id="BHf-cB-UbU"/>
|
||||
<constraint firstItem="EbW-Mp-c6s" firstAttribute="height" relation="lessThanOrEqual" secondItem="9jm-RW-DZK" secondAttribute="height" id="JtV-po-tD6"/>
|
||||
<constraint firstItem="EbW-Mp-c6s" firstAttribute="width" relation="lessThanOrEqual" secondItem="9jm-RW-DZK" secondAttribute="width" id="aCG-RN-DSJ"/>
|
||||
<constraint firstItem="nMB-gc-Hho" firstAttribute="top" relation="greaterThanOrEqual" secondItem="EbW-Mp-c6s" secondAttribute="bottom" id="i0h-xR-pPI"/>
|
||||
<constraint firstItem="EbW-Mp-c6s" firstAttribute="height" secondItem="9jm-RW-DZK" secondAttribute="height" priority="750" id="r08-2f-jwK"/>
|
||||
<constraint firstItem="EbW-Mp-c6s" firstAttribute="centerX" secondItem="9jm-RW-DZK" secondAttribute="centerX" id="xbz-FB-nZl"/>
|
||||
<constraint firstItem="EbW-Mp-c6s" firstAttribute="width" secondItem="9jm-RW-DZK" secondAttribute="width" priority="750" id="zcx-oD-0Uk"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="container" destination="EbW-Mp-c6s" id="T6K-0M-IAe"/>
|
||||
<outlet property="containerBottomOffset" destination="i0h-xR-pPI" id="TpT-gj-gr2"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="rxe-Bw-br6" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="4680" y="2919"/>
|
||||
</scene>
|
||||
<!--Migration View Controller-->
|
||||
<scene sceneID="DZc-Ih-aae">
|
||||
|
|
@ -1364,6 +1405,24 @@
|
|||
</objects>
|
||||
<point key="canvasLocation" x="1818" y="-190"/>
|
||||
</scene>
|
||||
<!--Downloader No Results Embed View Controller-->
|
||||
<scene sceneID="Bce-Yn-A6n">
|
||||
<objects>
|
||||
<navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="b8o-rZ-x0k" customClass="MWMDownloaderNoResultsEmbedViewController" sceneMemberID="viewController">
|
||||
<toolbarItems/>
|
||||
<navigationBar key="navigationBar" contentMode="scaleToFill" id="iNT-L2-ifB">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</navigationBar>
|
||||
<nil name="viewControllers"/>
|
||||
<connections>
|
||||
<segue destination="3el-Zi-2E4" kind="relationship" relationship="rootViewController" id="Nd1-nE-dJZ"/>
|
||||
</connections>
|
||||
</navigationController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="0um-vd-4vd" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="3780" y="2227.8169014084506"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
<image name="ic_add_button" width="28" height="28"/>
|
||||
|
|
|
|||
33
iphone/Maps/UI/Search/SearchNoResultsViewController.swift
Normal file
33
iphone/Maps/UI/Search/SearchNoResultsViewController.swift
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
import UIKit
|
||||
|
||||
final class SearchNoResultsViewController: MWMViewController {
|
||||
|
||||
static var controller: SearchNoResultsViewController {
|
||||
let storyboard = UIViewController.mainStoryboard()!
|
||||
let id = String(describing: self)
|
||||
return storyboard.instantiateViewController(withIdentifier: id) as! SearchNoResultsViewController
|
||||
}
|
||||
|
||||
@IBOutlet private weak var container: UIView!
|
||||
@IBOutlet fileprivate weak var containerBottomOffset: NSLayoutConstraint!
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
container.addSubview(MWMSearchNoResults.view(with: #imageLiteral(resourceName: "img_search_not_found"),
|
||||
title: L("search_not_found"),
|
||||
text: L("search_not_found_query")))
|
||||
MWMKeyboard.add(self)
|
||||
onKeyboardAnimation()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension SearchNoResultsViewController: MWMKeyboardObserver {
|
||||
|
||||
func onKeyboardAnimation() {
|
||||
containerBottomOffset.constant = MWMKeyboard.keyboardHeight()
|
||||
view.layoutIfNeeded()
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue