Release: v4.9.2

Translated using Weblate (Finnish)
Currently translated at 92.5% (474 of 512 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/fi/
2023-10-10 20:08:19 +02:00 · 2023-10-10 06:30:14 +00:00 · 2023-10-10 06:30:13 +00:00 · 2023-10-10 06:30:12 +00:00 · 2023-10-10 06:30:12 +00:00 · 2023-10-10 06:30:11 +00:00
154 changed files with 2866 additions and 2315 deletions
@@ -8,7 +8,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - uses: actions/setup-java@v3
        with:
@@ -11,7 +11,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - uses: actions/setup-java@v3
        with:
@@ -1,6 +1,3 @@
-# We have flaky test results due to performance limitations in Github Actions.
-# Happens too often nowadays; See https://github.com/OpenTracksApp/OpenTracks/issues/1409
-
 #https://github.com/marketplace/actions/android-emulator-runner
 name: Test
 on:
@@ -11,27 +8,20 @@ jobs:
  test:
    timeout-minutes: 45
    runs-on: macos-latest
-    strategy:
-      matrix:
-        api-level: [ 24, 30 ]
-        target: [ default ]
-      fail-fast: false
    steps:
      - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - uses: actions/setup-java@v3
        with:
-          distribution: 'zulu'
-          java-version: '11'
+          distribution: 'adopt'
+          java-version: '17'

      - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2.26.0
+        uses: reactivecircus/android-emulator-runner@v2.28.0
        with:
-          api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
          arch: x86_64
-          profile: Nexus 6
+          api-level: 34
          script: ./gradlew connectedCheck

      - name: Archive
@@ -125,14 +125,14 @@ For testing via adb: `adb shell am start -e someParameter someValue -n "package/
 The Public API is disabled by default to protect the user's privacy, but it can easily be enabled in the settings.

 ## File formats compatibility with open-source software
-
-|                                                      | [GPX 1.1](https://www.topografix.com/GPX/1/1/) | [KML 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html) | [KMZ 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html) |
-|------------------------------------------------------|------------------------------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------|
-| [OpenLayers 7.1.0](https://openlayers.org/)          | ?                                              | [no](https://github.com/openlayers/openlayers/issues/14104)          | [no](https://github.com/openlayers/openlayers/issues/14104)          |
-| [Golden Cheetah 3.5](https://www.goldencheetah.org/) | ?                                              | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     |
-| [GpxPod](https://apps.nextcloud.com/apps/gpxpod)     | ?                                              | ?                                                                    | ?                                                                    |
-| [OsmAnd](https://github.com/osmandapp/OsmAnd)        | ?                                              | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               |
-| [FitTrackee](https://github.com/SamR1/FitTrackee)    | yes                                            | n/a                                                                  | n/a                                                                  |
+|                                                           | [GPX 1.1](https://www.topografix.com/GPX/1/1/)                                 | [KML 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html) | [KMZ 2.3](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html) |
+|-----------------------------------------------------------|--------------------------------------------------------------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------|
+| [OpenLayers 7.1.0](https://openlayers.org/)               | ?                                                                              | [no](https://github.com/openlayers/openlayers/issues/14104)          | [no](https://github.com/openlayers/openlayers/issues/14104)          |
+| [Golden Cheetah 3.5](https://www.goldencheetah.org/)      | ?                                                                              | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     | [no](https://github.com/GoldenCheetah/GoldenCheetah/issues/4271)     |
+| [GpxPod](https://apps.nextcloud.com/apps/gpxpod)          | ?                                                                              | ?                                                                    | ?                                                                    |
+| [OsmAnd](https://github.com/osmandapp/OsmAnd)             | ?                                                                              | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               | [no](https://github.com/osmandapp/OsmAnd/issues/15271)               |
+| [FitTrackee](https://github.com/SamR1/FitTrackee)         | yes                                                                            | n/a                                                                  | n/a                                                                  |
+| [SportsTracker](https://github.com/ssaring/sportstracker) | yes, [single tracks only](https://github.com/ssaring/sportstracker/issues/260) | no                                                                   | no                                                                   |

 ## Dashboard API (incl. map)

@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0-beta01'
+        classpath 'com.android.tools.build:gradle:8.2.0-beta06'
    }
 }

@@ -64,8 +64,8 @@ android {

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 5382
-        versionName "v4.8.2"
+        versionCode 5465
+        versionName "v4.9.2"

        buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""

@@ -131,7 +131,7 @@ dependencies {
    implementation 'androidx.preference:preference:1.2.1'
    implementation 'androidx.documentfile:documentfile:1.0.1'
    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    implementation 'androidx.core:core-splashscreen:1.0.1'
    implementation 'androidx.mediarouter:mediarouter:1.4.0'
@@ -141,7 +141,7 @@ dependencies {
    androidTestImplementation 'androidx.test:rules:1.5.0'
    androidTestImplementation 'androidx.test:runner:1.5.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'org.mockito:mockito-android:5.5.0'
+    androidTestImplementation 'org.mockito:mockito-android:5.6.0'

    androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="22"
+        height="22"
+        viewBox="0 0 5.8208333 5.8208333"
+        version="1.1"
+        id="svg8"
+        inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+        sodipodi:docname="ic_activity.svg"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3162"
+       is_visible="true"
+       lpeversion="1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3149"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect2514"
+       effect="fillet_chamfer"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect950"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false"
+       nodesatellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect946"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false"
+       nodesatellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect918"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect912"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect894"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false"
+       nodesatellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#232629"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.390336"
+     inkscape:cx="13.4433"
+     inkscape:cy="12.572388"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="956"
+     inkscape:window-height="1036"
+     inkscape:window-x="960"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#232629">
+    <inkscape:grid
+       type="xygrid"
+       id="grid833"
+       empspacing="22"
+       dotted="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid835"
+       empspacing="1"
+       spacingy="1.0583333"
+       spacingx="1.0583333"
+       originx="0.26458333"
+       originy="0.26458333" />
+    <sodipodi:guide
+       position="4.195,4.2333333"
+       orientation="0.96592583,0.25881905"
+       id="guide887"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="0.26458333,1.9843751"
+       orientation="0,-1"
+       id="guide900"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="path924"
+       style="opacity:1;fill:#fdbc4b;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m -1.3252903,1.5032615 -0.4100651,0.6834418 a 0.12845631,0.12845631 60.481872 0 0 0.1101504,0.1945466 l 0.2495783,-10e-8 -0.1100188,0.5495576 a 0.08982544,0.08982544 21.142221 0 0 0.1651025,0.063848 L -0.91047797,2.3112131 A 0.12845634,0.12845634 60.481877 0 0 -1.0206284,2.1166665 H -1.2702067 L -1.1601879,1.567109 a 0.08982541,0.08982541 21.142225 0 0 -0.1651024,-0.063848 z"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:original-d="m -1.0583333,1.0583332 -0.79375,1.3229167 0.4764566,-10e-8 L -1.5875,3.4395832 -0.79375003,2.1166665 H -1.2702067 Z"
+       inkscape:path-effect="#path-effect950" />
+    <g
+       id="g954"
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)">
+      <rect
+         y="-7.9375"
+         x="-357.1875"
+         height="79.375"
+         width="68.791664"
+         id="rect919"
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="-5.2916665"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect851"
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect853"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect855"
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect857"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect859"
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect861"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect863"
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect865"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect867"
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect869"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="5.291667" />
+      <rect
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect871"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect873"
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect875"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect877"
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect879"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect881"
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect883"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect885"
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect887"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect889"
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect891"
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect893"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="31.75" />
+      <rect
+         y="47.625"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect895"
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect897"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect899"
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect901"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect903"
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect905"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect907"
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect909"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect911"
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect913"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="58.208336" />
+    </g>
+    <path
+       transform="scale(0.26458333)"
+       id="path887"
+       d="M 13.994141 4.5 A 0.49999949 0.49999949 0 0 0 13.552734 4.7773438 A 0.49999949 0.49999949 0 0 0 13.777344 5.4472656 L 14.908203 6.0136719 C 15.328243 6.2241517 15.636226 6.6066586 15.75 7.0625 L 17.390625 13.623047 C 15.381402 13.909129 13.837817 15.475476 13.601562 17.5 L 8.3984375 17.5 C 8.1378934 15.267332 6.3043435 13.50201 4.0039062 13.5 C 3.982495 13.499838 3.9608645 13.499856 3.9394531 13.5 L 2 13.5 A 0.49999949 0.49999949 0 0 0 1.5 14 A 0.49999949 0.49999949 0 0 0 2 14.5 L 3.9394531 14.5 A 0.50004949 0.50004949 0 0 0 3.9433594 14.5 C 3.9610145 14.499866 3.9784387 14.499866 3.9960938 14.5 A 0.50004949 0.50004949 0 0 0 4 14.5 C 5.9389193 14.5 7.5000003 16.061081 7.5 18 A 0.50004949 0.50004949 0 0 0 8 18.5 L 14 18.5 A 0.50004949 0.50004949 0 0 0 14.5 18 C 14.5 16.061081 16.061081 14.5 18 14.5 A 0.50004949 0.50004949 0 0 0 18.484375 13.878906 L 16.71875 6.8203125 C 16.534472 6.0819921 16.037756 5.460052 15.357422 5.1191406 A 0.50004949 0.50004949 0 0 0 15.355469 5.1191406 L 14.222656 4.5527344 A 0.49999949 0.49999949 0 0 0 13.994141 4.5 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157481;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <path
+       id="path970"
+       d="M 4.7617188 4.1367188 C 4.4265639 4.1367188 4.1523438 4.4109389 4.1523438 4.7460938 C 4.1523438 5.0812486 4.4265639 5.3554687 4.7617188 5.3554688 C 5.0968736 5.3554687 5.3710937 5.0812486 5.3710938 4.7460938 C 5.3710937 4.4109389 5.0968736 4.1367188 4.7617188 4.1367188 z M 4.7617188 4.3378906 C 4.9879388 4.3378906 5.1679687 4.5198737 5.1679688 4.7460938 C 5.1679687 4.9723138 4.9879388 5.1542969 4.7617188 5.1542969 C 4.5354987 5.1542969 4.3535156 4.9723138 4.3535156 4.7460938 C 4.3535156 4.5198737 4.5354987 4.3378906 4.7617188 4.3378906 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.201567;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:0.997" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.997;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.201567;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 1.0221536,4.1367188 c -0.33515491,0 -0.60937501,0.2742201 -0.60937501,0.609375 0,0.3351548 0.2742201,0.6093749 0.60937501,0.609375 0.3351548,-10e-8 0.6093749,-0.2742202 0.609375,-0.609375 -1e-7,-0.3351549 -0.2742202,-0.609375 -0.609375,-0.609375 z m 0,0.2011718 c 0.22622,0 0.4062499,0.1819831 0.40625,0.4082032 -1e-7,0.2262201 -0.18003,0.4082031 -0.40625,0.4082031 -0.22622011,0 -0.40820321,-0.181983 -0.40820321,-0.4082031 0,-0.2262201 0.1819831,-0.4082032 0.40820321,-0.4082032 z"
+       id="path970-7" />
+  </g>
+</svg>
@@ -0,0 +1 @@
+Un amic rastrejador esportiu que respecta la vostra privadesa.
@@ -0,0 +1,8 @@
+v4.8.3: OpenTracks
+
+
+Bugfix:
+- Android 14: prevent crash due to malformed UUID (example for filename template)
+
+Developer:
+- Marker list is now a RecyclerView
@@ -0,0 +1,7 @@
+v4.8.4: OpenTracks
+
+Changes:
+- Show max power for recorded tracks
+
+Developer:
+- TrackList now uses RecyclerView
@@ -0,0 +1,23 @@
+v4.9.0: OpenTracks
+
+NOTE: BREAKING CHANGE
+
+This release changes how OpenTracks determines moving and not moving.
+Until now, the speed (GPS or sensor) was used by a applying a threshold (e.g., less than 0.3 m/s).
+However, this may be very noise.
+From now on, a timeout duration is used (i.e., no significant change of position in the last X seconds).
+This duration is user configurable.
+The events of becoming idle are stored in the database incl. a timestamp, so statistics can be re-computed.
+
+A downgrade from this version is not implemented.
+Please backup all before upgrading.
+
+Changes:
+- Idle detection uses "no movement" duration rather than speed too low
+- Added scooter activity
+
+Bugfix:
+- While recording, TrackList showed all tracks as recording
+
+Developer:
+- Re-enabled Github action executing tests
@@ -0,0 +1,4 @@
+v4.9.1: OpenTracks
+
+Bugfix:
+- Crash when doing multi select in track list
@@ -0,0 +1,9 @@
+v4.9.2: OpenTracks
+
+Changes:
+- Option to use Android 12's Dynamic Color (Material Design)
+- Android 14's Predictive Back for some activities
+
+Bugfix:
+- Settings for total distance voice announcement was accidentially removed
+
@@ -1,8 +1,8 @@
 v4.7.1: OpenTracks

-Bugfixes:
- Android 14: crash on recording start (missing permissions)
- Android 14: crash on track deletion (ForegroundService without reason)
+Arranxos:
+- Android 14: fallo ao inicio da gravación (por falta de permisos)
+- Android 14: fallo ao eliminar unha ruta (sen razóns para ForegroundService)

-Developer:
- AggregatedStats is now a RecyclerView
+Desenvolvemento:
+- agora AggregatedStats é unha RecyclerView
@@ -0,0 +1,4 @@
+v4.8.2: OpenTracks
+
+Cambios:
+- Apos exportar as gravacións: mostra mensaxe de aviso se falla
@@ -0,0 +1,8 @@
+v4.8.3: OpenTracks
+
+
+Arranxos:
+- Android 14: evitar o peche da app debido a un UUID mal formado (ex. no modelo do nome de ficheiro)
+
+Desenvolvemento:
+- A lista Marker agora usa RecyclerView
@@ -0,0 +1,7 @@
+v4.8.4: OpenTracks
+
+Cambios:
+- Mostra a potencia máxima nas rutas gravadas
+
+Desenvolvemento:
+- agora TrackList usa RecyclerView
@@ -0,0 +1,4 @@
+v4.8.2: OpenTracks
+
+Veranderingen:
+- Na export van opname: toon foutmelding indien niet succesvol
@@ -0,0 +1,7 @@
+v4.8.3: OpenTracks
+
+Bugfix :
+- Android 14: crash voorkomen t.g.v. misvormde UUID (voorbeeld voor bestandsnaam sjabloon)
+
+Ontwikkelaar:
+- Markeringslijst is nu een RecyclerView
@@ -0,0 +1,7 @@
+v4.8.4: OpenTracks
+
+Veranderingen:
+- Toon maximale vermogen voor opgenomen tracks
+
+Ontwikkelaar:
+- TrackList gebruikt nu RecyclerView
@@ -0,0 +1,23 @@
+v4.9.0: OpenTracks
+
+OPMERKING: BREAKING CHANGE
+
+Deze release verandert hoe OpenTracks beweging van geen beweging onderscheidt.
+Tot nu toe werd de snelheid (GPS of sensor) gebruikt door een drempel toe te passen (bijv., minder dan 0,3 m/s).
+Dit kan echter erg lawaai zijn.
+Vanaf nu wordt een time-outduur gebruikt (d.w.z., geen significante positieverandering in de laatste X seconden).
+Deze duur is door de gebruiker configureerbaar.
+De gebeurtenissen om inactief te worden, worden opgeslagen in de database incl. een tijdstempel, zodat statistieken opnieuw kunnen worden berekend.
+
+Een downgrade van deze versie is niet geïmplementeerd.
+Maak een back-up van alles voordat u gaat upgraden.
+
+Veranderingen:
+- Inactieve detectie gebruikt de duur van "geen beweging" in plaats van te laag
+- Scooteractiviteit toegevoegd
+
+Bugfix :
+- Tijdens het opnemen toonde TrackList alle nummers als opname
+
+Ontwikkelaar:
+- Github-actie opnieuw ingeschakeld die tests uitvoert
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi

 # Increase the maximum file descriptors if we can.
@@ -1,16 +1,16 @@
 package de.dennisguse.opentracks;


-import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.longClick;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withParentIndex;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anything;
 import static de.dennisguse.opentracks.util.EspressoUtils.childAtPosition;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;

@@ -49,7 +49,7 @@ public class EspressoDeleteTrackTest {
        onView(withId(R.id.finish_button)).perform(click());

        // select track
-        onData(anything()).inAdapterView(withId(R.id.track_list)).atPosition(0).perform(longClick());
+        onView(allOf(withParent(withId(R.id.track_list)), withParentIndex(0))).perform(longClick());

        // open menu and delete selected track
        //TODO openActionBarOverflowOrOptionsMenu(); doesn't work
@@ -1,6 +1,5 @@
 package de.dennisguse.opentracks;

-import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.longClick;
@@ -8,8 +7,9 @@ import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withParentIndex;
 import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anything;
 import static de.dennisguse.opentracks.util.EspressoUtils.selectTabAtIndex;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;

@@ -95,6 +95,6 @@ public class EspressoUITest {
    @Test
    public void selectAndDeleteTrack() {
        onView(withId(R.id.track_list)).check(matches(isDisplayed()));
-        onData(anything()).inAdapterView(withId(R.id.track_list)).atPosition(0).perform(longClick());
+        onView(allOf(withParent(withId(R.id.track_list)), withParentIndex(0))).perform(longClick());
    }
 }
@@ -27,10 +27,10 @@ public class ChartPointTest {
        statistics.setTotalTime(Duration.ofSeconds(1000));

        // when
-        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), false, UnitSystem.IMPERIAL_FEET);
+        ChartPoint point = ChartPoint.create(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), false, UnitSystem.IMPERIAL_FEET);

        // then
-        assertEquals(1000000, (long) point.getTimeOrDistance());
+        assertEquals(1000000, (long) point.timeOrDistance());
    }

    @Test
@@ -40,10 +40,10 @@ public class ChartPointTest {
        statistics.setTotalDistance(Distance.of(1000));

        // when
-        ChartPoint point = new ChartPoint(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), true, UnitSystem.METRIC);
+        ChartPoint point = ChartPoint.create(statistics, TrackStubUtils.createDefaultTrackPoint(), Speed.of(0), true, UnitSystem.METRIC);

        // then
-        assertEquals(1, (long) point.getTimeOrDistance());
+        assertEquals(1, (long) point.timeOrDistance());
    }

    @Test
@@ -54,12 +54,12 @@ public class ChartPointTest {
                .setAltitude(Altitude.EGM2008.of(50));

        // when
-        ChartPoint point = new ChartPoint(statistics, trackPoint, Speed.of(10), false, UnitSystem.METRIC);
+        ChartPoint point = ChartPoint.create(statistics, trackPoint, Speed.of(10), false, UnitSystem.METRIC);

        // then
-        assertEquals(50, point.getAltitude(), 0.01);
-        assertEquals(36, point.getSpeed(), 0.01);
-        assertEquals(1.66, point.getPace(), 0.01);
+        assertEquals(50, point.altitude(), 0.01);
+        assertEquals(36, point.speed(), 0.01);
+        assertEquals(1.66, point.pace(), 0.01);
    }

    @Test
@@ -69,12 +69,12 @@ public class ChartPointTest {
        TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint()
                .setAltitude(Altitude.EGM2008.of(50));
        // when
-        ChartPoint point = new ChartPoint(statistics, trackPoint, Speed.of(10), false, UnitSystem.METRIC);
+        ChartPoint point = ChartPoint.create(statistics, trackPoint, Speed.of(10), false, UnitSystem.METRIC);

        // then
-        assertNull(point.getHeartRate());
-        assertNull(point.getCadence());
-        assertNull(point.getPower());
+        assertNull(point.heartRate());
+        assertNull(point.cadence());
+        assertNull(point.power());
    }

    @Test
@@ -89,11 +89,11 @@ public class ChartPointTest {
        TrackStatistics statistics = new TrackStatistics();

        // when
-        ChartPoint point = new ChartPoint(statistics, trackPoint, Speed.of(10), false, UnitSystem.METRIC);
+        ChartPoint point = ChartPoint.create(statistics, trackPoint, Speed.of(10), false, UnitSystem.METRIC);

        // then
-        assertEquals(100.0, point.getHeartRate(), 0.01);
-        assertEquals(101.0, point.getCadence(), 0.01);
-        assertEquals(102.0, point.getPower(), 0.01);
+        assertEquals(100.0, point.heartRate(), 0.01);
+        assertEquals(101.0, point.cadence(), 0.01);
+        assertEquals(102.0, point.power(), 0.01);
    }
 }
@@ -54,7 +54,7 @@ public class ChartValueSeriesTest {
                18) {
            @Override
            Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getAltitude();
+                return chartPoint.altitude();
            }

            @Override
@@ -80,9 +80,9 @@ public class ChartValueSeriesTest {

    @Test
    public void testVerySmallUpdates() {
-        series.update(new ChartPoint(1f));
-        series.update(new ChartPoint(2f));
-        series.update(new ChartPoint(3f));
+        series.update(withAltitude(1f));
+        series.update(withAltitude(2f));
+        series.update(withAltitude(3f));
        series.updateDimension();
        assertEquals(1, series.getInterval());
        assertEquals(1, series.getMinMarkerValue());
@@ -91,8 +91,8 @@ public class ChartValueSeriesTest {

    @Test
    public void testSmallUpdates() {
-        series.update(new ChartPoint(0));
-        series.update(new ChartPoint(10));
+        series.update(withAltitude(0));
+        series.update(withAltitude(10));
        series.updateDimension();
        assertEquals(100, series.getInterval());
        assertEquals(0, series.getMinMarkerValue());
@@ -101,8 +101,8 @@ public class ChartValueSeriesTest {

    @Test
    public void testBigUpdates() {
-        series.update(new ChartPoint(0));
-        series.update(new ChartPoint(901));
+        series.update(withAltitude(0));
+        series.update(withAltitude(901));
        series.updateDimension();
        assertEquals(1000, series.getInterval());
        assertEquals(0, series.getMinMarkerValue());
@@ -111,11 +111,23 @@ public class ChartValueSeriesTest {

    @Test
    public void testNotZeroBasedUpdates() {
-        series.update(new ChartPoint(220));
-        series.update(new ChartPoint(250));
+        series.update(withAltitude(220));
+        series.update(withAltitude(250));
        series.updateDimension();
        assertEquals(100, series.getInterval());
        assertEquals(200, series.getMinMarkerValue());
        assertEquals(700, series.getMaxMarkerValue());
    }
+
+    static ChartPoint withAltitude(double altitude) {
+        return new ChartPoint(
+                0,
+                altitude,
+                null,
+                null,
+                null,
+                null,
+                null
+        );
+    }
 }
@@ -986,13 +986,13 @@ public class CustomContentProviderUtilsTest {

        // then
        assertTrue(sensorStatistics.hasHeartRate());
-        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.avgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.maxHeartRate().getBPM(), stats.maxHr, 0f);
        assertTrue(sensorStatistics.hasCadence());
-        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.avgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.maxCadence().getRPM(), stats.maxCadence, 0f);
        assertTrue(sensorStatistics.hasPower());
-        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.avgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1018,8 +1018,8 @@ public class CustomContentProviderUtilsTest {

        // then
        assertTrue(sensorStatistics.hasHeartRate());
-        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.avgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.maxHeartRate().getBPM(), stats.maxHr, 0f);
        assertFalse(sensorStatistics.hasCadence());
        assertFalse(sensorStatistics.hasPower());
    }
@@ -1048,8 +1048,8 @@ public class CustomContentProviderUtilsTest {
        // then
        assertFalse(sensorStatistics.hasHeartRate());
        assertTrue(sensorStatistics.hasCadence());
-        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.avgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.maxCadence().getRPM(), stats.maxCadence, 0f);
        assertFalse(sensorStatistics.hasPower());
    }

@@ -1078,7 +1078,7 @@ public class CustomContentProviderUtilsTest {
        assertFalse(sensorStatistics.hasHeartRate());
        assertFalse(sensorStatistics.hasCadence());
        assertTrue(sensorStatistics.hasPower());
-        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.avgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1111,11 +1111,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
-        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
-        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.avgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.maxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.avgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.maxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.avgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1156,11 +1156,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
-        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
-        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.avgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.maxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.avgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.maxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.avgPower().getW(), stats.avgPower, 0f);
    }

    @Test
@@ -1201,11 +1201,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0f);
-        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0f);
-        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0f);
-        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0f);
-        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0f);
+        assertEquals(sensorStatistics.avgHeartRate().getBPM(), stats.avgHr, 0f);
+        assertEquals(sensorStatistics.maxHeartRate().getBPM(), stats.maxHr, 0f);
+        assertEquals(sensorStatistics.avgCadence().getRPM(), stats.avgCadence, 0f);
+        assertEquals(sensorStatistics.maxCadence().getRPM(), stats.maxCadence, 0f);
+        assertEquals(sensorStatistics.avgPower().getW(), stats.avgPower, 0f);
    }

    private void testGetSensorStats_randomData(int totalPoints, boolean withStartSegments) {
@@ -1232,11 +1232,11 @@ public class CustomContentProviderUtilsTest {
        TestSensorDataUtil.SensorDataStats stats = sensorDataUtil.computeStats();

        // then
-        assertEquals(sensorStatistics.getAvgHeartRate().getBPM(), stats.avgHr, 0.01f);
-        assertEquals(sensorStatistics.getMaxHeartRate().getBPM(), stats.maxHr, 0.01f);
-        assertEquals(sensorStatistics.getAvgCadence().getRPM(), stats.avgCadence, 0.01f);
-        assertEquals(sensorStatistics.getMaxCadence().getRPM(), stats.maxCadence, 0.01f);
-        assertEquals(sensorStatistics.getAvgPower().getW(), stats.avgPower, 0.01f);
+        assertEquals(sensorStatistics.avgHeartRate().getBPM(), stats.avgHr, 0.01f);
+        assertEquals(sensorStatistics.maxHeartRate().getBPM(), stats.maxHr, 0.01f);
+        assertEquals(sensorStatistics.avgCadence().getRPM(), stats.avgCadence, 0.01f);
+        assertEquals(sensorStatistics.maxCadence().getRPM(), stats.maxCadence, 0.01f);
+        assertEquals(sensorStatistics.avgPower().getW(), stats.avgPower, 0.01f);
    }

    @Test
@@ -23,8 +23,8 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertNull(selection.getSelection());
-        assertNull(selection.getSelectionArgs());
+        assertNull(selection.selection());
+        assertNull(selection.selectionArgs());
    }

    @Test
@@ -37,9 +37,9 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertEquals(selection.getSelection(), "_id IN (?)");
-        assertEquals(selection.getSelectionArgs().length, 1);
-        assertEquals(selection.getSelectionArgs()[0], "1");
+        assertEquals(selection.selection(), "_id IN (?)");
+        assertEquals(selection.selectionArgs().length, 1);
+        assertEquals(selection.selectionArgs()[0], "1");
    }

    @Test
@@ -57,11 +57,11 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertEquals(selection.getSelection(), "_id IN (?,?,?)");
-        assertEquals(selection.getSelectionArgs().length, 3);
-        assertEquals(selection.getSelectionArgs()[0], "1");
-        assertEquals(selection.getSelectionArgs()[1], "2");
-        assertEquals(selection.getSelectionArgs()[2], "3");
+        assertEquals(selection.selection(), "_id IN (?,?,?)");
+        assertEquals(selection.selectionArgs().length, 3);
+        assertEquals(selection.selectionArgs()[0], "1");
+        assertEquals(selection.selectionArgs()[1], "2");
+        assertEquals(selection.selectionArgs()[2], "3");
    }

    @Test
@@ -73,9 +73,9 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertEquals(selection.getSelection(), "category IN (?)");
-        assertEquals(selection.getSelectionArgs().length, 1);
-        assertEquals(selection.getSelectionArgs()[0], "running");
+        assertEquals(selection.selection(), "category IN (?)");
+        assertEquals(selection.selectionArgs().length, 1);
+        assertEquals(selection.selectionArgs()[0], "running");
    }

    @Test
@@ -91,12 +91,12 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertEquals(selection.getSelection(), "category IN (?,?,?,?)");
-        assertEquals(selection.getSelectionArgs().length, 4);
-        assertEquals(selection.getSelectionArgs()[0], "running");
-        assertEquals(selection.getSelectionArgs()[1], "road biking");
-        assertEquals(selection.getSelectionArgs()[2], "mountain biking");
-        assertEquals(selection.getSelectionArgs()[3], "trail walking");
+        assertEquals(selection.selection(), "category IN (?,?,?,?)");
+        assertEquals(selection.selectionArgs().length, 4);
+        assertEquals(selection.selectionArgs()[0], "running");
+        assertEquals(selection.selectionArgs()[1], "road biking");
+        assertEquals(selection.selectionArgs()[2], "mountain biking");
+        assertEquals(selection.selectionArgs()[3], "trail walking");
    }

    @Test
@@ -114,16 +114,16 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selectionOk = filterOk.buildSelection();

        // Then
-        assertNull(selectionWrong1.getSelection());
-        assertNull(selectionWrong1.getSelectionArgs());
+        assertNull(selectionWrong1.selection());
+        assertNull(selectionWrong1.selectionArgs());

-        assertNull(selectionWrong2.getSelection());
-        assertNull(selectionWrong2.getSelectionArgs());
+        assertNull(selectionWrong2.selection());
+        assertNull(selectionWrong2.selectionArgs());

-        assertEquals(selectionOk.getSelection(), "starttime BETWEEN ? AND ?");
-        assertEquals(selectionOk.getSelectionArgs().length, 2);
-        assertEquals(selectionOk.getSelectionArgs()[0], Long.toString(instant.toEpochMilli()));
-        assertEquals(selectionOk.getSelectionArgs()[1], Long.toString(instant.toEpochMilli() + oneDay));
+        assertEquals(selectionOk.selection(), "starttime BETWEEN ? AND ?");
+        assertEquals(selectionOk.selectionArgs().length, 2);
+        assertEquals(selectionOk.selectionArgs()[0], Long.toString(instant.toEpochMilli()));
+        assertEquals(selectionOk.selectionArgs()[1], Long.toString(instant.toEpochMilli() + oneDay));
    }

    @Test
@@ -143,13 +143,13 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertEquals(selection.getSelection(), "_id IN (?,?,?) AND category IN (?,?)");
-        assertEquals(selection.getSelectionArgs().length, 5);
-        assertEquals(selection.getSelectionArgs()[0], "1");
-        assertEquals(selection.getSelectionArgs()[1], "2");
-        assertEquals(selection.getSelectionArgs()[2], "3");
-        assertEquals(selection.getSelectionArgs()[3], "running");
-        assertEquals(selection.getSelectionArgs()[4], "road biking");
+        assertEquals(selection.selection(), "_id IN (?,?,?) AND category IN (?,?)");
+        assertEquals(selection.selectionArgs().length, 5);
+        assertEquals(selection.selectionArgs()[0], "1");
+        assertEquals(selection.selectionArgs()[1], "2");
+        assertEquals(selection.selectionArgs()[2], "3");
+        assertEquals(selection.selectionArgs()[3], "running");
+        assertEquals(selection.selectionArgs()[4], "road biking");
    }

    @Test
@@ -172,13 +172,13 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertEquals(selection.getSelection(), "_id IN (?,?,?) AND starttime BETWEEN ? AND ?");
-        assertEquals(selection.getSelectionArgs().length, 5);
-        assertEquals(selection.getSelectionArgs()[0], "1");
-        assertEquals(selection.getSelectionArgs()[1], "2");
-        assertEquals(selection.getSelectionArgs()[2], "3");
-        assertEquals(selection.getSelectionArgs()[3], Long.toString(instant.toEpochMilli()));
-        assertEquals(selection.getSelectionArgs()[4], Long.toString(instant.toEpochMilli() + oneDay));
+        assertEquals(selection.selection(), "_id IN (?,?,?) AND starttime BETWEEN ? AND ?");
+        assertEquals(selection.selectionArgs().length, 5);
+        assertEquals(selection.selectionArgs()[0], "1");
+        assertEquals(selection.selectionArgs()[1], "2");
+        assertEquals(selection.selectionArgs()[2], "3");
+        assertEquals(selection.selectionArgs()[3], Long.toString(instant.toEpochMilli()));
+        assertEquals(selection.selectionArgs()[4], Long.toString(instant.toEpochMilli() + oneDay));
    }

    @Test
@@ -196,11 +196,11 @@ public class TrackSelectionTest extends TestCase {
        SelectionData selection = filter.buildSelection();

        // Then
-        assertEquals(selection.getSelection(), "category IN (?,?) AND starttime BETWEEN ? AND ?");
-        assertEquals(selection.getSelectionArgs().length, 4);
-        assertEquals(selection.getSelectionArgs()[0], "running");
-        assertEquals(selection.getSelectionArgs()[1], "road biking");
-        assertEquals(selection.getSelectionArgs()[2], Long.toString(instant.toEpochMilli()));
-        assertEquals(selection.getSelectionArgs()[3], Long.toString(instant.toEpochMilli() + oneDay));
+        assertEquals(selection.selection(), "category IN (?,?) AND starttime BETWEEN ? AND ?");
+        assertEquals(selection.selectionArgs().length, 4);
+        assertEquals(selection.selectionArgs()[0], "running");
+        assertEquals(selection.selectionArgs()[1], "road biking");
+        assertEquals(selection.selectionArgs()[2], Long.toString(instant.toEpochMilli()));
+        assertEquals(selection.selectionArgs()[3], Long.toString(instant.toEpochMilli() + oneDay));
    }
 }
@@ -1,33 +1,16 @@
 package de.dennisguse.opentracks.data.model;

 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;

 import org.junit.Test;

 import java.time.Instant;
-import java.time.temporal.ChronoUnit;

 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.TrackPoint;

 public class TrackPointTest {

-    @Test
-    public void isRecent_true() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.now());
-
-        assertTrue(tp.isRecent());
-    }
-
-    @Test
-    public void isRecent_false() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.now().minus(2, ChronoUnit.MINUTES));
-
-        assertFalse(tp.isRecent());
-    }
-
    @Test
    public void distanceToPrevious() {
        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0))
@@ -5,8 +5,8 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

 import java.time.Instant;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.UUID;

 import de.dennisguse.opentracks.data.models.Track;
@@ -18,7 +18,7 @@ public class TrackFilenameGenerator2Test {

    @Parameterized.Parameters
    public static Collection<String> data() {
-        return Arrays.asList(
+        return List.of(
                "{name}_{starime}",
                "{name",
                "name}");
@@ -35,7 +35,7 @@ public class TrackFilenameGenerator2Test {
        // given
        Track track = new Track();
        track.setName("Best Track");
-        track.setUuid(UUID.fromString("0000fee0-0000-1000-8000-00805f9b34fb"));
+        track.setUuid(UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6"));
        track.getTrackStatistics().setStartTime(Instant.parse("2020-02-02T02:02:02Z"));

        // when
@@ -1,59 +0,0 @@
-package de.dennisguse.opentracks.io.file.exporter;
-
-import static org.junit.Assert.assertEquals;
-
-import android.content.Context;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.io.ByteArrayOutputStream;
-import java.time.Instant;
-import java.time.ZoneOffset;
-
-import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.io.file.TrackFileFormat;
-
-@RunWith(JUnit4.class)
-public class KmlTrackExporterTest {
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-
-    /**
-     * Sensor data by type should only be created if present in at least on TrackPoint.
-     */
-    @Test
-    public void writeCloseSegment_only_write_sensordata_if_present() {
-        String expected = """
-                <when>1970-01-01T00:00:00Z</when>
-                <coord/>
-                <when>1970-01-01T01:00:00+01:00</when>
-                <coord/>
-                <ExtendedData>
-                <SchemaData schemaUrl="#schema">
-                </SchemaData>
-                </ExtendedData>
-                </Track>
-                """;
-
-        // given
-        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0));
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        KMLTrackExporter kmlTrackWriter = (KMLTrackExporter) TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, null);
-        kmlTrackWriter.prepare(outputStream);
-
-        kmlTrackWriter.writeTrackPoint(ZoneOffset.UTC, trackPoint);
-        kmlTrackWriter.writeTrackPoint(ZoneOffset.ofTotalSeconds(3600), trackPoint);
-
-        // when
-        kmlTrackWriter.writeCloseSegment();
-        kmlTrackWriter.close();
-
-        // then
-        assertEquals(expected, outputStream.toString());
-    }
-}
@@ -35,6 +35,7 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
@@ -168,9 +169,12 @@ public class ExportImportTest {

        sendLocation(trackPointCreator, "2020-02-02T02:03:22Z", 3, 16, 10, 13, 15, 10, 0);

-        sendLocation(trackPointCreator, "2020-02-02T02:03:23Z", 3, 16.001, 10, 27, 15, 10, 0);
+        trackPointCreator.setClock("2020-02-02T02:03:30Z");
+        service.getTrackRecordingManager().onIdle();

-        trackPointCreator.setClock("2020-02-02T02:03:24Z");
+        sendLocation(trackPointCreator, "2020-02-02T02:03:50Z", 3, 16.001, 10, 27, 15, 10, 0);
+
+        trackPointCreator.setClock("2020-02-02T02:04:00Z");
        service.endCurrentTrack();

        Track track = contentProviderUtils.getTrack(trackId);
@@ -182,8 +186,103 @@ public class ExportImportTest {
        track = contentProviderUtils.getTrack(trackId);
        trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
        markers = contentProviderUtils.getMarkers(trackId);
-        assertEquals(12, trackPoints.size());
-        assertEquals(2, markers.size());
+    }
+
+    @LargeTest
+    @Test
+    public void track() throws TimeoutException {
+        setUp();
+
+        Track track = contentProviderUtils.getTrack(trackId);
+        TrackStatistics trackStatistics = track.getTrackStatistics();
+
+        assertEquals(ZoneOffset.of("+01:00"), track.getZoneOffset());
+        assertEquals(Instant.parse("2020-02-02T02:02:02Z"), trackStatistics.getStartTime());
+        assertEquals(Instant.parse("2020-02-02T02:04:00Z"), trackStatistics.getStopTime());
+
+        assertEquals(Duration.ofSeconds(56), trackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(26), trackStatistics.getMovingTime()); //TODO Likely too low
+
+        // Distance
+        assertEquals(222125.53125, trackStatistics.getTotalDistance().toM(), 0.01); //TODO Too low
+
+        // Speed
+        assertEquals(8543.29, trackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(3966.52, trackStatistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(8543.28, trackStatistics.getAverageMovingSpeed().toMPS(), 0.01);
+
+        // Altitude
+        assertEquals(10, trackStatistics.getMinAltitude(), 0.01);
+        assertEquals(10, trackStatistics.getMaxAltitude(), 0.01);
+
+        assertEquals(2, trackStatistics.getTotalAltitudeGain(), 0.01);
+        assertEquals(2, trackStatistics.getTotalAltitudeLoss(), 0.01);
+
+        List<TrackPoint> actual = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
+        new TrackPointAssert().assertEquals(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:02:02Z")),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
+                        .setLatitude(3)
+                        .setLongitude(14)
+                        .setAltitude(10)
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeLoss(1f)
+                        .setAltitudeGain(1f)
+                        .setHorizontalAccuracy(Distance.of(10)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:04Z"))
+                        .setSensorDistance(Distance.of(10))
+                        .setSpeed(Speed.of(15))
+                        .setHeartRate(HeartRate.of(66))
+                        .setCadence(3)
+                        .setPower(50)
+                        .setAltitudeLoss(1f)
+                        .setAltitudeGain(1f),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:15Z"))
+                        .setHeartRate(HeartRate.of(68))
+                        .setCadence(3)
+                        .setPower(50),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:17Z"))
+                        .setLatitude(3)
+                        .setLongitude(14.001)
+                        .setAltitude(10)
+                        .setSensorDistance(Distance.of(2))
+                        .setSpeed(Speed.of(5))
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f)
+                        .setHorizontalAccuracy(Distance.of(10))
+                        .setHeartRate(HeartRate.of(69))
+                        .setCadence(3)
+                        .setPower(50),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:18Z")),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:03:20Z")),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:03:21Z"))
+                        .setLatitude(3)
+                        .setLongitude(14.002)
+                        .setAltitude(10)
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f)
+                        .setHorizontalAccuracy(Distance.of(10)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, Instant.parse("2020-02-02T02:03:22Z"))
+                        .setLatitude(3)
+                        .setLongitude(16)
+                        .setAltitude(10)
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f)
+                        .setHorizontalAccuracy(Distance.of(10)),
+                new TrackPoint(TrackPoint.Type.IDLE, Instant.parse("2020-02-02T02:03:30Z")),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:03:50Z"))
+                        .setLatitude(3)
+                        .setLongitude(16.001)
+                        .setAltitude(10)
+                        .setSpeed(Speed.of(15))
+                        .setAltitudeLoss(0f)
+                        .setAltitudeGain(0f)
+                        .setHorizontalAccuracy(Distance.of(10)),
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:04:00Z"))
+
+        ), actual);
    }

    //TODO Does not test marker images
@@ -225,43 +324,7 @@ public class ExportImportTest {

        // Time
        assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset());
-        assertEquals(Instant.parse("2020-02-02T02:02:02Z"), importedTrackStatistics.getStartTime());
-        assertEquals(Instant.parse("2020-02-02T02:03:24Z"), importedTrackStatistics.getStopTime());
-
-        TrackStatistics originalTrackStatistics = track.getTrackStatistics();
-
-        assertEquals(originalTrackStatistics.getTotalTime(), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(20), importedTrackStatistics.getTotalTime());
-
-        assertEquals(originalTrackStatistics.getMovingTime(), importedTrackStatistics.getMovingTime());
-        assertEquals(Duration.ofSeconds(4), importedTrackStatistics.getMovingTime());
-
-        // Distance
-        assertEquals(originalTrackStatistics.getTotalDistance(), importedTrackStatistics.getTotalDistance());
-        assertEquals(222238.70, importedTrackStatistics.getTotalDistance().toM(), 0.01);
-
-        // Speed
-        assertEquals(originalTrackStatistics.getMaxSpeed(), importedTrackStatistics.getMaxSpeed());
-        assertEquals(55559.67, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
-
-        assertEquals(originalTrackStatistics.getAverageSpeed(), importedTrackStatistics.getAverageSpeed());
-        assertEquals(11111.93, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
-
-        assertEquals(originalTrackStatistics.getAverageMovingSpeed(), importedTrackStatistics.getAverageMovingSpeed());
-        assertEquals(55559.67, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
-
-        // Altitude
-        assertEquals(originalTrackStatistics.getMinAltitude(), importedTrackStatistics.getMinAltitude(), 0.01);
-        assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);
-
-        assertEquals(originalTrackStatistics.getMaxAltitude(), importedTrackStatistics.getMaxAltitude(), 0.01);
-        assertEquals(10, importedTrackStatistics.getMaxAltitude(), 0.01);
-
-        assertEquals(originalTrackStatistics.getTotalAltitudeGain(), importedTrackStatistics.getTotalAltitudeGain(), 0.01);
-        assertEquals(2, importedTrackStatistics.getTotalAltitudeGain(), 0.01);
-
-        assertEquals(originalTrackStatistics.getTotalAltitudeLoss(), importedTrackStatistics.getTotalAltitudeLoss(), 0.01);
-        assertEquals(2, importedTrackStatistics.getTotalAltitudeLoss(), 0.01);
+        assertEquals(track.getTrackStatistics(), importedTrackStatistics);

        // 4. markers
        assertMarkers();
@@ -347,7 +410,7 @@ public class ExportImportTest {
                        .setSpeed(Speed.of(5))
                        .setAltitudeLoss(1f)
                        .setAltitudeGain(1f)
-                        .setSensorDistance(Distance.of(14))
+                        .setSensorDistance(Distance.of(12))
                        .setHeartRate(69)
                        .setPower(50f)
                        .setCadence(3f)
@@ -368,7 +431,7 @@ public class ExportImportTest {
                        .setAltitudeGain(0f)
                        .setSpeed(Speed.of(15))
                        .setHorizontalAccuracy(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:03:23Z"))
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:03:50Z"))
                        .setLatitude(3)
                        .setLongitude(16.001)
                        .setAltitude(10)
@@ -379,24 +442,23 @@ public class ExportImportTest {
        ), actual);

        // 3. trackstatistics
-        TrackStatistics trackStatistics = track.getTrackStatistics();
        TrackStatistics importedTrackStatistics = importedTrack.getTrackStatistics();

        // Time
        assertEquals(track.getZoneOffset(), importedTrack.getZoneOffset());
        assertEquals(Instant.parse("2020-02-02T02:02:03Z"), importedTrackStatistics.getStartTime());
-        assertEquals(Instant.parse("2020-02-02T02:03:23Z"), importedTrackStatistics.getStopTime());
+        assertEquals(Instant.parse("2020-02-02T02:03:50Z"), importedTrackStatistics.getStopTime());

-        assertEquals(Duration.ofSeconds(80), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(80), importedTrackStatistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(107), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(107), importedTrackStatistics.getMovingTime());

        // Distance
-        assertEquals(222349.85, importedTrackStatistics.getTotalDistance().toM(), 0.01);
+        assertEquals(222347.85, importedTrackStatistics.getTotalDistance().toM(), 0.01);

        // Speed
-        assertEquals(2779.37, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
-        assertEquals(2779.37, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
-        assertEquals(2779.37, importedTrackStatistics.getAverageMovingSpeed().toMPS(), 0.01);
+        assertEquals(2078.01, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(2078.01, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(2078.01, importedTrackStatistics.getAverageMovingSpeed().toMPS(), 0.01);

        // Altitude
        assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);
@@ -487,14 +549,14 @@ public class ExportImportTest {

    private void mockBLESensorData(TrackPointCreator trackPointCreator, Float speed, Distance distance, float heartRate, float cadence, Float power) {

-            SensorDataSet sensorDataSet = new SensorDataSet();
-            sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
-            sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));
+        SensorDataSet sensorDataSet = new SensorDataSet();
+        sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
+        sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));

-            SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
-            Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
-            Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
-            sensorDataSet.set(cyclingCadence);
+        SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
+        Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
+        Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
+        sensorDataSet.set(cyclingCadence);

        if (distance != null && speed != null) {
            SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
@@ -141,8 +141,8 @@ public class GPXTrackImporterTest {

        // 3. trackstatistics
        TrackStatistics trackStatistics = importedTrack.getTrackStatistics();
-        assertEquals(1.44, trackStatistics.getMaxSpeed().toMPS(), 0.01);
-        assertEquals(Duration.ofSeconds(53), trackStatistics.getMovingTime());
+        assertEquals(0.75, trackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(Duration.ofSeconds(101), trackStatistics.getMovingTime());

        // 4. trackpoints
        List<TrackPoint> importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);
@@ -189,7 +189,7 @@ public class GPXTrackImporterTest {

        // 3. trackstatistics
        TrackStatistics trackStatistics = importedTrack.getTrackStatistics();
-        assertEquals(4.0, trackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(5.0, trackStatistics.getMaxSpeed().toMPS(), 0.01);
        assertEquals(Duration.ofSeconds(101), trackStatistics.getMovingTime());

        // 4. trackpoints
@@ -146,6 +146,7 @@ public class TrackRecordingServiceMarkerTest {
        assertEquals(0.0, wpt.getLength().toM(), 0.01);
        assertNotNull(wpt.getLocation());

+        trackPointCreator.setClock("2020-02-02T02:02:04Z");
        service.endCurrentTrack();
    }
 }
@@ -88,7 +88,7 @@ public class TrackRecordingServiceRecordingTest {
        contentProviderUtils = new ContentProviderUtils(context);

        PreferencesUtils.setString(R.string.recording_distance_interval_key, R.string.recording_distance_interval_default);
-        PreferencesUtils.setString(R.string.idle_speed_key, R.string.idle_speed_default);
+        PreferencesUtils.setString(R.string.idle_duration_key, R.string.idle_duration_default);

        service = startService();
    }
@@ -122,7 +122,7 @@ public class TrackRecordingServiceRecordingTest {
        service.endCurrentTrack();

        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 0, 1, 0, 0, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 1, 1, 0, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());

        new TrackPointAssert().assertEquals(List.of(
@@ -150,7 +150,7 @@ public class TrackRecordingServiceRecordingTest {
        service.endCurrentTrack();

        // then
-        assertEquals(new TrackStatistics(startTime, pauseTime, 0, 1, 0, 0, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, pauseTime, 0, 1, 1, 0, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());

        new TrackPointAssert().assertEquals(List.of(
@@ -166,7 +166,7 @@ public class TrackRecordingServiceRecordingTest {
        service.resumeTrack(trackId);

        // then
-        assertEquals(new TrackStatistics(startTime, resumeTime, 0, 1, 0, 0, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, resumeTime, 0, 1, 1, 0, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());

        new TrackPointAssert().assertEquals(List.of(
@@ -299,7 +299,7 @@ public class TrackRecordingServiceRecordingTest {
        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);

        // then
-        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 1, 15, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());

        // when
@@ -307,7 +307,7 @@ public class TrackRecordingServiceRecordingTest {
        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0001, 35.0, 1, 15);

        // then
-        assertEquals(new TrackStatistics(startTime, gps2, 11.113178253173828f, 4, 3, 15, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, gps2, 11.113178253173828f, 4, 4, 15, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());

        // when
@@ -315,7 +315,7 @@ public class TrackRecordingServiceRecordingTest {
        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0002, 35.0, 1, 15);

        // then
-        assertEquals(new TrackStatistics(startTime, gps3, 22.226356506347656, 6, 5, 15, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, gps3, 22.226356506347656, 6, 6, 15, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());


@@ -325,7 +325,7 @@ public class TrackRecordingServiceRecordingTest {
        service.endCurrentTrack();

        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 22.226356506347656, 10, 5, 15, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, stopTime, 22.226356506347656, 10, 10, 15, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());

        new TrackPointAssert().assertEquals(List.of(
@@ -357,71 +357,6 @@ public class TrackRecordingServiceRecordingTest {
        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
    }

-    @MediumTest
-    @Test
-    public void testRecording_gpsOnly_recordingDistance_above_speed_0() {
-        // given
-        String startTime = "2020-02-02T02:02:02Z";
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-        trackPointCreator.setClock(startTime);
-        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        String gps1 = "2020-02-02T02:02:03Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 0);
-
-        // then
-        TrackStatistics gps1statistics = new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f);
-        assertEquals(gps1statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String gps2 = "2020-02-02T02:02:06Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0001, 35.0, 1, 0);
-
-        // then
-        assertEquals(gps1statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String gps3 = "2020-02-02T02:02:08Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0002, 35.0, 1, 0);
-
-
-        // then
-        assertEquals(gps1statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String stopTime = "2020-02-02T02:02:12Z";
-        trackPointCreator.setClock(stopTime);
-        service.endCurrentTrack();
-
-
-        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
-                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        new TrackPointAssert().assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
-                        .setLatitude(45.0001)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
-    }
-
    @MediumTest
    @Test
    public void testRecording_gpsOnly_recordingDistance_below() {
@@ -437,7 +372,7 @@ public class TrackRecordingServiceRecordingTest {
        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);

        // then
-        TrackStatistics gps1Statistics = new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f);
+        TrackStatistics gps1Statistics = new TrackStatistics(startTime, gps1, 0, 1, 1, 15, 0f, 0f);
        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());

        // when
@@ -461,7 +396,7 @@ public class TrackRecordingServiceRecordingTest {
        service.endCurrentTrack();

        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 2.222635507583618, 10, 5, 15, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, stopTime, 2.222635507583618, 10, 10, 15, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());

        new TrackPointAssert().assertEquals(List.of(
@@ -486,158 +421,6 @@ public class TrackRecordingServiceRecordingTest {
        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
    }

-    @MediumTest
-    @Test
-    public void testRecording_gpsOnly_recordingDistance_idle() {
-        // given
-        String startTime = "2020-02-02T02:02:02Z";
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-        trackPointCreator.setClock(startTime);
-        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        String gps1 = "2020-02-02T02:02:03Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 0);
-
-        // then
-        TrackStatistics gps1Statistics = new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f);
-        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String gps2 = "2020-02-02T02:02:06Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0, 35.0, 1, 0);
-
-        // then
-        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String gps3 = "2020-02-02T02:02:08Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0, 35.0, 1, 0);
-
-        // then
-        assertEquals(gps1Statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-
-        // when
-        String stopTime = "2020-02-02T02:02:12Z";
-        trackPointCreator.setClock(stopTime);
-        service.endCurrentTrack();
-
-        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
-                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        new TrackPointAssert().assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
-                        .setLatitude(45.00002)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
-    }
-
-    @MediumTest
-    @Test
-    public void testRecording_gpsOnly_recordingDistance_idle_movement() {
-        // given
-        String startTime = "2020-02-02T02:02:02Z";
-        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-        trackPointCreator.setClock(startTime);
-        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
-
-        // when
-        String gps1 = "2020-02-02T02:02:03Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);
-
-        // then
-        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f)
-                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String gps2 = "2020-02-02T02:02:06Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0, 35.0, 1, 0);
-
-        // then
-        final TrackStatistics gps2statistics = new TrackStatistics(startTime, gps2, 0, 4, 0, 0, 0f, 0f);
-        assertEquals(gps2statistics
-                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String gps3 = "2020-02-02T02:02:08Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps3, 45.0, 35.0, 1, 0);
-
-        // then
-        assertEquals(gps2statistics, contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-
-        // when
-        String gps4 = "2020-02-02T02:02:10Z";
-        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps4, 45.0, 35.0, 1, 15);
-
-        // then
-        assertEquals(new TrackStatistics(startTime, gps4, 0, 8, 0, 0, 0f, 0f)
-                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        // when
-        String stopTime = "2020-02-02T02:02:12Z";
-        trackPointCreator.setClock(stopTime);
-        service.endCurrentTrack();
-
-        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
-                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
-
-        new TrackPointAssert().assertEquals(List.of(
-                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse(startTime)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps1))
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps2))
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps3))
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse(gps4))
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(1))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse(stopTime))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f)
-        ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
-    }
-
    @MediumTest
    @Test
    public void testRecording_gpsOnly_recordingDistance_movement_non_idle() {
@@ -721,7 +504,7 @@ public class TrackRecordingServiceRecordingTest {
        service.endCurrentTrack();

        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 0, 0, 0f, 0f)
+        assertEquals(new TrackStatistics(startTime, stopTime, 0, 10, 10, 0, 0f, 0f)
                , contentProviderUtils.getTrack(trackId).getTrackStatistics());


@@ -749,14 +532,14 @@ public class TrackRecordingServiceRecordingTest {
        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);

        // then
-        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 0, 0, 0f, 0f), contentProviderUtils.getTrack(trackId).getTrackStatistics());
+        assertEquals(new TrackStatistics(startTime, gps1, 0, 1, 1, 15, 0f, 0f), contentProviderUtils.getTrack(trackId).getTrackStatistics());

        // when
        String gps2 = "2020-02-02T02:02:06Z";
        TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.1, 35.0, 1, 15);

        // then
-        assertEquals(new TrackStatistics(startTime, gps2, 11113.275390625, 4, 3, 3704.4251302083335f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString());
+        assertEquals(new TrackStatistics(startTime, gps2, 11113.275390625, 4, 4, 2778.31884765625f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString());


        // when
@@ -765,7 +548,7 @@ public class TrackRecordingServiceRecordingTest {
        service.endCurrentTrack();

        // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 11113.275390625, 10, 3, 3704.4251302083335f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString());
+        assertEquals(new TrackStatistics(startTime, stopTime, 11113.275390625, 10, 10, 1111.3275390625f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString());


        // then
@@ -63,7 +63,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
@@ -79,7 +79,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
        assertEquals("Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement);
@@ -95,7 +95,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
        assertEquals("Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
@@ -111,7 +111,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
        assertEquals("Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement);
@@ -133,7 +133,7 @@ public class VoiceAnnouncementUtilsTest {
        }

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString();

        // then
        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement);
@@ -149,7 +149,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, false, null, null).toString();

        // then
        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement);
@@ -171,7 +171,7 @@ public class VoiceAnnouncementUtilsTest {
        }

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, false, lastInterval, null).toString();

        // then
        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement);
@@ -187,7 +187,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();

        // then
        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
@@ -201,7 +201,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setMovingTime(Duration.ofHours(1));

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();

        // then
        assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
@@ -215,7 +215,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setMovingTime(Duration.ofHours(1));

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_METER, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_METER, true, null, null).toString();

        // then
        assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
@@ -229,7 +229,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setMovingTime(Duration.ofHours(1));

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
        assertEquals("Total distance 1.1 kilometers. 1 hour. Average moving speed 1.1 kilometers per hour.", announcement);
@@ -251,7 +251,7 @@ public class VoiceAnnouncementUtilsTest {
        }

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, true, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, true, lastInterval, null).toString();

        // then
        assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement);
@@ -267,7 +267,7 @@ public class VoiceAnnouncementUtilsTest {
        stats.setTotalAltitudeGain(6000f);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, false, null, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, false, null, null).toString();

        // then
        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement);
@@ -289,7 +289,7 @@ public class VoiceAnnouncementUtilsTest {
        }

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, false, lastInterval, null).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.IMPERIAL_FEET, false, lastInterval, null).toString();

        // then
        assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement);
@@ -312,10 +312,10 @@ public class VoiceAnnouncementUtilsTest {
            lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
        }

-        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null);
+        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();

        // then
        assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement);
@@ -342,10 +342,10 @@ public class VoiceAnnouncementUtilsTest {
            lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
        }

-        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null);
+        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null);

        // when
-        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();
+        String announcement = VoiceAnnouncementUtils.createStatistics(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();

        // then
        assertEquals(" Current heart rate 133 bpm.", announcement);
@@ -83,35 +83,17 @@ public class TrackStatisticsUpdaterTest {
        TrackStatistics statistics = subject.getTrackStatistics();
        assertEquals(142.26, statistics.getTotalDistance().toM(), 0.01);
        assertEquals(Duration.ofSeconds(12), statistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(10), statistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(12), statistics.getMovingTime());

        assertEquals(2.5, statistics.getMinAltitude(), 0.01);
        assertEquals(32.5, statistics.getMaxAltitude(), 0.01);
        assertEquals(36, statistics.getTotalAltitudeGain(), 0.01);
        assertEquals(36, statistics.getTotalAltitudeLoss(), 0.01);

-        assertEquals(14.226, statistics.getMaxSpeed().toMPS(), 0.01);
-        assertEquals(14.226, statistics.getAverageMovingSpeed().toMPS(), 0.01);
+        assertEquals(11.85, statistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(11.85, statistics.getAverageMovingSpeed().toMPS(), 0.01);
        assertEquals(11.85, statistics.getAverageSpeed().toMPS(), 0.01);
-        assertEquals(106.64f, statistics.getAverageHeartRate().getBPM(), 0.01);
-    }
-
-    @Test
-    public void addTrackPoint_distance_from_GPS_not_moving() {
-        // given
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochMilli(1000));
-        TrackPoint tp2 = new TrackPoint(0, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(2000));
-        TrackPoint tp3 = new TrackPoint(0.00001, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(3000));
-
-        // when
-        subject.addTrackPoint(tp1);
-        subject.addTrackPoint(tp2);
-        subject.addTrackPoint(tp3);
-
-        // then
-        assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
+        assertEquals(106.834f, statistics.getAverageHeartRate().getBPM(), 0.01);
    }

    @Test
@@ -165,35 +147,6 @@ public class TrackStatisticsUpdaterTest {
        assertEquals(125.57, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
    }

-    @Test
-    public void addTrackPoint_distance_from_GPS_not_moving_and_sensor_moving() {
-        // given
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochMilli(1000));
-        TrackPoint tp2 = new TrackPoint(0, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(2000));
-        TrackPoint tp3 = new TrackPoint(0.00001, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(3000));
-        TrackPoint tp4 = new TrackPoint(0.00001, 0, Altitude.WGS84.of(5.0), Instant.ofEpochMilli(4000));
-        tp4.setSensorDistance(Distance.of(5f));
-        TrackPoint tp5 = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochMilli(5000));
-        tp5.setSensorDistance(Distance.of(10f));
-
-        // when
-        subject.addTrackPoint(tp1);
-        subject.addTrackPoint(tp2);
-        subject.addTrackPoint(tp3);
-
-        // then
-        assertEquals(0, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-
-        // when
-        subject.addTrackPoint(tp4);
-        subject.addTrackPoint(tp5);
-
-        // then
-        assertEquals(15, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
-    }
-
    @Test
    public void addTrackPoint_distance_from_GPS_moving_and_sensor_disconnecting() {
        // given
@@ -225,42 +178,6 @@ public class TrackStatisticsUpdaterTest {
        assertEquals(59.18, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
    }

-
-    @Test
-    public void addTrackPoint_maxSpeed_ignore_above_acceleration() {
-        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-        assertEquals(Speed.of(0f), subject.getTrackStatistics().getMaxSpeed());
-
-        subject.addTrackPoint(new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0)));
-        assertEquals(Speed.of(0f), subject.getTrackStatistics().getMaxSpeed());
-
-        // Ignore as we set max speed if two consecutive trackpoints were considered moving
-        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(1))
-                .setSpeed(Speed.of(1f)));
-        assertEquals(Speed.of(0f), subject.getTrackStatistics().getMaxSpeed());
-
-        // Update max speed
-        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(2))
-                .setSpeed(Speed.of(1f)));
-        assertEquals(Speed.of(1f), subject.getTrackStatistics().getMaxSpeed());
-
-        // Update max speed
-        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(12))
-                .setSpeed(Speed.of(50f)));
-        assertEquals(Speed.of(50f), subject.getTrackStatistics().getMaxSpeed());
-
-        // Ignore; we were getting slower
-        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(13))
-                .setSpeed(Speed.of(5f)));
-        assertEquals(Speed.of(50f), subject.getTrackStatistics().getMaxSpeed());
-
-        // Ignore acceleration above 2g
-        subject.addTrackPoint(new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(14))
-                .setSpeed(Speed.of(500f)));
-        assertEquals(Speed.of(50f), subject.getTrackStatistics().getMaxSpeed());
-
-    }
-
    @Test
    public void addTrackPoint_maxSpeed_multiple_segments() {
        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
@@ -290,6 +207,64 @@ public class TrackStatisticsUpdaterTest {
        assertEquals(Speed.of(2f), subject.getTrackStatistics().getMaxSpeed());
    }

+    @Test
+    public void addTrackPoint_idle_withoutDistance() {
+        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
+
+        // when
+        subject.addTrackPoints(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(1))
+                        .setSpeed(Speed.of(2f)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(2))
+                        .setSpeed(Speed.of(2f)),
+
+                new TrackPoint(TrackPoint.Type.IDLE, Instant.ofEpochSecond(30)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochSecond(40))
+                        .setHeartRate(50),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochSecond(45))
+                        .setHeartRate(50),
+                new TrackPoint(0, 1, Altitude.WGS84.of(0), Instant.ofEpochSecond(50)),
+                new TrackPoint(0, 2, Altitude.WGS84.of(0), Instant.ofEpochSecond(55)),
+
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochSecond(60))
+        ));
+
+        // then
+        assertEquals(Duration.ofSeconds(40), subject.getTrackStatistics().getMovingTime());
+    }
+
+    @Test
+    public void addTrackPoint_idle_withDistance() {
+        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
+
+        // when
+        subject.addTrackPoints(List.of(
+                new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.ofEpochSecond(0)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(1))
+                        .setSensorDistance(Distance.of(10)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(2))
+                        .setSensorDistance(Distance.of(10)),
+
+                new TrackPoint(TrackPoint.Type.IDLE, Instant.ofEpochSecond(30))
+                        .setSensorDistance(Distance.ofKilometer(1)),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochSecond(40))
+                        .setHeartRate(50),
+                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochSecond(45))
+                        .setHeartRate(50),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(50))
+                        .setSensorDistance(Distance.of(10)),
+                new TrackPoint(0, 0, Altitude.WGS84.of(0), Instant.ofEpochSecond(55))
+                        .setSensorDistance(Distance.of(10)),
+
+                new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.ofEpochSecond(60))
+        ));
+
+        // then
+        assertEquals(Duration.ofSeconds(45), subject.getTrackStatistics().getMovingTime());
+        assertEquals(Distance.of(1040), subject.getTrackStatistics().getTotalDistance());
+    }
+
    @Test
    public void copy_constructor() {
        // given
@@ -314,7 +289,6 @@ public class TrackStatisticsUpdaterTest {
        subject.addTrackPoint(tp5);
        copy.addTrackPoint(tp5);

-
        // then
        assertEquals(55.287, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
        assertEquals(55.287, copy.getTrackStatistics().getTotalDistance().toM(), 0.01);
@@ -57,12 +57,12 @@ public class StatisticsUtilsTest extends TestCase {

        // then
        assertEquals(resultTrue.getFields().size(), 3);
-        assertTrue(resultTrue.getFields().stream().anyMatch(f -> f.getKey().equals("key1")));
-        assertTrue(resultTrue.getFields().stream().anyMatch(f -> f.getKey().equals("key3")));
-        assertTrue(resultTrue.getFields().stream().anyMatch(f -> f.getKey().equals("key5")));
+        assertTrue(resultTrue.getFields().stream().anyMatch(f -> "key1".equals(f.getKey())));
+        assertTrue(resultTrue.getFields().stream().anyMatch(f -> "key3".equals(f.getKey())));
+        assertTrue(resultTrue.getFields().stream().anyMatch(f -> "key5".equals(f.getKey())));

        assertEquals(resultFalse.getFields().size(), 2);
-        assertTrue(resultFalse.getFields().stream().anyMatch(f -> f.getKey().equals("key2")));
-        assertTrue(resultFalse.getFields().stream().anyMatch(f -> f.getKey().equals("key4")));
+        assertTrue(resultFalse.getFields().stream().anyMatch(f -> "key2".equals(f.getKey())));
+        assertTrue(resultFalse.getFields().stream().anyMatch(f -> "key4".equals(f.getKey())));
    }
-}
+}
@@ -3,11 +3,11 @@
 "2020-02-02T03:02:03+01:00","TRACKPOINT",3,14,10,10,,54,1,1,,,,
 "2020-02-02T03:02:04+01:00","TRACKPOINT",,,,,,54,1,1,10,66,3,50
 "2020-02-02T03:02:15+01:00","TRACKPOINT",,,,,,,,,,68,3,50
-"2020-02-02T03:02:16+01:00","TRACKPOINT",,,,,,18,,,2,69,3,50
 "2020-02-02T03:02:17+01:00","TRACKPOINT",3,14.001,10,10,,18,0,0,2,69,3,50
 "2020-02-02T03:02:18+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
 "2020-02-02T03:03:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
 "2020-02-02T03:03:21+01:00","TRACKPOINT",3,14.002,10,10,,54,0,0,,,,
 "2020-02-02T03:03:22+01:00","SEGMENT_START_AUTOMATIC",3,16,10,10,,54,0,0,,,,
-"2020-02-02T03:03:23+01:00","TRACKPOINT",3,16.001,10,10,,54,0,0,,,,
-"2020-02-02T03:03:24+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
+"2020-02-02T03:03:30+01:00","IDLE",,,,,,,,,,,,
+"2020-02-02T03:03:50+01:00","TRACKPOINT",3,16.001,10,10,,54,0,0,,,,
+"2020-02-02T03:04:00+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
@@ -69,6 +69,7 @@ limitations under the License.
        android:allowBackup="true"
        android:fullBackupContent="@xml/backup_rules_30_lower"
        android:dataExtractionRules="@xml/backup_rules_31_higher"
+        android:enableOnBackInvokedCallback="true"
        android:hardwareAccelerated="true"
        android:hasFragileUserData="false"
        android:icon="@drawable/ic_launcher"
@@ -333,7 +334,8 @@ limitations under the License.

        <activity
            android:name=".TrackListActivity"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTop">
            <intent-filter>
                <action android:name="android.intent.action.SEARCH" />
            </intent-filter>
@@ -21,7 +21,7 @@ import android.view.View;

 import androidx.appcompat.app.AppCompatActivity;

-import de.dennisguse.opentracks.services.announcement.VoiceAnnouncement;
+import de.dennisguse.opentracks.services.announcement.TTSManager;

 /**
 * @author Jimmy Shih
@@ -33,14 +33,14 @@ public abstract class AbstractActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);

        // Set volume control stream for text to speech
-        setVolumeControlStream(VoiceAnnouncement.AUDIO_STREAM);
+        setVolumeControlStream(TTSManager.AUDIO_STREAM);

        setContentView(getRootView());
    }

    @Override
    public boolean onSupportNavigateUp() {
-        onBackPressed();
+        getOnBackPressedDispatcher().onBackPressed();
        return true;
    }

@@ -45,8 +45,8 @@ public abstract class AbstractTrackDeleteActivity extends AbstractActivity imple

    @Override
    public void onConfirmDeleteDone(Track.Id... trackIds) {
-        ArrayList<Track.Id> trackIdList = new ArrayList<>(Arrays.asList(trackIds))
-                .stream().filter(trackId -> !trackId.equals(getRecordingTrackId())).collect(Collectors.toCollection(ArrayList::new));
+        ArrayList<Track.Id> trackIdList = Arrays.stream(trackIds)
+                .filter(trackId -> !trackId.equals(getRecordingTrackId())).collect(Collectors.toCollection(ArrayList::new));

        onDeleteConfirmed();

@@ -7,6 +7,8 @@ import android.os.Build;
 import android.os.StrictMode;
 import android.util.Log;

+import com.google.android.material.color.DynamicColors;
+
 import java.lang.reflect.Method;

 import de.dennisguse.opentracks.settings.PreferencesUtils;
@@ -28,6 +30,11 @@ public class Startup extends Application {

        // Include version information into stack traces.
        Log.i(TAG, BuildConfig.APPLICATION_ID + "; BuildType: " + BuildConfig.BUILD_TYPE + "; VersionName: " + BuildConfig.VERSION_NAME + "/" + BuildConfig.VERSION_NAME_FULL + " VersionCode: " + BuildConfig.VERSION_CODE);
+        // In debug builds: show thread and VM warnings.
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, "Enabling strict mode");
+            StrictMode.enableDefaults();
+        }

        PreferencesUtils.initPreferences(this, getResources());
        // Set default values of preferences on first start.
@@ -35,11 +42,8 @@ public class Startup extends Application {
        PreferencesUtils.applyDefaultUnit();
        PreferencesUtils.applyNightMode();

-
-        // In debug builds: show thread and VM warnings.
-        if (BuildConfig.DEBUG) {
-            Log.d(TAG, "Enabling strict mode");
-            StrictMode.enableDefaults();
+        if (PreferencesUtils.shouldUseDynamicColors()) {
+            DynamicColors.applyToActivitiesIfAvailable(this);
        }
    }

@@ -16,7 +16,6 @@

 package de.dennisguse.opentracks;

-import android.app.ActivityOptions;
 import android.app.SearchManager;
 import android.content.Context;
 import android.content.Intent;
@@ -26,37 +25,26 @@ import android.graphics.drawable.AnimatedVectorDrawable;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
-import androidx.cursoradapter.widget.ResourceCursorAdapter;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.LinearLayoutManager;

 import com.google.android.material.button.MaterialButton;

-import java.time.Duration;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Objects;

-import de.dennisguse.opentracks.data.models.ActivityType;
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.DistanceFormatter;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.databinding.TrackListBinding;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
@@ -66,15 +54,14 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.SettingsActivity;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.share.ShareUtils;
+import de.dennisguse.opentracks.ui.TrackListAdapter;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsActivity;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.ui.util.ActivityUtils;
-import de.dennisguse.opentracks.ui.util.ListItemUtils;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
-import de.dennisguse.opentracks.util.StringUtils;

 /**
 * An activity displaying a list of tracks.
@@ -87,12 +74,10 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co

    // The following are set in onCreate
    private TrackRecordingServiceConnection trackRecordingServiceConnection;
-    private ResourceCursorAdapter resourceCursorAdapter;
+    private TrackListAdapter adapter;

    private TrackListBinding viewBinding;

-    private final TrackLoaderCallBack loaderCallbacks = new TrackLoaderCallBack();
-
    // Preferences
    private UnitSystem unitSystem = UnitSystem.defaultUnitSystem();

@@ -128,11 +113,14 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> {
        if (PreferencesUtils.isKey(R.string.stats_units_key, key)) {
            unitSystem = PreferencesUtils.getUnitSystem();
+            if (adapter != null) {
+                adapter.updateUnitSystem(unitSystem);
+            }
        }
        if (key != null) {
            runOnUiThread(() -> {
                TrackListActivity.this.invalidateOptionsMenu();
-                loaderCallbacks.restart();
+                loadData();
            });
        }
    };
@@ -140,6 +128,8 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    // Menu items
    private MenuItem searchMenuItem;

+    private String searchQuery;
+
    private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> {
        service.getRecordingStatusObservable()
                .observe(TrackListActivity.this, this::onRecordingStatusChanged);
@@ -180,63 +170,10 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
            }
        });

-        viewBinding.trackList.setEmptyView(viewBinding.trackListEmptyView);
-        viewBinding.trackList.setOnItemClickListener((parent, view, position, trackIdId) -> {
-            Track.Id trackId = new Track.Id(trackIdId);
-            if (recordingStatus.isRecording() && trackId.equals(recordingStatus.getTrackId())) {
-                // Is recording -> open record activity.
-                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class)
-                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-                startActivity(newIntent);
-            } else {
-                // Not recording -> open detail activity.
-                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordedActivity.class)
-                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
-                ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(
-                        this,
-                        new Pair<>(view.findViewById(R.id.list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON));
-                startActivity(newIntent, activityOptions.toBundle());
-            }
-        });
-
-        resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) {
-            @Override
-            public void bindView(View view, Context context, Cursor cursor) {
-                int idIndex = cursor.getColumnIndexOrThrow(TracksColumns._ID);
-                int iconIndex = cursor.getColumnIndexOrThrow(TracksColumns.ICON);
-                int nameIndex = cursor.getColumnIndexOrThrow(TracksColumns.NAME);
-                int totalTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALTIME);
-                int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
-                int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
-                int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
-                int activityTypeIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE_LOCALIZED);
-                int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
-                int markerCountIndex = cursor.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT);
-
-                Track.Id trackId = new Track.Id(cursor.getLong(idIndex));
-                boolean isRecording = trackId.equals(recordingStatus.getTrackId());
-                String icon = cursor.getString(iconIndex);
-                int iconId = ActivityType.findBy(icon)
-                        .getIconDrawableId();
-                String name = cursor.getString(nameIndex);
-                String totalTime = StringUtils.formatElapsedTime(Duration.ofMillis(cursor.getLong(totalTimeIndex)));
-                String totalDistance = DistanceFormatter.Builder()
-                        .setUnit(unitSystem)
-                        .build(TrackListActivity.this).formatDistance(Distance.of(cursor.getDouble(totalDistanceIndex)));
-                int markerCount = cursor.getInt(markerCountIndex);
-                long startTime = cursor.getLong(startTimeIndex);
-                int startTimeOffset = cursor.getInt(startTimeOffsetIndex);
-                String activityType = icon != null && !icon.equals("") ? null : cursor.getString(activityTypeIndex);
-                String description = cursor.getString(descriptionIndex);
-
-                ListItemUtils.setListItem(TrackListActivity.this, view, isRecording,
-                        iconId, R.string.image_track, name, totalTime, totalDistance, markerCount,
-                        OffsetDateTime.ofInstant(Instant.ofEpochMilli(startTime), ZoneOffset.ofTotalSeconds(startTimeOffset)),
-                        activityType, description, false);
-            }
-        };
-        viewBinding.trackList.setAdapter(resourceCursorAdapter);
-        ActivityUtils.configureListViewContextualMenu(viewBinding.trackList, contextualActionModeCallback);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        adapter = new TrackListAdapter(this, viewBinding.trackList, recordingStatus, unitSystem);
+        viewBinding.trackList.setLayoutManager(layoutManager);
+        viewBinding.trackList.setAdapter(adapter);

        viewBinding.trackListFabAction.setOnClickListener((view) -> {
            if (recordingStatus.isRecording()) {
@@ -271,8 +208,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        });

        setSupportActionBar(viewBinding.trackListToolbar);
-
-        loadData(getIntent());
+        adapter.setActionModeCallback(contextualActionModeCallback);
    }

    private void requestRequiredPermissions() {
@@ -293,7 +229,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co

        // Update UI
        this.invalidateOptionsMenu();
-        LoaderManager.getInstance(this).restartLoader(0, null, loaderCallbacks);
+        loadData();

        // Float button
        setFloatButton();
@@ -312,6 +248,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        super.onDestroy();
        viewBinding = null;
        trackRecordingServiceConnection = null;
+        adapter = null;
    }

    @Override
@@ -333,10 +270,6 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    @Override
    public boolean onPrepareOptionsMenu(Menu menu) {
        updateGpsMenuItem(gpsStatusValue.isGpsStarted(), recordingStatus.isRecording());
-
-        SearchView searchView = (SearchView) searchMenuItem.getActionView();
-        searchView.setQuery("", false);
-
        return super.onPrepareOptionsMenu(menu);
    }

@@ -375,11 +308,6 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        return super.onKeyUp(keyCode, event);
    }

-    @Override
-    public void overridePendingTransition(int enterAnim, int exitAnim) {
-        //Disable animations as it is weird going into searchMode; looks okay for SplashScreen.
-    }
-
    @Override
    public void onBackPressed() {
        SearchView searchView = (SearchView) searchMenuItem.getActionView();
@@ -387,8 +315,9 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
            searchView.setIconified(true);
        }

-        if (loaderCallbacks.getSearchQuery() != null) {
-            loaderCallbacks.setSearch(null);
+        if (searchQuery != null) {
+            searchQuery = null;
+            loadData();
            return;
        }

@@ -396,19 +325,30 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    }

    @Override
-    public void onNewIntent(Intent intent) {
+    protected void onNewIntent(Intent intent) {
        super.onNewIntent(intent);
-        setIntent(intent);
-        loadData(intent);
-    }

-    private void loadData(Intent intent) {
-        String searchQuery = null;
        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
            searchQuery = intent.getStringExtra(SearchManager.QUERY);
+        } else {
+            searchQuery = null;
        }
+    }

-        loaderCallbacks.setSearch(searchQuery);
+    private void loadData() {
+        viewBinding.trackListToolbar.setTitle(Objects.requireNonNullElseGet(searchQuery, () -> getString(R.string.app_name)));
+
+        Cursor tracks = new ContentProviderUtils(this).searchTracks(searchQuery);
+
+        adapter.swapData(tracks);
+
+        if (tracks.getCount() == 0) {
+            viewBinding.trackListEmptyView.setVisibility(View.VISIBLE);
+            viewBinding.trackList.setVisibility(View.GONE);
+        } else {
+            viewBinding.trackListEmptyView.setVisibility(View.GONE);
+            viewBinding.trackList.setVisibility(View.VISIBLE);
+        }
    }

    @Override
@@ -424,7 +364,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    @Nullable
    @Override
    protected Track.Id getRecordingTrackId() {
-        return recordingStatus.getTrackId();
+        return recordingStatus.trackId();
    }

    /**
@@ -490,64 +430,13 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        }

        if (itemId == R.id.list_context_menu_select_all) {
-            for (int i = 0; i < viewBinding.trackList.getCount(); i++) {
-                viewBinding.trackList.setItemChecked(i, true);
-            }
+            adapter.setAllSelected(true);
            return false;
        }

        return false;
    }

-    private class TrackLoaderCallBack implements LoaderManager.LoaderCallbacks<Cursor> {
-
-        private String searchQuery = null;
-
-        public String getSearchQuery() {
-            return searchQuery;
-        }
-
-        public void setSearch(String searchQuery) {
-            this.searchQuery = searchQuery;
-            restart();
-            viewBinding.trackListToolbar.setTitle(searchQuery == null ? getString(R.string.app_name) : searchQuery);
-        }
-
-        public void restart() {
-            LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
-        }
-
-        @NonNull
-        @Override
-        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-            final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
-                    TracksColumns.DESCRIPTION, TracksColumns.ACTIVITY_TYPE_LOCALIZED, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
-                    TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT};
-
-            final String sortOrder = TracksColumns.STARTTIME + " DESC";
-
-            if (searchQuery == null) {
-                return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, null, null, sortOrder);
-            } else {
-                final String SEARCH_QUERY = TracksColumns.NAME + " LIKE ? OR " +
-                        TracksColumns.DESCRIPTION + " LIKE ? OR " +
-                        TracksColumns.ACTIVITY_TYPE_LOCALIZED + " LIKE ?";
-                final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
-                return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, sortOrder);
-            }
-        }
-
-        @Override
-        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-            resourceCursorAdapter.swapCursor(cursor);
-        }
-
-        @Override
-        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-            resourceCursorAdapter.swapCursor(null);
-        }
-    }
-
    public void onGpsStatusChanged(GpsStatusValue newStatus) {
        gpsStatusValue = newStatus;
        updateGpsMenuItem(true, recordingStatus.isRecording());
@@ -561,5 +450,6 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
    private void onRecordingStatusChanged(RecordingStatus status) {
        recordingStatus = status;
        setFloatButton();
+        adapter.updateRecordingStatus(recordingStatus);
    }
 }
@@ -226,7 +226,7 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
    @Nullable
    @Override
    protected Track.Id getRecordingTrackId() {
-        return recordingStatus.getTrackId();
+        return recordingStatus.trackId();
    }

    @Override
@@ -188,7 +188,7 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener {

    public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) {
        if (isResumed()) {
-            ChartPoint point = new ChartPoint(trackStatistics, trackPoint, trackPoint.getSpeed(), chartByDistance, viewBinding.chartView.getUnitSystem());
+            ChartPoint point = ChartPoint.create(trackStatistics, trackPoint, trackPoint.getSpeed(), chartByDistance, viewBinding.chartView.getUnitSystem());
            pendingPoints.add(point);
        }
    }
@@ -1,7 +1,6 @@
 package de.dennisguse.opentracks.chart;

 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;

 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
@@ -9,81 +8,43 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.TrackStatistics;

-public class ChartPoint {
-    //X-axis
-    private double timeOrDistance;
+public record ChartPoint(
+        //X-axis
+        double timeOrDistance,

-    //Y-axis
-    private Double altitude;
-    private Double speed;
-    private Double pace;
-    private Double heartRate;
-    private Double cadence;
-    private Double power;
+        //Y-axis
+        Double altitude,
+        Double speed,
+        Double pace,
+        Double heartRate,
+        Double cadence,
+        Double power
+) {

-    @Deprecated
-    @VisibleForTesting
-    ChartPoint(double altitude) {
-        this.altitude = altitude;
-    }

-    public ChartPoint(@NonNull TrackStatistics trackStatistics, @NonNull TrackPoint trackPoint, Speed smoothedSpeed, boolean chartByDistance, UnitSystem unitSystem) {
-        if (chartByDistance) {
-            timeOrDistance = trackStatistics.getTotalDistance().toKM_Miles(unitSystem);
-        } else {
-            timeOrDistance = trackStatistics.getTotalTime().toMillis();
-        }
-
-        if (trackPoint.hasAltitude()) {
-            altitude = Distance.of(trackPoint.getAltitude().toM()).toM_FT(unitSystem);
-        }
-
-        if (smoothedSpeed != null) {
-            speed = smoothedSpeed.to(unitSystem);
-            pace = smoothedSpeed.toPace(unitSystem).toSeconds() / 60d;
-        }
-        if (trackPoint.hasHeartRate()) {
-            heartRate = (double) trackPoint.getHeartRate().getBPM();
-        }
-        if (trackPoint.hasCadence()) {
-            cadence = (double) trackPoint.getCadence().getRPM();
-        }
-        if (trackPoint.hasPower()) {
-            power = (double) trackPoint.getPower().getW();
-        }
-    }
-
-    public double getTimeOrDistance() {
-        return timeOrDistance;
-    }
-
-    public Double getAltitude() {
-        return altitude;
-    }
-
-    public Double getSpeed() {
-        return speed;
-    }
-
-    public Double getPace() {
-        return pace;
-    }
-
-    public Double getHeartRate() {
-        return heartRate;
-    }
-
-    public Double getCadence() {
-        return cadence;
-    }
-
-    public Double getPower() {
-        return power;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return "ChartPoint{" + "timeOrDistance=" + timeOrDistance + '}';
+    public static ChartPoint create(@NonNull TrackStatistics trackStatistics, @NonNull TrackPoint trackPoint, Speed smoothedSpeed, boolean chartByDistance, UnitSystem unitSystem) {
+        return new ChartPoint(
+                chartByDistance
+                        ? trackStatistics.getTotalDistance().toKM_Miles(unitSystem)
+                        : trackStatistics.getTotalTime().toMillis(),
+                trackPoint.hasAltitude()
+                        ? Distance.of(trackPoint.getAltitude().toM()).toM_FT(unitSystem)
+                        : null,
+                smoothedSpeed != null
+                        ? smoothedSpeed.to(unitSystem)
+                        : null,
+                smoothedSpeed != null
+                        ? smoothedSpeed.toPace(unitSystem).toSeconds() / 60d
+                        : null,
+                trackPoint.hasHeartRate()
+                        ? (double) trackPoint.getHeartRate().getBPM()
+                        : null,
+                trackPoint.hasCadence()
+                        ? (double) trackPoint.getCadence().getRPM()
+                        : null,
+                trackPoint.hasPower()
+                        ? (double) trackPoint.getPower().getW()
+                        : null
+        );
    }
 }
@@ -210,7 +210,7 @@ public class ChartView extends View {
                fontSizeMedium) {
            @Override
            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getAltitude();
+                return chartPoint.altitude();
            }

            @Override
@@ -232,7 +232,7 @@ public class ChartView extends View {
                fontSizeMedium) {
            @Override
            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getSpeed();
+                return chartPoint.speed();
            }

            @Override
@@ -255,7 +255,7 @@ public class ChartView extends View {
                fontSizeMedium) {
            @Override
            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getPace();
+                return chartPoint.pace();
            }

            @Override
@@ -278,7 +278,7 @@ public class ChartView extends View {
                fontSizeMedium) {
            @Override
            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getHeartRate();
+                return chartPoint.heartRate();
            }

            @Override
@@ -300,7 +300,7 @@ public class ChartView extends View {
                fontSizeMedium) {
            @Override
            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getCadence();
+                return chartPoint.cadence();
            }

            @Override
@@ -321,7 +321,7 @@ public class ChartView extends View {
                fontSizeMedium) {
            @Override
            protected Double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
-                return chartPoint.getPower();
+                return chartPoint.power();
            }

            @Override
@@ -425,7 +425,7 @@ public class ChartView extends View {
        synchronized (chartPoints) {
            chartPoints.addAll(dataPoints);
            for (ChartPoint dataPoint : dataPoints) {
-                xExtremityMonitor.update(dataPoint.getTimeOrDistance());
+                xExtremityMonitor.update(dataPoint.timeOrDistance());
                for (ChartValueSeries i : seriesList) {
                    i.update(dataPoint);
                }
@@ -887,7 +887,7 @@ public class ChartView extends View {
            }

            double value = series.extractDataFromChartPoint(point);
-            int x = getX(point.getTimeOrDistance());
+            int x = getX(point.timeOrDistance());
            int y = getY(series, value);

            // start from lower left corner
@@ -216,7 +216,7 @@ public class ContentProviderUtils {
    public List<Track> getTracks(ContentProviderSelectionInterface selection) {
        SelectionData selectionData = selection.buildSelection();
        ArrayList<Track> tracks = new ArrayList<>();
-        try (Cursor cursor = getTrackCursor(selectionData.getSelection(), selectionData.getSelectionArgs(), TracksColumns._ID)) {
+        try (Cursor cursor = getTrackCursor(selectionData.selection(), selectionData.selectionArgs(), TracksColumns._ID)) {
            if (cursor != null && cursor.moveToFirst()) {
                tracks.ensureCapacity(cursor.getCount());
                do {
@@ -228,6 +228,31 @@ public class ContentProviderUtils {
        return tracks;
    }

+    public Cursor searchTracks(String searchQuery) {
+        // Needed, because MARKER_COUNT is a virtual column and has to be explicitly requested.
+        final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.UUID, TracksColumns.NAME,
+                TracksColumns.DESCRIPTION, TracksColumns.ACTIVITY_TYPE_LOCALIZED, TracksColumns.STARTTIME,
+                TracksColumns.STARTTIME_OFFSET, TracksColumns.STOPTIME, TracksColumns.MARKER_COUNT,
+                TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.MOVINGTIME,
+                TracksColumns.AVGSPEED, TracksColumns.AVGMOVINGSPEED, TracksColumns.MAXSPEED,
+                TracksColumns.MIN_ALTITUDE, TracksColumns.MAX_ALTITUDE, TracksColumns.ALTITUDE_GAIN,
+                TracksColumns.ALTITUDE_LOSS, TracksColumns.ICON
+        };
+
+        String selection = null;
+        String[] selectionArgs = null;
+        final String sortOrder = TracksColumns.STARTTIME + " DESC";
+
+        if (searchQuery != null) {
+            selection = TracksColumns.NAME + " LIKE ? OR " +
+                    TracksColumns.DESCRIPTION + " LIKE ? OR " +
+                    TracksColumns.ACTIVITY_TYPE_LOCALIZED + " LIKE ?";
+            selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
+        }
+
+        return contentResolver.query(TracksColumns.CONTENT_URI, PROJECTION, selection, selectionArgs, sortOrder);
+    }
+
    public Track getTrack(@NonNull Track.Id trackId) {
        try (Cursor cursor = getTrackCursor(TracksColumns._ID + "=?", new String[]{Long.toString(trackId.id())}, null)) {
            if (cursor != null && cursor.moveToNext()) {
@@ -548,6 +573,35 @@ public class ContentProviderUtils {
        return contentResolver.query(MarkerColumns.CONTENT_URI, projection, selection, selectionArgs, sortOrder);
    }

+    public List<Marker> searchMarkers(Track.Id trackId, String query) {
+        String selection = null;
+        String[] selectionArgs = null;
+        String sortOrder = null;
+
+        if (query == null) {
+            if (trackId != null) {
+                selection = MarkerColumns.TRACKID + " = ?";
+                selectionArgs = new String[]{Long.toString(trackId.id())};
+            }
+        } else {
+            selection = MarkerColumns.NAME + " LIKE ? OR " +
+                    MarkerColumns.DESCRIPTION + " LIKE ? OR " +
+                    MarkerColumns.CATEGORY + " LIKE ?";
+            selectionArgs = new String[]{"%" + query + "%", "%" + query + "%", "%" + query + "%"};
+            sortOrder = MarkerColumns.DEFAULT_SORT_ORDER + " DESC";
+        }
+
+        ArrayList<Marker> markers = new ArrayList<>();
+        try (Cursor cursor = getMarkerCursor(null, selection, selectionArgs, sortOrder, -1)) {
+            if (cursor.moveToFirst()) {
+                do {
+                    markers.add(createMarker(cursor));
+                } while (cursor.moveToNext());
+            }
+        }
+        return markers;
+    }
+
    /**
     * Fills a {@link TrackPoint} from a cursor.
     *
@@ -840,12 +894,14 @@ public class ContentProviderUtils {
                final int AVG_HR_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_HR);
                final int MAX_CADENCE_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_MAX_CADENCE);
                final int AVG_CADENCE_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_CADENCE);
+                final int MAX_POWER_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_MAX_POWER);
                final int AVG_POWER_INDEX = cursor.getColumnIndexOrThrow(TrackPointsColumns.ALIAS_AVG_POWER);
                sensorStatistics = new SensorStatistics(
                        !cursor.isNull(MAX_HR_INDEX) ? HeartRate.of(cursor.getFloat(MAX_HR_INDEX)) : null,
                        !cursor.isNull(AVG_HR_INDEX) ? HeartRate.of(cursor.getFloat(AVG_HR_INDEX)) : null,
                        !cursor.isNull(MAX_CADENCE_INDEX) ? Cadence.of(cursor.getFloat(MAX_CADENCE_INDEX)) : null,
                        !cursor.isNull(AVG_CADENCE_INDEX) ? Cadence.of(cursor.getFloat(AVG_CADENCE_INDEX)) : null,
+                        !cursor.isNull(MAX_POWER_INDEX) ? Power.of(cursor.getFloat(MAX_POWER_INDEX)) : null,
                        !cursor.isNull(AVG_POWER_INDEX) ? Power.of(cursor.getFloat(AVG_POWER_INDEX)) : null
                );
            }
@@ -62,7 +62,7 @@ public class CustomContentProvider extends ContentProvider {

    /**
     * The string representing the query that compute sensor stats from trackpoints table.
-     * It computes the average for heart rate, cadence, and power (duration-based average) and the maximum for heart rate and cadence.
+     * It computes the average for heart rate, cadence and power (duration-based average) and the maximum for heart rate, cadence and power.
     * Finally, it ignores manual pause (SEGMENT_START_MANUAL).
     */
    private final String SENSOR_STATS_QUERY =
@@ -86,7 +86,9 @@ public class CustomContentProvider extends ContentProvider {

                "SUM(t." + TrackPointsColumns.SENSOR_POWER + " * (COALESCE(MAX(t." + TrackPointsColumns.TIME + ", (SELECT time_value FROM time_select)), t." + TrackPointsColumns.TIME + ") - t." + TrackPointsColumns.TIME + ")) " +
                "/ " +
-                "SUM(COALESCE(MAX(t." + TrackPointsColumns.TIME + ", (SELECT time_value FROM time_select)), t." + TrackPointsColumns.TIME + ") - t." + TrackPointsColumns.TIME + ") " + TrackPointsColumns.ALIAS_AVG_POWER + " " +
+                "SUM(COALESCE(MAX(t." + TrackPointsColumns.TIME + ", (SELECT time_value FROM time_select)), t." + TrackPointsColumns.TIME + ") - t." + TrackPointsColumns.TIME + ") " + TrackPointsColumns.ALIAS_AVG_POWER + ", " +
+
+                "MAX(t." + TrackPointsColumns.SENSOR_POWER + ") " + TrackPointsColumns.ALIAS_MAX_POWER + " " +

            "FROM " + TrackPointsColumns.TABLE_NAME + " t " +
            "WHERE t." + TrackPointsColumns.TRACKID + " = ? " +
@@ -1,24 +1,11 @@
 package de.dennisguse.opentracks.data;

-public class SelectionData {
-    private final String selection;
-    private final String[] selectionArgs;
+public record SelectionData(
+        String selection,
+        String[] selectionArgs
+) {

    public SelectionData() {
-        selection = null;
-        selectionArgs = null;
-    }
-
-    public SelectionData(String selection, String[] selectionArgs) {
-        this.selection = selection;
-        this.selectionArgs = selectionArgs;
-    }
-
-    public String getSelection() {
-        return selection;
-    }
-
-    public String[] getSelectionArgs() {
-        return selectionArgs;
+        this(null, null);
    }
 }
@@ -201,7 +201,7 @@ public class TrackDataHub {
     * Returns true if the selected track is recording.
     */
    public boolean isSelectedTrackRecording() {
-        return selectedTrackId != null && selectedTrackId.equals(recordingStatus.getTrackId());
+        return selectedTrackId != null && selectedTrackId.equals(recordingStatus.trackId());
    }

    /**
@@ -17,6 +17,7 @@ public enum ActivityIcon {
    UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp),
    WALK("WALK", R.drawable.ic_activity_walk_24dp),
    ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp),
+    KICKSCOOTER("KICKSCOOTER", R.drawable.ic_activity_scooter_24dp),
    INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp),
    SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp),
    CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp),
@@ -58,6 +58,7 @@ public enum ActivityType {
    ROWING("rowing", R.string.activity_type_rowing, ActivityIcon.UNKNOWN, true),
    RUNNING("running", R.string.activity_type_running, ActivityIcon.RUN, false),
    SAILING("sailing", R.string.activity_type_sailing, ActivityIcon.SAILING, true),
+    KICKSCOOTER("kickscooter", R.string.activity_type_kickscooter, ActivityIcon.KICKSCOOTER, true),
    SEAPLANE("seaplane", R.string.activity_type_seaplane, ActivityIcon.AIRPLANE, true),
    SKATE_BOARDING("skate boarding", R.string.activity_type_skate_boarding, ActivityIcon.SKATE_BOARDING, true),
    SKATING("skating", R.string.activity_type_skating, ActivityIcon.UNKNOWN, true),
@@ -2,7 +2,6 @@ package de.dennisguse.opentracks.data.models;

 import java.time.Duration;

-import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.UnitSystem;

 public record Speed(double speed_mps) {
@@ -56,10 +55,6 @@ public record Speed(double speed_mps) {
        return Double.isNaN(speed_mps) || Double.isInfinite(speed_mps);
    }

-    public boolean isMoving() {
-        return !isInvalid() && greaterThan(PreferencesUtils.getIdleSpeed());
-    }
-
    public boolean lessThan(Speed speed) {
        return !greaterThan(speed);
    }
@@ -66,6 +66,7 @@ public class TrackPoint {

        public final int type_db;

+
        Type(int type_db) {
            this.type_db = type_db;
        }
@@ -287,11 +288,6 @@ public class TrackPoint {
        this.speed = speed;
        return this;
    }
-
-    public boolean isMoving() {
-        return hasSpeed() && getSpeed().isMoving();
-    }
-
    public boolean hasBearing() {
        return bearing != null;
    }
@@ -352,9 +348,8 @@ public class TrackPoint {
        return hasHorizontalAccuracy() && horizontalAccuracy.lessThan(thresholdHorizontalAccuracy);
    }

-    //TODO Bearing requires a location; what do we do if we don't have any?
    public float bearingTo(@NonNull TrackPoint dest) {
-        return getLocation().bearingTo(dest.getLocation());
+        return bearingTo(dest.getLocation());
    }

    //TODO Bearing requires a location; what do we do if we don't have any?
@@ -449,13 +444,14 @@ public class TrackPoint {
                ", latitude=" + latitude +
                ", longitude=" + longitude +
                ", horizontalAccuracy=" + horizontalAccuracy +
+                ", verticalAccuracy=" + verticalAccuracy +
                ", altitude=" + altitude +
                ", speed=" + speed +
                ", bearing=" + bearing +
                ", sensorDistance=" + sensorDistance +
                ", type=" + type +
-                ", heartRate_bpm=" + heartRate +
-                ", cadence_rpm=" + cadence +
+                ", heartRate=" + heartRate +
+                ", cadence=" + cadence +
                ", power=" + power +
                ", altitudeGain_m=" + altitudeGain_m +
                ", altitudeLoss_m=" + altitudeLoss_m +
@@ -62,6 +62,7 @@ public interface TrackPointsColumns extends BaseColumns {
    String ALIAS_AVG_CADENCE = "avg_cadence";
    String ALIAS_MAX_CADENCE = "max_cadence";
    String ALIAS_AVG_POWER = "avg_power";
+    String ALIAS_MAX_POWER = "max_power";

    String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
            + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
@@ -47,6 +47,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements
            ActivityType.SNOW_BOARDING,
            ActivityType.SKIING,
            ActivityType.WALKING,
+            ActivityType.KICKSCOOTER,
            ActivityType.ESCOOTER,
            ActivityType.INLINE_SKATING,
            ActivityType.SKATE_BOARDING,
@@ -254,26 +254,28 @@ public class StatisticsRecordedFragment extends Fragment {
        }

        if (sensorStatistics.hasHeartRate()) {
-            String maxBPM = String.valueOf(Math.round(sensorStatistics.getMaxHeartRate().getBPM()));
-            String avgBPM = String.valueOf(Math.round(sensorStatistics.getAvgHeartRate().getBPM()));
+            String maxBPM = String.valueOf(Math.round(sensorStatistics.maxHeartRate().getBPM()));
+            String avgBPM = String.valueOf(Math.round(sensorStatistics.avgHeartRate().getBPM()));

            viewBinding.statsHeartRateGroup.setVisibility(View.VISIBLE);
            viewBinding.statsMaxHeartRateValue.setText(maxBPM);
            viewBinding.statsAvgHeartRateValue.setText(avgBPM);
        }
        if (sensorStatistics.hasCadence()) {
-            String maxRPM = String.valueOf(Math.round(sensorStatistics.getMaxCadence().getRPM()));
-            String avgRPM = String.valueOf(Math.round(sensorStatistics.getAvgCadence().getRPM()));
+            String maxRPM = String.valueOf(Math.round(sensorStatistics.maxCadence().getRPM()));
+            String avgRPM = String.valueOf(Math.round(sensorStatistics.avgCadence().getRPM()));

            viewBinding.statsCadenceGroup.setVisibility(View.VISIBLE);
            viewBinding.statsMaxCadenceValue.setText(maxRPM);
            viewBinding.statsAvgCadenceValue.setText(avgRPM);
        }
        if (sensorStatistics.hasPower()) {
-            String W = String.valueOf(Math.round(sensorStatistics.getAvgPower().getW()));
+            String maxW = String.valueOf(Math.round(sensorStatistics.maxPower().getW()));
+            String avgW = String.valueOf(Math.round(sensorStatistics.avgPower().getW()));

            viewBinding.statsPowerGroup.setVisibility(View.VISIBLE);
-            viewBinding.statsPowerValue.setText(W);
+            viewBinding.statsMaxPowerValue.setText(maxW);
+            viewBinding.statsAvgPowerValue.setText(avgW);
        }
    }
 }
@@ -93,7 +93,7 @@ public class TrackFilenameGenerator {
    public String getExample() {
        Track track = new Track();
        track.setName("Berlin");
-        track.setUuid(UUID.fromString("fefefefefe-0000-1000-8000-00805f9b34fb"));
+        track.setUuid(UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6"));
        track.getTrackStatistics().setStartTime(Instant.ofEpochMilli(0));

        return format(track, TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES);
@@ -171,6 +171,9 @@ public class GPXTrackExporter implements TrackExporter {
                            sensorPoints.add(trackPoint);
                        }
                    }
+                    case IDLE -> {
+                        // Not supported as IDLE-TrackPoints have no location.
+                    }
                    default ->
                            throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
                }
@@ -61,6 +61,7 @@ public class KMLTrackExporter implements TrackExporter {

    public static final String EXTENDED_DATA_TYPE_ACTIVITYTYPE = "type";

+    public static final String EXTENDED_DATA_TYPE_TRACKPOINT = "trackpoint_type";
    public static final String EXTENDED_DATA_TYPE_SPEED = "speed";
    public static final String EXTENDED_DATA_TYPE_DISTANCE = "distance";
    public static final String EXTENDED_DATA_TYPE_CADENCE = "cadence";
@@ -83,6 +84,9 @@ public class KMLTrackExporter implements TrackExporter {
    private final ContentProviderUtils contentProviderUtils;

    private PrintWriter printWriter;
+
+    private final ArrayList<TrackPoint.Type> trackpointTypeList = new ArrayList<>();
+
    private final List<Float> speedList = new ArrayList<>();
    private final List<Float> distanceList = new ArrayList<>();
    private final List<Float> powerList = new ArrayList<>();
@@ -177,12 +181,13 @@ public class KMLTrackExporter implements TrackExporter {
                        writeCloseSegment();
                        wroteSegment = false;
                    }
-                    case TRACKPOINT -> {
+                    case TRACKPOINT, IDLE -> {
                        if (!wroteSegment) {
                            // Might happen for older data (pre v3.15.0)
                            writeOpenSegment();
                            wroteSegment = true;
                        }
+
                        writeTrackPoint(track.getZoneOffset(), trackPoint);
                    }
                    default ->
@@ -309,6 +314,7 @@ public class KMLTrackExporter implements TrackExporter {
    @VisibleForTesting
    void writeOpenSegment() {
        printWriter.println("<Track>");
+        trackpointTypeList.clear();
        speedList.clear();
        distanceList.clear();
        powerList.clear();
@@ -324,32 +330,35 @@ public class KMLTrackExporter implements TrackExporter {
    void writeCloseSegment() {
        printWriter.println("<ExtendedData>");
        printWriter.println("<SchemaData schemaUrl=\"#" + SCHEMA_ID + "\">");
+
+        writeTrackPointType(trackpointTypeList);
+
        if (speedList.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(speedList, EXTENDED_DATA_TYPE_SPEED);
+            writeSimpleArraySensorData(speedList, EXTENDED_DATA_TYPE_SPEED);
        }
        if (distanceList.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(distanceList, EXTENDED_DATA_TYPE_DISTANCE);
+            writeSimpleArraySensorData(distanceList, EXTENDED_DATA_TYPE_DISTANCE);
        }
        if (powerList.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(powerList, EXTENDED_DATA_TYPE_POWER);
+            writeSimpleArraySensorData(powerList, EXTENDED_DATA_TYPE_POWER);
        }
        if (cadenceList.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(cadenceList, EXTENDED_DATA_TYPE_CADENCE);
+            writeSimpleArraySensorData(cadenceList, EXTENDED_DATA_TYPE_CADENCE);
        }
        if (heartRateList.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(heartRateList, EXTENDED_DATA_TYPE_HEART_RATE);
+            writeSimpleArraySensorData(heartRateList, EXTENDED_DATA_TYPE_HEART_RATE);
        }
        if (altitudeGainList.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(altitudeGainList, EXTENDED_DATA_TYPE_ALTITUDE_GAIN);
+            writeSimpleArraySensorData(altitudeGainList, EXTENDED_DATA_TYPE_ALTITUDE_GAIN);
        }
        if (altitudeLossList.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(altitudeLossList, EXTENDED_DATA_TYPE_ALTITUDE_LOSS);
+            writeSimpleArraySensorData(altitudeLossList, EXTENDED_DATA_TYPE_ALTITUDE_LOSS);
        }
        if (accuracyHorizontal.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(accuracyHorizontal, EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL);
+            writeSimpleArraySensorData(accuracyHorizontal, EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL);
        }
        if (accuracyVertical.stream().anyMatch(Objects::nonNull)) {
-            writeSimpleArrayData(accuracyVertical, EXTENDED_DATA_TYPE_ACCURACY_VERTICAL);
+            writeSimpleArraySensorData(accuracyVertical, EXTENDED_DATA_TYPE_ACCURACY_VERTICAL);
        }
        printWriter.println("</SchemaData>");
        printWriter.println("</ExtendedData>");
@@ -360,6 +369,8 @@ public class KMLTrackExporter implements TrackExporter {
    void writeTrackPoint(ZoneOffset zoneOffset, TrackPoint trackPoint) {
        printWriter.println("<when>" + getTime(zoneOffset, trackPoint.getLocation()) + "</when>");

+        trackpointTypeList.add(trackPoint.getType());
+
        if (trackPoint.hasLocation()) {
            printWriter.println("<coord>" + getCoordinates(trackPoint.getLocation(), " ") + "</coord>");
        } else {
@@ -378,13 +389,7 @@ public class KMLTrackExporter implements TrackExporter {
        accuracyVertical.add(trackPoint.hasVerticalAccuracy() ? (float) trackPoint.getVerticalAccuracy().toM() : null);
    }

-    /**
-     * Writes the simple array data.
-     *
-     * @param list a list of simple array data
-     * @param name the name of the simple array data
-     */
-    private void writeSimpleArrayData(List<Float> list, String name) {
+    private void writeSimpleArraySensorData(List<Float> list, String name) {
        printWriter.println("<SimpleArrayData name=\"" + name + "\">");
        for (int i = 0; i < list.size(); i++) {
            Float value = list.get(i);
@@ -397,14 +402,14 @@ public class KMLTrackExporter implements TrackExporter {
        printWriter.println("</SimpleArrayData>");
    }

-    /**
-     * Writes a placemark.
-     *
-     * @param name         the name
-     * @param activityType the activityType
-     * @param description  the description
-     * @param location     the location
-     */
+    private void writeTrackPointType(List<TrackPoint.Type> list) {
+        printWriter.println("<SimpleArrayData name=\"" + EXTENDED_DATA_TYPE_TRACKPOINT + "\">");
+        for (TrackPoint.Type value : list) {
+            printWriter.println("<value>" + value.name() + "</value>");
+        }
+        printWriter.println("</SimpleArrayData>");
+    }
+
    private void writePlacemark(String name, String activityType, String description, Location location, ZoneOffset zoneOffset) {
        if (location != null) {
            printWriter.println("<Placemark>");
@@ -489,7 +494,7 @@ public class KMLTrackExporter implements TrackExporter {
    }

    private void writeActivityType(String activityTypeLocalized) {
-        if (activityTypeLocalized == null || activityTypeLocalized.equals("")) {
+        if (activityTypeLocalized == null || "".equals(activityTypeLocalized)) {
            return;
        }
        printWriter.println("<ExtendedData>");
@@ -94,7 +94,9 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
    private final ArrayList<Instant> whenList = new ArrayList<>();
    private final ArrayList<Location> locationList = new ArrayList<>();

-    private String dataType;
+    private String dataType; //Could be converted to an ENUM
+
+    private final ArrayList<String> trackpointTypeList = new ArrayList<>();
    private final ArrayList<Float> sensorSpeedList = new ArrayList<>();
    private final ArrayList<Float> sensorDistanceList = new ArrayList<>();
    private final ArrayList<Float> sensorCadenceList = new ArrayList<>();
@@ -287,6 +289,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
        locationList.clear();
        whenList.clear();

+        trackpointTypeList.clear();
        sensorSpeedList.clear();
        sensorDistanceList.clear();
        sensorHeartRateList.clear();
@@ -313,6 +316,12 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                trackPoint.setLocation(location);
            }

+            if (i < trackpointTypeList.size() && trackpointTypeList.get(i) != null) {
+
+                TrackPoint.Type type = TrackPoint.Type.valueOf(trackpointTypeList.get(i));
+                trackPoint.setType(type);
+            }
+
            if (i < sensorSpeedList.size() && sensorSpeedList.get(i) != null) {
                trackPoint.setSpeed(Speed.of(sensorSpeedList.get(i)));
            }
@@ -399,10 +408,14 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
    }

    private void onExtendedDataValueEnd() throws SAXException {
+        if (dataType.equals(KMLTrackExporter.EXTENDED_DATA_TYPE_TRACKPOINT)) {
+            trackpointTypeList.add(content != null ? content.trim() : null);
+            return;
+        }
        Float value = null;
        if (content != null) {
            content = content.trim();
-            if (!content.equals("")) {
+            if (!"".equals(content)) {
                try {
                    value = Float.parseFloat(content);
                } catch (NumberFormatException e) {
@@ -28,7 +28,6 @@ import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -49,7 +48,7 @@ public class KmzTrackImporter {

    private static final String TAG = KmzTrackImporter.class.getSimpleName();

-    private static final List<String> KMZ_IMAGES_EXT = Arrays.asList("jpeg", "jpg", "png");
+    private static final List<String> KMZ_IMAGES_EXT = List.of("jpeg", "jpg", "png");

    private final Context context;
    private final TrackImporter trackImporter;
@@ -231,7 +230,7 @@ public class KmzTrackImporter {
     */
    @Deprecated //TODO Use JDK9's inputStream.transferTo() instead of manual buffer
    private void readAndSaveImageFile(ZipInputStream zipInputStream, Track.Id trackId, String fileName) throws IOException {
-        if (trackId == null || fileName.equals("")) {
+        if (trackId == null || "".equals(fileName)) {
            return;
        }

@@ -1,13 +1,14 @@
 package de.dennisguse.opentracks.services;

 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import de.dennisguse.opentracks.data.models.Track;

-public record RecordingStatus(Track.Id trackId) {
+public record RecordingStatus(@Nullable Track.Id trackId) {

-    public Track.Id getTrackId() {
-        return trackId;
+    static RecordingStatus record(@NonNull Track.Id trackId) {
+        return new RecordingStatus(trackId);
    }

    public boolean isRecording() {
@@ -18,10 +19,6 @@ public record RecordingStatus(Track.Id trackId) {
        return new RecordingStatus(null);
    }

-    static RecordingStatus record(@NonNull Track.Id trackId) {
-        return new RecordingStatus(trackId);
-    }
-
    public RecordingStatus stop() {
        return TrackRecordingService.STATUS_DEFAULT;
    }
@@ -5,10 +5,12 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
+import android.os.Handler;
 import android.util.Log;
 import android.util.Pair;

 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;

 import java.time.Duration;
 import java.time.ZoneOffset;
@@ -28,19 +30,25 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.util.TrackNameUtils;

-class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChangeListener {

    private static final String TAG = TrackRecordingManager.class.getSimpleName();

    private static final AltitudeCorrectionManager ALTITUDE_CORRECTION_MANAGER = new AltitudeCorrectionManager();

+    private final Runnable ON_IDLE = this::onIdle;
+
    private final ContentProviderUtils contentProviderUtils;
    private final Context context;
+    private final IdleObserver idleObserver;
+
+    private final Handler handler;

    private final TrackPointCreator trackPointCreator;

    private Distance recordingDistanceInterval;
    private Distance maxRecordingDistance;
+    private Duration idleDuration;

    private Track.Id trackId;
    private TrackStatisticsUpdater trackStatisticsUpdater;
@@ -52,15 +60,17 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
    private TrackPoint lastStoredTrackPoint;
    private TrackPoint lastStoredTrackPointWithLocation;

-    TrackRecordingManager(Context context, TrackPointCreator trackPointCreator) {
+    TrackRecordingManager(Context context, TrackPointCreator trackPointCreator, IdleObserver idleObserver, Handler handler) {
        this.context = context;
+        this.idleObserver = idleObserver;
        this.trackPointCreator = trackPointCreator;
+        this.handler = handler;
        contentProviderUtils = new ContentProviderUtils(context);
    }

    Track.Id startNewTrack() {
        TrackPoint segmentStartTrackPoint = trackPointCreator.createSegmentStartManual();
-        // Create new track
+
        ZoneOffset zoneOffset = ZoneOffset.systemDefault().getRules().getOffset(segmentStartTrackPoint.getTime());
        Track track = new Track(zoneOffset);
        trackId = contentProviderUtils.insertTrack(track);
@@ -74,7 +84,6 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        track.setActivityTypeLocalized(activityTypeLocalized);
        track.setActivityType(ActivityType.findByLocalizedString(context, activityTypeLocalized));
        track.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
-        //TODO Pass TrackPoint
        track.setName(TrackNameUtils.getTrackName(context, trackId, track.getStartTime()));
        contentProviderUtils.updateTrack(track);

@@ -100,7 +109,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        return true;
    }

-    void end() {
+    void endCurrentTrack() {
        TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
        insertTrackPoint(segmentEnd, true);

@@ -154,16 +163,30 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        return new Marker.Id(ContentUris.parseId(uri));
    }

+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+    public void onIdle() {
+        Log.d(TAG, "Becoming idle");
+        onNewTrackPoint(trackPointCreator.createIdle());
+
+        idleObserver.onIdle();
+    }
+
    /**
     * @return TrackPoint was stored?
     */
-    boolean onNewTrackPoint(@NonNull TrackPoint trackPoint) {
+    synchronized boolean onNewTrackPoint(@NonNull TrackPoint trackPoint) {
        if (trackPoint.hasSpeed()) {
            lastTrackPointUIWithSpeed = trackPoint;
        }
        if (trackPoint.hasAltitude()) {
            lastTrackPointUIWithAltitude = trackPoint;
        }
+
+        if (trackPoint.getType() == TrackPoint.Type.IDLE) {
+            insertTrackPoint(trackPoint, true);
+            handler.removeCallbacks(ON_IDLE);
+            return true;
+        }
        //Storing trackPoint

        // Always insert the first segment location
@@ -184,10 +207,10 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
            if (!shouldStore) {
                Log.d(TAG, "Ignoring TrackPoint as it has no distance (and sensor data is not new enough).");
                return false;
-            } else {
-                insertTrackPoint(trackPoint, true);
-                return true;
            }
+
+            insertTrackPoint(trackPoint, true);
+            return true;
        }

        Distance distanceToLastStoredTrackPoint;
@@ -200,18 +223,17 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        if (distanceToLastStoredTrackPoint.greaterThan(maxRecordingDistance)) {
            trackPoint.setType(TrackPoint.Type.SEGMENT_START_AUTOMATIC);
            insertTrackPoint(trackPoint, true);
+
+            handler.removeCallbacks(ON_IDLE);
+            handler.postDelayed(ON_IDLE, idleDuration.toMillis());
            return true;
        }

-        if (distanceToLastStoredTrackPoint.greaterOrEqualThan(recordingDistanceInterval)
-                && trackPoint.isMoving()) {
+        if (distanceToLastStoredTrackPoint.greaterOrEqualThan(recordingDistanceInterval)) {
            insertTrackPoint(trackPoint, false);
-            return true;
-        }

-        if (trackPoint.isMoving() != lastStoredTrackPoint.isMoving()) {
-            // Moving from non-moving to moving or vice versa; required to compute moving time correctly.
-            insertTrackPoint(trackPoint, true);
+            handler.removeCallbacks(ON_IDLE);
+            handler.postDelayed(ON_IDLE, idleDuration.toMillis());
            return true;
        }

@@ -252,6 +274,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
                lastStoredTrackPointWithLocation = lastStoredTrackPoint;
            }
        } catch (SQLiteException e) {
+            // TODO Remove; if this is a problem; use a synchronized method.
            /*
             * Insert failed, most likely because of SqlLite error code 5 (SQLite_BUSY).
             * This is expected to happen extremely rarely (if our listener gets invoked twice at about the same time).
@@ -277,5 +300,12 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
        if (PreferencesUtils.isKey(R.string.max_recording_distance_key, key)) {
            maxRecordingDistance = PreferencesUtils.getMaxRecordingDistance();
        }
+        if (PreferencesUtils.isKey(R.string.idle_duration_key, key)) {
+            idleDuration = PreferencesUtils.getIdleDurationTimeout();
+        }
+    }
+
+    public interface IdleObserver {
+        void onIdle();
    }
 }
@@ -47,7 +47,7 @@ import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.SystemUtils;

-public class TrackRecordingService extends Service implements TrackPointCreator.Callback, SharedPreferences.OnSharedPreferenceChangeListener {
+public class TrackRecordingService extends Service implements TrackPointCreator.Callback, SharedPreferences.OnSharedPreferenceChangeListener, TrackRecordingManager.IdleObserver {

    private static final String TAG = TrackRecordingService.class.getSimpleName();

@@ -107,8 +107,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        gpsStatusObservable = new MutableLiveData<>(STATUS_GPS_DEFAULT);
        recordingDataObservable = new MutableLiveData<>(NOT_RECORDING);

-        trackPointCreator = new TrackPointCreator(this, this, handler);
-        trackRecordingManager = new TrackRecordingManager(this, trackPointCreator);
+        trackPointCreator = new TrackPointCreator(this);
+        trackRecordingManager = new TrackRecordingManager(this, trackPointCreator, this , handler);

        voiceAnnouncementManager = new VoiceAnnouncementManager(this);
        notificationManager = new TrackRecordingServiceNotificationManager(this);
@@ -214,7 +214,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        // Set recording status
        updateRecordingStatus(STATUS_DEFAULT);

-        trackRecordingManager.end();
+        trackRecordingManager.endCurrentTrack();

        stopUpdateRecordingData();

@@ -249,7 +249,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        if (notificationManager == null) {

            StringWriter writer = new StringWriter();
-            Exception e = new RuntimeException("TrackRecording.newGpsStatus() called after onDestroy(); objectID: " + this + " with thread: " + Thread.currentThread().toString());
+            Exception e = new RuntimeException("TrackRecording.newGpsStatus() called after onDestroy(); objectID: " + this + " with thread: " + Thread.currentThread());
            e.printStackTrace(new PrintWriter(writer));

            Log.e(TAG, e.getMessage() + " " + writer);
@@ -296,11 +296,15 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        // Compute temporary track statistics using sensorData and update time.
        Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.getDataForUI();

-        voiceAnnouncementManager.update(this, data.first);
+        voiceAnnouncementManager.announceStatisticsIfNeeded(data.first);

        recordingDataObservable.postValue(new RecordingData(data.first, data.second.first, data.second.second));
    }

+    public void onIdle() {
+        voiceAnnouncementManager.announceIdle();
+    }
+
    @VisibleForTesting
    public void stopUpdateRecordingData() {
        handler.removeCallbacks(updateRecordingData);
@@ -27,42 +27,23 @@ import android.util.Log;

 import androidx.annotation.NonNull;

-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.data.ContentProviderUtils;
-import de.dennisguse.opentracks.data.TrackPointIterator;
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.stats.SensorStatistics;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.ui.intervals.IntervalStatistics;

-/**
- * This class will announce the user's {@link TrackStatistics}.
- *
- * @author Sandor Dornbush
- */
-public class VoiceAnnouncement {
+
+public class TTSManager {

    public final static int AUDIO_STREAM = TextToSpeech.Engine.DEFAULT_STREAM;

-    private static final String TAG = VoiceAnnouncement.class.getSimpleName();
+    private static final String TAG = TTSManager.class.getSimpleName();

    private final Context context;

    private final AudioManager audioManager;

-    private final ContentProviderUtils contentProviderUtils;
-    private TrackPoint.Id startTrackPointId = null;
-
-    private IntervalStatistics intervalStatistics;
-    private Distance intervalDistance;
-
    private final AudioManager.OnAudioFocusChangeListener audioFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {
        @Override
        public void onAudioFocusChange(int focusChange) {
@@ -109,12 +90,9 @@ public class VoiceAnnouncement {

    private MediaPlayer ttsFallback;

-    VoiceAnnouncement(Context context) {
+    TTSManager(Context context) {
        this.context = context;
        audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        contentProviderUtils = new ContentProviderUtils(context);
-        intervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
-        intervalStatistics = new IntervalStatistics(intervalDistance);
    }

    public void start() {
@@ -140,7 +118,7 @@ public class VoiceAnnouncement {
        }
    }

-    public void announce(@NonNull Track track) {
+    public void announce(@NonNull Spannable announcement) {
        synchronized (this) {
            if (!ttsReady) {
                ttsReady = ttsInitStatus == TextToSpeech.SUCCESS;
@@ -150,7 +128,7 @@ public class VoiceAnnouncement {
            }
        }

-        if (Arrays.asList(AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION)
+        if (List.of(AudioManager.MODE_IN_CALL, AudioManager.MODE_IN_COMMUNICATION)
                .contains(audioManager.getMode())) {
            Log.i(TAG, "Announcement is not allowed at this time.");
            return;
@@ -167,23 +145,6 @@ public class VoiceAnnouncement {
            return;
        }

-        Distance currentIntervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
-        if (currentIntervalDistance != intervalDistance) {
-            intervalStatistics = new IntervalStatistics(currentIntervalDistance);
-            intervalDistance = currentIntervalDistance;
-            startTrackPointId = null;
-        }
-
-        TrackPointIterator trackPointIterator = new TrackPointIterator(contentProviderUtils, track.getId(), startTrackPointId);
-        startTrackPointId = intervalStatistics.addTrackPoints(trackPointIterator);
-        IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval();
-        SensorStatistics sensorStatistics = null;
-        if (track.getId() != null) {
-            sensorStatistics = contentProviderUtils.getSensorStats(track.getId());
-        }
-
-        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics);
-
        if (announcement.length() > 0) {
            // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called.
            tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, null, "not used");
@@ -17,6 +17,7 @@ package de.dennisguse.opentracks.services.announcement;

 import android.content.Context;
 import android.content.SharedPreferences;
+import android.text.Spannable;
 import android.util.Log;

 import androidx.annotation.NonNull;
@@ -27,11 +28,15 @@ import androidx.mediarouter.media.MediaRouter;
 import java.time.Duration;

 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackPointIterator;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.ui.intervals.IntervalStatistics;

 /**
 * Execute a periodic task on a time or distance schedule.
@@ -42,9 +47,9 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe

    private static final String TAG = VoiceAnnouncementManager.class.getSimpleName();

-    private final TrackRecordingService trackRecordingService;
+    private final Context context;

-    private VoiceAnnouncement voiceAnnouncement;
+    private TTSManager voiceAnnouncement;

    private TrackStatistics trackStatistics;

@@ -58,12 +63,22 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
    @NonNull
    private Duration nextTotalTime = TOTALTIME_OFF;

-    public VoiceAnnouncementManager(@NonNull TrackRecordingService trackRecordingService) {
-        this.trackRecordingService = trackRecordingService;
+
+    private final ContentProviderUtils contentProviderUtils;
+    private TrackPoint.Id startTrackPointId = null;
+
+    private IntervalStatistics intervalStatistics;
+    private Distance intervalDistance;
+
+    public VoiceAnnouncementManager(@NonNull Context context) {
+        this.context = context;
+        contentProviderUtils = new ContentProviderUtils(context);
+        intervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
+        intervalStatistics = new IntervalStatistics(intervalDistance);
    }

    public void start(@Nullable TrackStatistics trackStatistics) {
-        voiceAnnouncement = new VoiceAnnouncement(trackRecordingService);
+        voiceAnnouncement = new TTSManager(context);
        voiceAnnouncement.start();
        update(trackStatistics);
    }
@@ -74,10 +89,10 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
        updateNextTaskDistance();
    }

-    public void update(@NonNull Context context, @NonNull Track track) {
+    private boolean shouldNotAnnounce() {
        if (voiceAnnouncement == null) {
            Log.e(TAG, "Cannot update when in status shutdown.");
-            return;
+            return true;
        }

        if (!PreferencesUtils.shouldVoiceAnnouncementOnDeviceSpeaker()
@@ -85,6 +100,26 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
                .getSelectedRoute()
                .isDeviceSpeaker()) {
            Log.i(TAG, "No voice announcement on device speaker.");
+            return true;
+        }
+
+        return false;
+    }
+
+    public void announceIdle() {
+        if (shouldNotAnnounce()) {
+            return;
+        }
+
+        if (!PreferencesUtils.shouldVoiceAnnouncementIdle()) {
+            return;
+        }
+
+        voiceAnnouncement.announce(VoiceAnnouncementUtils.createIdle(context));
+    }
+
+    public void announceStatisticsIfNeeded(@NonNull Track track) {
+        if (shouldNotAnnounce()) {
            return;
        }

@@ -100,10 +135,29 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
        }

        if (announce) {
-            voiceAnnouncement.announce(track);
+            voiceAnnouncement.announce(createAnnouncement(track));
        }
    }

+    private Spannable createAnnouncement(Track track) {
+        Distance currentIntervalDistance = PreferencesUtils.getVoiceAnnouncementDistance();
+        if (currentIntervalDistance != intervalDistance) {
+            intervalStatistics = new IntervalStatistics(currentIntervalDistance);
+            intervalDistance = currentIntervalDistance;
+            startTrackPointId = null;
+        }
+
+        TrackPointIterator trackPointIterator = new TrackPointIterator(contentProviderUtils, track.getId(), startTrackPointId);
+        startTrackPointId = intervalStatistics.addTrackPoints(trackPointIterator);
+        IntervalStatistics.Interval lastInterval = intervalStatistics.getLastInterval();
+        SensorStatistics sensorStatistics = null;
+        if (track.getId() != null) {
+            sensorStatistics = contentProviderUtils.getSensorStats(track.getId());
+        }
+
+        return VoiceAnnouncementUtils.createStatistics(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics);
+    }
+
    public void stop() {
        if (voiceAnnouncement != null) {
            voiceAnnouncement.stop();
@@ -33,7 +33,12 @@ class VoiceAnnouncementUtils {
    private VoiceAnnouncementUtils() {
    }

-    static Spannable getAnnouncement(Context context, TrackStatistics trackStatistics, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) {
+    static Spannable createIdle(Context context) {
+        return new SpannableStringBuilder()
+                .append(context.getString(R.string.voiceIdle));
+    }
+
+    static Spannable createStatistics(Context context, TrackStatistics trackStatistics, UnitSystem unitSystem, boolean isReportSpeed, @Nullable IntervalStatistics.Interval currentInterval, @Nullable SensorStatistics sensorStatistics) {
        SpannableStringBuilder builder = new SpannableStringBuilder();
        Distance totalDistance = trackStatistics.getTotalDistance();
        Speed averageMovingSpeed = trackStatistics.getAverageMovingSpeed();
@@ -133,7 +138,7 @@ class VoiceAnnouncementUtils {
        }

        if (shouldVoiceAnnounceAverageHeartRate() && sensorStatistics != null && sensorStatistics.hasHeartRate()) {
-            int averageHeartRate = Math.round(sensorStatistics.getAvgHeartRate().getBPM());
+            int averageHeartRate = Math.round(sensorStatistics.avgHeartRate().getBPM());

            builder.append(" ")
                    .append(context.getString(R.string.average_heart_rate));
@@ -36,16 +36,11 @@ public class TrackPointCreator implements SharedPreferences.OnSharedPreferenceCh
    private Clock clock = new MonotonicClock();
    private SensorManager sensorManager;

-    public TrackPointCreator(Callback service, Context context, Handler handler) {
+    public TrackPointCreator(Callback service) {
        this.service = service;
        this.sensorManager = new SensorManager(this);
    }

-    @VisibleForTesting
-    TrackPointCreator(Callback service) {
-        this.service = service;
-    }
-
    public synchronized void start(@NonNull Context context, @NonNull Handler handler) {
        this.context = context;

@@ -106,6 +101,13 @@ public class TrackPointCreator implements SharedPreferences.OnSharedPreferenceCh
        return segmentEnd;
    }

+    public synchronized TrackPoint createIdle() {
+        TrackPoint idle = new TrackPoint(TrackPoint.Type.IDLE, createNow());
+        addSensorData(idle);
+        reset();
+        return idle;
+    }
+
    public Pair<TrackPoint, SensorDataSet> createCurrentTrackPoint(@Nullable TrackPoint lastTrackPointUISpeed, @Nullable TrackPoint lastTrackPointUIAltitude, @Nullable TrackPoint lastStoredTrackPointWithLocation) {
        TrackPoint currentTrackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, createNow());

@@ -17,7 +17,7 @@ public class AnnouncementsSettingsFragment extends PreferenceFragmentCompat {
    @Override
    public void onStart() {
        super.onStart();
-        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_announcements_title);
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_announcements_statistics_title);
    }

    @Override
@@ -71,8 +71,10 @@ public class DefaultsSettingsFragment extends PreferenceFragmentCompat implement

        int entriesId = switch (unitSystem) {
            case METRIC -> R.array.stats_rate_metric_options;
-            case IMPERIAL_FEET, IMPERIAL_METER, NAUTICAL_IMPERIAL ->
+            case IMPERIAL_FEET, IMPERIAL_METER ->
                    R.array.stats_rate_imperial_options;
+            case NAUTICAL_IMPERIAL ->
+                R.array.stats_rate_nautical_options;
        };

        String[] entries = getResources().getStringArray(entriesId);
@@ -79,7 +79,7 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat {
        ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key));
        recordingGpsAccuracy.setEntries(PreferencesUtils.getThresholdHorizontalAccuracyEntries());

-        ListPreference idleSpeed = findPreference(getString(R.string.idle_speed_key));
-        idleSpeed.setEntries(PreferencesUtils.getIdleSpeedEntries());
+        ListPreference idleDuration = findPreference(getString(R.string.idle_duration_key));
+        idleDuration.setEntries(PreferencesUtils.getIdleDurationEntries());
    }
 }
@@ -45,7 +45,6 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.HeartRateZones;
-import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.TrackFilenameGenerator;
@@ -308,11 +307,20 @@ public class PreferencesUtils {
        return getBoolean(R.string.stats_fullscreen_while_recording_key, DEFAULT);
    }

+    public static boolean shouldUseDynamicColors() {
+        final boolean DEFAULT = resources.getBoolean(R.bool.settings_ui_dynamic_colors_default);
+        return getBoolean(R.string.settings_ui_dynamic_colors_key, DEFAULT);
+    }
+
    public static boolean shouldVoiceAnnouncementOnDeviceSpeaker() {
        final boolean DEFAULT = resources.getBoolean(R.bool.voice_on_device_speaker_default);
        return getBoolean(R.string.voice_on_device_speaker_key, DEFAULT);
    }

+    public static boolean shouldVoiceAnnouncementIdle() {
+        return getBoolean(R.string.voice_announce_idle_key, true);
+    }
+
    public static Duration getVoiceAnnouncementFrequency() {
        final int DEFAULT = Integer.parseInt(resources.getString(R.string.voice_announcement_frequency_default));
        int value = getInt(R.string.voice_announcement_frequency_key, DEFAULT);
@@ -530,11 +538,12 @@ public class PreferencesUtils {

    static String[] getMinRecordingIntervalEntries() {
        String[] entryValues = resources.getStringArray(R.array.min_recording_interval_values);
+        long recommended = PreferencesUtils.getMinRecordingIntervalDefault().getSeconds();
        String[] entries = new String[entryValues.length];
        for (int i = 0; i < entryValues.length; i++) {
            int value = Integer.parseInt(entryValues[i]);

-            if (value == PreferencesUtils.getMinRecordingIntervalDefault().getSeconds()) {
+            if (value == recommended) {
                entries[i] = resources.getString(R.string.value_smallest_recommended);
            } else {
                entries[i] = value < 60 ? resources.getString(R.string.value_integer_second, value) : resources.getString(R.string.value_integer_minute, value / 60);
@@ -598,49 +607,25 @@ public class PreferencesUtils {
        return entries;
    }

-
-    public static Speed getIdleSpeed() {
-        final float DEFAULT = Float.parseFloat(resources.getString(R.string.idle_speed_default));
-        float value = getFloat(R.string.idle_speed_key, DEFAULT);
-        return Speed.ofKMH(value);
+    public static Duration getIdleDurationTimeout() {
+        final int DEFAULT = Integer.parseInt(resources.getString(R.string.idle_duration_default));
+        int value = getInt(R.string.idle_duration_key, DEFAULT);
+        return Duration.ofSeconds(value);
    }

-    static String[] getIdleSpeedEntries() {
-        String[] entryValues = resources.getStringArray(R.array.idle_speed_values);
+    static String[] getIdleDurationEntries() {
+        String[] entryValues = resources.getStringArray(R.array.idle_duration_values);
        String[] entries = new String[entryValues.length];

-        final float idleSpeedDefault = Float.parseFloat(resources.getString(R.string.idle_speed_default));
-
-        UnitSystem unitSystem = getUnitSystem();
+        final int idleDurationDefault = Integer.parseInt(resources.getString(R.string.idle_duration_default));

        for (int i = 0; i < entryValues.length; i++) {
-            float value = Float.parseFloat(entryValues[i]);
+            int value = Integer.parseInt(entryValues[i]);

-            switch (unitSystem) {
-                case METRIC -> {
-                    if (value == idleSpeedDefault) {
-                        entries[i] = resources.getString(R.string.value_float_kilometer_hour_recommended, value);
-                    } else {
-                        entries[i] = resources.getString(R.string.value_float_kilometer_hour, value);
-                    }
-                }
-                case IMPERIAL_FEET, IMPERIAL_METER -> {
-                    double valueMPH = Speed.ofKMH(value).toMPH();
-                    if (value == idleSpeedDefault) {
-                        entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH);
-                    } else {
-                        entries[i] = resources.getString(R.string.value_float_mile_hour, valueMPH);
-                    }
-                }
-                case NAUTICAL_IMPERIAL -> {
-                    double valueKnots = Speed.ofKMH(value).toKnots();
-                    if (value == idleSpeedDefault) {
-                        entries[i] = resources.getString(R.string.value_float_knots_recommended, valueKnots);
-                    } else {
-                        entries[i] = resources.getString(R.string.value_float_knots, valueKnots);
-                    }
-                }
-                default -> throw new RuntimeException("Not implemented");
+            if (value == idleDurationDefault) {
+                entries[i] = resources.getString(R.string.value_int_seconds, value);
+            } else {
+                entries[i] = value < 60 ? resources.getString(R.string.value_integer_second, value) : resources.getString(R.string.value_integer_minute, value / 60);
            }
        }

@@ -2,6 +2,7 @@ package de.dennisguse.opentracks.settings;

 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;

 import androidx.fragment.app.DialogFragment;
@@ -34,6 +35,9 @@ public class UserInterfaceSettingsFragment extends PreferenceFragmentCompat {
            return true;
        });

+        Preference dynamicColors = findPreference(getString(R.string.settings_ui_dynamic_colors_key));
+        dynamicColors.setEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU);
+
        setShowOnMapFormatOptions();
    }

@@ -4,50 +4,24 @@ import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Power;

-public class SensorStatistics {
-    private final HeartRate maxHr;
-    private final HeartRate avgHr;
-    private final Cadence maxCadence;
-    private final Cadence avgCadence;
-    private final Power avgPower;
-
-    public SensorStatistics(HeartRate maxHr, HeartRate avgHr, Cadence maxCadence, Cadence avgCadence, Power avgPower) {
-        this.maxHr = maxHr;
-        this.avgHr = avgHr;
-        this.maxCadence = maxCadence;
-        this.avgCadence = avgCadence;
-        this.avgPower = avgPower;
-    }
+public record SensorStatistics(
+         HeartRate maxHeartRate,
+         HeartRate avgHeartRate,
+         Cadence maxCadence,
+         Cadence avgCadence,
+         Power maxPower,
+         Power avgPower
+) {

    public boolean hasHeartRate() {
-        return avgHr != null && maxHr != null;
-    }
-
-    public HeartRate getMaxHeartRate() {
-        return maxHr;
-    }
-
-    public HeartRate getAvgHeartRate() {
-        return avgHr;
+        return avgHeartRate != null && maxHeartRate != null;
    }

    public boolean hasCadence() {
        return avgCadence != null && maxCadence != null;
    }

-    public Cadence getMaxCadence() {
-        return maxCadence;
-    }
-
-    public Cadence getAvgCadence() {
-        return avgCadence;
-    }
-
    public boolean hasPower() {
        return avgPower != null;
    }
-
-    public Power getAvgPower() {
-        return avgPower;
-    }
 }
@@ -61,6 +61,8 @@ public class TrackStatistics {
    // The average heart rate seen on this track
    private HeartRate avgHeartRate = null;

+    private boolean isIdle;
+
    public TrackStatistics() {
        reset();
    }
@@ -81,6 +83,7 @@ public class TrackStatistics {
        totalAltitudeGain_m = other.totalAltitudeGain_m;
        totalAltitudeLoss_m = other.totalAltitudeLoss_m;
        avgHeartRate = other.avgHeartRate;
+        isIdle = other.isIdle;
    }

    @VisibleForTesting
@@ -168,6 +171,8 @@ public class TrackStatistics {
        setMaxSpeed(Speed.zero());
        setTotalAltitudeGain(null);
        setTotalAltitudeLoss(null);
+
+        isIdle = false;
    }

    public void reset(Instant startTime) {
@@ -248,6 +253,14 @@ public class TrackStatistics {
        return totalTime.minus(movingTime);
    }

+    public boolean isIdle() {
+        return isIdle;
+    }
+
+    public void setIdle(boolean idle) {
+        isIdle = idle;
+    }
+
    public boolean hasAverageHeartRate() {
        return avgHeartRate != null;
    }
@@ -16,8 +16,6 @@

 package de.dennisguse.opentracks.stats;

-import android.util.Log;
-
 import androidx.annotation.NonNull;

 import java.time.Duration;
@@ -40,11 +38,6 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 public class TrackStatisticsUpdater {

    private static final String TAG = TrackStatisticsUpdater.class.getSimpleName();
-    /**
-     * Ignore any acceleration faster than this.
-     * Will ignore any speeds that imply acceleration greater than 2g's
-     */
-    private static final double SPEED_MAX_ACCELERATION = 2 * 9.81;

    private final TrackStatistics trackStatistics;

@@ -132,26 +125,35 @@ public class TrackStatisticsUpdater {
            currentSegment.setAverageHeartRate(HeartRate.of(averageHeartRateBPM));
        }

-        // Update total distance
-        if (trackPoint.hasSensorDistance()) {
-            // Sensor-based distance/speed
-            currentSegment.addTotalDistance(trackPoint.getSensorDistance());
-        } else if (lastTrackPoint != null
-                && lastTrackPoint.hasLocation()
-                && trackPoint.hasLocation() && trackPoint.isMoving()) {
-            // GPS-based distance/speed
-            // Assumption: we ignore TrackPoints that are not moving as those are likely imprecise GPS measurements
-            Distance movingDistance = trackPoint.distanceToPrevious(lastTrackPoint);
-            currentSegment.addTotalDistance(movingDistance);
-        }
+        {
+            // Update total distance
+            Distance movingDistance = null;
+            if (trackPoint.hasSensorDistance()) {
+                movingDistance = trackPoint.getSensorDistance();
+            } else if (lastTrackPoint != null
+                    && lastTrackPoint.hasLocation()
+                    && trackPoint.hasLocation()) {
+                // GPS-based distance/speed
+                movingDistance = trackPoint.distanceToPrevious(lastTrackPoint);
+            }
+            if (movingDistance != null) {
+                currentSegment.setIdle(false);
+                currentSegment.addTotalDistance(movingDistance);
+            }

+            if (!currentSegment.isIdle() && !trackPoint.isSegmentManualStart()) {
+                if (lastTrackPoint != null) {
+                    currentSegment.addMovingTime(trackPoint, lastTrackPoint);
+                }
+            }

-        // Update moving time
-        if (trackPoint.isMoving() && lastTrackPoint != null && lastTrackPoint.isMoving()) {
-            currentSegment.addMovingTime(trackPoint, lastTrackPoint);
+            if (trackPoint.getType() == TrackPoint.Type.IDLE) {
+                currentSegment.setIdle(true);
+            }

-            // Update max speed
-            updateSpeed(trackPoint, lastTrackPoint);
+            if (trackPoint.hasSpeed()) {
+                updateSpeed(trackPoint);
+            }
        }

        if (trackPoint.isSegmentManualEnd()) {
@@ -180,27 +182,13 @@ public class TrackStatisticsUpdater {
    /**
     * Updates a speed reading while assuming the user is moving.
     */
-    private void updateSpeed(@NonNull TrackPoint trackPoint, @NonNull TrackPoint lastTrackPoint) {
-        if (isValidSpeed(trackPoint, lastTrackPoint)) {
-            Speed currentSpeed = trackPoint.getSpeed();
-            if (currentSpeed.greaterThan(currentSegment.getMaxSpeed())) {
-                currentSegment.setMaxSpeed(currentSpeed);
-            }
-        } else {
-            Log.d(TAG, "Invalid speed. speed: " + trackPoint.getSpeed() + " lastLocationSpeed: " + lastTrackPoint.getSpeed());
+    private void updateSpeed(@NonNull TrackPoint trackPoint) {
+        Speed currentSpeed = trackPoint.getSpeed();
+        if (currentSpeed.greaterThan(currentSegment.getMaxSpeed())) {
+            currentSegment.setMaxSpeed(currentSpeed);
        }
    }

-    private boolean isValidSpeed(@NonNull TrackPoint trackPoint, @NonNull TrackPoint lastTrackPoint) {
-        // See if the speed seems physically likely. Ignore any speeds that imply acceleration greater than 2g.
-        Duration timeDifference = Duration.between(lastTrackPoint.getTime(), trackPoint.getTime());
-        Speed maxSpeedDifference = Speed.of(Distance.of(SPEED_MAX_ACCELERATION), Duration.ofMillis(1000))
-                .mul(timeDifference.toSeconds());
-
-        Speed speedDifference = Speed.absDiff(lastTrackPoint.getSpeed(), trackPoint.getSpeed());
-        return speedDifference.lessThan(maxSpeedDifference);
-    }
-
    @NonNull
    @Override
    public String toString() {
@@ -0,0 +1,296 @@
+package de.dennisguse.opentracks.ui;
+
+import android.app.ActivityOptions;
+import android.content.Intent;
+import android.database.Cursor;
+import android.util.Pair;
+import android.util.SparseBooleanArray;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.TrackRecordedActivity;
+import de.dennisguse.opentracks.TrackRecordingActivity;
+import de.dennisguse.opentracks.data.models.ActivityType;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.tables.TracksColumns;
+import de.dennisguse.opentracks.databinding.TrackListItemBinding;
+import de.dennisguse.opentracks.services.RecordingStatus;
+import de.dennisguse.opentracks.settings.UnitSystem;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
+import de.dennisguse.opentracks.ui.util.ListItemUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+
+public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements ActionMode.Callback {
+
+    private static final String TAG = TrackListAdapter.class.getSimpleName();
+
+    private final AppCompatActivity context;
+    private final RecyclerView recyclerView;
+    private final SparseBooleanArray selection = new SparseBooleanArray();
+    private RecordingStatus recordingStatus;
+    private UnitSystem unitSystem;
+    private Cursor tracks;
+    private boolean selectionMode = false;
+    private ActivityUtils.ContextualActionModeCallback actionModeCallback;
+    private ActionMode actionMode;
+
+    public TrackListAdapter(AppCompatActivity context, RecyclerView recyclerView, RecordingStatus recordingStatus, UnitSystem unitSystem) {
+        this.context = context;
+        this.recyclerView = recyclerView;
+        this.recordingStatus = recordingStatus;
+        this.unitSystem = unitSystem;
+    }
+
+    public void setActionModeCallback(ActivityUtils.ContextualActionModeCallback actionModeCallback) {
+        this.actionModeCallback = actionModeCallback;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.track_list_item, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        ViewHolder viewHolder = (ViewHolder) holder;
+
+        tracks.moveToPosition(position);
+        viewHolder.bind(tracks);
+    }
+
+    @Override
+    public int getItemCount() {
+        if (tracks == null) {
+            return 0;
+        }
+        return tracks.getCount();
+    }
+
+    public void swapData(Cursor tracks) {
+        this.tracks = tracks;
+        this.notifyDataSetChanged();
+    }
+
+    public void updateRecordingStatus(RecordingStatus recordingStatus) {
+        this.recordingStatus = recordingStatus;
+    }
+
+    public void updateUnitSystem(UnitSystem unitSystem) {
+        this.unitSystem = unitSystem;
+    }
+
+    @Override
+    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+        mode.getMenuInflater().inflate(R.menu.list_context_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+        selectionMode = true;
+
+        actionModeCallback.onPrepare(menu, null, getCheckedIds(), true);
+        return true;
+    }
+
+    @Override
+    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+        if (actionModeCallback.onClick(item.getItemId(), null, getCheckedIds())) {
+            mode.finish();
+        }
+        return true;
+    }
+
+    @Override
+    public void onDestroyActionMode(ActionMode mode) {
+        selectionMode = false;
+
+        setAllSelected(false);
+
+        actionModeCallback.onDestroy();
+    }
+
+    public void setAllSelected(boolean isSelected) {
+        if (isSelected) {
+            final int idIndex = tracks.getColumnIndexOrThrow(TracksColumns._ID);
+
+            tracks.moveToFirst();
+            do {
+                selection.put((int) tracks.getLong(idIndex), true);
+            } while (tracks.moveToNext());
+        } else {
+            selection.clear();
+        }
+
+        for (int i = 0; i < recyclerView.getChildCount(); i++) {
+            ViewHolder holder = (ViewHolder) recyclerView.getChildViewHolder(recyclerView.getChildAt(i));
+            holder.setSelected(isSelected);
+        }
+    }
+
+    private long[] getCheckedIds() {
+        List<Long> ids = new ArrayList<>();
+
+        for (int i = 0; i < selection.size(); i++) {
+            if (selection.valueAt(i)) {
+                ids.add((long) selection.keyAt(i));
+            }
+        }
+
+        return ids.stream().mapToLong(i -> i).toArray();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+
+        private final TrackListItemBinding viewBinding;
+        private final View view;
+
+        private ActivityType activityType;
+        private String name;
+        private int markerCount;
+        private Duration totalTime;
+        private Distance totalDistance;
+        private Instant startTime;
+        private ZoneOffset zoneOffset;
+        private String activityTypeLocalized;
+        private String description;
+        private Track.Id trackId;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+
+            viewBinding = TrackListItemBinding.bind(itemView);
+            view = itemView;
+
+            view.setOnClickListener(this);
+            view.setOnLongClickListener(this);
+        }
+
+        private void getData(Cursor track) {
+            final int idIndex = track.getColumnIndexOrThrow(TracksColumns._ID);
+            final int nameIndex = track.getColumnIndexOrThrow(TracksColumns.NAME);
+            final int descriptionIndex = track.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
+            final int activityTypeLocalizedIndex = track.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE_LOCALIZED);
+            final int startTimeIndex = track.getColumnIndexOrThrow(TracksColumns.STARTTIME);
+            final int startTimeOffsetIndex = track.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
+            final int totalDistanceIndex = track.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
+            final int totalTimeIndex = track.getColumnIndexOrThrow(TracksColumns.TOTALTIME);
+            final int iconIndex = track.getColumnIndexOrThrow(TracksColumns.ICON);
+            final int markerCountIndex = track.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT);
+
+            activityType = ActivityType.findBy(track.getString(iconIndex));
+            name = track.getString(nameIndex);
+            markerCount = track.getInt(markerCountIndex);
+            totalTime = Duration.ofMillis(track.getLong(totalTimeIndex));
+            totalDistance = Distance.of(track.getFloat(totalDistanceIndex));
+            startTime = Instant.ofEpochMilli(track.getLong(startTimeIndex));
+            zoneOffset = ZoneOffset.ofTotalSeconds(track.getInt(startTimeOffsetIndex));
+            activityTypeLocalized = track.getString(activityTypeLocalizedIndex);
+            description = track.getString(descriptionIndex);
+            trackId = new Track.Id(track.getLong(idIndex));
+        }
+
+        public void bind(Cursor track) {
+
+            getData(track);
+
+            int iconId = activityType.getIconDrawableId();
+            int iconDesc = R.string.image_track;
+
+            boolean isRecordingThisTrackRecording = trackId.equals(recordingStatus.trackId());
+            if (isRecordingThisTrackRecording) {
+                iconId = R.drawable.ic_track_recording;
+                iconDesc = R.string.image_record;
+            }
+
+            viewBinding.trackListItemIcon.setImageResource(iconId);
+            viewBinding.trackListItemIcon.setContentDescription(context.getString(iconDesc));
+
+            viewBinding.trackListItemName.setText(name);
+
+            String timeDistanceText = ListItemUtils.getTimeDistanceText(context, unitSystem, isRecordingThisTrackRecording, totalTime, totalDistance, markerCount);
+            viewBinding.trackListItemTimeDistance.setText(timeDistanceText);
+
+            viewBinding.trackListItemMarkerCountIcon.setVisibility(markerCount > 0 ? View.VISIBLE : View.GONE);
+            viewBinding.trackListItemMarkerCount.setText(markerCount > 0 ? Integer.toString(markerCount) : null);
+
+            if (!recordingStatus.isRecording()) {
+                ListItemUtils.setDateAndTime(context, viewBinding.trackListItemDate, viewBinding.trackListItemTime, startTime, zoneOffset);
+            } else {
+                viewBinding.trackListItemDate.setText(null);
+                viewBinding.trackListItemTime.setText(null);
+            }
+
+            String category = activityType == null ? activityTypeLocalized : null;
+            String categoryDescription = StringUtils.getCategoryDescription(category, description);
+            viewBinding.trackListItemCategoryDescription.setText(categoryDescription);
+            viewBinding.trackListItemCategoryDescription.setVisibility("".equals(categoryDescription) ? View.GONE : View.VISIBLE);
+
+            setSelected(selection.get((int) getId()));
+        }
+
+        public void setSelected(boolean isSelected) {
+            selection.put((int) getId(), isSelected);
+            view.setActivated(isSelected);
+        }
+
+        public long getId() {
+            return trackId.id();
+        }
+
+
+        @Override
+        public void onClick(View v) {
+            if (selectionMode) {
+                setSelected(!view.isActivated());
+                actionMode.invalidate();
+                return;
+            }
+
+            if (recordingStatus.isRecording() && trackId.equals(recordingStatus.trackId())) {
+                // Is recording -> open record activity.
+                Intent newIntent = IntentUtils.newIntent(context, TrackRecordingActivity.class)
+                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
+                context.startActivity(newIntent);
+            } else {
+                // Not recording -> open detail activity.
+                Intent newIntent = IntentUtils.newIntent(context, TrackRecordedActivity.class)
+                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
+                ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(
+                        context,
+                        new Pair<>(view.findViewById(R.id.track_list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON));
+                context.startActivity(newIntent, activityOptions.toBundle());
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View v) {
+            setSelected(!view.isActivated());
+            if (!selectionMode) {
+                actionMode = context.startSupportActionMode(TrackListAdapter.this);
+            } else {
+                actionMode.invalidate();
+            }
+            return true;
+        }
+    }
+}
@@ -44,8 +44,8 @@ public class RecordingLayoutIO {
    private static DataField fromCSV(String[] fieldParts, @NonNull Resources resources) {
        return new DataField(
                fieldParts[0],
-                fieldParts[1].equals(YES_VALUE),
-                fieldParts[2].equals(YES_VALUE),
+                YES_VALUE.equals(fieldParts[1]),
+                YES_VALUE.equals(fieldParts[2]),
                fieldParts[0].equals(resources.getString(R.string.stats_custom_layout_coordinates_key)));
    }

@@ -18,19 +18,16 @@ package de.dennisguse.opentracks.ui.markers;

 import android.app.SearchManager;
 import android.content.Intent;
-import android.database.Cursor;
 import android.os.Bundle;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.LinearLayoutManager;

+import java.util.List;
 import java.util.Objects;

 import de.dennisguse.opentracks.AbstractActivity;
@@ -38,15 +35,12 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.data.tables.MarkerColumns;
 import de.dennisguse.opentracks.databinding.MarkerListBinding;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.share.ShareUtils;
-import de.dennisguse.opentracks.ui.markers.DeleteMarkerDialogFragment.DeleteMarkerCaller;
 import de.dennisguse.opentracks.ui.util.ActivityUtils;
-import de.dennisguse.opentracks.ui.util.ScrollVisibleViews;
 import de.dennisguse.opentracks.util.IntentUtils;

 /**
@@ -54,23 +48,20 @@ import de.dennisguse.opentracks.util.IntentUtils;
 *
 * @author Leif Hendrik Wilden
 */
-public class MarkerListActivity extends AbstractActivity implements DeleteMarkerCaller {
+public class MarkerListActivity extends AbstractActivity {

    public static final String EXTRA_TRACK_ID = "track_id";

-    private static final String TAG = MarkerListActivity.class.getSimpleName();
-
    private ContentProviderUtils contentProviderUtils;

    private RecordingStatus recordingStatus = TrackRecordingService.STATUS_DEFAULT;

-    private Track track;
-    private MarkerResourceCursorAdapter resourceCursorAdapter;
+    private Track.Id trackId;
+
+    private MarkerListAdapter adapter;

    private MarkerListBinding viewBinding;

-    private final MarkerLoaderCallback loaderCallbacks = new MarkerLoaderCallback();
-
    private TrackRecordingServiceConnection trackRecordingServiceConnection;

    private final TrackRecordingServiceConnection.Callback bindCallback = (service, unused) -> service.getRecordingStatusObservable()
@@ -105,33 +96,24 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    private MenuItem insertMarkerMenuItem;
    private MenuItem searchMenuItem;

+    private String searchQuery;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
-        Track.Id trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);
-
        contentProviderUtils = new ContentProviderUtils(this);

-        track = trackId != null ? contentProviderUtils.getTrack(trackId) : null;
-
-        viewBinding.markerList.setEmptyView(viewBinding.markerListEmpty);
-        viewBinding.markerList.setOnItemClickListener((parent, view, position, id) -> {
-            resourceCursorAdapter.markerInvalid(id);
-            Intent intent = IntentUtils.newIntent(MarkerListActivity.this, MarkerDetailActivity.class)
-                    .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, new Marker.Id(id));
-            startActivity(intent);
-        });
-
-        resourceCursorAdapter = new MarkerResourceCursorAdapter(this, R.layout.list_item);
-        ScrollVisibleViews scrollVisibleViews = new ScrollVisibleViews(resourceCursorAdapter);
-        viewBinding.markerList.setOnScrollListener(scrollVisibleViews);
-        viewBinding.markerList.setAdapter(resourceCursorAdapter);
-        ActivityUtils.configureListViewContextualMenu(viewBinding.markerList, contextualActionModeCallback);
+        trackId = getIntent().getParcelableExtra(EXTRA_TRACK_ID);

        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindCallback);

+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        adapter = new MarkerListAdapter(this, viewBinding.markerList, null);
+        viewBinding.markerList.setLayoutManager(layoutManager);
+        viewBinding.markerList.setAdapter(adapter);
+
        setSupportActionBar(viewBinding.markerListToolbar);
+        adapter.setActionModeCallback(contextualActionModeCallback);
    }

    @Override
@@ -145,7 +127,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
        super.onResume();
        trackRecordingServiceConnection.bind(this);
        this.invalidateOptionsMenu();
-        loadData(getIntent());
+        loadData();
    }

    @Override
@@ -157,9 +139,8 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    @Override
    protected void onDestroy() {
        super.onDestroy();
-        resourceCursorAdapter.clear();
        viewBinding = null;
-        resourceCursorAdapter = null;
+        adapter = null;
        contentProviderUtils = null;
    }

@@ -183,15 +164,15 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker

    @Override
    public boolean onPrepareOptionsMenu(Menu menu) {
-        insertMarkerMenuItem.setVisible(track != null && track.getId().equals(recordingStatus.getTrackId()));
+        insertMarkerMenuItem.setVisible(trackId != null && trackId.equals(recordingStatus.trackId()));
        return super.onPrepareOptionsMenu(menu);
    }

    @Override
    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (track != null && item.getItemId() == R.id.marker_list_insert_marker) {
+        if (trackId != null && item.getItemId() == R.id.marker_list_insert_marker) {
            Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
-                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, track.getId());
+                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId);
            startActivity(intent);
            return true;
        }
@@ -229,7 +210,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker

        if (itemId == R.id.list_context_menu_edit) {
            if (markerIds.length == 1) {
-                resourceCursorAdapter.markerInvalid(markerIds[0].id());
                Intent intent = IntentUtils.newIntent(this, MarkerEditActivity.class)
                        .putExtra(MarkerEditActivity.EXTRA_MARKER_ID, markerIds[0]);
                startActivity(intent);
@@ -243,23 +223,13 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
        }

        if (itemId == R.id.list_context_menu_select_all) {
-            for (int i = 0; i < viewBinding.markerList.getCount(); i++) {
-                viewBinding.markerList.setItemChecked(i, true);
-            }
+            adapter.setAllSelected(true);
            return false;
        }

        return false;
    }

-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_SEARCH && searchMenuItem != null) {
-            return true;
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
    @Override
    public void onBackPressed() {
        SearchView searchView = (SearchView) searchMenuItem.getActionView();
@@ -267,8 +237,9 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
            searchView.setIconified(true);
        }

-        if (loaderCallbacks.getSearchQuery() != null) {
-            loaderCallbacks.setSearch(null);
+        if (searchQuery != null) {
+            searchQuery = null;
+            loadData();
            return;
        }

@@ -276,78 +247,33 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
    }

    @Override
-    public void onNewIntent(Intent intent) {
+    protected void onNewIntent(Intent intent) {
        super.onNewIntent(intent);
-        setIntent(intent);
-        loadData(intent);
-    }

-    private void loadData(Intent intent) {
-        String searchQuery = null;
        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
            searchQuery = intent.getStringExtra(SearchManager.QUERY);
+        } else {
+            searchQuery = null;
        }
-
-        loaderCallbacks.setSearch(searchQuery);
    }

-    @Override
-    public void onMarkerDeleted() {
-        // Do nothing
+    private void loadData() {
+        viewBinding.markerListToolbar.setTitle(Objects.requireNonNullElseGet(searchQuery, () -> getString(R.string.menu_markers)));
+
+        List<Marker> markers = contentProviderUtils.searchMarkers(trackId, searchQuery);
+
+        adapter.swapData(markers);
+
+        if (markers.isEmpty()) {
+            viewBinding.markerListEmpty.setVisibility(View.VISIBLE);
+            viewBinding.markerList.setVisibility(View.GONE);
+        } else {
+            viewBinding.markerListEmpty.setVisibility(View.GONE);
+            viewBinding.markerList.setVisibility(View.VISIBLE);
+        }
    }

    private void onRecordingStatusChanged(RecordingStatus status) {
        recordingStatus = status;
    }
-
-    private class MarkerLoaderCallback implements LoaderManager.LoaderCallbacks<Cursor> {
-
-        private String searchQuery = null;
-
-        public String getSearchQuery() {
-            return searchQuery;
-        }
-
-        public void setSearch(String searchQuery) {
-            this.searchQuery = searchQuery;
-            restart();
-            viewBinding.markerListToolbar.setTitle(Objects.requireNonNullElseGet(searchQuery, () -> getString(R.string.menu_markers)));
-        }
-
-        public void restart() {
-            LoaderManager.getInstance(MarkerListActivity.this).restartLoader(0, null, loaderCallbacks);
-        }
-
-        @NonNull
-        @Override
-        public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-            final String[] PROJECTION = new String[]{MarkerColumns._ID,
-                    MarkerColumns.NAME, MarkerColumns.DESCRIPTION, MarkerColumns.CATEGORY,
-                    MarkerColumns.TIME, MarkerColumns.PHOTOURL, MarkerColumns.TRACKID};
-
-            if (searchQuery == null) {
-                if (track != null) {
-                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, MarkerColumns.TRACKID + "=?", new String[]{String.valueOf(track.getId().id())}, null);
-                } else {
-                    return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, null, null, null);
-                }
-            } else {
-                final String SEARCH_QUERY = MarkerColumns.NAME + " LIKE ? OR " +
-                        MarkerColumns.DESCRIPTION + " LIKE ? OR " +
-                        MarkerColumns.CATEGORY + " LIKE ?";
-                final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
-                return new CursorLoader(MarkerListActivity.this, MarkerColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, MarkerColumns.DEFAULT_SORT_ORDER + " DESC");
-            }
-        }
-
-        @Override
-        public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
-            resourceCursorAdapter.swapCursor(cursor);
-        }
-
-        @Override
-        public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-            resourceCursorAdapter.swapCursor(null);
-        }
-    }
 }
@@ -0,0 +1,271 @@
+package de.dennisguse.opentracks.ui.markers;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.media.ThumbnailUtils;
+import android.net.Uri;
+import android.util.Log;
+import android.util.LruCache;
+import android.util.SparseBooleanArray;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.databinding.MarkerListItemBinding;
+import de.dennisguse.opentracks.ui.util.ActivityUtils;
+import de.dennisguse.opentracks.ui.util.ExecutorListViewService;
+import de.dennisguse.opentracks.ui.util.ListItemUtils;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+
+public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements ActionMode.Callback {
+
+    private static final String TAG = MarkerListAdapter.class.getSimpleName();
+
+    private final AppCompatActivity context;
+    private final RecyclerView recyclerView;
+    private List<Marker> markers;
+    private final SparseBooleanArray selection;
+    private boolean selectionMode;
+    private ActivityUtils.ContextualActionModeCallback actionModeCallback;
+    private ActionMode actionMode;
+
+    private final ExecutorListViewService<Marker.Id> executorService = new ExecutorListViewService<>(128);
+
+    private final LruCache<Marker.Id, Bitmap> memoryCache;
+
+    public MarkerListAdapter(AppCompatActivity context, RecyclerView recyclerView, List<Marker> markers) {
+        this.context = context;
+        this.recyclerView = recyclerView;
+        this.markers = markers;
+
+        selection = new SparseBooleanArray();
+        selectionMode = false;
+
+        // Get max available VM memory, exceeding this amount will throw an OutOfMemory exception.
+        final long usedMemory = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+        final int cacheSize = (int) (Runtime.getRuntime().maxMemory() - usedMemory) / 8;
+
+        memoryCache = new LruCache<>(cacheSize) {
+            @Override
+            protected int sizeOf(Marker.Id key, Bitmap value) {
+                return value.getByteCount();
+            }
+        };
+    }
+
+    public void setActionModeCallback(ActivityUtils.ContextualActionModeCallback actionModeCallback) {
+        this.actionModeCallback = actionModeCallback;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.marker_list_item, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        ViewHolder viewHolder = (ViewHolder) holder;
+
+        viewHolder.bind(markers.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        if (markers == null) {
+            return 0;
+        }
+        return markers.size();
+    }
+
+    public void swapData(List<Marker> markers) {
+        this.markers = markers;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
+        actionMode.getMenuInflater().inflate(R.menu.list_context_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
+        selectionMode = true;
+        actionModeCallback.onPrepare(menu, null, getCheckedIds(), true);
+        return true;
+    }
+
+    @Override
+    public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
+        if (actionModeCallback.onClick(menuItem.getItemId(), null, getCheckedIds())) {
+            actionMode.finish();
+        }
+        return true;
+    }
+
+    @Override
+    public void onDestroyActionMode(ActionMode actionMode) {
+        selectionMode = false;
+
+        setAllSelected(false);
+
+        actionModeCallback.onDestroy();
+    }
+
+    public void setAllSelected(boolean isSelected) {
+        if (isSelected) {
+            for (Marker marker : markers) {
+                selection.put((int) marker.getId().id(), true);
+            }
+        } else {
+            selection.clear();
+        }
+
+        for (int i = 0; i < recyclerView.getChildCount(); i++) {
+            ViewHolder holder = (ViewHolder) recyclerView.getChildViewHolder(recyclerView.getChildAt(i));
+            holder.setSelected(isSelected);
+        }
+    }
+
+    private long[] getCheckedIds() {
+        List<Long> ids = new ArrayList<>();
+
+        for (int i = 0; i < selection.size(); i++) {
+            if (selection.valueAt(i)) {
+                ids.add((long) selection.keyAt(i));
+            }
+        }
+
+        return ids.stream().mapToLong(i -> i).toArray();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+
+        private final MarkerListItemBinding viewBinding;
+        private final View view;
+
+        private Marker marker;
+
+        public ViewHolder(@NonNull View view) {
+            super(view);
+
+            viewBinding = MarkerListItemBinding.bind(view);
+            this.view = view;
+
+            view.setOnClickListener(this);
+            view.setOnLongClickListener(this);
+        }
+
+        public void bind(Marker marker) {
+            this.marker = marker;
+
+            viewBinding.markerListItemPhoto.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
+            viewBinding.markerListItemTextGradient.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
+            if (marker.hasPhoto()) {
+                int height = ThemeUtils.getPhotoHeight(context);
+                ViewGroup.LayoutParams params = viewBinding.markerListItemPhoto.getLayoutParams();
+                params.height = height;
+                viewBinding.markerListItemPhoto.setLayoutParams(params);
+                viewBinding.markerListItemTextGradient.setLayoutParams(params);
+
+                asyncLoadPhoto(viewBinding.markerListItemPhoto, marker.getPhotoURI(), marker.getId());
+            }
+
+            viewBinding.markerListItemName.setText(marker.getName());
+
+            {
+                ZoneOffset timeZone = new ContentProviderUtils(context).getTrack(marker.getTrackId()).getZoneOffset();
+                ListItemUtils.setDateAndTime(context, viewBinding.markerListItemDate, viewBinding.markerListItemTime, marker.getTime(), timeZone);
+            }
+
+            String categoryDescription = StringUtils.getCategoryDescription(marker.getCategory(), marker.getDescription());
+            viewBinding.markerListItemTimeDistance.setText(categoryDescription);
+
+            setSelected(selection.get((int) getId()));
+        }
+
+        public void setSelected(boolean isSelected) {
+            selection.put((int) getId(), isSelected);
+            view.setActivated(isSelected);
+        }
+
+        public long getId() {
+            return marker.getId().id();
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (selectionMode) {
+                setSelected(!view.isActivated());
+                actionMode.invalidate();
+            } else {
+                Intent intent = IntentUtils.newIntent(context, MarkerDetailActivity.class)
+                        .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, marker.getId());
+                context.startActivity(intent);
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View view) {
+            setSelected(!view.isActivated());
+            if (!selectionMode) {
+                actionMode = context.startSupportActionMode(MarkerListAdapter.this);
+            } else {
+                actionMode.invalidate();
+            }
+            return true;
+        }
+    }
+
+    /**
+     * It loads the photoUrl in the imageView from view.
+     * It takes the photo from cache or from storage if isn't in the cache.
+     *
+     * @param imageView view object where photo will be loaded.
+     * @param photoUri  photo's url.
+     * @param id        marker's id where photo belong.
+     */
+    private void asyncLoadPhoto(ImageView imageView, Uri photoUri, Marker.Id id) {
+
+        Bitmap bm = memoryCache.get(id);
+        imageView.setImageBitmap(bm);
+        if (bm != null) {
+            return;
+        }
+
+        executorService.execute(id, () -> {
+            try (InputStream inputStream = context.getContentResolver().openInputStream(photoUri)) {
+                Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+                int height = ThemeUtils.getPhotoHeight(context);
+                Log.d(TAG, "Width : " + (bitmap.getWidth() / (bitmap.getHeight() / height)) + " | Height: " + height);
+                final Bitmap finalPhoto = ThumbnailUtils.extractThumbnail(bitmap, bitmap.getWidth() / (bitmap.getHeight() / height), height);
+                context.runOnUiThread(() -> imageView.setImageBitmap(finalPhoto));
+                memoryCache.put(id, finalPhoto);
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to image " + e);
+            }
+        });
+    }
+}
@@ -1,195 +0,0 @@
-package de.dennisguse.opentracks.ui.markers;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.ThumbnailUtils;
-import android.net.Uri;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import androidx.annotation.NonNull;
-import androidx.collection.LruCache;
-import androidx.cursoradapter.widget.ResourceCursorAdapter;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.data.ContentProviderUtils;
-import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.data.tables.MarkerColumns;
-import de.dennisguse.opentracks.ui.util.ExecutorListViewService;
-import de.dennisguse.opentracks.ui.util.ListItemUtils;
-import de.dennisguse.opentracks.ui.util.ScrollVisibleViews;
-
-public class MarkerResourceCursorAdapter extends ResourceCursorAdapter implements ScrollVisibleViews.VisibleViewsListener {
-
-    private static final String TAG = MarkerResourceCursorAdapter.class.getSimpleName();
-
-    private static final int LIST_PREFERRED_ITEM_HEIGHT_DEFAULT = 128;
-
-    private final Activity activity;
-
-    //TODO Should be Marker.Id
-    private final ExecutorListViewService<Long> executorService = new ExecutorListViewService<>(LIST_PREFERRED_ITEM_HEIGHT_DEFAULT);
-
-    private boolean scroll = false;
-
-    // Cache size is in bytes.
-    private final LruCache<String, Bitmap> memoryCache;
-
-    public MarkerResourceCursorAdapter(Activity activity, int layout) {
-        super(activity, layout, null, 0);
-
-        this.activity = activity;
-
-        // Get max available VM memory, exceeding this amount will throw an OutOfMemory exception.
-        final long usedMemory = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
-        final int cacheSize = (int) (Runtime.getRuntime().maxMemory() - usedMemory) / 8;
-
-        memoryCache = new LruCache<>(cacheSize) {
-            @Override
-            protected int sizeOf(@NonNull String key, @NonNull Bitmap bitmap) {
-                return bitmap.getByteCount();
-            }
-        };
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        int idIndex = cursor.getColumnIndex(MarkerColumns._ID);
-        int nameIndex = cursor.getColumnIndex(MarkerColumns.NAME);
-        int timeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TIME);
-        int categoryIndex = cursor.getColumnIndex(MarkerColumns.CATEGORY);
-        int descriptionIndex = cursor.getColumnIndex(MarkerColumns.DESCRIPTION);
-        int photoUrlIndex = cursor.getColumnIndex(MarkerColumns.PHOTOURL);
-        int trackIdIndex = cursor.getColumnIndex(MarkerColumns.TRACKID);
-
-        long id = cursor.getLong(idIndex);
-        int iconId = MarkerUtils.ICON_ID;
-        String name = cursor.getString(nameIndex);
-        long time = cursor.getLong(timeIndex);
-        String category = cursor.getString(categoryIndex);
-        String description = cursor.getString(descriptionIndex);
-        String photoUrl = cursor.getString(photoUrlIndex);
-        long trackId = cursor.getLong(trackIdIndex);
-
-        view.setTag(String.valueOf(id));
-
-        boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
-
-        ImageView imageView = view.findViewById(R.id.list_item_photo);
-        ImageView textGradient = view.findViewById(R.id.list_item_text_gradient);
-        imageView.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
-        textGradient.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
-        imageView.setImageBitmap(null);
-
-        if (hasPhoto) {
-            int height = getPhotoHeight(activity);
-            ViewGroup.LayoutParams params = imageView.getLayoutParams();
-            params.height = height;
-            imageView.setLayoutParams(params);
-
-            if (getBitmapFromMemCache(String.valueOf(id)) != null || !scroll) {
-                asyncLoadPhoto(view, imageView, photoUrl, id);
-            }
-        }
-
-        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
-        Track track = contentProviderUtils.getTrack(new Track.Id(trackId));
-        ListItemUtils.setListItem(activity, view, false, iconId, R.string.image_marker, name, null, null, 0,
-                OffsetDateTime.ofInstant(Instant.ofEpochMilli(time), track.getZoneOffset()), category, description, hasPhoto);
-    }
-
-    public void clear() {
-        executorService.shutdown();
-    }
-
-    @Override
-    public void onViewVisible(View view, int position) {
-        scroll = true;
-
-        Cursor cursor = getCursor();
-        if (!cursor.moveToPosition(position)) {
-            return;
-        }
-
-        long id = cursor.getLong(cursor.getColumnIndexOrThrow(MarkerColumns._ID));
-        String photoUrl = cursor.getString(cursor.getColumnIndexOrThrow(MarkerColumns.PHOTOURL));
-
-        boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
-        if (hasPhoto) {
-            ImageView imageView = view.findViewById(R.id.list_item_photo);
-            asyncLoadPhoto(view, imageView, photoUrl, id);
-        }
-    }
-
-    public void markerInvalid(long id) {
-        memoryCache.remove(String.valueOf(id));
-        scroll = false;
-    }
-
-    private void addBitmapToMemoryCache(String key, Bitmap bitmap) {
-        synchronized (memoryCache) {
-            if (getBitmapFromMemCache(key) == null) {
-                memoryCache.put(key, bitmap);
-            }
-        }
-    }
-
-    private Bitmap getBitmapFromMemCache(String key) {
-        return memoryCache.get(key);
-    }
-
-    /**
-     * It loads the photoUrl in the imageView from view.
-     * It takes the photo from cache or from storage if isn't in the cache.
-     *
-     * @param view      item's view.
-     * @param imageView view object where photo will be loaded.
-     * @param photoUrl  photo's url.
-     * @param id        marker's id where photo belong.
-     */
-    private void asyncLoadPhoto(View view, ImageView imageView, String photoUrl, long id) {
-        Bitmap photo = getBitmapFromMemCache(String.valueOf(id));
-        imageView.setImageBitmap(photo);
-
-        if (photo == null) {
-            executorService.execute(id, () -> {
-                try (InputStream inputStream = activity.getContentResolver().openInputStream(Uri.parse(photoUrl))) {
-                    Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
-                    int height = getPhotoHeight(activity);
-                    Log.d(TAG, "Width : " + (bitmap.getWidth() / (bitmap.getHeight() / height)) + " | Height: " + height);
-                    final Bitmap finalPhoto = ThumbnailUtils.extractThumbnail(bitmap, bitmap.getWidth() / (bitmap.getHeight() / height), height);
-                    addBitmapToMemoryCache(String.valueOf(id), finalPhoto);
-                    if (view.getTag().equals(String.valueOf(id))) {
-                        activity.runOnUiThread(() -> imageView.setImageBitmap(finalPhoto));
-                    }
-                } catch (IOException e) {
-                    Log.e(TAG, "Failed to image " + e);
-                }
-            });
-        }
-    }
-
-    /**
-     * Gets the photo height.
-     *
-     * @param context the context
-     */
-    private static int getPhotoHeight(Context context) {
-        int[] attrs = new int[]{android.R.attr.listPreferredItemHeight};
-        TypedArray typeArray = context.obtainStyledAttributes(attrs);
-        int height = typeArray.getDimensionPixelSize(0, LIST_PREFERRED_ITEM_HEIGHT_DEFAULT);
-        typeArray.recycle();
-        return 2 * height;
-    }
-}
@@ -9,77 +9,16 @@ import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.util.Log;
-import android.util.SparseBooleanArray;
-import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.AbsListView;
-import android.widget.ListView;

 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;

-import java.util.ArrayList;
-
-import de.dennisguse.opentracks.R;
-
 public class ActivityUtils {

    private static final String TAG = ActivityUtils.class.getSimpleName();

-    public static void configureListViewContextualMenu(final ListView listView, final ContextualActionModeCallback contextualActionModeCallback) {
-        listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
-        listView.setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() {
-
-            @Override
-            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                mode.getMenuInflater().inflate(R.menu.list_context_menu, menu);
-                return true;
-            }
-
-            @Override
-            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                contextualActionModeCallback.onPrepare(menu, getCheckedPositions(listView), listView.getCheckedItemIds(), true);
-                return true;
-            }
-
-            @Override
-            public void onDestroyActionMode(ActionMode mode) {
-                contextualActionModeCallback.onDestroy();
-            }
-
-            @Override
-            public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
-                mode.invalidate();
-            }
-
-            @Override
-            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                if (contextualActionModeCallback.onClick(item.getItemId(), getCheckedPositions(listView), listView.getCheckedItemIds())) {
-                    mode.finish();
-                }
-                return true;
-            }
-
-            /**
-             * Gets the checked positions in a list view.
-             *
-             * @param list the list view
-             */
-            private int[] getCheckedPositions(ListView list) {
-                SparseBooleanArray positions = list.getCheckedItemPositions();
-                ArrayList<Integer> arrayList = new ArrayList<>();
-                for (int i = 0; i < positions.size(); i++) {
-                    int key = positions.keyAt(i);
-                    if (positions.valueAt(i)) {
-                        arrayList.add(key);
-                    }
-                }
-                return arrayList.stream().mapToInt(i -> i).toArray();
-            }
-        });
-    }
-
    public static SearchView configureSearchWidget(Activity activity, final MenuItem menuItem) {
        final SearchView searchView = (SearchView) menuItem.getActionView();
        SearchManager searchManager = (SearchManager) activity.getSystemService(Context.SEARCH_SERVICE);
@@ -18,16 +18,20 @@ package de.dennisguse.opentracks.ui.util;

 import android.content.Context;
 import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.ImageView;
 import android.widget.TextView;

 import androidx.core.content.ContextCompat;

+import java.time.Duration;
+import java.time.Instant;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;

 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.DistanceFormatter;
+import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.util.StringUtils;

 /**
@@ -40,101 +44,6 @@ public class ListItemUtils {
    private ListItemUtils() {
    }

-    /**
-     * Sets a list item.
-     *
-     * @param context                  the context
-     * @param view                     the list item view
-     * @param isRecording              true if recording
-     * @param iconId                   the icon id
-     * @param iconContentDescriptionId the icon content description id
-     * @param name                     the name value
-     * @param totalTime                the total time value
-     * @param totalDistance            the total distance value
-     * @param markerCount              the marker count
-     * @param offsetDateTime           the start time with offset
-     * @param category                 the category value
-     * @param description              the description value
-     * @param hasPhoto                 true if this list item has photo
-     */
-    public static void setListItem(Context context, View view, boolean isRecording, int iconId, int iconContentDescriptionId, String name, String totalTime, String totalDistance, int markerCount, OffsetDateTime offsetDateTime, String category, String description, boolean hasPhoto) {
-        // Set icon
-        if (isRecording) {
-            iconId = R.drawable.ic_track_recording;
-            iconContentDescriptionId = R.string.image_record;
-        }
-
-        ImageView iconImageView = view.findViewById(R.id.list_item_icon);
-        iconImageView.setImageResource(iconId);
-        iconImageView.setContentDescription(context.getString(iconContentDescriptionId));
-
-        // Set name
-        TextView nameTextView = view.findViewById(R.id.list_item_name);
-        setTextView(context, nameTextView, name, hasPhoto);
-
-        // Set totalTime/totalDistance
-        TextView timeDistanceTextView = view.findViewById(R.id.list_item_time_distance);
-        String timeDistanceText;
-        if (isRecording) {
-            timeDistanceText = context.getString(R.string.generic_recording);
-        } else {
-            // Match list_item_time_distance in list_item.xml
-            timeDistanceText = getTimeDistance(totalTime, totalDistance);
-            if (markerCount > 0) {
-                timeDistanceText += "  ‧";
-            }
-        }
-        setTextView(context, timeDistanceTextView, timeDistanceText, hasPhoto);
-
-        // Set markerCount
-        ImageView markerCountIcon = view.findViewById(R.id.list_item_marker_count_icon);
-        TextView markerCountTextView = view.findViewById(R.id.list_item_marker_count);
-        boolean hasMarker = markerCount > 0;
-        markerCountIcon.setVisibility(hasMarker ? View.VISIBLE : View.GONE);
-        String markerCountValue = hasMarker ? String.valueOf(markerCount) : null;
-        if (hasMarker) {
-            // Scale markerCountIcon
-            int lineHeight = markerCountTextView.getLineHeight();
-            LayoutParams layoutParams = markerCountIcon.getLayoutParams();
-            layoutParams.width = lineHeight;
-            layoutParams.height = lineHeight;
-        }
-        setTextView(context, markerCountTextView, markerCountValue, hasPhoto);
-
-        // Set date/time
-        TextView dateTextView = view.findViewById(R.id.list_item_date);
-        TextView timeTextView = view.findViewById(R.id.list_item_time);
-        String dateValue = null;
-        String timeValue = null;
-        if (!isRecording) {
-            dateValue = StringUtils.formatDateTodayRelative(context, offsetDateTime);
-            String pattern = "HH:mm";
-            if (!offsetDateTime.getOffset().equals(OffsetDateTime.now().getOffset())) {
-                pattern = "HH:mm x";
-            }
-            timeValue = offsetDateTime.format(DateTimeFormatter.ofPattern(pattern));
-        }
-        setTextView(context, dateTextView, dateValue, hasPhoto);
-        setTextView(context, timeTextView, timeValue, hasPhoto);
-
-        // Set category and description
-        TextView categoryDescriptionTextView = view.findViewById(R.id.list_item_category_description);
-        String categoryDescription = isRecording ? null : StringUtils.getCategoryDescription(category, description);
-
-        // Place categoryDescription in either ownerTimeDistanceTextView or categoryDescriptionTextView
-        if (timeDistanceTextView.getVisibility() == View.GONE && markerCountIcon.getVisibility() == View.GONE) {
-            setTextView(context, categoryDescriptionTextView, null, hasPhoto);
-            // Match list_item_category_description in list_item.xml
-            timeDistanceTextView.setSingleLine(false);
-            timeDistanceTextView.setMaxLines(2);
-            setTextView(context, timeDistanceTextView, categoryDescription, hasPhoto);
-        } else {
-            // Match list_item_time_distance in list_item.xml
-            timeDistanceTextView.setSingleLine(true);
-            setTextView(context, categoryDescriptionTextView, categoryDescription, hasPhoto);
-        }
-    }
-
    /**
     * Gets a string for share owner, total time, and total distance.
     *
@@ -158,6 +67,29 @@ public class ListItemUtils {
        return builder.toString();
    }

+    public static String getTimeDistanceText(Context context, UnitSystem unitSystem, boolean isRecording, Duration totalTime, Distance totalDistance, int markerCount) {
+        String timeDistanceText;
+        if (isRecording) {
+            timeDistanceText = context.getString(R.string.generic_recording);
+        } else {
+            // Match list_item_time_distance in list_item.xml
+
+            String time = StringUtils.formatElapsedTime(totalTime);
+            // TODO unit system
+            String distance = DistanceFormatter.Builder()
+                    .setUnit(unitSystem)
+                    .build(context)
+                    .formatDistance(totalDistance);
+
+            timeDistanceText = getTimeDistance(time, distance);
+            if (markerCount > 0) {
+                timeDistanceText += "  ‧";
+            }
+        }
+
+        return timeDistanceText;
+    }
+
    /**
     * Sets a text view.
     *
@@ -180,4 +112,17 @@ public class ListItemUtils {
            textView.setShadowLayer(0, 0, 0, 0);
        }
    }
+
+    public static void setDateAndTime(Context context, TextView dateView, TextView timeView, Instant time, ZoneOffset timeZone) {
+        OffsetDateTime offsetDateTime = OffsetDateTime.ofInstant(time, timeZone);
+        String dateContent = StringUtils.formatDateTodayRelative(context, offsetDateTime);
+        String pattern = "HH:mm";
+        if (!offsetDateTime.getOffset().equals(OffsetDateTime.now().getOffset())) {
+            pattern = "HH:mm x";
+        }
+        String timeContent = offsetDateTime.format(DateTimeFormatter.ofPattern(pattern));
+
+        dateView.setText(dateContent);
+        timeView.setText(timeContent);
+    }
 }
@@ -52,4 +52,15 @@ public class ThemeUtils {
        typedArray.recycle();
        return fontSize;
    }
+
+    /**
+     * Gets the photo height.
+     */
+    public static int getPhotoHeight(Context context) {
+        int[] attrs = new int[]{android.R.attr.listPreferredItemHeight};
+        TypedArray typeArray = context.obtainStyledAttributes(attrs);
+        int height = typeArray.getDimensionPixelSize(0, 128);
+        typeArray.recycle();
+        return 2 * height;
+    }
 }
@@ -0,0 +1,239 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.8208"
+    android:viewportHeight="5.8208">
+  <path
+      android:pathData="m-1.3253,1.5033 l-0.4101,0.6834a0.1285,0.1285 60.4819,0 0,0.1102 0.1945l0.2496,-0 -0.11,0.5496a0.0898,0.0898 21.1422,0 0,0.1651 0.0638L-0.9105,2.3112A0.1285,0.1285 60.4819,0 0,-1.0206 2.1167H-1.2702L-1.1602,1.5671a0.0898,0.0898 21.1422,0 0,-0.1651 -0.0638z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.264583"
+      android:fillColor="#fdbc4b"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M14.7722,-15.5564l26.5377,0l0,30.6204l-26.5377,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.6652"
+      android:fillColor="#cacaca"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M15.7928,-14.5358l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#e74c3c"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M19.8755,-14.5358l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#ed1515"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M23.9583,-14.5358l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#f47750"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M28.041,-14.5358l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#fdbc4b"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M32.1237,-14.5358l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#c9ce3b"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M15.7928,-10.453l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#da4453"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M19.8755,-10.453l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#c0392b"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M23.9583,-10.453l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#d35400"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M28.041,-10.453l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#f67400"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M32.1237,-10.453l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#f39c1f"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M15.7928,-4.329l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#1cdc9a"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M19.8755,-4.329l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#2ecc71"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M23.9583,-4.329l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#1abc9c"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M28.041,-4.329l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#3498db"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M32.1237,-4.329l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#3daee9"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M15.7928,-0.2463l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#10d116"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M19.8755,-0.2463l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#27ae60"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M23.9583,-0.2463l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#16a085"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M28.041,-0.2463l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#2980b9"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M32.1237,-0.2463l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#1d99f3"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M36.2064,-4.329l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#9b59b6"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M36.2064,-0.2463l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#8e44ad"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M15.7928,5.8778l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#34495e"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M19.8756,5.8778l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#31363b"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M23.9583,5.8778l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#7f8c8d"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M28.041,5.8778l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#bdc3c7"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M32.1237,5.8778l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#fcfcfc"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M15.7928,9.9605l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#2c3e50"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M19.8756,9.9605l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#232629"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M23.9583,9.9605l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#4d4d4d"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M28.041,9.9605l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#95a5a6"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M32.1237,9.9605l4.0827,0l0,4.0827l-4.0827,0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="5.7692"
+      android:fillColor="#eff0f1"
+      android:strokeLineCap="square"/>
+  <path
+      android:pathData="M3.7026,1.1906A0.1323,0.1323 0,0 0,3.5858 1.264A0.1323,0.1323 0,0 0,3.6453 1.4413L3.9445,1.5911C4.0556,1.6468 4.1371,1.748 4.1672,1.8686L4.6013,3.6044C4.0697,3.6801 3.6613,4.0946 3.5987,4.6302L2.2221,4.6302C2.1532,4.0395 1.668,3.5724 1.0594,3.5719C1.0537,3.5718 1.048,3.5718 1.0423,3.5719L0.5292,3.5719A0.1323,0.1323 0,0 0,0.3969 3.7042A0.1323,0.1323 0,0 0,0.5292 3.8365L1.0423,3.8365A0.1323,0.1323 0,0 0,1.0433 3.8365C1.048,3.8364 1.0526,3.8364 1.0573,3.8365A0.1323,0.1323 0,0 0,1.0583 3.8365C1.5713,3.8365 1.9844,4.2495 1.9844,4.7625A0.1323,0.1323 0,0 0,2.1167 4.8948L3.7042,4.8948A0.1323,0.1323 0,0 0,3.8365 4.7625C3.8365,4.2495 4.2495,3.8365 4.7625,3.8365A0.1323,0.1323 0,0 0,4.8907 3.6721L4.4235,1.8045C4.3747,1.6092 4.2433,1.4446 4.0633,1.3544A0.1323,0.1323 0,0 0,4.0628 1.3544L3.7631,1.2046A0.1323,0.1323 0,0 0,3.7026 1.1906z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.265"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M4.7617,4.1367C4.4266,4.1367 4.1523,4.4109 4.1523,4.7461C4.1523,5.0812 4.4266,5.3555 4.7617,5.3555C5.0969,5.3555 5.3711,5.0812 5.3711,4.7461C5.3711,4.4109 5.0969,4.1367 4.7617,4.1367zM4.7617,4.3379C4.9879,4.3379 5.168,4.5199 5.168,4.7461C5.168,4.9723 4.9879,5.1543 4.7617,5.1543C4.5355,5.1543 4.3535,4.9723 4.3535,4.7461C4.3535,4.5199 4.5355,4.3379 4.7617,4.3379z"
+      android:strokeAlpha="0.997"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.201567"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.997"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m1.0222,4.1367c-0.3352,0 -0.6094,0.2742 -0.6094,0.6094 0,0.3352 0.2742,0.6094 0.6094,0.6094 0.3352,-0 0.6094,-0.2742 0.6094,-0.6094 -0,-0.3352 -0.2742,-0.6094 -0.6094,-0.6094zM1.0222,4.3379c0.2262,0 0.4062,0.182 0.4063,0.4082 -0,0.2262 -0.18,0.4082 -0.4063,0.4082 -0.2262,0 -0.4082,-0.182 -0.4082,-0.4082 0,-0.2262 0.182,-0.4082 0.4082,-0.4082z"
+      android:strokeAlpha="0.997"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.201567"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="0.997"
+      android:strokeLineCap="butt"/>
+</vector>
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/activated_background"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp">
-
-    <!-- Photo -->
-    <ImageView
-        android:id="@+id/list_item_photo"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="4dp"
-        android:contentDescription="@string/image_photo_marker"
-        android:scaleType="centerCrop" />
-
-    <!-- A gradient on top of the text -->
-    <ImageView
-        android:id="@+id/list_item_text_gradient"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:alpha=".6"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:contentDescription="@string/image_photo_marker"
-        android:src="@drawable/text_gradient" />
-
-    <!-- Icon -->
-    <ImageView
-        android:id="@+id/list_item_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:contentDescription="@string/image_track"
-        tools:src="@drawable/ic_activity_bike_24dp"/>
-
-    <!-- Name -->
-    <TextView
-        android:id="@+id/list_item_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        style="?attr/textAppearanceBody1"
-        android:singleLine="true"
-        android:layout_marginStart="8dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/list_item_icon"
-        app:layout_constraintEnd_toStartOf="@id/list_item_date"
-        tools:text="Main text" />
-
-    <!-- Date -->
-    <TextView
-        android:id="@+id/list_item_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?attr/textAppearanceBodySmall"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/list_item_name"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:gravity="end"
-        android:layout_marginStart="8dp"
-        tools:text="2022-02-17" />
-
-    <!-- Total time and distance -->
-    <TextView
-        android:id="@+id/list_item_time_distance"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        style="?attr/textAppearanceBodySmall"
-        app:layout_constraintTop_toBottomOf="@id/list_item_name"
-        app:layout_constraintStart_toStartOf="@id/list_item_name"
-        tools:text="50:43 (50.00km)" />
-
-    <!-- Marker count icon -->
-    <ImageView
-        android:id="@+id/list_item_marker_count_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/list_item_name"
-        app:layout_constraintStart_toEndOf="@id/list_item_time_distance"
-        app:layout_constraintBottom_toBottomOf="@id/list_item_time_distance"
-        android:contentDescription="@string/image_marker_count"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_marker_show_24dp" />
-
-    <!-- Marker count text -->
-    <TextView
-        android:id="@+id/list_item_marker_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?attr/textAppearanceBodySmall"
-        app:layout_constraintStart_toEndOf="@id/list_item_marker_count_icon"
-        app:layout_constraintBottom_toBottomOf="@id/list_item_marker_count_icon"
-        android:singleLine="true"
-        tools:text="2" />
-
-    <!-- Time -->
-    <TextView
-        android:id="@+id/list_item_time"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        style="?attr/textAppearanceBodySmall"
-        app:layout_constraintTop_toBottomOf="@id/list_item_name"
-        app:layout_constraintStart_toEndOf="@id/list_item_marker_count"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:gravity="end"
-        android:layout_gravity="bottom"
-        android:layout_marginStart="8dp"
-        tools:text="10:10:10"/>
-
-    <!-- Second row barrier -->
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/list_item_second_row_barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="list_item_time_distance,list_item_marker_count_icon,list_item_marker_count,list_item_time" />
-
-    <!-- Category and description -->
-    <TextView
-        android:id="@+id/list_item_category_description"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        style="?attr/textAppearanceBodySmall"
-        app:layout_constraintTop_toBottomOf="@id/list_item_second_row_barrier"
-        app:layout_constraintStart_toStartOf="@id/list_item_name"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:maxLines="2"
-        android:ellipsize="end"
-        tools:text="Description" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
@@ -37,7 +37,7 @@ limitations under the License.
        android:paddingBottom="?attr/actionBarSize"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-        <ListView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/marker_list"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/activated_background"
+    android:padding="8dp">
+
+    <!-- Photo -->
+    <ImageView
+        android:id="@+id/marker_list_item_photo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/image_photo_marker"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toTopOf="@id/marker_list_item_bottom_line"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <!-- A gradient on top of the text -->
+    <ImageView
+        android:id="@+id/marker_list_item_text_gradient"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha=".6"
+        android:contentDescription="@string/image_photo_marker"
+        android:src="@drawable/text_gradient"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/marker_list_item_bottom_line"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <!-- Name -->
+    <TextView
+        android:id="@+id/marker_list_item_name"
+        style="?attr/textAppearanceBody1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Main text" />
+
+    <!-- Date -->
+    <TextView
+        android:id="@+id/marker_list_item_date"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="2022-02-17" />
+
+    <!-- Total time and distance -->
+    <TextView
+        android:id="@+id/marker_list_item_time_distance"
+        style='?attr/textAppearanceBodySmall'
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@+id/marker_list_item_name"
+        app:layout_constraintTop_toBottomOf="@+id/marker_list_item_name"
+        tools:text="50:43 (50.00km)" />
+
+    <!-- Time -->
+    <TextView
+        android:id="@+id/marker_list_item_time"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/marker_list_item_name"
+        tools:text="10:10:10" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/marker_list_item_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="marker_list_item_photo,marker_list_item_text_gradient,marker_list_item_name,marker_list_item_date,marker_list_item_time_distance,marker_list_item_time" />
+
+    <!-- Bottom Line -->
+    <View
+        android:id="@+id/marker_list_item_bottom_line"
+        style="@style/HorizontalLine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/marker_list_item_barrier" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -584,53 +584,85 @@
            app:layout_constraintEnd_toStartOf="@id/guideline3"
            app:layout_constraintTop_toBottomOf="@id/stats_cadence_barrier" />

-        <!-- Sensors data -->
        <androidx.constraintlayout.widget.Group
            android:id="@+id/stats_power_group"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:visibility="gone"
-            app:constraint_referenced_ids="stats_power_horizontal_line,stats_power_label,stats_power_value,stats_power_unit" />
+            app:constraint_referenced_ids="stats_power_horizontal_line,stats_max_power_label,stats_max_power_value,stats_max_power_unit,stats_avg_power_label,stats_avg_power_value,stats_avg_power_unit" />

        <TextView
-            android:id="@+id/stats_power_label"
+            android:id="@+id/stats_max_power_label"
            style="@style/TextAppearance.OpenTracks.PrimaryHeader"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="@string/sensor_state_power_avg"
+            android:text="@string/sensor_state_power_max"
            app:layout_constrainedWidth="true"
            app:layout_constraintStart_toEndOf="@id/guideline"
            app:layout_constraintEnd_toStartOf="@id/guideline2"
            app:layout_constraintTop_toBottomOf="@id/stats_power_horizontal_line" />

        <TextView
-            android:id="@+id/stats_power_value"
+            android:id="@+id/stats_max_power_value"
            style="@style/TextAppearance.OpenTracks.PrimaryValue"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:value="@string/value_unknown"
            app:layout_constraintHorizontal_chainStyle="packed"
            app:layout_constraintStart_toEndOf="@id/guideline"
-            app:layout_constraintEnd_toStartOf="@id/stats_power_unit"
-            app:layout_constraintTop_toBottomOf="@id/stats_power_label"
+            app:layout_constraintEnd_toStartOf="@id/stats_max_power_unit"
+            app:layout_constraintTop_toBottomOf="@id/stats_max_power_label"
            tools:text="100" />

        <TextView
-            android:id="@+id/stats_power_unit"
+            android:id="@+id/stats_max_power_unit"
            style="@style/TextAppearance.OpenTracks.PrimaryUnit"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/sensor_state_power_unit"
-            app:layout_constraintBottom_toBottomOf="@id/stats_power_value"
-            app:layout_constraintStart_toEndOf="@id/stats_power_value"
+            app:layout_constraintBottom_toBottomOf="@id/stats_max_power_value"
+            app:layout_constraintStart_toEndOf="@id/stats_max_power_value"
            app:layout_constraintEnd_toStartOf="@id/guideline2" />

+        <TextView
+            android:id="@+id/stats_avg_power_label"
+            style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_power_avg"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/guideline2"
+            app:layout_constraintEnd_toEndOf="@id/guideline3"
+            app:layout_constraintTop_toBottomOf="@id/stats_power_horizontal_line" />
+
+        <TextView
+            android:id="@+id/stats_avg_power_value"
+            style="@style/TextAppearance.OpenTracks.PrimaryValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:value="@string/value_unknown"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/guideline2"
+            app:layout_constraintEnd_toStartOf="@id/stats_avg_power_unit"
+            app:layout_constraintTop_toBottomOf="@id/stats_avg_power_label"
+            tools:text="100" />
+
+        <TextView
+            android:id="@+id/stats_avg_power_unit"
+            style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_power_unit"
+            app:layout_constraintBottom_toBottomOf="@id/stats_avg_power_value"
+            app:layout_constraintStart_toEndOf="@id/stats_avg_power_value"
+            app:layout_constraintEnd_toStartOf="@id/guideline3" />
+
        <androidx.constraintlayout.widget.Barrier
            android:id="@+id/stats_power_barrier"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="stats_power_value" />
+            app:constraint_referenced_ids="stats_max_power_value,stats_avg_power_value" />

        <!-- Horizontal Line -->
        <View
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp">
-
-    <TextView
-        android:id="@+id/stats_description_main"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/TextAppearance.OpenTracks.PrimaryHeader"
-        tools:text="@string/sensor_state_heart_rate"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/stats_value"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/TextAppearance.OpenTracks.PrimaryValue"
-        android:value="@string/value_unknown"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintTop_toBottomOf="@id/stats_description_main"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/stats_unit"
-        tools:text="90" />
-
-    <TextView
-        android:id="@+id/stats_unit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/TextAppearance.OpenTracks.PrimaryUnit"
-        tools:text="@string/sensor_unit_beats_per_minute"
-        app:layout_constraintStart_toEndOf="@id/stats_value"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="@id/stats_value" />
-
-    <TextView
-        android:id="@+id/stats_description_secondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/TextAppearance.OpenTracks.SecondaryHeader"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/stats_value"
-        tools:visibility="visible"
-        tools:text="90" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
@@ -39,7 +39,7 @@ limitations under the License.
        android:paddingBottom="?attr/actionBarSize"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-        <ListView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/track_list"
            android:layout_width="match_parent"
            android:layout_height="0dp"
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/activated_background"
+    android:padding="8dp">
+
+    <!-- Icon -->
+    <ImageView
+        android:id="@+id/track_list_item_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/image_track"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_activity_bike_24dp" />
+
+    <!-- Name -->
+    <TextView
+        android:id="@+id/track_list_item_name"
+        style="?attr/textAppearanceBody1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:singleLine="true"
+        app:layout_constraintStart_toEndOf="@id/track_list_item_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Main Text" />
+
+    <!-- Date -->
+    <TextView
+        android:id="@+id/track_list_item_date"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="2022-02-17" />
+
+    <!-- Total time and distance -->
+    <TextView
+        android:id="@+id/track_list_item_time_distance"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/track_list_item_name"
+        app:layout_constraintTop_toBottomOf="@id/track_list_item_name"
+        tools:text="50:43 (50.00km)" />
+
+    <!-- Marker Count Icon -->
+    <ImageView
+        android:id="@+id/track_list_item_marker_count_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/image_marker_count"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_marker_show_24dp"
+        app:layout_constraintBottom_toBottomOf="@id/track_list_item_time_distance"
+        app:layout_constraintStart_toEndOf="@id/track_list_item_time_distance"
+        app:layout_constraintTop_toBottomOf="@id/track_list_item_name" />
+
+    <!-- Marker count -->
+    <TextView
+        android:id="@+id/track_list_item_marker_count"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        app:layout_constraintBottom_toBottomOf="@id/track_list_item_marker_count_icon"
+        app:layout_constraintStart_toEndOf="@id/track_list_item_marker_count_icon"
+        tools:text="2" />
+
+    <!-- Time -->
+    <TextView
+        android:id="@+id/track_list_item_time"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/track_list_item_name"
+        tools:text="10:10:10" />
+
+    <!-- Second row barrier -->
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/track_list_item_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="track_list_item_time_distance,track_list_item_marker_count_icon,track_list_item_marker_count,track_list_item_time" />
+
+    <!-- Category and description -->
+    <TextView
+        android:id="@+id/track_list_item_category_description"
+        style="?attr/textAppearanceBodySmall"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/track_list_item_name"
+        app:layout_constraintTop_toBottomOf="@id/track_list_item_barrier"
+        tools:text="Description" />
+
+    <!-- Bottom Line -->
+    <View
+        android:id="@+id/marker_list_item_bottom_line"
+        style="@style/HorizontalLine"
+        android:layout_marginBottom="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/track_list_item_category_description" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -126,7 +126,6 @@ limitations under the License.
    <string name="gps_wait_for_signal">في انتظار إشارة نظام تحديد المواقع العالمي (GPS)‬</string>
    <!-- Image -->
    <string name="image_arrow">سهم</string>
-    <string name="image_marker">علامة</string>
    <string name="image_marker_count">عدد العلامات</string>
    <string name="image_photo_marker">علامة الصورة</string>
    <string name="image_record">تسجيل</string>
@@ -163,8 +162,6 @@ limitations under the License.
    <string name="menu_settings">الإعدادات</string>
    <string name="menu_share">مشاركة</string>
    <string name="menu_show_on_map">إظهار على الخريطة</string>
-    <string name="menu_start_gps">بدء GPS</string>
-    <string name="menu_stop_gps">إيقاف GPS</string>
    <!-- OpenTracks -->
    <string name="recording_service">خدمة التسجيل</string>
    <!-- Search -->
@@ -193,7 +190,6 @@ limitations under the License.
    <string name="settings_reset_confirm_title">إعادة التعيين الآن؟</string>
    <string name="settings_reset_done">لقد تمت إعادة جميع الإعدادات إلى القيم الافتراضية</string>
    <!-- Settings Sensor -->
-    <string name="settings_sensor_bluetooth">البلوتوث</string>
    <!-- Settings Stats -->
    <string name="settings_stats_rate_title">المعدل المفضل</string>
    <string name="settings_stats_units_imperial">وحدات القياس البريطانية (ميل، قدم)</string>
@@ -104,7 +104,6 @@
    <string name="gps_wait_for_better_signal">Waiting for a better GPS signal</string>
    <string name="gps_wait_for_signal">Waiting for GPS signal</string>
    <string name="image_arrow">Arrow</string>
-    <string name="image_marker">Marker</string>
    <string name="image_marker_count">Marker count</string>
    <string name="image_photo_marker">Photo marker</string>
    <string name="image_record">Record</string>
@@ -135,8 +134,6 @@
    <string name="menu_settings">Settings</string>
    <string name="menu_share">Share</string>
    <string name="menu_show_on_map">Show on map</string>
-    <string name="menu_start_gps">Start GPS</string>
-    <string name="menu_stop_gps">Stop GPS</string>
    <string name="recording_service">Recording service</string>
    <string name="sensor_state_heart_rate">Heart rate</string>
    <string name="sensor_state_heart_rate_value">%1$d bpm</string>
@@ -158,7 +155,6 @@
    <string name="settings_reset_confirm_message">All settings will be reverted to default values.</string>
    <string name="settings_reset_confirm_title">Reset now?</string>
    <string name="settings_reset_done">All settings have been reverted to default values</string>
-    <string name="settings_sensor_bluetooth">Bluetooth</string>
    <string name="settings_stats_rate_title">Preferred rate</string>
    <string name="settings_stats_units_imperial">Imperial (miles, ft)</string>
    <string name="settings_stats_units_metric">Metric (km, m)</string>
@@ -104,7 +104,6 @@
    <string name="gps_wait_for_better_signal">Esperando una mejor señal de GPS</string>
    <string name="gps_wait_for_signal">Esperando señal de GPS</string>
    <string name="image_arrow">Flecha</string>
-    <string name="image_marker">Marcador</string>
    <string name="image_marker_count">Recuento de marcadores</string>
    <string name="image_photo_marker">Marcador de foto</string>
    <string name="image_record">Grabar</string>
@@ -136,8 +135,6 @@
    <string name="menu_settings">Configuración</string>
    <string name="menu_share">Compartir</string>
    <string name="menu_show_on_map">Mostrar en el mapa</string>
-    <string name="menu_start_gps">Iniciar GPS</string>
-    <string name="menu_stop_gps">Detener GPS</string>
    <string name="menu_resume_track">Reanudar recorrido</string>
    <string name="recording_service">Servicio de grabación</string>
    <string name="sensor_state_heart_rate">Frecuencia cardíaca</string>
@@ -160,7 +157,6 @@
    <string name="settings_reset_confirm_message">Todos las configuraciones se restablecerán a los valores predeterminados. Esto no eliminará ningún recorrido en el dispositivo.</string>
    <string name="settings_reset_confirm_title">¿Restablecer ahora?</string>
    <string name="settings_reset_done">Se restablecieron los valores predeterminados de todas las configuraciones</string>
-    <string name="settings_sensor_bluetooth">Bluetooth</string>
    <string name="settings_stats_rate_title">Tasa preferida</string>
    <string name="settings_stats_units_imperial">Imperiales (millas, pies)</string>
    <string name="settings_stats_units_metric">Métricas (km, m)</string>
@@ -331,7 +327,6 @@
 \na) (actualizaciones en vivo) Instale <a href="https://github.com/OpenTracksApp/OSMDashboard"> OSMDashboard </a>. Proporciona mapas en línea o fuera de línea a través de <a href="https://www.openstreetmap.org"> OpenStreetMap </a>.
 \nEn realidad, OSMDashboard es una aplicación separada que solo puede acceder (temporalmente) a los datos de los recorridos que se mostrarán.
 \nb) A través de una aplicación de mapas normal (p. ej., <a href="http://osmand.net/"> OsmAnd </a> y <a href="https://maps.me/"> MAPS.ME </a>). Estas aplicaciones deben admitir el formato de archivo KMZ (solo ubicaciones y marcas de tiempo). De hecho, una aplicación debe admitir <i> ACTION_VIEW </i> con MIME <i> application / vnd.google-earth.kmz</i>. </string>
-    <string name="delete_service">Borrar servicio</string>
    <string name="about_third_party_data">Datos de terceros</string>
    <string name="about_libraries">Bibliotecas</string>
    <string name="help_feature_title">OpenTracks tiene las siguientes características:</string>
@@ -352,8 +347,6 @@
    <string name="help_data_storage_title">¿Cómo almacena OpenTracks los datos de los sensores\?</string>
    <string name="help_gps_troubleshooting_title">¿OpenTracks no registra ubicaciones\?</string>
    <string name="help_support_title">¿Cómo puedo ayudar a OpenTracks\?</string>
-    <string name="open_track_as_KML">Abrir como KML</string>
-    <string name="open_track_as_GPX">Abrir como GPX</string>
    <string name="open_track_as_trackfileformat">Abrir como %1$s</string>
    <string name="activity_type_escooter">moto</string>
    <string name="description_speed_ms">Velocidad (m/s)</string>
@@ -425,11 +418,10 @@
    <string name="generic_filter">Filtrar</string>
    <string name="menu_select_layout">Seleccionar diseño</string>
    <string name="settings_import_export_title">Importar/Exportar</string>
-    <string name="settings_announcements_title">Avisos de voz</string>
+    <string name="settings_announcements_statistics_title">Avisos de voz</string>
    <string name="settings_announcements_summary">Tiempo, Distancia, Velocidad de la voz</string>
    <string name="settings_import_export_summary">Importar, Exportar, Autoexportar</string>
    <string name="settings_units_category">Unidades</string>
-    <string name="settings_recording_idle_speed_title">Umbral de velocidad de ralentí</string>
    <string name="custom_layout_select_layout">Seleccionar diseño</string>
    <string name="stats_custom_layout_default_layout">Diseño predeterminado</string>
    <string name="settings_generic_sensor">Genérico</string>
@@ -126,7 +126,6 @@ limitations under the License.
    <string name="gps_wait_for_signal">Изчаква се сигнал за GPS</string>
    <!-- Image -->
    <string name="image_arrow">Стрелка</string>
-    <string name="image_marker">Маркер</string>
    <string name="image_marker_count">Брой маркери</string>
    <string name="image_photo_marker">Маркер за снимки</string>
    <string name="image_record">Запис</string>
@@ -163,8 +162,6 @@ limitations under the License.
    <string name="menu_settings">Настройки</string>
    <string name="menu_share">Споделяне</string>
    <string name="menu_show_on_map">Показване на картата</string>
-    <string name="menu_start_gps">Стартиране на GPS</string>
-    <string name="menu_stop_gps">Спиране на GPS</string>
    <!-- OpenTracks -->
    <string name="recording_service">Услуга за запис</string>
    <!-- Search -->
@@ -193,7 +190,6 @@ limitations under the License.
    <string name="settings_reset_confirm_title">Да се зададе ли повторно сега?</string>
    <string name="settings_reset_done">Всички настройки са възстановени до стойностите по подразбиране</string>
    <!-- Settings Sensor -->
-    <string name="settings_sensor_bluetooth">Bluetooth</string>
    <!-- Settings Stats -->
    <string name="settings_stats_rate_title">Предпочитана мярка</string>
    <string name="settings_stats_units_imperial">Имперски (мил, фт)</string>
@@ -312,7 +308,6 @@ limitations under the License.
    <string name="waypoint_type_water_fountain">чешма</string>
    <string name="waypoint_type_waypoint">пътна точка</string>
    <string name="generic_completed">Завършен</string>
-    <string name="open_track_as_GPX">Отваряне като GPX</string>
    <string name="sensor_state_heart_rate_max">Максимален пулс</string>
    <string name="help_gps_troubleshooting_title">OpenTracks не записва локации\?</string>
    <string name="track_pace_notification">Темп: %1$s</string>
@@ -352,7 +347,6 @@ limitations under the License.
 \n б) Чрез нормално приложение за карти (напр. чрез <a href="http://osmand.net/">OsmAnd</a> и <a href="https://maps.me/">MAPS.ME</a>). Тези приложения трябва да поддържат файловия формат KMZ (само местоположения и времеви марки). Всъщност едно приложение трябва да поддържа <i>ACTION_VIEW</i> с MIME <i>application/vnd.google-earth.kmz</i>. </string>
    <string name="help_data_storage_title">Как OpenTracks съхранява данните от сензорите\?</string>
    <string name="help_data_storage_content"> Данните от сензора се съхраняват за всяко записано място. По отношение на сензора за сърдечен ритъм това означава, че само <i>едно</i> измерване на сърдечния ритъм се съхранява за всяко местоположение. Ако стоите неподвижно или се намирате на закрито, няма да бъдат записани данни от сензора (но те ще бъдат </string>
-    <string name="open_track_as_KML">Отваряне като KML</string>
    <string name="open_track_as_trackfileformat">Отворете като %1$s</string>
    <string name="description_altitude_loss">Загуба на височина: %1$d m (%2$d ft)</string>
    <string name="help_recording_content">OpenTracks използва GPS сензора на устройството, за да записва непрекъснато местоположението. Ако GPS устройството съобщи неточни данни (напр. местоположение, скорост, надморска височина), OpenTracks не може да направи нищо по въпроса.</string>
@@ -400,7 +394,6 @@ limitations under the License.
    <string name="permission_gps_failed">OpenTracks изисква разрешение за използване на GPS.</string>
    <string name="sensor_state_power_avg">Средна мощност</string>
    <string name="help_feature_title">OpenTracks има следните функции:</string>
-    <string name="delete_service">Услуга за изтриване</string>
    <string name="settings_night_mode_option_system">Система</string>
    <string name="settings_prevent_reimport_tracks_title">Забрана за повторно импортиране на песни</string>
    <string name="export_progress_summary_skip_msg">Пропуснати писти</string>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dennis Guse	374656aa6b	Release: v4.9.2	2023-10-10 20:08:19 +02:00
Åzze	c623475c95	Translated using Weblate (Finnish) Currently translated at 92.5% (474 of 512 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/fi/	2023-10-10 06:30:14 +00:00
Hosted Weblate	316e21a2c4	Update translation files Updated by "Remove blank strings" hook in Weblate. Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/	2023-10-10 06:30:13 +00:00
mondstern	9dedfb38bc	Translated using Weblate (Catalan) Currently translated at 0.8% (1 of 120 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/ca/	2023-10-10 06:30:12 +00:00
plum7x	eb7552acdb	Translated using Weblate (Chinese (Traditional)) Currently translated at 99.2% (508 of 512 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/zh_Hant/	2023-10-10 06:30:12 +00:00
ovl-1	79729cd4a7	Translated using Weblate (Norwegian Bokmål) Currently translated at 97.2% (498 of 512 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nb_NO/	2023-10-10 06:30:11 +00:00
mondstern	12c2c7cae0	Translated using Weblate (Catalan) Currently translated at 52.5% (269 of 512 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/ca/	2023-10-10 06:30:10 +00:00
Dennis Guse	504e27a9df	Android12+: use user-defined DynamicColors.	2023-10-10 08:29:32 +02:00
Dennis Guse	5fbc079d96	Android12+: use user-defined DynamicColors.	2023-10-10 08:25:05 +02:00
Dennis Guse	54fb70053c	Settings: use category for recording UI settings.	2023-10-10 08:25:05 +02:00
Dennis Guse	ea7d754482	Bugfix: voice announcement setting for total distance was removed.	2023-10-10 08:25:05 +02:00
Dennis Guse	1647b821e6	Bump com.android.tools.build:gradle from 8.1.0-beta04 to 8.1.0-beta06	2023-10-10 08:25:05 +02:00
Dennis Guse	5ced5e2c0b	Cleanup: remove unused method.	2023-10-10 07:37:05 +02:00
Dennis Guse	31ea1348de	Predictive back: enable. Part of #1708.	2023-10-10 07:37:05 +02:00
Dennis Guse	3995e2b609	Upgrade to Gradlew 8.4.0	2023-10-09 08:12:56 +02:00
dependabot[bot]	eddf6ffc04	Bump org.mockito:mockito-android from 5.5.0 to 5.6.0 Bumps [org.mockito:mockito-android](https://github.com/mockito/mockito) from 5.5.0 to 5.6.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.5.0...v5.6.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-09 08:10:58 +02:00
Leon Marz	88b860af5a	Marker List: Fix crashes in selection mode	2023-10-08 14:20:40 +02:00
Leon Marz	1708e09c5a	Change missing line for `afbe94195c`	2023-10-08 14:20:40 +02:00
Dennis Guse	07abf50fca	Release: v4.9.1	2023-10-08 13:29:11 +02:00
Leon Marz	afbe94195c	TrackList: Fix crashes in selection mode Fixes: #1711	2023-10-08 13:27:12 +02:00
dependabot[bot]	8ca208a631	Bump com.google.android.material:material from 1.9.0 to 1.10.0 Bumps [com.google.android.material:material](https://github.com/material-components/material-components-android) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](https://github.com/material-components/material-components-android/compare/1.9.0...1.10.0) --- updated-dependencies: - dependency-name: com.google.android.material:material dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-05 22:54:49 +02:00
Dennis Guse	7b6120abf4	Cleanup: remove unused resources.	2023-10-03 17:42:58 +02:00
Dennis Guse	2c9726f643	Bugfix: preferred speed for nautical setting was not showing correct options.	2023-10-03 17:28:01 +02:00
ovl-1	b3d610b791	Translated using Weblate (Norwegian Bokmål) Currently translated at 97.1% (504 of 519 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nb_NO/	2023-09-30 14:02:52 +02:00
Stephan Paternotte	409ddfd31c	Translated using Weblate (Dutch) Currently translated at 100.0% (120 of 120 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/	2023-09-28 21:58:22 +02:00
josé m	2d47f1895b	Translated using Weblate (Galician) Currently translated at 100.0% (519 of 519 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/gl/	2023-09-28 21:58:22 +02:00
Fjuro	1d89d68e59	Translated using Weblate (Czech) Currently translated at 100.0% (519 of 519 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/cs/	2023-09-28 21:58:22 +02:00
ovl-1	3ebce4be7c	Translated using Weblate (Norwegian Bokmål) Currently translated at 96.3% (500 of 519 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nb_NO/	2023-09-28 21:58:22 +02:00
gallegonovato	a7954382fd	Translated using Weblate (Spanish) Currently translated at 100.0% (519 of 519 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/es/	2023-09-28 21:58:22 +02:00
josé m	1d036a096a	Translated using Weblate (Galician) Currently translated at 99.0% (514 of 519 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/gl/	2023-09-28 21:58:22 +02:00
Stephan Paternotte	d952593687	Translated using Weblate (Dutch) Currently translated at 100.0% (519 of 519 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nl/	2023-09-28 21:58:22 +02:00
pixeebot[bot]	83445cfde0	Switch order of literals to prevent NullPointerException (#4 ) Co-authored-by: pixeebot[bot] <23113631+pixeebot@users.noreply.github.com>	2023-09-28 21:58:22 +02:00
Dennis Guse	aae1a4d65d	Merge pull request #1710 from OpenTracksApp/cleanup Cleanup: use record if possible	2023-09-28 21:58:17 +02:00
Dennis Guse	cb3904ee0b	Cleanup: SensorStatistics is a record.	2023-09-28 20:06:13 +02:00
Dennis Guse	684756c264	Cleanup: SelectionData is a record.	2023-09-28 20:00:47 +02:00
Dennis Guse	bc857faa18	Cleanup: ChartPoint is a record.	2023-09-28 19:57:15 +02:00
Dennis Guse	e9b02df631	Cleanup.	2023-09-28 19:39:43 +02:00
Dennis Guse	648ebadb36	Release: v4.9.0	2023-09-26 20:57:59 +02:00
Dennis Guse	fda9ef9dd7	Bugfix: TrackList should only mark the currently recording track as recording.	2023-09-26 20:48:11 +02:00
Dennis Guse	2b08eb3287	Cleanup: removed unnecessary getter from data class RecordingStatus.	2023-09-26 08:13:32 +02:00
Leon Marz	f4cec0a8b2	Fix broken TrackList UI tests	2023-09-26 07:16:34 +02:00
Dennis Guse	b5e88b3e05	Merge pull request #1707 from OpenTracksApp/idleDetection#1187 Idle detection#1187	2023-09-25 18:00:43 +02:00
Dennis Guse	83da4f8f34	Idle: add voice announcement (user configurable). Fixes of #1174	2023-09-25 17:59:17 +02:00
Dennis Guse	9a50d7bedf	Idle: move idle into TrackStatistics.	2023-09-25 17:59:17 +02:00
Dennis Guse	348cb16256	ExportImportTest: extract test for checking recording.	2023-09-25 17:59:17 +02:00
Dennis Guse	7d739e3640	TrackStatisticsUpdater: remove check for max acceleration (was still used for max speed).	2023-09-25 17:59:17 +02:00
Dennis Guse	78d2a0722a	Idle: TrackRecordingManager creates IDLE TrackPoints (configurable timeout). Fixes of #1187.	2023-09-25 17:59:17 +02:00
Dennis Guse	00debe2eb5	Idle: TrackRecordingManager creates IDLE TrackPoints (import/export GPX/KML). Fixes of #1187.	2023-09-25 17:59:17 +02:00
Dennis Guse	6be9d2477c	Idle: TrackRecordingManager creates IDLE TrackPoints. Fixes of #1187.	2023-09-25 17:59:17 +02:00
Dennis Guse	60fd1cd105	Merge pull request #1704 from OpenTracksApp/action-test Re-enable Github Action executes tests.	2023-09-23 23:01:00 +02:00
Dennis Guse	b360191055	Github action: test runner uses updated dependencies and only executes agains API34.	2023-09-23 23:00:34 +02:00
Dennis Guse	8a20edb83a	Revert "Github Actions: disable test execution as results are flaky due to performance limitations." This reverts commit `8f9cbcc077`.	2023-09-23 23:00:34 +02:00
Dennis Guse	165dd401f4	Activity: added scooter (incl. icon). Fixes #1695.	2023-09-23 21:52:07 +02:00
Dennis Guse	10e65035ee	Cleanup: use List.of().	2023-09-23 21:33:47 +02:00
Dennis Guse	f797ce0872	Fix tests due to `cf9b432224`	2023-09-23 16:46:53 +02:00
Dennis Guse	4425fbae90	Revert "Bump androidx.mediarouter:mediarouter from 1.4.0 to 1.6.0" This reverts commit `f643d86772`.	2023-09-23 15:57:03 +02:00
josé m	f2c1d08f60	Translated using Weblate (Galician) Currently translated at 13.4% (16 of 119 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/gl/	2023-09-21 07:32:04 +02:00
Maksym Movchan	481c77679b	Translated using Weblate (Ukrainian) Currently translated at 97.8% (503 of 514 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/uk/	2023-09-21 07:32:04 +02:00
Stephan Paternotte	1029460e64	Translated using Weblate (Dutch) Currently translated at 100.0% (119 of 119 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/	2023-09-21 07:32:04 +02:00
Stephan Paternotte	b250d95e41	Translated using Weblate (Dutch) Currently translated at 100.0% (514 of 514 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/nl/	2023-09-21 07:32:04 +02:00
josé m	bd99daddd4	Translated using Weblate (Galician) Currently translated at 100.0% (514 of 514 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/gl/	2023-09-21 07:32:04 +02:00
Fjuro	b3af0b3b5f	Translated using Weblate (Czech) Currently translated at 100.0% (514 of 514 strings) Translation: OpenTracks/opentracks.src-main-res-values-strings-xml--main Translate-URL: https://hosted.weblate.org/projects/opentracks/opentracks-src-main-res-values-strings-xml-main/cs/	2023-09-21 07:32:04 +02:00
josé m	a151b78da7	Translated using Weblate (Galician) Currently translated at 11.8% (14 of 118 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/gl/	2023-09-21 07:32:04 +02:00
Stephan Paternotte	3f760c28da	Translated using Weblate (Dutch) Currently translated at 100.0% (118 of 118 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/	2023-09-21 07:32:04 +02:00
Stephan Paternotte	50d20f297e	Translated using Weblate (Dutch) Currently translated at 100.0% (117 of 117 strings) Translation: OpenTracks/App store metadata files Translate-URL: https://hosted.weblate.org/projects/opentracks/app-store-metadata-files/nl/	2023-09-21 07:32:04 +02:00
dependabot[bot]	f643d86772	Bump androidx.mediarouter:mediarouter from 1.4.0 to 1.6.0 Bumps androidx.mediarouter:mediarouter from 1.4.0 to 1.6.0. --- updated-dependencies: - dependency-name: androidx.mediarouter:mediarouter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-09-21 07:31:59 +02:00
Dennis Guse	a6f5635cb8	Release: v4.8.4	2023-09-17 10:18:46 +02:00
Dennis Guse	bebf89608c	Bump com.android.tools.build:gradle from 8.2.0-beta01 to 8.2.0-beta04	2023-09-17 10:17:35 +02:00
Dennis Guse	0cf02082d3	Merge pull request #1687 from lmarz/track TrackListActivity: Switch to RecyclerView Fixes #1613	2023-09-14 22:06:00 +02:00
Leon Marz	e18017d500	TrackListActivity: Switch to RecyclerView Part of: #1613	2023-09-14 18:11:02 +02:00
Leon Marz	7776b51f05	TrackListActivity: Set launchMode to singleTop	2023-09-14 18:11:02 +02:00
Leon Marz	30c76de136	Add recycler view adapter for track list	2023-09-14 18:11:02 +02:00
Leon Marz	853469cb28	ContentProviderUtils.java: Add searchTracks method	2023-09-14 18:11:02 +02:00
quaelnix	cf9b432224	Add max power stats	2023-09-13 18:38:32 +02:00
dependabot[bot]	e130039118	Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-09-07 09:54:38 +02:00
Martin Herrman	adb491ee81	Update README.md Add SportsTracker to file format compatibility table	2023-09-05 22:57:52 +02:00
Dennis Guse	1b295e06da	Release: v4.8.3	2023-08-31 22:07:48 +02:00
Dennis Guse	4ca6b230c3	Bugfix: prevent crash due to invalid UUID example (Android 14+ / API34+). Fixes #1682.	2023-08-31 22:05:31 +02:00
Dennis Guse	bb722de756	Upgrade to Gradlew 8.3.0	2023-08-28 20:31:14 +02:00
Dennis Guse	8eab847fae	Merge pull request #1672 from lmarz/marker MarkerListActivity: Switch to RecyclerView	2023-08-28 20:17:38 +02:00
Leon Marz	c256cbe07d	MarkerListActivity: Switch to RecyclerView Part of: #1613	2023-08-28 10:02:00 +02:00
Leon Marz	5978886a18	Add recycler view adapter for marker list	2023-08-28 10:02:00 +02:00
Leon Marz	7afa4b86d4	ContentProviderUtils: Add searchMarkers method	2023-08-28 10:01:51 +02:00
				`@@ -0,0 +1 @@`
				`Un amic rastrejador esportiu que respecta la vostra privadesa.`