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

[iOS] fix back button in catalog

Browse source
This commit is contained in:
Aleksey Belousov 2020-01-24 14:07:55 +03:00 • committed by Daria Volvenkova
parent b35d7a475b
commit 2dafe01b77
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,6 @@ final class CatalogWebViewController: WebViewController {
var deeplink: URL?
var categoryInfo: CatalogCategoryInfo?
var statSent = false
var backButton: UIBarButtonItem!
var billing = InAppPurchase.inAppBilling()
var noInternetView: CatalogConnectionErrorView!
@ -60,11 +59,6 @@ final class CatalogWebViewController: WebViewController {
}
}
super.init(url: catalogUrl, title: L("guides_catalogue_title"))!
backButton = UIBarButtonItem(image: UIImage(named: "ic_nav_bar_back"),
style: .plain,
target: navigationController,
action: #selector(onBack))
navigationItem.leftBarButtonItem = backButton
noInternetView = CatalogConnectionErrorView(frame: .zero, actionCallback: { [weak self] in
guard let self = self else { return }
if !FrameworkHelper.isNetworkConnected() {
@ -133,8 +127,11 @@ final class CatalogWebViewController: WebViewController {
progressView.tintColor = UIColor.white()
updateProgress()
navigationItem.hidesBackButton = true;
navigationItem.rightBarButtonItem = UIBarButtonItem(title: L("core_exit"), style: .plain, target: self, action: #selector(goBack))
let backButton = UIBarButtonItem(image: UIImage(named: "ic_nav_bar_back"),
style: .plain,
target: self,
action: #selector(onBack))
navigationItem.leftBarButtonItem = backButton
}
override func viewDidAppear(_ animated: Bool) {