feat: bottom addressbar

nmotod · Sep 29, 2023 · c4ebd28 · c4ebd28
1 parent 072c6cc
commit c4ebd28
Show file tree

Hide file tree

Showing 13 changed files with 423 additions and 386 deletions.
diff --git a/Modules/Package.swift b/Modules/Package.swift
@@ -10,7 +10,7 @@ let package = Package(
     name: "Modules",
     defaultLocalization: "en",
     platforms: [
-        .iOS(.v16),
+        .iOS("17.0.0"),
     ],
     products: [
         .library(
@@ -37,6 +37,10 @@ let package = Package(
             name: "Theme.Previews",
             targets: ["Theme"]
         ),
+        .library(
+            name: "TabBrowser.Previews",
+            targets: ["TabBrowser"]
+        ),
     ],
     dependencies: [
         // .package(url: "https://github.com/mischa-hildebrand/AlignedCollectionViewFlowLayout", revision: "49330ef67177dba5c9e1a3efdd0df93d83f12ee7"),

diff --git a/Modules/Sources/TabBrowser/AddressEdit/AddressEditViewController.swift b/Modules/Sources/TabBrowser/AddressEdit/AddressEditViewController.swift
@@ -7,17 +7,27 @@ protocol AddressEditViewControllerDelegate: AnyObject {
 }
 
 class AddressEditViewController: UIViewController, AddressEditViewControllerRootViewHandler {
-    let initialText: String
+    let initialURL: URL?
+
+    private var initialText: String {
+        guard let initialURL,
+              !InternalURL.isInternalURL(initialURL)
+        else {
+            return ""
+        }
+
+        return initialURL.absoluteString
+    }
 
     weak var delegate: AddressEditViewControllerDelegate?
 
     private var rootView: RootView!
 
     init(
-        initialText: String,
+        initialURL: URL?,
         delegate: AddressEditViewControllerDelegate
     ) {
-        self.initialText = initialText
+        self.initialURL = initialURL
         self.delegate = delegate
 
         super.init(nibName: nil, bundle: nil)

diff --git a/Modules/Sources/TabBrowser/InternalURL.swift b/Modules/Sources/TabBrowser/InternalURL.swift
@@ -25,4 +25,8 @@ enum InternalURL: String {
     var url: URL {
         return URL(string: Self.scheme + "://" + Self.host + path)!
     }
+
+    static func isInternalURL(_ url: URL) -> Bool {
+        return InternalURL(url: url) != nil
+    }
 }
diff --git a/Modules/Sources/TabBrowser/NewTab/NewTabViewController+HeroHeaderView.swift b/Modules/Sources/TabBrowser/NewTab/NewTabViewController+HeroHeaderView.swift
@@ -19,7 +19,7 @@ extension NewTabViewController {
 
         private let backgroundView = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterialDark))
 
-        private let addressBar = AddressBar(frame: .init(x: 0, y: 0, width: 300, height: 60))
+//        private let addressBar = AddressBar(frame: .init(x: 0, y: 0, width: 300, height: 60))
 
         private let addressBarBox = UIView()
 
@@ -49,16 +49,16 @@ extension NewTabViewController {
         /// - 1.0 : Non-sticky (hero header is on screen)
         var percentExpansion: CGFloat = 0 {
             didSet {
-                backgroundView.isHidden = (percentExpansion > 0)
-
-                addressBarHeightConstraint.update(offset: clamp(min: 50, max: 60, percent: percentExpansion))
-                addressBarAlignLeftConstraint.update(offset: clamp(min: 0, max: 10, percent: percentExpansion))
-                addressBarAlignRightConstraint.update(offset: -clamp(min: 0, max: 10, percent: percentExpansion))
-
-                let labelScale = clamp(min: 1.1, max: 1, percent: percentExpansion)
-                addressBar.labelButton.titleLabel?.transform = .init(scaleX: labelScale, y: labelScale)
-
-                heroImageBox.alpha = percentExpansion
+//                backgroundView.isHidden = (percentExpansion > 0)
+//
+//                addressBarHeightConstraint.update(offset: clamp(min: 50, max: 60, percent: percentExpansion))
+//                addressBarAlignLeftConstraint.update(offset: clamp(min: 0, max: 10, percent: percentExpansion))
+//                addressBarAlignRightConstraint.update(offset: -clamp(min: 0, max: 10, percent: percentExpansion))
+//
+////                let labelScale = clamp(min: 1.1, max: 1, percent: percentExpansion)
+////                addressBar.labelButton.titleLabel?.transform = .init(scaleX: labelScale, y: labelScale)
+//
+//                heroImageBox.alpha = percentExpansion
             }
         }
 
@@ -75,7 +75,7 @@ extension NewTabViewController {
         private func setup() {
             addSubview(backgroundView)
             addSubview(addressBarBox)
-            addressBarBox.addSubview(addressBar)
+//            addressBarBox.addSubview(addressBar)
             addSubview(heroImageBox)
             addSubview(topToolbar)
 
@@ -90,16 +90,16 @@ extension NewTabViewController {
                 make.height.equalTo(50)
             }
 
-            addressBar.snp.makeConstraints { make in
-                addressBarAlignLeftConstraint = make.left.equalToSuperview().constraint
-                addressBarAlignRightConstraint = make.right.equalToSuperview().constraint
-                make.centerY.equalToSuperview()
-                addressBarHeightConstraint = make.height.equalTo(50).constraint
-            }
-
-            addressBar.labelButton.addTarget(self, action: #selector(editAddress(_:)), for: .touchUpInside)
-            addressBar.labelButton.isPlaceholder = true
-            addressBar.labelButton.addressText = NSLocalizedString("Search or enter address", comment: "")
+//            addressBar.snp.makeConstraints { make in
+//                addressBarAlignLeftConstraint = make.left.equalToSuperview().constraint
+//                addressBarAlignRightConstraint = make.right.equalToSuperview().constraint
+//                make.centerY.equalToSuperview()
+//                addressBarHeightConstraint = make.height.equalTo(50).constraint
+//            }
+//
+//            addressBar.labelButton.addTarget(self, action: #selector(editAddress(_:)), for: .touchUpInside)
+//            addressBar.labelButton.isPlaceholder = true
+//            addressBar.labelButton.addressText = NSLocalizedString("Search or enter address", comment: "")
 
             // Hero image
             heroImageBox.snp.makeConstraints { make in

diff --git a/Modules/Sources/TabBrowser/Tab/AddressBar/AddressBackgroundLayer.swift b/Modules/Sources/TabBrowser/Tab/AddressBar/AddressBackgroundLayer.swift