Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-05 02:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

iOS 14/macOS Big Sur Support

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-11-28 15:37:55 +01:00
parent 696751e07c
commit 5ef89ac9f4
57 changed files with 1147 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
macOS/Settings/InstancesSettings.swift → macOS/InstancesSettings.swift
View File

@@ -40,7 +40,7 @@ struct InstancesSettings: View {
if !selectedInstance.isNil, selectedInstance.app.supportsAccounts {
SettingsHeader(text: "Accounts")
List(selection: $selectedAccount) {
let list = List(selection: $selectedAccount) {
if selectedInstanceAccounts.isEmpty {
Text("You have no accounts for this instance")
.foregroundColor(.secondary)
@@ -51,7 +51,7 @@ struct InstancesSettings: View {
Spacer()
Button("Remove", role: .destructive) {
Button("Remove") {
presentingAccountRemovalConfirmation = true
}
.foregroundColor(.red)
@@ -60,30 +60,40 @@ struct InstancesSettings: View {
.tag(account)
}
}
.confirmationDialog(
"Are you sure you want to remove \(selectedAccount?.description ?? "") account?",
isPresented: $presentingAccountRemovalConfirmation
) {
Button("Remove", role: .destructive) {
AccountsModel.remove(selectedAccount!)
}
.alert(isPresented: $presentingAccountRemovalConfirmation) {
Alert(
title: Text(
"Are you sure you want to remove \(selectedAccount?.description ?? "") account?"
),
message: Text("This cannot be undone"),
primaryButton: .destructive(Text("Delete")) {
AccountsModel.remove(selectedAccount!)
},
secondaryButton: .cancel()
)
}
if #available(macOS 12.0, *) {
list
.listStyle(.inset(alternatesRowBackgrounds: true))
} else {
list
}
.listStyle(.inset(alternatesRowBackgrounds: true))
}
if selectedInstance != nil, selectedInstance.app.hasFrontendURL {
SettingsHeader(text: "Frontend URL")
TextField("Frontend URL", text: $frontendURL, prompt: Text("Frontend URL"))
.onAppear {
frontendURL = selectedInstance.frontendURL ?? ""
TextField("Frontend URL", text: $frontendURL)
.onChange(of: selectedInstance) { _ in
frontendURL = selectedInstanceFrontendURL
}
.onChange(of: frontendURL) { newValue in
InstancesModel.setFrontendURL(selectedInstance, newValue)
}
.labelsHidden()
Text("If provided, you can copy links from videos, channels and playlist")
Text("Used to create links from videos, channels and playlist")
.font(.caption)
.foregroundColor(.secondary)
}
@@ -105,23 +115,26 @@ struct InstancesSettings: View {
Spacer()
Button("Remove Instance", role: .destructive) {
Button("Remove Instance") {
presentingInstanceRemovalConfirmation = true
}
.confirmationDialog(
"Are you sure you want to remove \(selectedInstance!.longDescription) instance?",
isPresented: $presentingInstanceRemovalConfirmation
) {
Button("Remove Instance", role: .destructive) {
if accounts.current?.instance == selectedInstance {
accounts.setCurrent(nil)
}
.alert(isPresented: $presentingInstanceRemovalConfirmation) {
Alert(
title: Text(
"Are you sure you want to remove \(selectedInstance!.longDescription) instance?"
),
message: Text("This cannot be undone"),
primaryButton: .destructive(Text("Remove")) {
if accounts.current?.instance == selectedInstance {
accounts.setCurrent(nil)
}
InstancesModel.remove(selectedInstance!)
selectedInstanceID = instances.last?.id
}
InstancesModel.remove(selectedInstance!)
selectedInstanceID = instances.last?.id
},
secondaryButton: .cancel()
)
}
.foregroundColor(.red)
}
}
@@ -134,6 +147,7 @@ struct InstancesSettings: View {
.onAppear {
selectedInstanceID = instances.first?.id
frontendURL = selectedInstanceFrontendURL
}
.sheet(isPresented: $presentingAccountForm) {
AccountForm(instance: selectedInstance, selectedAccount: $selectedAccount)
@@ -154,6 +168,10 @@ struct InstancesSettings: View {
InstancesModel.find(selectedInstanceID)
}
var selectedInstanceFrontendURL: String {
selectedInstance?.frontendURL ?? ""
}
private var selectedInstanceAccounts: [Account] {
guard selectedInstance != nil else {
return []