From cc0a2de2abfc131857bb85d336341cb99bfd3fc9 Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Thu, 15 Dec 2022 12:36:37 -0300
Subject: [PATCH] Using nav controller to webscreen
---
Package.swift | 3 ---
Sources/AppNavigation/PresentWebsite.swift | 4 +++-
.../WebsiteFeature/WebsiteController.swift | 22 +------------------
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/Package.swift b/Package.swift
index 5b274897..b6116630 100644
--- a/Package.swift
+++ b/Package.swift
@@ -203,9 +203,6 @@ let package = Package(
),
.target(
name: "WebsiteFeature",
- dependencies: [
- .target(name: "AppResources"),
- ],
swiftSettings: swiftSettings
),
.target(
diff --git a/Sources/AppNavigation/PresentWebsite.swift b/Sources/AppNavigation/PresentWebsite.swift
index 02abd2ee..bdd2b918 100644
--- a/Sources/AppNavigation/PresentWebsite.swift
+++ b/Sources/AppNavigation/PresentWebsite.swift
@@ -40,7 +40,9 @@ public struct PresentWebsiteNavigator: TypedNavigator {
public func perform(_ action: PresentWebsite, completion: @escaping () -> Void) {
action.parent.present(
- viewController(action.urlString),
+ UINavigationController(
+ rootViewController: viewController(action.urlString)
+ ),
animated: action.animated,
completion: completion
)
diff --git a/Sources/WebsiteFeature/WebsiteController.swift b/Sources/WebsiteFeature/WebsiteController.swift
index fd759971..dacb0998 100644
--- a/Sources/WebsiteFeature/WebsiteController.swift
+++ b/Sources/WebsiteFeature/WebsiteController.swift
@@ -1,6 +1,5 @@
import UIKit
import WebKit
-import AppResources
public final class WebsiteController: UIViewController {
private lazy var webView = WKWebView()
@@ -13,26 +12,7 @@ public final class WebsiteController: UIViewController {
}
public override func loadView() {
- let screenView = UIView()
- let navigationBar = UINavigationBar()
- navigationBar.isTranslucent = false
- navigationBar.backgroundColor = Asset.neutralLine.color
-
- screenView.addSubview(navigationBar)
- screenView.addSubview(webView)
-
- navigationBar.translatesAutoresizingMaskIntoConstraints = false
- navigationBar.leftAnchor.constraint(equalTo: screenView.leftAnchor).isActive = true
- navigationBar.rightAnchor.constraint(equalTo: screenView.rightAnchor).isActive = true
- navigationBar.topAnchor.constraint(equalTo: screenView.safeAreaLayoutGuide.topAnchor).isActive = true
-
- webView.translatesAutoresizingMaskIntoConstraints = false
- webView.leftAnchor.constraint(equalTo: screenView.leftAnchor).isActive = true
- webView.rightAnchor.constraint(equalTo: screenView.rightAnchor).isActive = true
- webView.topAnchor.constraint(equalTo: navigationBar.bottomAnchor).isActive = true
- webView.bottomAnchor.constraint(equalTo: screenView.bottomAnchor).isActive = true
-
- view = screenView
+ view = webView
}
required init?(coder: NSCoder) { nil }
--
GitLab