Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-09 20:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor naming improvements

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-10-23 13:51:02 +02:00
parent 7ab5886ed4
commit 512613d350
14 changed files with 143 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Shared/Settings/AccountFormView.swift → Shared/Settings/AccountForm.swift
View File

@@ -1,7 +1,7 @@
import Defaults
import SwiftUI
struct AccountFormView: View {
struct AccountForm: View {
let instance: Instance
var selectedAccount: Binding<Account?>?
@@ -83,7 +83,7 @@ struct AccountFormView: View {
var footer: some View {
HStack {
ValidationStatusView(isValid: $isValid, isValidated: $isValidated, isValidating: $isValidating, error: .constant(nil))
AccountValidationStatus(isValid: $isValid, isValidated: $isValidated, isValidating: $isValidating, error: .constant(nil))
Spacer()
@@ -145,6 +145,6 @@ struct AccountFormView: View {
struct AccountFormView_Previews: PreviewProvider {
static var previews: some View {
AccountFormView(instance: Instance.fixture)
AccountForm(instance: Instance.fixture)
}
}

2
Shared/Settings/ValidationStatusView.swift → Shared/Settings/AccountValidationStatus.swift
View File

@@ -1,7 +1,7 @@
import Foundation
import SwiftUI
struct ValidationStatusView: View {
struct AccountValidationStatus: View {
@Binding var isValid: Bool
@Binding var isValidated: Bool
@Binding var isValidating: Bool

4
Shared/Settings/AccountsSettingsView.swift → Shared/Settings/AccountsSettings.swift
View File

@@ -1,6 +1,6 @@
import SwiftUI
struct AccountsSettingsView: View {
struct AccountsSettings: View {
let instanceID: Instance.ID?
@State private var accountsChanged = false
@@ -50,7 +50,7 @@ struct AccountsSettingsView: View {
}
}
.sheet(isPresented: $presentingAccountForm, onDismiss: { accountsChanged.toggle() }) {
AccountFormView(instance: instance)
AccountForm(instance: instance)
}
#if os(iOS)
.listStyle(.insetGrouped)

6
Shared/Settings/InstanceFormView.swift → Shared/Settings/InstanceForm.swift
View File

@@ -1,6 +1,6 @@
import SwiftUI
struct InstanceFormView: View {
struct InstanceForm: View {
@Binding var savedInstanceID: Instance.ID?
@State private var name = ""
@@ -94,7 +94,7 @@ struct InstanceFormView: View {
private var footer: some View {
HStack(alignment: .center) {
ValidationStatusView(isValid: $isValid, isValidated: $isValidated, isValidating: $isValidating, error: $validationError)
AccountValidationStatus(isValid: $isValid, isValidated: $isValidated, isValidating: $isValidating, error: $validationError)
Spacer()
@@ -154,6 +154,6 @@ struct InstanceFormView: View {
struct InstanceFormView_Previews: PreviewProvider {
static var previews: some View {
InstanceFormView(savedInstanceID: .constant(nil))
InstanceForm(savedInstanceID: .constant(nil))
}
}

8
Shared/Settings/InstancesSettingsView.swift → Shared/Settings/InstancesSettings.swift
View File

@@ -1,7 +1,7 @@
import Defaults
import SwiftUI
struct InstancesSettingsView: View {
struct InstancesSettings: View {
@Default(.instances) private var instances
@EnvironmentObject<AccountsModel> private var accounts
@@ -21,7 +21,7 @@ struct InstancesSettingsView: View {
ForEach(instances) { instance in
Group {
NavigationLink(instance.longDescription) {
AccountsSettingsView(instanceID: instance.id)
AccountsSettings(instanceID: instance.id)
}
}
#if os(iOS)
@@ -43,7 +43,7 @@ struct InstancesSettingsView: View {
#endif
}
.sheet(isPresented: $presentingInstanceForm) {
InstanceFormView(savedInstanceID: $savedFormInstanceID)
InstanceForm(savedInstanceID: $savedFormInstanceID)
}
}
@@ -66,7 +66,7 @@ struct InstancesSettingsView: View {
struct InstancesSettingsView_Previews: PreviewProvider {
static var previews: some View {
VStack {
InstancesSettingsView()
InstancesSettings()
}
.frame(width: 400, height: 270)
.environmentObject(InstancesModel())

2
Shared/Settings/PlaybackSettingsView.swift → Shared/Settings/PlaybackSettings.swift
View File

@@ -1,7 +1,7 @@
import Defaults
import SwiftUI
struct PlaybackSettingsView: View {
struct PlaybackSettings: View {
@Default(.quality) private var quality
var body: some View {

20
Shared/Settings/ServicesSettings.swift Normal file
View File

@@ -0,0 +1,20 @@
//
// ServicesSettings.swift
// Pearvidious
//
// Created by Arkadiusz Fal on 23/10/2021.
//
import SwiftUI
struct ServicesSettings: View {
var body: some View {
Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
}
}
struct ServicesSettings_Previews: PreviewProvider {
static var previews: some View {
ServicesSettings()
}
}

8
Shared/Settings/SettingsView.swift
View File

@@ -17,7 +17,7 @@ struct SettingsView: View {
#if os(macOS)
TabView {
Form {
InstancesSettingsView()
InstancesSettings()
}
.tabItem {
Label("Instances", systemImage: "server.rack")
@@ -25,7 +25,7 @@ struct SettingsView: View {
.tag(Tabs.instances)
Form {
PlaybackSettingsView()
PlaybackSettings()
}
.tabItem {
Label("Playback", systemImage: "play.rectangle.on.rectangle.fill")
@@ -40,8 +40,8 @@ struct SettingsView: View {
#if os(tvOS)
AccountSelectionView()
#endif
InstancesSettingsView()
PlaybackSettingsView()
InstancesSettings()
PlaybackSettings()
}
.navigationTitle("Settings")
.toolbar {