diff --git a/app/src/main/java/com/capstone/foodify/MainActivity.java b/app/src/main/java/com/capstone/foodify/MainActivity.java index b56dc03..87a3743 100644 --- a/app/src/main/java/com/capstone/foodify/MainActivity.java +++ b/app/src/main/java/com/capstone/foodify/MainActivity.java @@ -11,6 +11,8 @@ import android.view.MenuItem; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.navigation.NavigationBarView; +import java.util.Objects; + public class MainActivity extends AppCompatActivity { ViewPager2 viewPager2; @@ -23,6 +25,8 @@ 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 4029786..15f0741 100644 --- a/app/src/main/java/com/capstone/foodify/SignInActivity.java +++ b/app/src/main/java/com/capstone/foodify/SignInActivity.java @@ -1,12 +1,17 @@ package com.capstone.foodify; -import androidx.appcompat.app.AppCompatActivity; - import android.content.Intent; import android.os.Bundle; +import android.view.MenuItem; import android.view.View; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + +import java.util.Objects; + public class SignInActivity extends AppCompatActivity { TextView signUp_textView; @@ -15,6 +20,12 @@ public class SignInActivity extends AppCompatActivity { 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); signUp_textView.setOnClickListener(new View.OnClickListener() { @Override @@ -23,4 +34,15 @@ public class SignInActivity extends AppCompatActivity { } }); } + + // this event will enable the back + // function to the button on press + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + if (item.getItemId() == android.R.id.home) { + this.finish(); + return true; + } + return super.onOptionsItemSelected(item); + } } \ No newline at end of file diff --git a/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java b/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java index 998d639..82e10c7 100644 --- a/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java +++ b/app/src/main/java/com/capstone/foodify/SplashScreenActivity.java @@ -23,5 +23,7 @@ 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/vector.xml new file mode 100644 index 0000000..7e077b4 --- /dev/null +++ b/app/src/main/res/drawable/vector.xml @@ -0,0 +1,9 @@ + + +