From 11d7e18ccd5ff4f227b2b258b43014fac9bedcda Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Wed, 8 Feb 2023 11:51:39 +0700
Subject: [PATCH] Fix value in string.xml and format date

---
 .idea/deploymentTargetDropDown.xml              | 17 +++++++++++++++++
 .../com/capstone/foodify/SignUpActivity.java    |  2 +-
 app/src/main/res/values/strings.xml             |  8 ++++----
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..cfed20b
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_6_API_33.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-02-08T04:49:02.963423Z" />
+  </component>
+</project>
\ 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 b6e9fa4..1fdf8fc 100644
--- a/app/src/main/java/com/capstone/foodify/SignUpActivity.java
+++ b/app/src/main/java/com/capstone/foodify/SignUpActivity.java
@@ -139,7 +139,7 @@ public class SignUpActivity extends AppCompatActivity {
     }
 
     private void updateLabel(){
-        String myFormat="MM/dd/yy";
+        String myFormat="dd/MM/yyyy";
         SimpleDateFormat dateFormat=new SimpleDateFormat(myFormat, Locale.US);
         editText.setText(dateFormat.format(myCalendar.getTime()));
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0aeb360..bcd0851 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,9 +16,9 @@
     <string name="repeat_password_text">xác nhận mật khẩu</string>
     <string name="first_name_text">Họ</string>
     <string name="last_name_text">Tên</string>
-    <string name="birthday_text">ngày sinh nhật (mm/dd/yyyy)</string>
+    <string name="birthday_text">ngày tháng năm sinh</string>
     <string name="address_text">địa chỉ</string>
-    <string name="phone_or_email">phone or email</string>
-    <string name="forgot_password">Forgot Password?</string>
-    <string name="dont_have_an_account">Don\'t have an account?</string>
+    <string name="phone_or_email">số điện thoại hoặc email</string>
+    <string name="forgot_password">quên mật khẩu?</string>
+    <string name="dont_have_an_account">Bạn chưa có tài khoản?</string>
 </resources>
\ No newline at end of file