buzzert/Attractor
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Long press on the window button to open a new tab

Browse Source
This commit is contained in:
James Magahern
2020-07-31 16:36:10 -07:00
parent 5457a05309
commit 030c1db45c
4 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SBrowser.xcodeproj/project.pbxproj
View File

@@ -12,6 +12,7 @@
1A14FC2824D26749009B3F83 /* Tab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A14FC2724D26749009B3F83 /* Tab.swift */; };
1AB88EFD24D3BA560006F850 /* TabController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB88EFC24D3BA560006F850 /* TabController.swift */; };
1AB88EFF24D3BBA50006F850 /* TabPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB88EFE24D3BBA50006F850 /* TabPickerViewController.swift */; };
1AB88F0624D4D3A90006F850 /* UIGestureRecognizer+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AB88F0524D4D3A90006F850 /* UIGestureRecognizer+Actions.swift */; };
1ADFF46024C7DE53006DC7AE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF45F24C7DE53006DC7AE /* AppDelegate.swift */; };
1ADFF46224C7DE53006DC7AE /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF46124C7DE53006DC7AE /* SceneDelegate.swift */; };
1ADFF46924C7DE54006DC7AE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1ADFF46824C7DE54006DC7AE /* Assets.xcassets */; };
@@ -62,6 +63,7 @@
1A14FC2724D26749009B3F83 /* Tab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tab.swift; sourceTree = "<group>"; };
1AB88EFC24D3BA560006F850 /* TabController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabController.swift; sourceTree = "<group>"; };
1AB88EFE24D3BBA50006F850 /* TabPickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabPickerViewController.swift; sourceTree = "<group>"; };
1AB88F0524D4D3A90006F850 /* UIGestureRecognizer+Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIGestureRecognizer+Actions.swift"; sourceTree = "<group>"; };
1ADFF45C24C7DE53006DC7AE /* SBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
1ADFF45F24C7DE53006DC7AE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
1ADFF46124C7DE53006DC7AE /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -238,6 +240,7 @@
children = (
1ADFF4C224CA6AF6006DC7AE /* CGPoint+Utils.swift */,
1ADFF4C624CA6DEB006DC7AE /* UIEdgeInsets+Layout.swift */,
1AB88F0524D4D3A90006F850 /* UIGestureRecognizer+Actions.swift */,
);
path = Utilities;
sourceTree = "<group>";
@@ -360,6 +363,7 @@
1ADFF47424C7DE9C006DC7AE /* BrowserViewController.swift in Sources */,
1ADFF4D024CBBCD1006DC7AE /* ScriptPolicyControl.swift in Sources */,
1ADFF48D24C8C176006DC7AE /* SBRProcessBundleBridge.m in Sources */,
1AB88F0624D4D3A90006F850 /* UIGestureRecognizer+Actions.swift in Sources */,
1ADFF46224C7DE53006DC7AE /* SceneDelegate.swift in Sources */,
1ADFF4CB24CB8278006DC7AE /* ScriptControllerIconView.swift in Sources */,
1AB88EFD24D3BA560006F850 /* TabController.swift in Sources */,

16
SBrowser/Browser View/BrowserViewController.swift
View File

@@ -123,6 +123,22 @@ class BrowserViewController: UIViewController, WKNavigationDelegate,
self.present(navController, animated: true, completion: nil)
}), for: .touchUpInside)
let newTabAction = UIAction { [unowned self] action in
if let gestureRecognizer = action.sender as? UILongPressGestureRecognizer {
if gestureRecognizer.state != .began { return }
}
// Create new tab
let newTab = tabController.createNewTab(url: nil)
self.tab = newTab
}
let gestureRecognizer = UILongPressGestureRecognizer(action: newTabAction)
toolbarController.windowButton.addGestureRecognizer(gestureRecognizer)
// New tab button
toolbarController.newTabButton.addAction(newTabAction, for: .touchUpInside)
// TextField delegate
toolbarController.urlBar.textField.delegate = self

5
SBrowser/Titlebar and URL Bar/ToolbarViewController.swift
View File

@@ -155,6 +155,7 @@ class ToolbarViewController: UIViewController
let windowButton = UIButton(frame: .zero)
let backButton = UIButton(frame: .zero)
let forwardButton = UIButton(frame: .zero)
let newTabButton = UIButton(frame: .zero)
var darkModeEnabled: Bool = false {
didSet {
@@ -189,6 +190,9 @@ class ToolbarViewController: UIViewController
// Forward button
forwardButton.setImage(UIImage(systemName: "chevron.right"), for: .normal)
// New tab button
newTabButton.setImage(UIImage(systemName: "plus"), for: .normal)
let toolbarAnimationDuration: TimeInterval = 0.3
urlBar.textField.addAction(.init(handler: { [traitCollection, toolbarView, urlBar] _ in
if traitCollection.horizontalSizeClass == .compact {
@@ -223,6 +227,7 @@ class ToolbarViewController: UIViewController
toolbarView.trailingButtonsView.addButtonView(darkModeButton)
toolbarView.trailingButtonsView.addButtonView(shareButton)
toolbarView.trailingButtonsView.addButtonView(scriptControllerIconView)
toolbarView.trailingButtonsView.addButtonView(newTabButton)
toolbarView.trailingButtonsView.addButtonView(windowButton)
}
}

16
SBrowser/Utilities/UIGestureRecognizer+Actions.swift Normal file
View File

@@ -0,0 +1,16 @@
//
// UIGestureRecognizer+Actions.swift
// SBrowser
//
// Created by James Magahern on 7/31/20.
//
import UIKit
extension UIGestureRecognizer
{
convenience init(action: UIAction) {
self.init(target: action, action: NSSelectorFromString("_performActionWithSender:"))
objc_setAssociatedObject(self, "associatedUIAction", action, .OBJC_ASSOCIATION_RETAIN)
}
}