Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
a353985e47
|
@ -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: {
|
||||||
|
|
|
@ -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: {
|
||||||
|
|
|
@ -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.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue