From 68694f07420bb0c18f6494a128a734d23b793451 Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Wed, 8 Feb 2023 11:35:33 +0700
Subject: [PATCH] Add back button for sign in and sign up screen
---
.../com/capstone/foodify/MainActivity.java | 2 --
.../com/capstone/foodify/SignInActivity.java | 18 ++++++++++++------
.../com/capstone/foodify/SignUpActivity.java | 14 ++++++++++----
.../capstone/foodify/SplashScreenActivity.java | 2 --
.../drawable/{vector.xml => back_button.xml} | 0
app/src/main/res/layout/activity_sign_in.xml | 14 ++++++++++++--
app/src/main/res/layout/activity_sign_up.xml | 17 ++++++++++++++---
app/src/main/res/values/themes.xml | 2 ++
8 files changed, 50 insertions(+), 19 deletions(-)
rename app/src/main/res/drawable/{vector.xml => back_button.xml} (100%)
diff --git a/app/src/main/java/com/capstone/foodify/MainActivity.java b/app/src/main/java/com/capstone/foodify/MainActivity.java
index 87a3743..fa23345 100644
--- a/app/src/main/java/com/capstone/foodify/MainActivity.java
+++ b/app/src/main/java/com/capstone/foodify/MainActivity.java
@@ -25,8 +25,6 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- Objects.requireNonNull(getSupportActionBar()).hide();
-
bottomNavigationView = findViewById(R.id.bottom_nav);
viewPager2 = findViewById(R.id.viewPager);
viewPagerAdapter = new ViewPagerAdapter(this);
diff --git a/app/src/main/java/com/capstone/foodify/SignInActivity.java b/app/src/main/java/com/capstone/foodify/SignInActivity.java
index 15f0741..dcd711d 100644
--- a/app/src/main/java/com/capstone/foodify/SignInActivity.java
+++ b/app/src/main/java/com/capstone/foodify/SignInActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
+import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -15,18 +16,23 @@ import java.util.Objects;
public class SignInActivity extends AppCompatActivity {
TextView signUp_textView;
+
+ ImageView back_image;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_in);
- // calling the action bar
- ActionBar actionBar = getSupportActionBar();
- Objects.requireNonNull(actionBar).setDisplayShowTitleEnabled(false);
- // showing the back button in action bar
- Objects.requireNonNull(actionBar).setDisplayHomeAsUpEnabled(true);
-
signUp_textView = (TextView) findViewById(R.id.sign_up_textView);
+
+ back_image = (ImageView) findViewById(R.id.back_image);
+
+ back_image.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ onBackPressed();
+ }
+ });
signUp_textView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git a/app/src/main/java/com/capstone/foodify/SignUpActivity.java b/app/src/main/java/com/capstone/foodify/SignUpActivity.java
index 2a8aa86..9f960b9 100644
--- a/app/src/main/java/com/capstone/foodify/SignUpActivity.java
+++ b/app/src/main/java/com/capstone/foodify/SignUpActivity.java
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.DatePicker;
import android.widget.EditText;
+import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
@@ -30,9 +31,9 @@ public class SignUpActivity extends AppCompatActivity {
textInput_address, textInput_repeatPassword, textInput_firstName, textInput_lastName, textInput_birthDay;
final Calendar myCalendar= Calendar.getInstance();
EditText editText, edt_birthday;
-
TextView signIn_textView;
Spinner wardSpinner, districtSpinner;
+ ImageView back_image;
@Override
@@ -52,9 +53,14 @@ public class SignUpActivity extends AppCompatActivity {
}
});
- // enabling action bar app icon and behaving it as toggle button
- Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
- getSupportActionBar().setHomeButtonEnabled(true);
+ back_image = (ImageView) findViewById(R.id.back_image);
+
+ back_image.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ onBackPressed();
+ }
+ });
}
diff --git a/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java b/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java
index 82e10c7..998d639 100644
--- a/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java
+++ b/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java
@@ -23,7 +23,5 @@ public class SplashScreenActivity extends AppCompatActivity {
finish();
}
}, 3000);
-
- Objects.requireNonNull(getSupportActionBar()).hide();
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/vector.xml b/app/src/main/res/drawable/back_button.xml
similarity index 100%
rename from app/src/main/res/drawable/vector.xml
rename to app/src/main/res/drawable/back_button.xml
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
index d0c066c..58433c4 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -6,18 +6,28 @@
android:layout_height="match_parent"
tools:context=".SignInActivity">
+
+
+ app:layout_constraintTop_toTopOf="@id/back_image" />
+
+
+ app:layout_constraintTop_toTopOf="@id/back_image" />
- ?attr/colorPrimaryVariant
+ - false
+ - true