Commit 55e032ef authored by Niklas Fix's avatar Niklas Fix 🎓

#47 & #48

parent a6145a7d
......@@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.fragment_email.*
class EmailFragment : Fragment(), EmailContract.View, Step {
private var errorStringInvalidEmail: String = "error"
private lateinit var errorStringInvalidEmail: String
override lateinit var presenter: EmailContract.Presenter
override lateinit var signupPresenter: SignupContract.Presenter
......
......@@ -9,8 +9,7 @@ class EmailPresenter(var view: EmailContract.View?) : EmailContract.Presenter {
}
override fun checkEmail(email: String) {
// if (email.endsWith("@stud.tu-darmstadt.de")) {
if (true) {
if (email.endsWith("@stud.tu-darmstadt.de")) {
view?.showEmailValid()
} else {
view?.showEmailNotValid()
......
......@@ -54,8 +54,8 @@
<string name="enter_new_password">Neues Passwort eingeben</string>
<string name="forgot_password">Passwort vergessen?</string>
<string name="subjects">Fächer</string>
<string name="signup_email_description_top">Bevor du Zugang zu einer komplett neuen Art des Lernens erlangst, benötigen wir deine Email-Adresse.</string>
<string name="signup_email_description_bottom">Wir werden dir eine Email an diese Adresse senden, welche du zuerst bestätigen musst.</string>
<string name="signup_email_description_top">Bevor du Zugang zu einer komplett neuen Art des Lernens erlangst, benötigen wir deine Universitäts-Email-Adresse (mit Endung auf @stud.tu-darmstadt.de).</string>
<string name="signup_email_description_bottom">Wir werden dir eine Email an diese Adresse senden, welche du zuerst bestätigen musst. Es kann manchmal ein paar Minuten dauern bevor die Email ankommt. Warum nicht die Zeit nutzen und deinen Freunden von Akamu erzählen?</string>
<string name="sign_out">Ausloggen</string>
<string name="alphabetic">Alphabetisch</string>
<string name="password_changed">Passwort geändert</string>
......@@ -80,7 +80,7 @@
<string name="prompt_challenged_successful">wurde herausgefordert</string>
<string name="right_answer">Richtige Antwort</string>
<string name="scoreIs00">Niemand hat in dieser Runde Punkte erzielt :(</string>
<string name="signup_email_description_head">Email</string>
<string name="signup_email_description_head">Universitäts-Email</string>
<string name="signup_password_description">Hier kannst du dein persönliches Passwort setzen. Aber vergiss es nicht nach der nächsten Prüfung…</string>
<string name="signup_password_description_head">Persönliches Passwort</string>
<string name="signup_user_description">Das ist der Name, den deine Freunde sehen werden, wenn sie mit dir spielen. Gib dir selbst einen Namen, an den sie sich erinnern werden!</string>
......
......@@ -114,11 +114,9 @@
<string name="signup_password_description">Set your personal password here. But don\'t forget it after the next
exam…
</string>
<string name="signup_email_description_head">Email</string>
<string name="signup_email_description_top">"Before you get access to a complete new way of learning, we need your email address. "</string>
<string name="signup_email_description_bottom">We will send you an email to this address, which you have to confirm
first.
</string>
<string name="signup_email_description_head">University Email</string>
<string name="signup_email_description_top">Before you get access to a complete new way of learning, we need your student email address (which ends on @stud.tu-darmstadt.de).</string>
<string name="signup_email_description_bottom">We will send you an email to this address, which you have to confirm first. Sometimes it takes a few minutes before the email arrives. Why not use the time to tell your friends about Akamu?</string>
<string name="no_active_duels">You currently have no active duels :(\nStart with adding some friends.</string>
<string name="subjects">Subjects</string>
<string name="sign_out">Sign out</string>
......
......@@ -231,11 +231,9 @@
<string name="signup_password_description">Set your personal password here. But don\'t forget it after the next
exam…
</string>
<string name="signup_email_description_head">Email</string>
<string name="signup_email_description_top">"Before you get access to a complete new way of learning, we need your email address. "</string>
<string name="signup_email_description_bottom">We will send you an email to this address, which you have to confirm
first.
</string>
<string name="signup_email_description_head">University Email</string>
<string name="signup_email_description_top">Before you get access to a complete new way of learning, we need your student email address (which ends on @stud.tu-darmstadt.de).</string>
<string name="signup_email_description_bottom">We will send you an email to this address, which you have to confirm first. Sometimes it takes a few minutes before the email arrives. Why not use the time to tell your friends about Akamu?</string>
<string name="no_active_duels">You currently have no active duels :(\nStart with adding some friends.</string>
<string name="subjects">Subjects</string>
<string name="sign_out">Sign out</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment