Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Long press on urlbar theme colors (#450)
- Loading branch information
|
|
@@ -1647,12 +1647,7 @@ extension BrowserViewController: URLBarDelegate { |
|
let urlActions = self.getLongPressLocationBarActions(with: urlBar)
|
|
let urlActions = self.getLongPressLocationBarActions(with: urlBar)
|
|
let generator = UIImpactFeedbackGenerator(style: .heavy)
|
|
let generator = UIImpactFeedbackGenerator(style: .heavy)
|
|
generator.impactOccurred()
|
|
generator.impactOccurred()
|
|
if #available(iOS 11.0, *), let tab = self.tabManager.selectedTab {
|
|
self.presentSheetWith(actions: [urlActions], on: self, from: urlBar)
|
|
let trackingProtectionMenu = self.getTrackingMenu(for: tab, presentingOn: urlBar)
|
|
|
|
self.presentSheetWith(actions: [urlActions, trackingProtectionMenu], on: self, from: urlBar)
|
|
|
|
} else {
|
|
|
|
self.presentSheetWith(actions: [urlActions], on: self, from: urlBar)
|
|
|
|
}
|
|
|
|
// Cliqz: Close control center or vpn panel
|
|
// Cliqz: Close control center or vpn panel
|
|
self.hidePrivacyPanel()
|
|
self.hidePrivacyPanel()
|
|
}
|
|
}
|
|
|
|
|
|
@@ -95,7 +95,7 @@ class PhotonActionSheet: UIViewController, UITableViewDelegate, UITableViewDataS |
|
let button = UIButton()
|
|
let button = UIButton()
|
|
button.setTitle(Strings.CloseButtonTitle, for: .normal)
|
|
button.setTitle(Strings.CloseButtonTitle, for: .normal)
|
|
button.backgroundColor = UIColor.theme.actionMenu.closeButtonBackground
|
|
button.backgroundColor = UIColor.theme.actionMenu.closeButtonBackground
|
|
button.setTitleColor(UIConstants.SystemBlueColor, for: .normal)
|
|
button.setTitleColor(UIColor.theme.actionMenu.foreground, for: .normal)
|
|
button.layer.cornerRadius = PhotonActionSheetUX.CornerRadius
|
|
button.layer.cornerRadius = PhotonActionSheetUX.CornerRadius
|
|
button.titleLabel?.font = DynamicFontHelper.defaultHelper.DeviceFontExtraLargeBold
|
|
button.titleLabel?.font = DynamicFontHelper.defaultHelper.DeviceFontExtraLargeBold
|
|
button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
|
|
button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
|
|
|
|
|
|
@@ -28,7 +28,7 @@ fileprivate class DarkTableViewColor: TableViewColor { |
|
}
|
|
}
|
|
|
|
|
|
fileprivate class DarkActionMenuColor: ActionMenuColor {
|
|
fileprivate class DarkActionMenuColor: ActionMenuColor {
|
|
override var foreground: UIColor { return defaultTextAndTint }
|
|
override var foreground: UIColor { return UIColor.white }
|
|
override var iPhoneBackground: UIColor { return UIColor.Photon.Grey90.withAlphaComponent(0.9) }
|
|
override var iPhoneBackground: UIColor { return UIColor.Photon.Grey90.withAlphaComponent(0.9) }
|
|
override var closeButtonBackground: UIColor { return defaultBackground }
|
|
override var closeButtonBackground: UIColor { return defaultBackground }
|
|
|
|
|
|
|
|