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

Merge branch 'develop' into non-pure-black-mode

This commit is contained in:
Shadowfacts 2023-02-02 23:14:27 -05:00
parent 20c4c4bb2f af8a9faaeb
commit 512eec09a8
2 changed files with 98 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,11 @@
// //
import SwiftUI import SwiftUI
import TTTKit
struct PreferencesView: View { struct PreferencesView: View {
let mastodonController: MastodonController let mastodonController: MastodonController
@ObservedObject var localData = LocalData.shared
@ObservedObject private var localData = LocalData.shared
@State private var showingLogoutConfirmation = false @State private var showingLogoutConfirmation = false
init(mastodonController: MastodonController) { init(mastodonController: MastodonController) {
@ -18,101 +18,109 @@ struct PreferencesView: View {
} }
var body: some View { var body: some View {
// workaround: the navigation view is provided by MyProfileTableViewController so that it can inject the Done button List {
// NavigationView { accountsSection
List { preferencesSection
Section(header: Text("Accounts")) { aboutSection
ForEach(localData.accounts, id: \.accessToken) { (account) in }
Button(action: { .listStyle(.insetGrouped)
NotificationCenter.default.post(name: .activateAccount, object: nil, userInfo: ["account": account]) .navigationBarTitle("Preferences")
}) { .navigationBarTitleDisplayMode(.inline)
HStack { }
LocalAccountAvatarView(localAccountInfo: account)
VStack(alignment: .leading) { private var accountsSection: some View {
Text(verbatim: account.username) Section {
.foregroundColor(.primary) ForEach(localData.accounts, id: \.accessToken) { (account) in
Text(verbatim: account.instanceURL.host!) Button(action: {
.font(.caption) NotificationCenter.default.post(name: .activateAccount, object: nil, userInfo: ["account": account])
.foregroundColor(.primary) }) {
} HStack {
Spacer() LocalAccountAvatarView(localAccountInfo: account)
if account == mastodonController.accountInfo! { VStack(alignment: .leading) {
Image(systemName: "checkmark") Text(verbatim: account.username)
.renderingMode(.template) .foregroundColor(.primary)
.foregroundColor(.secondary) Text(verbatim: account.instanceURL.host!)
} .font(.caption)
} .foregroundColor(.primary)
}.onDrag {
let activity = UserActivityManager.mainSceneActivity(accountID: account.id)
return NSItemProvider(object: activity)
} }
}.onDelete { (indices: IndexSet) in Spacer()
var indices = indices if account == mastodonController.accountInfo! {
var logoutFromCurrent = false Image(systemName: "checkmark")
if let index = indices.first(where: { localData.accounts[$0] == mastodonController.accountInfo! }) { .renderingMode(.template)
logoutFromCurrent = true .foregroundColor(.secondary)
indices.remove(index)
}
indices.forEach { LogoutService(accountInfo: localData.accounts[$0]).run() }
if logoutFromCurrent {
self.logoutPressed()
}
}
Button(action: {
NotificationCenter.default.post(name: .addAccount, object: nil)
}) {
Text("Add Account...")
}
if localData.getMostRecentAccount() != nil {
Button(action: {
self.showingLogoutConfirmation = true
}) {
Text("Logout from current")
}.alert(isPresented: $showingLogoutConfirmation) {
Alert(title: Text("Are you sure you want to logout?"), message: nil, primaryButton: .destructive(Text("Logout"), action: self.logoutPressed), secondaryButton: .cancel())
} }
} }
}.onDrag {
let activity = UserActivityManager.mainSceneActivity(accountID: account.id)
return NSItemProvider(object: activity)
}
}.onDelete { (indices: IndexSet) in
var indices = indices
var logoutFromCurrent = false
if let index = indices.first(where: { localData.accounts[$0] == mastodonController.accountInfo! }) {
logoutFromCurrent = true
indices.remove(index)
} }
Section { indices.forEach { LogoutService(accountInfo: localData.accounts[$0]).run() }
NavigationLink(destination: AppearancePrefsView()) {
Text("Appearance")
}
NavigationLink(destination: ComposingPrefsView()) {
Text("Composing")
}
NavigationLink(destination: MediaPrefsView()) {
Text("Media")
}
NavigationLink(destination: BehaviorPrefsView()) {
Text("Behavior")
}
NavigationLink(destination: WellnessPrefsView()) {
Text("Digital Wellness")
}
NavigationLink(destination: AdvancedPrefsView()) {
Text("Advanced")
}
}
Section { if logoutFromCurrent {
NavigationLink("About") { self.logoutPressed()
AboutView()
}
NavigationLink("Tip Jar") {
TipJarView()
}
NavigationLink("Acknowledgements") {
AcknowledgementsView()
}
} }
} }
.listStyle(InsetGroupedListStyle())
.navigationBarTitle(Text("Preferences"), displayMode: .inline) Button(action: {
// } NotificationCenter.default.post(name: .addAccount, object: nil)
}) {
Text("Add Account...")
}
Button(action: {
self.showingLogoutConfirmation = true
}) {
Text("Logout from current")
}.alert(isPresented: $showingLogoutConfirmation) {
Alert(title: Text("Are you sure you want to logout?"), message: nil, primaryButton: .destructive(Text("Logout"), action: self.logoutPressed), secondaryButton: .cancel())
}
} header: {
Text("Accounts")
}
}
private var preferencesSection: some View {
Section {
NavigationLink(destination: AppearancePrefsView()) {
Text("Appearance")
}
NavigationLink(destination: ComposingPrefsView()) {
Text("Composing")
}
NavigationLink(destination: MediaPrefsView()) {
Text("Media")
}
NavigationLink(destination: BehaviorPrefsView()) {
Text("Behavior")
}
NavigationLink(destination: WellnessPrefsView()) {
Text("Digital Wellness")
}
NavigationLink(destination: AdvancedPrefsView()) {
Text("Advanced")
}
}
}
private var aboutSection: some View {
Section {
NavigationLink("About") {
AboutView()
}
NavigationLink("Tip Jar") {
TipJarView()
}
NavigationLink("Acknowledgements") {
AcknowledgementsView()
}
}
} }
func logoutPressed() { func logoutPressed() {

1
Tusker/Screens/Profile/MyProfileViewController.swift
View File

@ -8,6 +8,7 @@
import UIKit import UIKit
import Pachyderm import Pachyderm
import SwiftUI
class MyProfileViewController: ProfileViewController { class MyProfileViewController: ProfileViewController {