diff --git a/app/src/main/java/com/example/mampfmobil/MainActivity.java b/app/src/main/java/com/example/mampfmobil/MainActivity.java index 287ce00326d74588d2a8d81986086d943945ae61..9717569680bb927cacd185e7e863b651641b4110 100644 --- a/app/src/main/java/com/example/mampfmobil/MainActivity.java +++ b/app/src/main/java/com/example/mampfmobil/MainActivity.java @@ -23,6 +23,7 @@ public class MainActivity extends AppCompatActivity { binding = ActivityMainBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); MampfMobil meinMampf = new MampfMobil(binding.getRoot().getContext()); + // Hier wird die Bottom Navigation View ausgeblendet binding.navView.setVisibility(View.GONE); @@ -48,7 +49,8 @@ public class MainActivity extends AppCompatActivity { @Override protected void onStop() { - Log.d("myTag", "This ONSTOP"); + Log.d("myTag", "SAVED PERSISTANT"); + MampfMobil.savePersistant(); super.onStop(); } diff --git a/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java b/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java index 1f1d4ab818e044c7c09ec7632d7954420a9a876f..9ede2334513f438b7e9c09d42ab7b285539db5ed 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java +++ b/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java @@ -153,8 +153,9 @@ private ActivityCustomerBinding binding; } @Override - protected void onDestroy() { - Log.d("myTag", "This ONDESTROY CUSTOMER"); - super.onDestroy(); + protected void onStop() { + Log.d("myTag", "SAVED PERSISTANT"); + MampfMobil.savePersistant(); + super.onStop(); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/mampfmobil/ui/DelivererActivity.java b/app/src/main/java/com/example/mampfmobil/ui/DelivererActivity.java index 90971bf45e47c55593fdf51e569ac84969392bf1..b24cf187f60e16f234acd7a64b3ae2695fb449c7 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/DelivererActivity.java +++ b/app/src/main/java/com/example/mampfmobil/ui/DelivererActivity.java @@ -49,8 +49,9 @@ private ActivityDelivererBinding binding; } @Override - protected void onDestroy() { - Log.d("myTag", "This ONDESTROYDELIVERER"); - super.onDestroy(); + protected void onStop() { + Log.d("myTag", "SAVED PERSISTANT"); + MampfMobil.savePersistant(); + super.onStop(); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java b/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java index df0613091ba31bb2ec5111c3ada9f0d3d8c23c4c..6384b691c9521d567c6cebd15d9e3bd1bd23dcf7 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java +++ b/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java @@ -31,14 +31,19 @@ public class MampfMobil { public MampfMobil(Context context){ this.context = context; - customers = new Vector<>(); - deliverers = new Vector<>(); - suppliers = new Vector<>(); - takefromPersistance(); + if(!isInitialized) { customers = new Vector<>(); deliverers = new Vector<>(); suppliers = new Vector<>(); + takefromPersistance(); + isInitialized = true; + } + + /*if(!isInitialized) { + customers = new Vector<>(); + deliverers = new Vector<>(); + suppliers = new Vector<>(); //create Dummys!!! customers.add(new Customer("Fabio", "Heyming", "Weinbergstr 70, 55299 Nackenheim")); @@ -111,7 +116,7 @@ public class MampfMobil { suppliers.add(new Supplier("", "")); isInitialized = true; savePersistant(); - } + }*/ } public static boolean findCustomer(String vorname, String nachname){ @@ -273,7 +278,6 @@ public class MampfMobil { } } String fileName6 = "bestellungen.csv"; - Log.d("myTag", csvBestellungen); CSVFileHelper.saveCSVFile(context, fileName6, csvBestellungen); @@ -401,7 +405,6 @@ public class MampfMobil { String fileName6 = "bestellungen.csv"; String csvData6 = CSVFileHelper.loadCSVFile(context, fileName6); - Log.d("myTag", csvData6 ); if (csvData6 != null) { String[] lines = csvData6.split("\n"); for (String line : lines) { @@ -434,7 +437,7 @@ public class MampfMobil { Bestellung temp = new Bestellung(ID, tempSup, delivery, state, tempCus, delivererId); - Log.d("myTag", data.length + " lang" ); + for (int i = 6; i < data.length; i += 2) { int ItemId = Integer.parseInt(data[i]); int quantity = Integer.parseInt(data[i + 1]); @@ -447,7 +450,7 @@ public class MampfMobil { } } } - Log.d("myTag", tempItem.name + quantity); + temp.addBestellungsteil(new BestellungsTeil(tempItem, quantity)); } diff --git a/app/src/main/java/com/example/mampfmobil/ui/SupplierActivity.java b/app/src/main/java/com/example/mampfmobil/ui/SupplierActivity.java index 9ee913288e7c2468b07131fa4beb80f1b2f59027..e5e10dbe16f20a24caefeaffeb059b455fd0576a 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/SupplierActivity.java +++ b/app/src/main/java/com/example/mampfmobil/ui/SupplierActivity.java @@ -47,8 +47,9 @@ public class SupplierActivity extends AppCompatActivity { } @Override - protected void onDestroy() { - Log.d("myTag", "This ONDESTROYDELIVERER"); - super.onDestroy(); + protected void onStop() { + Log.d("myTag", "SAVED PERSISTANT"); + MampfMobil.savePersistant(); + super.onStop(); } } \ No newline at end of file