From f3659904dc9ab86d5ae032ec900972e168f5f253 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Fri, 19 May 2023 09:55:25 +0200
Subject: [PATCH] Fix keyboard issue with account/instance form on iOS
---
Shared/Settings/AccountForm.swift | 8 ++++++--
Shared/Settings/InstanceForm.swift | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Shared/Settings/AccountForm.swift b/Shared/Settings/AccountForm.swift
index 56c26fa5..72ab0593 100644
--- a/Shared/Settings/AccountForm.swift
+++ b/Shared/Settings/AccountForm.swift
@@ -94,8 +94,12 @@ struct AccountForm: View {
}
@ViewBuilder var validationStatus: some View {
- if !username.isEmpty && !password.isEmpty {
- Section {
+ Section {
+ if username.isEmpty || password.isEmpty {
+ Text("Enter account credentials to connect...")
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .foregroundColor(.secondary)
+ } else {
AccountValidationStatus(
app: .constant(instance.app),
isValid: $isValid,
diff --git a/Shared/Settings/InstanceForm.swift b/Shared/Settings/InstanceForm.swift
index a89bc737..c78e1056 100644
--- a/Shared/Settings/InstanceForm.swift
+++ b/Shared/Settings/InstanceForm.swift
@@ -99,8 +99,12 @@ struct InstanceForm: View {
}
@ViewBuilder var validationStatus: some View {
- if !url.isEmpty {
- Section {
+ Section {
+ if url.isEmpty {
+ Text("Enter location address to connect...")
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .foregroundColor(.secondary)
+ } else {
AccountValidationStatus(
app: $app,
isValid: $isValid,