From 759aeb6ed6fc5b6d2454b163206ac5fb948ed67e Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 21 Dec 2019 18:29:35 +0100 Subject: [PATCH] Removed DescriptionGenerator interface. --- ...est.java => DescriptionGeneratorTest.java} | 28 +- .../opentracks/chart/ChartView.java | 2 +- .../content/DescriptionGenerator.java | 225 +++++++++++++++- .../content/DescriptionGeneratorImpl.java | 244 ------------------ .../io/file/exporter/KmlTrackWriter.java | 3 +- .../opentracks/util/IntentUtils.java | 4 +- 6 files changed, 237 insertions(+), 269 deletions(-) rename src/androidTest/java/de/dennisguse/opentracks/content/{DescriptionGeneratorImplTest.java => DescriptionGeneratorTest.java} (86%) delete mode 100644 src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java similarity index 86% rename from src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java rename to src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java index a2bc332cc..ac0d3a170 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java @@ -33,25 +33,25 @@ import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.StringUtils; /** - * Tests for {@link DescriptionGeneratorImpl}. + * Tests for {@link DescriptionGenerator}. * * @author Jimmy Shih */ @RunWith(AndroidJUnit4.class) -public class DescriptionGeneratorImplTest { +public class DescriptionGeneratorTest { private static final long START_TIME = 1288721514000L; - private DescriptionGeneratorImpl descriptionGenerator; + private DescriptionGenerator descriptionGenerator; private Context context = ApplicationProvider.getApplicationContext(); @Before public void setUp() { - descriptionGenerator = new DescriptionGeneratorImpl(ApplicationProvider.getApplicationContext()); + descriptionGenerator = new DescriptionGenerator(ApplicationProvider.getApplicationContext()); } /** - * Tests {@link DescriptionGeneratorImpl#generateTrackDescription(Track, boolean)}. + * Tests {@link DescriptionGenerator#generateTrackDescription(Track, boolean)}. */ @Test public void testGenerateTrackDescription() { @@ -94,7 +94,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#generateWaypointDescription(TripStatistics)}. + * Tests {@link DescriptionGenerator#generateWaypointDescription(TripStatistics)}. */ @Test public void testGenerateWaypointDescription() { @@ -130,7 +130,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writeDistance(double, StringBuilder, int, String)}. + * Tests {@link DescriptionGenerator#writeDistance(double, StringBuilder, int, String)}. */ @Test public void testWriteDistance() { @@ -140,7 +140,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writeTime(long, StringBuilder, int, String)}. + * Tests {@link DescriptionGenerator#writeTime(long, StringBuilder, int, String)}. */ @Test public void testWriteTime() { @@ -150,7 +150,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writeSpeed(double, StringBuilder, int, String)}. + * Tests {@link DescriptionGenerator#writeSpeed(double, StringBuilder, int, String)}. */ @Test public void testWriteSpeed() { @@ -160,7 +160,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writeElevation(double, StringBuilder, int, String)}. + * Tests {@link DescriptionGenerator#writeElevation(double, StringBuilder, int, String)}. */ @Test public void testWriteElevation() { @@ -170,7 +170,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writePace(double, StringBuilder, int, String)}. + * Tests {@link DescriptionGenerator#writePace(double, StringBuilder, int, String)}. */ @Test public void testWritePace() { @@ -180,7 +180,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)}. + * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)}. */ @Test public void testWriteGrade() { @@ -190,7 +190,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)} with a NaN. + * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)} with a NaN. */ @Test public void testWriteGrade_nan() { @@ -200,7 +200,7 @@ public class DescriptionGeneratorImplTest { } /** - * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)} with an infinite number. + * Tests {@link DescriptionGenerator#writeGrade(double, StringBuilder, int, String)} with an infinite number. */ @Test public void testWriteGrade_infinite() { diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index ecbbef10f..b90b12d2f 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -555,7 +555,7 @@ public class ChartView extends View { canvas.save(); float x = getX(getWaypointXValue(waypoint)); canvas.drawLine(x, topBorder + spacer + markerHeight / 2, x, topBorder + effectiveHeight, markerPaint); - canvas.translate(x - (float) (markerWidth * WAYPOINT_X_ANCHOR), topBorder + spacer); + canvas.translate(x - (markerWidth * WAYPOINT_X_ANCHOR), topBorder + spacer); waypointMarker.draw(canvas); canvas.restore(); diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java index deaf02711..47637a27d 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java +++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 Google Inc. + * Copyright 2012 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -13,17 +13,37 @@ * License for the specific language governing permissions and limitations under * the License. */ + package de.dennisguse.opentracks.content; +import android.content.Context; +import android.util.Pair; + +import androidx.annotation.VisibleForTesting; + +import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.stats.TripStatistics; +import de.dennisguse.opentracks.util.StringUtils; +import de.dennisguse.opentracks.util.UnitConversions; /** - * An interface for an object that can generate descriptions of track and waypoint. + * Generates descriptions for tracks and waypoints. * - * @author Sandor Dornbush + * @author Jimmy Shih */ -public interface DescriptionGenerator { +public class DescriptionGenerator { + + private static final String HTML_LINE_BREAK = "
"; + private static final String HTML_PARAGRAPH_SEPARATOR = "

"; + private static final String TEXT_LINE_BREAK = "\n"; + private static final String TEXT_PARAGRAPH_SEPARATOR = "\n\n"; + + private Context context; + + public DescriptionGenerator(Context context) { + this.context = context; + } /** * Generates a track description. @@ -31,12 +51,205 @@ public interface DescriptionGenerator { * @param track the track * @param html true to output html, false to output plain text */ - String generateTrackDescription(Track track, boolean html); + public String generateTrackDescription(Track track, boolean html) { + String paragraphSeparator = html ? HTML_PARAGRAPH_SEPARATOR : TEXT_PARAGRAPH_SEPARATOR; + String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK; + StringBuilder builder = new StringBuilder(); + + // Created by + String creator = html + ? "" + context.getString(R.string.app_name) + "" + : context.getString(R.string.app_name); + builder.append(creator); + + builder.append(paragraphSeparator); + + writeString(track.getName(), builder, R.string.generic_name_line, lineBreak); + writeString(track.getCategory(), builder, R.string.description_activity_type, lineBreak); + writeString(track.getDescription(), builder, R.string.generic_description_line, lineBreak); + builder.append(generateTripStatisticsDescription(track.getTripStatistics(), html)); + + return builder.toString(); + } /** * Generate a waypoint description from a trip statistics. * * @param tripStatistics the trip statistics */ - String generateWaypointDescription(TripStatistics tripStatistics); + public String generateWaypointDescription(TripStatistics tripStatistics) { + return generateTripStatisticsDescription(tripStatistics, false); + } + + /** + * Writes a string to a string builder. + * + * @param text the string + * @param builder the string builder + * @param resId the resource id containing one string placeholder + * @param lineBreak the line break + */ + private void writeString(String text, StringBuilder builder, int resId, String lineBreak) { + if (text == null || text.length() == 0) { + text = context.getString(R.string.value_unknown); + } + builder.append(context.getString(resId, text)); + builder.append(lineBreak); + } + + /** + * Generates a description for a {@link TripStatistics}. + * + * @param stats the trip statistics + * @param html true to use "
" for line break instead of "\n" + */ + private String generateTripStatisticsDescription(TripStatistics stats, boolean html) { + String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK; + StringBuilder builder = new StringBuilder(); + + // Total distance + writeDistance(stats.getTotalDistance(), builder, R.string.description_total_distance, lineBreak); + + // Total time + writeTime(stats.getTotalTime(), builder, R.string.description_total_time, lineBreak); + + // Moving time + writeTime(stats.getMovingTime(), builder, R.string.description_moving_time, lineBreak); + + // Average speed + writeSpeed(stats.getAverageSpeed(), builder, R.string.description_average_speed, lineBreak); + + // Average moving speed + writeSpeed(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_speed, lineBreak); + + // Max speed + writeSpeed(stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak); + + // Average pace + writePace(stats.getAverageSpeed(), builder, R.string.description_average_pace_in_minute, lineBreak); + + // Average moving pace + writePace(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_pace_in_minute, lineBreak); + + // Fastest pace + writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak); + + // Max elevation + writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak); + + // Min elevation + writeElevation(stats.getMinElevation(), builder, R.string.description_min_elevation, lineBreak); + + // Elevation gain + writeElevation(stats.getTotalElevationGain(), builder, R.string.description_elevation_gain, lineBreak); + + // Max grade + writeGrade(stats.getMaxGrade(), builder, R.string.description_max_grade, lineBreak); + + // Min grade + writeGrade(stats.getMinGrade(), builder, R.string.description_min_grade, lineBreak); + + // Recorded time + builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTime(context, stats.getStartTime()))); + builder.append(lineBreak); + + return builder.toString(); + } + + /** + * Writes distance. + * + * @param distance distance in meters + * @param builder StringBuilder to append distance + * @param resId resource id of distance string + * @param lineBreak line break string + */ + @VisibleForTesting + void writeDistance(double distance, StringBuilder builder, int resId, String lineBreak) { + double distanceInKm = distance * UnitConversions.M_TO_KM; + double distanceInMi = distanceInKm * UnitConversions.KM_TO_MI; + builder.append(context.getString(resId, distanceInKm, distanceInMi)); + builder.append(lineBreak); + } + + /** + * Writes time. + * + * @param time time in milliseconds. + * @param builder StringBuilder to append time + * @param resId resource id of time string + * @param lineBreak line break string + */ + @VisibleForTesting + void writeTime(long time, StringBuilder builder, int resId, String lineBreak) { + builder.append(context.getString(resId, StringUtils.formatElapsedTime(time))); + builder.append(lineBreak); + } + + /** + * Writes speed. + * + * @param speed speed in meters per second + * @param builder StringBuilder to append speed + * @param resId resource id of speed string + * @param lineBreak line break string + */ + @VisibleForTesting + void writeSpeed(double speed, StringBuilder builder, int resId, String lineBreak) { + double speedInKmHr = speed * UnitConversions.MS_TO_KMH; + double speedInMiHr = speedInKmHr * UnitConversions.KM_TO_MI; + builder.append(context.getString(resId, speedInKmHr, speedInMiHr)); + builder.append(lineBreak); + } + + /** + * Writes pace. + * + * @param speed speed in meters per second + * @param builder StringBuilder to append pace + * @param resId resource id of pace string + * @param lineBreak line break string + */ + @VisibleForTesting + void writePace(double speed, StringBuilder builder, int resId, String lineBreak) { + Pair paceInMetrics = StringUtils.getSpeedParts(context, speed, true, false); + Pair paceInImperial = StringUtils.getSpeedParts(context, speed, false, false); + + String formattedPaceMetrics = paceInMetrics.first != null ? paceInMetrics.first : context.getString(R.string.value_unknown); + String formattedPaceImperial = paceInImperial.first != null ? paceInImperial.first : context.getString(R.string.value_unknown); + + builder.append(context.getString(resId, formattedPaceMetrics, formattedPaceImperial)); + builder.append(lineBreak); + } + + /** + * Writes elevation. + * + * @param elevation elevation in meters + * @param builder StringBuilder to append elevation + * @param resId resource id of elevation string + * @param lineBreak line break string + */ + @VisibleForTesting + void writeElevation(double elevation, StringBuilder builder, int resId, String lineBreak) { + long elevationInM = Math.round(elevation); + long elevationInFt = Math.round(elevation * UnitConversions.M_TO_FT); + builder.append(context.getString(resId, elevationInM, elevationInFt)); + builder.append(lineBreak); + } + + /** + * Writes grade. + * + * @param grade grade in fraction + * @param builder StringBuilder to append grade + * @param resId resource id grade string + * @param lineBreak line break string + */ + @VisibleForTesting + void writeGrade(double grade, StringBuilder builder, int resId, String lineBreak) { + long gradeInPercent = Double.isNaN(grade) || Double.isInfinite(grade) ? 0L : Math.round(grade * 100); + builder.append(context.getString(resId, gradeInPercent)); + builder.append(lineBreak); + } } diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java deleted file mode 100644 index d57468f75..000000000 --- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java +++ /dev/null @@ -1,244 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package de.dennisguse.opentracks.content; - -import android.content.Context; -import android.util.Pair; - -import androidx.annotation.VisibleForTesting; - -import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.content.data.Track; -import de.dennisguse.opentracks.stats.TripStatistics; -import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.util.UnitConversions; - -/** - * @author Jimmy Shih - */ -public class DescriptionGeneratorImpl implements DescriptionGenerator { - - private static final String HTML_LINE_BREAK = "
"; - private static final String HTML_PARAGRAPH_SEPARATOR = "

"; - private static final String TEXT_LINE_BREAK = "\n"; - private static final String TEXT_PARAGRAPH_SEPARATOR = "\n\n"; - - private Context context; - - public DescriptionGeneratorImpl(Context context) { - this.context = context; - } - - @Override - public String generateTrackDescription(Track track, boolean html) { - String paragraphSeparator = html ? HTML_PARAGRAPH_SEPARATOR : TEXT_PARAGRAPH_SEPARATOR; - String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK; - StringBuilder builder = new StringBuilder(); - - // Created by - String creator = html - ? "" + context.getString(R.string.app_name) + "" - : context.getString(R.string.app_name); - builder.append(creator); - - builder.append(paragraphSeparator); - - writeString(track.getName(), builder, R.string.generic_name_line, lineBreak); - writeString(track.getCategory(), builder, R.string.description_activity_type, lineBreak); - writeString(track.getDescription(), builder, R.string.generic_description_line, lineBreak); - builder.append(generateTripStatisticsDescription(track.getTripStatistics(), html)); - - return builder.toString(); - } - - @Override - public String generateWaypointDescription(TripStatistics tripStatistics) { - return generateTripStatisticsDescription(tripStatistics, false); - } - - /** - * Writes a string to a string builder. - * - * @param text the string - * @param builder the string builder - * @param resId the resource id containing one string placeholder - * @param lineBreak the line break - */ - private void writeString(String text, StringBuilder builder, int resId, String lineBreak) { - if (text == null || text.length() == 0) { - text = context.getString(R.string.value_unknown); - } - builder.append(context.getString(resId, text)); - builder.append(lineBreak); - } - - /** - * Generates a description for a {@link TripStatistics}. - * - * @param stats the trip statistics - * @param html true to use "
" for line break instead of "\n" - */ - private String generateTripStatisticsDescription(TripStatistics stats, boolean html) { - String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK; - StringBuilder builder = new StringBuilder(); - - // Total distance - writeDistance(stats.getTotalDistance(), builder, R.string.description_total_distance, lineBreak); - - // Total time - writeTime(stats.getTotalTime(), builder, R.string.description_total_time, lineBreak); - - // Moving time - writeTime(stats.getMovingTime(), builder, R.string.description_moving_time, lineBreak); - - // Average speed - writeSpeed(stats.getAverageSpeed(), builder, R.string.description_average_speed, lineBreak); - - // Average moving speed - writeSpeed(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_speed, lineBreak); - - // Max speed - writeSpeed(stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak); - - // Average pace - writePace(stats.getAverageSpeed(), builder, R.string.description_average_pace_in_minute, lineBreak); - - // Average moving pace - writePace(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_pace_in_minute, lineBreak); - - // Fastest pace - writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak); - - // Max elevation - writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak); - - // Min elevation - writeElevation(stats.getMinElevation(), builder, R.string.description_min_elevation, lineBreak); - - // Elevation gain - writeElevation(stats.getTotalElevationGain(), builder, R.string.description_elevation_gain, lineBreak); - - // Max grade - writeGrade(stats.getMaxGrade(), builder, R.string.description_max_grade, lineBreak); - - // Min grade - writeGrade(stats.getMinGrade(), builder, R.string.description_min_grade, lineBreak); - - // Recorded time - builder.append(context.getString(R.string.description_recorded_time, StringUtils.formatDateTime(context, stats.getStartTime()))); - builder.append(lineBreak); - - return builder.toString(); - } - - /** - * Writes distance. - * - * @param distance distance in meters - * @param builder StringBuilder to append distance - * @param resId resource id of distance string - * @param lineBreak line break string - */ - @VisibleForTesting - void writeDistance(double distance, StringBuilder builder, int resId, String lineBreak) { - double distanceInKm = distance * UnitConversions.M_TO_KM; - double distanceInMi = distanceInKm * UnitConversions.KM_TO_MI; - builder.append(context.getString(resId, distanceInKm, distanceInMi)); - builder.append(lineBreak); - } - - /** - * Writes time. - * - * @param time time in milliseconds. - * @param builder StringBuilder to append time - * @param resId resource id of time string - * @param lineBreak line break string - */ - @VisibleForTesting - void writeTime(long time, StringBuilder builder, int resId, String lineBreak) { - builder.append(context.getString(resId, StringUtils.formatElapsedTime(time))); - builder.append(lineBreak); - } - - /** - * Writes speed. - * - * @param speed speed in meters per second - * @param builder StringBuilder to append speed - * @param resId resource id of speed string - * @param lineBreak line break string - */ - @VisibleForTesting - void writeSpeed(double speed, StringBuilder builder, int resId, String lineBreak) { - double speedInKmHr = speed * UnitConversions.MS_TO_KMH; - double speedInMiHr = speedInKmHr * UnitConversions.KM_TO_MI; - builder.append(context.getString(resId, speedInKmHr, speedInMiHr)); - builder.append(lineBreak); - } - - /** - * Writes pace. - * - * @param speed speed in meters per second - * @param builder StringBuilder to append pace - * @param resId resource id of pace string - * @param lineBreak line break string - */ - @VisibleForTesting - void writePace(double speed, StringBuilder builder, int resId, String lineBreak) { - Pair paceInMetrics = StringUtils.getSpeedParts(context, speed, true, false); - Pair paceInImperial = StringUtils.getSpeedParts(context, speed, false, false); - - String formattedPaceMetrics = paceInMetrics.first != null ? paceInMetrics.first : context.getString(R.string.value_unknown); - String formattedPaceImperial = paceInImperial.first != null ? paceInImperial.first : context.getString(R.string.value_unknown); - - builder.append(context.getString(resId, formattedPaceMetrics, formattedPaceImperial)); - builder.append(lineBreak); - } - - /** - * Writes elevation. - * - * @param elevation elevation in meters - * @param builder StringBuilder to append elevation - * @param resId resource id of elevation string - * @param lineBreak line break string - */ - @VisibleForTesting - void writeElevation(double elevation, StringBuilder builder, int resId, String lineBreak) { - long elevationInM = Math.round(elevation); - long elevationInFt = Math.round(elevation * UnitConversions.M_TO_FT); - builder.append(context.getString(resId, elevationInM, elevationInFt)); - builder.append(lineBreak); - } - - /** - * Writes grade. - * - * @param grade grade in fraction - * @param builder StringBuilder to append grade - * @param resId resource id grade string - * @param lineBreak line break string - */ - @VisibleForTesting - void writeGrade(double grade, StringBuilder builder, int resId, String lineBreak) { - long gradeInPercent = Double.isNaN(grade) || Double.isInfinite(grade) ? 0L : Math.round(grade * 100); - builder.append(context.getString(resId, gradeInPercent)); - builder.append(lineBreak); - } -} diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java index 2d3479b84..8ae0af347 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java @@ -28,7 +28,6 @@ import java.util.List; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.DescriptionGenerator; -import de.dennisguse.opentracks.content.DescriptionGeneratorImpl; import de.dennisguse.opentracks.content.SensorDataSetLocation; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.data.Waypoint; @@ -85,7 +84,7 @@ public class KmlTrackWriter implements TrackWriter { this.exportTrackDetail = exportTrackDetail; this.exportSensorData = exportSensorData; this.exportPhotos = exportPhotos; - this.descriptionGenerator = new DescriptionGeneratorImpl(context); + this.descriptionGenerator = new DescriptionGenerator(context); this.contentProviderUtils = new ContentProviderUtils(context); } diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java index b4f339b2e..53334af20 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java @@ -34,7 +34,7 @@ import java.util.Date; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.DescriptionGeneratorImpl; +import de.dennisguse.opentracks.content.DescriptionGenerator; import de.dennisguse.opentracks.content.ShareContentProvider; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.data.Waypoint; @@ -77,7 +77,7 @@ public class IntentUtils { String trackDescription = ""; if (trackIds.length == 1) { Track track = new ContentProviderUtils(context).getTrack(trackIds[0]); - trackDescription = track == null ? "" : new DescriptionGeneratorImpl(context).generateTrackDescription(track, false); + trackDescription = track == null ? "" : new DescriptionGenerator(context).generateTrackDescription(track, false); } String action = trackIds.length == 1 ? Intent.ACTION_SEND : Intent.ACTION_SEND_MULTIPLE;