From 782be62f2b051faa40a65e81641ae9096f843e46 Mon Sep 17 00:00:00 2001 From: jannis Date: Wed, 22 Jan 2020 11:56:05 +0100 Subject: [PATCH] #37 Workout list does not refresh properly --- .../activity/ListWorkoutsActivity.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 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 207c7ad..d0f82d0 100644 --- a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java +++ b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java @@ -74,12 +74,9 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor findViewById(R.id.workoutListRecordHiking) .setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_HIKING)); findViewById(R.id.workoutListRecordCycling).setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_CYCLING)); - loadData(); - checkFirstStart(); - refreshAdapter(); - + refresh(); } private void checkFirstStart(){ @@ -106,11 +103,7 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor public void onResume() { super.onResume(); - int count= workouts.length; - loadData(); - if(count != workouts.length){ - refreshAdapter(); - } + refresh(); } @Override @@ -123,11 +116,15 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor public void onItemLongClick(int pos, Workout workout) { DialogUtils.showDeleteWorkoutDialog(this, () -> { Instance.getInstance(ListWorkoutsActivity.this).db.workoutDao().deleteWorkout(workout); - loadData(); - adapter.notifyItemRemoved(pos); + refresh(); }); } + private void refresh() { + loadData(); + refreshAdapter(); + } + private void loadData(){ workouts= Instance.getInstance(this).db.workoutDao().getWorkouts(); }