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

Refactoring.

Browse Source 
Also fixes #406.
This commit is contained in:
Dennis Guse
2020-09-03 22:58:10 +02:00
parent bc051f5d81
commit d6d40b01e6
3 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/IntervalsRecordedFragment.java
+2 -8
View File
@@ -78,18 +78,12 @@ public class IntervalsRecordedFragment extends Fragment implements IntervalListV
* @param interval intervals will split in this interval if not null. If it's null then view model will use the default one.
*/
@Override
public void intervalChanged(IntervalStatisticsModel.IntervalOption interval) {
public void intervalChanged(@Nullable IntervalStatisticsModel.IntervalOption interval) {
if (viewModel == null || intervalListView == null) {
return;
}
viewModel.invalidate();
LiveData<IntervalStatistics> liveData;
if (interval == null) {
liveData = viewModel.getIntervalStats(trackId);
} else {
liveData = viewModel.getIntervalStats(trackId, interval);
}
LiveData<IntervalStatistics> liveData = viewModel.getIntervalStats(trackId, interval);
liveData.observe(getActivity(), intervalStatistics -> {
if (intervalStatistics != null) {
intervalListView.display(intervalStatistics.getIntervalList());
src/main/java/de/dennisguse/opentracks/fragments/IntervalsRecordingFragment.java
+2 -8
View File
@@ -107,18 +107,12 @@ public class IntervalsRecordingFragment extends Fragment implements IntervalList
* @param interval intervals will split in this interval if not null. If it's null then view model will use the default one.
*/
@Override
public void intervalChanged(IntervalStatisticsModel.IntervalOption interval) {
public void intervalChanged(@Nullable IntervalStatisticsModel.IntervalOption interval) {
if (viewModel == null || intervalListView == null) {
return;
}
viewModel.invalidate();
LiveData<IntervalStatistics> liveData;
if (interval == null) {
liveData = viewModel.getIntervalStats(trackId);
} else {
liveData = viewModel.getIntervalStats(trackId, interval);
}
LiveData<IntervalStatistics> liveData = viewModel.getIntervalStats(trackId, interval);
liveData.observe(getActivity(), intervalStatistics -> {
if (intervalStatistics != null) {
intervalListView.display(intervalStatistics.getIntervalList());
src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsModel.java
+7 -17
View File
@@ -24,32 +24,22 @@ import de.dennisguse.opentracks.util.UnitConversions;
public class IntervalStatisticsModel extends AndroidViewModel {
private MutableLiveData<IntervalStatistics> intervalStats = new MutableLiveData<>();
private IntervalOption interval = IntervalOption.OPTION_1;
public IntervalStatisticsModel(@NonNull Application application) {
super(application);
}
public LiveData<IntervalStatistics> getIntervalStats(@Nullable Track.Id trackId, IntervalOption interval) {
if (trackId != null && this.interval != interval) {
this.interval = interval;
loadIntervalStats(trackId);
public LiveData<IntervalStatistics> getIntervalStats(@Nullable Track.Id trackId, @Nullable IntervalOption interval) {
if (interval == null) {
interval = IntervalOption.OPTION_1;
}
if (trackId != null) {
loadIntervalStats(trackId, interval);
}
return intervalStats;
}
public LiveData<IntervalStatistics> getIntervalStats(Track.Id trackId) {
return getIntervalStats(trackId, interval);
}
/**
* Call this method when you want to force the view model to re-load intervals.
*/
public void invalidate() {
intervalStats = new MutableLiveData<>();
}
private void loadIntervalStats(final Track.Id trackId) {
private void loadIntervalStats(final Track.Id trackId, IntervalOption interval) {
new Thread(() -> {
Context context = getApplication().getApplicationContext();
ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);