Skip to content

[trello.com/c/QBfqpo6A] Handle case when it does not save width for split view controller #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[trello.com/c/QBfqpo6A] Handle case when it does not save width for split view controller #848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Adamant/App/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ private func makeSplitController(storageKey: UserDefaultsKey) -> UISplitViewCont

controller.preferredDisplayMode = .oneBesideSecondary

let minimumPrimaryColumnWidth: CGFloat = UIScreen.main.bounds.width * 0.2
let minimumPrimaryColumnWidth: CGFloat = UIScreen.main.bounds.width * 0.1666
// Set the minimum ratio to 1:5, or to 300px if 1:5 results in a smaller value
controller.minimumPrimaryColumnWidth = minimumPrimaryColumnWidth > 400 ? minimumPrimaryColumnWidth : 400

Expand All @@ -785,12 +785,11 @@ private func makeSplitController(storageKey: UserDefaultsKey) -> UISplitViewCont
}

private final class AdamantSplitViewController: UISplitViewController {
var storageKey: UserDefaultsKey = .leftSplitViewController
var storageKey: UserDefaultsKey? = .none

override func viewDidLoad() {
super.viewDidLoad()
let stored = UserDefaults.standard.object(forKey: storageKey.rawValue) as? Double
guard let stored = stored, stored > 0.3334, stored < 0.75 else {
guard let key = storageKey?.rawValue, let stored = (UserDefaults.standard.object(forKey: key) as? Double), stored >= 0.1666, stored <= 0.75 else {
preferredPrimaryColumnWidthFraction = 0.3334
return
}
Expand All @@ -799,7 +798,8 @@ private final class AdamantSplitViewController: UISplitViewController {

override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
guard let key = storageKey?.rawValue else { return }
let fraction = primaryColumnWidth / view.bounds.width
UserDefaults.standard.set(fraction, forKey: storageKey.rawValue)
UserDefaults.standard.set(fraction, forKey: key)
}
}
Loading