Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Aiden Vigue 2021-07-22 13:46:05 -04:00
commit a353985e47
No known key found for this signature in database
GPG Key ID: B9A09843AB079D5B
7 changed files with 3 additions and 1 deletions

View File

@ -111,6 +111,7 @@ struct ConnectToServerView: View {
TextField(NSLocalizedString("Server URL", comment: ""), text: $uri) TextField(NSLocalizedString("Server URL", comment: ""), text: $uri)
.disableAutocorrection(true) .disableAutocorrection(true)
.autocapitalization(.none) .autocapitalization(.none)
.keyboardType(.URL)
Button { Button {
viewModel.connectToServer() viewModel.connectToServer()
} label: { } label: {

View File

@ -109,6 +109,7 @@ struct ConnectToServerView: View {
TextField(NSLocalizedString("Server URL", comment: ""), text: $uri) TextField(NSLocalizedString("Server URL", comment: ""), text: $uri)
.disableAutocorrection(true) .disableAutocorrection(true)
.autocapitalization(.none) .autocapitalization(.none)
.keyboardType(.URL)
Button { Button {
viewModel.connectToServer() viewModel.connectToServer()
} label: { } label: {

View File

@ -63,7 +63,7 @@ struct SettingsView: View {
) )
} }
Section { Section(header: Text(ServerEnvironment.current.server.name ?? "")) {
HStack { HStack {
Text("Signed in as \(username)").foregroundColor(.primary) Text("Signed in as \(username)").foregroundColor(.primary)
Spacer() Spacer()

Binary file not shown.

Binary file not shown.