Skip to content

Commit

Permalink
Updated forget password UI
Browse files Browse the repository at this point in the history 
Updated ui to keep consistency
  • Loading branch information
@Carl26
Carl26 committed Mar 14, 2017
1 parent ec4bd7f commit e628779
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 64 deletions.
36 changes: 32 additions & 4 deletions ..._Pigeon/app/src/main/java/org/example/team_pigeon/movie_pigeon/ResetPasswordActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
Expand All @@ -32,10 +33,11 @@
*/

public class ResetPasswordActivity extends AppCompatActivity {
EditText emailField, vCodeField, newPwdField;
EditText emailField, vCodeField, newPwdField, confirmPwdField;
TextView tvEmail, tvVcode, tvNewPwd, tvConfirmPwd;
Button BConfirm, BBack;
Boolean vCodeButtonClicked = false;
String email, type, vCode, newPwd;
String email, type, vCode, newPwd, confirmPwd;
String TAG = "ResetPwd";
String[] vCodeBundle = new String[2];
String[] resetBundle = new String[3];
Expand All @@ -52,8 +54,22 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(resetView);

emailField = (EditText) resetView.findViewById(R.id.rsETEmail);
vCodeField = (EditText) resetView.findViewById(R.id.rsETVerificationCode);
newPwdField = (EditText) resetView.findViewById(R.id.rsETNewPwd);
vCodeField = (EditText) resetView.findViewById(R.id.rsETVCode);
newPwdField = (EditText) resetView.findViewById(R.id.rsETPassword);
confirmPwdField = (EditText) resetView.findViewById(R.id.rsETConfirmPassword);

tvEmail = (TextView) resetView.findViewById(R.id.rsTVEmail);
tvVcode = (TextView) resetView.findViewById(R.id.rsTVVCode);
tvNewPwd = (TextView) resetView.findViewById(R.id.rsTVPassword);
tvConfirmPwd = (TextView) resetView.findViewById(R.id.rsTVConfirmPassword);

tvVcode.setVisibility(View.INVISIBLE);
tvNewPwd.setVisibility(View.INVISIBLE);
tvConfirmPwd.setVisibility(View.INVISIBLE);
vCodeField.setVisibility(View.INVISIBLE);
newPwdField.setVisibility(View.INVISIBLE);
confirmPwdField.setVisibility(View.INVISIBLE);

BConfirm = (Button) resetView.findViewById(R.id.rsBVerificationCode);
BBack = (Button) resetView.findViewById(R.id.rsBBack);
hint = (TextView) resetView.findViewById(R.id.rsHint);
Expand All @@ -65,6 +81,15 @@ public void handleMessage(Message msg) {
case VCodeSuccess:
Toast.makeText(getApplicationContext(), "Email sent to " + email, Toast.LENGTH_SHORT).show();
BConfirm.setText("Confirm");
tvVcode.setVisibility(View.VISIBLE);
tvNewPwd.setVisibility(View.VISIBLE);
tvConfirmPwd.setVisibility(View.VISIBLE);
vCodeField.setVisibility(View.VISIBLE);
newPwdField.setVisibility(View.VISIBLE);
confirmPwdField.setVisibility(View.VISIBLE);
vCodeField.requestFocus();
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(vCodeField, InputMethodManager.SHOW_IMPLICIT);
vCodeButtonClicked = true;
hint.setText("Please fill in the rest and click 'Confirm'");
Log.i(TAG, "Successfully sent VCode");
Expand Down Expand Up @@ -97,10 +122,13 @@ public void onClick(View v) {
// send to server with vCode
vCode = String.valueOf(vCodeField.getText());
newPwd = String.valueOf(newPwdField.getText());
confirmPwd = String.valueOf(confirmPwdField.getText());
if (vCode.equals("")) {
Toast.makeText(getApplicationContext(), "Verification code can't be empty", Toast.LENGTH_SHORT).show();
} else if (newPwd.equals("")) {
Toast.makeText(getApplicationContext(), "New password can't be empty", Toast.LENGTH_SHORT).show();
} else if (!newPwd.equals(confirmPwd)) {
Toast.makeText(getApplicationContext(), "Passwords don't match", Toast.LENGTH_SHORT).show();
} else {
resetBundle[0] = vCode;
resetBundle[1] = "Reset";
Expand Down
188 changes: 128 additions & 60 deletions frontend/Movie_Pigeon/app/src/main/res/layout/activity_reset_password.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,71 +11,139 @@
android:layout_marginTop="50dp"
android:id="@+id/tvResetPassword" />

<EditText
android:layout_width="200dp"
android:id="@+id/rsETEmail"
android:cursorVisible="true"
android:textSize="13dp"
android:textColor="#000000"
android:inputType="text"
android:background="@color/colorEditTextGrey"
android:layout_height="20dp"
android:layout_below="@+id/tvEmail"
<TableLayout
android:layout_width="250dp"
android:layout_height="wrap_content"
android:id="@+id/resetTable"
android:layout_marginTop="31dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="19dp" />
android:layout_below="@+id/tvResetPassword">

<EditText
android:layout_width="200dp"
android:id="@+id/rsETVerificationCode"
android:cursorVisible="true"
android:textSize="13dp"
android:textColor="#000000"
android:inputType="text"
android:background="@color/colorEditTextGrey"
android:layout_height="20dp"
android:layout_marginTop="20dp"
android:layout_below="@+id/tvVerificationCode"
android:layout_centerHorizontal="true"/>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_height="match_parent"
android:text="Email:"
android:textColor="#000000"
android:id="@+id/rsTVEmail"
android:layout_gravity="left"
android:textSize="15sp"
android:layout_width="wrap_content" />
</TableRow>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Enter your email:"
android:layout_marginTop="36dp"
android:id="@+id/tvEmail"
android:layout_below="@+id/tvResetPassword"
android:layout_alignStart="@+id/rsETEmail" />
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText
android:layout_width="250dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:paddingLeft="3dp"
android:paddingBottom="7dp"
android:id="@+id/rsETEmail"
android:cursorVisible="true"
android:textColor="#000000"
android:textSize="16sp"
android:inputType="text"
android:background="@drawable/table_text_underline" />
</TableRow>

<EditText
android:layout_width="200dp"
android:id="@+id/rsETNewPwd"
android:cursorVisible="true"
android:textSize="13dp"
android:textColor="#000000"
android:inputType="text"
android:background="@color/colorEditTextGrey"
android:layout_height="20dp"
android:layout_marginTop="20dp"
android:layout_below="@+id/tvNewPwd"
android:layout_centerHorizontal="true"/>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_height="match_parent"
android:text="Verification Code:"
android:paddingTop="10dp"
android:textColor="#000000"
android:id="@+id/rsTVVCode"
android:layout_gravity="left"
android:textSize="15sp"
android:layout_width="wrap_content" />
</TableRow>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Enter your new password:"
android:layout_marginTop="36dp"
android:id="@+id/tvNewPwd"
android:layout_below="@+id/rsETVerificationCode"
android:layout_alignStart="@+id/rsETVerificationCode" />
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText
android:layout_width="250dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:paddingLeft="3dp"
android:id="@+id/rsETVCode"
android:cursorVisible="true"
android:textColor="#000000"
android:textSize="16sp"
android:inputType="text"
android:background="@drawable/table_text_underline"
android:paddingBottom="7dp"/>
</TableRow>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Enter verification code:"
android:layout_marginTop="38dp"
android:id="@+id/tvVerificationCode"
android:layout_below="@+id/rsETEmail"
android:layout_alignStart="@+id/rsETVerificationCode" />
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_height="match_parent"
android:text="New password:"
android:paddingTop="10dp"
android:textColor="#000000"
android:id="@+id/rsTVPassword"
android:layout_gravity="left"
android:textSize="15sp"
android:layout_width="wrap_content" />
</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText
android:layout_width="250dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:paddingLeft="3dp"
android:id="@+id/rsETPassword"
android:cursorVisible="true"
android:textColor="#000000"
android:textSize="16sp"
android:inputType="textPassword"
android:paddingBottom="7dp"
android:background="@drawable/table_text_underline"
android:ellipsize="start"/>
</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_height="match_parent"
android:text="Re-type new password:"
android:paddingTop="10dp"
android:textColor="#000000"
android:id="@+id/rsTVConfirmPassword"
android:layout_gravity="left"
android:textSize="15sp"
android:layout_width="wrap_content" />
</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText
android:layout_width="250dp"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:paddingLeft="3dp"
android:id="@+id/rsETConfirmPassword"
android:cursorVisible="true"
android:textColor="#000000"
android:textSize="16sp"
android:inputType="textPassword"
android:paddingBottom="7dp"
android:background="@drawable/table_text_underline"
android:ellipsize="start"/>
</TableRow>
</TableLayout>

<Button
android:layout_width="150dp"
Expand All @@ -102,7 +170,7 @@
android:layout_height="wrap_content"
android:text="Please fill in email and click 'Verify Email'"
android:layout_marginTop="10dp"
android:textSize="12dp"
android:textSize="12sp"
android:textColor="#AA3939"
android:id="@+id/rsHint"
android:layout_below="@+id/tvResetPassword"
Expand Down

0 comments on commit e628779

Please sign in to comment.