luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-29 08:42:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source
This commit is contained in:
jannis 2019-11-03 17:38:58 +01:00
commit f664372621
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

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

13
app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
View File

@ -78,8 +78,7 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
checkFirstStart(); 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() { public void onResume() {
super.onResume(); super.onResume();
int count= workouts.length;
loadData(); loadData();
adapter.notifyDataSetChanged(); if(count != workouts.length){
refreshAdapter();
}
} }
@Override @Override
@ -130,6 +132,11 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
workouts= Instance.getInstance(this).db.workoutDao().getWorkouts(); workouts= Instance.getInstance(this).db.workoutDao().getWorkouts();
} }
private void refreshAdapter(){
adapter= new WorkoutAdapter(workouts, this);
listView.setAdapter(adapter);
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present. // Inflate the menu; this adds items to the action bar if it is present.

3
metadata/en-US/changelogs/210.txt Normal file
View File

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