mirror of
https://github.com/russok/FitoTrack.git
synced 2025-10-28 08:12:11 -07:00
Merge branch '2.0'
This commit is contained in:
commit
f664372621
@ -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 {
|
||||
|
||||
@ -78,8 +78,7 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
|
||||
|
||||
checkFirstStart();
|
||||
|
||||
adapter= new WorkoutAdapter(workouts, this);
|
||||
listView.setAdapter(adapter);
|
||||
refreshAdapter();
|
||||
|
||||
}
|
||||
|
||||
@ -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.
|
||||
|
||||
3
metadata/en-US/changelogs/210.txt
Normal file
3
metadata/en-US/changelogs/210.txt
Normal file
@ -0,0 +1,3 @@
|
||||
**2.1:**
|
||||
|
||||
- Fix workouts not showing after recorded (#25)
|
||||
Loading…
x
Reference in New Issue
Block a user