From d675c02bc30d51f2738f36e34ddd11495d13ef99 Mon Sep 17 00:00:00 2001
From: Nezumi2711 <73208452+Nezumi2711@users.noreply.github.com>
Date: Thu, 9 Jun 2022 15:16:27 +0700
Subject: [PATCH] Development Progress - 1

---
 Foodify/app/src/main/AndroidManifest.xml      |   6 +-
 .../com/waterbase/foodify/Model/User.java     |   4 +-
 .../java/com/waterbase/foodify/SignUp.java    |  33 ++-
 .../com/waterbase/foodify/VerifyPhone.java    |  47 ++++
 Foodify/app/src/main/res/drawable/sms.png     | Bin 0 -> 9282 bytes
 .../src/main/res/layout/activity_sign_up.xml  |  21 +-
 .../main/res/layout/activity_verify_phone.xml | 202 ++++++++++++++++++
 7 files changed, 271 insertions(+), 42 deletions(-)
 create mode 100644 Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java
 create mode 100644 Foodify/app/src/main/res/drawable/sms.png
 create mode 100644 Foodify/app/src/main/res/layout/activity_verify_phone.xml

diff --git a/Foodify/app/src/main/AndroidManifest.xml b/Foodify/app/src/main/AndroidManifest.xml
index f92dafa..99325d9 100644
--- a/Foodify/app/src/main/AndroidManifest.xml
+++ b/Foodify/app/src/main/AndroidManifest.xml
@@ -17,10 +17,14 @@
         android:theme="@style/Theme.Foodify"
         tools:replace="android:theme"
         tools:targetApi="31">
+        <activity
+            android:name=".VerifyPhone"
+            android:exported="false" />
+
         <service
             android:name=".Service.ListenOrder"
             android:enabled="true"
-            android:exported="true"></service>
+            android:exported="true" />
 
         <activity
             android:name=".OrderStatus"
diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Model/User.java b/Foodify/app/src/main/java/com/waterbase/foodify/Model/User.java
index 2980f4c..cf2ea0e 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/Model/User.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/Model/User.java
@@ -1,6 +1,8 @@
 package com.waterbase.foodify.Model;
 
-public class User {
+import java.io.Serializable;
+
+public class User implements Serializable {
 
     private String Name;
     private String Password;
diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java b/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java
index 262dafe..3bfd6b0 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/SignUp.java
@@ -28,7 +28,7 @@ import com.waterbase.foodify.Model.User;
 
 public class SignUp extends AppCompatActivity {
 
-    EditText edtPhone, edtName, edtPassword, edtEmail;
+    EditText edtPhone, edtName, edtPassword;
     Button btnSignUp;
     TextView txtAppName;
 
@@ -40,7 +40,6 @@ public class SignUp extends AppCompatActivity {
         edtName = (EditText) findViewById(R.id.txtFullName);
         edtPassword = (EditText) findViewById(R.id.edtPassword);
         edtPhone = (EditText) findViewById(R.id.edtPhone);
-        edtEmail = (EditText) findViewById(R.id.edtEmail);
         btnSignUp = (Button) findViewById(R.id.btnSignUp);
 
         txtAppName = (TextView) findViewById(R.id.txtAppName);
@@ -56,7 +55,7 @@ public class SignUp extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 if(!TextUtils.isEmpty(edtName.getText().toString()) && !TextUtils.isEmpty(edtPassword.getText().toString())
-                        && !TextUtils.isEmpty(edtPhone.getText().toString()) && !TextUtils.isEmpty(edtEmail.getText().toString()))    {
+                        && !TextUtils.isEmpty(edtPhone.getText().toString()))    {
                     if (Common.isConnectedToInternet(getBaseContext())) {
                         final ProgressDialog mDialog = new ProgressDialog(SignUp.this);
                         mDialog.setMessage("Vui lòng chờ...");
@@ -71,24 +70,16 @@ public class SignUp extends AppCompatActivity {
                                     Toast.makeText(SignUp.this, "Số điện thoại đã được đăng ký!", Toast.LENGTH_SHORT).show();
                                     finish();
                                 } else {
-                                    //Firebase Auth
-                                    final FirebaseAuth firebaseAuth = FirebaseAuth.getInstance();
-                                    firebaseAuth.createUserWithEmailAndPassword(edtEmail.getText().toString(), edtPassword.getText().toString()).addOnCompleteListener((task) -> {
-                                        if(task.isSuccessful()) {
-                                            firebaseAuth.getCurrentUser().sendEmailVerification().addOnCompleteListener(new OnCompleteListener<Void>() {
-                                                @Override
-                                                public void onComplete(@NonNull Task<Void> task) {
-                                                    if(task.isSuccessful()) {
-                                                        mDialog.dismiss();
-                                                        User user = new User(edtName.getText().toString(), edtPassword.getText().toString());
-                                                        table_user.child(edtPhone.getText().toString()).setValue(user);
-                                                        Toast.makeText(SignUp.this, "Đăng ký thành công!", Toast.LENGTH_SHORT).show();
-                                                        finish();
-                                                    }
-                                                }
-                                            });
-                                        }
-                                    });
+                                    mDialog.dismiss();
+                                    User user = new User(edtName.getText().toString(), edtPassword.getText().toString());
+                                    Intent intent = new Intent(SignUp.this, VerifyPhone.class);
+                                    intent.putExtra("user", user);
+                                    intent.putExtra("phone", edtPhone.getText().toString());
+                                    startActivity(intent);
+//                                    User user = new User(edtName.getText().toString(), edtPassword.getText().toString());
+//                                    table_user.child(edtPhone.getText().toString()).setValue(user);
+//                                    Toast.makeText(SignUp.this, "Đăng ký thành công!", Toast.LENGTH_SHORT).show();
+//                                    finish();
                                 }
                             }
 
diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java b/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java
new file mode 100644
index 0000000..baca3cd
--- /dev/null
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/VerifyPhone.java
@@ -0,0 +1,47 @@
+package com.waterbase.foodify;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.widget.EditText;
+
+public class VerifyPhone extends AppCompatActivity {
+
+    private EditText inputCode1, inputCode2, inputCode3, inputCode4, inputCode5, inputCode6;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_verify_phone);
+
+        inputCode1 = findViewById(R.id.inputCode1);
+        inputCode2 = findViewById(R.id.inputCode2);
+        inputCode3 = findViewById(R.id.inputCode3);
+        inputCode4 = findViewById(R.id.inputCode4);
+        inputCode5 = findViewById(R.id.inputCode5);
+        inputCode6 = findViewById(R.id.inputCode6);
+    }
+
+    private void setupOTPInputs() {
+        inputCode1.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if(!s.toString().trim().isEmpty()){
+                    inputCode2.requestFocus();
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/Foodify/app/src/main/res/drawable/sms.png b/Foodify/app/src/main/res/drawable/sms.png
new file mode 100644
index 0000000000000000000000000000000000000000..77aa1c973e99d9cf719a417f0c8c9ae1ff2afbe8
GIT binary patch
literal 9282
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
Jg`9cF{{eJpKe_+_

literal 0
HcmV?d00001

diff --git a/Foodify/app/src/main/res/layout/activity_sign_up.xml b/Foodify/app/src/main/res/layout/activity_sign_up.xml
index 9d8b611..f7e7812 100644
--- a/Foodify/app/src/main/res/layout/activity_sign_up.xml
+++ b/Foodify/app/src/main/res/layout/activity_sign_up.xml
@@ -44,28 +44,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/txtAppName" />
 
-    <EditText
-        android:id="@+id/edtEmail"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:backgroundTint="#CCCCCC"
-        android:drawableLeft="@drawable/ic_baseline_email_24"
-        android:drawablePadding="13dp"
-        android:hint="Email"
-        android:inputType="textEmailAddress"
-        android:textColor="@color/white"
-        android:textColorHint="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/txtSignUp"
-        app:layout_constraintWidth_percent=".8" />
-
     <EditText
         android:id="@+id/txtFullName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="30dp"
         android:backgroundTint="#CCCCCC"
         android:drawableLeft="@drawable/ic_baseline_account_circle_24"
         android:drawablePadding="13dp"
@@ -74,7 +57,7 @@
         android:textColorHint="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edtEmail"
+        app:layout_constraintTop_toBottomOf="@+id/txtSignUp"
         app:layout_constraintWidth_percent=".8" />
 
     <EditText
diff --git a/Foodify/app/src/main/res/layout/activity_verify_phone.xml b/Foodify/app/src/main/res/layout/activity_verify_phone.xml
new file mode 100644
index 0000000..7fc7a99
--- /dev/null
+++ b/Foodify/app/src/main/res/layout/activity_verify_phone.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:overScrollMode="never"
+    android:scrollbars="none"
+    android:background="@drawable/bg4"
+    tools:context=".VerifyPhone">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        >
+        
+        <ImageView
+            android:layout_width="130dp"
+            android:layout_height="130dp"
+            android:layout_marginTop="80dp"
+            android:src="@drawable/sms"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="70dp"
+            android:text="Mã xác thực OTP"
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:textSize="20dp"
+            android:textAllCaps="true"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
+            android:textAlignment="center"
+            android:text="Chúng tôi đã gửi mã xác thực cho bạn. Vui lòng nhập mã OTP khi nhận được tin nhắn!"
+            android:textStyle="bold"
+            android:textColor="@color/common_google_signin_btn_text_dark"
+            android:textSize="12dp"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
+            android:textAlignment="center"
+            android:text="Nhập mã xác thực"
+            android:textStyle="bold"
+            android:textColor="@color/common_google_signin_btn_text_dark"
+            android:textSize="12dp"
+            />
+        
+        <LinearLayout
+            android:layout_marginTop="30dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+
+            <EditText
+                android:id="@+id/inputCode1"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:backgroundTint="#CCCCCC"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                tools:ignore="LabelFor"/>
+            <EditText
+                android:id="@+id/inputCode2"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:backgroundTint="#CCCCCC"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                tools:ignore="LabelFor"/>
+            <EditText
+                android:id="@+id/inputCode3"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:backgroundTint="#CCCCCC"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                tools:ignore="LabelFor"/>
+            <EditText
+                android:id="@+id/inputCode4"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:backgroundTint="#CCCCCC"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                tools:ignore="LabelFor"/>
+            <EditText
+                android:id="@+id/inputCode5"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:backgroundTint="#CCCCCC"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                tools:ignore="LabelFor"/>
+            <EditText
+                android:id="@+id/inputCode6"
+                android:layout_width="40dp"
+                android:layout_height="45dp"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:backgroundTint="#CCCCCC"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/white"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                tools:ignore="LabelFor"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Không nhận được mã OTP?"
+                android:textSize="12dp"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                />
+
+            <TextView
+                android:layout_marginLeft="5dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Gửi lại"
+                android:textSize="12dp"
+                android:textColor="@color/purple_500"
+                android:textStyle="bold"
+                android:textAllCaps="true"
+                />
+
+
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/btnVerify"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/btn_bg_design"
+            android:padding="10dp"
+            android:text="Xác thực"
+            android:textAllCaps="true"
+            android:textStyle="bold"
+            android:layout_marginTop="80dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp" />
+
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file