From 52dea5bef3894a38e2ffbbe959f87332872ab842 Mon Sep 17 00:00:00 2001 From: Krzysztof Jan Modras Date: Wed, 21 Aug 2019 11:52:46 +0200 Subject: [PATCH] Long press on urlbar theme colors (#450) fixes #447 --- Client/Frontend/Browser/BrowserViewController.swift | 7 +------ Client/Frontend/Widgets/PhotonActionSheet.swift | 2 +- Cliqz/Theme/GhosteryDarkTheme.swift | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift index a87864a2b..6a821a06c 100644 --- a/Client/Frontend/Browser/BrowserViewController.swift +++ b/Client/Frontend/Browser/BrowserViewController.swift @@ -1647,12 +1647,7 @@ extension BrowserViewController: URLBarDelegate { let urlActions = self.getLongPressLocationBarActions(with: urlBar) let generator = UIImpactFeedbackGenerator(style: .heavy) generator.impactOccurred() - if #available(iOS 11.0, *), let tab = self.tabManager.selectedTab { - 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) - } + self.presentSheetWith(actions: [urlActions], on: self, from: urlBar) // Cliqz: Close control center or vpn panel self.hidePrivacyPanel() } diff --git a/Client/Frontend/Widgets/PhotonActionSheet.swift b/Client/Frontend/Widgets/PhotonActionSheet.swift index 7807622df..d618bfa22 100644 --- a/Client/Frontend/Widgets/PhotonActionSheet.swift +++ b/Client/Frontend/Widgets/PhotonActionSheet.swift @@ -95,7 +95,7 @@ class PhotonActionSheet: UIViewController, UITableViewDelegate, UITableViewDataS let button = UIButton() button.setTitle(Strings.CloseButtonTitle, for: .normal) 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.titleLabel?.font = DynamicFontHelper.defaultHelper.DeviceFontExtraLargeBold button.addTarget(self, action: #selector(dismiss), for: .touchUpInside) diff --git a/Cliqz/Theme/GhosteryDarkTheme.swift b/Cliqz/Theme/GhosteryDarkTheme.swift index ba377031e..d3d239842 100644 --- a/Cliqz/Theme/GhosteryDarkTheme.swift +++ b/Cliqz/Theme/GhosteryDarkTheme.swift @@ -28,7 +28,7 @@ fileprivate class DarkTableViewColor: TableViewColor { } 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 closeButtonBackground: UIColor { return defaultBackground }