From ca330b2d806ac6636302396ce64cc05e78613e98 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 15 Dec 2019 21:28:03 +0100 Subject: [PATCH] Cleanup. --- .../opentracks/content/TrackDataHub.java | 11 +- .../opentracks/fragments/StatsFragment.java | 2 - .../io/file/exporter/ExportActivity.java | 8 - src/main/res/layout/stats.xml | 382 ++++++++++++++++- src/main/res/layout/stats_content.xml | 395 ------------------ 5 files changed, 386 insertions(+), 412 deletions(-) delete mode 100644 src/main/res/layout/stats_content.xml diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java index 1ae3ae45c..661f9b964 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java @@ -40,6 +40,10 @@ import de.dennisguse.opentracks.util.PreferencesUtils; */ public class TrackDataHub implements DataSourceListener { + public synchronized static TrackDataHub newInstance(Context context) { + return new TrackDataHub(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACK_POINTS); + } + /** * Target number of track points displayed by the map overlay. * We may display more than this number of points. @@ -98,10 +102,6 @@ public class TrackDataHub implements DataSourceListener { resetSamplingState(); } - public synchronized static TrackDataHub newInstance(Context context) { - return new TrackDataHub(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACK_POINTS); - } - public void start() { if (started) { Log.i(TAG, "TrackDataHub already started, ignoring start."); @@ -399,8 +399,7 @@ public class TrackDataHub implements DataSourceListener { trackDataListener.clearWaypoints(); } - try (Cursor cursor = contentProviderUtils.getWaypointCursor( - selectedTrackId, -1L, MAX_DISPLAYED_WAYPOINTS)) { + try (Cursor cursor = contentProviderUtils.getWaypointCursor(selectedTrackId, -1L, MAX_DISPLAYED_WAYPOINTS)) { if (cursor != null && cursor.moveToFirst()) { do { Waypoint waypoint = contentProviderUtils.createWaypoint(cursor); diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java index c6a3d8751..c12163e35 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -572,7 +572,6 @@ public class StatsFragment extends Fragment implements TrackDataListener { double elevation = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getMinElevation(); Pair parts = StringUtils.formatElevation(getContext(), elevation, metricUnits); - elevationMinValue.setText(parts.first); elevationMinUnit.setText(parts.second); } @@ -581,7 +580,6 @@ public class StatsFragment extends Fragment implements TrackDataListener { double elevation = lastTripStatistics == null ? Double.NaN : lastTripStatistics.getMaxElevation(); Pair parts = StringUtils.formatElevation(getContext(), elevation, metricUnits); - elevationMaxValue.setText(parts.first); elevationMaxUnit.setText(parts.second); } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java index ff2c4b302..366b5c581 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java @@ -103,16 +103,8 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr } directoryDisplayName = FileUtils.getPathDisplayName(trackFileFormat.getExtension()); - - //TODO (still needed?): getLastNonConfiguration instance returned ExportAsyncTask before -// Object retained = getLastNonConfigurationInstance(); -// if (retained instanceof ExportAsyncTask) { -// exportAsyncTask = (ExportAsyncTask) retained; -// exportAsyncTask.setActivity(this); -// } else { exportAsyncTask = new ExportAsyncTask(this, trackFileFormat, directory); exportAsyncTask.execute(); -// } } @Override diff --git a/src/main/res/layout/stats.xml b/src/main/res/layout/stats.xml index 98b3ad68a..fd2737ee8 100644 --- a/src/main/res/layout/stats.xml +++ b/src/main/res/layout/stats.xml @@ -21,6 +21,386 @@ limitations under the License. android:layout_height="wrap_content" android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/stats_content.xml b/src/main/res/layout/stats_content.xml deleted file mode 100644 index f2fbbebd4..000000000 --- a/src/main/res/layout/stats_content.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file