From 4f22a6f500a53b24e9d17ee9b12408959040547b Mon Sep 17 00:00:00 2001
From: jannis <jannis@tadris.de>
Date: Tue, 15 Oct 2019 12:24:22 +0200
Subject: [PATCH 1/3] Fix #25 Workouts not visible after recording has stopped

---
 .../fitness/activity/ListWorkoutsActivity.java   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
index 17c1c1c..1fe0626 100644
--- a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
@@ -47,6 +47,7 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
     private RecyclerView.LayoutManager layoutManager;
     private FloatingActionMenu menu;
     Workout[] workouts;
+    private boolean recorderHasStarted= false;
 
 
     @Override
@@ -78,8 +79,7 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
 
         checkFirstStart();
 
-        adapter= new WorkoutAdapter(workouts, this);
-        listView.setAdapter(adapter);
+        refreshAdapter();
 
     }
 
@@ -101,6 +101,8 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
         RecordWorkoutActivity.ACTIVITY= activity;
         final Intent intent= new Intent(this, RecordWorkoutActivity.class);
         new Handler().postDelayed(() -> startActivity(intent), 300);
+
+        recorderHasStarted= true;
     }
 
     @Override
@@ -108,7 +110,10 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
         super.onResume();
 
         loadData();
-        adapter.notifyDataSetChanged();
+        if(recorderHasStarted){
+            refreshAdapter();
+            recorderHasStarted= false;
+        }
     }
 
     @Override
@@ -130,6 +135,11 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
         workouts= Instance.getInstance(this).db.workoutDao().getWorkouts();
     }
 
+    private void refreshAdapter(){
+        adapter= new WorkoutAdapter(workouts, this);
+        listView.setAdapter(adapter);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.

From 7fec3ef2505ef22607e6de8e469ea1e4411c9cb4 Mon Sep 17 00:00:00 2001
From: jannis <jannis@tadris.de>
Date: Sun, 3 Nov 2019 17:34:38 +0100
Subject: [PATCH 2/3] Fix #25 also for deleting workouts

---
 .../de/tadris/fitness/activity/ListWorkoutsActivity.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
index 1fe0626..337c562 100644
--- a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
@@ -47,7 +47,6 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
     private RecyclerView.LayoutManager layoutManager;
     private FloatingActionMenu menu;
     Workout[] workouts;
-    private boolean recorderHasStarted= false;
 
 
     @Override
@@ -101,18 +100,16 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
         RecordWorkoutActivity.ACTIVITY= activity;
         final Intent intent= new Intent(this, RecordWorkoutActivity.class);
         new Handler().postDelayed(() -> startActivity(intent), 300);
-
-        recorderHasStarted= true;
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
+        int count= workouts.length;
         loadData();
-        if(recorderHasStarted){
+        if(count != workouts.length){
             refreshAdapter();
-            recorderHasStarted= false;
         }
     }
 

From 2a5f0f3164fa29f771ffcfbba6c5a5d9d591eb97 Mon Sep 17 00:00:00 2001
From: jannis <jannis@tadris.de>
Date: Sun, 3 Nov 2019 17:38:36 +0100
Subject: [PATCH 3/3] Version 2.1

---
 app/build.gradle                  | 4 ++--
 metadata/en-US/changelogs/210.txt | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 metadata/en-US/changelogs/210.txt

diff --git a/app/build.gradle b/app/build.gradle
index 7d03c09..9980cf3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,8 +35,8 @@ android {
         applicationId "de.tadris.fitness"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 200
-        versionName "2.0"
+        versionCode 210
+        versionName "2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/metadata/en-US/changelogs/210.txt b/metadata/en-US/changelogs/210.txt
new file mode 100644
index 0000000..b92010d
--- /dev/null
+++ b/metadata/en-US/changelogs/210.txt
@@ -0,0 +1,3 @@
+**2.1:**
+
+- Fix workouts not showing after recorded (#25)
\ No newline at end of file