From cd838506e3e6b7931f1977e6c1768efd2e86b8d8 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Wed, 2 Aug 2023 19:07:32 +0500 Subject: [PATCH 1/2] fixed ALS-1492 ALS-1493 setting back button & bottom tab bar visibility --- .../Coordinators/ChildCoordinators/SettingsCoordinator.swift | 1 + .../Settings/Subviews/MapStyle/Builder/MapStyleBuilder.swift | 1 + 2 files changed, 2 insertions(+) diff --git a/LocationServices/LocationServices/Coordinators/ChildCoordinators/SettingsCoordinator.swift b/LocationServices/LocationServices/Coordinators/ChildCoordinators/SettingsCoordinator.swift index de63c414..e2207efa 100644 --- a/LocationServices/LocationServices/Coordinators/ChildCoordinators/SettingsCoordinator.swift +++ b/LocationServices/LocationServices/Coordinators/ChildCoordinators/SettingsCoordinator.swift @@ -32,6 +32,7 @@ private extension SettingsCoordinator { extension SettingsCoordinator: SettingsNavigationDelegate { func showNextScene(type: SettingsCellType) { + navigationController.navigationBar.isHidden = false switch type { case .units: showUnitScene() diff --git a/LocationServices/LocationServices/Scenes/Settings/Subviews/MapStyle/Builder/MapStyleBuilder.swift b/LocationServices/LocationServices/Scenes/Settings/Subviews/MapStyle/Builder/MapStyleBuilder.swift index b62af4a4..fd0a0315 100644 --- a/LocationServices/LocationServices/Scenes/Settings/Subviews/MapStyle/Builder/MapStyleBuilder.swift +++ b/LocationServices/LocationServices/Scenes/Settings/Subviews/MapStyle/Builder/MapStyleBuilder.swift @@ -10,6 +10,7 @@ import UIKit final class MapStyleBuilder { static func create() -> MapStyleVC { let controller = MapStyleVC() + controller.hidesBottomBarWhenPushed = true let viewModel = MapStyleViewModel() controller.viewModel = viewModel return controller From 4d48a63925d9fc39f8892543919c4400366cde2e Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:04:14 +0500 Subject: [PATCH 2/2] fixed ALS-1496 settings options are not tappable after coming from routing screen --- .../Scenes/Settings/Controller/SettingsVC.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift b/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift index a81c5287..930e8333 100644 --- a/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift +++ b/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift @@ -15,7 +15,7 @@ final class SettingsVC: UIViewController { static let horizontalOffset: CGFloat = 16 } - weak var delegate: SettingsNavigationDelegate? + var delegate: SettingsNavigationDelegate? private var headerTitle: LargeTitleLabel = { let label = LargeTitleLabel(labelText: StringConstant.settigns)