Merge branch '2.0'

app/build.gradle

@@ -35,8 +35,8 @@ android {
         applicationId "de.tadris.fitness"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 200
+        versionCode 210
-        versionName "2.0"
+        versionName "2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java

@@ -78,8 +78,7 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
 
         checkFirstStart();
 
-        adapter= new WorkoutAdapter(workouts, this);
+        refreshAdapter();
-        listView.setAdapter(adapter);
 
     }
 
@@ -107,8 +106,11 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
     public void onResume() {
         super.onResume();
 
+        int count= workouts.length;
         loadData();
-        adapter.notifyDataSetChanged();
+        if(count != workouts.length){
+            refreshAdapter();
+        }
     }
 
     @Override
@@ -130,6 +132,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.

metadata/en-US/changelogs/210.txt

@@ -0,0 +1,3 @@
+**2.1:**
+
+- Fix workouts not showing after recorded (#25)