diff --git a/app/src/main/java/com/example/mampfmobil/MainActivity.java b/app/src/main/java/com/example/mampfmobil/MainActivity.java index c6de4bcec06d80b0323f5c2f0b9f75c1976b66eb..ad4949310efd16f9aa22cdbff4b583cc958f0ebf 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 1208ef00d644c8596776313ac706ff159f756148..776a39d67ca3075c8d877f160a1829d1801ad261 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 6840c1a05e809afaeb2f17db5656c7845f2a7a36..12ce039c6984a3b9bcce8a81efa0db848e339746 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 1c04a130d82d334534abac19859316a53a118508..364653720aba0d2889eccb23163ad0d821bcd45a 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 b082aee0c36448c4cc963ef4613527e88aa67618..30989ced0a94074933824687604702b14aacdef5 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 29637d81b715ef9be6acd281664fac9deac6c762..efd5f6e33ffbbf8a023e0af59a2c0b68db5bf093 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 f1635e6b7e69244bcc87a711310062ca8db38d72..cd907150b1c69524421373cdfca163e1888d4486 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 c60e2120434af8031d295e2155ce8c36854f1651..6bd6d744eade9f08572a018c2fb12cf6c918085c 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);