kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[iOS] fixed naming

Browse source
This commit is contained in:
Aleksey Belouosv 2018-07-02 14:20:33 +03:00 • committed by Vlad Mihaylenko
parent 09278308a3
commit a495549291
6 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
View file

@ -7,7 +7,7 @@ final class CatalogWebViewController: WebViewController {
var deeplink: URL?
@objc init() {
super.init(url: MWMBookmarksManager.catalogFrontendUrl(), andTitleOrNil: L("routes_and_bookmarks"))
super.init(url: MWMBookmarksManager.catalogFrontendUrl()!, title: L("routes_and_bookmarks"))!
}
required init?(coder aDecoder: NSCoder) {

15
iphone/Maps/Common/WebViewController.h
View file

@ -4,14 +4,17 @@
@interface WebViewController : MWMViewController <WKNavigationDelegate>
@property (nonatomic) NSURL * m_url;
@property (copy, nonatomic) NSString * m_htmlText;
@property (nonatomic) NSURL * _Nullable m_url;
@property (copy, nonatomic) NSString * _Nullable m_htmlText;
// Set to YES if external browser should be launched
@property (nonatomic) BOOL openInSafari;
- (id)initWithUrl:(NSURL *)url andTitleOrNil:(NSString *)title;
- (id)initWithHtml:(NSString *)htmlText baseUrl:(NSURL *)url andTitleOrNil:(NSString *)title;
- (instancetype)initWithAuthURL:(NSURL *)url onSuccessAuth:(MWMStringBlock)success
onFailure:(MWMVoidBlock)failure;
- (instancetype _Nullable)initWithUrl:(NSURL * _Nonnull)url title:( NSString * _Nullable)title;
- (instancetype _Nullable)initWithHtml:(NSString * _Nonnull)htmlText
baseUrl:(NSURL * _Nullable)url
title:(NSString * _Nullable)title;
- (instancetype _Nullable)initWithAuthURL:(NSURL * _Nonnull)url
onSuccessAuth:(MWMStringBlock _Nullable)success
onFailure:(MWMVoidBlock _Nullable)failure;
@end

4
iphone/Maps/Common/WebViewController.mm
View file

@ -11,7 +11,7 @@
@implementation WebViewController
- (id)initWithUrl:(NSURL *)url andTitleOrNil:(NSString *)title
- (id)initWithUrl:(NSURL *)url title:(NSString *)title
{
self = [super initWithNibName:nil bundle:nil];
if (self)
@ -23,7 +23,7 @@
return self;
}
- (id)initWithHtml:(NSString *)htmlText baseUrl:(NSURL *)url andTitleOrNil:(NSString *)title
- (id)initWithHtml:(NSString *)htmlText baseUrl:(NSURL *)url title:(NSString *)title
{
self = [super initWithNibName:nil bundle:nil];
if (self)

2
iphone/Maps/UI/Settings/MWMAboutController.mm
View file

@ -98,7 +98,7 @@ extern NSString * const kAlohalyticsTapEventKey;
NSString * s = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:&error];
NSString * text = [NSString stringWithFormat:@"%@\n%@", self.versionLabel.text, s];
WebViewController * aboutViewController =
[[WebViewController alloc] initWithHtml:text baseUrl:nil andTitleOrNil:L(@"copyright")];
[[WebViewController alloc] initWithHtml:text baseUrl:nil title:L(@"copyright")];
aboutViewController.openInSafari = YES;
[self.navigationController pushViewController:aboutViewController animated:YES];
}

4
iphone/Maps/UI/Settings/MWMHelpController.mm
View file

@ -42,12 +42,12 @@ NSString * const kiOSEmail = @"ios@maps.me";
NSString * path = [NSBundle.mainBundle pathForResource:@"faq" ofType:@"html"];
html = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil];
self.aboutViewController =
[[WebViewController alloc] initWithHtml:html baseUrl:nil andTitleOrNil:nil];
[[WebViewController alloc] initWithHtml:html baseUrl:nil title:nil];
}
else
{
NSURL * url = [NSURL URLWithString:@"https://support.maps.me"];
self.aboutViewController = [[WebViewController alloc] initWithUrl:url andTitleOrNil:nil];
self.aboutViewController = [[WebViewController alloc] initWithUrl:url title:nil];
}
self.aboutViewController.openInSafari = NO;

2
iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm
View file

@ -197,7 +197,7 @@ using namespace locale_translator;
WebViewController * vc =
[[WebViewController alloc] initWithHtml:html
baseUrl:baseURL
andTitleOrNil:L(@"pref_tts_how_to_set_up_voice")];
title:L(@"pref_tts_how_to_set_up_voice")];
[self.navigationController pushViewController:vc animated:YES];
}
}