Release: v4.3.4

Build: remove resConfigs limiting included languages.
Fixes #1527.
2023-05-01 12:53:35 +02:00 · 2023-05-01 12:44:19 +02:00 · 2023-04-27 18:49:23 +02:00 · 2023-04-26 07:19:11 +02:00 · 2023-04-26 07:19:11 +02:00 · 2023-04-24 07:01:14 +02:00
199 changed files with 4331 additions and 2978 deletions
@@ -13,7 +13,7 @@ jobs:
      - uses: actions/setup-java@v3
        with:
          distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'

      - name: Assemble APK
        shell: bash
@@ -16,6 +16,6 @@ jobs:
      - uses: actions/setup-java@v3
        with:
          distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'

      - run: ./gradlew lint
@@ -1,3 +1,6 @@
+# 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:
@@ -2,7 +2,7 @@

 _OpenTracks_ is a sport tracking application that completely respects your privacy.

-[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
+[![Awesome Humane Tech](https://codeberg.org/teaserbot-labs/delightful-humane-design/raw/branch/main/humane-tech-badge.svg)](https://delightful.club/delightful-humane-design/#health)

 <table>
    <tr>
@@ -40,8 +40,10 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
    </tr>
 </table>

-<a href="https://weblate.bubu1.eu/engage/OpenTracks/">
-	<img src="https://weblate.bubu1.eu/widgets/OpenTracks/-/opentracks/horizontal-auto.svg" alt="Translation status" />
+Translations are hosted on <a href="https://hosted.weblate.org/engage/opentracks/">
+hosted.weblate.org</a>.
+<a href="https://hosted.weblate.org/engage/opentracks/">
+<img src="https://hosted.weblate.org/widgets/opentracks/-/horizontal-auto.svg" alt="Translation status" />
 </a>

 ## Screenshots
@@ -129,6 +131,7 @@ The Public API is disabled by default to protect the user's privacy, but it can
 | [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                                                                  |

 ## Dashboard API (incl. map)

@@ -149,7 +152,7 @@ The developer documentation is in [README_API.md](README_API.md).
 ## Project history

 _OpenTracks_ is based upon Google _My Tracks app_ ([code](https://code.google.com/archive/p/mytracks/)).
-Initially, _My Tracks_ was initially released by Google in 2010 as [open-source software](http://google-latlong.blogspot.fr/2010/05/code-for-my-tracks-is-now-yours.html).
+_My Tracks_ was initially released by Google in 2010 as [open-source software](http://google-latlong.blogspot.fr/2010/05/code-for-my-tracks-is-now-yours.html).
 In 2016, [Google decided to discontinue](https://support.google.com/maps/answer/6333516) _My Tracks_ and stopped distributing it via the Google Play store in April 2016.
 Then [Plonk42](https://github.com/plonk42) conducted some maintenance work until 2016, so _My Tracks_ could still be used (based upon version _Google's MyTracks_ version 2.0.6).
 Plonk42's version is available [here](https://github.com/Plonk42/mytracks).
@@ -17,10 +17,10 @@ Application id: de.dennisguse.opentracks
 It if it properly tagged F-Droid takes care of building the app and publishing.
 Usually, it takes two days before the update is published (build, signed, and published). 

-The recent build activity can be found [here](https://f-droid.org/wiki/index.php?title=Special:RecentChanges&days=7&from=&hidebots=0&hideanons=1&hideliu=1&limit=500)
+The recent build activity can be found [here](https://monitor.f-droid.org/builds/build)

 ## Google Play Store
-Application id: de.dennisguse.opentracks.playstore
+Application id: `de.dennisguse.opentracks.playstore`

 Requirement: `gem install fastlane`

@@ -35,4 +35,6 @@ Supported languages: https://support.google.com/googleplay/android-developer/tab

 ## Translations (localization)

-Translations of the OpenTracks are handled in Weblate: [https://weblate.bubu1.eu/projects/OpenTracks/](https://weblate.bubu1.eu/projects/OpenTracks/).
+Translations of the OpenTracks are handled in
+Weblate: [https://hosted.weblate.org/projects/opentracks/](https://hosted.weblate.org/projects/opentracks)
+.
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.0-beta01'
    }
 }

@@ -47,20 +47,25 @@ android {
    compileOptions {
        coreLibraryDesugaringEnabled true

-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }

    compileSdk 33

    buildFeatures {
        viewBinding true
+        buildConfig true
+    }
+
+    androidResources {
+        generateLocaleConfig = true
    }

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 5051
-        versionName "v4.1.1"
+        versionCode 5196
+        versionName "v4.3.4"

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

@@ -106,11 +111,11 @@ android {
        }
    }

-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
        variant.resValue "string", "applicationId", variant.applicationId

        if (variant.buildType.name == 'nightly') {
-            variant.outputs.all {
+            variant.outputs.configureEach {
                setVersionCodeOverride(getVersionCode())
                setVersionNameOverride(getVersionName())
                outputFileName = "${applicationId}_${variant.versionCode}.apk"
@@ -120,23 +125,23 @@ android {
 }

 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
    implementation 'androidx.preference:preference:1.2.0'
    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'com.google.android.material:material:1.8.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.mediarouter:mediarouter:1.3.1'

-    androidTestImplementation 'androidx.test:core:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'org.mockito:mockito-android:4.8.0'
+    androidTestImplementation 'androidx.test:core:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    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.3.1'

-    androidTestUtil 'androidx.test:orchestrator:1.4.1'
+    androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }
@@ -7,5 +7,5 @@ Changes:
 Bugfix:
 - Speech announcements use MAY_DUCK (again)
 - ChartView shows markers (again)
- Fixed landscape layout of TrackListActivity
+- Fixed landscape recordingLayout of TrackListActivity
 - Request legacy file API behavior (necessary for Android 10)
@@ -0,0 +1,11 @@
+v4.1.2: OpenTracks
+
+Changes:
+- Voice announcements only use on decimal for distance
+
+Bugfix:
+- Crash when stopping (race condition)
+
+Developer:
+- Github actions: disabled instrumentation testing (too slow)
+- Tests are done with only fake GPS data
@@ -0,0 +1,8 @@
+v4.2.0: OpenTracks
+
+Changes:
+- Show heartrate zone information
+
+Developer:
+- Migrated to hosted.weblate.org
+- Recording UI uses Views directly
@@ -0,0 +1,8 @@
+v4.2.1: OpenTracks
+
+Changes:
+- Speed sensor: acceptable wheel diameter is 100mm-4000mm
+
+Bugfix:
+- Reconnect to a sensor if connection is lost
+
@@ -0,0 +1,9 @@
+v4.2.2: OpenTracks
+
+Bugfix:
+- Track icon wrongly shown in dialog
+- Textcolor for heartrate zone 1 was ignoring theme
+- Not all activityTypes were shown in dropdownlist
+- Crash due to color not found
+
+
@@ -0,0 +1,5 @@
+v4.3.0: OpenTracks
+
+Changes:
+- Allow backups (incl. encrypted to the Google)
+- Android 13: allow app-specific language settings
@@ -0,0 +1,8 @@
+v4.3.1: OpenTracks
+
+Changes:
+- Setting to skip voice announcements on device speaker
+
+Bugfix:
+- GPS disabled warning was falsely shown
+
@@ -0,0 +1,9 @@
+v4.3.2: OpenTracks
+
+Bugfix:
+- KML header was misformed (#1522)
+
+Developer:
+- Use Java 17 (multi-line text, switch)
+- API33: locale config is generated
+
@@ -0,0 +1,5 @@
+v4.3.3: OpenTracks
+
+Bugfixes:
+- Hidden fields were shown (introduced in v4.2.0)
+- Speed was shown instead of pace (introduced in v4.2.0)
@@ -0,0 +1,4 @@
+v4.3.4: OpenTracks
+
+Bugfix:
+- Android 13: regional locales could not be selected (introduced in v4.3.0)
@@ -0,0 +1,16 @@
+v3.18.6: OpenTracks
+
+Athruithe:
+- "Taispeáin ar léarscáil" - feidhmiúlacht trí KML in ionad KMZ
+- Ní chuimsíonn fógra gutha ainm na haipe
+- Agus é ag taifeadadh: déantar gnóthachan/caillteanas ingearchló a nuashonrú gach soicind
+- Tuairiscí an tsiopa aistrithe
+
+Maoláin:
+- Aistriúcháin fógartha gutha seasta neamhbhailí
+
+Forbróir:
+- ceadanna Android12 (BLUETOOTH_SCAN)
+- ceadanna Android12 (ACCESS_COARSE_LOCATION)
+- Ag dearbhú do Trackpoints (tástáil)
+- Aistriúcháin neamhúsáidte bainte
@@ -0,0 +1,8 @@
+v3.19.1: OpenTracks
+
+Athruithe:
+- Aistriúcháin nuashonraithe.
+
+Ceartúchán Bug:
+- Easpórtáil Gach Rianta fabht seasta.
+- Lean bug Track socraithe.
@@ -0,0 +1,7 @@
+v3.20.0: OpenTracks
+
+Athruithe:
+- Agus tú ag taifeadadh: tá UI staitisticí inchumraithe anois
+
+Ceartúchán Bug:
+- Níor tugadh aird ar athrú ainm/catagóir an traic le linn an taifeadta (a tugadh isteach i v3.19.0)
@@ -0,0 +1,6 @@
+v3.20.1: OpenTracks
+
+Athruithe:
+- Is féidir fógraí a úsáid anois de réir achair agus ama
+- Bíp fógraí mura bhfuil aon bhogearraí Téacs-go-hurlabhra suiteáilte
+- Baineadh minicíocht oiriúnaitheach suíomh GPS
@@ -0,0 +1,11 @@
+v3.22.0: OpenTracks
+
+Athruithe:
+- Ní stórálfar láithreacha ach amháin má thaistilítear > an t-eatramh faid a thaifeadtar
+   (feidhmiúlacht fágtha bainte den bhrath díomhaoin/neamhdhíomhaoin)
+- Is féidir Chomhéadain a chumrú chun clog a thaispeáint
+- Is féidir luas díomhaoin a chumrú anois
+
+Ceartúchán Bug:
+- Eatraimh: tuairteála nuair a stóráiltear gnóthachan ach ní caillteanas
+- Agus tú ag taifeadadh: seachain tuairteáil agus fógraí gutha á ndíchumasú
@@ -0,0 +1,10 @@
+v3.23.0: OpenTracks
+
+Athruithe:
+- Cuireadh próifílí Chomhéadain leis
+- Staitisticí comhiomlánaithe le haghaidh rianta roghnaithe
+- TrackPoints díomhaoin/neamhdhomhaoin athfhorfheidhmithe de réir mar a stop an t-am bogtha ag obair (tugtha isteach in v3.22.0)
+
+Ceartúcháin fhabht:
+- Braiteoirí BLE: sonraí soiléire maidir le dínascadh
+- Ní mór an t-easpórtáil uathoibríoch a cheadú go fóill
@@ -0,0 +1,11 @@
+v3.25.0: OpenTracks
+
+Athruithe:
+- Tá GPS roghnach anois lena n-áirítear. Rabhadh GPS díchumasaithe
+- PublicAPI: is féidir le feidhmchláir eile sonraí taifeadta a fháil anois má thosaíonn siad ar thaifeadadh (curtha i bhfeidhm do Gadgetbridge)
+- Gníomhaíochtaí nua: snámh, snámh oscailte, agus workout
+- Baineadh feidhmiúlacht pic sciar
+
+Ceartúchán Bug:
+- Chomhéadain: luas / airde nuair a léim idir 0.0 agus an luach iarbhír
+- Is féidir rianta le emojis a onnmhairiú
@@ -0,0 +1,5 @@
+v3.25.1: OpenTracks
+
+Ceartúchán Bug:
+- Easpórtáil uathoibríoch: tá súil againn teipeanna ciúine a chosc
+- Easpórtáil uathoibríoch: cosc tuairteála
@@ -0,0 +1,8 @@
+v3.26.0: OpenTracks
+
+Athruithe:
+- Is féidir fógraí gutha a chumrú
+- Fógraí gutha faoi ráta croí
+
+Ceartúchán Bug:
+- Tuairteála mar gheall ar riocht cine
@@ -0,0 +1,4 @@
+v3.26.1: OpenTracks
+
+Ceartúchán Bug:
+- Níor sháraigh barra gníomhaíochta comhthéacsúla an barra uirlisí i dtéama na hoíche.
@@ -0,0 +1,13 @@
+v4.0.1: OpenTracks
+
+Athruithe:
+- Is féidir fógraí gutha a chumrú anois
+- Folaíonn mód lánscáileáin anois barra nascleanúna Android freisin
+- Ba cheart go mbeadh nasc le braiteoirí BLE níos tapúla anois
+- Ceadaigh socruithe a athshocrú agus tú ag taifeadadh
+- Ceadaigh socruithe iompórtála/easpórtála a athrú agus tú ag taifeadadh
+- KML/KMZ: ná húsáid deilbhíní le luchtú ó Google
+
+Ceartúchán Bug:
+- Oibríonn TrackStoppedActivity ar scáileáin níos lú anois
+- Iarratas ar cheadanna ar an rianliosta
@@ -0,0 +1,10 @@
+v4. 0. 2: OpenTracks
+
+Athruithe:
+- - Agus muirmhíle 
+- Is féidir socruithe a athshocrú agus taifeadadh á dhéanamh
+
+Ceartúcháin:
+- Fógra gutha slánú
+- Cairt: bhí ingearchló smoothed weirdly
+- Ní raibh easpórtáil ag seiceáil an bhfuil an comhad ann
@@ -0,0 +1,8 @@
+v4.0. 3: OpenTracks
+
+Athruithe:
+ Sonraíocht: Max. luas mar a thuairiscigh braiteoir (GPS nó BLE)
+
+Ceartúcháin:
+- Cosc ar thuairteáil mura bhfuil Painéal Na Nionstraimí OSM suiteáilte
+- Easpórtáil rian GPX: ná heaspórtáil deighleáin an amhráin folamh
@@ -0,0 +1,13 @@
+v4. 0. 4: OpenTracks
+
+Athruithe:
+- Stóráil sonraí braiteoir BLE fiú gan achar (gach 10s)
+- PUBLIC API: ceadaíonn leagan ainm, catagóir, agus cur síos
+
+Ceartúcháin:
+- Tuairteála nuair a ghlacadh pictiúr agus rothlach an fón
+- 
+
+Forbróir:
+ Sprioc-SDK 33
+- Baraiméadar úsáideann eatramh de 5s
@@ -0,0 +1,7 @@
+v4. 0. 5: OpenTracks
+
+Athruithe:
+- - PlayStore release faigh lógó eile
+
+Ceartúcháin:
+- Taispeánann liosta eatramh " - " mura bhfuil gnóthachan/caillteanas i láthair
@@ -0,0 +1,5 @@
+v4.0. 6: OpenTracks 
+
+Ceartúcháin:
+- Egm2008 fhritháireamh mícheart ríomh le haghaidh domhanfhad diúltach
+- - Crashed API poiblí má Bhí Rianta Oscailte sa chúlra (26 AIBREÁN+)
@@ -0,0 +1,10 @@
+v4. 0. 7: OpenTracks
+
+Athruithe:
+- Gps comhartha caillte teorainn ama: 30s
+- - Android 13: cead a iarraidh chun fógraí a thaispeáint
+- Scrios rianta níos tapúla (bunachar sonraí folúis amháin más gá)
+
+Ceartúcháin:
+- PublicAPI stop ordú mar thoradh ar tuairteála (a tugadh isteach i v4. 0. 6)
+- Ceadanna: ceadanna a iarraidh le linn tosaithe
@@ -0,0 +1,11 @@
+v4. 0. 8: OpenTracks
+
+Athruithe:
+- Airde a thaispeántar i gcónaí i m/ft
+- Taispeáin crios ama an riain mura bhfuil sé éagsúil le crios ama na feiste
+- PublicAPI: tacaíocht deilbhín an riain a shocrú go sainráite
+
+Forbróir:
+- A Tugadh Isteach Cianfhormáideoir
+- Uasghrádú GO AGP 7.3/desugar Ar Feadh Ré.aicme
+- Android12+: déan splancscáileán trí Androidx
@@ -0,0 +1,8 @@
+v4. 1. 0: OpenTracks
+
+Athruithe:
+- Easpórtáil leagan KML/KMZ 2. 3 amháin (2. 2)
+- Le haghaidh crank-bhunaithe powermeters: faigh cadence
+
+Ceartúcháin:
+- Workaround do tuairteála ar "iompórtáil gach rud"
@@ -0,0 +1,7 @@
+v4.1. 1: OpenTracks
+
+Athruithe:
+- Cuir scáileán réamhrá leis (taispeáin uair amháin)
+
+Ceartúcháin:
+- Ná tuairteála mura bhfuil gléas GPS i láthair
@@ -0,0 +1,22 @@
+Cairde rianaithe spóirt a bhfuil meas aige ar do phríobháideachas.
+
+Tugann gníomhaíochtaí spóirt agus lasmuigh sonas, scil agus muinín.
+
+Cuir luach ar do shláinte trí súil a choinneáil ar d'oiliúint.
+Taifeadann tú de réir mar a théann tú ag rith nó ag siúl, agus tugann sé ríomhaire rothar duit le scáileán níos mó le haghaidh rothaíochta.
+Marcáil láithreacha suimiúla ar do bhealach le pictiúir.
+Coinnigh staitisticí taifeadta go mion go leor le haghaidh anailíse.
+Comhroinn ach na sonraí a theastaíonn uait a bheith ag daoine eile.
+
+* Fógraí gutha.
+* Tacaíonn braiteoirí Bluetooth LE: ráta croí, luas agus fad (rothaíocht), deireadh (rothaíocht), agus méadar cumhachta (rothaíocht).
+* Gnóthachan agus caillteanas airde: trí bhraiteoir barometric.
+* Airde léirithe in EGM2008 (os cionn meánleibhéal na farraige); onnmhairiú mar WGS84.
+* Easpórtáil sonraí mar rianta mar KMZ (grianghraif san áireamh), KML, nó GPX.
+* Gan rochtain ar an Idirlíon nó ceadanna breise.
+* Téama dorcha agus éadrom, ag urramú socruithe an chórais.
+* Gan fógraí.
+
+Bogearraí Libre / Bogearraí Saor in Aisce / Foinse Oscailte
+rud a chiallaíonn gur féidir leat an cód foinse a úsáid, a staidéar, a athrú agus a roinnt.
+Ceadúnaithe Apache 2.0
@@ -0,0 +1 @@
+Cairde rianaithe spóirt a bhfuil meas aige ar do phríobháideachas.
@@ -0,0 +1 @@
+OpenTracks
@@ -0,0 +1,22 @@
+一個尊重您的隱私的運動蹤跡紀錄器。
+
+運動與戶外活動賦予幸福、技能與自信。
+
+由保持追蹤您的訓練來重視您的健康。
+紀錄您的跑步或健行，並且在您騎自行車時給您一台具有大螢幕的自行車電腦。
+用照片標記您一路上有趣的地點。
+保持紀錄非常詳細的統計資料以供分析。
+僅分享資料給您想要分享的其他人。
+
+* 語音播報。
+* 支援藍芽 LE 感測器：心律、速度與距離 (騎自行車)、踏頻 (騎自行車)、功率計 (騎自行車)。
+* 海拔上升與下降：通過氣壓感測器。
+* EGM2008 海拔顯示 (平均海平面以上)；匯出為 WGS84。
+* 匯出蹤跡資料為 KMZ (包含照片)、KML、GPX。
+* 沒有網路存取或額外的權限需求。
+* 深色與淺色主題，取決於系統設定。
+* 沒有廣告。
+
+此為 自由軟體 / 免費軟體 / 開放原始碼
+這意味您可以使用、學習、修改與分享此專案的原始碼。
+授權條款：Apache 2.0
@@ -0,0 +1 @@
+一個尊重您的隱私的運動蹤跡紀錄器。
@@ -0,0 +1 @@
+OpenTracks
@@ -1 +1,2 @@
-android.useAndroidX=true
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx1024m
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -205,6 +205,12 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
@@ -27,21 +27,23 @@ public class KmlTrackExporterTest {
     */
    @Test
    public void writeCloseSegment_only_write_sensordata_if_present() {
-        String expected = "<when>1970-01-01T00:00:00Z</when>\n" +
-                "<coord/>\n" +
-                "<when>1970-01-01T01:00:00+01:00</when>\n" +
-                "<coord/>\n" +
-                "<ExtendedData>\n" +
-                "<SchemaData schemaUrl=\"#schema\">\n" +
-                "</SchemaData>\n" +
-                "</ExtendedData>\n" +
-                "</Track>\n";
+        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);
+        KMLTrackExporter kmlTrackWriter = (KMLTrackExporter) TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, null);
        kmlTrackWriter.prepare(outputStream);

        kmlTrackWriter.writeTrackPoint(ZoneOffset.UTC, trackPoint);
@@ -12,19 +12,16 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Looper;

-import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;

 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -73,6 +70,9 @@ import de.dennisguse.opentracks.stats.TrackStatistics;

 /**
 * Export a track to {@link TrackFileFormat} and verify that the import is identical.
+ * <p>
+ * Note: those tests are affected by {@link de.dennisguse.opentracks.sensors.sensorData.SensorData}.isRecent().
+ * If the test device is too slow (like in a CI) these are likely to fail as the sensor data will be omitted from actual.
 */
@RunWith(AndroidJUnit4.class)
 public class ExportImportTest {
@@ -82,9 +82,6 @@ public class ExportImportTest {
    @Rule
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);

-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
    //For csv_export_only() as we the timezone is hardcoded in the expectation.
    @Rule
    public TimezoneRule timezoneRule = new TimezoneRule(TimeZone.getTimeZone("Europe/Berlin"));
@@ -157,18 +154,19 @@ public class ExportImportTest {
        mockBLESensorData(trackPointCreator, 15f, sensorDistance, 66f, 3f, 50f);

        trackPointCreator.setClock("2020-02-02T02:02:14Z");
-        mockBLESensorData(trackPointCreator, 15f, null, 66f, 3f, 50f);
+        mockBLESensorData(trackPointCreator, 15f, null, 67f, 3f, 50f);
        trackPointCreator.setClock("2020-02-02T02:02:15Z");
-        mockBLESensorData(trackPointCreator, null, null, 66f, 3f, 50f);
+        mockBLESensorData(trackPointCreator, null, null, 68f, 3f, 50f);

        trackPointCreator.setClock("2020-02-02T02:02:16Z");
-        mockBLESensorData(trackPointCreator, 5f, Distance.of(2), 66f, 3f, 50f); // Distance will be added to next TrackPoint
+        mockBLESensorData(trackPointCreator, 5f, Distance.of(2), 69f, 3f, 50f); // Distance will be added to next TrackPoint

        sendLocation(trackPointCreator, "2020-02-02T02:02:17Z", 3, 14.001, 10, 13, 15, 10, 0);
        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);

        trackPointCreator.setClock("2020-02-02T02:02:18Z");
-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, trackPointCreator));
+        BluetoothRemoteSensorManager mockRemoteSensorManager = Mockito.mock(BluetoothRemoteSensorManager.class);
+        trackPointCreator.getSensorManager().setBluetoothSensorManager(mockRemoteSensorManager);
        service.endCurrentTrack();

        trackPointCreator.setClock("2020-02-02T02:03:20Z");
@@ -181,7 +179,7 @@ public class ExportImportTest {
        sendLocation(trackPointCreator, "2020-02-02T02:03:23Z", 3, 16.001, 10, 27, 15, 10, 0);

        trackPointCreator.setClock("2020-02-02T02:03:24Z");
-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, trackPointCreator));
+        trackPointCreator.getSensorManager().setBluetoothSensorManager(mockRemoteSensorManager);
        service.endCurrentTrack();

        Track track = contentProviderUtils.getTrack(trackId);
@@ -206,7 +204,7 @@ public class ExportImportTest {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, contentProviderUtils);

        // when
        // 1. export
@@ -289,7 +287,7 @@ public class ExportImportTest {
        editor.commit();
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, contentProviderUtils);

        // when
        trackExporter.writeTrack(track, context.getContentResolver().openOutputStream(tmpFileUri));
@@ -312,7 +310,7 @@ public class ExportImportTest {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context, contentProviderUtils);

        // when
        // 1. export
@@ -359,7 +357,7 @@ public class ExportImportTest {
                        .setAltitudeLoss(1f)
                        .setAltitudeGain(1f)
                        .setSensorDistance(Distance.of(14))
-                        .setHeartRate(66f)
+                        .setHeartRate(69)
                        .setPower(50f)
                        .setCadence(3f)
                        .setHorizontalAccuracy(Distance.of(10)),
@@ -430,7 +428,7 @@ public class ExportImportTest {
        editor.commit();
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context, contentProviderUtils);

        // when
        // 1. export
@@ -447,7 +445,6 @@ public class ExportImportTest {
        assertNull(trackImported);
    }

-    @Ignore(value = "TODO Fails on CI; works on API24 and API30 locally")
    @LargeTest
    @Test
    public void csv_export_only() throws TimeoutException, IOException {
@@ -456,7 +453,7 @@ public class ExportImportTest {
        // given
        Track track = contentProviderUtils.getTrack(trackId);

-        TrackExporter trackExporter = TrackFileFormat.CSV.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.CSV.createTrackExporter(context, contentProviderUtils);

        // when
        // 1. export
@@ -498,37 +495,38 @@ public class ExportImportTest {
    }

    private void mockBLESensorData(TrackPointCreator trackPointCreator, Float speed, Distance distance, float heartRate, float cadence, Float power) {
-        trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, trackPointCreator) {
-            @Override
-            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
-                SensorDataSet sensorDataSet = new SensorDataSet();
-                sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
-                sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));
+        BluetoothRemoteSensorManager remoteSensorManager = Mockito.mock(BluetoothRemoteSensorManager.class);
+        Mockito.when(remoteSensorManager.fill(Mockito.any())).thenAnswer(invocation -> {
+            TrackPoint trackPoint = invocation.getArgument(0);

-                SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
-                Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
-                Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
-                sensorDataSet.set(cyclingCadence);
+            SensorDataSet sensorDataSet = new SensorDataSet();
+            sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
+            sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));

-                if (distance != null && speed != null) {
-                    SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
-                    Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
-                    Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
-                    SensorDataCyclingDistanceSpeed distanceSpeed = Mockito.mock(SensorDataCyclingDistanceSpeed.class);
-                    Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
-                    Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
-                    sensorDataSet.set(distanceSpeed);
-                }
+            SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
+            Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
+            Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
+            sensorDataSet.set(cyclingCadence);

-                sensorDataSet.fillTrackPoint(trackPoint);
-                return sensorDataSet;
+            if (distance != null && speed != null) {
+                SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
+                Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
+                Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
+                SensorDataCyclingDistanceSpeed distanceSpeed = Mockito.mock(SensorDataCyclingDistanceSpeed.class);
+                Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
+                Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
+                sensorDataSet.set(distanceSpeed);
            }
+
+            sensorDataSet.fillTrackPoint(trackPoint);
+            return sensorDataSet;
        });
+        trackPointCreator.getSensorManager().setBluetoothSensorManager(remoteSensorManager);
        trackPointCreator.onChange(new SensorDataSet());
    }

    private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
-        AltitudeSumManager altitudeSumManager = trackPointCreator.getAltitudeSumManager();
+        AltitudeSumManager altitudeSumManager = trackPointCreator.getSensorManager().getAltitudeSumManager();
        altitudeSumManager.setAltitudeGain_m(altitudeGain);
        altitudeSumManager.setAltitudeLoss_m(altitudeGain);
    }
@@ -231,7 +231,7 @@ public class GPXTrackImporterTest {
        importTrackId = importer.importFile(inputStream).get(0);
        Track importedTrack = contentProviderUtils.getTrack(importTrackId);

-        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context);
+        TrackExporter trackExporter = TrackFileFormat.GPX.createTrackExporter(context, contentProviderUtils);
        trackExporter.writeTrack(importedTrack, outputStream);

        // then
@@ -9,6 +9,7 @@ import org.junit.Test;

 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
@@ -23,10 +24,10 @@ public class BluetoothUtilsTest {
        characteristic.setValue(new byte[]{0x02, 0x3C});

        // when
-        int heartRate = BluetoothUtils.parseHeartRate(characteristic);
+        HeartRate heartRate = BluetoothUtils.parseHeartRate(characteristic);

        // then
-        assertEquals(60, heartRate);
+        assertEquals(HeartRate.of(60), heartRate);
    }

    @Test
@@ -36,10 +37,10 @@ public class BluetoothUtilsTest {
        characteristic.setValue(new byte[]{0x01, 0x01, 0x01});

        // when
-        int heartRate = BluetoothUtils.parseHeartRate(characteristic);
+        HeartRate heartRate = BluetoothUtils.parseHeartRate(characteristic);

        // then
-        assertEquals(257, heartRate);
+        assertEquals(HeartRate.of(257), heartRate);
    }

    @Test
@@ -29,7 +29,6 @@ import android.os.Looper;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;

 import org.junit.After;
@@ -57,9 +56,6 @@ public class TrackRecordingServiceTestMarker {
    @Rule
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);

-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
    private final Context context = ApplicationProvider.getApplicationContext();
    private ContentProviderUtils contentProviderUtils;

@@ -128,7 +124,6 @@ public class TrackRecordingServiceTestMarker {
    public void recording_GPSfix_createsMarker() {
        // given
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
-        trackPointCreator.stopGPS();

        trackPointCreator.setClock("2020-02-02T02:02:02Z");
        Track.Id trackId = service.startNewTrack();
@@ -11,7 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;

 import org.junit.After;
@@ -46,6 +45,8 @@ import de.dennisguse.opentracks.stats.TrackStatistics;

 /**
 * Tests insert location.
+ * Note: on API23, the TrackRecordingService may not be stopped properly before the next test.
+ * So, if something fails, subsequent tests may be affected.
 */
@RunWith(AndroidJUnit4.class)
 public class TrackRecordingServiceTestRecording {
@@ -53,9 +54,6 @@ public class TrackRecordingServiceTestRecording {
    @Rule
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);

-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
    private final Context context = ApplicationProvider.getApplicationContext();
    private ContentProviderUtils contentProviderUtils;

@@ -95,7 +93,6 @@ public class TrackRecordingServiceTestRecording {
        PreferencesUtils.setString(R.string.idle_speed_key, R.string.idle_speed_default);

        service = startService();
-        service.getTrackPointCreator().stopGPS();
    }

    @After
@@ -117,8 +114,7 @@ public class TrackRecordingServiceTestRecording {
        String startTime = "2020-02-02T02:02:02Z";
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // then
        assertEquals(new TrackStatistics(startTime, startTime, 0, 0, 0, 0, null, null)
@@ -155,8 +151,7 @@ public class TrackRecordingServiceTestRecording {

        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String pauseTime = "2020-02-02T02:02:03Z";
@@ -202,8 +197,7 @@ public class TrackRecordingServiceTestRecording {
        String starTime = "2020-02-02T02:02:02Z";
        trackPointCreator.setClock(starTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        String pauseTime = "2020-02-02T02:02:03Z";
        trackPointCreator.setClock(pauseTime);
@@ -235,8 +229,7 @@ public class TrackRecordingServiceTestRecording {

        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        String stopTime = "2020-02-02T02:02:03Z";
        trackPointCreator.setClock(stopTime);
@@ -246,8 +239,7 @@ public class TrackRecordingServiceTestRecording {
        String resumeTime = "2020-02-02T02:02:04Z";
        trackPointCreator.setClock(resumeTime);
        service.resumeTrack(trackId);
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // then
        new TrackPointAssert().assertEquals(List.of(
@@ -268,13 +260,13 @@ public class TrackRecordingServiceTestRecording {

        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.stopGPS();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getSensorManager().getBluetoothSensorManager();

        // when
        String sensor1 = "2020-02-02T02:02:03Z";
        trackPointCreator.setClock(sensor1);
+
        remoteSensorManager.onChanged(new SensorDataHeartRate("", "", HeartRate.of(5))); //Should be ignored

        String sensor3 = "2020-02-02T02:02:13Z";
@@ -308,7 +300,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);


        // when
@@ -382,7 +374,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -447,7 +439,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -511,7 +503,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -575,7 +567,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -663,7 +655,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -713,7 +705,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -759,7 +751,7 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);

        // when
        String gps1 = "2020-02-02T02:02:03Z";
@@ -823,8 +815,8 @@ public class TrackRecordingServiceTestRecording {
        TrackPointCreator trackPointCreator = service.getTrackPointCreator();
        trackPointCreator.setClock(startTime);
        Track.Id trackId = service.startNewTrack();
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
-        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
+        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getSensorManager().getBluetoothSensorManager();

        // when
        String sensor1 = "2020-02-02T02:02:03Z";
@@ -195,7 +195,7 @@ public class TrackRecordingServiceTestStateMachine {

    @MediumTest
    @Test
-    public void cannotResume_non_existing_track() throws InterruptedException {
+    public void cannotResume_non_existing_track() {
        // given
        assertFalse(service.isRecording());
        assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
@@ -1,15 +1,12 @@
 package de.dennisguse.opentracks.services;

 import android.content.Context;
-import android.content.Intent;
 import android.location.Location;

 import androidx.test.rule.ServiceTestRule;

-import java.time.Clock;
 import java.util.concurrent.TimeoutException;

-import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

@@ -22,14 +19,6 @@ public class TrackRecordingServiceTestUtils {
    public static void resetService(ServiceTestRule mServiceRule, Context context) throws TimeoutException {
        // Let's use default values.
        PreferencesUtils.clear();
-
-        // Reset service (if some previous test failed)
-        TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
-                .getService();
-
-        service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context, null, service.getTrackPointCreator()));
-        service.getTrackPointCreator().setClock(Clock.systemUTC());
-        service.endCurrentTrack();
    }

    static void sendGPSLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, long speed) {
@@ -8,7 +8,6 @@ import android.os.Looper;

 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.rule.GrantPermissionRule;
 import androidx.test.rule.ServiceTestRule;

 import org.junit.AfterClass;
@@ -31,9 +30,6 @@ public class VoiceAnnouncementManagerTest {
    @Rule
    public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS);

-    @Rule
-    public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
    @BeforeClass
    public static void preSetUp() {
        // Prepare looper for Android's message queue
@@ -64,7 +64,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement);
    }

    @Test
@@ -80,7 +80,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement);
    }

    @Test
@@ -96,13 +96,13 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
    }

    @Test
    public void getAnnouncement_metric_distance_rounding_check_two() {
        TrackStatistics stats = new TrackStatistics();
-        stats.setTotalDistance(Distance.of(19990));
+        stats.setTotalDistance(Distance.of(19900));
        stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10));
        stats.setMovingTime(Duration.ofHours(1));
        stats.setMaxSpeed(Speed.of(100));
@@ -112,7 +112,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();

        // then
-        assertEquals("Total distance 19.99 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement);
+        assertEquals("Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement);
    }

    @Test
@@ -134,7 +134,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement);
+        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);
    }

    @Test
@@ -150,7 +150,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, null, null).toString();

        // then
-        assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement);
+        assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement);
    }

    @Test
@@ -172,7 +172,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement);
+        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);
    }

    @Test
@@ -188,7 +188,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, null, null).toString();

        // then
-        assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
+        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
    }

    @Test
@@ -210,7 +210,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 8.83 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement);
+        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);
    }

    @Test
@@ -226,7 +226,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, false, null, null).toString();

        // then
-        assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement);
+        assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement);
    }

    @Test
@@ -248,7 +248,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, false, lastInterval, null).toString();

        // then
-        assertEquals("Total distance 8.83 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement);
+        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);
    }

    @Test
@@ -274,7 +274,7 @@ public class VoiceAnnouncementUtilsTest {
        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();

        // then
-        assertEquals("Total distance 14.21 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);
+        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);
    }

    @Test
@@ -6,6 +6,7 @@ import static org.mockito.Mockito.verify;

 import android.content.Context;
 import android.location.Location;
+import android.os.Handler;
 import android.os.Looper;

 import androidx.test.core.app.ApplicationProvider;
@@ -25,7 +26,7 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

@RunWith(MockitoJUnitRunner.class)
-public class GPSHandlerTest {
+public class GPSManagerTest {

    private final Context context = ApplicationProvider.getApplicationContext();

@@ -33,7 +34,7 @@ public class GPSHandlerTest {
    private TrackPointCreator trackPointCreator;

    @InjectMocks
-    private GPSHandler locationHandler;
+    private GPSManager locationHandler;

    @BeforeClass
    public static void preSetUp() {
@@ -49,7 +50,7 @@ public class GPSHandlerTest {
        Mockito.when(trackPointCreator.createNow())
                .thenReturn(Instant.now());

-        locationHandler.onStart(context);
+        locationHandler.start(context, new Handler());
    }

    /**
@@ -25,7 +25,7 @@ public class TrackPointCreatorTest {
    private TrackPointCreator.Callback server;

    @Mock
-    private GPSHandler locationHandler;
+    private GPSManager locationHandler;

    private TrackPointCreator subject;

@@ -17,7 +17,8 @@ import org.junit.runner.RunWith;
 import java.util.List;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;

@RunWith(AndroidJUnit4.class)
 public class PreferencesOpenHelperTest {
@@ -38,10 +39,10 @@ public class PreferencesOpenHelperTest {
        PreferencesOpenHelper.newInstance(1).check();

        // then there should be one layout with old custom layout that has the new CSV value.
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
-        assertEquals(layouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), PreferencesUtils.getCustomLayout().toCsv());
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
+        assertNotNull(recordingLayouts);
+        assertEquals(recordingLayouts.size(), 1);
+        assertEquals(recordingLayouts.get(0).toCsv(), PreferencesUtils.getCustomLayout().toCsv());
    }

    @Test
@@ -63,10 +64,10 @@ public class PreferencesOpenHelperTest {
                + PreferencesUtils.getLayoutColumnsByDefault() + ";distance,1,1,0;speed,1,1,0;";

        // then there should be one layout with old custom layout that has the new CSV value.
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
-        assertEquals(layouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
+        assertNotNull(recordingLayouts);
+        assertEquals(recordingLayouts.size(), 1);
+        assertEquals(recordingLayouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
    }

    @Test
@@ -87,10 +88,10 @@ public class PreferencesOpenHelperTest {
        String updatedOldCustomLayoutCsv = "whatever;3;distance,1,1,0;speed,1,1,0;";

        // then there should be one layout with old custom layout that has the new CSV value.
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
-        assertEquals(layouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
+        assertNotNull(recordingLayouts);
+        assertEquals(recordingLayouts.size(), 1);
+        assertEquals(recordingLayouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
    }

    @Test
@@ -109,10 +110,10 @@ public class PreferencesOpenHelperTest {
        PreferencesOpenHelper.newInstance(1).check();

        // then custom layout should be equals to default layout.
-        Layout defaultLayout = Layout.fromCsv(PreferencesUtils.buildDefaultLayout(), resources);
-        List<Layout> customLayout = PreferencesUtils.getAllCustomLayouts();
+        RecordingLayout defaultRecordingLayout = RecordingLayoutIO.fromCsv(PreferencesUtils.buildDefaultLayout(), resources);
+        List<RecordingLayout> customRecordingLayout = PreferencesUtils.getAllCustomLayouts();

-        assertEquals(customLayout.size(), 1);
-        assertEquals(defaultLayout.toCsv(), customLayout.get(0).toCsv());
+        assertEquals(customRecordingLayout.size(), 1);
+        assertEquals(defaultRecordingLayout.toCsv(), customRecordingLayout.get(0).toCsv());
    }
 }
@@ -22,7 +22,8 @@ import java.util.List;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;

@RunWith(AndroidJUnit4.class)
 public class PreferencesUtilsTest {
@@ -85,13 +86,13 @@ public class PreferencesUtilsTest {
        editor.commit();

        // when
-        List<Layout> layouts = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();

        // then
-        assertEquals(layouts.size(), 1);
-        assertTrue(layouts.get(0).getFields().size() > 0);
-        assertEquals(layouts.get(0).getName(), context.getString(R.string.stats_custom_layout_default_layout));
-        assertTrue(layouts.get(0).getFields().stream().anyMatch(DataField::isVisible));
+        assertEquals(recordingLayouts.size(), 1);
+        assertTrue(recordingLayouts.get(0).getFields().size() > 0);
+        assertEquals(recordingLayouts.get(0).getName(), context.getString(R.string.stats_custom_layout_default_layout));
+        assertTrue(recordingLayouts.get(0).getFields().stream().anyMatch(DataField::isVisible));
    }

    @Test
@@ -103,12 +104,12 @@ public class PreferencesUtilsTest {
        editor.commit();

        // when
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();

        // then
-        assertTrue(layout.getFields().size() > 0);
-        assertEquals(layout.getName(), context.getString(R.string.stats_custom_layout_default_layout));
-        assertTrue(layout.getFields().stream().anyMatch(DataField::isVisible));
+        assertTrue(recordingLayout.getFields().size() > 0);
+        assertEquals(recordingLayout.getName(), context.getString(R.string.stats_custom_layout_default_layout));
+        assertTrue(recordingLayout.getFields().stream().anyMatch(DataField::isVisible));
    }

    @Test
@@ -126,28 +127,28 @@ public class PreferencesUtilsTest {
        editor.apply();

        // when
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();

        // then
-        assertEquals(layout.getFields().size(), 4);
-        assertEquals(layout.getName(), "run");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 4);
+        assertEquals(recordingLayout.getName(), "run");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);

-        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
-        assertTrue(layout.getFields().get(0).isVisible());
-        assertTrue(layout.getFields().get(0).isPrimary());
+        assertEquals(recordingLayout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertTrue(recordingLayout.getFields().get(0).isVisible());
+        assertTrue(recordingLayout.getFields().get(0).isPrimary());

-        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
-        assertTrue(layout.getFields().get(1).isVisible());
-        assertFalse(layout.getFields().get(1).isPrimary());
+        assertEquals(recordingLayout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertTrue(recordingLayout.getFields().get(1).isVisible());
+        assertFalse(recordingLayout.getFields().get(1).isPrimary());

-        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_average_moving_speed_key));
-        assertFalse(layout.getFields().get(2).isVisible());
-        assertTrue(layout.getFields().get(2).isPrimary());
+        assertEquals(recordingLayout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_average_moving_speed_key));
+        assertFalse(recordingLayout.getFields().get(2).isVisible());
+        assertTrue(recordingLayout.getFields().get(2).isPrimary());

-        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
-        assertFalse(layout.getFields().get(3).isVisible());
-        assertFalse(layout.getFields().get(3).isPrimary());
+        assertEquals(recordingLayout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertFalse(recordingLayout.getFields().get(3).isVisible());
+        assertFalse(recordingLayout.getFields().get(3).isPrimary());
    }

    @Test
@@ -165,44 +166,44 @@ public class PreferencesUtilsTest {
        editor.apply();

        // when
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();

        // then
-        assertEquals(layout.getFields().size(), 4);
-        assertEquals(layout.getName(), "walking");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 4);
+        assertEquals(recordingLayout.getName(), "walking");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);

-        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
-        assertTrue(layout.getFields().get(0).isVisible());
-        assertTrue(layout.getFields().get(0).isPrimary());
+        assertEquals(recordingLayout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertTrue(recordingLayout.getFields().get(0).isVisible());
+        assertTrue(recordingLayout.getFields().get(0).isPrimary());

-        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
-        assertTrue(layout.getFields().get(1).isVisible());
-        assertFalse(layout.getFields().get(1).isPrimary());
+        assertEquals(recordingLayout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertTrue(recordingLayout.getFields().get(1).isVisible());
+        assertFalse(recordingLayout.getFields().get(1).isPrimary());

-        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_coordinates_key));
-        assertFalse(layout.getFields().get(2).isVisible());
-        assertTrue(layout.getFields().get(2).isPrimary());
-        assertTrue(layout.getFields().get(2).isWide());
+        assertEquals(recordingLayout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_coordinates_key));
+        assertFalse(recordingLayout.getFields().get(2).isVisible());
+        assertTrue(recordingLayout.getFields().get(2).isPrimary());
+        assertTrue(recordingLayout.getFields().get(2).isWide());

-        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
-        assertFalse(layout.getFields().get(3).isVisible());
-        assertFalse(layout.getFields().get(3).isPrimary());
+        assertEquals(recordingLayout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertFalse(recordingLayout.getFields().get(3).isVisible());
+        assertFalse(recordingLayout.getFields().get(3).isPrimary());
    }

    @Test
    public void testSetCustomLayout() {
        // given
        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        Layout layoutSrc = new Layout("road cycling");
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false));
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, false, false));
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), context.getString(R.string.stats_average_moving_speed), false, true, false));
-        layoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), false, false, false));
+        RecordingLayout recordingLayoutSrc = new RecordingLayout("road cycling");
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_moving_time_key), true, true, false));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_distance_key), true, false, false));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), false, true, false));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_speed_key), false, false, false));

        // when
        SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString(context.getString(R.string.stats_custom_layouts_key), layoutSrc.toCsv());
+        editor.putString(context.getString(R.string.stats_custom_layouts_key), recordingLayoutSrc.toCsv());
        editor.commit();

        // then
@@ -215,13 +216,13 @@ public class PreferencesUtilsTest {
                + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,1,0;"
                + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0,0;");

-        Layout layoutDst = PreferencesUtils.getCustomLayout();
-        assertEquals(layoutSrc.getName(), layoutDst.getName());
-        assertEquals(layoutSrc.getFields().size(), layoutDst.getFields().size());
-        for (int i = 0; i < layoutSrc.getFields().size(); i++) {
-            assertEquals(layoutSrc.getFields().get(i).getKey(), layoutDst.getFields().get(i).getKey());
-            assertEquals(layoutSrc.getFields().get(i).isVisible(), layoutDst.getFields().get(i).isVisible());
-            assertEquals(layoutSrc.getFields().get(i).isPrimary(), layoutDst.getFields().get(i).isPrimary());
+        RecordingLayout recordingLayoutDst = PreferencesUtils.getCustomLayout();
+        assertEquals(recordingLayoutSrc.getName(), recordingLayoutDst.getName());
+        assertEquals(recordingLayoutSrc.getFields().size(), recordingLayoutDst.getFields().size());
+        for (int i = 0; i < recordingLayoutSrc.getFields().size(); i++) {
+            assertEquals(recordingLayoutSrc.getFields().get(i).getKey(), recordingLayoutDst.getFields().get(i).getKey());
+            assertEquals(recordingLayoutSrc.getFields().get(i).isVisible(), recordingLayoutDst.getFields().get(i).isVisible());
+            assertEquals(recordingLayoutSrc.getFields().get(i).isPrimary(), recordingLayoutDst.getFields().get(i).isPrimary());
        }
    }

@@ -247,7 +248,7 @@ public class PreferencesUtilsTest {
        editor.putString(context.getString(R.string.stats_custom_layouts_key), cyclingProfile + "\n" + runningProfile);
        editor.apply();

-        List<Layout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();

        // when cyling profile is updated
        String cyclingProfileUpdated = "cycling;2;"
@@ -256,14 +257,14 @@ public class PreferencesUtilsTest {
                + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,0;"
                + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0;";

-        List<Layout> layoutsToBeUpdated = new ArrayList<>();
-        layoutsToBeUpdated.add(Layout.fromCsv(cyclingProfileUpdated, resources));
-        layoutsToBeUpdated.add(Layout.fromCsv(runningProfile, resources));
+        List<RecordingLayout> layoutsToBeUpdated = new ArrayList<>();
+        layoutsToBeUpdated.add(RecordingLayoutIO.fromCsv(cyclingProfileUpdated, resources));
+        layoutsToBeUpdated.add(RecordingLayoutIO.fromCsv(runningProfile, resources));

        PreferencesUtils.updateCustomLayouts(layoutsToBeUpdated);

        // then only updated profile is modified in the custom layouts
-        List<Layout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();

        assertEquals(layoutsBefore.size(), 2);
        assertEquals(layoutsAfter.size(), 2);
@@ -294,7 +295,7 @@ public class PreferencesUtilsTest {
        editor.putString(context.getString(R.string.stats_custom_layouts_key), cyclingProfile + "\n" + runningProfile);
        editor.apply();

-        List<Layout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsBefore = PreferencesUtils.getAllCustomLayouts();

        // when cyling profile is updated
        String cyclingProfileUpdated = "cycling;2;"
@@ -302,11 +303,11 @@ public class PreferencesUtilsTest {
                + context.getString(R.string.stats_custom_layout_distance_key) + ",0,0;"
                + context.getString(R.string.stats_custom_layout_average_moving_speed_key) + ",0,0;"
                + context.getString(R.string.stats_custom_layout_speed_key) + ",0,0;";
-        Layout layoutToBeUpdated = Layout.fromCsv(cyclingProfileUpdated, resources);
-        PreferencesUtils.updateCustomLayout(layoutToBeUpdated);
+        RecordingLayout recordingLayoutToBeUpdated = RecordingLayoutIO.fromCsv(cyclingProfileUpdated, resources);
+        PreferencesUtils.updateCustomLayout(recordingLayoutToBeUpdated);

        // then only updated profile is modified in the custom layouts
-        List<Layout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();

        assertEquals(layoutsBefore.size(), 2);
        assertEquals(layoutsAfter.size(), 2);
@@ -337,9 +338,9 @@ public class PreferencesUtilsTest {
        editor.apply();

        // when it gets the custom layout
-        Layout layout = PreferencesUtils.getCustomLayout();
+        RecordingLayout recordingLayout = PreferencesUtils.getCustomLayout();

        // then the first one was returned
-        assertEquals(layout.getName(), "cycling");
+        assertEquals(recordingLayout.getName(), "cycling");
    }
 }
@@ -78,7 +78,7 @@ public class TrackStatisticsUpdaterTest {

        // when
        TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-        data.trackPoints.forEach(it -> subject.addTrackPoint(it));
+        data.trackPoints.forEach(subject::addTrackPoint);

        // then
        TrackStatistics statistics = subject.getTrackStatistics();
@@ -12,7 +12,6 @@ import static org.hamcrest.Matchers.allOf;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;

 import android.util.Pair;
-import android.view.View;

 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.ViewInteraction;
@@ -72,7 +71,7 @@ public class EspressoAggregatedFilterTest {
        ViewInteraction checkBox = onView(
                allOf(withId(R.id.filter_dialog_check_button), withText(CATEGORY),
                        withParent(allOf(withId(R.id.filter_items),
-                                withParent(IsInstanceOf.<View>instanceOf(android.view.ViewGroup.class)))),
+                                withParent(IsInstanceOf.instanceOf(android.view.ViewGroup.class)))),
                        isDisplayed()));
        checkBox.perform(waitFor(2000));

@@ -10,7 +10,7 @@ import org.junit.runner.RunWith;
 import java.util.List;

@RunWith(AndroidJUnit4.class)
-public class CsvLayoutUtilsTest extends TestCase {
+public class CsvRecordingLayoutUtilsTest extends TestCase {

    @Test
    public void testGetCsvLineParts() {
@@ -1,76 +0,0 @@
-package de.dennisguse.opentracks.ui.customRecordingLayout;
-
-
-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.assertThat;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.CoreMatchers.is;
-
-import android.view.View;
-
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.espresso.NoMatchingViewException;
-import androidx.test.espresso.ViewAssertion;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.GrantPermissionRule;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.TrackListActivity;
-import de.dennisguse.opentracks.settings.PreferencesUtils;
-
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class EspressoCustomLayoutTest {
-
-    @Rule
-    public ActivityScenarioRule<TrackListActivity> mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class);
-
-    @Rule
-    public GrantPermissionRule mGrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
-
-    @Test
-    public void customLayoutTest() {
-        // TrackListActivity: start recording
-        ViewInteraction trackControllerRecordButton = onView(ViewMatchers.withId(R.id.track_list_fab_action));
-        trackControllerRecordButton.perform(click());
-
-        // Get custom layout preferences and check all data fields are showed.
-        Layout layout = PreferencesUtils.getCustomLayout();
-
-        onView(withId(R.id.stats_recycler_view)).check(new RecyclerViewItemCountAssertion((int) layout.getFields().stream().filter(DataField::isVisible).count()));
-
-        // stop recording
-        ViewInteraction trackControllerStopButton = onView(withId(R.id.track_recording_fab_action));
-        trackControllerStopButton.perform(longClick());
-    }
-
-    private static class RecyclerViewItemCountAssertion implements ViewAssertion {
-        private final int expectedCount;
-
-        public RecyclerViewItemCountAssertion(int expectedCount) {
-            this.expectedCount = expectedCount;
-        }
-
-        @Override
-        public void check(View view, NoMatchingViewException noViewFoundException) {
-            if (noViewFoundException != null) {
-                throw noViewFoundException;
-            }
-
-            RecyclerView recyclerView = (RecyclerView) view;
-            RecyclerView.Adapter<?> adapter = recyclerView.getAdapter();
-            assertThat(adapter.getItemCount(), is(expectedCount));
-        }
-    }
-
-}
@@ -17,7 +17,7 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.PreferencesUtils;

@RunWith(AndroidJUnit4.class)
-public class LayoutTest extends TestCase {
+public class RecordingLayoutTest extends TestCase {

    private final Context context = ApplicationProvider.getApplicationContext();
    private final Resources resources = ApplicationProvider.getApplicationContext().getResources();
@@ -28,21 +28,17 @@ public class LayoutTest extends TestCase {
        String csv = "running;2;" + context.getString(R.string.stats_custom_layout_speed_key) + ",1,1,0;" + context.getString(R.string.stats_custom_layout_distance_key) + ",1,0,0;" + context.getString(R.string.stats_custom_layout_altitude_key) + ",0,1,0;" + context.getString(R.string.stats_custom_layout_gain_key) + ",0,0,0;";

        // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();

        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "running");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getName(), "running");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
        assertEquals(dataFieldList.size(), 4);
        assertEquals(dataFieldList.get(0).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
        assertEquals(dataFieldList.get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
        assertEquals(dataFieldList.get(2).getKey(), context.getString(R.string.stats_custom_layout_altitude_key));
        assertEquals(dataFieldList.get(3).getKey(), context.getString(R.string.stats_custom_layout_gain_key));
-        assertEquals(dataFieldList.get(0).getTitle(), context.getString(R.string.stats_speed));
-        assertEquals(dataFieldList.get(1).getTitle(), context.getString(R.string.stats_distance));
-        assertEquals(dataFieldList.get(2).getTitle(), context.getString(R.string.stats_altitude));
-        assertEquals(dataFieldList.get(3).getTitle(), context.getString(R.string.stats_gain));
        assertTrue(dataFieldList.get(0).isVisible());
        assertTrue(dataFieldList.get(0).isPrimary());
        assertFalse(dataFieldList.get(0).isWide());
@@ -64,13 +60,13 @@ public class LayoutTest extends TestCase {
        String csv1 = "Layout Name;speed,1,1;distance,0,0;";

        // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();

        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), PreferencesUtils.getDefaultLayoutName());
-        assertEquals(layout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
-        assertEquals(layout.getFields().size(), 0);
+        assertEquals(recordingLayout.getName(), PreferencesUtils.getDefaultLayoutName());
+        assertEquals(recordingLayout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
+        assertEquals(recordingLayout.getFields().size(), 0);
    }

    @Test
@@ -79,13 +75,13 @@ public class LayoutTest extends TestCase {
        String csv1 = "Layout Name;2;";

        // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();

        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), PreferencesUtils.getDefaultLayoutName());
-        assertEquals(layout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
-        assertEquals(layout.getFields().size(), 0);
+        assertEquals(recordingLayout.getName(), PreferencesUtils.getDefaultLayoutName());
+        assertEquals(recordingLayout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
+        assertEquals(recordingLayout.getFields().size(), 0);
    }

    @Test
@@ -94,13 +90,13 @@ public class LayoutTest extends TestCase {
        String csv1 = "Layout Name;2;speed,distance,total time;";

        // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();

        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "Layout Name");
-        assertEquals(layout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().size(), 0);
+        assertEquals(recordingLayout.getName(), "Layout Name");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 0);
    }

    @Test
@@ -109,27 +105,27 @@ public class LayoutTest extends TestCase {
        String csv1 = "Layout Name;2;speed,1,0;distance;";

        // when create a layout from CSV line
-        Layout layout = Layout.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
+        List<DataField> dataFieldList = recordingLayout.getFields();

        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "Layout Name");
-        assertEquals(layout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().size(), 1);
+        assertEquals(recordingLayout.getName(), "Layout Name");
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getFields().size(), 1);
    }

    @Test
    public void testToCsv() {
        // given a layout's object
-        Layout layout = new Layout("Test Layout", 2);
-        layout.addField("key1", "Title 1", false, false, false);
-        layout.addField("key2", "Title 2", false, true, false);
-        layout.addField("key3", "Title 3", true, false, false);
-        layout.addField("key4", "Title 4", true, true, false);
-        layout.addField("key5", "Title 5", true, true, true);
+        RecordingLayout recordingLayout = new RecordingLayout("Test Layout", 2);
+        recordingLayout.addField(new DataField("key1", false, false, false));
+        recordingLayout.addField(new DataField("key2", false, true, false));
+        recordingLayout.addField(new DataField("key3", true, false, false));
+        recordingLayout.addField(new DataField("key4", true, true, false));
+        recordingLayout.addField(new DataField("key5", true, true, true));

        // when converts it to CSV
-        String csv = layout.toCsv();
+        String csv = recordingLayout.toCsv();

        // then csv is well built
        assertEquals(csv, "Test Layout;2;key1,0,0,0;key2,0,1,0;key3,1,0,0;key4,1,1,0;key5,1,1,1;");
@@ -138,15 +134,15 @@ public class LayoutTest extends TestCase {
    @Test
    public void testToCsv_columnsByDefault() {
        // given a layout's object
-        Layout layout = new Layout("Test Layout");
-        layout.addField("key1", "Title 1", false, false, false);
-        layout.addField("key2", "Title 2", false, true, false);
-        layout.addField("key3", "Title 3", true, false, false);
-        layout.addField("key4", "Title 4", true, true, false);
-        layout.addField("key5", "Title 5", true, true, true);
+        RecordingLayout recordingLayout = new RecordingLayout("Test Layout");
+        recordingLayout.addField(new DataField("key1", false, false, false));
+        recordingLayout.addField(new DataField("key2", false, true, false));
+        recordingLayout.addField(new DataField("key3", true, false, false));
+        recordingLayout.addField(new DataField("key4", true, true, false));
+        recordingLayout.addField(new DataField("key5", true, true, true));

        // when converts it to CSV
-        String csv = layout.toCsv();
+        String csv = recordingLayout.toCsv();

        // then csv is well built
        assertEquals(csv, "Test Layout;" + PreferencesUtils.getLayoutColumnsByDefault() + ";key1,0,0,0;key2,0,1,0;key3,1,0,0;key4,1,1,0;key5,1,1,1;");
@@ -34,23 +34,24 @@ public class EGM2008UtilsTest {
        int expectedLength = 18671444;
        int expectedHeaderLength = 404;

-        String expectedHeader = "P5\n" +
-                "# Geoid file in PGM format for the GeographicLib::Geoid class\n" +
-                "# Description WGS84 EGM2008, 5-minute grid\n" +
-                "# URL http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008\n" +
-                "# DateTime 2009-08-29 18:45:00\n" +
-                "# MaxBilinearError 0.478\n" +
-                "# RMSBilinearError 0.012\n" +
-                "# MaxCubicError 0.294\n" +
-                "# RMSCubicError 0.005\n" +
-                "# Offset -108\n" +
-                "# Scale 0.003\n" +
-                "# Origin 90N 0E\n" +
-                "# AREA_OR_POINT Point\n" +
-                "# Vertical_Datum WGS84\n" +
-                "4320    2161\n" +
-                "65535" +
-                "\n";
+        String expectedHeader = """
+                P5
+                # Geoid file in PGM format for the GeographicLib::Geoid class
+                # Description WGS84 EGM2008, 5-minute grid
+                # URL http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008
+                # DateTime 2009-08-29 18:45:00
+                # MaxBilinearError 0.478
+                # RMSBilinearError 0.012
+                # MaxCubicError 0.294
+                # RMSCubicError 0.005
+                # Offset -108
+                # Scale 0.003
+                # Origin 90N 0E
+                # AREA_OR_POINT Point
+                # Vertical_Datum WGS84
+                4320    2161
+                65535
+                """;

        // when
        try (InputStream inputStream = context.getResources().openRawResource(EGM2008Utils.EGM2008_5_DATA)) {
@@ -12,7 +12,7 @@ import org.junit.runner.RunWith;

 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;

@RunWith(AndroidJUnit4.class)
 public class StatisticsUtilsTest extends TestCase {
@@ -44,16 +44,16 @@ public class StatisticsUtilsTest extends TestCase {
    @Test
    public void testFilterVisible() {
        // given
-        Layout layout = new Layout("profile");
-        layout.addField(new DataField("key1", "title1", true, true, false));
-        layout.addField(new DataField("key2", "title2", false, true, false));
-        layout.addField(new DataField("key3", "title3", true, true, false));
-        layout.addField(new DataField("key4", "title4", false, true, false));
-        layout.addField(new DataField("key5", "title5", true, true, false));
+        RecordingLayout recordingLayout = new RecordingLayout("profile");
+        recordingLayout.addField(new DataField("key1", true, true, false));
+        recordingLayout.addField(new DataField("key2", false, true, false));
+        recordingLayout.addField(new DataField("key3", true, true, false));
+        recordingLayout.addField(new DataField("key4", false, true, false));
+        recordingLayout.addField(new DataField("key5", true, true, false));

        // when
-        Layout resultTrue = StatisticsUtils.filterVisible(layout, true);
-        Layout resultFalse = StatisticsUtils.filterVisible(layout, false);
+        RecordingLayout resultTrue = recordingLayout.toRecordingLayout(true);
+        RecordingLayout resultFalse = recordingLayout.toRecordingLayout(false);

        // then
        assertEquals(resultTrue.getFields().size(), 3);
@@ -1,199 +0,0 @@
-package de.dennisguse.opentracks.viewmodels;
-
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.time.Duration;
-import java.util.List;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.data.models.Cadence;
-import de.dennisguse.opentracks.data.models.Distance;
-import de.dennisguse.opentracks.data.models.HeartRate;
-import de.dennisguse.opentracks.data.models.Power;
-import de.dennisguse.opentracks.data.models.Track;
-import de.dennisguse.opentracks.services.RecordingData;
-import de.dennisguse.opentracks.settings.UnitSystem;
-import de.dennisguse.opentracks.stats.SensorStatistics;
-import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
-
-@RunWith(MockitoJUnitRunner.class)
-public class StatisticDataBuilderTest extends TestCase {
-
-    private final Context context = ApplicationProvider.getApplicationContext();
-
-    @Mock
-    private Track trackMock;
-
-    @Mock
-    private TrackStatistics trackStatisticsMock;
-
-    @Mock
-    private RecordingData recordingDataMock;
-
-    @Mock
-    private SensorStatistics sensorStatisticsMock;
-
-    @Test
-    public void testFromRecordingData() {
-        when(trackMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-        when(trackStatisticsMock.getTotalTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getMovingTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
-        when(recordingDataMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-
-        // given
-        Layout layout = new Layout(context.getString(R.string.default_activity_default));
-        layout.addField(context.getString(R.string.stats_custom_layout_total_time_key), context.getString(R.string.stats_total_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), false, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_max_speed_key), context.getString(R.string.stats_max_speed), false, true, false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromRecordingData(context, recordingDataMock, layout, UnitSystem.METRIC);
-
-        // then
-        assertEquals(statisticDataList.size(), 3);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_total_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_moving_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_distance))));
-    }
-
-    @Test
-    public void testFromRecordingData_allFields() {
-        when(trackMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-        when(trackStatisticsMock.getTotalTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getMovingTime()).thenReturn(Duration.ofMillis(0));
-        when(trackStatisticsMock.getTotalDistance()).thenReturn(Distance.of(0));
-        when(recordingDataMock.getTrackStatistics()).thenReturn(trackStatisticsMock);
-
-        // given
-        Layout layout = new Layout(context.getString(R.string.default_activity_default));
-        layout.addField(context.getString(R.string.stats_custom_layout_total_time_key), context.getString(R.string.stats_total_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_moving_time_key), context.getString(R.string.stats_moving_time), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_distance_key), context.getString(R.string.stats_distance), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_speed_key), context.getString(R.string.stats_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), context.getString(R.string.stats_average_moving_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_speed_key), context.getString(R.string.stats_average_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_max_speed_key), context.getString(R.string.stats_max_speed), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_pace_key), context.getString(R.string.stats_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_moving_pace_key), context.getString(R.string.stats_average_moving_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_average_pace_key), context.getString(R.string.stats_average_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_fastest_pace_key), context.getString(R.string.stats_fastest_pace), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_altitude_key), context.getString(R.string.stats_altitude), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_gain_key), context.getString(R.string.stats_gain), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_loss_key), context.getString(R.string.stats_loss), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_coordinates_key), context.getString(R.string.stats_coordinates), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_heart_rate_key), context.getString(R.string.stats_sensors_heart_rate), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_cadence_key), context.getString(R.string.stats_sensors_cadence), true, true, false);
-        layout.addField(context.getString(R.string.stats_custom_layout_power_key), context.getString(R.string.stats_sensors_power), true, true, false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromRecordingData(context, recordingDataMock, layout, UnitSystem.METRIC);
-
-        // then
-        assertEquals(statisticDataList.size(), 18);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_total_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_moving_time))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_distance))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_moving_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_max_speed))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_moving_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_average_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_fastest_pace))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_altitude))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_gain))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_loss))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_coordinates))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_heart_rate))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_cadence))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.stats_sensors_power))));
-    }
-
-    @Test
-    public void testFromSensorStatistics_onlyHeartRate() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
-        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(HeartRate.of(200f));
-        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(HeartRate.of(150f));
-        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
-        when(sensorStatisticsMock.hasPower()).thenReturn(false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-
-        // then
-        assertEquals(statisticDataList.size(), 2);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_avg))));
-    }
-
-    @Test
-    public void testFromSensorStatistics_onlyCadence() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
-        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgCadence()).thenReturn(Cadence.of(90f));
-        when(sensorStatisticsMock.getMaxCadence()).thenReturn(Cadence.of(110f));
-        when(sensorStatisticsMock.hasPower()).thenReturn(false);
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-
-        // then
-        assertEquals(statisticDataList.size(), 2);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_avg))));
-    }
-
-    @Test
-    public void testFromSensorStatistics_onlyPower() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(false);
-        when(sensorStatisticsMock.hasCadence()).thenReturn(false);
-        when(sensorStatisticsMock.hasPower()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgPower()).thenReturn(Power.of(300f));
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_power_avg))));
-
-        // then
-        assertEquals(statisticDataList.size(), 1);
-    }
-
-    @Test
-    public void testFromSensorStatistics() {
-        when(sensorStatisticsMock.hasHeartRate()).thenReturn(true);
-        when(sensorStatisticsMock.getMaxHeartRate()).thenReturn(HeartRate.of(200f));
-        when(sensorStatisticsMock.getAvgHeartRate()).thenReturn(HeartRate.of(150f));
-        when(sensorStatisticsMock.hasCadence()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgCadence()).thenReturn(Cadence.of(90f));
-        when(sensorStatisticsMock.getMaxCadence()).thenReturn(Cadence.of(110f));
-        when(sensorStatisticsMock.hasPower()).thenReturn(true);
-        when(sensorStatisticsMock.getAvgPower()).thenReturn(Power.of(300f));
-
-        // when
-        List<StatisticData> statisticDataList = StatisticDataBuilder.fromSensorStatistics(context, sensorStatisticsMock);
-
-        // then
-        assertEquals(statisticDataList.size(), 5);
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_heart_rate_avg))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_max))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_cadence_avg))));
-        assertTrue(statisticDataList.stream().anyMatch(i -> i.getField().getTitle().equals(context.getString(R.string.sensor_state_power_avg))));
-    }
-}
@@ -1,11 +1,13 @@
 #time,trackpoint_type,latitude,longitude,altitude,accuracy_horizontal,accuracy_vertical,speed,altitude_gain,altitude_loss,sensor_distance,heartrate,cadence,power
 "2020-02-02T03:02:02+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:03+01:00","TRACKPOINT",3,3,10,10,,54,1,1,,,,
+"2020-02-02T03:02:03+01:00","TRACKPOINT",3,14,10,10,,54,1,1,,,,
 "2020-02-02T03:02:04+01:00","SENSORPOINT",,,,,,54,1,1,10,66,3,50
-"2020-02-02T03:02:05+01:00","TRACKPOINT",3,3,10,10,,18,0,0,2,66,3,50
-"2020-02-02T03:02:06+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:21+01:00","TRACKPOINT",3,3,10,10,,54,0,0,,,,
-"2020-02-02T03:02:22+01:00","SEGMENT_START_AUTOMATIC",3,3,10,10,,54,0,0,,,,
-"2020-02-02T03:02:23+01:00","TRACKPOINT",3,3,10,10,,54,0,0,,,,
-"2020-02-02T03:02:24+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
+"2020-02-02T03:02:15+01:00","SENSORPOINT",,,,,,,,,,68,3,50
+"2020-02-02T03:02:16+01:00","SENSORPOINT",,,,,,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",,,,,,,,,,,,
@@ -62,7 +62,9 @@ limitations under the License.

    <application
        android:name=".Startup"
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules_30_lower"
+        android:dataExtractionRules="@xml/backup_rules_31_higher"
        android:hardwareAccelerated="true"
        android:hasFragileUserData="false"
        android:icon="@drawable/ic_launcher"
@@ -24,6 +24,7 @@ import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;

 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackEditBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
@@ -75,7 +76,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit

        viewBinding.fields.trackEditActivityType.setText(track.getCategory());

-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
        viewBinding.fields.trackEditActivityType.setAdapter(adapter);
        viewBinding.fields.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.fields.trackEditActivityType.getAdapter().getItem(position))));
        viewBinding.fields.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {
@@ -38,7 +38,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
-import androidx.core.splashscreen.SplashScreen;
 import androidx.cursoradapter.widget.ResourceCursorAdapter;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.CursorLoader;
@@ -312,9 +311,9 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
        searchMenuItem = menu.findItem(R.id.track_list_search);
        SearchView searchView = ActivityUtils.configureSearchWidget(this, searchMenuItem);

-        searchView.findViewById(R.id.search_edit_frame).setPadding(0, 0, 48, 0);
+        searchView.findViewById(androidx.appcompat.R.id.search_edit_frame).setPadding(0, 0, 48, 0);

-        SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(R.id.search_src_text);
+        SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
        searchAutoComplete.setHintTextColor(ContextCompat.getColor(this, android.R.color.white));
        searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white));

@@ -274,18 +274,14 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
        @NonNull
        @Override
        public Fragment createFragment(int position) {
-            switch (position) {
-                case 0:
-                    return StatisticsRecordedFragment.newInstance(trackId);
-                case 1:
-                    return IntervalsFragment.newInstance(trackId, true);
-                case 2:
-                    return ChartFragment.newInstance(false);
-                case 3:
-                    return ChartFragment.newInstance(true);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> StatisticsRecordedFragment.newInstance(trackId);
+                case 1 -> IntervalsFragment.newInstance(trackId, true);
+                case 2 -> ChartFragment.newInstance(false);
+                case 3 -> ChartFragment.newInstance(true);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
        }

        @Override
@@ -294,18 +290,14 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement
        }

        public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return getString(R.string.track_detail_stats_tab);
-                case 1:
-                    return getString(R.string.track_detail_intervals_tab);
-                case 2:
-                    return getString(R.string.settings_chart_by_time);
-                case 3:
-                    return getString(R.string.settings_chart_by_distance);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> getString(R.string.track_detail_stats_tab);
+                case 1 -> getString(R.string.track_detail_intervals_tab);
+                case 2 -> getString(R.string.settings_chart_by_time);
+                case 3 -> getString(R.string.settings_chart_by_distance);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
        }
    }

@@ -146,9 +146,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
            finish();
            return true;
        });
-        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> {
-            Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show();
-        });
+        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show());

        viewBinding.bottomAppBar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24);
        setSupportActionBar(viewBinding.bottomAppBar);
@@ -335,18 +333,14 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        @NonNull
        @Override
        public Fragment createFragment(int position) {
-            switch (position) {
-                case 0:
-                    return StatisticsRecordingFragment.newInstance();
-                case 1:
-                    return IntervalsFragment.newInstance(trackId, false);
-                case 2:
-                    return ChartFragment.newInstance(false);
-                case 3:
-                    return ChartFragment.newInstance(true);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> StatisticsRecordingFragment.newInstance();
+                case 1 -> IntervalsFragment.newInstance(trackId, false);
+                case 2 -> ChartFragment.newInstance(false);
+                case 3 -> ChartFragment.newInstance(true);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
        }

        @Override
@@ -355,18 +349,14 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
        }

        public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return getString(R.string.track_detail_stats_tab);
-                case 1:
-                    return getString(R.string.track_detail_intervals_tab);
-                case 2:
-                    return getString(R.string.settings_chart_by_time);
-                case 3:
-                    return getString(R.string.settings_chart_by_distance);
-                default:
-                    throw new RuntimeException("There isn't Fragment associated with the position: " + position);
-            }
+            return switch (position) {
+                case 0 -> getString(R.string.track_detail_stats_tab);
+                case 1 -> getString(R.string.track_detail_intervals_tab);
+                case 2 -> getString(R.string.settings_chart_by_time);
+                case 3 -> getString(R.string.settings_chart_by_distance);
+                default ->
+                        throw new RuntimeException("There isn't Fragment associated with the position: " + position);
+            };
        }
    }

@@ -383,13 +373,18 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
    }

    private void onGpsStatusChanged(GpsStatusValue gpsStatusValue) {
-        if (gpsStatusValue.isGpsStarted() && snackbar != null && snackbar.isShown()) {
-            snackbar.dismiss();
+        boolean snackbarShowing = snackbar != null && snackbar.isShown();
+        if (gpsStatusValue.isGpsStarted()) {
+            if (snackbarShowing) {
+                snackbar.dismiss();
+            }
            return;
        }
-        if (gpsStatusValue != GpsStatusValue.GPS_DISABLED) {
+
+        if (snackbarShowing) {
            return;
        }
+
        snackbar = Snackbar
                .make(viewBinding.trackRecordingCoordinatorLayout,
                        getString(R.string.gps_recording_status, getString(gpsStatusValue.message), getString(R.string.gps_recording_without_signal)),
@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.ArrayAdapter;

 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.Track;
@@ -51,7 +52,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements

        viewBinding.trackEditActivityType.setText(track.getCategory());

-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
        viewBinding.trackEditActivityType.setAdapter(adapter);
        viewBinding.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.trackEditActivityType.getAdapter().getItem(position))));
        viewBinding.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {
@@ -1,176 +0,0 @@
-package de.dennisguse.opentracks.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextClock;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.ui.customRecordingLayout.CustomLayoutFieldType;
-import de.dennisguse.opentracks.viewmodels.StatisticData;
-
-public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private List<StatisticData> statisticDataList;
-    private final Context context;
-
-    public StatisticsAdapter(Context context) {
-        this.context = context;
-        this.statisticDataList = new ArrayList<>();
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view;
-        if (viewType == CustomLayoutFieldType.CLOCK.value()) {
-            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_clock_item, parent, false);
-            return new StatisticsAdapter.ViewClockHolder(view);
-        } else {
-            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_generic_item, parent, false);
-            return new StatisticsAdapter.ViewHolder(view);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        StatisticData statisticData = statisticDataList.get(position);
-        if (getItemViewType(position) == CustomLayoutFieldType.CLOCK.value()) {
-            StatisticsAdapter.ViewClockHolder viewHolder = (StatisticsAdapter.ViewClockHolder) holder;
-            viewHolder.setData(statisticData);
-        } else {
-            StatisticsAdapter.ViewHolder viewHolder = (StatisticsAdapter.ViewHolder) holder;
-            viewHolder.setData(statisticData);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        if (statisticDataList == null) {
-            return 0;
-        } else {
-            return statisticDataList.size();
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (statisticDataList.get(position).getField().getType(context) == CustomLayoutFieldType.CLOCK) {
-            return CustomLayoutFieldType.CLOCK.value();
-        } else {
-            return CustomLayoutFieldType.GENERIC.value();
-        }
-    }
-
-    public boolean isItemWide(int position) {
-        return statisticDataList.get(position).getField().isWide();
-    }
-
-    public List<StatisticData> swapData(List<StatisticData> data) {
-        if (statisticDataList == data) {
-            return null;
-        }
-
-        statisticDataList = data;
-
-        if (data != null) {
-            this.notifyDataSetChanged();
-        }
-
-        return data;
-    }
-
-    public static class WithRecordedLayout extends StatisticsAdapter {
-        public WithRecordedLayout(Context context) {
-            super(context);
-        }
-
-        @NonNull
-        @Override
-        public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_recorded_item, parent, false);
-            return new StatisticsAdapter.ViewRecordedHolder(view);
-        }
-    }
-
-    private class ViewHolder extends RecyclerView.ViewHolder {
-        final TextView value;
-        final TextView unit;
-        final TextView descMain;
-        final TextView descSecondary;
-
-        public ViewHolder(@NonNull View itemView) {
-            super(itemView);
-            value = itemView.findViewById(R.id.stats_value);
-            unit = itemView.findViewById(R.id.stats_unit);
-            descMain = itemView.findViewById(R.id.stats_description_main);
-            descSecondary = itemView.findViewById(R.id.stats_description_secondary);
-        }
-
-        public void setData(StatisticData statisticData) {
-            if (statisticData == null) {
-                return;
-            }
-            this.value.setText(statisticData.hasValue() ? statisticData.getValue() : context.getString(R.string.value_unknown));
-            this.value.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryValue : R.style.TextAppearance_OpenTracks_SecondaryValue);
-            this.unit.setText(statisticData.getUnit());
-            this.descMain.setText(statisticData.getField().getTitle());
-            this.descMain.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryHeader : R.style.TextAppearance_OpenTracks_SecondaryHeader);
-            if (statisticData.hasDescription()) {
-                this.descSecondary.setVisibility(View.VISIBLE);
-                this.descSecondary.setText(statisticData.getDescription());
-            } else {
-                this.descSecondary.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    private class ViewClockHolder extends RecyclerView.ViewHolder {
-        final TextClock value;
-        final TextView descMain;
-
-        public ViewClockHolder(@NonNull View itemView) {
-            super(itemView);
-            value = itemView.findViewById(R.id.stats_clock);
-            descMain = itemView.findViewById(R.id.stats_description_main);
-        }
-
-        public void setData(StatisticData statisticData) {
-            if (statisticData == null) {
-                return;
-            }
-            this.value.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryValue : R.style.TextAppearance_OpenTracks_SecondaryValue);
-            this.descMain.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.TextAppearance_OpenTracks_PrimaryHeader : R.style.TextAppearance_OpenTracks_SecondaryHeader);
-        }
-    }
-
-    private class ViewRecordedHolder extends ViewHolder {
-
-        public ViewRecordedHolder(@NonNull View itemView) {
-            super(itemView);
-        }
-
-        public void setData(StatisticData statisticData) {
-            if (statisticData == null) {
-                return;
-            }
-            this.value.setText(statisticData.hasValue() ? statisticData.getValue() : context.getString(R.string.value_unknown));
-            this.unit.setText(statisticData.getUnit());
-            this.descMain.setText(statisticData.getField().getTitle());
-            if (statisticData.hasDescription()) {
-                this.descSecondary.setVisibility(View.VISIBLE);
-                this.descSecondary.setText(statisticData.getDescription());
-            } else {
-                this.descSecondary.setVisibility(View.GONE);
-            }
-        }
-    }
-}
@@ -210,16 +210,11 @@ abstract class ChartValueSeries {
    }

    int getTitleId(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return metricTitleId;
-            case IMPERIAL:
-                return imperialTitleId;
-            case NAUTICAL_IMPERIAL:
-                return nauticalTitleId;
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> metricTitleId;
+            case IMPERIAL -> imperialTitleId;
+            case NAUTICAL_IMPERIAL -> nauticalTitleId;
+        };
    }

    Paint getTitlePaint() {
@@ -733,16 +733,11 @@ public class ChartView extends View {
    private String getXAxisLabel() {
        Context context = getContext();
        if (chartByDistance) {
-            switch (unitSystem) {
-                case METRIC:
-                    return context.getString(R.string.unit_kilometer);
-                case IMPERIAL:
-                    return context.getString(R.string.unit_mile);
-                case NAUTICAL_IMPERIAL:
-                    return context.getString(R.string.unit_nautical_mile);
-                default:
-                    throw new RuntimeException("Not implemented");
-            }
+            return switch (unitSystem) {
+                case METRIC -> context.getString(R.string.unit_kilometer);
+                case IMPERIAL -> context.getString(R.string.unit_mile);
+                case NAUTICAL_IMPERIAL -> context.getString(R.string.unit_nautical_mile);
+            };
        } else {
            return context.getString(R.string.description_time);
        }
@@ -27,7 +27,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;

@@ -134,20 +133,12 @@ public class CustomContentProvider extends ContentProvider {

    @Override
    public int delete(@NonNull Uri url, String where, String[] selectionArgs) {
-        String table;
-        switch (getUrlType(url)) {
-            case TRACKPOINTS:
-                table = TrackPointsColumns.TABLE_NAME;
-                break;
-            case TRACKS:
-                table = TracksColumns.TABLE_NAME;
-                break;
-            case MARKERS:
-                table = MarkerColumns.TABLE_NAME;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URL " + url);
-        }
+        String table = switch (getUrlType(url)) {
+            case TRACKPOINTS -> TrackPointsColumns.TABLE_NAME;
+            case TRACKS -> TracksColumns.TABLE_NAME;
+            case MARKERS -> MarkerColumns.TABLE_NAME;
+            default -> throw new IllegalArgumentException("Unknown URL " + url);
+        };

        Log.w(TAG, "Deleting from table " + table);
        int totalChangesBefore = getTotalChanges();
@@ -187,24 +178,15 @@ public class CustomContentProvider extends ContentProvider {

    @Override
    public String getType(@NonNull Uri url) {
-        switch (getUrlType(url)) {
-            case TRACKPOINTS:
-                return TrackPointsColumns.CONTENT_TYPE;
-            case TRACKPOINTS_BY_ID:
-            case TRACKPOINTS_BY_TRACKID:
-                return TrackPointsColumns.CONTENT_ITEMTYPE;
-            case TRACKS:
-                return TracksColumns.CONTENT_TYPE;
-            case TRACKS_BY_ID:
-                return TracksColumns.CONTENT_ITEMTYPE;
-            case MARKERS:
-                return MarkerColumns.CONTENT_TYPE;
-            case MARKERS_BY_ID:
-            case MARKERS_BY_TRACKID:
-                return MarkerColumns.CONTENT_ITEMTYPE;
-            default:
-                throw new IllegalArgumentException("Unknown URL " + url);
-        }
+        return switch (getUrlType(url)) {
+            case TRACKPOINTS -> TrackPointsColumns.CONTENT_TYPE;
+            case TRACKPOINTS_BY_ID, TRACKPOINTS_BY_TRACKID -> TrackPointsColumns.CONTENT_ITEMTYPE;
+            case TRACKS -> TracksColumns.CONTENT_TYPE;
+            case TRACKS_BY_ID -> TracksColumns.CONTENT_ITEMTYPE;
+            case MARKERS -> MarkerColumns.CONTENT_TYPE;
+            case MARKERS_BY_ID, MARKERS_BY_TRACKID -> MarkerColumns.CONTENT_ITEMTYPE;
+            default -> throw new IllegalArgumentException("Unknown URL " + url);
+        };
    }

    @Override
@@ -252,47 +234,47 @@ public class CustomContentProvider extends ContentProvider {
        SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
        String sortOrder = null;
        switch (getUrlType(url)) {
-            case TRACKPOINTS:
+            case TRACKPOINTS -> {
                queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                sortOrder = sort != null ? sort : TrackPointsColumns.DEFAULT_SORT_ORDER;
-                break;
-            case TRACKPOINTS_BY_ID:
+            }
+            case TRACKPOINTS_BY_ID -> {
                queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                queryBuilder.appendWhere(TrackPointsColumns._ID + "=" + ContentUris.parseId(url));
-                break;
-            case TRACKPOINTS_BY_TRACKID:
+            }
+            case TRACKPOINTS_BY_TRACKID -> {
                queryBuilder.setTables(TrackPointsColumns.TABLE_NAME);
                queryBuilder.appendWhere(TrackPointsColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
-                break;
-            case TRACKS:
+            }
+            case TRACKS -> {
                if (projection != null && Arrays.asList(projection).contains(TracksColumns.MARKER_COUNT)) {
                    queryBuilder.setTables(TracksColumns.TABLE_NAME + " LEFT OUTER JOIN (SELECT " + MarkerColumns.TRACKID + " AS markerTrackId, COUNT(*) AS " + TracksColumns.MARKER_COUNT + " FROM " + MarkerColumns.TABLE_NAME + " GROUP BY " + MarkerColumns.TRACKID + ") ON (" + TracksColumns.TABLE_NAME + "." + TracksColumns._ID + "= markerTrackId)");
                } else {
                    queryBuilder.setTables(TracksColumns.TABLE_NAME);
                }
                sortOrder = sort != null ? sort : TracksColumns.DEFAULT_SORT_ORDER;
-                break;
-            case TRACKS_BY_ID:
+            }
+            case TRACKS_BY_ID -> {
                queryBuilder.setTables(TracksColumns.TABLE_NAME);
                queryBuilder.appendWhere(TracksColumns._ID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
-                break;
-            case TRACKS_SENSOR_STATS:
+            }
+            case TRACKS_SENSOR_STATS -> {
                long trackId = ContentUris.parseId(url);
                return db.rawQuery(SENSOR_STATS_QUERY, new String[]{String.valueOf(trackId), String.valueOf(trackId)});
-            case MARKERS:
+            }
+            case MARKERS -> {
                queryBuilder.setTables(MarkerColumns.TABLE_NAME);
                sortOrder = sort != null ? sort : MarkerColumns.DEFAULT_SORT_ORDER;
-                break;
-            case MARKERS_BY_ID:
+            }
+            case MARKERS_BY_ID -> {
                queryBuilder.setTables(MarkerColumns.TABLE_NAME);
                queryBuilder.appendWhere(MarkerColumns._ID + "=" + ContentUris.parseId(url));
-                break;
-            case MARKERS_BY_TRACKID:
+            }
+            case MARKERS_BY_TRACKID -> {
                queryBuilder.setTables(MarkerColumns.TABLE_NAME);
                queryBuilder.appendWhere(MarkerColumns.TRACKID + " IN (" + TextUtils.join(SQL_LIST_DELIMITER, ContentProviderUtils.parseTrackIdsFromUri(url)) + ")");
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown url " + url);
+            }
+            default -> throw new IllegalArgumentException("Unknown url " + url);
        }
        Cursor cursor = queryBuilder.query(db, projection, selection, selectionArgs, null, null, sortOrder);
        cursor.setNotificationUri(getContext().getContentResolver(), url);
@@ -305,41 +287,40 @@ public class CustomContentProvider extends ContentProvider {
        String table;
        String whereClause;
        switch (getUrlType(url)) {
-            case TRACKPOINTS:
+            case TRACKPOINTS -> {
                table = TrackPointsColumns.TABLE_NAME;
                whereClause = where;
-                break;
-            case TRACKPOINTS_BY_ID:
+            }
+            case TRACKPOINTS_BY_ID -> {
                table = TrackPointsColumns.TABLE_NAME;
                whereClause = TrackPointsColumns._ID + "=" + ContentUris.parseId(url);
                if (!TextUtils.isEmpty(where)) {
                    whereClause += " AND (" + where + ")";
                }
-                break;
-            case TRACKS:
+            }
+            case TRACKS -> {
                table = TracksColumns.TABLE_NAME;
                whereClause = where;
-                break;
-            case TRACKS_BY_ID:
+            }
+            case TRACKS_BY_ID -> {
                table = TracksColumns.TABLE_NAME;
                whereClause = TracksColumns._ID + "=" + ContentUris.parseId(url);
                if (!TextUtils.isEmpty(where)) {
                    whereClause += " AND (" + where + ")";
                }
-                break;
-            case MARKERS:
+            }
+            case MARKERS -> {
                table = MarkerColumns.TABLE_NAME;
                whereClause = where;
-                break;
-            case MARKERS_BY_ID:
+            }
+            case MARKERS_BY_ID -> {
                table = MarkerColumns.TABLE_NAME;
                whereClause = MarkerColumns._ID + "=" + ContentUris.parseId(url);
                if (!TextUtils.isEmpty(where)) {
                    whereClause += " AND (" + where + ")";
                }
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown url " + url);
+            }
+            default -> throw new IllegalArgumentException("Unknown url " + url);
        }
        int count;
        try {
@@ -372,16 +353,12 @@ public class CustomContentProvider extends ContentProvider {
     * @param contentValues the content values
     */
    private Uri insertContentValues(Uri url, UrlType urlType, ContentValues contentValues) {
-        switch (urlType) {
-            case TRACKPOINTS:
-                return insertTrackPoint(url, contentValues);
-            case TRACKS:
-                return insertTrack(url, contentValues);
-            case MARKERS:
-                return insertMarker(url, contentValues);
-            default:
-                throw new IllegalArgumentException("Unknown url " + url);
-        }
+        return switch (urlType) {
+            case TRACKPOINTS -> insertTrackPoint(url, contentValues);
+            case TRACKS -> insertTrack(url, contentValues);
+            case MARKERS -> insertMarker(url, contentValues);
+            default -> throw new IllegalArgumentException("Unknown url " + url);
+        };
    }

    private Uri insertTrackPoint(Uri url, ContentValues values) {
@@ -61,42 +61,18 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
        for (int toVersion = oldVersion + 1; toVersion <= newVersion; toVersion++) {
            Log.i(TAG, "Upgrade from " + oldVersion + " to " + toVersion);
            switch (toVersion) {
-                case 24:
-                    upgradeFrom23to24(db);
-                    break;
-                case 25:
-                    upgradeFrom24to25(db);
-                    break;
-                case 26:
-                    upgradeFrom25to26(db);
-                    break;
-                case 27:
-                    upgradeFrom26to27(db);
-                    break;
-                case 28:
-                    upgradeFrom27to28(db);
-                    break;
-                case 29:
-                    upgradeFrom28to29(db);
-                    break;
-                case 30:
-                    upgradeFrom29to30(db);
-                    break;
-                case 31:
-                    upgradeFrom30to31(db);
-                    break;
-                case 32:
-                    upgradeFrom31to32(db);
-                    break;
-                case 33:
-                    upgradeFrom32to33(db);
-                    break;
-                case 34:
-                    upgradeFrom33to34(db);
-                    break;
-
-                default:
-                    throw new RuntimeException("Not implemented: upgrade to " + toVersion);
+                case 24 -> upgradeFrom23to24(db);
+                case 25 -> upgradeFrom24to25(db);
+                case 26 -> upgradeFrom25to26(db);
+                case 27 -> upgradeFrom26to27(db);
+                case 28 -> upgradeFrom27to28(db);
+                case 29 -> upgradeFrom28to29(db);
+                case 30 -> upgradeFrom29to30(db);
+                case 31 -> upgradeFrom30to31(db);
+                case 32 -> upgradeFrom31to32(db);
+                case 33 -> upgradeFrom32to33(db);
+                case 34 -> upgradeFrom33to34(db);
+                default -> throw new RuntimeException("Not implemented: upgrade to " + toVersion);
            }
        }
    }
@@ -106,41 +82,18 @@ public class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
        for (int toVersion = oldVersion - 1; toVersion >= newVersion; toVersion--) {
            Log.i(TAG, "Downgrade from " + oldVersion + " to " + toVersion);
            switch (toVersion) {
-                case 23:
-                    downgradeFrom24to23(db);
-                    break;
-                case 24:
-                    downgradeFrom25to24(db);
-                    break;
-                case 25:
-                    downgradeFrom26to25(db);
-                    break;
-                case 26:
-                    downgradeFrom27to26(db);
-                    break;
-                case 27:
-                    downgradeFrom28to27(db);
-                    break;
-                case 28:
-                    downgradeFrom29to28(db);
-                    break;
-                case 29:
-                    downgradeFrom30to29(db);
-                    break;
-                case 30:
-                    downgradeFrom31to30(db);
-                    break;
-                case 31:
-                    downgradeFrom32to31(db);
-                    break;
-                case 32:
-                    downgradeFrom33to32(db);
-                    break;
-                case 33:
-                    downgradeFrom34to33(db);
-                    break;
-                default:
-                    throw new RuntimeException("Not implemented: downgrade to " + toVersion);
+                case 23 -> downgradeFrom24to23(db);
+                case 24 -> downgradeFrom25to24(db);
+                case 25 -> downgradeFrom26to25(db);
+                case 26 -> downgradeFrom27to26(db);
+                case 27 -> downgradeFrom28to27(db);
+                case 28 -> downgradeFrom29to28(db);
+                case 29 -> downgradeFrom30to29(db);
+                case 30 -> downgradeFrom31to30(db);
+                case 31 -> downgradeFrom32to31(db);
+                case 32 -> downgradeFrom33to32(db);
+                case 33 -> downgradeFrom34to33(db);
+                default -> throw new RuntimeException("Not implemented: downgrade to " + toVersion);
            }
        }
    }
@@ -129,24 +129,18 @@ public class ShareContentProvider extends CustomContentProvider {
    }

    private static TrackFileFormat getTrackFileFormat(@NonNull Uri uri) {
-        switch (uriMatcher.match(uri)) {
-            case URI_GPX:
-                return TrackFileFormat.GPX;
-
-            case URI_KML_WITH_TRACKDETAIL_SENSORDATA:
-                return TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA;
-
-            case URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA:
-                return TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA;
-            case URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES:
-                return TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES;
-
-            case URI_CSV:
-                return TrackFileFormat.CSV;
-
-            default:
-                throw new RuntimeException("Could not derive TrackFileFormat from Uri " + uri);
-        }
+        return switch (uriMatcher.match(uri)) {
+            case URI_GPX -> TrackFileFormat.GPX;
+            case URI_KML_WITH_TRACKDETAIL_SENSORDATA ->
+                    TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA;
+            case URI_KMZ_WITH_TRACKDETAIL_AND_SENSORDATA ->
+                    TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA;
+            case URI_KMZ_WITH_TRACKDETAIL_SENSORDATA_AND_PICTURES ->
+                    TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES;
+            case URI_CSV -> TrackFileFormat.CSV;
+            default ->
+                    throw new RuntimeException("Could not derive TrackFileFormat from Uri " + uri);
+        };
    }

    @Nullable
@@ -170,14 +164,14 @@ public class ShareContentProvider extends CustomContentProvider {
        int i = 0;
        for (String col : projection) {
            switch (col) {
-                case OpenableColumns.DISPLAY_NAME:
+                case OpenableColumns.DISPLAY_NAME -> {
                    cols[i] = OpenableColumns.DISPLAY_NAME;
                    values[i++] = uri.getLastPathSegment();
-                    break;
-                case OpenableColumns.SIZE:
+                }
+                case OpenableColumns.SIZE -> {
                    cols[i] = OpenableColumns.SIZE;
                    values[i++] = -1; //Report unknown size; if applications need to know, one need to generate the file here also (count bytes that are written to OutputStream.
-                    break;
+                }
            }
        }

@@ -214,7 +208,7 @@ public class ShareContentProvider extends CustomContentProvider {
            }
        }

-        final TrackExporter trackExporter = getTrackFileFormat(uri).createTrackExporter(getContext());
+        final TrackExporter trackExporter = getTrackFileFormat(uri).createTrackExporter(getContext(), new ContentProviderUtils(getContext()));

        PipeDataWriter<String> pipeDataWriter = (output, uri1, mimeType, opts, args) -> {
            try (FileOutputStream fileOutputStream = new FileOutputStream(output.getFileDescriptor())) {
@@ -0,0 +1,79 @@
+package de.dennisguse.opentracks.data.models;
+
+import android.content.Context;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import de.dennisguse.opentracks.R;
+
+public enum ActivityType {
+    AIRPLANE("AIRPLANE", R.drawable.ic_activity_flight_24dp, true, R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane),
+    BIKE("BIKE", R.drawable.ic_activity_bike_24dp, true, R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_road_biking, R.string.activity_type_track_cycling),
+    MOUNTAIN_BIKE("MOUNTAIN_BIKE", R.drawable.ic_activity_mtb_24dp, true, R.string.activity_type_mountain_biking),
+    MOTOR_BIKE("MOTOR_BIKE", R.drawable.ic_activity_motorbike_24dp, true, R.string.activity_type_motor_bike),
+    KAYAK("KAYAK", R.drawable.ic_activity_kayaking_24dp, true, R.string.activity_type_kayaking),
+    BOAT("BOAT", R.drawable.ic_activity_boat_24dp, true, R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat),
+    SAILING("SAILING", R.drawable.ic_activity_sailing_24dp, true, R.string.activity_type_sailing),
+    DRIVE("DRIVE", R.drawable.ic_activity_drive_24dp, true, R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car),
+    RUN("RUN", R.drawable.ic_activity_run_24dp, false, R.string.activity_type_running, R.string.activity_type_street_running, R.string.activity_type_track_running, R.string.activity_type_trail_running),
+    SKI("SKI", R.drawable.ic_activity_skiing_24dp, true, R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing),
+    SNOW_BOARDING("SNOW_BOARDING", R.drawable.ic_activity_snowboarding_24dp, true, R.string.activity_type_snow_boarding),
+    UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp, true, R.string.activity_type_unknown),
+    WALK("WALK", R.drawable.ic_activity_walk_24dp, false, R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking),
+    ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp, true, R.string.activity_type_escooter),
+    INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp, true, R.string.activity_type_inline_skating),
+    SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp, true, R.string.activity_type_skate_boarding),
+    CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp, false, R.string.activity_type_climbing),
+    SWIMMING("SWIMMING", R.drawable.ic_activity_swimming_24dp, false, R.string.activity_type_swimming),
+    SWIMMING_OPEN("SWIMMING_OPEN", R.drawable.ic_activity_swimming_open_24dp, false, R.string.activity_type_swimming_open),
+    WORKOUT("WORKOUT", R.drawable.ic_activity_workout_24dp, false, R.string.activity_type_workout);
+
+    final String id;
+    final int iconId;
+    final boolean showSpeedPreferred;
+    final int[] localizedStringIds;
+
+    //isSpeed?
+
+    ActivityType(String id, int iconId, boolean showSpeedPreferred, int... localizedStringIds) {
+        this.id = id;
+        this.iconId = iconId;
+        this.showSpeedPreferred = showSpeedPreferred;
+        this.localizedStringIds = localizedStringIds;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public int getIconId() {
+        return iconId;
+    }
+
+    public boolean isShowSpeedPreferred() {
+        return showSpeedPreferred;
+    }
+
+    public int[] getLocalizedStringIds() {
+        return localizedStringIds;
+    }
+
+    public int getFirstLocalizedStringId() {
+        return localizedStringIds[0];
+    }
+
+    public static List<String> getLocalizedStrings(Context context) {
+        List<String> result = new ArrayList<>();
+        for (ActivityType activityType : values()) {
+            List<String> strings = Arrays.stream(activityType.localizedStringIds)
+                    .mapToObj(context::getString)
+                    .collect(Collectors.toList());
+            result.addAll(strings);
+        }
+
+        return result;
+    }
+}
@@ -58,16 +58,11 @@ public class Distance {
    }

    public static Distance one(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return Distance.ofKilometer(1);
-            case IMPERIAL:
-                return Distance.ofMile(1);
-            case NAUTICAL_IMPERIAL:
-                return Distance.ofNauticalMile(1);
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> Distance.ofKilometer(1);
+            case IMPERIAL -> Distance.ofMile(1);
+            case NAUTICAL_IMPERIAL -> Distance.ofNauticalMile(1);
+        };
    }

    private final double distance_m;
@@ -133,28 +128,18 @@ public class Distance {
    }

    public double toKM_Miles(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return toKM();
-            case IMPERIAL:
-                return toMI();
-            case NAUTICAL_IMPERIAL:
-                return toNauticalMiles();
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> toKM();
+            case IMPERIAL -> toMI();
+            case NAUTICAL_IMPERIAL -> toNauticalMiles();
+        };
    }

    public double toM_FT(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return toM();
-            case NAUTICAL_IMPERIAL:
-            case IMPERIAL:
-                return toFT();
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> toM();
+            case NAUTICAL_IMPERIAL, IMPERIAL -> toFT();
+        };
    }

    @Override
@@ -46,38 +46,36 @@ public class DistanceFormatter {
    public Pair<String, String> getDistanceParts(Distance distance) {
        if (distance.isInvalid()) {
            String valueUnknown = resources.getString(R.string.value_unknown);
-            switch (unitSystem) {
-                case METRIC:
-                    return new Pair<>(valueUnknown, resources.getString(R.string.unit_meter));
-                case IMPERIAL:
-                case NAUTICAL_IMPERIAL:
-                    return new Pair<>(valueUnknown, resources.getString(R.string.unit_feet));
-                default:
-                    throw new RuntimeException("Not implemented");
-            }
+            return switch (unitSystem) {
+                case METRIC -> new Pair<>(valueUnknown, resources.getString(R.string.unit_meter));
+                case IMPERIAL, NAUTICAL_IMPERIAL ->
+                        new Pair<>(valueUnknown, resources.getString(R.string.unit_feet));
+            };
        }

        switch (unitSystem) {
-            case METRIC:
+            case METRIC -> {
                if (distance.greaterThan(Distance.ofKilometer(threshold))) {
                    return new Pair<>(StringUtils.formatDecimal(distance.toKM(), decimalCount), resources.getString(R.string.unit_kilometer));
                } else {
                    return new Pair<>(StringUtils.formatDecimal(distance.toM(), decimalCount), resources.getString(R.string.unit_meter));
                }
-            case IMPERIAL:
+            }
+            case IMPERIAL -> {
                if (distance.greaterThan(Distance.ofMile(threshold))) {
                    return new Pair<>(StringUtils.formatDecimal(distance.toMI(), decimalCount), resources.getString(R.string.unit_mile));
                } else {
                    return new Pair<>(StringUtils.formatDecimal(distance.toFT(), decimalCount), resources.getString(R.string.unit_feet));
                }
-            case NAUTICAL_IMPERIAL:
+            }
+            case NAUTICAL_IMPERIAL -> {
                if (distance.greaterThan(Distance.ofNauticalMile(threshold))) {
                    return new Pair<>(StringUtils.formatDecimal(distance.toNauticalMiles(), decimalCount), resources.getString(R.string.unit_nautical_mile));
                } else {
                    return new Pair<>(StringUtils.formatDecimal(distance.toFT(), decimalCount), resources.getString(R.string.unit_feet));
                }
-            default:
-                throw new RuntimeException("Not implemented");
+            }
+            default -> throw new RuntimeException("Not implemented");
        }
    }

@@ -0,0 +1,38 @@
+package de.dennisguse.opentracks.data.models;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
+
+public class HeartRateZones {
+
+    private final HeartRate max;
+
+    public HeartRateZones(@NonNull HeartRate max) {
+        this.max = max;
+    }
+
+    public int getTextColorForZone(Context context, HeartRate current) {
+        if (current != null) {
+            if (current.getBPM() >= max.getBPM() * 0.9) {
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_5);
+            }
+            if (current.getBPM() >= max.getBPM() * 0.8) {
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_4);
+            }
+            if (current.getBPM() >= max.getBPM() * 0.7) {
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_3);
+            }
+            if (current.getBPM() >= max.getBPM() * 0.6) {
+                return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_2);
+            }
+        }
+
+        // Zone 1
+        return ThemeUtils.getTextColorPrimary(context);
+    }
+}
@@ -115,16 +115,11 @@ public class Speed {
    }

    public double to(UnitSystem unitSystem) {
-        switch (unitSystem) {
-            case METRIC:
-                return toKMH();
-            case IMPERIAL:
-                return toMPH();
-            case NAUTICAL_IMPERIAL:
-                return toKnots();
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        return switch (unitSystem) {
+            case METRIC -> toKMH();
+            case IMPERIAL -> toMPH();
+            case NAUTICAL_IMPERIAL -> toKnots();
+        };
    }

    @Override
@@ -39,20 +39,14 @@ public class SpeedFormatter {
     * @return the formatted speed (or null) and it's unit as {@link Pair}
     */
    public Pair<String, String> getSpeedParts(Speed speed) {
-        int unitId;
-        switch (unitSystem) {
-            case METRIC:
-                unitId = reportSpeedOrPace ? R.string.unit_kilometer_per_hour : R.string.unit_minute_per_kilometer;
-                break;
-            case IMPERIAL:
-                unitId = reportSpeedOrPace ? R.string.unit_mile_per_hour : R.string.unit_minute_per_mile;
-                break;
-            case NAUTICAL_IMPERIAL:
-                unitId = reportSpeedOrPace ? R.string.unit_knots : R.string.unit_minute_per_nautical_mile;
-                break;
-            default:
-                throw new RuntimeException("Not implemented");
-        }
+        int unitId = switch (unitSystem) {
+            case METRIC ->
+                    reportSpeedOrPace ? R.string.unit_kilometer_per_hour : R.string.unit_minute_per_kilometer;
+            case IMPERIAL ->
+                    reportSpeedOrPace ? R.string.unit_mile_per_hour : R.string.unit_minute_per_mile;
+            case NAUTICAL_IMPERIAL ->
+                    reportSpeedOrPace ? R.string.unit_knots : R.string.unit_minute_per_nautical_mile;
+        };

        String unitString = resources.getString(unitId);

@@ -385,10 +385,6 @@ public class TrackPoint {
        return this;
    }

-    public boolean hasSensorData() {
-        return hasHeartRate() || hasCadence() || hasPower();
-    }
-
    public boolean hasHeartRate() {
        return heartRate != null;
    }
@@ -31,11 +31,8 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

-import java.util.List;
-
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackRecordedActivity;
-import de.dennisguse.opentracks.adapters.StatisticsAdapter;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
@@ -47,8 +44,6 @@ import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.viewmodels.StatisticData;
-import de.dennisguse.opentracks.viewmodels.StatisticDataBuilder;

 /**
 * A fragment to display track statistics to the user for a recorded {@link Track}.
@@ -72,7 +67,6 @@ public class StatisticsRecordedFragment extends Fragment {
    }

    private SensorStatistics sensorStatistics;
-    private StatisticsAdapter.WithRecordedLayout sensorsAdapter;

    private Track.Id trackId;
    @Nullable // Lazily loaded.
@@ -113,8 +107,6 @@ public class StatisticsRecordedFragment extends Fragment {

        trackId = getArguments().getParcelable(TRACK_ID_KEY);
        contentProviderUtils = new ContentProviderUtils(getContext());
-
-        sensorsAdapter = new StatisticsAdapter.WithRecordedLayout(getContext());
    }

    @Override
@@ -123,7 +115,7 @@ public class StatisticsRecordedFragment extends Fragment {

        RecyclerView sensorsRecyclerView = viewBinding.statsSensorsRecyclerView;
        sensorsRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
-        sensorsRecyclerView.setAdapter(sensorsAdapter);
+//        sensorsRecyclerView.setAdapter(sensorsAdapter);

        return viewBinding.getRoot();
    }
@@ -261,10 +253,6 @@ public class StatisticsRecordedFragment extends Fragment {
        if (sensorStatistics == null) {
            return;
        }
-
-        List<StatisticData> sensorDataList = StatisticDataBuilder.fromSensorStatistics(getContext(), sensorStatistics);
-        if (sensorDataList.size() > 0) {
-            sensorsAdapter.swapData(sensorDataList);
-        }
+        //TODO
    }
 }
@@ -2,6 +2,7 @@ package de.dennisguse.opentracks.fragments;

 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,16 +10,14 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import androidx.gridlayout.widget.GridLayout;

+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;

 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.adapters.StatisticsAdapter;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.StatisticsRecordingBinding;
 import de.dennisguse.opentracks.services.RecordingData;
@@ -26,9 +25,10 @@ import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.UnitSystem;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
-import de.dennisguse.opentracks.viewmodels.StatisticData;
-import de.dennisguse.opentracks.viewmodels.StatisticsDataModel;
+import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
+import de.dennisguse.opentracks.viewmodels.Mapping;
+import de.dennisguse.opentracks.viewmodels.StatisticViewHolder;

 /**
 * A fragment to display track statistics to the user for a currently recording {@link Track}.
@@ -48,68 +48,37 @@ public class StatisticsRecordingFragment extends Fragment {

    private RecordingData recordingData = TrackRecordingService.NOT_RECORDING;

-    private Layout layout;
+    private final List<StatisticViewHolder<?>> viewHolders = new LinkedList<>();
+
+    private RecordingLayout recordingLayout;

    private StatisticsRecordingBinding viewBinding;
-    private StatisticsAdapter statisticsAdapter;
-    private GridLayoutManager gridLayoutManager;
-    private StatisticsDataModel viewModel;
-    private LiveData<List<StatisticData>> statisticsLiveData;

    private UnitSystem unitSystem = UnitSystem.defaultUnitSystem();

    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> {
-        boolean updateUInecessary = false;
-
        if (PreferencesUtils.isKey(R.string.stats_units_key, key)) {
-            updateUInecessary = true;
            unitSystem = PreferencesUtils.getUnitSystem();
+            updateDataOnUI();
        }

        if (PreferencesUtils.isKey(R.string.stats_custom_layouts_key, key) || PreferencesUtils.isKey(R.string.stats_custom_layout_selected_layout_key, key)) {
-            updateUInecessary = true;
-            layout = PreferencesUtils.getCustomLayout();
-            gridLayoutManager.setSpanCount(layout.getColumnsPerRow());
-        }
-
-        if (key != null && updateUInecessary && isResumed()) {
-            getActivity().runOnUiThread(this::updateUI);
+            onLayoutChanged(PreferencesUtils.getCustomLayout());
        }
    };

-    private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> {
-        service.getRecordingDataObservable()
-                .observe(StatisticsRecordingFragment.this, this::onRecordingDataChanged);
-    };
+    private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> service.getRecordingDataObservable()
+            .observe(StatisticsRecordingFragment.this, this::onRecordingDataChanged);

    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        trackRecordingServiceConnection = new TrackRecordingServiceConnection(bindChangedCallback);
-
-        statisticsAdapter = new StatisticsAdapter(getContext());
    }

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        viewBinding = StatisticsRecordingBinding.inflate(inflater, container, false);
-
-        RecyclerView recyclerView = viewBinding.statsRecyclerView;
-        recyclerView.addItemDecoration(new DividerItemDecoration(getContext(), RecyclerView.VERTICAL));
-        layout = PreferencesUtils.getCustomLayout();
-        gridLayoutManager = new GridLayoutManager(getContext(), layout.getColumnsPerRow());
-        gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
-            @Override
-            public int getSpanSize(int position) {
-                if (statisticsAdapter.isItemWide(position)) {
-                    return layout.getColumnsPerRow();
-                }
-                return 1;
-            }
-        });
-        recyclerView.setLayoutManager(gridLayoutManager);
-        recyclerView.setAdapter(statisticsAdapter);
-
        return viewBinding.getRoot();
    }

@@ -119,10 +88,6 @@ public class StatisticsRecordingFragment extends Fragment {

        PreferencesUtils.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);

-        viewModel = new ViewModelProvider(getActivity()).get(StatisticsDataModel.class);
-        statisticsLiveData = viewModel.getStatsData();
-        statisticsLiveData.observe(getActivity(), statsDataList -> statisticsAdapter.swapData(statsDataList));
-
        trackRecordingServiceConnection.startConnection(getContext());
    }

@@ -141,6 +106,7 @@ public class StatisticsRecordingFragment extends Fragment {
    @Override
    public void onDestroyView() {
        super.onDestroyView();
+        viewHolders.clear();
        viewBinding = null;
    }

@@ -148,17 +114,55 @@ public class StatisticsRecordingFragment extends Fragment {
    public void onDestroy() {
        super.onDestroy();
        trackRecordingServiceConnection = null;
-        viewModel = null;
-
-        if (statisticsLiveData != null) {
-            statisticsLiveData.removeObservers(getActivity());
-        }
-        statisticsLiveData = null;
    }

-    private void updateUI() {
-        if (isResumed()) {
-            viewModel.update(recordingData, layout, unitSystem);
+    private void onLayoutChanged(@NonNull RecordingLayout newRecordingLayout) {
+        if (newRecordingLayout.equals(recordingLayout)) {
+            return;
+        }
+        recordingLayout = newRecordingLayout;
+
+        viewBinding.statsLayout.setColumnCount(recordingLayout.getColumnsPerRow());
+
+        viewBinding.statsLayout.removeAllViews(); //Let's start from scratch
+        viewHolders.clear();
+
+        Map<String, Callable<StatisticViewHolder<?>>> m = Mapping.create(getContext());
+
+        int rowIndex = 0;
+        int columnIndex = 0;
+        for (DataField dataField : recordingLayout.toRecordingLayout(true).getFields()) {
+            GridLayout.LayoutParams param = new GridLayout.LayoutParams();
+            param.setGravity(Gravity.FILL_HORIZONTAL);
+            param.width = 0;
+
+            if (dataField.isWide()) {
+                rowIndex++;
+                param.columnSpec = GridLayout.spec(0, recordingLayout.getColumnsPerRow(), 1);
+                param.rowSpec = GridLayout.spec(rowIndex, 1, 1);
+                columnIndex = 0;
+                rowIndex++;
+            } else {
+                if (columnIndex >= recordingLayout.getColumnsPerRow()) {
+                    columnIndex = 0;
+                    rowIndex++;
+                }
+                param.columnSpec = GridLayout.spec(columnIndex, 1, 1);
+                param.rowSpec = GridLayout.spec(rowIndex, 1, 1);
+
+                columnIndex++;
+            }
+
+            try {
+                StatisticViewHolder<?> viewHolder = m.get(dataField.getKey()).call();
+                viewHolder.initialize(getContext(), getLayoutInflater());
+                viewHolder.configureUI(dataField);
+                viewHolders.add(viewHolder);
+
+                viewBinding.statsLayout.addView(viewHolder.getView(), param);
+            } catch (Exception e) {
+                throw new RuntimeException("Could not add " + dataField.getKey(), e);
+            }
        }
    }

@@ -171,6 +175,12 @@ public class StatisticsRecordingFragment extends Fragment {
            sharedPreferenceChangeListener.onSharedPreferenceChanged(null, getString(R.string.stats_rate_key));
        }

-        updateUI();
+        updateDataOnUI();
+    }
+
+    private void updateDataOnUI() {
+        if (isResumed()) {
+            viewHolders.forEach(i -> i.onChanged(unitSystem, recordingData));
+        }
    }
 }
@@ -62,8 +62,8 @@ public class IntroductionActivity extends AbstractActivity {
    private static class CustomFragmentPagerAdapter extends FragmentStateAdapter {

        private static final List<FragmentCreator> fragmentCreators = List.of(
-                (FragmentCreator) WelcomeFragment::newInstance,
-                (FragmentCreator) OSMDashboardFragment::newInstance
+                WelcomeFragment::newInstance,
+                OSMDashboardFragment::newInstance
        );

        public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
@@ -3,6 +3,8 @@ package de.dennisguse.opentracks.io.file;
 import android.content.Context;
 import android.content.res.Resources;

+import androidx.annotation.NonNull;
+
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Locale;
@@ -25,8 +27,8 @@ public enum TrackFileFormat {

    KML_WITH_TRACKDETAIL_AND_SENSORDATA("KML_WITH_TRACKDETAIL_AND_SENSORDATA") {
        @Override
-        public TrackExporter createTrackExporter(Context context) {
-            return new KMLTrackExporter(context, false);
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            return new KMLTrackExporter(context, contentProviderUtils, false);
        }

        @Override
@@ -45,9 +47,9 @@ public enum TrackFileFormat {
        private static final boolean exportPhotos = false;

        @Override
-        public TrackExporter createTrackExporter(Context context) {
-            KMLTrackExporter exporter = new KMLTrackExporter(context, exportPhotos);
-            return new KmzTrackExporter(context, new ContentProviderUtils(context), exporter, exportPhotos);
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
+            return new KmzTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
        }

        @Override
@@ -70,9 +72,9 @@ public enum TrackFileFormat {
        private static final boolean exportPhotos = true;

        @Override
-        public TrackExporter createTrackExporter(Context context) {
-            KMLTrackExporter exporter = new KMLTrackExporter(context, exportPhotos);
-            return new KmzTrackExporter(context, new ContentProviderUtils(context), exporter, exportPhotos);
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            KMLTrackExporter exporter = new KMLTrackExporter(context, contentProviderUtils, exportPhotos);
+            return new KmzTrackExporter(context, contentProviderUtils, exporter, exportPhotos);
        }

        @Override
@@ -93,8 +95,8 @@ public enum TrackFileFormat {

    GPX("GPX") {
        @Override
-        public TrackExporter createTrackExporter(Context context) {
-            return new GPXTrackExporter(new ContentProviderUtils(context), context.getString(R.string.app_name));
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            return new GPXTrackExporter(contentProviderUtils, context.getString(R.string.app_name));
        }

        @Override
@@ -109,8 +111,8 @@ public enum TrackFileFormat {

    CSV("CSV") {
        @Override
-        public TrackExporter createTrackExporter(Context context) {
-            return new CSVTrackExporter(new ContentProviderUtils(context));
+        public TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils) {
+            return new CSVTrackExporter(contentProviderUtils);
        }

        @Override
@@ -161,7 +163,7 @@ public enum TrackFileFormat {
     *
     * @param context the context
     */
-    public abstract TrackExporter createTrackExporter(Context context);
+    public abstract TrackExporter createTrackExporter(@NonNull Context context, @NonNull ContentProviderUtils contentProviderUtils);

    /**
     * Returns the file extension for each format.
@@ -93,23 +93,9 @@ public class CSVTrackExporter implements TrackExporter {

    @Override
    public boolean writeTrack(Track[] tracks, @NonNull OutputStream outputStream) {
-        List<Column> columns = Collections.unmodifiableList(Arrays.asList(
-                new Column("time", null),
-                new Column("trackpoint_type", t -> quote(t.getType().name())),
-                new Column("latitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLatitude()) : ""),
-                new Column("longitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLongitude()) : ""),
-                new Column("altitude", t -> t.hasAltitude() ? COORDINATE_FORMAT.format(t.getAltitude().toM()) : ""),
-                new Column("accuracy_horizontal", t -> t.hasHorizontalAccuracy() ? DISTANCE_FORMAT.format(t.getHorizontalAccuracy().toM()) : ""),
-                new Column("accuracy_vertical", t -> t.hasVerticalAccuracy() ? DISTANCE_FORMAT.format(t.getVerticalAccuracy().toM()) : ""),
+        List<Column> columns = Collections.unmodifiableList(Arrays.asList(new Column("time", null), new Column("trackpoint_type", t -> quote(t.getType().name())), new Column("latitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLatitude()) : ""), new Column("longitude", t -> t.hasLocation() ? COORDINATE_FORMAT.format(t.getLongitude()) : ""), new Column("altitude", t -> t.hasAltitude() ? COORDINATE_FORMAT.format(t.getAltitude().toM()) : ""), new Column("accuracy_horizontal", t -> t.hasHorizontalAccuracy() ? DISTANCE_FORMAT.format(t.getHorizontalAccuracy().toM()) : ""), new Column("accuracy_vertical", t -> t.hasVerticalAccuracy() ? DISTANCE_FORMAT.format(t.getVerticalAccuracy().toM()) : ""),

-                new Column("speed", t -> t.hasSpeed() ? SPEED_FORMAT.format(t.getSpeed().toKMH()) : ""),
-                new Column("altitude_gain", t -> t.hasAltitudeGain() ? DISTANCE_FORMAT.format(t.getAltitudeGain()) : ""),
-                new Column("altitude_loss", t -> t.hasAltitudeLoss() ? DISTANCE_FORMAT.format(t.getAltitudeLoss()) : ""),
-                new Column("sensor_distance", t -> t.hasSensorDistance() ? DISTANCE_FORMAT.format(t.getSensorDistance().toM()) : ""),
-                new Column("heartrate", t -> t.hasHeartRate() ? HEARTRATE_FORMAT.format(t.getHeartRate().getBPM()) : ""),
-                new Column("cadence", t -> t.hasCadence() ? CADENCE_FORMAT.format(t.getCadence().getRPM()) : ""),
-                new Column("power", t -> t.hasPower() ? ALTITUDE_FORMAT.format(t.getPower().getW()) : "")
-        ));
+                new Column("speed", t -> t.hasSpeed() ? SPEED_FORMAT.format(t.getSpeed().toKMH()) : ""), new Column("altitude_gain", t -> t.hasAltitudeGain() ? DISTANCE_FORMAT.format(t.getAltitudeGain()) : ""), new Column("altitude_loss", t -> t.hasAltitudeLoss() ? DISTANCE_FORMAT.format(t.getAltitudeLoss()) : ""), new Column("sensor_distance", t -> t.hasSensorDistance() ? DISTANCE_FORMAT.format(t.getSensorDistance().toM()) : ""), new Column("heartrate", t -> t.hasHeartRate() ? HEARTRATE_FORMAT.format(t.getHeartRate().getBPM()) : ""), new Column("cadence", t -> t.hasCadence() ? CADENCE_FORMAT.format(t.getCadence().getRPM()) : ""), new Column("power", t -> t.hasPower() ? ALTITUDE_FORMAT.format(t.getPower().getW()) : "")));

        try {
            prepare(outputStream);
@@ -144,15 +130,10 @@ public class CSVTrackExporter implements TrackExporter {
                TrackPoint trackPoint = trackPointIterator.next();

                switch (trackPoint.getType()) {
-                    case SEGMENT_START_MANUAL:
-                    case SEGMENT_END_MANUAL:
-                    case SEGMENT_START_AUTOMATIC:
-                    case SENSORPOINT:
-                    case TRACKPOINT:
-                        writeTrackPoint(columns, trackPoint);
-                        break;
-                    default:
-                        throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
+                    case SEGMENT_START_MANUAL, SEGMENT_END_MANUAL, SEGMENT_START_AUTOMATIC, SENSORPOINT, TRACKPOINT ->
+                            writeTrackPoint(columns, trackPoint);
+                    default ->
+                            throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
                }
            }
        }
@@ -171,18 +152,14 @@ public class CSVTrackExporter implements TrackExporter {

    public void writeHeader(List<Column> columns) {
        if (printWriter != null) {
-            String columnNames = columns.stream().map(c -> c.columnName)
-                    .reduce((s, s2) -> s + "," + s2)
-                    .orElseThrow(() -> new RuntimeException("No columns defined"));
+            String columnNames = columns.stream().map(c -> c.columnName).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
            printWriter.println("#" + columnNames);
        }
    }

    public void writeTrackPoint(List<Column> columns, TrackPoint trackPoint) {
        if (printWriter != null) {
-            String columnNames = columns.stream().map(c -> c.extractor.apply(trackPoint))
-                    .reduce((s, s2) -> s + "," + s2)
-                    .orElseThrow(() -> new RuntimeException("No columns defined"));
+            String columnNames = columns.stream().map(c -> c.extractor.apply(trackPoint)).reduce((s, s2) -> s + "," + s2).orElseThrow(() -> new RuntimeException("No columns defined"));
            printWriter.println(columnNames);
        }
    }
@@ -30,14 +30,9 @@ public class ExportServiceResultReceiver extends ResultReceiver {
    protected void onReceiveResult(int resultCode, Bundle resultData) {
        Track.Id trackId = resultData.getParcelable(ExportServiceResultReceiver.RESULT_EXTRA_TRACK_ID);
        switch (resultCode) {
-            case RESULT_CODE_SUCCESS:
-                receiver.onExportSuccess(trackId);
-                break;
-            case RESULT_CODE_ERROR:
-                receiver.onExportError(trackId);
-                break;
-            default:
-                throw new RuntimeException("Unknown resultCode.");
+            case RESULT_CODE_SUCCESS -> receiver.onExportSuccess(trackId);
+            case RESULT_CODE_ERROR -> receiver.onExportError(trackId);
+            default -> throw new RuntimeException("Unknown resultCode.");
        }
    }

@@ -145,37 +145,32 @@ public class GPXTrackExporter implements TrackExporter {
                }

                switch (trackPoint.getType()) {
-                    case SEGMENT_START_MANUAL:
-                        Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_START_MANUAL.name() + " is not supported.");
-                        break;
-                    case SEGMENT_END_MANUAL:
+                    case SEGMENT_START_MANUAL ->
+                            Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_START_MANUAL.name() + " is not supported.");
+                    case SEGMENT_END_MANUAL -> {
                        if (wroteSegment) writeCloseSegment();
                        wroteSegment = false;
                        Log.i(TAG, "Exporting " + TrackPoint.Type.SEGMENT_END_MANUAL.name() + " is not supported.");
-                        break;
-                    case SEGMENT_START_AUTOMATIC:
+                    }
+                    case SEGMENT_START_AUTOMATIC -> {
                        if (wroteSegment) writeCloseSegment();
                        writeOpenSegment();
                        wroteSegment = true;
-
                        trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
                        sensorPoints.clear();
-                        break;
-                    case SENSORPOINT:
-                        sensorPoints.add(trackPoint);
-                        break;
-                    case TRACKPOINT:
+                    }
+                    case SENSORPOINT -> sensorPoints.add(trackPoint);
+                    case TRACKPOINT -> {
                        if (!wroteSegment) {
                            // Might happen for older data (pre v3.15.0)
                            writeOpenSegment();
                            wroteSegment = true;
                        }
-
                        trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
                        sensorPoints.clear();
-                        break;
-                    default:
-                        throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
+                    }
+                    default ->
+                            throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
                }
            }

@@ -93,10 +93,10 @@ public class KMLTrackExporter implements TrackExporter {
    private final List<Float> accuracyHorizontal = new ArrayList<>();
    private final List<Float> accuracyVertical = new ArrayList<>();

-    public KMLTrackExporter(Context context, boolean exportPhotos) {
+    public KMLTrackExporter(Context context, ContentProviderUtils contentProviderUtils, boolean exportPhotos) {
        this.context = context;
        this.exportPhotos = exportPhotos;
-        this.contentProviderUtils = new ContentProviderUtils(context);
+        this.contentProviderUtils = contentProviderUtils;
    }

    public boolean writeTrack(Track track, @NonNull OutputStream outputStream) {
@@ -169,30 +169,28 @@ public class KMLTrackExporter implements TrackExporter {
                }

                switch (trackPoint.getType()) {
-                    case SEGMENT_START_MANUAL:
-                    case SEGMENT_START_AUTOMATIC:
+                    case SEGMENT_START_MANUAL, SEGMENT_START_AUTOMATIC -> {
                        if (wroteSegment) writeCloseSegment();
                        writeOpenSegment();
                        writeTrackPoint(track.getZoneOffset(), trackPoint);
                        wroteSegment = true;
-                        break;
-                    case SEGMENT_END_MANUAL:
+                    }
+                    case SEGMENT_END_MANUAL -> {
                        if (!wroteSegment) writeOpenSegment();
                        writeTrackPoint(track.getZoneOffset(), trackPoint);
                        writeCloseSegment();
                        wroteSegment = false;
-                        break;
-                    case SENSORPOINT:
-                    case TRACKPOINT:
+                    }
+                    case SENSORPOINT, TRACKPOINT -> {
                        if (!wroteSegment) {
                            // Might happen for older data (pre v3.15.0)
                            writeOpenSegment();
                            wroteSegment = true;
                        }
                        writeTrackPoint(track.getZoneOffset(), trackPoint);
-                        break;
-                    default:
-                        throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
+                    }
+                    default ->
+                            throw new RuntimeException("Exporting this TrackPoint type is not implemented: " + trackPoint.getType());
                }
            }

@@ -226,15 +224,19 @@ public class KMLTrackExporter implements TrackExporter {

    private void writeHeader(Track[] tracks) {
        if (printWriter != null) {
-            printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            printWriter.println("<kml xmlns=\"http://www.opengis.net/kml/2.3\"");
-            printWriter.println("xmlns:atom=\"http://www.w3.org/2005/Atom\"");
-            printWriter.println("xmlns:opentracks=\"http://opentracksapp.com/xmlschemas/v1\">");
-            //TODO ADD xsi:schemaLocation for atom
-            printWriter.println("xsi:schemaLocation=" +
-                    "\"http://www.opengis.net/kml/2.3 http://schemas.opengis.net/kml/2.3/ogckml23.xsd"
-                    + " http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd\">");
-
+            printWriter.println(
+                    """
+                            <?xml version="1.0" encoding="UTF-8"?>
+                            """);
+            printWriter.println(
+                    """
+                            <kml xmlns="http://www.opengis.net/kml/2.3"
+                                xmlns:atom="http://www.w3.org/2005/Atom"
+                                xmlns:opentracks="http://opentracksapp.com/xmlschemas/v1"
+                                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                xsi:schemaLocation="http://www.opengis.net/kml/2.3 http://schemas.opengis.net/kml/2.3/ogckml23.xsd
+                                                    http://opentracksapp.com/xmlschemas/v1 http://opentracksapp.com/xmlschemas/OpenTracks_v1.xsd">
+                            """); //TODO ADD xsi:schemaLocation for atom
            printWriter.println("<Document>");
            printWriter.println("<open>1</open>");
            printWriter.println("<visibility>1</visibility>");
@@ -156,103 +156,94 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
    @Override
    public void endElement(String uri, String localName, String tag) {
        switch (tag) {
-            case TAG_GPX:
-                onFileEnd();
-                break;
-            case TAG_MARKER:
-                onMarkerEnd();
-                break;
-            case TAG_TRACK:
+            case TAG_GPX -> onFileEnd();
+            case TAG_MARKER -> onMarkerEnd();
+            case TAG_TRACK -> {
                trackImporter.setTrack(context, name, uuid, description, category, null, zoneOffset);
                zoneOffset = null;
-                break;
-            case TAG_TRACK_SEGMENT:
-                onTrackSegmentEnd();
-                break;
-            case TAG_TRACK_POINT:
-                currentSegment.add(createTrackPoint());
-                break;
-            case TAG_NAME:
+            }
+            case TAG_TRACK_SEGMENT -> onTrackSegmentEnd();
+            case TAG_TRACK_POINT -> currentSegment.add(createTrackPoint());
+            case TAG_NAME -> {
                if (content != null) {
                    name = content.trim();
                }
-                break;
-            case TAG_DESCRIPTION:
+            }
+            case TAG_DESCRIPTION -> {
                if (content != null) {
                    description = content.trim();
                }
-                break;
-            case TAG_TYPE:
+            }
+            case TAG_TYPE -> {
                if (content != null) {
                    category = content.trim();
                }
-                break;
-            case TAG_TIME:
+            }
+            case TAG_TIME -> {
                if (content != null) {
                    time = content.trim();
                }
-                break;
-            case TAG_ALTITUDE:
+            }
+            case TAG_ALTITUDE -> {
                if (content != null) {
                    altitude = content.trim();
                }
-                break;
-            case TAG_COMMENT:
+            }
+            case TAG_COMMENT -> {
                if (content != null) {
                    markerType = content.trim();
                }
-                break;
-            case TAG_EXTENSION_SPEED:
-            case TAG_EXTENSION_SPEED_COMPAT:
+            }
+            case TAG_EXTENSION_SPEED, TAG_EXTENSION_SPEED_COMPAT -> {
                if (content != null) {
                    speed = content.trim();
                }
-                break;
-            case TAG_EXTENSION_HEARTRATE:
+            }
+            case TAG_EXTENSION_HEARTRATE -> {
                if (content != null) {
                    heartrate = content.trim();
                }
-                break;
-            case TAG_EXTENSION_CADENCE:
+            }
+            case TAG_EXTENSION_CADENCE -> {
                if (content != null) {
                    cadence = content.trim();
                }
-                break;
-            case TAG_EXTENSION_POWER:
+            }
+            case TAG_EXTENSION_POWER -> {
                if (content != null) {
                    power = content.trim();
                }
-                break;
-            case TAG_ID:
+            }
+            case TAG_ID -> {
                if (content != null) {
                    uuid = content.trim();
                }
-                break;
-            case TAG_EXTENSION_GAIN:
+            }
+            case TAG_EXTENSION_GAIN -> {
                if (content != null) {
                    gain = content.trim();
                }
-                break;
-            case TAG_EXTENSION_LOSS:
+            }
+            case TAG_EXTENSION_LOSS -> {
                if (content != null) {
                    loss = content.trim();
                }
-                break;
-            case TAG_EXTENSION_DISTANCE:
+            }
+            case TAG_EXTENSION_DISTANCE -> {
                if (content != null) {
                    sensorDistance = content.trim();
                }
-                break;
-            case TAG_EXTENSION_ACCURACY_HORIZONTAL:
+            }
+            case TAG_EXTENSION_ACCURACY_HORIZONTAL -> {
                if (content != null) {
                    accuracyHorizontal = content.trim();
                }
-                break;
-            case TAG_EXTENSION_ACCURACY_VERTICAL:
+            }
+            case TAG_EXTENSION_ACCURACY_VERTICAL -> {
                if (content != null) {
                    accuracyVertical = content.trim();
                }
-                break;
+            }
        }

        content = "";
@@ -79,19 +79,17 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe
        String message = resultData.getString(ImportServiceResultReceiver.RESULT_EXTRA_MESSAGE);

        switch (resultCode) {
-            case ImportServiceResultReceiver.RESULT_CODE_ERROR:
+            case ImportServiceResultReceiver.RESULT_CODE_ERROR -> {
                summary.errorCount++;
                summary.fileErrors.add(getApplication().getString(R.string.import_error_info, fileName, message));
-                break;
-            case ImportServiceResultReceiver.RESULT_CODE_IMPORTED:
+            }
+            case ImportServiceResultReceiver.RESULT_CODE_IMPORTED -> {
                summary.importedTrackIds.addAll(trackIds);
                summary.successCount++;
-                break;
-            case ImportServiceResultReceiver.RESULT_CODE_ALREADY_EXISTS:
-                summary.existsCount++;
-                break;
-            default:
-                throw new RuntimeException(TAG + ": import service result code invalid: " + resultCode);
+            }
+            case ImportServiceResultReceiver.RESULT_CODE_ALREADY_EXISTS -> summary.existsCount++;
+            default ->
+                    throw new RuntimeException(TAG + ": import service result code invalid: " + resultCode);
        }

        importData.postValue(summary);
@@ -136,27 +136,18 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
    @Override
    public void startElement(String uri, String localName, String tag, Attributes attributes) throws SAXException {
        switch (tag) {
-            case TAG_PLACEMARK:
-            case TAG_PHOTO_OVERLAY:
+            case TAG_PLACEMARK, TAG_PHOTO_OVERLAY ->
                // Note that a track is contained in a Placemark, calling onMarkerStart will clear various track variables like name, category, and description.
-                onMarkerStart();
-                break;
-            case TAG_MULTI_TRACK:
-            case TAG_KML22_MULTI_TRACK:
-                trackImporter.newTrack();
-                break;
-            case TAG_TRACK:
-            case TAG_KML22_TRACK:
+                    onMarkerStart();
+            case TAG_MULTI_TRACK, TAG_KML22_MULTI_TRACK -> trackImporter.newTrack();
+            case TAG_TRACK, TAG_KML22_TRACK -> {
                if (trackImporter == null) {
                    throw new SAXException("Missing " + TAG_MULTI_TRACK);
                }
                onTrackSegmentStart();
-                break;
-            case TAG_DATA_CATEGORY:
-            case TAG_SIMPLE_ARRAY_DATA:
-            case TAG_KML22_SIMPLE_ARRAY_DATA:
-                dataType = attributes.getValue(ATTRIBUTE_NAME);
-                break;
+            }
+            case TAG_DATA_CATEGORY, TAG_SIMPLE_ARRAY_DATA, TAG_KML22_SIMPLE_ARRAY_DATA ->
+                    dataType = attributes.getValue(ATTRIBUTE_NAME);
        }
    }

@@ -168,32 +159,18 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
    @Override
    public void endElement(String uri, String localName, String tag) throws SAXException {
        switch (tag) {
-            case TAG_KML:
-                onFileEnd();
-                break;
-            case TAG_PLACEMARK:
-            case TAG_PHOTO_OVERLAY:
+            case TAG_KML -> onFileEnd();
+            case TAG_PLACEMARK, TAG_PHOTO_OVERLAY ->
                // Note that a track is contained in a Placemark, calling onMarkerEnd is save since markerType is not set for a track.
-                onMarkerEnd();
-                break;
-            case TAG_COORDINATES:
-                onMarkerLocationEnd();
-                break;
-            case TAG_MULTI_TRACK:
-            case TAG_KML22_MULTI_TRACK:
+                    onMarkerEnd();
+            case TAG_COORDINATES -> onMarkerLocationEnd();
+            case TAG_MULTI_TRACK, TAG_KML22_MULTI_TRACK -> {
                trackImporter.setTrack(context, name, uuid, description, category, icon, zoneOffset);
                zoneOffset = null;
-                break;
-            case TAG_TRACK:
-            case TAG_KML22_TRACK:
-                onTrackSegmentEnd();
-                break;
-            case TAG_COORD:
-            case TAG_KML22_COORD:
-                onCoordEnded();
-                break;
-            case TAG_VALUE:
-            case TAG_KML22_VALUE:
+            }
+            case TAG_TRACK, TAG_KML22_TRACK -> onTrackSegmentEnd();
+            case TAG_COORD, TAG_KML22_COORD -> onCoordEnded();
+            case TAG_VALUE, TAG_KML22_VALUE -> {
                if (KMLTrackExporter.EXTENDED_DATA_TYPE_CATEGORY.equals(dataType)) {
                    if (content != null) {
                        category = content.trim();
@@ -201,28 +178,28 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                } else {
                    onExtendedDataValueEnd();
                }
-                break;
-            case TAG_NAME:
+            }
+            case TAG_NAME -> {
                if (content != null) {
                    name = content.trim();
                }
-                break;
-            case TAG_UUID:
+            }
+            case TAG_UUID -> {
                if (content != null) {
                    uuid = content.trim();
                }
-                break;
-            case TAG_DESCRIPTION:
+            }
+            case TAG_DESCRIPTION -> {
                if (content != null) {
                    description = content.trim();
                }
-                break;
-            case TAG_ICON:
+            }
+            case TAG_ICON -> {
                if (content != null) {
                    icon = content.trim();
                }
-                break;
-            case TAG_WHEN:
+            }
+            case TAG_WHEN -> {
                if (content != null) {
                    try {
                        OffsetDateTime time = StringUtils.parseTime(content.trim());
@@ -234,18 +211,17 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                        throw new ParsingException(createErrorMessage(String.format(Locale.US, "Unable to parse time: %s", content.trim())), e);
                    }
                }
-
-                break;
-            case TAG_STYLE_URL:
+            }
+            case TAG_STYLE_URL -> {
                if (content != null) {
                    markerType = content.trim();
                }
-                break;
-            case TAG_HREF:
+            }
+            case TAG_HREF -> {
                if (content != null) {
                    photoUrl = content.trim();
                }
-                break;
+            }
        }

        // Reset element content
@@ -436,35 +412,19 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
            }
        }
        switch (dataType) {
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_SPEED:
-                sensorSpeedList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_DISTANCE:
-                sensorDistanceList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_POWER:
-                sensorPowerList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_HEART_RATE:
-                sensorHeartRateList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_CADENCE:
-                sensorCadenceList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_GAIN:
-                altitudeGainList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_LOSS:
-                altitudeLossList.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL:
-                accuracyHorizontal.add(value);
-                break;
-            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_VERTICAL:
-                accuracyVertical.add(value);
-                break;
-            default:
-                Log.w(TAG, "Data from extended data " + dataType + " is not (yet) supported.");
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_SPEED -> sensorSpeedList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_DISTANCE -> sensorDistanceList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_POWER -> sensorPowerList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_HEART_RATE -> sensorHeartRateList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_CADENCE -> sensorCadenceList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_GAIN -> altitudeGainList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ALTITUDE_LOSS -> altitudeLossList.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_HORIZONTAL ->
+                    accuracyHorizontal.add(value);
+            case KMLTrackExporter.EXTENDED_DATA_TYPE_ACCURACY_VERTICAL ->
+                    accuracyVertical.add(value);
+            default ->
+                    Log.w(TAG, "Data from extended data " + dataType + " is not (yet) supported.");
        }
    }

--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Cairde rianaithe spóirt a bhfuil meas aige ar do phríobháideachas.`
				`@@ -0,0 +1 @@`
				`一個尊重您的隱私的運動蹤跡紀錄器。`