-
Notifications
You must be signed in to change notification settings - Fork 893
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix brave/brave-ios#7592: Alternative - New Keyboard Shortcuts for ta…
…bs "reopen" and "reverse navigation" And Zoom In Zoom Out (brave/brave-ios#8391)
- Loading branch information
1 parent
98d369d
commit a761e6a
Showing
6 changed files
with
132 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
Sources/Brave/Frontend/Browser/PageZoom/PageZoomHandler.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| // Copyright 2023 The Brave Authors. All rights reserved. | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| import Foundation | ||
| import Shared | ||
| import Data | ||
| import Preferences | ||
|
|
||
| class PageZoomHandler: ObservableObject { | ||
|
|
||
| enum ChangeStatus { | ||
| case increment, decrement | ||
| } | ||
|
|
||
| private weak var webView: BraveWebView? | ||
| let isPrivateBrowsing: Bool | ||
|
|
||
| static let steps = [0.5, 0.75, 0.85, | ||
| 1.0, 1.15, 1.25, | ||
| 1.50, 1.75, 2.00, | ||
| 2.50, 3.0] | ||
| static let propertyName = "viewScale" | ||
| @Published var currentValue: Double = 1.0 | ||
|
|
||
| required init(tab: Tab?, isPrivateBrowsing: Bool) { | ||
| self.webView = tab?.webView | ||
| self.isPrivateBrowsing = isPrivateBrowsing | ||
|
|
||
| // Private Browsing on Safari iOS always defaults to 100%, and isn't persistently saved. | ||
| if isPrivateBrowsing { | ||
| currentValue = 1.0 | ||
| return | ||
| } | ||
|
|
||
| if let webView = webView { | ||
| // Fetch the current value for zoom | ||
| if let url = webView.url, let domain = Domain.getPersistedDomain(for: url) { | ||
| currentValue = domain.zoom_level?.doubleValue ?? Preferences.General.defaultPageZoomLevel.value | ||
| } else { | ||
| currentValue = webView.value(forKey: Self.propertyName) as? Double ?? Preferences.General.defaultPageZoomLevel.value | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func changeZoomLevel(_ status: ChangeStatus) { | ||
| switch status { | ||
| case .increment: | ||
| guard let index = Self.steps.firstIndex(of: currentValue), | ||
| index + 1 < Self.steps.count else { return } | ||
|
|
||
| currentValue = Self.steps[index + 1] | ||
| case .decrement: | ||
| guard let index = Self.steps.firstIndex(of: currentValue), | ||
| index - 1 >= 0 else { return } | ||
| currentValue = Self.steps[index - 1] | ||
| } | ||
|
|
||
| // Setting the value | ||
| storeChanges() | ||
| } | ||
|
|
||
| func reset() { | ||
| currentValue = Preferences.General.defaultPageZoomLevel.value | ||
| storeChanges() | ||
| } | ||
|
|
||
| private func storeChanges() { | ||
| guard let webView = webView, | ||
| let url = webView.url else { return } | ||
|
|
||
| webView.setValue(currentValue, forKey: PageZoomHandler.propertyName) | ||
|
|
||
| // Do NOT store the changes in the Domain | ||
| if !isPrivateBrowsing { | ||
| let domain = Domain.getPersistedDomain(for: url)?.then { | ||
| $0.zoom_level = currentValue == $0.zoom_level?.doubleValue ? nil : NSNumber(value: currentValue) | ||
| } | ||
|
|
||
| try? domain?.managedObjectContext?.save() | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters