From cbc291ee494fc8c0bd41ba87589af599d8072dec Mon Sep 17 00:00:00 2001
From: Fabio Heyming <fabio.heyming@web.de>
Date: Sat, 10 Jun 2023 04:54:40 +0200
Subject: [PATCH] Massig Bugfixes
---
.../com/example/mampfmobil/MainActivity.java | 4 +++-
.../mampfmobil/ui/CustomerActivity.java | 7 ++++---
.../mampfmobil/ui/DelivererActivity.java | 7 ++++---
.../com/example/mampfmobil/ui/MampfMobil.java | 21 +++++++++++--------
.../mampfmobil/ui/SupplierActivity.java | 7 ++++---
5 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/example/mampfmobil/MainActivity.java b/app/src/main/java/com/example/mampfmobil/MainActivity.java
index 287ce00..9717569 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 1f1d4ab..9ede233 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 90971bf..b24cf18 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 df06130..6384b69 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 9ee9132..e5e10db 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
--
GitLab