Fahim
/
Tusker
forked from shadowfacts/Tusker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for iOS 13 beta 5

This commit is contained in:
Shadowfacts 2019-08-05 21:08:00 -06:00
parent abd73fbe3b
commit 7064ae950e
Signed by untrusted user: shadowfacts
GPG Key ID: 94A5AB95422746E5
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tusker/Preferences/Preference.swift
View File

@ -14,9 +14,9 @@ struct Preference<Value>: BindingConvertible {
init(_ path: WritableKeyPath<Preferences, Value>) {
self.path = path
self.binding = Binding(getValue: {
self.binding = Binding(get: {
return Preferences.shared[keyPath: path]
}, setValue: { (newValue) in
}, set: { (newValue) in
Preferences.shared[keyPath: path] = newValue
})
}
@ -42,9 +42,9 @@ struct MappedPreference<Value, PrefValue>: BindingConvertible {
self.path = path
self.fromPref = fromPref
self.toPref = toPref
self.binding = Binding(getValue: {
self.binding = Binding(get: {
return fromPref(Preferences.shared[keyPath: path])
}, setValue: { (newValue) in
}, set: { (newValue) in
Preferences.shared[keyPath: path] = toPref(newValue)
})
}

24
Tusker/Preferences/Preferences.swift
View File

@ -11,7 +11,7 @@ import Pachyderm
import SwiftUI
import Combine
class Preferences: Codable, BindableObject {
class Preferences: Codable, ObservableObject {
static var shared: Preferences = load()
@ -35,23 +35,23 @@ class Preferences: Codable, BindableObject {
private init() {}
typealias PublisherType = PassthroughSubject<Preferences, Never>
let willChange = PassthroughSubject<Preferences, Never>()
typealias ObjectWillChangePublisher = PassthroughSubject<Preferences, Never>
let objectWillChange = PassthroughSubject<Preferences, Never>()
// MARK: - Appearance
var showRepliesInProfiles = false { willSet { willChange.send(self) } }
var avatarStyle = AvatarStyle.roundRect { willSet { willChange.send(self) } }
var hideCustomEmojiInUsernames = false { willSet { willChange.send(self) } }
var showRepliesInProfiles = false { willSet { objectWillChange.send(self) } }
var avatarStyle = AvatarStyle.roundRect { willSet { objectWillChange.send(self) } }
var hideCustomEmojiInUsernames = false { willSet { objectWillChange.send(self) } }
// MARK: - Behavior
var defaultPostVisibility = Status.Visibility.public { willSet { willChange.send(self) } }
var automaticallySaveDrafts = true { willSet { willChange.send(self) } }
var contentWarningCopyMode = ContentWarningCopyMode.asIs { willSet { willChange.send(self) } }
var openLinksInApps = true { willSet { willChange.send(self) } }
var defaultPostVisibility = Status.Visibility.public { willSet { objectWillChange.send(self) } }
var automaticallySaveDrafts = true { willSet { objectWillChange.send(self) } }
var contentWarningCopyMode = ContentWarningCopyMode.asIs { willSet { objectWillChange.send(self) } }
var openLinksInApps = true { willSet { objectWillChange.send(self) } }
// MARK: - Advanced
var silentActions: [String: Permission] = [:] { willSet { willChange.send(self) } }
var statusContentType: StatusContentType = .plain { willSet { willChange.send(self) } }
var silentActions: [String: Permission] = [:] { willSet { objectWillChange.send(self) } }
var statusContentType: StatusContentType = .plain { willSet { objectWillChange.send(self) } }
}

2
Tusker/Screens/Preferences/AdvancedPrefsView.swift
View File

@ -15,7 +15,7 @@ struct AdvancedPrefsView : View {
List {
formattingSection
automationSection
}.listStyle(.grouped)
}.listStyle(GroupedListStyle())
.navigationBarTitle(Text("Advanced"))
}

2
Tusker/Screens/Preferences/AppearancePrefsView.swift
View File

@ -26,7 +26,7 @@ struct AppearancePrefsView : View {
Text("Hide Custom Emoji in Usernames")
}
}
.listStyle(.grouped)
.listStyle(GroupedListStyle())
.navigationBarTitle(Text("Appearance"))
}
}

2
Tusker/Screens/Preferences/BehaviorPrefsView.swift
View File

@ -18,7 +18,7 @@ struct BehaviorPrefsView : View {
List {
section1
section2
}.listStyle(.grouped)
}.listStyle(GroupedListStyle())
.navigationBarTitle(Text("Behavior"))
}

2
Tusker/Screens/Preferences/PreferencesView.swift
View File

@ -22,7 +22,7 @@ struct PreferencesView : View {
Text("Advanced")
}
}
.listStyle(.grouped)
.listStyle(GroupedListStyle())
.navigationBarTitle(Text("Preferences"), displayMode: .inline)
.onDisappear {
// todo: this onDisappear callback is not called in beta 4, check again in beta 5

6
Tusker/Screens/Preferences/SilentActionPrefs.swift
View File

@ -37,7 +37,7 @@ struct SilentActionPrefs : View {
List(Array(preferences.silentActions.keys), id: \.self) { source in
SilentActionPermissionCell(source: source)
}
.listStyle(.grouped)
.listStyle(GroupedListStyle())
// .navigationBarTitle("Silent Action Permissions")
// see FB6838291
// List(Array(silentActions.keys).identified(by: \.self)) { application in
@ -58,9 +58,9 @@ struct SilentActionPermissionCell: View {
}
var body: some View {
Toggle(isOn: Binding(getValue: {
Toggle(isOn: Binding(get: {
self.preferences.silentActions[self.source] == .accepted
}, setValue: {
}, set: {
self.preferences.silentActions[self.source] = $0 ? .accepted : .rejected
})) {
Text(verbatim: source)

2
Tusker/Screens/Utilities/EnhancedTableViewController.swift
View File

@ -15,7 +15,7 @@ class EnhancedTableViewController: UITableViewController {
private var topOffset: CGPoint {
// when scrolled to top, the content offset is negative the height of the UI above the scroll view (i.e. the nav and status bars)
let windowScene = UIApplication.shared.keyWindow!.windowScene!
let windowScene = view.window!.windowScene!
let barOffset = -1 * (navigationController!.navigationBar.frame.height + windowScene.statusBarManager!.statusBarFrame.height)
// add one so it's not technically all the way at the top, and scrollViewWShouldScrollToTop is still called to trigger undo
return CGPoint(x: 0, y: barOffset + 1)