Skip to content
Snippets Groups Projects
Commit 3de0b8d3 authored by cpilaszewicz's avatar cpilaszewicz
Browse files

Merge branch '263-restructure-authentication-2' of...

Merge branch '263-restructure-authentication-2' of https://git.imp.fu-berlin.de/enzevalos/enzevalos_iphone into 263-restructure-authentication-2

* '263-restructure-authentication-2' of https://git.imp.fu-berlin.de/enzevalos/enzevalos_iphone:
  fix standard port and button names
parents e77c34e6 2338a8d3
No related branches found
No related tags found
4 merge requests!58Onboarding screens swift ui merge dev,!55WIP: Resolve "UI for gamifcation & stats",!47Provisional fix for OpenSSL 1.1+, needs testing,!39Resolve "Restructure Authentication"
...@@ -43,7 +43,7 @@ struct AuthenticationScreen: View { ...@@ -43,7 +43,7 @@ struct AuthenticationScreen: View {
self.viewModel.detailValidation(self.login, self.password, self.username, self.imapServer, self.imapPort, self.imapEncryption, self.smtpServer, self.smtpPort, self.smtpEncryption) : self.viewModel.detailValidation(self.login, self.password, self.username, self.imapServer, self.imapPort, self.imapEncryption, self.smtpServer, self.smtpPort, self.smtpEncryption) :
self.viewModel.validate(self.login, self.password) self.viewModel.validate(self.login, self.password)
}) { }) {
Text("Button") Text("Login")
} }
} }
...@@ -81,7 +81,7 @@ struct AuthenticationScreen: View { ...@@ -81,7 +81,7 @@ struct AuthenticationScreen: View {
} }
Button(action: { self.viewModel.startGoogleOauth() }) { Button(action: { self.viewModel.startGoogleOauth() }) {
Text("Google button") Text("Google login")
} }
}.padding() }.padding()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment