From f6050a780e4423a53d19eae699f9080deb7ad91d Mon Sep 17 00:00:00 2001 From: Slimexsan <Filip.Stanicak@Student.Reutlingen-University.de> Date: Mon, 1 Jun 2020 00:48:15 +0200 Subject: [PATCH] Changes on the lost_pw screen --- .../java/com/example/mobileapp/Lost_PW.java | 29 +++++++++++++++++++ .../com/example/mobileapp/Start_Screen.java | 4 +++ Frontend/app/src/main/res/layout/lost_pw.xml | 28 ++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Lost_PW.java b/Frontend/app/src/main/java/com/example/mobileapp/Lost_PW.java index 4a57d23..6bddb22 100644 --- a/Frontend/app/src/main/java/com/example/mobileapp/Lost_PW.java +++ b/Frontend/app/src/main/java/com/example/mobileapp/Lost_PW.java @@ -4,12 +4,21 @@ import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; import android.view.View; +import android.widget.Button; +import android.widget.EditText; import android.widget.ImageView; import android.os.Bundle; +import android.widget.TextView; + +import org.w3c.dom.Text; public class Lost_PW extends AppCompatActivity { private ImageView back_button; + private TextView input_email; + private Button send_email; + private EditText email_ph; + private TextView notification; @Override protected void onCreate(Bundle savedInstanceState) { @@ -17,6 +26,10 @@ public class Lost_PW extends AppCompatActivity { setContentView(R.layout.lost_pw); back_button = (ImageView)findViewById(R.id.back_button); + send_email = (Button)findViewById(R.id.btnSendEmail); + input_email = (TextView)findViewById(R.id.email_stuck); + email_ph = (EditText)findViewById(R.id.email_ph); + notification = (TextView)findViewById(R.id.email_notification); back_button.setOnClickListener(new View.OnClickListener() { @Override @@ -24,6 +37,22 @@ public class Lost_PW extends AppCompatActivity { startActivity(new Intent(Lost_PW.this, Start_Screen.class)); } }); + + + /** + * Makes the inputEmail not click and changeable again. So the user + * knows to witch e-mail the reset code was send. + */ + send_email.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + email_ph.setVisibility(View.GONE); + input_email.setVisibility(View.VISIBLE); + input_email.setText(email_ph.getText()); + notification.setText("E-Mail was send"); + } + }); + } diff --git a/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java b/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java index 6d68902..acefebb 100644 --- a/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java +++ b/Frontend/app/src/main/java/com/example/mobileapp/Start_Screen.java @@ -49,6 +49,10 @@ public class Start_Screen extends AppCompatActivity { } }); + + /** + * Testusage for wrong PW/E-Mail input, has to be connected to our DB + */ login.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/Frontend/app/src/main/res/layout/lost_pw.xml b/Frontend/app/src/main/res/layout/lost_pw.xml index 2b175bd..e1200bc 100644 --- a/Frontend/app/src/main/res/layout/lost_pw.xml +++ b/Frontend/app/src/main/res/layout/lost_pw.xml @@ -63,6 +63,20 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.783" /> + <TextView + android:id="@+id/email_stuck" + android:layout_width="265dp" + android:layout_height="34dp" + android:background="@null" + android:ems="10" + android:inputType="textEmailAddress" + android:paddingLeft="10dp" + android:textColor="#C5B358" + android:textSize="20dp" + app:layout_constraintBottom_toTopOf="@+id/view2" + app:layout_constraintStart_toEndOf="@+id/email_icon2" /> + + <EditText android:id="@+id/email_ph" android:layout_width="265dp" @@ -77,6 +91,8 @@ app:layout_constraintBottom_toTopOf="@+id/view2" app:layout_constraintStart_toEndOf="@+id/email_icon2" /> + + <ImageView android:id="@+id/email_icon2" android:layout_width="34dp" @@ -190,6 +206,18 @@ app:layout_constraintStart_toEndOf="@+id/view11" app:layout_constraintTop_toBottomOf="@+id/view3" /> + <TextView + android:id="@+id/email_notification" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="12dp" + + android:layout_marginLeft="12dp" + android:layout_marginTop="8dp" + android:textColor="#716528" + app:layout_constraintStart_toStartOf="@+id/email_stuck" + app:layout_constraintTop_toBottomOf="@+id/view2" /> + </androidx.constraintlayout.widget.ConstraintLayout> -- GitLab