diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4d95bd..1110062 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,16 +13,17 @@ android:supportsRtl="true" android:theme="@style/Theme.Foodify" tools:targetApi="31"> + + android:noHistory="true" /> + android:noHistory="true" /> diff --git a/app/src/main/java/com/capstone/foodify/ForgotPasswordActivity.java b/app/src/main/java/com/capstone/foodify/ForgotPasswordActivity.java new file mode 100644 index 0000000..7dd4d4d --- /dev/null +++ b/app/src/main/java/com/capstone/foodify/ForgotPasswordActivity.java @@ -0,0 +1,31 @@ +package com.capstone.foodify; + +import androidx.appcompat.app.AppCompatActivity; + +import android.graphics.Typeface; +import android.os.Bundle; + +import com.google.android.material.textfield.TextInputLayout; + +public class ForgotPasswordActivity extends AppCompatActivity { + + TextInputLayout textInput_account; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_forgot_password); + + setFontUI(); + } + + private void setFontUI() { + Typeface bebas= Typeface.createFromAsset(getAssets(), "font/bebas.ttf"); + + textInput_account = (TextInputLayout) findViewById(R.id.textInput_account); + + textInput_account.setTypeface(bebas); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/capstone/foodify/SignInActivity.java b/app/src/main/java/com/capstone/foodify/SignInActivity.java index dcd711d..f0b3e78 100644 --- a/app/src/main/java/com/capstone/foodify/SignInActivity.java +++ b/app/src/main/java/com/capstone/foodify/SignInActivity.java @@ -1,6 +1,7 @@ package com.capstone.foodify; import android.content.Intent; +import android.graphics.Typeface; import android.os.Bundle; import android.view.MenuItem; import android.view.View; @@ -11,19 +12,25 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import com.google.android.material.textfield.TextInputLayout; + import java.util.Objects; public class SignInActivity extends AppCompatActivity { - TextView signUp_textView; + TextView signUp_textView, forgotPassword_textView; + + TextInputLayout textInput_account, textInput_password; ImageView back_image; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sign_in); + setFontUI(); signUp_textView = (TextView) findViewById(R.id.sign_up_textView); + forgotPassword_textView = (TextView) findViewById(R.id.forgotPassword_textView); back_image = (ImageView) findViewById(R.id.back_image); @@ -39,6 +46,23 @@ public class SignInActivity extends AppCompatActivity { startActivity(new Intent(SignInActivity.this, SignUpActivity.class)); } }); + + forgotPassword_textView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + startActivity(new Intent(SignInActivity.this, ForgotPasswordActivity.class)); + } + }); + } + + private void setFontUI() { + Typeface bebas= Typeface.createFromAsset(getAssets(), "font/bebas.ttf"); + + textInput_account = (TextInputLayout) findViewById(R.id.textInput_account); + textInput_password = (TextInputLayout) findViewById(R.id.textInput_password); + + textInput_account.setTypeface(bebas); + textInput_password.setTypeface(bebas); } // this event will enable the back diff --git a/app/src/main/res/font/poppins.ttf b/app/src/main/res/font/poppins.ttf new file mode 100644 index 0000000..e337070 Binary files /dev/null and b/app/src/main/res/font/poppins.ttf differ diff --git a/app/src/main/res/layout/activity_forgot_password.xml b/app/src/main/res/layout/activity_forgot_password.xml new file mode 100644 index 0000000..332f4c7 --- /dev/null +++ b/app/src/main/res/layout/activity_forgot_password.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bcd0851..156e3f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,4 +21,5 @@ số điện thoại hoặc email quên mật khẩu? Bạn chưa có tài khoản? + Chúng tôi sẽ gửi mã xác nhận qua email của bạn. \ No newline at end of file