Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-10-11 01:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instance and account form and validation improvements

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-12-17 15:57:59 +01:00
parent 9f3a94137c
commit cf0572a94b
4 changed files with 109 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Shared/Settings/InstanceForm.swift
View File

@@ -22,9 +22,14 @@ struct InstanceForm: View {
VStack(alignment: .leading) {
Group {
header
form
#if os(macOS)
VStack {
validationStatus
}
.frame(minHeight: 60, alignment: .topLeading)
.padding(.horizontal, 15)
#endif
footer
}
.frame(maxWidth: 1000)
@@ -36,7 +41,8 @@ struct InstanceForm: View {
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
.background(Color.background(scheme: colorScheme))
#else
.frame(width: 400, height: 150)
.frame(width: 400, height: 180)
.padding(.vertical)
#endif
}
@@ -80,19 +86,34 @@ struct InstanceForm: View {
.autocapitalization(.none)
.keyboardType(.URL)
#endif
#if os(tvOS)
VStack {
validationStatus
}
.frame(minHeight: 100)
#elseif os(iOS)
validationStatus
#endif
}
}
@ViewBuilder var validationStatus: some View {
if !url.isEmpty {
Section {
AccountValidationStatus(
app: $app,
isValid: $isValid,
isValidated: $isValidated,
isValidating: $isValidating,
error: $validationError
)
}
}
}
private var footer: some View {
HStack {
AccountValidationStatus(
app: $app,
isValid: $isValid,
isValidated: $isValidated,
isValidating: $isValidating,
error: $validationError
)
Spacer()
Button("Save", action: submitForm)