karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Interval statistics: retain interval value after change orientation and recreation.

Browse Source
This commit is contained in:
Román
2020-08-12 15:20:59 +02:00
committed by Román Martínez
parent a8cefcd0fd
commit cbc803d038
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java
+8 -8
View File
@@ -141,6 +141,14 @@ public class StatisticsRecordedFragment extends Fragment implements IntervalList
speedMovingLabel = view.findViewById(R.id.stats_moving_speed_label);
speedMovingValue = view.findViewById(R.id.stats_moving_speed_value);
speedMovingUnit = view.findViewById(R.id.stats_moving_speed_unit);
intervalListView = new IntervalListView(getActivity(), this);
intervalListView.setId(View.generateViewId());
LinearLayout linearLayoutExtra = rootView.findViewById(R.id.linear_layout_extra);
linearLayoutExtra.removeAllViews();
linearLayoutExtra.addView(intervalListView);
viewModel = new ViewModelProvider(this).get(IntervalStatisticsModel.class);
}
@Override
@@ -164,13 +172,6 @@ public class StatisticsRecordedFragment extends Fragment implements IntervalList
}
private void addIntervals() {
intervalListView = new IntervalListView(getActivity(), this);
intervalListView.setId(View.generateViewId());
LinearLayout linearLayoutExtra = rootView.findViewById(R.id.linear_layout_extra);
linearLayoutExtra.removeAllViews();
linearLayoutExtra.addView(intervalListView);
viewModel = new ViewModelProvider(this).get(IntervalStatisticsModel.class);
viewModel.getIntervalStats(track.getId()).observe(getActivity(), intervalStatistics -> {
if (intervalStatistics != null) {
intervalListView.display(intervalStatistics.getIntervalList());
@@ -302,7 +303,6 @@ public class StatisticsRecordedFragment extends Fragment implements IntervalList
@Override
public void intervalChanged(IntervalStatisticsModel.IntervalOption interval) {
if (viewModel != null && intervalListView != null) {
viewModel = new ViewModelProvider(this).get(IntervalStatisticsModel.class);
viewModel.getIntervalStats(track.getId(), interval).observe(getActivity(), intervalStatistics -> {
if (intervalStatistics != null) {
intervalListView.display(intervalStatistics.getIntervalList());
src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java
+2 -1
View File
@@ -22,6 +22,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
public IntervalStatisticsModel(@NonNull Application application) {
super(application);
interval = IntervalOption.OPTION_1;
}
public LiveData<IntervalStatistics> getIntervalStats(long trackId, IntervalOption interval) {
@@ -34,7 +35,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
}
public LiveData<IntervalStatistics> getIntervalStats(long trackId) {
return getIntervalStats(trackId, IntervalOption.OPTION_1);
return getIntervalStats(trackId, interval);
}
private void loadIntervalStats(long trackId) {