From a14307b9a4ea96aec12d78ebb728d1dc29b129c2 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 27 Nov 2019 07:37:06 +0100 Subject: [PATCH] Moved Chart* into own package. --- .../opentracks/{ => chart}/ChartValueSeriesTest.java | 4 +++- .../dennisguse/opentracks/fragments/ChartFragmentTest.java | 2 +- .../dennisguse/opentracks/{ => chart}/ChartValueSeries.java | 2 +- .../java/de/dennisguse/opentracks/{ => chart}/ChartView.java | 5 ++++- .../de/dennisguse/opentracks/fragments/ChartFragment.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) rename src/androidTest/java/de/dennisguse/opentracks/{ => chart}/ChartValueSeriesTest.java (97%) rename src/main/java/de/dennisguse/opentracks/{ => chart}/ChartValueSeries.java (99%) rename src/main/java/de/dennisguse/opentracks/{ => chart}/ChartView.java (99%) diff --git a/src/androidTest/java/de/dennisguse/opentracks/ChartValueSeriesTest.java b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java similarity index 97% rename from src/androidTest/java/de/dennisguse/opentracks/ChartValueSeriesTest.java rename to src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java index d3065ad0f..0f274bbab 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/ChartValueSeriesTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package de.dennisguse.opentracks; +package de.dennisguse.opentracks.chart; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -23,6 +23,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import de.dennisguse.opentracks.R; + /** * Tests {@link ChartValueSeries}. * diff --git a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java index 2df470f67..d11917e2d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java @@ -26,8 +26,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import de.dennisguse.opentracks.ChartView; import de.dennisguse.opentracks.TrackStubUtils; +import de.dennisguse.opentracks.chart.ChartView; import de.dennisguse.opentracks.content.SensorDataSetLocation; import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.util.UnitConversions; diff --git a/src/main/java/de/dennisguse/opentracks/ChartValueSeries.java b/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/ChartValueSeries.java rename to src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java index e03dad8b6..7518afb1f 100644 --- a/src/main/java/de/dennisguse/opentracks/ChartValueSeries.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks; +package de.dennisguse.opentracks.chart; import android.content.Context; import android.graphics.Canvas; diff --git a/src/main/java/de/dennisguse/opentracks/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java similarity index 99% rename from src/main/java/de/dennisguse/opentracks/ChartView.java rename to src/main/java/de/dennisguse/opentracks/chart/ChartView.java index f2184805a..0643f1a04 100644 --- a/src/main/java/de/dennisguse/opentracks/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -14,7 +14,7 @@ * the License. */ -package de.dennisguse.opentracks; +package de.dennisguse.opentracks.chart; import android.content.Context; import android.content.Intent; @@ -36,6 +36,8 @@ import android.widget.Scroller; import java.text.NumberFormat; import java.util.ArrayList; +import de.dennisguse.opentracks.MarkerDetailActivity; +import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.Waypoint; import de.dennisguse.opentracks.stats.ExtremityMonitor; import de.dennisguse.opentracks.util.IntentUtils; @@ -44,6 +46,7 @@ import de.dennisguse.opentracks.util.UnitConversions; /** * Visualization of the chart. + * Provides support for zooming (via pinch), scrolling, flinging, and selecting shown markers (single touch). * * @author Sandor Dornbush * @author Leif Hendrik Wilden diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java index e072c0906..76f1af919 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java @@ -33,9 +33,9 @@ import androidx.fragment.app.FragmentActivity; import java.util.ArrayList; import java.util.EnumSet; -import de.dennisguse.opentracks.ChartView; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackDetailActivity; +import de.dennisguse.opentracks.chart.ChartView; import de.dennisguse.opentracks.content.SensorDataSetLocation; import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.TrackDataHub;