From 8fcfb9ecb5e21aa6284c5049926506ff4a2092c1 Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Wed, 8 Feb 2023 10:34:32 +0700
Subject: [PATCH] Change name activity

---
 .idea/vcs.xml                                         |  6 ++++++
 app/src/main/AndroidManifest.xml                      |  2 +-
 .../capstone/foodify/Fragment/ProfileFragment.java    |  4 ++--
 .../{SignInActivity.java => SignUpActivity.java}      |  6 +++---
 .../{activity_sign_in.xml => activity_sign_up.xml}    | 11 ++++++-----
 5 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 .idea/vcs.xml
 rename app/src/main/java/com/capstone/foodify/{SignInActivity.java => SignUpActivity.java} (97%)
 rename app/src/main/res/layout/{activity_sign_in.xml => activity_sign_up.xml} (99%)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a6d3f94..2e5fbb0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:theme="@style/Theme.Foodify"
         tools:targetApi="31">
         <activity
-            android:name=".SignInActivity"
+            android:name=".SignUpActivity"
             android:exported="false" />
         <activity
             android:name=".SplashScreenActivity"
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java
index 76e0abe..b0204da 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/ProfileFragment.java
@@ -12,7 +12,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 
 import com.capstone.foodify.R;
-import com.capstone.foodify.SignInActivity;
+import com.capstone.foodify.SignUpActivity;
 
 public class ProfileFragment extends Fragment {
 
@@ -27,7 +27,7 @@ public class ProfileFragment extends Fragment {
         btnSignUp.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent i =new Intent(getActivity(), SignInActivity.class);
+                Intent i =new Intent(getActivity(), SignUpActivity.class);
                 startActivity(i);
                 ((Activity) getActivity()).overridePendingTransition(0,0);
             }
diff --git a/app/src/main/java/com/capstone/foodify/SignInActivity.java b/app/src/main/java/com/capstone/foodify/SignUpActivity.java
similarity index 97%
rename from app/src/main/java/com/capstone/foodify/SignInActivity.java
rename to app/src/main/java/com/capstone/foodify/SignUpActivity.java
index bb87f2f..1bb0f3a 100644
--- a/app/src/main/java/com/capstone/foodify/SignInActivity.java
+++ b/app/src/main/java/com/capstone/foodify/SignUpActivity.java
@@ -22,7 +22,7 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
 
-public class SignInActivity extends AppCompatActivity {
+public class SignUpActivity extends AppCompatActivity {
 
     TextInputLayout textInput_email, textInput_password, textInput_phone,
             textInput_address, textInput_repeatPassword, textInput_firstName, textInput_lastName, textInput_birthDay;
@@ -35,7 +35,7 @@ public class SignInActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_sign_in);
+        setContentView(R.layout.activity_sign_up);
 
         setFontUI();
 
@@ -53,7 +53,7 @@ public class SignInActivity extends AppCompatActivity {
         editText.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                new DatePickerDialog(SignInActivity.this,date,myCalendar.get(Calendar.YEAR),myCalendar.get(Calendar.MONTH),myCalendar.get(Calendar.DAY_OF_MONTH)).show();
+                new DatePickerDialog(SignUpActivity.this,date,myCalendar.get(Calendar.YEAR),myCalendar.get(Calendar.MONTH),myCalendar.get(Calendar.DAY_OF_MONTH)).show();
             }
         });
 
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_up.xml
similarity index 99%
rename from app/src/main/res/layout/activity_sign_in.xml
rename to app/src/main/res/layout/activity_sign_up.xml
index 6b9cc29..782d193 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SignInActivity">
+    tools:context=".SignUpActivity">
 
     <TextView
         android:id="@+id/textView"
@@ -177,17 +177,18 @@
         >
 
         <Spinner
-            android:id="@+id/ward"
+            android:id="@+id/district"
             android:layout_width="190dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="12dp"
-            android:contentDescription="ward"
+            android:contentDescription="district"
             />
+
         <Spinner
-            android:id="@+id/district"
+            android:id="@+id/ward"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:contentDescription="district"
+            android:contentDescription="ward"
             />
 
     </LinearLayout>