Package structure: moved aggregated statistics.

Part of #963.
2022-01-15 20:12:35 +01:00
parent 5053c41bec
commit 1a125ca60d
12 changed files with 24 additions and 21 deletions
@@ -1,84 +0,0 @@
-package de.dennisguse.opentracks.viewmodels;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-
-public class AggregatedStatistics {
-
-    private final Map<String, AggregatedStatistic> dataMap = new HashMap<>();
-
-    private final List<AggregatedStatistic> dataList = new ArrayList<>();
-
-    public AggregatedStatistics(@NonNull List<Track> tracks) {
-        for (Track track : tracks) {
-            aggregate(track);
-        }
-
-        dataList.addAll(dataMap.values());
-        Collections.sort(dataList, (o1, o2) -> {
-            if (o1.getCountTracks() == o2.getCountTracks()) {
-                return o1.getCategory().compareTo(o2.getCategory());
-            }
-            return (o1.getCountTracks() < o2.getCountTracks() ? 1 : -1);
-        });
-    }
-
-    @VisibleForTesting
-    public void aggregate(@NonNull Track track) {
-        String category = track.getCategory();
-        if (dataMap.containsKey(category)) {
-            dataMap.get(category).add(track.getTrackStatistics());
-        } else {
-            dataMap.put(category, new AggregatedStatistic(category, track.getTrackStatistics()));
-        }
-    }
-
-    public int getCount() {
-        return dataMap.size();
-    }
-
-    public AggregatedStatistic get(String category) {
-        return dataMap.get(category);
-    }
-
-    public AggregatedStatistic getItem(int position) {
-        return dataList.get(position);
-    }
-
-    public static class AggregatedStatistic {
-        private final String category;
-        private final TrackStatistics trackStatistics;
-        private int countTracks = 1;
-
-        public AggregatedStatistic(String category, TrackStatistics trackStatistics) {
-            this.category = category;
-            this.trackStatistics = trackStatistics;
-        }
-
-        public String getCategory() {
-            return category;
-        }
-
-        public TrackStatistics getTrackStatistics() {
-            return trackStatistics;
-        }
-
-        public int getCountTracks() {
-            return countTracks;
-        }
-
-        void add(TrackStatistics statistics) {
-            trackStatistics.merge(statistics);
-            countTracks++;
-        }
-    }
-}
@@ -1,51 +0,0 @@
-package de.dennisguse.opentracks.viewmodels;
-
-import android.app.Application;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import java.util.List;
-
-import de.dennisguse.opentracks.content.data.Track;
-import de.dennisguse.opentracks.content.data.TrackSelection;
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-
-public class AggregatedStatisticsModel extends AndroidViewModel {
-
-    private MutableLiveData<AggregatedStatistics> aggregatedStats;
-
-    public AggregatedStatisticsModel(@NonNull Application application) {
-        super(application);
-    }
-
-    public LiveData<AggregatedStatistics> getAggregatedStats(@Nullable TrackSelection selection) {
-        if (aggregatedStats == null) {
-            aggregatedStats = new MutableLiveData<>();
-            loadAggregatedStats(selection);
-        }
-        return aggregatedStats;
-    }
-
-    public void updateSelection(TrackSelection selection) {
-        loadAggregatedStats(selection);
-    }
-
-    public void clearSelection() {
-        loadAggregatedStats(new TrackSelection());
-    }
-
-    private void loadAggregatedStats(TrackSelection selection) {
-        new Thread(() -> {
-            ContentProviderUtils contentProviderUtils = new ContentProviderUtils(getApplication().getApplicationContext());
-            List<Track> tracks = selection != null ? contentProviderUtils.getTracks(selection) : contentProviderUtils.getTracks();
-
-            AggregatedStatistics aggregatedStatistics = new AggregatedStatistics(tracks);
-
-            aggregatedStats.postValue(aggregatedStatistics);
-        }).start();
-    }
-}