diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2e5fbb0..3d2afc9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,9 @@
android:supportsRtl="true"
android:theme="@style/Theme.Foodify"
tools:targetApi="31">
+
diff --git a/app/src/main/java/com/capstone/foodify/SignInActivity.java b/app/src/main/java/com/capstone/foodify/SignInActivity.java
new file mode 100644
index 0000000..4029786
--- /dev/null
+++ b/app/src/main/java/com/capstone/foodify/SignInActivity.java
@@ -0,0 +1,26 @@
+package com.capstone.foodify;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+public class SignInActivity extends AppCompatActivity {
+
+ TextView signUp_textView;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_sign_in);
+
+ signUp_textView = (TextView) findViewById(R.id.sign_up_textView);
+ signUp_textView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ startActivity(new Intent(SignInActivity.this, SignUpActivity.class));
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/SignUpActivity.java b/app/src/main/java/com/capstone/foodify/SignUpActivity.java
index 1bb0f3a..2a8aa86 100644
--- a/app/src/main/java/com/capstone/foodify/SignUpActivity.java
+++ b/app/src/main/java/com/capstone/foodify/SignUpActivity.java
@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
import android.app.DatePickerDialog;
import android.content.Context;
+import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
import android.view.View;
@@ -21,6 +22,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Locale;
+import java.util.Objects;
public class SignUpActivity extends AppCompatActivity {
@@ -29,6 +31,7 @@ public class SignUpActivity extends AppCompatActivity {
final Calendar myCalendar= Calendar.getInstance();
EditText editText, edt_birthday;
+ TextView signIn_textView;
Spinner wardSpinner, districtSpinner;
@@ -38,25 +41,25 @@ public class SignUpActivity extends AppCompatActivity {
setContentView(R.layout.activity_sign_up);
setFontUI();
+ chooseDateOfBirth();
+ listWardAndDistrict();
- //Calendar date of birth
- editText=(EditText) findViewById(R.id.edt_birthDay);
- 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();
- }
- };
- editText.setOnClickListener(new View.OnClickListener() {
+ signIn_textView = (TextView) findViewById(R.id.signIn_textView);
+ signIn_textView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new DatePickerDialog(SignUpActivity.this,date,myCalendar.get(Calendar.YEAR),myCalendar.get(Calendar.MONTH),myCalendar.get(Calendar.DAY_OF_MONTH)).show();
+ startActivity(new Intent(SignUpActivity.this, SignInActivity.class));
}
});
+ // enabling action bar app icon and behaving it as toggle button
+ Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setHomeButtonEnabled(true);
+ }
+
+
+
+ private void listWardAndDistrict() {
wardSpinner = (Spinner) findViewById(R.id.ward);
districtSpinner = (Spinner) findViewById(R.id.district);
@@ -82,7 +85,6 @@ public class SignUpActivity extends AppCompatActivity {
wardSpinner.setSelection(ward.indexOf("---Phường"));//set selected value in spinner
districtSpinner.setSelection(district.indexOf("---Quận"));
}
-
private static class MySpinnerAdapter extends ArrayAdapter {
// Initialise custom font, for example:
Typeface font = Typeface.createFromAsset(getContext().getAssets(),
@@ -112,6 +114,26 @@ public class SignUpActivity extends AppCompatActivity {
}
}
+ private void chooseDateOfBirth() {
+ //Calendar date of birth
+ editText=(EditText) findViewById(R.id.edt_birthDay);
+ 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();
+ }
+ };
+ editText.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new DatePickerDialog(SignUpActivity.this,date,myCalendar.get(Calendar.YEAR),myCalendar.get(Calendar.MONTH),myCalendar.get(Calendar.DAY_OF_MONTH)).show();
+ }
+ });
+ }
+
private void updateLabel(){
String myFormat="MM/dd/yy";
SimpleDateFormat dateFormat=new SimpleDateFormat(myFormat, Locale.US);
diff --git a/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java b/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java
index 0a1fb6a..998d639 100644
--- a/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java
+++ b/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java
@@ -7,6 +7,8 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import java.util.Objects;
+
public class SplashScreenActivity extends AppCompatActivity {
@Override
diff --git a/app/src/main/res/drawable/baseline_person_24.xml b/app/src/main/res/drawable/baseline_person_24.xml
new file mode 100644
index 0000000..98730cd
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_person_24.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
new file mode 100644
index 0000000..d0c066c
--- /dev/null
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 782d193..ca82afe 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -276,6 +276,7 @@
android:textStyle="bold" />
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e453de2..7282036 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,6 @@
#2FDBBC
#A3A3A3
#F99928
- #F1F0F0
+ #ACA5A5
\ 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 535f3c1..0aeb360 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
- UI App
+ Foodify
Trang chủ
Tìm kiếm
Giỏ hàng
@@ -18,4 +18,7 @@
Tên
ngày sinh nhật (mm/dd/yyyy)
địa chỉ
+ phone or email
+ Forgot Password?
+ Don\'t have an account?
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 607096e..4a5ddcf 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,8 +10,6 @@
- ?attr/colorPrimaryVariant
- - false
- - true