Release: v4.3.1

Bugfix: GPS disabled warning was showing (repeatedly but incorrectly).
Fixes #1429.
2023-04-07 18:11:52 +02:00 · 2023-04-07 11:13:57 +02:00 · 2023-04-06 07:37:43 +02:00 · 2023-04-05 18:26:29 +02:00 · 2023-04-03 19:25:16 +02:00 · 2023-03-29 21:50:42 +02:00
161 changed files with 3922 additions and 2272 deletions
@@ -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:
@@ -40,8 +40,8 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
    </tr>
 </table>
-<a href="https://weblate.bubu1.eu/engage/OpenTracks/">
+<a href="https://hosted.weblate.org/engage/opentracks/">
-	<img src="https://weblate.bubu1.eu/widgets/OpenTracks/-/opentracks/horizontal-auto.svg" alt="Translation status" />
+  <img src="https://hosted.weblate.org/widgets/opentracks/-/horizontal-auto.svg" alt="Translation status" />
 </a>
 ## Screenshots
@@ -129,6 +129,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 +150,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:7.4.2'
    }
 }
@@ -59,8 +59,8 @@ android {
    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        versionCode 5051
+        versionCode 5168
-        versionName "v4.1.1"
+        versionName "v4.3.1"
        buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
@@ -69,6 +69,8 @@ android {
        testInstrumentationRunner "de.dennisguse.opentracks.TestRunner"
        testInstrumentationRunnerArguments clearPackageData: 'true'
        resConfigs "ar", "bg", "ca", "cs", "da", "de", "el", "en", "es", "et", "eu", "fa", "fi", "fr", "ga", "gl", "hi", "hr", "hu", "in", "it", "iw", "ja", "ko", "lt", "lv", "mo", "ms", "nb", "nl", "pl", "pt", "ro", "ru", "sk", "sl", "sr", "sv", "th", "tl", "tr", "uk", "vi", "zh"
    }
    signingConfigs {
        nightly {
@@ -120,23 +122,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.appcompat:appcompat:1.6.1'
    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.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.mediarouter:mediarouter:1.3.1'
-    androidTestImplementation 'androidx.test:core:1.4.0'
+    androidTestImplementation 'androidx.test:core:1.5.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.5.0'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'org.mockito:mockito-android:4.8.0'
+    androidTestImplementation 'org.mockito:mockito-android:5.2.0'
-    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,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
@@ -1 +1,2 @@
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=256m
@@ -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
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+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
@@ -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);
@@ -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)),
@@ -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 {
@@ -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) {
+        BluetoothRemoteSensorManager remoteSensorManager = Mockito.mock(BluetoothRemoteSensorManager.class);
-            @Override
+        Mockito.when(remoteSensorManager.fill(Mockito.any())).thenAnswer(invocation -> {
-            public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
+            TrackPoint trackPoint = invocation.getArgument(0);
                SensorDataSet sensorDataSet = new SensorDataSet();
                sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
                sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));
-                SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
+            SensorDataSet sensorDataSet = new SensorDataSet();
-                Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
+            sensorDataSet.set(new SensorDataCyclingPower("power", "power", Power.of(power)));
-                Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
+            sensorDataSet.set(new SensorDataHeartRate("heartRate", "heartRate", HeartRate.of(heartRate)));
                sensorDataSet.set(cyclingCadence);
-                if (distance != null && speed != null) {
+            SensorDataCyclingCadence cyclingCadence = Mockito.mock(SensorDataCyclingCadence.class);
-                    SensorDataCyclingDistanceSpeed.Data distanceSpeedData = Mockito.mock(SensorDataCyclingDistanceSpeed.Data.class);
+            Mockito.when(cyclingCadence.hasValue()).thenReturn(true);
-                    Mockito.when(distanceSpeedData.getDistanceOverall()).thenReturn(distance);
+            Mockito.when(cyclingCadence.getValue()).thenReturn(Cadence.of(cadence));
-                    Mockito.when(distanceSpeedData.getSpeed()).thenReturn(Speed.of(speed));
+            sensorDataSet.set(cyclingCadence);
                    SensorDataCyclingDistanceSpeed distanceSpeed = Mockito.mock(SensorDataCyclingDistanceSpeed.class);
                    Mockito.when(distanceSpeed.hasValue()).thenReturn(true);
                    Mockito.when(distanceSpeed.getValue()).thenReturn(distanceSpeedData);
                    sensorDataSet.set(distanceSpeed);
                }
-                sensorDataSet.fillTrackPoint(trackPoint);
+            if (distance != null && speed != null) {
-                return sensorDataSet;
+                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);
    }
@@ -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.getSensorManager().setAltitudeSumManager(altitudeSumManager);
        trackPointCreator.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.getSensorManager().setAltitudeSumManager(altitudeSumManager);
        trackPointCreator.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.getSensorManager().setAltitudeSumManager(altitudeSumManager);
        trackPointCreator.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.getSensorManager().setAltitudeSumManager(altitudeSumManager);
        trackPointCreator.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.getSensorManager().setAltitudeSumManager(altitudeSumManager);
        trackPointCreator.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.getSensorManager().setAltitudeSumManager(altitudeSumManager);
-        trackPointCreator.setAltitudeSumManager(altitudeSumManager);
+        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getSensorManager().getBluetoothSensorManager();
        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
        // 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);
+        trackPointCreator.getSensorManager().setAltitudeSumManager(altitudeSumManager);
-        BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager();
+        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();
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
+        assertNotNull(recordingLayouts);
-        assertEquals(layouts.size(), 1);
+        assertEquals(recordingLayouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), PreferencesUtils.getCustomLayout().toCsv());
+        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();
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
+        assertNotNull(recordingLayouts);
-        assertEquals(layouts.size(), 1);
+        assertEquals(recordingLayouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
+        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();
+        List<RecordingLayout> recordingLayouts = PreferencesUtils.getAllCustomLayouts();
-        assertNotNull(layouts);
+        assertNotNull(recordingLayouts);
-        assertEquals(layouts.size(), 1);
+        assertEquals(recordingLayouts.size(), 1);
-        assertEquals(layouts.get(0).toCsv(), updatedOldCustomLayoutCsv);
+        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);
+        RecordingLayout defaultRecordingLayout = RecordingLayoutIO.fromCsv(PreferencesUtils.buildDefaultLayout(), resources);
-        List<Layout> customLayout = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> customRecordingLayout = PreferencesUtils.getAllCustomLayouts();
-        assertEquals(customLayout.size(), 1);
+        assertEquals(customRecordingLayout.size(), 1);
-        assertEquals(defaultLayout.toCsv(), customLayout.get(0).toCsv());
+        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);
+        assertEquals(recordingLayouts.size(), 1);
-        assertTrue(layouts.get(0).getFields().size() > 0);
+        assertTrue(recordingLayouts.get(0).getFields().size() > 0);
-        assertEquals(layouts.get(0).getName(), context.getString(R.string.stats_custom_layout_default_layout));
+        assertEquals(recordingLayouts.get(0).getName(), context.getString(R.string.stats_custom_layout_default_layout));
-        assertTrue(layouts.get(0).getFields().stream().anyMatch(DataField::isVisible));
+        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);
+        assertTrue(recordingLayout.getFields().size() > 0);
-        assertEquals(layout.getName(), context.getString(R.string.stats_custom_layout_default_layout));
+        assertEquals(recordingLayout.getName(), context.getString(R.string.stats_custom_layout_default_layout));
-        assertTrue(layout.getFields().stream().anyMatch(DataField::isVisible));
+        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(recordingLayout.getFields().size(), 4);
-        assertEquals(layout.getName(), "run");
+        assertEquals(recordingLayout.getName(), "run");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertEquals(recordingLayout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
-        assertTrue(layout.getFields().get(0).isVisible());
+        assertTrue(recordingLayout.getFields().get(0).isVisible());
-        assertTrue(layout.getFields().get(0).isPrimary());
+        assertTrue(recordingLayout.getFields().get(0).isPrimary());
-        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertEquals(recordingLayout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
-        assertTrue(layout.getFields().get(1).isVisible());
+        assertTrue(recordingLayout.getFields().get(1).isVisible());
-        assertFalse(layout.getFields().get(1).isPrimary());
+        assertFalse(recordingLayout.getFields().get(1).isPrimary());
-        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_average_moving_speed_key));
+        assertEquals(recordingLayout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_average_moving_speed_key));
-        assertFalse(layout.getFields().get(2).isVisible());
+        assertFalse(recordingLayout.getFields().get(2).isVisible());
-        assertTrue(layout.getFields().get(2).isPrimary());
+        assertTrue(recordingLayout.getFields().get(2).isPrimary());
-        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertEquals(recordingLayout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
-        assertFalse(layout.getFields().get(3).isVisible());
+        assertFalse(recordingLayout.getFields().get(3).isVisible());
-        assertFalse(layout.getFields().get(3).isPrimary());
+        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(recordingLayout.getFields().size(), 4);
-        assertEquals(layout.getName(), "walking");
+        assertEquals(recordingLayout.getName(), "walking");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
+        assertEquals(recordingLayout.getFields().get(0).getKey(), context.getString(R.string.stats_custom_layout_moving_time_key));
-        assertTrue(layout.getFields().get(0).isVisible());
+        assertTrue(recordingLayout.getFields().get(0).isVisible());
-        assertTrue(layout.getFields().get(0).isPrimary());
+        assertTrue(recordingLayout.getFields().get(0).isPrimary());
-        assertEquals(layout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
+        assertEquals(recordingLayout.getFields().get(1).getKey(), context.getString(R.string.stats_custom_layout_distance_key));
-        assertTrue(layout.getFields().get(1).isVisible());
+        assertTrue(recordingLayout.getFields().get(1).isVisible());
-        assertFalse(layout.getFields().get(1).isPrimary());
+        assertFalse(recordingLayout.getFields().get(1).isPrimary());
-        assertEquals(layout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_coordinates_key));
+        assertEquals(recordingLayout.getFields().get(2).getKey(), context.getString(R.string.stats_custom_layout_coordinates_key));
-        assertFalse(layout.getFields().get(2).isVisible());
+        assertFalse(recordingLayout.getFields().get(2).isVisible());
-        assertTrue(layout.getFields().get(2).isPrimary());
+        assertTrue(recordingLayout.getFields().get(2).isPrimary());
-        assertTrue(layout.getFields().get(2).isWide());
+        assertTrue(recordingLayout.getFields().get(2).isWide());
-        assertEquals(layout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
+        assertEquals(recordingLayout.getFields().get(3).getKey(), context.getString(R.string.stats_custom_layout_speed_key));
-        assertFalse(layout.getFields().get(3).isVisible());
+        assertFalse(recordingLayout.getFields().get(3).isVisible());
-        assertFalse(layout.getFields().get(3).isPrimary());
+        assertFalse(recordingLayout.getFields().get(3).isPrimary());
    }
    @Test
    public void testSetCustomLayout() {
        // given
        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        Layout layoutSrc = new Layout("road cycling");
+        RecordingLayout recordingLayoutSrc = new RecordingLayout("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));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_moving_time_key), 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));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_distance_key), 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));
+        recordingLayoutSrc.addField(new DataField(context.getString(R.string.stats_custom_layout_average_moving_speed_key), 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));
+        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();
+        RecordingLayout recordingLayoutDst = PreferencesUtils.getCustomLayout();
-        assertEquals(layoutSrc.getName(), layoutDst.getName());
+        assertEquals(recordingLayoutSrc.getName(), recordingLayoutDst.getName());
-        assertEquals(layoutSrc.getFields().size(), layoutDst.getFields().size());
+        assertEquals(recordingLayoutSrc.getFields().size(), recordingLayoutDst.getFields().size());
-        for (int i = 0; i < layoutSrc.getFields().size(); i++) {
+        for (int i = 0; i < recordingLayoutSrc.getFields().size(); i++) {
-            assertEquals(layoutSrc.getFields().get(i).getKey(), layoutDst.getFields().get(i).getKey());
+            assertEquals(recordingLayoutSrc.getFields().get(i).getKey(), recordingLayoutDst.getFields().get(i).getKey());
-            assertEquals(layoutSrc.getFields().get(i).isVisible(), layoutDst.getFields().get(i).isVisible());
+            assertEquals(recordingLayoutSrc.getFields().get(i).isVisible(), recordingLayoutDst.getFields().get(i).isVisible());
-            assertEquals(layoutSrc.getFields().get(i).isPrimary(), layoutDst.getFields().get(i).isPrimary());
+            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<>();
+        List<RecordingLayout> layoutsToBeUpdated = new ArrayList<>();
-        layoutsToBeUpdated.add(Layout.fromCsv(cyclingProfileUpdated, resources));
+        layoutsToBeUpdated.add(RecordingLayoutIO.fromCsv(cyclingProfileUpdated, resources));
-        layoutsToBeUpdated.add(Layout.fromCsv(runningProfile, 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);
+        RecordingLayout recordingLayoutToBeUpdated = RecordingLayoutIO.fromCsv(cyclingProfileUpdated, resources);
-        PreferencesUtils.updateCustomLayout(layoutToBeUpdated);
+        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);
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        List<DataField> dataFieldList = recordingLayout.getFields();
        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "running");
+        assertEquals(recordingLayout.getName(), "running");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        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);
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        List<DataField> dataFieldList = recordingLayout.getFields();
        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), PreferencesUtils.getDefaultLayoutName());
+        assertEquals(recordingLayout.getName(), PreferencesUtils.getDefaultLayoutName());
-        assertEquals(layout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
+        assertEquals(recordingLayout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
-        assertEquals(layout.getFields().size(), 0);
+        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);
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        List<DataField> dataFieldList = recordingLayout.getFields();
        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), PreferencesUtils.getDefaultLayoutName());
+        assertEquals(recordingLayout.getName(), PreferencesUtils.getDefaultLayoutName());
-        assertEquals(layout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
+        assertEquals(recordingLayout.getColumnsPerRow(), PreferencesUtils.getLayoutColumnsByDefault());
-        assertEquals(layout.getFields().size(), 0);
+        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);
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        List<DataField> dataFieldList = recordingLayout.getFields();
        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "Layout Name");
+        assertEquals(recordingLayout.getName(), "Layout Name");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().size(), 0);
+        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);
+        RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(csv1, resources);
-        List<DataField> dataFieldList = layout.getFields();
+        List<DataField> dataFieldList = recordingLayout.getFields();
        // then layout and data fields are built correctly
-        assertEquals(layout.getName(), "Layout Name");
+        assertEquals(recordingLayout.getName(), "Layout Name");
-        assertEquals(layout.getColumnsPerRow(), 2);
+        assertEquals(recordingLayout.getColumnsPerRow(), 2);
-        assertEquals(layout.getFields().size(), 1);
+        assertEquals(recordingLayout.getFields().size(), 1);
    }
    @Test
    public void testToCsv() {
        // given a layout's object
-        Layout layout = new Layout("Test Layout", 2);
+        RecordingLayout recordingLayout = new RecordingLayout("Test Layout", 2);
-        layout.addField("key1", "Title 1", false, false, false);
+        recordingLayout.addField(new DataField("key1", false, false, false));
-        layout.addField("key2", "Title 2", false, true, false);
+        recordingLayout.addField(new DataField("key2", false, true, false));
-        layout.addField("key3", "Title 3", true, false, false);
+        recordingLayout.addField(new DataField("key3", true, false, false));
-        layout.addField("key4", "Title 4", true, true, false);
+        recordingLayout.addField(new DataField("key4", true, true, false));
-        layout.addField("key5", "Title 5", true, true, true);
+        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");
+        RecordingLayout recordingLayout = new RecordingLayout("Test Layout");
-        layout.addField("key1", "Title 1", false, false, false);
+        recordingLayout.addField(new DataField("key1", false, false, false));
-        layout.addField("key2", "Title 2", false, true, false);
+        recordingLayout.addField(new DataField("key2", false, true, false));
-        layout.addField("key3", "Title 3", true, false, false);
+        recordingLayout.addField(new DataField("key3", true, false, false));
-        layout.addField("key4", "Title 4", true, true, false);
+        recordingLayout.addField(new DataField("key4", true, true, false));
-        layout.addField("key5", "Title 5", true, true, true);
+        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;");
@@ -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");
+        RecordingLayout recordingLayout = new RecordingLayout("profile");
-        layout.addField(new DataField("key1", "title1", true, true, false));
+        recordingLayout.addField(new DataField("key1", true, true, false));
-        layout.addField(new DataField("key2", "title2", false, true, false));
+        recordingLayout.addField(new DataField("key2", false, true, false));
-        layout.addField(new DataField("key3", "title3", true, true, false));
+        recordingLayout.addField(new DataField("key3", true, true, false));
-        layout.addField(new DataField("key4", "title4", false, true, false));
+        recordingLayout.addField(new DataField("key4", false, true, false));
-        layout.addField(new DataField("key5", "title5", true, true, false));
+        recordingLayout.addField(new DataField("key5", true, true, false));
        // when
-        Layout resultTrue = StatisticsUtils.filterVisible(layout, true);
+        RecordingLayout resultTrue = StatisticsUtils.filterVisible(recordingLayout, true);
-        Layout resultFalse = StatisticsUtils.filterVisible(layout, false);
+        RecordingLayout resultFalse = StatisticsUtils.filterVisible(recordingLayout, 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:15+01:00","SENSORPOINT",,,,,,,,,,68,3,50
-"2020-02-02T03:02:06+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
+"2020-02-02T03:02:16+01:00","SENSORPOINT",,,,,,18,,,2,69,3,50
-"2020-02-02T03:02:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
+"2020-02-02T03:02:17+01:00","TRACKPOINT",3,14.001,10,10,,18,0,0,2,69,3,50
-"2020-02-02T03:02:21+01:00","TRACKPOINT",3,3,10,10,,54,0,0,,,,
+"2020-02-02T03:02:18+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:22+01:00","SEGMENT_START_AUTOMATIC",3,3,10,10,,54,0,0,,,,
+"2020-02-02T03:03:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,,
-"2020-02-02T03:02:23+01:00","TRACKPOINT",3,3,10,10,,54,0,0,,,,
+"2020-02-02T03:03:21+01:00","TRACKPOINT",3,14.002,10,10,,54,0,0,,,,
-"2020-02-02T03:02:24+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,,
+"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,13 +62,16 @@ 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"
        android:label="@string/app_name"
        android:supportsRtl="true"
-        android:theme="@style/ThemeCustom">
+        android:theme="@style/ThemeCustom"
        android:localeConfig="@xml/locales_config">
        <activity
            android:name=".publicapi.StartRecording"
@@ -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;
@@ -146,9 +146,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
            finish();
            return true;
        });
-        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> {
+        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show());
            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);
@@ -383,13 +381,18 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
    }
    private void onGpsStatusChanged(GpsStatusValue gpsStatusValue) {
-        if (gpsStatusValue.isGpsStarted() && snackbar != null && snackbar.isShown()) {
+        boolean snackbarShowing = snackbar != null && snackbar.isShown();
-            snackbar.dismiss();
+        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);
            }
        }
    }
 }
@@ -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;
@@ -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;
    }
 }
@@ -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);
    }
 }
@@ -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;
        }
-
+        //TODO
        List<StatisticData> sensorDataList = StatisticDataBuilder.fromSensorStatistics(getContext(), sensorStatistics);
        if (sensorDataList.size() > 0) {
            sensorsAdapter.swapData(sensorDataList);
        }
    }
 }
@@ -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.gridlayout.widget.GridLayout;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 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.ui.customRecordingLayout.DataField;
-import de.dennisguse.opentracks.viewmodels.StatisticData;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
-import de.dennisguse.opentracks.viewmodels.StatisticsDataModel;
+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;
+            onLayoutChanged(PreferencesUtils.getCustomLayout());
            layout = PreferencesUtils.getCustomLayout();
            gridLayoutManager.setSpanCount(layout.getColumnsPerRow());
        }
        if (key != null && updateUInecessary && isResumed()) {
            getActivity().runOnUiThread(this::updateUI);
        }
    };
-    private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> {
+    private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> service.getRecordingDataObservable()
-        service.getRecordingDataObservable()
+            .observe(StatisticsRecordingFragment.this, this::onRecordingDataChanged);
                .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,56 @@ 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() {
+    private void onLayoutChanged(@NonNull RecordingLayout newRecordingLayout) {
-        if (isResumed()) {
+        if (newRecordingLayout.equals(recordingLayout)) {
-            viewModel.update(recordingData, layout, unitSystem);
+            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 (int i = 0; i < recordingLayout.getFields().size(); i++) {
            DataField dataField = recordingLayout.getFields().get(i);
            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 +176,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,
+                WelcomeFragment::newInstance,
-                (FragmentCreator) OSMDashboardFragment::newInstance
+                OSMDashboardFragment::newInstance
        );
        public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
@@ -25,7 +25,6 @@ import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.ui.markers.MarkerUtils;
@@ -40,9 +40,9 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorData;
 * Manages connection to a Bluetooth LE sensor and subscribes for onChange-notifications.
 * Also parses the transferred data into {@link SensorDataObserver}.
 */
-public abstract class BluetoothConnectionManager<DataType> {
+public abstract class AbstractBluetoothConnectionManager<DataType> {
-    private static final String TAG = BluetoothConnectionManager.class.getSimpleName();
+    private static final String TAG = AbstractBluetoothConnectionManager.class.getSimpleName();
    private final SensorDataObserver observer;
@@ -54,20 +54,23 @@ public abstract class BluetoothConnectionManager<DataType> {
        public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
            switch (newState) {
                case BluetoothProfile.STATE_CONNECTING:
-                    Log.d(TAG, "Connecting to sensor: " + gatt.getDevice());
+                    Log.i(TAG, "Connecting to sensor: " + gatt.getDevice());
                    break;
                case BluetoothProfile.STATE_CONNECTED:
-                    Log.d(TAG, "Connected to sensor: " + gatt.getDevice());
+                    Log.i(TAG, "Connected to sensor: " + gatt.getDevice() + "; discovering services.");
                    gatt.discoverServices();
                    break;
                case BluetoothProfile.STATE_DISCONNECTING:
-                    Log.d(TAG, "Disconnecting from sensor: " + gatt.getDevice());
+                    Log.i(TAG, "Disconnecting from sensor: " + gatt.getDevice());
                    break;
                case BluetoothProfile.STATE_DISCONNECTED:
-                    Log.d(TAG, "Disconnected from sensor: " + gatt.getDevice());
+                    //This is also triggered, if no connection was established (ca. 30s)
-
+                    Log.i(TAG, "Disconnected from sensor: " + gatt.getDevice() + "; trying to reconnect");
                    if (gatt.connect()) {
                        Log.e(TAG, "Could not trigger reconnect for sensor: " + gatt.getDevice());
                    }
                    clearData();
                    break;
            }
@@ -133,12 +136,12 @@ public abstract class BluetoothConnectionManager<DataType> {
        }
    };
-    BluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
+    AbstractBluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
        this.serviceMeasurementUUIDs = List.of(serviceUUUID);
        this.observer = observer;
    }
-    BluetoothConnectionManager(List<ServiceMeasurementUUID> serviceUUUID, SensorDataObserver observer) {
+    AbstractBluetoothConnectionManager(List<ServiceMeasurementUUID> serviceUUUID, SensorDataObserver observer) {
        this.serviceMeasurementUUIDs = serviceUUUID;
        this.observer = observer;
    }
@@ -19,7 +19,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
 /**
 * Estimates the altitude gain and altitude loss using the device's pressure sensor (i.e., barometer).
 */
-public class AltitudeSumManager implements SensorEventListener {
+public class AltitudeSumManager implements SensorConnector, SensorEventListener {
    private static final String TAG = AltitudeSumManager.class.getSimpleName();
@@ -8,11 +8,11 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
-public class BluetoothRemoteSensorManagerCyclingCadence extends BluetoothConnectionManager<Cadence> {
+public class BluetoothConnectionManagerCyclingCadence extends AbstractBluetoothConnectionManager<Cadence> {
-    private static final String TAG = BluetoothRemoteSensorManagerCyclingCadence.class.getSimpleName();
+    private static final String TAG = BluetoothConnectionManagerCyclingCadence.class.getSimpleName();
-    BluetoothRemoteSensorManagerCyclingCadence(SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingCadence(SensorDataObserver observer) {
        super(BluetoothUtils.CYCLING_CADENCE, observer);
    }
@@ -5,9 +5,9 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingDistanceSpeed;
-public class BluetoothRemoteSensorManagerCyclingDistanceSpeed extends BluetoothConnectionManager<SensorDataCyclingDistanceSpeed.Data> {
+public class BluetoothConnectionManagerCyclingDistanceSpeed extends AbstractBluetoothConnectionManager<SensorDataCyclingDistanceSpeed.Data> {
-    BluetoothRemoteSensorManagerCyclingDistanceSpeed(SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingDistanceSpeed(SensorDataObserver observer) {
        super(BluetoothUtils.CYCLING_SPEED_CADENCE, observer);
    }
@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 import de.dennisguse.opentracks.data.models.Power;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
-public class BluetoothRemoteSensorManagerCyclingPower extends BluetoothConnectionManager<Power> {
+public class BluetoothConnectionManagerCyclingPower extends AbstractBluetoothConnectionManager<Power> {
-    BluetoothRemoteSensorManagerCyclingPower(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingPower(@NonNull SensorDataObserver observer) {
        super(BluetoothUtils.CYCLING_POWER, observer);
    }
@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
-public class BluetoothRemoteSensorManagerHeartRate extends BluetoothConnectionManager<HeartRate> {
+public class BluetoothConnectionManagerHeartRate extends AbstractBluetoothConnectionManager<HeartRate> {
-    BluetoothRemoteSensorManagerHeartRate(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionManagerHeartRate(@NonNull SensorDataObserver observer) {
        super(BluetoothUtils.HEARTRATE, observer);
    }
@@ -20,8 +20,8 @@ public class BluetoothRemoteSensorManagerHeartRate extends BluetoothConnectionMa
    @Override
    protected SensorDataHeartRate parsePayload(@NonNull ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) {
-        Integer heartRate = BluetoothUtils.parseHeartRate(characteristic);
+        HeartRate heartRate = BluetoothUtils.parseHeartRate(characteristic);
-        return heartRate != null ? new SensorDataHeartRate(address, sensorName, HeartRate.of(heartRate)) : null;
+        return heartRate != null ? new SensorDataHeartRate(address, sensorName, heartRate) : null;
    }
 }
@@ -6,9 +6,9 @@ import androidx.annotation.NonNull;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
-public class BluetoothRemoteSensorManagerRunningSpeedAndCadence extends BluetoothConnectionManager<SensorDataRunning.Data> {
+public class BluetoothConnectionRunningSpeedAndCadence extends AbstractBluetoothConnectionManager<SensorDataRunning.Data> {
-    BluetoothRemoteSensorManagerRunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionRunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
        super(BluetoothUtils.RUNNING_SPEED_CADENCE, observer);
    }
@@ -52,11 +52,11 @@ import de.dennisguse.opentracks.util.PermissionRequester;
 *
 * @author Sandor Dornbush
 */
-public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.SensorDataObserver {
+public class BluetoothRemoteSensorManager implements SensorConnector, AbstractBluetoothConnectionManager.SensorDataObserver {
    private static final String TAG = BluetoothRemoteSensorManager.class.getSimpleName();
-    public static final Duration MAX_SENSOR_DATE_SET_AGE_MS = Duration.ofSeconds(5);
+    public static final Duration MAX_SENSOR_DATE_SET_AGE = Duration.ofSeconds(5);
    private final BluetoothAdapter bluetoothAdapter;
    private final Context context;
@@ -65,15 +65,15 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
    private Distance preferenceWheelCircumference;
-    private final BluetoothRemoteSensorManagerHeartRate heartRate = new BluetoothRemoteSensorManagerHeartRate(this);
+    private final BluetoothConnectionManagerHeartRate heartRate = new BluetoothConnectionManagerHeartRate(this);
-    private final BluetoothRemoteSensorManagerCyclingCadence cyclingCadence = new BluetoothRemoteSensorManagerCyclingCadence(this);
+    private final BluetoothConnectionManagerCyclingCadence cyclingCadence = new BluetoothConnectionManagerCyclingCadence(this);
-    private final BluetoothRemoteSensorManagerCyclingDistanceSpeed cyclingSpeed = new BluetoothRemoteSensorManagerCyclingDistanceSpeed(this);
+    private final BluetoothConnectionManagerCyclingDistanceSpeed cyclingSpeed = new BluetoothConnectionManagerCyclingDistanceSpeed(this);
-    private final BluetoothRemoteSensorManagerCyclingPower cyclingPower = new BluetoothRemoteSensorManagerCyclingPower(this);
+    private final BluetoothConnectionManagerCyclingPower cyclingPower = new BluetoothConnectionManagerCyclingPower(this);
-    private final BluetoothRemoteSensorManagerRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothRemoteSensorManagerRunningSpeedAndCadence(this);
+    private final BluetoothConnectionRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothConnectionRunningSpeedAndCadence(this);
    private final SensorDataSet sensorDataSet = new SensorDataSet();
-    private final SensorDataSetChangeObserver observer;
+    private final SensorManager.SensorDataSetChangeObserver observer;
    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
        @Override
@@ -114,21 +114,23 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
        }
    };
-    public BluetoothRemoteSensorManager(@NonNull Context context, @NonNull Handler handler, @NonNull SensorDataSetChangeObserver observer) {
+    public BluetoothRemoteSensorManager(@NonNull Context context, @NonNull Handler handler, @NonNull SensorManager.SensorDataSetChangeObserver observer) {
        this.context = context;
        this.handler = handler;
        this.observer = observer;
        bluetoothAdapter = BluetoothUtils.getAdapter(context);
    }
-    public void start() {
+    @Override
    public void start(Context context, Handler handler) {
        started = true;
        //Registering triggers connection startup
        PreferencesUtils.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
    }
-    public synchronized void stop() {
+    @Override
    public synchronized void stop(Context context) {
        heartRate.disconnect();
        cyclingCadence.disconnect();
        cyclingSpeed.disconnect();
@@ -145,7 +147,7 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
        return bluetoothAdapter != null && bluetoothAdapter.isEnabled();
    }
-    private synchronized void connect(BluetoothConnectionManager<?> connectionManager, String address) {
+    private synchronized void connect(AbstractBluetoothConnectionManager<?> connectionManager, String address) {
        if (!isEnabled()) {
            Log.w(TAG, "Bluetooth not enabled.");
            return;
@@ -230,8 +232,4 @@ public class BluetoothRemoteSensorManager implements BluetoothConnectionManager.
    public Handler getHandler() {
        return handler;
    }
    public interface SensorDataSetChangeObserver {
        void onChange(SensorDataSet sensorDataSet);
    }
 }
@@ -30,6 +30,7 @@ import java.util.UUID;
 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.Speed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
@@ -101,7 +102,7 @@ public class BluetoothUtils {
        return BluetoothUtils.getAdapter(context) != null;
    }
-    public static Integer parseHeartRate(BluetoothGattCharacteristic characteristic) {
+    public static HeartRate parseHeartRate(BluetoothGattCharacteristic characteristic) {
        //DOCUMENTATION https://www.bluetooth.com/wp-content/uploads/Sitecore-Media-Library/Gatt/Xml/Characteristics/org.bluetooth.characteristic.heart_rate_measurement.xml
        byte[] raw = characteristic.getValue();
        if (raw.length == 0) {
@@ -110,10 +111,10 @@ public class BluetoothUtils {
        boolean formatUINT16 = ((raw[0] & 0x1) == 1);
        if (formatUINT16 && raw.length >= 3) {
-            return characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, 1);
+            return HeartRate.of(characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, 1));
        }
        if (!formatUINT16 && raw.length >= 2) {
-            return characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, 1);
+            return HeartRate.of(characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, 1));
        }
        return null;
@@ -0,0 +1,11 @@
 package de.dennisguse.opentracks.sensors;
 import android.content.Context;
 import android.os.Handler;
 public interface SensorConnector {
    void start(Context context, Handler handler);
    void stop(Context context);
 }
@@ -0,0 +1,85 @@
 package de.dennisguse.opentracks.sensors;
 import android.content.Context;
 import android.os.Handler;
 import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorData;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 public class SensorManager {
    private static final String TAG = SensorManager.class.getSimpleName();
    private BluetoothRemoteSensorManager bluetoothSensorManager;
    private AltitudeSumManager altitudeSumManager;
    public SensorManager(Context context, Handler handler, SensorDataSetChangeObserver observer) {
        bluetoothSensorManager = new BluetoothRemoteSensorManager(context, handler, observer);
        altitudeSumManager = new AltitudeSumManager();
    }
    public void start(Context context, Handler handler) {
        bluetoothSensorManager.start(context, handler);
        altitudeSumManager.start(context, handler);
    }
    public void stop(Context context) {
        if (bluetoothSensorManager != null) {
            bluetoothSensorManager.stop(context);
            bluetoothSensorManager = null;
        }
        if (altitudeSumManager != null) {
            altitudeSumManager.stop(context);
            altitudeSumManager = null;
        }
    }
    public SensorDataSet fill(TrackPoint trackPoint) {
        altitudeSumManager.fill(trackPoint);
        return bluetoothSensorManager.fill(trackPoint);
    }
    public void reset() {
        if (bluetoothSensorManager == null || altitudeSumManager == null) {
            Log.d(TAG, "No recording running and no reset necessary.");
            return;
        }
        bluetoothSensorManager.reset();
        altitudeSumManager.reset();
    }
    @Deprecated
    @VisibleForTesting
    public BluetoothRemoteSensorManager getBluetoothSensorManager() {
        return bluetoothSensorManager;
    }
    @Deprecated
    @VisibleForTesting
    public void setBluetoothSensorManager(BluetoothRemoteSensorManager remoteSensorManager) {
        this.bluetoothSensorManager = remoteSensorManager;
    }
    @Deprecated
    @VisibleForTesting
    public AltitudeSumManager getAltitudeSumManager() {
        return altitudeSumManager;
    }
    @Deprecated
    @VisibleForTesting
    public void setAltitudeSumManager(AltitudeSumManager altitudeSumManager) {
        this.altitudeSumManager = altitudeSumManager;
    }
    @Deprecated
    public interface SensorDataSetChangeObserver {
        void onChange(SensorDataSet sensorDataSet);
    }
 }
@@ -1,7 +1,6 @@
 package de.dennisguse.opentracks.sensors.sensorData;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import java.time.Instant;
@@ -32,16 +31,6 @@ public abstract class SensorData<T> {
        this.time = time;
    }
    @NonNull
    public String getSensorAddress() {
        return sensorAddress;
    }
    @Nullable
    public String getSensorName() {
        return sensorName;
    }
    public String getSensorNameOrAddress() {
        return sensorName != null ? sensorName : sensorAddress;
    }
@@ -74,7 +63,7 @@ public abstract class SensorData<T> {
     */
    private boolean isRecent() {
        return Instant.now()
-                .isBefore(time.plus(BluetoothRemoteSensorManager.MAX_SENSOR_DATE_SET_AGE_MS));
+                .isBefore(time.plus(BluetoothRemoteSensorManager.MAX_SENSOR_DATE_SET_AGE));
    }
    @NonNull
@@ -22,7 +22,6 @@ import java.util.concurrent.Executors;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 public class TrackDeleteService extends Service {
@@ -111,7 +111,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        egm2008CorrectionManager = new EGM2008CorrectionManager();
        trackRecordingManager = new TrackRecordingManager(this);
        trackRecordingManager.start();
-        trackPointCreator = new TrackPointCreator(this);
+        trackPointCreator = new TrackPointCreator(this, this, handler);
        voiceAnnouncementManager = new VoiceAnnouncementManager(this);
        notificationManager = new TrackRecordingServiceNotificationManager(this);
@@ -177,7 +177,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
    }
    public void resumeTrack(Track.Id trackId) {
        trackPointCreator.reset();
        if (!trackRecordingManager.resumeExistingTrack(trackId, trackPointCreator)) {
            Log.w(TAG, "Cannot resume a non-existing track.");
            return;
@@ -267,10 +266,11 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
    @Override
    public void newGpsStatus(GpsStatusValue gpsStatusValue) {
        notificationManager.updateContent(getString(gpsStatusValue.message));
        //TODO This check should not be necessary, but prevents a crash; somehow the shutdown is not working correctly as we should not receive a notification then.
        // It is likely a race condition as the LocationManager provides location updates without using the Handler.
        if (gpsStatusObservable != null) {
            notificationManager.updateContent(getString(gpsStatusValue.message));
            gpsStatusObservable.postValue(gpsStatusValue);
        }
    }
@@ -327,7 +327,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
        TrackPoint trackPoint = data.second.first;
        egm2008CorrectionManager.correctAltitude(this, trackPoint);
-        localVoiceAnnouncementManager.update(data.first);
+        localVoiceAnnouncementManager.update(this, data.first);
        recordingDataObservable.postValue(new RecordingData(data.first, trackPoint, data.second.second));
    }
@@ -15,12 +15,14 @@
 */
 package de.dennisguse.opentracks.services.announcement;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.mediarouter.media.MediaRouter;
 import java.time.Duration;
@@ -73,12 +75,20 @@ public class VoiceAnnouncementManager implements SharedPreferences.OnSharedPrefe
        updateNextTaskDistance();
    }
-    public void update(@NonNull Track track) {
+    public void update(@NonNull Context context, @NonNull Track track) {
        if (voiceAnnouncement == null) {
            Log.e(TAG, "Cannot update when in status shutdown.");
            return;
        }
        if (!PreferencesUtils.shouldVoiceAnnouncementOnDeviceSpeaker()
                && MediaRouter.getInstance(context)
                .getSelectedRoute()
                .isDeviceSpeaker()) {
            Log.i(TAG, "No voice announcement on device speaker.");
            return;
        }
        boolean announce = false;
        this.trackStatistics = track.getTrackStatistics();
        if (trackStatistics.getTotalDistance().greaterThan(nextTotalDistance)) {
@@ -74,7 +74,7 @@ class VoiceAnnouncementUtils {
            builder.append(context.getString(R.string.total_distance));
            // Units should always be english singular for TTS.
            // See https://developer.android.com/reference/android/text/style/TtsSpan?hl=en#TYPE_MEASURE
-            appendDecimalUnit(builder, context.getResources().getQuantityString(distanceId, getQuantityCount(distanceInUnit), distanceInUnit), distanceInUnit, 2, unitDistanceTTS);
+            appendDecimalUnit(builder, context.getResources().getQuantityString(distanceId, getQuantityCount(distanceInUnit), distanceInUnit), distanceInUnit, 1, unitDistanceTTS);
            // Punctuation helps introduce natural pauses in TTS
            builder.append(".");
        }
@@ -3,14 +3,16 @@ package de.dennisguse.opentracks.services.handlers;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.location.LocationListenerCompat;
 import androidx.core.location.LocationManagerCompat;
 import androidx.core.location.LocationRequestCompat;
 import java.time.Duration;
 import java.time.Instant;
@@ -18,28 +20,35 @@ import java.time.Instant;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.SensorConnector;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-public class GPSHandler implements LocationListener, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class GPSManager implements SensorConnector, LocationListenerCompat, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
-    private final String TAG = GPSHandler.class.getSimpleName();
+    private final String TAG = GPSManager.class.getSimpleName();
    public static final String LOCATION_PROVIDER = LocationManager.GPS_PROVIDER;
    private final TrackPointCreator trackPointCreator;
    private Context context;
    private Handler handler;
    private LocationManager locationManager;
    private GpsStatus gpsStatus;
    private Duration gpsInterval;
    private Distance thresholdHorizontalAccuracy;
-    public GPSHandler(TrackPointCreator trackPointCreator) {
+    public GPSManager(TrackPointCreator trackPointCreator) {
        this.trackPointCreator = trackPointCreator;
    }
-    public void onStart(@NonNull Context context) {
+    public void start(@NonNull Context context, @NonNull Handler handler) {
        this.context = context;
        this.handler = handler;
        PreferencesUtils.registerOnSharedPreferenceChangeListener(this);
        gpsStatus = new GpsStatus(context, this);
        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
@@ -53,13 +62,14 @@ public class GPSHandler implements LocationListener, GpsStatus.GpsStatusListener
    @SuppressWarnings({"MissingPermission"})
    //TODO upgrade to AGP7.0.0/API31 started complaining about removeUpdates.
-    public void onStop() {
+    public void stop(Context context) {
        if (locationManager != null && context != null) {
            if (PermissionRequester.GPS.hasPermission(context)) {
-                locationManager.removeUpdates(this);
+                LocationManagerCompat.removeUpdates(locationManager, this);
            }
            locationManager = null;
            context = null;
            handler = null;
        }
        if (gpsStatus != null) {
@@ -154,14 +164,20 @@ public class GPSHandler implements LocationListener, GpsStatus.GpsStatusListener
            return;
        }
-        if(!LocationManagerCompat.hasProvider(locationManager, LocationManager.GPS_PROVIDER)) {
+        if (!LocationManagerCompat.hasProvider(locationManager, LOCATION_PROVIDER)) {
            Log.e(TAG, "Device doesn't have GPS.");
            return;
        }
        LocationRequestCompat locationRequest = new LocationRequestCompat.Builder(gpsInterval.toMillis())
                .setQuality(LocationRequestCompat.QUALITY_HIGH_ACCURACY)
                .setMaxUpdateDelayMillis(0)
                .build();
        if (PermissionRequester.GPS.hasPermission(context)) {
            try {
-                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, gpsInterval.toMillis(), 0, this);
+                final Handler HANDLER = handler;
                LocationManagerCompat.requestLocationUpdates(locationManager, LOCATION_PROVIDER, locationRequest, HANDLER::post, this);
            } catch (SecurityException e) {
                Log.e(TAG, "Could not register location listener; permissions not granted.", e);
            }
@@ -16,14 +16,13 @@ import java.time.ZoneId;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.sensors.AltitudeSumManager;
+import de.dennisguse.opentracks.sensors.SensorManager;
 import de.dennisguse.opentracks.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 /**
 * Creates TrackPoints while recording by fusing data from different sensors (e.g., GNSS, barometer, BLE sensors).
 */
-public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDataSetChangeObserver {
+public class TrackPointCreator implements SensorManager.SensorDataSetChangeObserver {
    private static final String TAG = TrackPointCreator.class.getSimpleName();
@@ -34,52 +33,34 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
    @NonNull
    private Clock clock = new MonotonicClock();
-    private final GPSHandler gpsHandler;
+    private final GPSManager gpsManager;
-    private BluetoothRemoteSensorManager remoteSensorManager;
+    private SensorManager sensorManager;
    private AltitudeSumManager altitudeSumManager;
-    public TrackPointCreator(Callback service) {
+    public TrackPointCreator(Callback service, Context context, Handler handler) {
        this.service = service;
-        this.gpsHandler = new GPSHandler(this);
+        this.gpsManager = new GPSManager(this);
        this.sensorManager = new SensorManager(context, handler, this);
    }
    @VisibleForTesting
-    TrackPointCreator(GPSHandler gpsHandler, Callback service) {
+    TrackPointCreator(GPSManager gpsManager, Callback service) {
        this.service = service;
-        this.gpsHandler = gpsHandler;
+        this.gpsManager = gpsManager;
    }
    public synchronized void start(@NonNull Context context, @NonNull Handler handler) {
        this.context = context;
-        gpsHandler.onStart(context);
+        gpsManager.start(context, handler);
-
+        sensorManager.start(context, handler);
        remoteSensorManager = new BluetoothRemoteSensorManager(context, handler, this);
        altitudeSumManager = new AltitudeSumManager();
        remoteSensorManager.start();
        altitudeSumManager.start(context, handler);
    }
    private boolean isStarted() {
        return context != null;
    }
-    @Deprecated
+    private synchronized void reset() {
-    //There should be a cooler way to do this; we want to send fake locations without getting affected by real GPS data.
+        sensorManager.reset();
    @VisibleForTesting
    public void stopGPS() {
        gpsHandler.onStop();
    }
    public synchronized void reset() {
        if (remoteSensorManager == null || altitudeSumManager == null) {
            Log.d(TAG, "No recording running and no reset necessary.");
            return;
        }
        remoteSensorManager.reset();
        altitudeSumManager.reset();
    }
    private SensorDataSet addSensorData(TrackPoint trackPoint) {
@@ -87,31 +68,12 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
            Log.w(TAG, "Not started, should not be called.");
            return null;
        }
        SensorDataSet sensorDataSet = null;
        BluetoothRemoteSensorManager localRemoteSensorManager = remoteSensorManager;
        if (localRemoteSensorManager != null) {
            sensorDataSet = localRemoteSensorManager.fill(trackPoint);
        }
        AltitudeSumManager localAltitudeSumManager = altitudeSumManager;
        if (localAltitudeSumManager != null) {
            localAltitudeSumManager.fill(trackPoint);
        }
-        return sensorDataSet;
+        return sensorManager.fill(trackPoint);
    }
    public synchronized void stop() {
-        gpsHandler.onStop();
+        gpsManager.stop(context);
        if (remoteSensorManager != null) {
            remoteSensorManager.stop();
            remoteSensorManager = null;
        }
        if (altitudeSumManager != null) {
            altitudeSumManager.stop(context);
            altitudeSumManager = null;
        }
        this.context = null;
    }
@@ -132,7 +94,7 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
    public void onNewTrackPoint(@NonNull TrackPoint trackPoint) {
        addSensorData(trackPoint);
-        boolean stored = service.newTrackPoint(trackPoint, gpsHandler.getThresholdHorizontalAccuracy());
+        boolean stored = service.newTrackPoint(trackPoint, gpsManager.getThresholdHorizontalAccuracy());
        if (stored) {
            reset();
        }
@@ -176,26 +138,8 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
    }
    @VisibleForTesting
-    public AltitudeSumManager getAltitudeSumManager() {
+    public SensorManager getSensorManager() {
-        return altitudeSumManager;
+        return sensorManager;
    }
    @Deprecated
    @VisibleForTesting
    public void setAltitudeSumManager(AltitudeSumManager altitudeSumManager) {
        this.altitudeSumManager = altitudeSumManager;
    }
    @Deprecated
    @VisibleForTesting
    public BluetoothRemoteSensorManager getRemoteSensorManager() {
        return remoteSensorManager;
    }
    @Deprecated
    @VisibleForTesting
    public void setRemoteSensorManager(BluetoothRemoteSensorManager remoteSensorManager) {
        this.remoteSensorManager = remoteSensorManager;
    }
    @VisibleForTesting
@@ -209,8 +153,8 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat
    }
    @VisibleForTesting
-    public GPSHandler getGpsHandler() {
+    public GPSManager getGpsHandler() {
-        return gpsHandler;
+        return gpsManager;
    }
    void sendGpsStatus(GpsStatusValue gpsStatusValue) {
@@ -28,6 +28,7 @@ import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDialogFragmentCompat;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -79,7 +80,7 @@ public class ActivityTypePreference extends DialogPreference {
            textView = view.findViewById(R.id.activity_type_preference_text_view);
            String category = PreferencesUtils.getDefaultActivity();
            textView.setText(category);
-            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(context, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+            ArrayAdapter<String> adapter = new ArrayAdapter<>(context, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(context));
            textView.setAdapter(adapter);
            textView.setOnItemClickListener((parent, v, position, id) -> {
                String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));
@@ -73,9 +73,7 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat {
    private void setFilenameTemplate() {
        EditTextPreference preference = findPreference(getString(R.string.export_filename_format_key));
-        preference.setOnBindEditTextListener(t -> {
+        preference.setOnBindEditTextListener(t -> t.setHint(getString(R.string.export_filename_format_default)));
            t.setHint(getString(R.string.export_filename_format_default));
        });
        preference.setDialogMessage(TrackFilenameGenerator.getAllOptions());
        preference.setOnPreferenceChangeListener((p, newValue) -> new TrackFilenameGenerator(newValue.toString()).isValid());
@@ -42,11 +42,14 @@ import java.util.stream.Stream;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.HeartRateZones;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.TrackFilenameGenerator;
 import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -278,6 +281,12 @@ public class PreferencesUtils {
        return getBoolean(R.string.settings_sensor_bluetooth_service_filter_enabled_key, DEFAULT);
    }
    public static HeartRateZones getHeartRateZones() {
        final int DEFAULT = Integer.parseInt(resources.getString(R.string.settings_sensor_heart_rate_max_default));
        int value = getInt(R.string.settings_sensor_heart_rate_max_key, DEFAULT);
        return new HeartRateZones(HeartRate.of(value));
    }
    public static boolean shouldShowStatsOnLockscreen() {
        final boolean STATS_SHOW_ON_LOCKSCREEN_DEFAULT = resources.getBoolean(R.bool.stats_show_on_lockscreen_while_recording_default);
        return getBoolean(R.string.stats_show_on_lockscreen_while_recording_key, STATS_SHOW_ON_LOCKSCREEN_DEFAULT);
@@ -293,6 +302,11 @@ public class PreferencesUtils {
        return getBoolean(R.string.stats_fullscreen_while_recording_key, DEFAULT);
    }
    public static boolean shouldVoiceAnnouncementOnDeviceSpeaker() {
        final boolean DEFAULT = resources.getBoolean(R.bool.voice_on_device_speaker_default);
        return getBoolean(R.string.voice_on_device_speaker_key, DEFAULT);
    }
    public static Duration getVoiceAnnouncementFrequency() {
        final int DEFAULT = Integer.parseInt(resources.getString(R.string.voice_announcement_frequency_default));
        int value = getInt(R.string.voice_announcement_frequency_key, DEFAULT);
@@ -753,35 +767,35 @@ public class PreferencesUtils {
    /**
     * @return custom layout selected or the first one if any has been selected or the one selected is not exists anymore.
     */
-    public static Layout getCustomLayout() {
+    public static RecordingLayout getCustomLayout() {
        String csvCustomLayouts = getString(R.string.stats_custom_layouts_key, buildDefaultLayout());
        String[] csvLines = csvCustomLayouts.split(CsvLayoutUtils.LINE_SEPARATOR);
        String layoutSelected = getString(R.string.stats_custom_layout_selected_layout_key, null);
        if (layoutSelected == null) {
-            return Layout.fromCsv(csvLines[0], resources);
+            return RecordingLayoutIO.fromCsv(csvLines[0], resources);
        }
        for (String line : csvLines) {
-            Layout layout = Layout.fromCsv(line, resources);
+            RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(line, resources);
-            if (layout.sameName(layoutSelected)) {
+            if (recordingLayout.sameName(layoutSelected)) {
-                return layout;
+                return recordingLayout;
            }
        }
-        return Layout.fromCsv(csvLines[0], resources);
+        return RecordingLayoutIO.fromCsv(csvLines[0], resources);
    }
-    public static void updateCustomLayouts(@NonNull List<Layout> layouts) {
+    public static void updateCustomLayouts(@NonNull List<RecordingLayout> recordingLayouts) {
-        setString(R.string.stats_custom_layouts_key, layouts.stream().map(Layout::toCsv).collect(Collectors.joining(CsvLayoutUtils.LINE_SEPARATOR)));
+        setString(R.string.stats_custom_layouts_key, RecordingLayoutIO.toCSV(recordingLayouts));
    }
-    public static void updateCustomLayout(@NonNull Layout layout) {
+    public static void updateCustomLayout(@NonNull RecordingLayout recordingLayout) {
-        List<Layout> preferenceLayouts = PreferencesUtils.getAllCustomLayouts();
+        List<RecordingLayout> preferenceRecordingLayouts = PreferencesUtils.getAllCustomLayouts();
-        Optional<Layout> layoutToBeUpdated = preferenceLayouts.stream().filter(l -> l.sameName(layout)).findFirst();
+        Optional<RecordingLayout> layoutToBeUpdated = preferenceRecordingLayouts.stream().filter(l -> l.sameName(recordingLayout)).findFirst();
        if (layoutToBeUpdated.isPresent()) {
-            layoutToBeUpdated.get().replaceAllFields(layout.getFields());
+            layoutToBeUpdated.get().replaceAllFields(recordingLayout.getFields());
-            layoutToBeUpdated.get().setColumnsPerRow(layout.getColumnsPerRow());
+            layoutToBeUpdated.get().setColumnsPerRow(recordingLayout.getColumnsPerRow());
-            PreferencesUtils.updateCustomLayouts(preferenceLayouts);
+            PreferencesUtils.updateCustomLayouts(preferenceRecordingLayouts);
        }
    }
@@ -795,19 +809,19 @@ public class PreferencesUtils {
        setString(R.string.stats_custom_layout_selected_layout_key, layoutName);
    }
-    public static List<Layout> getAllCustomLayouts() {
+    public static List<RecordingLayout> getAllCustomLayouts() {
-        List<Layout> layouts = new ArrayList<>();
+        List<RecordingLayout> recordingLayouts = new ArrayList<>();
        String csvCustomLayout = getString(R.string.stats_custom_layouts_key, buildDefaultLayout());
        String[] csvLines = csvCustomLayout.split(CsvLayoutUtils.LINE_SEPARATOR);
        for (String line : csvLines) {
-            layouts.add(Layout.fromCsv(line, resources));
+            recordingLayouts.add(RecordingLayoutIO.fromCsv(line, resources));
        }
-        return layouts;
+        return recordingLayouts;
    }
    public static List<String> getAllCustomLayoutNames() {
-        return getAllCustomLayouts().stream().map(Layout::getName).collect(Collectors.toList());
+        return getAllCustomLayouts().stream().map(RecordingLayout::getName).collect(Collectors.toList());
    }
    public static void resetCustomLayoutPreferences() {
@@ -45,7 +45,7 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
            if (newValue instanceof String) {
                try {
                    int newValueInt = Integer.parseInt((String) newValue);
-                    return newValueInt > 500 && newValueInt < 4000;
+                    return newValueInt >= 100 && newValueInt < 4000;
                } catch (NumberFormatException e) {
                    Log.w(TAG, "Entered string is no number.");
                }
@@ -17,7 +17,7 @@ import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.databinding.ActivitySettingsCustomLayoutBinding;
 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.SettingsCustomLayoutEditAdapter;
 import de.dennisguse.opentracks.ui.util.ArrayAdapterFilterDisabled;
 import de.dennisguse.opentracks.util.StatisticsUtils;
@@ -30,8 +30,8 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
    private SettingsCustomLayoutEditAdapter adapterFieldsVisible;
    private SettingsCustomLayoutEditAdapter adapterFieldsHidden;
    private String profile;
-    private Layout layoutFieldsVisible;
+    private RecordingLayout recordingLayoutFieldsVisible;
-    private Layout layoutFieldsHidden;
+    private RecordingLayout recordingLayoutFieldsHidden;
    private int numColumns;
    @Override
@@ -39,12 +39,12 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
        super.onCreate(savedInstanceState);
        // Recycler view with visible stats.
-        Layout layout = getIntent().getParcelableExtra(EXTRA_LAYOUT);
+        RecordingLayout recordingLayout = getIntent().getParcelableExtra(EXTRA_LAYOUT);
-        profile = layout.getName();
+        profile = recordingLayout.getName();
-        layoutFieldsVisible = StatisticsUtils.filterVisible(layout, true);
+        recordingLayoutFieldsVisible = StatisticsUtils.filterVisible(recordingLayout, true);
-        adapterFieldsVisible = new SettingsCustomLayoutEditAdapter(this, this, layoutFieldsVisible);
+        adapterFieldsVisible = new SettingsCustomLayoutEditAdapter(this, this, recordingLayoutFieldsVisible);
-        numColumns = layout.getColumnsPerRow();
+        numColumns = recordingLayout.getColumnsPerRow();
        RecyclerView recyclerViewVisible = viewBinding.recyclerViewVisible;
        gridLayoutManager = new GridLayoutManager(this, numColumns);
        gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
@@ -65,7 +65,7 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
                int fromPosition = viewHolder.getAdapterPosition();
                int toPosition = target.getAdapterPosition();
-                layoutFieldsVisible = adapterFieldsVisible.move(fromPosition, toPosition);
+                recordingLayoutFieldsVisible = adapterFieldsVisible.move(fromPosition, toPosition);
                return true;
            }
@@ -90,8 +90,8 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
        viewBinding.rowsOptions.setText(rowsOptionAdapter.getItem(numColumns - 1).toString(), false);
        // Recycler view with not visible stats.
-        layoutFieldsHidden = StatisticsUtils.filterVisible(layout, false);
+        recordingLayoutFieldsHidden = StatisticsUtils.filterVisible(recordingLayout, false);
-        adapterFieldsHidden = new SettingsCustomLayoutEditAdapter(this, this, layoutFieldsHidden);
+        adapterFieldsHidden = new SettingsCustomLayoutEditAdapter(this, this, recordingLayoutFieldsHidden);
        RecyclerView recyclerViewNotVisible = viewBinding.recyclerViewNotVisible;
        recyclerViewNotVisible.setLayoutManager(new LinearLayoutManager(this));
        recyclerViewNotVisible.setAdapter(adapterFieldsHidden);
@@ -103,18 +103,18 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
    @Override
    protected void onPause() {
        super.onPause();
-        if (!layoutFieldsVisible.getFields().isEmpty() || !layoutFieldsHidden.getFields().isEmpty()) {
+        if (!recordingLayoutFieldsVisible.getFields().isEmpty() || !recordingLayoutFieldsHidden.getFields().isEmpty()) {
-            Layout layout = new Layout(profile, numColumns);
+            RecordingLayout recordingLayout = new RecordingLayout(profile, numColumns);
-            layout.addFields(layoutFieldsVisible.getFields());
+            recordingLayout.addFields(recordingLayoutFieldsVisible.getFields());
-            layout.addFields(layoutFieldsHidden.getFields());
+            recordingLayout.addFields(recordingLayoutFieldsHidden.getFields());
-            PreferencesUtils.updateCustomLayout(layout);
+            PreferencesUtils.updateCustomLayout(recordingLayout);
        }
    }
    @Override
    protected void onDestroy() {
        super.onDestroy();
-        layoutFieldsVisible = null;
+        recordingLayoutFieldsVisible = null;
    }
    @Override
@@ -132,24 +132,24 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
                        if (which == 0) {
                            field.togglePrimary();
                        } else {
-                            layoutFieldsVisible.removeField(field);
+                            recordingLayoutFieldsVisible.removeField(field);
                            field.toggleVisibility();
-                            layoutFieldsHidden.addField(field);
+                            recordingLayoutFieldsHidden.addField(field);
                        }
-                        adapterFieldsVisible.swapValues(layoutFieldsVisible);
+                        adapterFieldsVisible.swapValues(recordingLayoutFieldsVisible);
-                        adapterFieldsHidden.swapValues(layoutFieldsHidden);
+                        adapterFieldsHidden.swapValues(recordingLayoutFieldsHidden);
                    })
                    .create()
                    .show();
        } else {
-            layoutFieldsHidden.removeField(field);
+            recordingLayoutFieldsHidden.removeField(field);
            field.toggleVisibility();
-            layoutFieldsVisible.addField(field);
+            recordingLayoutFieldsVisible.addField(field);
            viewBinding.scrollView.fullScroll(ScrollView.FOCUS_UP);
-            adapterFieldsVisible.swapValues(layoutFieldsVisible);
+            adapterFieldsVisible.swapValues(recordingLayoutFieldsVisible);
-            adapterFieldsHidden.swapValues(layoutFieldsHidden);
+            adapterFieldsHidden.swapValues(recordingLayoutFieldsHidden);
        }
    }
 }
@@ -23,7 +23,7 @@ import com.google.android.material.textfield.TextInputLayout;
 import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.databinding.ActivitySettingsCustomLayoutListBinding;
-import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
+import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 import de.dennisguse.opentracks.ui.customRecordingLayout.SettingsCustomLayoutListAdapter;
 import de.dennisguse.opentracks.ui.util.RecyclerViewSwipeDeleteCallback;
@@ -96,7 +96,7 @@ public class SettingsCustomLayoutListActivity extends AbstractActivity implement
            @Override
            public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
                final int position = viewHolder.getAdapterPosition();
-                final Layout item = adapter.getLayouts().get(position);
+                final RecordingLayout item = adapter.getLayouts().get(position);
                adapter.removeLayout(position);
@@ -150,9 +150,9 @@ public class SettingsCustomLayoutListActivity extends AbstractActivity implement
    }
    @Override
-    public void onSettingsCustomLayoutProfileClicked(@NonNull Layout layout) {
+    public void onSettingsCustomLayoutProfileClicked(@NonNull RecordingLayout recordingLayout) {
        Intent intent = new Intent(this, SettingsCustomLayoutEditActivity.class);
-        intent.putExtra(SettingsCustomLayoutEditActivity.EXTRA_LAYOUT, layout);
+        intent.putExtra(SettingsCustomLayoutEditActivity.EXTRA_LAYOUT, recordingLayout);
        startActivity(intent);
    }
@@ -1,25 +1,19 @@
 package de.dennisguse.opentracks.ui.customRecordingLayout;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
-import de.dennisguse.opentracks.R;
+import java.util.Objects;
 public class DataField implements Parcelable {
    public static final String YES_VALUE = "1";
    public static final String NOT_VALUE = "0";
    private final String key;
    private final String title;
    private boolean isVisible;
    private boolean isPrimary;
    private final boolean isWide;
-    public DataField(String key, String title, boolean isVisible, boolean isPrimary, boolean isWide) {
+    public DataField(String key, boolean isVisible, boolean isPrimary, boolean isWide) {
        this.key = key;
        this.title = title;
        this.isVisible = isVisible;
        this.isPrimary = isPrimary;
        this.isWide = isWide;
@@ -27,7 +21,6 @@ public class DataField implements Parcelable {
    protected DataField(Parcel in) {
        key = in.readString();
        title = in.readString();
        isVisible = in.readByte() != 0;
        isPrimary = in.readByte() != 0;
        isWide = in.readByte() != 0;
@@ -49,10 +42,6 @@ public class DataField implements Parcelable {
        return key;
    }
    public String getTitle() {
        return title;
    }
    public boolean isVisible() {
        return isVisible;
    }
@@ -73,65 +62,6 @@ public class DataField implements Parcelable {
        return isWide;
    }
    public CustomLayoutFieldType getType(Context context) {
        if (key.equals(context.getString(R.string.stats_custom_layout_clock_key))) {
            return CustomLayoutFieldType.CLOCK;
        } else {
            return CustomLayoutFieldType.GENERIC;
        }
    }
    public String toCsv() {
        String visible = this.isVisible ? YES_VALUE : NOT_VALUE;
        String primary = this.isPrimary ? YES_VALUE : NOT_VALUE;
        String wide = this.isWide ? YES_VALUE : NOT_VALUE;
        return key + CsvLayoutUtils.PROPERTY_SEPARATOR + visible + CsvLayoutUtils.PROPERTY_SEPARATOR + primary + CsvLayoutUtils.PROPERTY_SEPARATOR + wide;
    }
    public static String getTitleByKey(Resources resources, String key) {
        if (key.equals(resources.getString(R.string.stats_custom_layout_total_time_key))) {
            return resources.getString(R.string.stats_total_time);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_moving_time_key))) {
            return resources.getString(R.string.stats_moving_time);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_distance_key))) {
            return resources.getString(R.string.stats_distance);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_speed_key))) {
            return resources.getString(R.string.stats_speed);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_pace_key))) {
            return resources.getString(R.string.stats_pace);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_average_moving_speed_key))) {
            return resources.getString(R.string.stats_average_moving_speed);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_average_speed_key))) {
            return resources.getString(R.string.stats_average_speed);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_max_speed_key))) {
            return resources.getString(R.string.stats_max_speed);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_average_moving_pace_key))) {
            return resources.getString(R.string.stats_average_moving_pace);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_average_pace_key))) {
            return resources.getString(R.string.stats_average_pace);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_fastest_pace_key))) {
            return resources.getString(R.string.stats_fastest_pace);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_altitude_key))) {
            return resources.getString(R.string.stats_altitude);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_gain_key))) {
            return resources.getString(R.string.stats_gain);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_loss_key))) {
            return resources.getString(R.string.stats_loss);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_coordinates_key))) {
            return resources.getString(R.string.stats_coordinates);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_heart_rate_key))) {
            return resources.getString(R.string.stats_sensors_heart_rate);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_cadence_key))) {
            return resources.getString(R.string.stats_sensors_cadence);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_power_key))) {
            return resources.getString(R.string.stats_sensors_power);
        } else if (key.equals(resources.getString(R.string.stats_custom_layout_clock_key))) {
            return resources.getString(R.string.stats_clock);
        } else {
            throw new RuntimeException("It doesn't exists a field with key: " + key);
        }
    }
    @Override
    public int describeContents() {
        return 0;
@@ -140,9 +70,31 @@ public class DataField implements Parcelable {
    @Override
    public void writeToParcel(Parcel parcel, int i) {
        parcel.writeString(key);
        parcel.writeString(title);
        parcel.writeByte((byte) (isVisible ? 1 : 0));
        parcel.writeByte((byte) (isPrimary ? 1 : 0));
        parcel.writeByte((byte) (isWide ? 1 : 0));
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        DataField dataField = (DataField) o;
        return isVisible == dataField.isVisible && isPrimary == dataField.isPrimary && isWide == dataField.isWide && Objects.equals(key, dataField.key);
    }
    @Override
    public int hashCode() {
        return Objects.hash(key, isVisible, isPrimary, isWide);
    }
    @Override
    public String toString() {
        return "DataField{" +
                "key='" + key + '\'' +
                ", isVisible=" + isVisible +
                ", isPrimary=" + isPrimary +
                ", isWide=" + isWide +
                '}';
    }
 }
@@ -1,78 +1,50 @@
 package de.dennisguse.opentracks.ui.customRecordingLayout;
 import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-public class Layout implements Parcelable {
+public class RecordingLayout implements Parcelable {
    private static final String TAG = Layout.class.getSimpleName();
    // User-generated layout's name.
    private final String name;
    private int columnsPerRow;
    private final List<DataField> dataFields = new ArrayList<>();
-    public static Layout fromCsv(@NonNull String csvLine, @NonNull Resources resources) {
+    public RecordingLayout(String name) {
        List<String> csvParts = CsvLayoutUtils.getCsvLineParts(csvLine);
        if (csvParts == null) {
            Log.e(TAG, "Invalid CSV layout. It shouldn't happen: " + csvLine);
            return new Layout(PreferencesUtils.getDefaultLayoutName());
        }
        Layout layout = new Layout(csvParts.get(0), Integer.parseInt(csvParts.get(1)));
        for (int i = 2; i < csvParts.size(); i++) {
            String[] fieldParts = CsvLayoutUtils.getCsvFieldParts(csvParts.get(i));
            if (fieldParts == null) {
                Log.e(TAG, "Invalid CSV layout. It shouldn't happen: " + csvLine);
                return layout;
            }
            layout.addField(fieldParts[0], DataField.getTitleByKey(resources, fieldParts[0]), fieldParts[1].equals(DataField.YES_VALUE), fieldParts[2].equals(DataField.YES_VALUE), fieldParts[0].equals(resources.getString(R.string.stats_custom_layout_coordinates_key)));
        }
        return layout;
    }
    public Layout(String name) {
        this.name = name;
        this.columnsPerRow = PreferencesUtils.getLayoutColumnsByDefault();
    }
-    public Layout(String name, int columnsPerRow) {
+    public RecordingLayout(String name, int columnsPerRow) {
        this.name = name;
        this.columnsPerRow = columnsPerRow;
    }
-    protected Layout(Parcel in) {
+    protected RecordingLayout(Parcel in) {
        name = in.readString();
        columnsPerRow = in.readInt();
        in.readList(dataFields, DataField.class.getClassLoader());
    }
-    public static final Creator<Layout> CREATOR = new Creator<>() {
+    public static final Creator<RecordingLayout> CREATOR = new Creator<>() {
        @Override
-        public Layout createFromParcel(Parcel in) {
+        public RecordingLayout createFromParcel(Parcel in) {
-            return new Layout(in);
+            return new RecordingLayout(in);
        }
        @Override
-        public Layout[] newArray(int size) {
+        public RecordingLayout[] newArray(int size) {
-            return new Layout[size];
+            return new RecordingLayout[size];
        }
    };
    public void addField(String key, String title, boolean visible, boolean primary, boolean isWide) {
        dataFields.add(new DataField(key, title, visible, primary, isWide));
    }
    public void addField(DataField dataField) {
        dataFields.add(dataField);
    }
@@ -111,8 +83,8 @@ public class Layout implements Parcelable {
        this.columnsPerRow = columnsPerRow;
    }
-    public boolean sameName(Layout layout) {
+    public boolean sameName(RecordingLayout recordingLayout) {
-        return this.name.equalsIgnoreCase(layout.getName());
+        return this.name.equalsIgnoreCase(recordingLayout.getName());
    }
    public boolean sameName(String name) {
@@ -126,7 +98,7 @@ public class Layout implements Parcelable {
        }
        return getName() + CsvLayoutUtils.ITEM_SEPARATOR + getColumnsPerRow() + CsvLayoutUtils.ITEM_SEPARATOR
-                + fields.stream().map(DataField::toCsv).collect(Collectors.joining(CsvLayoutUtils.ITEM_SEPARATOR))
+                + fields.stream().map(RecordingLayoutIO::toCsv).collect(Collectors.joining(CsvLayoutUtils.ITEM_SEPARATOR))
                + CsvLayoutUtils.ITEM_SEPARATOR;
    }
@@ -141,4 +113,17 @@ public class Layout implements Parcelable {
        parcel.writeInt(columnsPerRow);
        parcel.writeList(dataFields);
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        RecordingLayout recordingLayout = (RecordingLayout) o;
        return columnsPerRow == recordingLayout.columnsPerRow && Objects.equals(name, recordingLayout.name) && Objects.equals(dataFields, recordingLayout.dataFields);
    }
    @Override
    public int hashCode() {
        return Objects.hash(name, columnsPerRow, dataFields);
    }
 }
@@ -0,0 +1,58 @@
 package de.dennisguse.opentracks.ui.customRecordingLayout;
 import android.content.res.Resources;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import java.util.List;
 import java.util.stream.Collectors;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 public class RecordingLayoutIO {
    private static final String TAG = RecordingLayout.class.getSimpleName();
    private static final String YES_VALUE = "1";
    private static final String NOT_VALUE = "0";
    public static RecordingLayout fromCsv(@NonNull String csvLine, @NonNull Resources resources) {
        List<String> csvParts = CsvLayoutUtils.getCsvLineParts(csvLine);
        if (csvParts == null) {
            Log.e(TAG, "Invalid CSV layout. It shouldn't happen: " + csvLine);
            return new RecordingLayout(PreferencesUtils.getDefaultLayoutName());
        }
        RecordingLayout recordingLayout = new RecordingLayout(csvParts.get(0), Integer.parseInt(csvParts.get(1)));
        for (int i = 2; i < csvParts.size(); i++) {
            String[] fieldParts = CsvLayoutUtils.getCsvFieldParts(csvParts.get(i));
            if (fieldParts == null) {
                Log.e(TAG, "Invalid CSV layout. It shouldn't happen: " + csvLine);
                return recordingLayout;
            }
            recordingLayout.addField(fromCSV(fieldParts, resources));
        }
        return recordingLayout;
    }
    public static String toCSV(List<RecordingLayout> recordingLayouts) {
        return recordingLayouts.stream().map(RecordingLayout::toCsv).collect(Collectors.joining(CsvLayoutUtils.LINE_SEPARATOR));
    }
    private static DataField fromCSV(String[] fieldParts, @NonNull Resources resources) {
        return new DataField(
                fieldParts[0],
                fieldParts[1].equals(YES_VALUE),
                fieldParts[2].equals(YES_VALUE),
                fieldParts[0].equals(resources.getString(R.string.stats_custom_layout_coordinates_key)));
    }
    static String toCsv(DataField datafield) {
        String visible = datafield.isVisible() ? YES_VALUE : NOT_VALUE;
        String primary = datafield.isPrimary() ? YES_VALUE : NOT_VALUE;
        String wide = datafield.isWide() ? YES_VALUE : NOT_VALUE;
        return datafield.getKey() + CsvLayoutUtils.PROPERTY_SEPARATOR + visible + CsvLayoutUtils.PROPERTY_SEPARATOR + primary + CsvLayoutUtils.PROPERTY_SEPARATOR + wide;
    }
 }
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1 @@`
							`Cairde rianaithe spóirt a bhfuil meas aige ar do phríobháideachas.`
`@@ -1 +1,2 @@`
	`android.useAndroidX=true`	`android.useAndroidX=true`
		`org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=256m`