From ec2e3d0b7402a857bc0013f918f0364fba98aeb8 Mon Sep 17 00:00:00 2001 From: fheyming <fabio-andre.heyming@sva.de> Date: Sat, 3 Jun 2023 09:29:05 +0200 Subject: [PATCH] Added back button for logon and register --- .../java/com/example/mampfmobil/MainActivity.java | 8 ++++++++ .../ui/customer/CustomerLogonFragment.java | 9 +++++++++ .../ui/customer/CustomerOrdersFragment.java | 12 ++++++++++++ .../ui/customer/CustomerRegisterFragment.java | 9 +++++++++ .../ui/deliverer/DelivererLogonFragment.java | 8 ++++++++ .../ui/deliverer/DelivererRegisterFragment.java | 9 +++++++++ .../ui/supplier/SupplierLogonFragment.java | 10 ++++++++++ .../ui/supplier/SupplierRegisterFragment.java | 11 +++++++++++ 8 files changed, 76 insertions(+) diff --git a/app/src/main/java/com/example/mampfmobil/MainActivity.java b/app/src/main/java/com/example/mampfmobil/MainActivity.java index c6de4bc..ad49493 100644 --- a/app/src/main/java/com/example/mampfmobil/MainActivity.java +++ b/app/src/main/java/com/example/mampfmobil/MainActivity.java @@ -1,5 +1,6 @@ package com.example.mampfmobil; +import android.content.Intent; import android.os.Bundle; import android.view.View; @@ -31,4 +32,11 @@ public class MainActivity extends AppCompatActivity { } + @Override + public boolean onSupportNavigateUp() { + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + return true; // true zurückgeben, um anzugeben, dass die Aktion behandelt wurde + } + } \ No newline at end of file diff --git a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerLogonFragment.java b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerLogonFragment.java index 1208ef0..776a39d 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerLogonFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerLogonFragment.java @@ -1,5 +1,7 @@ package com.example.mampfmobil.ui.customer; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -40,6 +42,13 @@ public class CustomerLogonFragment extends Fragment { EditText lastname = rootView.findViewById(R.id.editTextLastName); Button button = rootView.findViewById(R.id.buttonRegister); + AppCompatActivity activity = (AppCompatActivity) requireActivity(); + // Enable the back button in the ActionBar + ActionBar actionBar = activity.getSupportActionBar(); + if(actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + button.setOnClickListener(new View.OnClickListener() { private Toast toast; // @Override diff --git a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerOrdersFragment.java b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerOrdersFragment.java index 6840c1a..12ce039 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerOrdersFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerOrdersFragment.java @@ -60,6 +60,18 @@ public class CustomerOrdersFragment extends Fragment { return rootView; } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + // Hier kannst du den gewünschten Code ausführen, wenn der Zurück-Button gedrückt wird + // Zum Beispiel: + getActivity().onBackPressed(); // Rückwärtsnavigation durchführen + return true; + } + return super.onOptionsItemSelected(item); + } + @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); diff --git a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerRegisterFragment.java b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerRegisterFragment.java index 1c04a13..3646537 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerRegisterFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerRegisterFragment.java @@ -1,5 +1,7 @@ package com.example.mampfmobil.ui.customer; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.ViewModelProvider; import android.content.Intent; @@ -39,6 +41,13 @@ public class CustomerRegisterFragment extends Fragment { EditText lastname = rootView.findViewById(R.id.editTextLastName); EditText register = rootView.findViewById(R.id.editTextAddress); + AppCompatActivity activity = (AppCompatActivity) requireActivity(); + // Enable the back button in the ActionBar + ActionBar actionBar = activity.getSupportActionBar(); + if(actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + button.setOnClickListener(new View.OnClickListener() { private Toast toast; // diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererLogonFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererLogonFragment.java index b082aee..30989ce 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererLogonFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererLogonFragment.java @@ -1,5 +1,7 @@ package com.example.mampfmobil.ui.deliverer; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -42,6 +44,12 @@ public class DelivererLogonFragment extends Fragment { EditText firstname = rootView.findViewById(R.id.editTextFirstName); EditText lastname = rootView.findViewById(R.id.editTextLastName); + AppCompatActivity activity = (AppCompatActivity) requireActivity(); + // Enable the back button in the ActionBar + ActionBar actionBar = activity.getSupportActionBar(); + if(actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } button.setOnClickListener(new View.OnClickListener() { private Toast toast; // diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererRegisterFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererRegisterFragment.java index 29637d8..efd5f6e 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererRegisterFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererRegisterFragment.java @@ -1,5 +1,7 @@ package com.example.mampfmobil.ui.deliverer; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.ViewModelProvider; import android.content.Intent; @@ -38,6 +40,13 @@ public class DelivererRegisterFragment extends Fragment { EditText lastname = rootView.findViewById(R.id.editTextLastName); EditText register = rootView.findViewById(R.id.editTextAddress); + AppCompatActivity activity = (AppCompatActivity) requireActivity(); + // Enable the back button in the ActionBar + ActionBar actionBar = activity.getSupportActionBar(); + if(actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + button.setOnClickListener(new View.OnClickListener() { private Toast toast; // @Override diff --git a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java index f1635e6..cd90715 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierLogonFragment.java @@ -1,5 +1,7 @@ package com.example.mampfmobil.ui.supplier; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -41,6 +43,14 @@ public class SupplierLogonFragment extends Fragment { Button button = rootView.findViewById(R.id.buttonRegister); EditText firstname = rootView.findViewById(R.id.editTextFirstName); + AppCompatActivity activity = (AppCompatActivity) requireActivity(); + // Enable the back button in the ActionBar + ActionBar actionBar = activity.getSupportActionBar(); + if(actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + + button.setOnClickListener(new View.OnClickListener() { private Toast toast; // @Override diff --git a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierRegisterFragment.java b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierRegisterFragment.java index c60e212..6bd6d74 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierRegisterFragment.java +++ b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierRegisterFragment.java @@ -1,5 +1,7 @@ package com.example.mampfmobil.ui.supplier; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.ViewModelProvider; import android.content.Intent; @@ -39,6 +41,13 @@ public class SupplierRegisterFragment extends Fragment { EditText name = rootView.findViewById(R.id.editTextFirstName); EditText register = rootView.findViewById(R.id.editTextAddress); + AppCompatActivity activity = (AppCompatActivity) requireActivity(); + // Enable the back button in the ActionBar + ActionBar actionBar = activity.getSupportActionBar(); + if(actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + button.setOnClickListener(new View.OnClickListener() { private Toast toast; // @Override @@ -71,6 +80,8 @@ public class SupplierRegisterFragment extends Fragment { return rootView; } + + @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); -- GitLab