Add profile account and change password screen

app/src/main/AndroidManifest.xml

@@ -14,6 +14,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Foodify"
         tools:targetApi="31">
+        <activity
+            android:name=".Activity.ChangePasswordActivity"
+            android:exported="false" />
+        <activity
+            android:name=".Activity.AccountAndProfileActivity"
+            android:exported="false" />
         <activity
             android:name=".Activity.FoodDetailActivity"
             android:exported="false" />
@@ -38,8 +44,8 @@
             android:noHistory="true" />
         <activity
             android:name=".Activity.MainActivity"
-            android:theme="@style/Theme.Foodify.SplashScreen"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Foodify.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/capstone/foodify/Activity/AccountAndProfileActivity.java

@@ -0,0 +1,111 @@
+package com.capstone.foodify.Activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.app.DatePickerDialog;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.capstone.foodify.R;
+import com.google.android.material.textfield.TextInputLayout;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+
+public class AccountAndProfileActivity extends AppCompatActivity {
+
+    TextInputLayout textInput_email, textInput_phone, textInput_firstName, textInput_lastName, textInput_birthDay, textInput_username;
+
+    EditText edt_birthday;
+    final Calendar myCalendar= Calendar.getInstance();
+    LinearLayout change_password;
+
+    ImageView back_image;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_account_and_profile);
+
+        initComponent();
+        setFontUI();
+        chooseDateOfBirth();
+
+        change_password.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(AccountAndProfileActivity.this, ChangePasswordActivity.class));
+            }
+        });
+
+        back_image.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onBackPressed();
+            }
+        });
+
+
+    }
+
+    private void initComponent() {
+        textInput_email= (TextInputLayout) findViewById(R.id.textInput_email);
+        textInput_phone = (TextInputLayout) findViewById(R.id.textInput_phone);
+        textInput_firstName = (TextInputLayout) findViewById(R.id.textInput_firstName);
+        textInput_lastName = (TextInputLayout) findViewById(R.id.textInput_lastName);
+        textInput_birthDay = (TextInputLayout) findViewById(R.id.textInput_birthDay);
+        textInput_username = (TextInputLayout) findViewById(R.id.textInput_username);
+        change_password = (LinearLayout) findViewById(R.id.change_password);
+
+        back_image = (ImageView) findViewById(R.id.back_image);
+
+        edt_birthday = (EditText) findViewById(R.id.edt_birthDay);
+    }
+
+    private void setFontUI() {
+        Typeface bebas= Typeface.createFromAsset(getAssets(), "font/bebas.ttf");
+
+        //Set Type face
+        textInput_email.setTypeface(bebas);
+        textInput_phone.setTypeface(bebas);
+        textInput_firstName.setTypeface(bebas);
+        textInput_lastName.setTypeface(bebas);
+        textInput_birthDay.setTypeface(bebas);
+        textInput_username.setTypeface(bebas);
+
+        edt_birthday.setTypeface(bebas);
+    }
+
+    private void chooseDateOfBirth() {
+        //Calendar date of birth
+
+        DatePickerDialog.OnDateSetListener date = new DatePickerDialog.OnDateSetListener() {
+            @Override
+            public void onDateSet(DatePicker view, int year, int month, int day) {
+                myCalendar.set(Calendar.YEAR, year);
+                myCalendar.set(Calendar.MONTH,month);
+                myCalendar.set(Calendar.DAY_OF_MONTH,day);
+                updateLabel();
+            }
+        };
+        edt_birthday.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                new DatePickerDialog(AccountAndProfileActivity.this,date,myCalendar.get(Calendar.YEAR),myCalendar.get(Calendar.MONTH),myCalendar.get(Calendar.DAY_OF_MONTH)).show();
+            }
+        });
+    }
+
+    private void updateLabel(){
+        String myFormat="dd/MM/yyyy";
+        SimpleDateFormat dateFormat=new SimpleDateFormat(myFormat, Locale.US);
+        edt_birthday.setText(dateFormat.format(myCalendar.getTime()));
+    }
+}

app/src/main/java/com/capstone/foodify/Activity/ChangePasswordActivity.java

@@ -0,0 +1,51 @@
+package com.capstone.foodify.Activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.capstone.foodify.R;
+import com.google.android.material.textfield.TextInputLayout;
+
+public class ChangePasswordActivity extends AppCompatActivity {
+
+    TextInputLayout textInput_old_password, textInput_password, textInput_password_confirm;
+
+    ImageView back_image;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_change_password);
+
+        initComponent();
+        setFontUI();
+
+        //Handle event when back image on click
+        back_image.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onBackPressed();
+            }
+        });
+    }
+
+    private void initComponent() {
+        textInput_old_password = findViewById(R.id.textInput_old_password);
+        textInput_password = findViewById(R.id.textInput_password);
+        textInput_password_confirm = findViewById(R.id.textInput_password_confirm);
+
+        back_image = findViewById(R.id.back_image);
+    }
+
+    private void setFontUI() {
+        Typeface bebas= Typeface.createFromAsset(getAssets(), "font/bebas.ttf");
+
+        textInput_password.setTypeface(bebas);
+        textInput_old_password.setTypeface(bebas);
+        textInput_password_confirm.setTypeface(bebas);
+    }
+}

app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java

@@ -36,7 +36,8 @@ import retrofit2.Response;
 public class SignUpActivity extends AppCompatActivity {
 
     TextInputLayout textInput_email, textInput_password, textInput_phone,
-            textInput_address, textInput_repeatPassword, textInput_firstName, textInput_lastName, textInput_birthDay;
+            textInput_address, textInput_repeatPassword, textInput_firstName, textInput_lastName, textInput_birthDay,
+            textInput_username;
     final Calendar myCalendar= Calendar.getInstance();
     EditText edt_birthday;
     TextView signIn_textView;
@@ -101,6 +102,7 @@ public class SignUpActivity extends AppCompatActivity {
         textInput_firstName = (TextInputLayout) findViewById(R.id.textInput_firstName);
         textInput_lastName = (TextInputLayout) findViewById(R.id.textInput_lastName);
         textInput_birthDay = (TextInputLayout) findViewById(R.id.textInput_birthDay);
+        textInput_username = (TextInputLayout) findViewById(R.id.textInput_username);
 
         edt_birthday = (EditText) findViewById(R.id.edt_birthDay);
 
@@ -251,6 +253,7 @@ public class SignUpActivity extends AppCompatActivity {
         textInput_firstName.setTypeface(bebas);
         textInput_lastName.setTypeface(bebas);
         textInput_birthDay.setTypeface(bebas);
+        textInput_username.setTypeface(bebas);
 
         edt_birthday.setTypeface(bebas);
     }

app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java

@@ -6,9 +6,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 
 import androidx.fragment.app.Fragment;
 
+import com.capstone.foodify.Activity.AccountAndProfileActivity;
 import com.capstone.foodify.Activity.SignUpActivity;
 import com.capstone.foodify.R;
 
@@ -16,17 +18,25 @@ public class ProfileFragment extends Fragment {
 
     Button btnSignUp;
 
+    LinearLayout account_and_profile;
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View rootView = inflater.inflate(R.layout.fragment_profile, container, false);
         btnSignUp = (Button) rootView.findViewById(R.id.sign_up_button);
+        account_and_profile = (LinearLayout) rootView.findViewById(R.id.account_and_profile);
         btnSignUp.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent i =new Intent(getActivity(), SignUpActivity.class);
-                startActivity(i);
+                startActivity(new Intent(getActivity(), SignUpActivity.class));
+            }
+        });
+
+        account_and_profile.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(getActivity(), AccountAndProfileActivity.class));
             }
         });
         return rootView;

app/src/main/res/layout/activity_account_and_profile.xml

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activity.AccountAndProfileActivity">
+
+    <ImageView
+        android:id="@+id/back_image"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:src="@drawable/back_button"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="25dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="40dp"
+        android:fontFamily="@font/bebas"
+        android:text="@string/account_and_profile"
+        android:textColor="@color/black"
+        android:textSize="40sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/back_image" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_email"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginBottom="20dp"
+        android:hint="@string/email_text"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/textInput_phone"
+        app:startIconDrawable="@drawable/baseline_email_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_email"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="textEmailAddress"
+            android:enabled="false"
+            />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_phone"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:hint="@string/phone_text"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/textInput_username"
+        app:startIconDrawable="@drawable/baseline_phone_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_phone"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="phone"
+            android:enabled="false"
+            />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_username"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:hint="@string/username"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/linearLayout_fullName"
+        app:startIconDrawable="@drawable/baseline_abc_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_username"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="text"
+            android:enabled="false"
+            />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout_fullName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/textInput_birthDay"
+        >
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/textInput_firstName"
+            android:layout_width="150dp"
+            android:layout_height="60dp"
+            android:layout_marginEnd="20dp"
+            android:hint="@string/first_name_text"
+            app:boxBackgroundColor="@color/white"
+            app:startIconDrawable="@drawable/baseline_abc_24"
+            app:startIconTint="@color/primaryColor">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/edt_first_name"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:inputType="textPassword" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/textInput_lastName"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:hint="@string/last_name_text"
+            app:boxBackgroundColor="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textInput_phone">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/edt_last_name"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:inputType="textPassword" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_birthDay"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="40dp"
+        android:hint="@string/birthday_text"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/change_password"
+        app:startIconDrawable="@drawable/baseline_calendar_month_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_birthDay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="25/5/2001"
+            android:clickable="false"
+            android:cursorVisible="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <LinearLayout
+        android:id="@+id/change_password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="80dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        app:layout_constraintBottom_toTopOf="@id/updated_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:orientation="horizontal"
+        >
+
+        <ImageView
+            android:id="@+id/ic_pencil"
+            android:src="@drawable/baseline_vpn_key_24"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:ignore="ContentDescription"
+            app:tint="@color/primaryColor"
+            />
+
+        <TextView
+            android:text="@string/change_password"
+            android:textSize="18sp"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/black"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="12dp"
+            android:layout_weight="1"
+            />
+
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:rotation="180"
+            android:src="@drawable/back_button"
+            tools:ignore="ContentDescription" />
+
+    </LinearLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/updated_button"
+        style="@style/DefaultSolid"
+        android:fontFamily="@font/bebas"
+        android:text="@string/updated"
+        android:textSize="20sp"
+        android:padding="10dp"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginBottom="17dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_change_password.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activity.ChangePasswordActivity">
+
+    <ImageView
+        android:id="@+id/back_image"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:src="@drawable/back_button"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="25dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="40dp"
+        android:fontFamily="@font/bebas"
+        android:text="@string/change_password"
+        android:textColor="@color/black"
+        android:textSize="40sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/back_image" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_old_password"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:hint="@string/old_password"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/textInput_password"
+        app:passwordToggleEnabled="true"
+        app:passwordToggleTint="@color/primaryColor"
+        app:startIconDrawable="@drawable/baseline_vpn_key_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_old_password"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="textPassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_password"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:hint="@string/password_text"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/textInput_password_confirm"
+        app:passwordToggleEnabled="true"
+        app:passwordToggleTint="@color/primaryColor"
+        app:startIconDrawable="@drawable/baseline_vpn_key_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_password"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="textPassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_password_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="100dp"
+        android:hint="@string/repeat_password_text"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/change_password_button"
+        app:passwordToggleEnabled="true"
+        app:passwordToggleTint="@color/primaryColor"
+        app:startIconDrawable="@drawable/baseline_vpn_key_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_confirmPassword"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="textPassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/change_password_button"
+        style="@style/DefaultSolid"
+        android:fontFamily="@font/bebas"
+        android:text="@string/change_password"
+        android:textSize="20sp"
+        android:padding="10dp"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginBottom="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_sign_up.xml

@@ -75,6 +75,27 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInput_username"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:hint="Username"
+        app:boxBackgroundColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textInput_phone"
+        app:startIconDrawable="@drawable/baseline_abc_24"
+        app:startIconTint="@color/primaryColor">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edt_username"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="text" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
     <LinearLayout
         android:id="@+id/linearLayout_fullName"
         android:layout_width="match_parent"
@@ -84,7 +105,7 @@
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textInput_phone">
+        app:layout_constraintTop_toBottomOf="@+id/textInput_username">
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/textInput_firstName"

app/src/main/res/layout/fragment_profile.xml

@@ -7,14 +7,14 @@
     tools:context=".Fragment.ProfileFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/profile_page"
+        android:id="@+id/user_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:visibility="gone"
+        android:visibility="visible"
         >
 
         <com.makeramen.roundedimageview.RoundedImageView
@@ -148,7 +148,7 @@
 
             <ImageView
                 android:id="@+id/ic_order_history"
-                android:src="@drawable/order_history"
+                android:src="@drawable/ic_basket"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 tools:ignore="ContentDescription"
@@ -156,7 +156,7 @@
                 />
 
             <TextView
-                android:text="Order History"
+                android:text="Order"
                 android:textSize="18sp"
                 android:fontFamily="@font/opensans"
                 android:textColor="@color/black"
@@ -224,12 +224,104 @@
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <Button
-        android:id="@+id/sign_up_button"
-        android:layout_marginTop="100dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Sign in"
-        tools:ignore="MissingConstraints" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/guest_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        >
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/guest_avatar"
+            android:src="@drawable/profile_avatar"
+            app:riv_corner_radius="180dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:scaleType="centerCrop"
+            android:layout_marginBottom="200dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            />
+
+        <TextView
+            android:id="@+id/text_view_guest"
+            android:text="Guest"
+            android:textSize="20sp"
+            android:fontFamily="@font/opensans"
+            android:layout_marginTop="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/guest_avatar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
+        <LinearLayout
+            android:id="@+id/button_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/text_view_guest"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:layout_marginTop="20dp"
+            >
+
+            <Button
+                android:id="@+id/sign_up_button"
+                android:backgroundTint="@color/graylight"
+                android:text="Sign Up"
+                android:textSize="18sp"
+                android:fontFamily="@font/bebas"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+            <Button
+                android:id="@+id/sign_in_button"
+                android:text="Sign in"
+                android:textSize="18sp"
+                android:fontFamily="@font/bebas"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="30dp"
+                />
+
+
+        </LinearLayout>
+
+
+
+        <TextView
+            android:id="@+id/version_app_text"
+            android:text="Foodify V1.0.0"
+            android:textSize="18sp"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/graylight"
+            android:layout_marginTop="30dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/button_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
+        <TextView
+            android:id="@+id/copyright_text"
+            android:text="Foodify Coperation"
+            android:textSize="18sp"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/graylight"
+            android:layout_marginTop="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/version_app_text"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -41,4 +41,9 @@
     <string name="favourite_icon">Favourite Icon</string>
     <string name="text_description">Non odit iusto delectus maxime sit placeat voluptatum dolorem. Dolores quos rerum iusto.
         Beatae totam ab veritatis aliquid tenetur qui ut. Quia ut dolorum enim et. .</string>
+    <string name="username">Tên người dùng</string>
+    <string name="updated">Cập nhật</string>
+    <string name="old_password">Mật khẩu cũ</string>
+    <string name="change_password">Đổi mật khẩu</string>
+    <string name="account_and_profile">Thông tin tài khoản</string>
 </resources>