updated Readme

removed link to the Roadmap

.gitignore

@@ -1,8 +1,3 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-
 # testing
 /coverage
 
@@ -13,7 +8,11 @@
 
 # misc
 .*
-*.properties
-*.iml
 !.gitignore
 
+# idea
+*.iml
+
+# gradle
+local.properties
+

NOTICE.md

@@ -49,6 +49,30 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
+<https://github.com/vectorstofinal/geoid_heights>
+
+    The MIT License (MIT)
+
+    Copyright (c) 2015 vectorstofinal
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
 <https://github.com/westnordost/osmapi>
 
     © 2016-2019 Tobias Zwick. This library is released under the terms of the GNU Lesser General Public License (LGPL).

README.md

@@ -20,7 +20,7 @@ FitoTrack is a mobile app for logging and viewing your workouts. Whether you're
 - **View your workouts.** View general information such as date, time, duration, distance, speed and pace. See your route on a map. Work out your level of performance from the speed diagram.
 - **Open-Source.** There is neither advertivesment nor tracking, and the source code is open and licensed under the GPLv3.
 
-please see the [Userguide](https://codeberg.org/jannis/FitoTrack/wiki/How-to-use) if you have any problems and the [Roadmap](https://codeberg.org/jannis/FitoTrack/wiki/Roadmap) for planned features.
+Please see the [Userguide](https://codeberg.org/jannis/FitoTrack/wiki/How-to-use) if you have any problems.
 
 ## Contributing
 

app/build.gradle

@@ -35,8 +35,8 @@ android {
         applicationId "de.tadris.fitness"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 410
-        versionName "4.1"
+        versionCode 500
+        versionName "5.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -73,7 +73,7 @@ dependencies {
     implementation 'org.mapsforge:mapsforge-map-android:0.11.0'
     implementation 'com.caverock:androidsvg:1.3'
 
-    // Charts
+    // UI
     implementation 'net.sf.kxml:kxml2:2.3.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'com.github.clans:fab:1.6.4'

app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
     package="de.tadris.fitness">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -39,19 +40,21 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name=".activity.VoiceAnnouncementsSettingsActivity"></activity>
+        <activity android:name=".activity.VoiceAnnouncementsSettingsActivity" />
+        <activity android:name=".activity.SettingsActivity" />
+        <activity android:name=".activity.EnterWorkoutActivity"/>
         <activity
             android:name=".activity.ShowWorkoutMapActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.ShowWorkoutMapDiagramActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".activity.SettingsActivity" />
         <activity
             android:name=".activity.ShowWorkoutActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.RecordWorkoutActivity"
+            android:showOnLockScreen="true"
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.ListWorkoutsActivity"

app/src/main/java/de/tadris/fitness/Instance.java

@@ -32,6 +32,7 @@ import java.util.List;
 import de.tadris.fitness.data.AppDatabase;
 import de.tadris.fitness.data.UserPreferences;
 import de.tadris.fitness.recording.LocationListener;
+import de.tadris.fitness.util.FitoTrackThemes;
 import de.tadris.fitness.util.unit.UnitUtils;
 
 public class Instance {
@@ -50,17 +51,19 @@ public class Instance {
     public final AppDatabase db;
     public final List<LocationListener.LocationChangeListener> locationChangeListeners = new ArrayList<>();
     public final UserPreferences userPreferences;
+    public final FitoTrackThemes themes;
 
     public boolean pressureAvailable= false;
     public float lastPressure= 0;
 
     private Instance(Context context) {
         userPreferences= new UserPreferences(context);
+        themes = new FitoTrackThemes(context);
         db = Room.databaseBuilder(context.getApplicationContext(), AppDatabase.class, DATABASE_NAME)
                 .addMigrations(new Migration(1, 2) {
                     @Override
                     public void migrate(@NonNull SupportSQLiteDatabase database) {
-                        try{
+                        try {
                             database.beginTransaction();
 
                             database.execSQL("ALTER table workout add descent REAL NOT NULL DEFAULT 0;");
@@ -85,7 +88,20 @@ public class Instance {
                             database.execSQL("DROP TABLE workout_sample2");
 
                             database.setTransactionSuccessful();
-                        }finally {
+                        } finally {
+                            database.endTransaction();
+                        }
+                    }
+                }, new Migration(2, 3) {
+                    @Override
+                    public void migrate(@NonNull SupportSQLiteDatabase database) {
+                        try {
+                            database.beginTransaction();
+
+                            database.execSQL("ALTER table workout add COLUMN edited INTEGER not null default 0");
+
+                            database.setTransactionSuccessful();
+                        } finally {
                             database.endTransaction();
                         }
                     }

app/src/main/java/de/tadris/fitness/activity/EnterWorkoutActivity.java

@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.InputType;
+import android.util.TypedValue;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import de.tadris.fitness.R;
+import de.tadris.fitness.data.WorkoutBuilder;
+import de.tadris.fitness.data.WorkoutType;
+import de.tadris.fitness.dialog.DatePickerFragment;
+import de.tadris.fitness.dialog.DurationPickerDialogFragment;
+import de.tadris.fitness.dialog.SelectWorkoutTypeDialog;
+import de.tadris.fitness.dialog.TimePickerFragment;
+import de.tadris.fitness.util.unit.UnitUtils;
+
+public class EnterWorkoutActivity extends InformationActivity implements SelectWorkoutTypeDialog.WorkoutTypeSelectListener, DatePickerFragment.DatePickerCallback, TimePickerFragment.TimePickerCallback, DurationPickerDialogFragment.DurationPickListener {
+
+    WorkoutBuilder workoutBuilder = new WorkoutBuilder();
+    TextView typeTextView, dateTextView, timeTextView, durationTextView;
+    EditText distanceEditText, commentEditText;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_enter_workout);
+
+        initRoot();
+
+        addTitle(getString(R.string.info));
+        setupActionBar();
+
+        KeyValueLine typeLine = addKeyValueLine(getString(R.string.type));
+        typeTextView = typeLine.value;
+        typeLine.lineRoot.setOnClickListener(v -> showTypeSelection());
+
+        distanceEditText = new EditText(this);
+        distanceEditText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+        distanceEditText.setSingleLine(true);
+        distanceEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+        distanceEditText.setOnEditorActionListener((v, actionId, event) -> {
+            // If the User clicks on the finish button on the keyboard, continue by showing the date selection
+            if (actionId == EditorInfo.IME_ACTION_SEARCH ||
+                    actionId == EditorInfo.IME_ACTION_DONE ||
+                    event != null &&
+                            event.getAction() == KeyEvent.ACTION_DOWN &&
+                            event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+                if (event == null || !event.isShiftPressed()) {
+                    showDateSelection();
+                    return true;
+                }
+            }
+            return false;
+        });
+        addKeyValueLine(getString(R.string.workoutDistance), distanceEditText, UnitUtils.CHOSEN_SYSTEM.getLongDistanceUnit());
+
+
+        KeyValueLine dateLine = addKeyValueLine(getString(R.string.workoutDate));
+        dateLine.lineRoot.setOnClickListener(v -> showDateSelection());
+        dateTextView = dateLine.value;
+
+        KeyValueLine timeLine = addKeyValueLine(getString(R.string.workoutStartTime));
+        timeLine.lineRoot.setOnClickListener(v -> showTimeSelection());
+        timeTextView = timeLine.value;
+
+        KeyValueLine durationLine = addKeyValueLine(getString(R.string.workoutDuration));
+        durationLine.lineRoot.setOnClickListener(v -> showDurationSelection());
+        durationTextView = durationLine.value;
+
+        addTitle(getString(R.string.comment));
+
+        commentEditText = new EditText(this);
+        commentEditText.setSingleLine(true);
+        root.addView(commentEditText);
+
+        updateTextViews();
+    }
+
+    private void saveWorkout() {
+        workoutBuilder.setComment(commentEditText.getText().toString());
+        try {
+            workoutBuilder.setLength((int) (Double.parseDouble(distanceEditText.getText().toString()) * 1000));
+        } catch (NumberFormatException ignored) {
+            distanceEditText.requestFocus();
+            distanceEditText.setError(getString(R.string.errorEnterValidNumber));
+            return;
+        }
+        if (workoutBuilder.getStart().getTimeInMillis() > System.currentTimeMillis()) {
+            Toast.makeText(this, R.string.errorWorkoutAddFuture, Toast.LENGTH_LONG).show();
+            return;
+        }
+        if (workoutBuilder.getDuration() < 1000) {
+            Toast.makeText(this, R.string.errorEnterValidDuration, Toast.LENGTH_LONG).show();
+            return;
+        }
+        ShowWorkoutActivity.selectedWorkout = workoutBuilder.insertWorkout(this);
+        startActivity(new Intent(this, ShowWorkoutActivity.class));
+        finish();
+    }
+
+    private void updateTextViews() {
+        typeTextView.setText(getString(workoutBuilder.getWorkoutType().title));
+        dateTextView.setText(SimpleDateFormat.getDateInstance().format(workoutBuilder.getStart().getTime()));
+        timeTextView.setText(SimpleDateFormat.getTimeInstance().format(workoutBuilder.getStart().getTime()));
+        durationTextView.setText(UnitUtils.getHourMinuteSecondTime(workoutBuilder.getDuration()));
+    }
+
+    private void showTypeSelection() {
+        new SelectWorkoutTypeDialog(this, this).show();
+    }
+
+    @Override
+    public void onSelectWorkoutType(WorkoutType workoutType) {
+        workoutBuilder.setWorkoutType(workoutType);
+        updateTextViews();
+        distanceEditText.requestFocus();
+    }
+
+    private void showDateSelection() {
+        DatePickerFragment fragment = new DatePickerFragment();
+        fragment.callback = this;
+        fragment.show(getFragmentManager(), "datePicker");
+    }
+
+    @Override
+    public void onDatePick(int year, int month, int day) {
+        workoutBuilder.getStart().set(year, month, day);
+        updateTextViews();
+        showTimeSelection();
+    }
+
+    private void showTimeSelection() {
+        TimePickerFragment fragment = new TimePickerFragment();
+        fragment.callback = this;
+        fragment.show(getFragmentManager(), "timePicker");
+    }
+
+    @Override
+    public void onTimePick(int hour, int minute) {
+        workoutBuilder.getStart().set(Calendar.HOUR_OF_DAY, hour);
+        workoutBuilder.getStart().set(Calendar.MINUTE, minute);
+        workoutBuilder.getStart().set(Calendar.SECOND, 0);
+        updateTextViews();
+        showDurationSelection();
+    }
+
+    private void showDurationSelection() {
+        DurationPickerDialogFragment fragment = new DurationPickerDialogFragment(this, this, workoutBuilder.getDuration());
+        fragment.listener = this;
+        fragment.initialDuration = workoutBuilder.getDuration();
+        fragment.show();
+    }
+
+    @Override
+    public void onDurationPick(long duration) {
+        workoutBuilder.setDuration(duration);
+        updateTextViews();
+        commentEditText.requestFocus();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.enter_workout_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        switch (id) {
+            case R.id.actionEnterWorkoutAdd:
+                saveWorkout();
+                return true;
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void setupActionBar() {
+        if (getActionBar() != null) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
+    @Override
+    void initRoot() {
+        root = findViewById(R.id.enterWorkoutRoot);
+    }
+}

app/src/main/java/de/tadris/fitness/activity/FitoTrackActivity.java

@@ -23,15 +23,23 @@ import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.util.TypedValue;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.app.ActivityCompat;
 
+import de.tadris.fitness.Instance;
 import de.tadris.fitness.R;
 
 abstract public class FitoTrackActivity extends Activity {
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTheme(Instance.getInstance(this).themes.getDefaultTheme());
+    }
 
     int getThemePrimaryColor() {
         final TypedValue value = new TypedValue ();

app/src/main/java/de/tadris/fitness/activity/FitoTrackSettingsActivity.java

@@ -23,6 +23,7 @@ import android.app.AlertDialog;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
+import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
@@ -31,13 +32,21 @@ import android.preference.RingtonePreference;
 import android.text.TextUtils;
 import android.view.MenuItem;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
+import de.tadris.fitness.Instance;
 import de.tadris.fitness.R;
 import de.tadris.fitness.util.unit.UnitUtils;
 
 public abstract class FitoTrackSettingsActivity extends PreferenceActivity {
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setTheme(Instance.getInstance(this).themes.getDefaultTheme());
+        super.onCreate(savedInstanceState);
+    }
+
     protected void showErrorDialog(Exception e, @StringRes int title, @StringRes int message) {
         new AlertDialog.Builder(this)
                 .setTitle(title)

app/src/main/java/de/tadris/fitness/activity/InformationActivity.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.activity;
+
+import android.graphics.Typeface;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import de.tadris.fitness.R;
+
+public abstract class InformationActivity extends FitoTrackActivity {
+
+    ViewGroup root;
+
+    protected void addTitle(String title) {
+        TextView textView = new TextView(this);
+        textView.setText(title);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+        textView.setTextColor(getThemePrimaryColor());
+        textView.setTypeface(Typeface.DEFAULT_BOLD);
+        textView.setAllCaps(true);
+        textView.setPadding(0, 20, 0, 0);
+
+        root.addView(textView);
+    }
+
+    protected TextView addText(String text, boolean themeColor) {
+        TextView textView = createTextView(text, themeColor);
+        root.addView(textView);
+
+        return textView;
+    }
+
+    protected TextView createTextView(String text) {
+        return createTextView(text, false);
+    }
+
+    protected TextView createTextView(String text, boolean themeColor) {
+        TextView textView = new TextView(this);
+        textView.setText(text);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+        if (themeColor) {
+            textView.setTextColor(getThemePrimaryColor());
+        } else {
+            textView.setTextColor(getResources().getColor(R.color.textLighterBlack));
+        }
+        textView.setPadding(0, 20, 0, 0);
+
+        return textView;
+    }
+
+    protected void addKeyValue(String key1, String value1) {
+        addKeyValue(key1, value1, "", "");
+    }
+
+    protected void addKeyValue(String key1, String value1, String key2, String value2) {
+        View v = getLayoutInflater().inflate(R.layout.show_entry, root, false);
+
+        TextView title1 = v.findViewById(R.id.v1title);
+        TextView title2 = v.findViewById(R.id.v2title);
+        TextView v1 = v.findViewById(R.id.v1value);
+        TextView v2 = v.findViewById(R.id.v2value);
+
+        title1.setText(key1);
+        title2.setText(key2);
+        v1.setText(value1);
+        v2.setText(value2);
+
+        root.addView(v);
+    }
+
+    protected KeyValueLine addKeyValueLine(String key) {
+        return addKeyValueLine(key, "");
+    }
+
+    protected KeyValueLine addKeyValueLine(String key, String value) {
+        return addKeyValueLine(key, null, value);
+    }
+
+    protected KeyValueLine addKeyValueLine(String key, @Nullable View view) {
+        return addKeyValueLine(key, view, "");
+    }
+
+    protected KeyValueLine addKeyValueLine(String key, @Nullable View view, String value) {
+        View v = getLayoutInflater().inflate(R.layout.enter_workout_line, root, false);
+
+        TextView keyView = v.findViewById(R.id.lineKey);
+        TextView valueView = v.findViewById(R.id.lineValue);
+        LinearLayout customViewRoot = v.findViewById(R.id.lineViewRoot);
+
+        keyView.setText(key);
+        valueView.setText(value);
+
+        if (view != null) {
+            customViewRoot.addView(view);
+        }
+
+        root.addView(v);
+        return new KeyValueLine(v, keyView, valueView, view);
+    }
+
+    public static class KeyValueLine {
+        public View lineRoot;
+        public TextView key;
+        public TextView value;
+        public View customView;
+
+        public KeyValueLine(View lineRoot, TextView key, TextView value, View customView) {
+            this.lineRoot = lineRoot;
+            this.key = key;
+            this.value = value;
+            this.customView = customView;
+        }
+    }
+
+    abstract void initRoot();
+
+
+}

app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java

@@ -19,7 +19,6 @@
 
 package de.tadris.fitness.activity;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -37,10 +36,11 @@ import com.github.clans.fab.FloatingActionMenu;
 import de.tadris.fitness.Instance;
 import de.tadris.fitness.R;
 import de.tadris.fitness.data.Workout;
+import de.tadris.fitness.data.WorkoutType;
 import de.tadris.fitness.util.DialogUtils;
 import de.tadris.fitness.view.WorkoutAdapter;
 
-public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.WorkoutAdapterListener {
+public class ListWorkoutsActivity extends FitoTrackActivity implements WorkoutAdapter.WorkoutAdapterListener {
 
     private RecyclerView listView;
     private RecyclerView.Adapter adapter;
@@ -63,16 +63,17 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
         menu= findViewById(R.id.workoutListMenu);
         menu.setOnMenuButtonLongClickListener(v -> {
             if(workouts.length > 0){
-                startRecording(workouts[0].workoutType);
+                startRecording(workouts[0].getWorkoutType());
                 return true;
             }else{
                 return false;
             }
         });
 
-        findViewById(R.id.workoutListRecordRunning).setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_RUNNING));
-        findViewById(R.id.workoutListRecordHiking) .setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_HIKING));
-        findViewById(R.id.workoutListRecordCycling).setOnClickListener(v -> startRecording(Workout.WORKOUT_TYPE_CYCLING));
+        findViewById(R.id.workoutListRecordRunning).setOnClickListener(v -> startRecording(WorkoutType.RUNNING));
+        findViewById(R.id.workoutListRecordHiking).setOnClickListener(v -> startRecording(WorkoutType.HIKING));
+        findViewById(R.id.workoutListRecordCycling).setOnClickListener(v -> startRecording(WorkoutType.CYCLING));
+        findViewById(R.id.workoutListEnter).setOnClickListener(v -> startEnterWorkoutActivity());
 
         checkFirstStart();
 
@@ -92,7 +93,13 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
         }
     }
 
-    private void startRecording(String activity) {
+    private void startEnterWorkoutActivity() {
+        menu.close(true);
+        final Intent intent = new Intent(this, EnterWorkoutActivity.class);
+        new Handler().postDelayed(() -> startActivity(intent), 300);
+    }
+
+    private void startRecording(WorkoutType activity) {
         menu.close(true);
         RecordWorkoutActivity.ACTIVITY= activity;
         final Intent intent= new Intent(this, RecordWorkoutActivity.class);

app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java

@@ -35,6 +35,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -53,20 +54,18 @@ import java.util.List;
 
 import de.tadris.fitness.Instance;
 import de.tadris.fitness.R;
-import de.tadris.fitness.announcement.AnnouncementGPSStatus;
-import de.tadris.fitness.announcement.VoiceAnnouncements;
-import de.tadris.fitness.data.Workout;
+import de.tadris.fitness.data.WorkoutType;
 import de.tadris.fitness.map.MapManager;
-import de.tadris.fitness.map.tilesource.TileSources;
 import de.tadris.fitness.recording.LocationListener;
 import de.tadris.fitness.recording.PressureService;
 import de.tadris.fitness.recording.WorkoutRecorder;
-import de.tadris.fitness.util.ThemeManager;
+import de.tadris.fitness.recording.announcement.AnnouncementGPSStatus;
+import de.tadris.fitness.recording.announcement.VoiceAnnouncements;
 import de.tadris.fitness.util.unit.UnitUtils;
 
 public class RecordWorkoutActivity extends FitoTrackActivity implements LocationListener.LocationChangeListener, WorkoutRecorder.WorkoutRecorderListener, VoiceAnnouncements.VoiceAnnouncementCallback {
 
-    public static String ACTIVITY= Workout.WORKOUT_TYPE_RUNNING;
+    public static WorkoutType ACTIVITY = WorkoutType.OTHER;
 
     private MapView mapView;
     private TileDownloadLayer downloadLayer;
@@ -76,6 +75,7 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
     private final InfoViewHolder[] infoViews = new InfoViewHolder[4];
     private TextView timeView;
     private TextView gpsStatusView;
+    private TextView attribution;
     private View waitingForGPSOverlay;
     private boolean gpsFound = false;
     private boolean isResumed = false;
@@ -90,7 +90,7 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTheme(ThemeManager.getThemeByWorkoutType(ACTIVITY));
+        setTheme(Instance.getInstance(this).themes.getWorkoutTypeTheme(ACTIVITY));
         setContentView(R.layout.activity_record_workout);
 
         setTitle(R.string.recordWorkout);
@@ -101,6 +101,8 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
         waitingForGPSOverlay= findViewById(R.id.recorderWaitingOverlay);
         waitingForGPSOverlay.setVisibility(View.VISIBLE);
 
+        attribution = findViewById(R.id.recordMapAttribution);
+
         checkPermissions();
 
         recorder= new WorkoutRecorder(this, ACTIVITY, this);
@@ -136,7 +138,9 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
         waitingForGPSOverlay.clearAnimation();
         waitingForGPSOverlay.animate().alpha(0f).setDuration(1000).setListener(new Animator.AnimatorListener() {
             @Override public void onAnimationStart(Animator animator) { }
+
             @Override public void onAnimationCancel(Animator animator) { }
+
             @Override public void onAnimationRepeat(Animator animator) { }
 
             @Override
@@ -144,17 +148,16 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
                 waitingForGPSOverlay.setVisibility(View.GONE);
             }
         }).start();
+        hideOSMAttribution();
+    }
+
+    private void hideOSMAttribution() {
+        attribution.animate().alpha(0f).setDuration(1000).setStartDelay(5000).start();
     }
 
     private void setupMap(){
         this.mapView= new MapView(this);
-        TileSources.Purpose purpose;
-        if(ACTIVITY.equals(Workout.WORKOUT_TYPE_CYCLING)){
-            purpose= TileSources.Purpose.CYCLING;
-        }else{
-            purpose= TileSources.Purpose.OUTDOOR;
-        }
-        downloadLayer= MapManager.setupMap(mapView, purpose);
+        downloadLayer = MapManager.setupMap(mapView);
     }
 
     private void updateLine(){
@@ -343,10 +346,18 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
 
     public void onResume(){
         super.onResume();
+        enableLockScreenVisibility();
         downloadLayer.onResume();
         isResumed= true;
     }
 
+    private void enableLockScreenVisibility() {
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
+                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
+                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.

app/src/main/java/de/tadris/fitness/activity/SettingsActivity.java

@@ -40,9 +40,9 @@ import java.io.File;
 import java.io.IOException;
 
 import de.tadris.fitness.R;
-import de.tadris.fitness.announcement.VoiceAnnouncements;
 import de.tadris.fitness.export.BackupController;
 import de.tadris.fitness.export.RestoreController;
+import de.tadris.fitness.recording.announcement.VoiceAnnouncements;
 import de.tadris.fitness.util.FileUtils;
 import de.tadris.fitness.util.unit.UnitUtils;
 import de.tadris.fitness.view.ProgressDialogController;
@@ -62,6 +62,12 @@ public class SettingsActivity extends FitoTrackSettingsActivity {
 
         bindPreferenceSummaryToValue(findPreference("unitSystem"));
         bindPreferenceSummaryToValue(findPreference("mapStyle"));
+        bindPreferenceSummaryToValue(findPreference("themeSetting"));
+        findPreference("themeSetting").setOnPreferenceChangeListener((preference, newValue) -> {
+            sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, newValue);
+            Toast.makeText(SettingsActivity.this, R.string.hintRestart, Toast.LENGTH_LONG).show();
+            return true;
+        });
 
         findPreference("weight").setOnPreferenceClickListener(preference -> {
             showWeightPicker();

app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java

@@ -21,13 +21,10 @@ package de.tadris.fitness.activity;
 
 import android.app.AlertDialog;
 import android.content.Intent;
-import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Spinner;
@@ -66,12 +63,13 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
         initBeforeContent();
 
         setContentView(R.layout.activity_show_workout);
-        root= findViewById(R.id.showWorkoutRoot);
+        initRoot();
 
         initAfterContent();
 
-        commentView = addText(getString(R.string.comment) + ": " + workout.comment);
+        commentView = addText("", true);
         commentView.setOnClickListener(v -> openEditCommentDialog());
+        updateCommentText();
 
         addTitle(getString(R.string.workoutTime));
         addKeyValue(getString(R.string.workoutDate), getDate());
@@ -82,34 +80,43 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
 
         addKeyValue(getString(R.string.workoutDistance), UnitUtils.getDistance(workout.length), getString(R.string.workoutPace), UnitUtils.getPace(workout.avgPace));
 
-        addTitle(getString(R.string.workoutRoute));
+        if (hasSamples()) {
+            addTitle(getString(R.string.workoutRoute));
 
-        addMap();
+            addMap();
+
+            map.setClickable(false);
+            mapRoot.setOnClickListener(v -> startActivity(new Intent(ShowWorkoutActivity.this, ShowWorkoutMapActivity.class)));
+
+        }
 
-        map.setClickable(false);
-        mapRoot.setOnClickListener(v -> startActivity(new Intent(ShowWorkoutActivity.this, ShowWorkoutMapActivity.class)));
 
         addTitle(getString(R.string.workoutSpeed));
 
         addKeyValue(getString(R.string.workoutAvgSpeedShort), UnitUtils.getSpeed(workout.avgSpeed),
                 getString(R.string.workoutTopSpeed), UnitUtils.getSpeed(workout.topSpeed));
 
-        addSpeedDiagram();
+        if (hasSamples()) {
 
-        speedDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_SPEED));
+            addSpeedDiagram();
+
+            speedDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_SPEED));
+        }
 
         addTitle(getString(R.string.workoutBurnedEnergy));
         addKeyValue(getString(R.string.workoutTotalEnergy), workout.calorie + " kcal",
                 getString(R.string.workoutEnergyConsumption), UnitUtils.getRelativeEnergyConsumption((double)workout.calorie / ((double)workout.length / 1000)));
 
-        addTitle(getString(R.string.height));
+        if (hasSamples()) {
+            addTitle(getString(R.string.height));
 
-        addKeyValue(getString(R.string.workoutAscent), UnitUtils.getDistance((int)workout.ascent),
-                getString(R.string.workoutDescent), UnitUtils.getDistance((int)workout.descent));
+            addKeyValue(getString(R.string.workoutAscent), UnitUtils.getDistance((int) workout.ascent),
+                    getString(R.string.workoutDescent), UnitUtils.getDistance((int) workout.descent));
 
-        addHeightDiagram();
+            addHeightDiagram();
 
-        heightDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_HEIGHT));
+            heightDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_HEIGHT));
+        }
 
 
     }
@@ -126,14 +133,31 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
         editText.setSingleLine(true);
         new AlertDialog.Builder(this)
                 .setTitle(R.string.enterComment)
-                .setPositiveButton(R.string.okay, (dialog, which) -> changeComment(editText.getText().toString(), commentView))
+                .setPositiveButton(R.string.okay, (dialog, which) -> changeComment(editText.getText().toString()))
                 .setView(editText).create().show();
     }
 
-    private void changeComment(String comment, TextView onChange) {
+    private void changeComment(String comment) {
         workout.comment= comment;
         Instance.getInstance(this).db.workoutDao().updateWorkout(workout);
-        onChange.setText(getString(R.string.comment) + ": " + workout.comment);
+        updateCommentText();
+    }
+
+    private void updateCommentText() {
+        String str = "";
+        if (workout.edited) {
+            str += getString(R.string.workoutEdited);
+        }
+        if (workout.comment != null && workout.comment.length() > 0) {
+            if (str.length() > 0) {
+                str += "\n";
+            }
+            str += getString(R.string.comment) + ": " + workout.comment;
+        }
+        if (str.length() == 0) {
+            str = getString(R.string.noComment);
+        }
+        commentView.setText(str);
     }
 
     private String getDate() {
@@ -141,51 +165,6 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
     }
 
 
-    private void addTitle(String title) {
-        TextView textView= new TextView(this);
-        textView.setText(title);
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
-        textView.setTextColor(getThemePrimaryColor());
-        textView.setTypeface(Typeface.DEFAULT_BOLD);
-        textView.setAllCaps(true);
-        textView.setPadding(0, 20, 0, 0);
-
-        root.addView(textView);
-    }
-
-    private TextView addText(String text) {
-        TextView textView= new TextView(this);
-        textView.setText(text);
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
-        textView.setTextColor(getThemePrimaryColor());
-        textView.setPadding(0, 20, 0, 0);
-
-        root.addView(textView);
-
-        return textView;
-    }
-
-    private void addKeyValue(String key1, String value1) {
-        addKeyValue(key1, value1, "", "");
-    }
-
-    private void addKeyValue(String key1, String value1, String key2, String value2) {
-        View v= getLayoutInflater().inflate(R.layout.show_entry, root, false);
-
-        TextView title1= v.findViewById(R.id.v1title);
-        TextView title2= v.findViewById(R.id.v2title);
-        TextView v1= v.findViewById(R.id.v1value);
-        TextView v2= v.findViewById(R.id.v2value);
-
-        title1.setText(key1);
-        title2.setText(key2);
-        v1.setText(value1);
-        v2.setText(value2);
-
-        root.addView(v);
-    }
-
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -299,4 +278,8 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    void initRoot() {
+        root = findViewById(R.id.showWorkoutRoot);
+    }
 }

app/src/main/java/de/tadris/fitness/activity/ShowWorkoutMapActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
  *
  * This file is part of FitoTrack
  *
@@ -32,7 +32,7 @@ public class ShowWorkoutMapActivity extends WorkoutActivity {
         initBeforeContent();
 
         setContentView(R.layout.activity_show_workout_map);
-        root= findViewById(R.id.showWorkoutMapParent);
+        initRoot();
 
         initAfterContent();
 
@@ -43,4 +43,8 @@ public class ShowWorkoutMapActivity extends WorkoutActivity {
     }
 
 
+    @Override
+    void initRoot() {
+        root = findViewById(R.id.showWorkoutMapParent);
+    }
 }

app/src/main/java/de/tadris/fitness/activity/ShowWorkoutMapDiagramActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
  *
  * This file is part of FitoTrack
  *
@@ -36,7 +36,7 @@ public class ShowWorkoutMapDiagramActivity extends WorkoutActivity {
         initBeforeContent();
 
         setContentView(R.layout.activity_show_workout_map_diagram);
-        root= findViewById(R.id.showWorkoutMapParent);
+        initRoot();
 
         initAfterContent();
 
@@ -54,4 +54,8 @@ public class ShowWorkoutMapDiagramActivity extends WorkoutActivity {
     }
 
 
+    @Override
+    void initRoot() {
+        root = findViewById(R.id.showWorkoutMapParent);
+    }
 }

app/src/main/java/de/tadris/fitness/activity/WorkoutActivity.java

@@ -55,18 +55,14 @@ import de.tadris.fitness.data.WorkoutManager;
 import de.tadris.fitness.data.WorkoutSample;
 import de.tadris.fitness.map.MapManager;
 import de.tadris.fitness.map.WorkoutLayer;
-import de.tadris.fitness.map.tilesource.TileSources;
-import de.tadris.fitness.util.ThemeManager;
-import de.tadris.fitness.util.WorkoutTypeCalculator;
 import de.tadris.fitness.util.unit.UnitUtils;
 
-public abstract class WorkoutActivity extends FitoTrackActivity {
+public abstract class WorkoutActivity extends InformationActivity {
 
     public static Workout selectedWorkout;
 
     List<WorkoutSample> samples;
     Workout workout;
-    ViewGroup root;
     private Resources.Theme theme;
     MapView map;
     private TileDownloadLayer downloadLayer;
@@ -79,14 +75,14 @@ public abstract class WorkoutActivity extends FitoTrackActivity {
     void initBeforeContent() {
         workout= selectedWorkout;
         samples= Arrays.asList(Instance.getInstance(this).db.workoutDao().getAllSamplesOfWorkout(workout.id));
-        setTheme(ThemeManager.getThemeByWorkout(workout));
+        setTheme(Instance.getInstance(this).themes.getWorkoutTypeTheme(workout.getWorkoutType()));
     }
 
     void initAfterContent() {
         if (getActionBar() != null) {
             getActionBar().setDisplayHomeAsUpEnabled(true);
         }
-        setTitle(WorkoutTypeCalculator.getType(workout));
+        setTitle(workout.getWorkoutType().title);
 
         theme= getTheme();
     }
@@ -259,7 +255,7 @@ public abstract class WorkoutActivity extends FitoTrackActivity {
 
     void addMap(){
         map= new MapView(this);
-        downloadLayer= MapManager.setupMap(map, TileSources.Purpose.DEFAULT);
+        downloadLayer = MapManager.setupMap(map);
 
         WorkoutLayer workoutLayer= new WorkoutLayer(samples, getThemePrimaryColor());
         map.addLayer(workoutLayer);
@@ -297,9 +293,15 @@ public abstract class WorkoutActivity extends FitoTrackActivity {
         return getWindowManager().getDefaultDisplay().getWidth()*3/4;
     }
 
+    protected boolean hasSamples() {
+        return samples.size() > 1;
+    }
+
     @Override
     protected void onDestroy() {
-        map.destroyAll();
+        if (map != null) {
+            map.destroyAll();
+        }
         AndroidGraphicFactory.clearResourceMemoryCache();
         super.onDestroy();
     }
@@ -307,12 +309,16 @@ public abstract class WorkoutActivity extends FitoTrackActivity {
     @Override
     public void onPause(){
         super.onPause();
-        downloadLayer.onPause();
+        if (downloadLayer != null) {
+            downloadLayer.onPause();
+        }
     }
 
     public void onResume(){
         super.onResume();
-        downloadLayer.onResume();
+        if (downloadLayer != null) {
+            downloadLayer.onResume();
+        }
     }
 
     @Override

app/src/main/java/de/tadris/fitness/data/AppDatabase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
  *
  * This file is part of FitoTrack
  *
@@ -22,7 +22,7 @@ package de.tadris.fitness.data;
 import androidx.room.Database;
 import androidx.room.RoomDatabase;
 
-@Database(version = 2, entities = {Workout.class,  WorkoutSample.class})
+@Database(version = 3, entities = {Workout.class, WorkoutSample.class})
 public abstract class AppDatabase extends RoomDatabase {
     public abstract WorkoutDao workoutDao();
 }

app/src/main/java/de/tadris/fitness/data/Workout.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
  *
  * This file is part of FitoTrack
  *
@@ -19,10 +19,13 @@
 
 package de.tadris.fitness.data;
 
+import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -31,10 +34,6 @@ import java.util.Date;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Workout{
 
-    public static final String WORKOUT_TYPE_RUNNING= "running";
-    public static final String WORKOUT_TYPE_HIKING=  "hiking";
-    public static final String WORKOUT_TYPE_CYCLING= "cycling";
-
     @PrimaryKey
     public long id;
 
@@ -63,12 +62,13 @@ public class Workout{
     public double topSpeed;
 
     /**
-     * Average pace of workout in km/min
+     * Average pace of workout in min/km
      */
     public double avgPace;
 
-    public String workoutType;
-
+    @ColumnInfo(name = "workoutType")
+    @JsonProperty(value = "workoutType")
+    public String workoutTypeId;
 
     public float ascent;
 
@@ -76,6 +76,8 @@ public class Workout{
 
     public int calorie;
 
+    public boolean edited;
+
     public String toString(){
         if(comment.length() > 2){
             return comment;
@@ -84,9 +86,20 @@ public class Workout{
         }
     }
 
+    @JsonIgnore
     public String getDateString(){
         return SimpleDateFormat.getDateTimeInstance().format(new Date(start));
     }
 
+    @JsonIgnore
+    public WorkoutType getWorkoutType() {
+        return WorkoutType.getTypeById(workoutTypeId);
+    }
+
+    @JsonIgnore
+    public void setWorkoutType(WorkoutType workoutType) {
+        this.workoutTypeId = workoutType.id;
+    }
+
 
 }

app/src/main/java/de/tadris/fitness/data/WorkoutBuilder.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.data;
+
+import android.content.Context;
+
+import java.util.Calendar;
+
+import de.tadris.fitness.Instance;
+import de.tadris.fitness.util.CalorieCalculator;
+
+public class WorkoutBuilder {
+
+    private WorkoutType workoutType;
+
+    private Calendar start;
+    private long duration;
+
+    private int length;
+
+    private String comment;
+
+    public WorkoutBuilder() {
+        workoutType = WorkoutType.RUNNING;
+        start = Calendar.getInstance();
+        duration = 1000L * 60 * 10;
+        length = 500;
+        comment = "";
+    }
+
+    public Workout create(Context context) {
+        Workout workout = new Workout();
+
+        // Calculate values
+        workout.start = start.getTimeInMillis();
+        workout.duration = duration;
+        workout.end = workout.start + workout.duration;
+
+        workout.id = workout.start;
+        workout.setWorkoutType(workoutType);
+
+        workout.length = length;
+
+        workout.avgSpeed = (double) length / (double) (duration / 1000);
+        workout.topSpeed = 0;
+        workout.avgPace = ((double) workout.duration / 1000 / 60) / ((double) workout.length / 1000);
+
+        workout.pauseDuration = 0;
+        workout.ascent = 0;
+        workout.descent = 0;
+
+        workout.calorie = CalorieCalculator.calculateCalories(workout, Instance.getInstance(context).userPreferences.getUserWeight());
+        workout.comment = comment;
+
+        workout.edited = true;
+
+        return workout;
+    }
+
+    public Workout insertWorkout(Context context) {
+        Workout workout = create(context);
+        Instance.getInstance(context).db.workoutDao().insertWorkout(workout);
+        return workout;
+    }
+
+    public WorkoutType getWorkoutType() {
+        return workoutType;
+    }
+
+    public void setWorkoutType(WorkoutType workoutType) {
+        this.workoutType = workoutType;
+    }
+
+    public Calendar getStart() {
+        return start;
+    }
+
+    public void setStart(Calendar start) {
+        this.start = start;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(long duration) {
+        this.duration = duration;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    public void setLength(int length) {
+        this.length = length;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+}

app/src/main/java/de/tadris/fitness/data/WorkoutType.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.data;
+
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+
+import de.tadris.fitness.R;
+
+public enum WorkoutType {
+
+    RUNNING("running", R.string.workoutTypeRunning, 7, true, R.style.Running, R.style.RunningDark),
+    HIKING("hiking", R.string.workoutTypeHiking, 7, true, R.style.Hiking, R.style.HikingDark),
+    CYCLING("cycling", R.string.workoutTypeCycling, 12, true, R.style.Bicycling, R.style.BicyclingDark),
+    OTHER("other", R.string.workoutTypeOther, 7, true, R.style.AppTheme, R.style.AppThemeDark);
+
+    public String id;
+    @StringRes
+    public int title;
+    public int minDistance; // Minimum distance between samples
+    public boolean hasGPS;
+    @StyleRes
+    public int lightTheme, darkTheme;
+
+    WorkoutType(String id, int title, int minDistance, boolean hasGPS, int lightTheme, int darkTheme) {
+        this.id = id;
+        this.title = title;
+        this.minDistance = minDistance;
+        this.hasGPS = hasGPS;
+        this.lightTheme = lightTheme;
+        this.darkTheme = darkTheme;
+    }
+
+    public static WorkoutType getTypeById(String id) {
+        for (WorkoutType type : values()) {
+            if (type.id.equals(id)) {
+                return type;
+            }
+        }
+        return OTHER;
+    }
+}

app/src/main/java/de/tadris/fitness/dialog/DatePickerFragment.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.dialog;
+
+import android.app.DatePickerDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.os.Bundle;
+import android.widget.DatePicker;
+
+import java.util.Calendar;
+
+public class DatePickerFragment extends DialogFragment implements DatePickerDialog.OnDateSetListener {
+
+    public DatePickerCallback callback;
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the current date as the default date in the picker
+        final Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(System.currentTimeMillis());
+        int year = c.get(Calendar.YEAR);
+        int month = c.get(Calendar.MONTH);
+        int day = c.get(Calendar.DAY_OF_MONTH);
+
+        // Create a new instance of DatePickerDialog and return it
+        return new DatePickerDialog(getActivity(), this, year, month, day);
+    }
+
+    public void onDateSet(DatePicker view, int year, int month, int day) {
+        callback.onDatePick(year, month, day);
+    }
+
+    public interface DatePickerCallback {
+        void onDatePick(int year, int month, int day);
+    }
+}

app/src/main/java/de/tadris/fitness/dialog/DurationPickerDialogFragment.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.dialog;
+
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.view.View;
+import android.widget.NumberPicker;
+
+import de.tadris.fitness.R;
+
+public class DurationPickerDialogFragment {
+
+    public Activity context;
+    public DurationPickListener listener;
+    public long initialDuration;
+
+    public DurationPickerDialogFragment(Activity context, DurationPickListener listener, long initialDuration) {
+        this.context = context;
+        this.listener = listener;
+        this.initialDuration = initialDuration;
+    }
+
+    public void show() {
+        final AlertDialog.Builder d = new AlertDialog.Builder(context);
+        d.setTitle(R.string.setDuration);
+        View v = context.getLayoutInflater().inflate(R.layout.dialog_duration_picker, null);
+        NumberPicker hours = v.findViewById(R.id.durationPickerHours);
+        hours.setFormatter(value -> value + " " + context.getString(R.string.timeHourShort));
+        hours.setMinValue(0);
+        hours.setMaxValue(24);
+        hours.setValue(getInitialHours());
+
+        NumberPicker minutes = v.findViewById(R.id.durationPickerMinutes);
+        minutes.setFormatter(value -> value + " " + context.getString(R.string.timeMinuteShort));
+        minutes.setMinValue(0);
+        minutes.setMaxValue(60);
+        minutes.setValue(getInitialMinutes());
+
+        NumberPicker seconds = v.findViewById(R.id.durationPickerSeconds);
+        seconds.setFormatter(value -> value + " " + context.getString(R.string.timeSecondsShort));
+        seconds.setMinValue(0);
+        seconds.setMaxValue(60);
+        seconds.setValue(getInitialSeconds());
+
+        d.setView(v);
+
+        d.setNegativeButton(R.string.cancel, null);
+        d.setPositiveButton(R.string.okay, (dialog, which) -> {
+            listener.onDurationPick(getMillisFromPick(hours.getValue(), minutes.getValue(), seconds.getValue()));
+        });
+
+        d.create().show();
+    }
+
+    private int getInitialHours() {
+        return (int) (initialDuration / 1000 / 60 / 60);
+    }
+
+    private int getInitialMinutes() {
+        return (int) (initialDuration / 1000 / 60 % 60);
+    }
+
+    private int getInitialSeconds() {
+        return (int) (initialDuration / 1000 % 60);
+    }
+
+    private static long getMillisFromPick(int hours, int minutes, int seconds) {
+        long secondInMillis = 1000L;
+        long minuteInMillis = secondInMillis * 60;
+        long hourInMillis = minuteInMillis * 60;
+        return hours * hourInMillis + minutes * minuteInMillis + seconds * secondInMillis;
+    }
+
+    public interface DurationPickListener {
+        void onDurationPick(long duration);
+    }
+
+}

app/src/main/java/de/tadris/fitness/dialog/SelectWorkoutTypeDialog.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.dialog;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.widget.ArrayAdapter;
+
+import de.tadris.fitness.R;
+import de.tadris.fitness.data.WorkoutType;
+
+public class SelectWorkoutTypeDialog {
+
+    private Activity context;
+    private WorkoutTypeSelectListener listener;
+    private WorkoutType[] options;
+
+    public SelectWorkoutTypeDialog(Activity context, WorkoutTypeSelectListener listener) {
+        this.context = context;
+        this.listener = listener;
+        this.options = WorkoutType.values();
+    }
+
+    public void show() {
+        AlertDialog.Builder builderSingle = new AlertDialog.Builder(context);
+
+        final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(context, R.layout.select_dialog_singlechoice_material);
+        for (WorkoutType type : options) {
+            arrayAdapter.add(context.getString(type.title));
+        }
+
+        builderSingle.setAdapter(arrayAdapter, (dialog, which) -> listener.onSelectWorkoutType(options[which]));
+        builderSingle.show();
+    }
+
+    public interface WorkoutTypeSelectListener {
+        void onSelectWorkoutType(WorkoutType workoutType);
+    }
+}

app/src/main/java/de/tadris/fitness/dialog/TimePickerFragment.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.dialog;
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.TimePickerDialog;
+import android.os.Bundle;
+import android.text.format.DateFormat;
+import android.widget.TimePicker;
+
+import java.util.Calendar;
+
+public class TimePickerFragment extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
+
+    public TimePickerCallback callback;
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the current time as the default values for the picker
+        final Calendar c = Calendar.getInstance();
+        int hour = c.get(Calendar.HOUR_OF_DAY);
+        int minute = c.get(Calendar.MINUTE);
+
+        // Create a new instance of TimePickerDialog and return it
+        return new TimePickerDialog(getActivity(), this, hour, minute, DateFormat.is24HourFormat(getActivity()));
+    }
+
+    public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+        callback.onTimePick(hourOfDay, minute);
+    }
+
+    public interface TimePickerCallback {
+        void onTimePick(int hour, int minute);
+    }
+}

app/src/main/java/de/tadris/fitness/map/MapManager.java

@@ -30,11 +30,10 @@ import de.tadris.fitness.map.tilesource.FitoTrackTileSource;
 import de.tadris.fitness.map.tilesource.HumanitarianTileSource;
 import de.tadris.fitness.map.tilesource.MapnikTileSource;
 import de.tadris.fitness.map.tilesource.ThunderforestTileSource;
-import de.tadris.fitness.map.tilesource.TileSources;
 
 public class MapManager {
 
-    public static TileDownloadLayer setupMap(MapView mapView, TileSources.Purpose purpose){
+    public static TileDownloadLayer setupMap(MapView mapView) {
         FitoTrackTileSource tileSource;
 
         String chosenTileLayer= Instance.getInstance(mapView.getContext()).userPreferences.getMapStyle();

app/src/main/java/de/tadris/fitness/map/tilesource/TileSources.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
- *
- * This file is part of FitoTrack
- *
- * FitoTrack is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     FitoTrack is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.tadris.fitness.map.tilesource;
-
-
-public class TileSources {
-
-    public static FitoTrackTileSource[] tileSources= new FitoTrackTileSource[]{
-            MapnikTileSource.INSTANCE, HumanitarianTileSource.INSTANCE, ThunderforestTileSource.OUTDOORS, ThunderforestTileSource.CYCLE_MAP
-    };
-
-    public enum Purpose{
-        DEFAULT, OUTDOOR, CYCLING
-    }
-
-}

app/src/main/java/de/tadris/fitness/recording/WorkoutRecorder.java

@@ -32,21 +32,11 @@ import java.util.List;
 import de.tadris.fitness.Instance;
 import de.tadris.fitness.data.Workout;
 import de.tadris.fitness.data.WorkoutSample;
+import de.tadris.fitness.data.WorkoutType;
 import de.tadris.fitness.util.CalorieCalculator;
 
 public class WorkoutRecorder implements LocationListener.LocationChangeListener {
 
-    private static int getMinDistance(String workoutType){
-        switch (workoutType){
-            case Workout.WORKOUT_TYPE_HIKING:
-            case Workout.WORKOUT_TYPE_RUNNING:
-                return 8;
-            case Workout.WORKOUT_TYPE_CYCLING:
-                return 15;
-            default: return 10;
-        }
-    }
-
     private static final int PAUSE_TIME= 10000;
 
     /**
@@ -72,17 +62,18 @@ public class WorkoutRecorder implements LocationListener.LocationChangeListener
     private final WorkoutRecorderListener workoutRecorderListener;
     private GpsState gpsState= GpsState.SIGNAL_LOST;
 
-    public WorkoutRecorder(Context context, String workoutType, WorkoutRecorderListener workoutRecorderListener) {
+    public WorkoutRecorder(Context context, WorkoutType workoutType, WorkoutRecorderListener workoutRecorderListener) {
         this.context= context;
         this.state= RecordingState.IDLE;
         this.workoutRecorderListener = workoutRecorderListener;
 
         this.workout= new Workout();
+        workout.edited = false;
 
         // Default values
         this.workout.comment= "";
 
-        this.workout.workoutType= workoutType;
+        this.workout.setWorkoutType(workoutType);
     }
 
     public void start(){
@@ -214,7 +205,7 @@ public class WorkoutRecorder implements LocationListener.LocationChangeListener
                     WorkoutSample lastSample= samples.get(samples.size() - 1);
                     distance= LocationListener.locationToLatLong(location).sphericalDistance(new LatLong(lastSample.lat, lastSample.lon));
                     long timediff= lastSample.absoluteTime - location.getTime();
-                    if(distance < getMinDistance(workout.workoutType) && timediff < 500){
+                    if (distance < workout.getWorkoutType().minDistance && timediff < 500) {
                         return;
                     }
                 }

app/src/main/java/de/tadris/fitness/recording/WorkoutSaver.java

@@ -23,12 +23,14 @@ import android.content.Context;
 import android.hardware.SensorManager;
 import android.util.Log;
 
+import java.io.IOException;
 import java.util.List;
 
 import de.tadris.fitness.Instance;
 import de.tadris.fitness.data.AppDatabase;
 import de.tadris.fitness.data.Workout;
 import de.tadris.fitness.data.WorkoutSample;
+import de.tadris.fitness.util.AltitudeCorrection;
 import de.tadris.fitness.util.CalorieCalculator;
 
 class WorkoutSaver {
@@ -51,7 +53,7 @@ class WorkoutSaver {
         setSimpleValues();
         setTopSpeed();
 
-        setRealElevation();
+        setElevation();
         setAscentAndDescent();
 
         setCalories();
@@ -84,9 +86,7 @@ class WorkoutSaver {
         double length= 0;
         for(int i= 1; i < samples.size(); i++){
             double sampleLength= samples.get(i - 1).toLatLong().sphericalDistance(samples.get(i).toLatLong());
-            long timeDiff= (samples.get(i).relativeTime - samples.get(i - 1).relativeTime) / 1000;
             length+= sampleLength;
-            samples.get(i).speed= Math.abs(sampleLength / timeDiff);
         }
         workout.length= (int)length;
         workout.avgSpeed= ((double) workout.length) / ((double) workout.duration / 1000);
@@ -103,7 +103,27 @@ class WorkoutSaver {
         workout.topSpeed= topSpeed;
     }
 
-    private void setRealElevation(){
+    private void setElevation() {
+        setCorrectedElevation();
+        setPressureElevation();
+    }
+
+    private void setCorrectedElevation() {
+        // Please see the AltitudeCorrection.java for the reason of this
+        try {
+            int lat = (int) Math.round(samples.get(0).lat);
+            int lon = (int) Math.round(samples.get(0).lon);
+            AltitudeCorrection correction = new AltitudeCorrection(context, lat, lon);
+            for (WorkoutSample sample : samples) {
+                sample.elevation = correction.getHeightOverSeaLevel(sample.elevation);
+            }
+        } catch (IOException e) {
+            // If we can't read the file, we cannot correct the values
+            e.printStackTrace();
+        }
+    }
+
+    private void setPressureElevation() {
         boolean pressureDataAvailable= samples.get(0).tmpPressure != -1;
 
         if(!pressureDataAvailable){

app/src/main/java/de/tadris/fitness/recording/announcement/Announcement.java

@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
 import android.content.Context;
 import android.preference.PreferenceManager;

app/src/main/java/de/tadris/fitness/recording/announcement/AnnouncementAverageSpeed.java

@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
 import android.content.Context;
 

app/src/main/java/de/tadris/fitness/recording/announcement/AnnouncementDistance.java

@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
 import android.content.Context;
 

app/src/main/java/de/tadris/fitness/recording/announcement/AnnouncementDuration.java

@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
 import android.content.Context;
 

app/src/main/java/de/tadris/fitness/recording/announcement/AnnouncementGPSStatus.java

@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
 import android.content.Context;
 

app/src/main/java/de/tadris/fitness/recording/announcement/AnnouncementManager.java

@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
 import android.content.Context;
 

app/src/main/java/de/tadris/fitness/recording/announcement/AnnouncementMode.java

@@ -17,7 +17,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
 import android.content.Context;
 import android.preference.PreferenceManager;

app/src/main/java/de/tadris/fitness/recording/announcement/VoiceAnnouncements.java

@@ -17,8 +17,10 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.tadris.fitness.announcement;
+package de.tadris.fitness.recording.announcement;
 
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothHeadset;
 import android.content.Context;
 import android.media.AudioManager;
 import android.speech.tts.TextToSpeech;
@@ -115,7 +117,7 @@ public class VoiceAnnouncements {
             // Cannot speak
             return;
         }
-        if (currentMode == AnnouncementMode.HEADPHONES && !audioManager.isWiredHeadsetOn()) {
+        if (currentMode == AnnouncementMode.HEADPHONES && !isHeadsetOn()) {
             // Not allowed to speak
             return;
         }
@@ -123,6 +125,14 @@ public class VoiceAnnouncements {
         textToSpeech.speak(text, TextToSpeech.QUEUE_ADD, null, "announcement" + (++speakId));
     }
 
+    private boolean isHeadsetOn() {
+        BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        boolean bluetoothHeadsetConnected = mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()
+                && mBluetoothAdapter.getProfileConnectionState(BluetoothHeadset.HEADSET) == BluetoothHeadset.STATE_CONNECTED;
+
+        return audioManager.isWiredHeadsetOn() || bluetoothHeadsetConnected;
+    }
+
     public void destroy() {
         textToSpeech.shutdown();
     }

app/src/main/java/de/tadris/fitness/util/AltitudeCorrection.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.util;
+
+import android.content.Context;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import de.tadris.fitness.R;
+
+/**
+ * This class has the task to correct the altitude.
+ * <p>
+ * In Germany or UK for example the GPS height differs
+ * roughly 50m from the real elevation over sea level.
+ * <p>
+ * The altitude given by GPS is the altitude over the WGS84 reference ellipsoid
+ * but we want the height over the sea level. That's why we have to correct the height.
+ * Luckily I found a file containing the corrections for all places around the world.
+ * <p>
+ * The geoids.csv is from https://github.com/vectorstofinal/geoid_heights licensed under MIT
+ */
+public class AltitudeCorrection {
+
+    private Context context;
+    private int latitude, longitude;
+    private double offset; // Basically how much higher the sea-level than the ellipsoid is
+
+    public AltitudeCorrection(Context context, int latitude, int longitude) throws IOException {
+        this.context = context;
+        this.latitude = latitude;
+        this.longitude = longitude;
+        findOffset();
+    }
+
+    private void findOffset() throws IOException {
+        InputStream inputStream = context.getResources().openRawResource(R.raw.geoids);
+        List<String> list = IOUtils.readLines(inputStream, StandardCharsets.UTF_8);
+        for (String line : list) {
+            String[] data = line.split(",");
+            int lat = Integer.parseInt(data[0]);
+            int lon = Integer.parseInt(data[1]);
+            double offset = Double.parseDouble(data[2]);
+            if (lat == this.latitude && lon == this.longitude) {
+                this.offset = offset;
+                return;
+            }
+        }
+    }
+
+    public double getHeightOverSeaLevel(double heightOverEllipsoid) {
+        return heightOverEllipsoid - offset;
+    }
+}

app/src/main/java/de/tadris/fitness/util/CalorieCalculator.java

@@ -20,6 +20,7 @@
 package de.tadris.fitness.util;
 
 import de.tadris.fitness.data.Workout;
+import de.tadris.fitness.data.WorkoutType;
 
 public class CalorieCalculator {
 
@@ -47,15 +48,14 @@ public class CalorieCalculator {
      */
     private static double getMET(Workout workout) {
         double speedInKmh= workout.avgSpeed * 3.6;
-        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_RUNNING) || workout.workoutType.equals(Workout.WORKOUT_TYPE_HIKING)){
-            // This is a linear graph based on the website linked above
+        WorkoutType type = workout.getWorkoutType();
+        if (type == WorkoutType.RUNNING || type == WorkoutType.HIKING) {
             return Math.max(1.5, speedInKmh*1.117 - 2.1906);
         }
-        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_CYCLING)){
-            // This is a linear graph based on the website linked above
+        if (type == WorkoutType.CYCLING) {
             return Math.max(3, (speedInKmh-10) / 1.5);
         }
-        return -1;
+        return 0;
     }
 
 }

app/src/main/java/de/tadris/fitness/util/FitoTrackThemes.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+ *
+ * This file is part of FitoTrack
+ *
+ * FitoTrack is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     FitoTrack is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.tadris.fitness.util;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.StyleRes;
+
+import de.tadris.fitness.R;
+import de.tadris.fitness.data.WorkoutType;
+
+public class FitoTrackThemes {
+
+    private static final int THEME_SETTING_LIGHT = 0;
+    private static final int THEME_SETTING_DARK = 1;
+
+    private Context context;
+
+    public FitoTrackThemes(Context context) {
+        this.context = context;
+    }
+
+    @StyleRes
+    public int getDefaultTheme() {
+        if (shouldUseLightMode()) {
+            return R.style.AppTheme;
+        } else {
+            return R.style.AppThemeDark;
+        }
+    }
+
+    @StyleRes
+    public int getWorkoutTypeTheme(WorkoutType type) {
+        if (shouldUseLightMode()) {
+            return type.lightTheme;
+        } else {
+            return type.darkTheme;
+        }
+    }
+
+    private boolean shouldUseLightMode() {
+        switch (getThemeSetting()) {
+            default:
+            case THEME_SETTING_LIGHT:
+                return true;
+            case THEME_SETTING_DARK:
+                return false;
+        }
+    }
+
+    private int getThemeSetting() {
+        String setting = PreferenceManager.getDefaultSharedPreferences(context).getString("themeSetting", String.valueOf(THEME_SETTING_LIGHT));
+        assert setting != null;
+        return Integer.parseInt(setting);
+    }
+
+}

app/src/main/java/de/tadris/fitness/util/ThemeManager.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
- *
- * This file is part of FitoTrack
- *
- * FitoTrack is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     FitoTrack is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.tadris.fitness.util;
-
-import de.tadris.fitness.R;
-import de.tadris.fitness.data.Workout;
-
-public class ThemeManager {
-
-    public static int getThemeByWorkoutType(String type){
-        switch (type){
-            case Workout.WORKOUT_TYPE_RUNNING: return R.style.Running;
-            case Workout.WORKOUT_TYPE_CYCLING: return R.style.Bicycling;
-            case Workout.WORKOUT_TYPE_HIKING:  return R.style.Hiking;
-            default: return R.style.AppTheme;
-        }
-    }
-
-    public static int getThemeByWorkout(Workout workout){
-        return getThemeByWorkoutType(workout.workoutType);
-    }
-
-}
-

app/src/main/java/de/tadris/fitness/util/WorkoutTypeCalculator.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
- *
- * This file is part of FitoTrack
- *
- * FitoTrack is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     FitoTrack is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.tadris.fitness.util;
-
-import de.tadris.fitness.R;
-import de.tadris.fitness.data.Workout;
-
-public class WorkoutTypeCalculator {
-
-    public static int getType(Workout workout){
-        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_RUNNING)){
-            if(workout.avgSpeed < 1.9){
-                return R.string.workoutTypeWalking;
-            }else if(workout.avgSpeed < 2.7){
-                return R.string.workoutTypeJogging;
-            }else{
-                return R.string.workoutTypeRunning;
-            }
-        }
-        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_CYCLING)){
-            return R.string.workoutTypeCycling;
-        }
-        if(workout.workoutType.equals(Workout.WORKOUT_TYPE_HIKING)){
-            return R.string.workoutTypeHiking;
-        }
-        return R.string.workoutTypeUnknown;
-    }
-
-}

app/src/main/java/de/tadris/fitness/util/gpx/GpxExporter.java

@@ -61,7 +61,7 @@ public class GpxExporter {
         track.cmt= workout.comment;
         track.desc= workout.comment;
         track.src= "FitoTrack";
-        track.type= workout.workoutType;
+        track.type = workout.getWorkoutType().id;
         track.trkseg= new ArrayList<>();
 
         TrackSegment segment= new TrackSegment();

app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java

@@ -32,7 +32,6 @@ import java.util.Date;
 
 import de.tadris.fitness.R;
 import de.tadris.fitness.data.Workout;
-import de.tadris.fitness.util.WorkoutTypeCalculator;
 import de.tadris.fitness.util.unit.UnitUtils;
 
 public class WorkoutAdapter extends RecyclerView.Adapter<WorkoutAdapter.WorkoutViewHolder>{
@@ -78,7 +77,7 @@ public class WorkoutAdapter extends RecyclerView.Adapter<WorkoutAdapter.WorkoutV
     public void onBindViewHolder(WorkoutViewHolder holder, final int position) {
         Workout workout= workouts[position];
         holder.dateText.setText(SimpleDateFormat.getDateTimeInstance().format(new Date(workout.start)));
-        holder.typeText.setText(WorkoutTypeCalculator.getType(workout));
+        holder.typeText.setText(workout.getWorkoutType().title);
         if(workout.comment != null){
             if(workout.comment.length() > 33){
                 holder.commentText.setText(workout.comment.substring(0, 30) + "...");

app/src/main/res/layout/activity_enter_workout.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.EnterWorkoutActivity">
+
+    <LinearLayout
+        android:id="@+id/enterWorkoutRoot"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="15dp" />
+</ScrollView>

app/src/main/res/layout/activity_list_workouts.xml

@@ -72,6 +72,16 @@
             app:fab_label="@string/workoutTypeCycling"
             app:fab_size="normal" />
 
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/workoutListEnter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_add_white"
+            app:fab_colorNormal="@color/colorPrimary"
+            app:fab_colorPressed="@color/colorPrimaryDark"
+            app:fab_label="@string/enterWorkout"
+            app:fab_size="normal" />
+
     </com.github.clans.fab.FloatingActionMenu>
 
 

app/src/main/res/layout/activity_record_workout.xml

@@ -55,6 +55,15 @@
             android:text="@string/gps"
             android:textColor="@android:color/transparent" />
 
+        <TextView
+            android:id="@+id/recordMapAttribution"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center"
+            android:layout_margin="5dp"
+            android:textColor="@color/textColorLight"
+            android:text="@string/OpenStreetMapAttribution" />
+
 
     </FrameLayout>
 
@@ -74,7 +83,7 @@
             android:fontFamily="sans-serif-black"
             android:text="0:44:08"
             android:textAlignment="center"
-            android:textColor="@android:color/black"
+            android:textColor="?android:textColorPrimary"
             android:textSize="30sp"
             android:textStyle="bold" />
 
@@ -116,7 +125,7 @@
                     android:text="2,06 km"
                     android:textAlignment="center"
                     android:textAllCaps="false"
-                    android:textColor="@android:color/black"
+                    android:textColor="?android:textColorPrimary"
                     android:textSize="24sp"
                     android:textStyle="bold" />
 
@@ -136,7 +145,7 @@
                     android:text="30 kcal"
                     android:textAlignment="center"
                     android:textAllCaps="false"
-                    android:textColor="@android:color/black"
+                    android:textColor="?android:textColorPrimary"
                     android:textSize="24sp"
                     android:textStyle="bold" />
 
@@ -167,7 +176,7 @@
                     android:text="7 km/h"
                     android:textAlignment="center"
                     android:textAllCaps="false"
-                    android:textColor="@android:color/black"
+                    android:textColor="?android:textColorPrimary"
                     android:textSize="24sp"
                     android:textStyle="bold" />
 
@@ -187,7 +196,7 @@
                     android:text="30 kcal"
                     android:textAlignment="center"
                     android:textAllCaps="false"
-                    android:textColor="@android:color/black"
+                    android:textColor="?android:textColorPrimary"
                     android:textSize="24sp"
                     android:textStyle="bold" />
 

app/src/main/res/layout/dialog_duration_picker.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <NumberPicker
+        android:id="@+id/durationPickerHours"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="30dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=":" />
+
+    <NumberPicker
+        android:id="@+id/durationPickerMinutes"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="30dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=":" />
+
+    <NumberPicker
+        android:id="@+id/durationPickerSeconds"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="30dp" />
+
+</LinearLayout>

app/src/main/res/layout/enter_workout_line.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginLeft="-15dp"
+    android:layout_marginRight="-15dp"
+    android:gravity="center_vertical"
+    android:background="?android:selectableItemBackground">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp">
+
+        <TextView
+            android:id="@+id/lineKey"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+        <LinearLayout
+            android:id="@+id/lineViewRoot"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@+id/lineValue"
+            android:layout_toEndOf="@+id/lineKey"
+            android:layout_centerVertical="true"
+            android:gravity="right|center_vertical"
+            android:orientation="horizontal">
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/lineValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:textAlignment="textEnd"
+            android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:dividerHorizontal" />
+
+</LinearLayout>

app/src/main/res/layout/select_dialog_singlechoice_material.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawableStart="?android:attr/listChoiceIndicatorSingle"
+    android:drawablePadding="20dp"
+    android:ellipsize="marquee"
+    android:gravity="center_vertical"
+    android:minHeight="48dip"
+    android:paddingStart="20dp"
+    android:paddingEnd="24dp"
+    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+    android:textColor="?android:attr/textColorAlertDialogListItem" />

app/src/main/res/layout/show_entry.xml

@@ -41,7 +41,7 @@
             android:fontFamily="sans-serif-black"
             android:text=""
             android:textAllCaps="true"
-            android:textColor="@color/textColorLight"
+            android:textColor="?android:textColorSecondary"
             android:textStyle="bold" />
 
         <TextView
@@ -51,7 +51,7 @@
             android:fontFamily="sans-serif-black"
             android:text=""
             android:textAllCaps="false"
-            android:textColor="@color/textLighterBlack"
+            android:textColor="?android:textColorPrimary"
             android:textSize="24sp"
             android:textStyle="bold" />
     </LinearLayout>
@@ -73,7 +73,7 @@
             android:fontFamily="sans-serif-black"
             android:text=""
             android:textAllCaps="true"
-            android:textColor="@color/textColorLight"
+            android:textColor="?android:textColorSecondary"
             android:textStyle="bold" />
 
         <TextView
@@ -83,7 +83,7 @@
             android:fontFamily="sans-serif-black"
             android:text=""
             android:textAllCaps="false"
-            android:textColor="@color/textLighterBlack"
+            android:textColor="?android:textColorPrimary"
             android:textSize="24sp"
             android:textStyle="bold" />
 

app/src/main/res/layout/view_workout.xml

@@ -36,7 +36,7 @@
             android:layout_weight="1"
             android:text="Aug 19, 2019 20:15"
             android:textAllCaps="true"
-            android:textColor="@color/textLighterBlack"
+            android:textColor="?android:textColorPrimary"
             android:textSize="18sp"
             android:textStyle="bold" />
 
@@ -80,7 +80,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="27min"
-                android:textColor="@color/textLighterBlack"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="30sp" />
         </LinearLayout>
 

app/src/main/res/menu/enter_workout_menu.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/actionEnterWorkoutAdd"
+        android:icon="@drawable/ic_add_white"
+        android:showAsAction="always"
+        android:title="@string/save" />
+</menu>

app/src/main/res/values-de/strings.xml

@@ -129,4 +129,20 @@
     <string name="savedToDownloads">Im Downloadordner gespeichert</string>
     <string name="savingFailed">Speichern fehlgeschlagen</string>
     <string name="share">Teilen</string>
+    <string name="timeMinuteShort">min</string>
+    <string name="timeHourShort">h</string>
+    <string name="timeSecondsShort">s</string>
+    <string name="errorEnterValidNumber">Gebe eine gültige Zahl ein</string>
+    <string name="errorWorkoutAddFuture">Das Workout kann sich nicht in der Zukunft befinden</string>
+    <string name="errorEnterValidDuration">Gebe eine gültige Dauer ein</string>
+    <string name="workoutEdited">Dieses Workout wurde bearbeitet.</string>
+    <string name="workoutTypeOther">Anderes</string>
+    <string name="type">Typ</string>
+    <string name="enterWorkout">Workout eingeben</string>
+    <string name="setDuration">Dauer setzen</string>
+    <string name="info">Info</string>
+    <string name="OpenStreetMapAttribution">© OpenStreetMap Mitwirkende</string>
+    <string name="theme">Thema</string>
+    <string name="hintRestart">Bitte die App neustarten, damit die Änderungen wirksam werden</string>
+    <string name="noComment">Kein Kommentar</string>
 </resources>

app/src/main/res/values-de/theme_setting.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_theme_setting">
+        <item>Hell</item>
+        <item>Dunkel</item>
+    </string-array>
+
+</resources>

app/src/main/res/values-hu/announcement_mode.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Balázs Úr <balazs@urbalazs.hu>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_announcement_mode">
+        <item>Mindig</item>
+        <item>Csak fülhallgatón</item>
+    </string-array>
+
+</resources>

app/src/main/res/values-hu/map_layers.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Balázs Úr <balazs@urbalazs.hu>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_map_layers">
+        <item>Mapnik\nAlapértelmezett OSM térképstílus</item>
+        <item>Humanitarian\nTiszta térkép, de néha nem érhető el</item>
+        <item>Outdoors\nKorlátozott hozzáférés</item>
+        <item>Cyclemap\nKorlátozott hozzáférés</item>
+    </string-array>
+
+</resources>

app/src/main/res/values-hu/osm_track_visibility.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Balázs Úr <balazs@urbalazs.hu>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string-array name="osm_track_visibility">
+        <item>Azonosítható</item>
+        <item>Követhető</item>
+        <item>Személyes</item>
+    </string-array>
+</resources>

app/src/main/res/values-hu/strings.xml

@@ -0,0 +1,179 @@
+<!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Balázs Úr <balazs@urbalazs.hu>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string name="app_name">FitoTrack</string>
+    <string name="workout_add">Hozzáadás</string>
+    <string name="stop">Leállítás</string>
+    <string name="delete">Törlés</string>
+    <string name="exporting">Exportálás</string>
+
+    <string name="error">Hiba</string>
+    <string name="errorGpxExportFailed">A GPX exportálása nem sikerült.</string>
+    <string name="errorExportFailed">Az adatok exportálása nem sikerült.</string>
+    <string name="errorImportFailed">Az adatok importálása nem sikerült.</string>
+    <string name="shareFile">Fájl megosztása</string>
+    <string name="initialising">Előkészítés</string>
+    <string name="preferences">Beállítások</string>
+    <string name="workouts">Edzések</string>
+    <string name="locationData">Hely adatai</string>
+    <string name="converting">Átalakítás</string>
+    <string name="finished">Befejeződött</string>
+    <string name="loadingFile">Fájl betöltése</string>
+    <string name="chooseBackupFile">Biztonsági mentés fájl kiválasztása</string>
+
+    <string name="importBackupMessage">FIGYELMEZTETÉS: Az alkalmazásban található összes meglévő adat törölve lesz. Ha nem szeretné elveszíteni azokat, akkor először készítsen egy másik biztonsági mentést. Biztosan vissza szeretné állítani ezt a biztonsági mentést?</string>
+    <string name="restore">Visszaállítás</string>
+    <string name="backup">Biztonsági mentés</string>
+
+    <string name="pref_ringtone_silent">Csendes</string>
+
+    <string name="setPreferencesTitle">Beállítások megadása</string>
+    <string name="setPreferencesMessage">Beállíthatja az előnyben részesített mértékegységrendszert és a súlyát a beállításokban.</string>
+
+    <string name="timeMinuteSingular">Perc</string>
+    <string name="timeMinutePlural">Perc</string>
+    <string name="timeMinuteShort">p</string>
+    <string name="timeHourSingular">Óra</string>
+    <string name="timeHourPlural">Óra</string>
+    <string name="timeHourShort">ó</string>
+    <string name="timeSecondsShort">mp</string>
+    <string name="and">és</string>
+
+    <string name="errorEnterValidNumber">Adjon meg egy érvényes számot</string>
+    <string name="errorWorkoutAddFuture">Az edzés nem lehet a jövőben</string>
+    <string name="errorEnterValidDuration">Adjon meg egy érvényes időtartamot</string>
+
+    <string name="announcementGPSStatus">GPS állapota</string>
+
+    <string name="voiceAnnouncementsTitle">Hangos közlemények</string>
+
+    <string name="pref_voice_announcements_summary">Hangutasítások beállítása, amely tájékoztatást nyújt az edzés során</string>
+
+    <string name="pref_announcements_config_title">Közlemények aktiválója</string>
+    <string name="pref_announcements_config_summary">A hangos közlemények közti idő és távolság kiválasztása</string>
+
+    <string name="pref_announcements_content">A közlemények tartalma</string>
+
+    <string name="gpsLost">A GPS-jel elveszett</string>
+    <string name="gpsFound">A GPS-jel megjött</string>
+
+    <string name="workoutTime">Idő</string>
+    <string name="workoutDate">Dátum</string>
+    <string name="workoutDuration">Időtartam</string>
+    <string name="workoutPauseDuration">Szünet időtartama</string>
+    <string name="workoutStartTime">Kezdés ideje</string>
+    <string name="workoutEndTime">Befejezés ideje</string>
+    <string name="workoutDistance">Távolság</string>
+    <string name="workoutPace">Gyorsaság</string>
+    <string name="workoutRoute">Útvonal</string>
+    <string name="workoutSpeed">Sebesség</string>
+    <string name="workoutAvgSpeedShort">Átlagsebesség</string>
+    <string name="workoutAvgSpeedLong">Átlagsebesség</string>
+    <string name="workoutTopSpeed">Legnagyobb sebesség</string>
+    <string name="workoutBurnedEnergy">Elégetett energia</string>
+    <string name="workoutTotalEnergy">Összes energia</string>
+    <string name="workoutEnergyConsumption">Energiafogyasztás</string>
+    <string name="workoutEdited">Ez az edzés szerkesztve lett.</string>
+    <string name="uploading">Feltöltés</string>
+    <string name="enterVerificationCode">Hitelesítési kód megadása</string>
+    <string name="authenticationFailed">A hitelesítés sikertelen.</string>
+    <string name="upload">Feltöltés</string>
+    <string name="uploadSuccessful">A feltöltés sikeres</string>
+    <string name="uploadFailed">A feltöltés sikertelen</string>
+    <string name="uploadFailedOsmNotAuthorized">Nincs felhatalmazva, próbálja újra</string>
+
+    <string name="workoutAscent">Emelkedés</string>
+    <string name="workoutDescent">Ereszkedés</string>
+
+    <string name="height">Magasság</string>
+
+
+    <string name="workoutTypeRunning">Futás</string>
+    <string name="workoutTypeWalking">Séta</string>
+    <string name="workoutTypeJogging">Kocogás</string>
+    <string name="workoutTypeCycling">Kerékpározás</string>
+    <string name="workoutTypeHiking">Túrázás</string>
+    <string name="workoutTypeOther">Egyéb</string>
+    <string name="workoutTypeUnknown">Ismeretlen</string>
+    <string name="type">Típus</string>
+
+    <string name="enterWorkout">Edzés megadása</string>
+
+    <string name="setDuration">Időtartam beállítása</string>
+
+
+    <string name="recordWorkout">Edzés rögzítése</string>
+
+    <string name="noGpsTitle">GPS letiltva</string>
+    <string name="noGpsMessage">Engedélyezze a GPS használatát az edzés követéséhez.</string>
+    <string name="enable">Engedélyezés</string>
+
+    <string name="comment">Megjegyzés</string>
+    <string name="enterComment">Megjegyzés megadása</string>
+    <string name="okay">Rendben</string>
+
+    <string name="stopRecordingQuestion">Leállítja a rögzítést?</string>
+    <string name="stopRecordingQuestionMessage">Valóban le szeretné állítani a rögzítést?</string>
+
+    <!-- leave the underscore because "continue" is a java command -->
+    <string name="continue_">Folytatás</string>
+
+    <string name="deleteWorkout">Edzés törlése</string>
+    <string name="deleteWorkoutMessage">Valóban törölni szeretné az edzést?</string>
+
+    <string name="trackerRunning">A követő fut</string>
+    <string name="trackerRunningMessage">Az edzése rögzítés alatt van</string>
+
+    <string name="trackingInfo">Követési információk</string>
+    <string name="trackingInfoDescription">Információk a futó követőről</string>
+
+    <string name="cancel">Mégse</string>
+    <string name="exportAsGpxFile">Exportálás GPX-fájlként</string>
+    <string name="pref_weight">Az Ön súlya</string>
+    <string name="pref_weight_summary">Az Ön súlya az elégetett kalóriák kiszámításához szükséges</string>
+    <string name="pref_unit_system">Előnyben részesített mértékegységrendszer</string>
+    <string name="settings">Beállítások</string>
+    <string name="exportData">Adatok exportálása</string>
+    <string name="exportDataSummary">Ezzel biztonsági mentést készíthet az összes edzésadatról</string>
+    <string name="importBackup">Adatok biztonsági mentésének importálása</string>
+    <string name="importBackupSummary">Egy elkészített biztonsági mentés visszatöltése</string>
+    <string name="gps">GPS</string>
+    <string name="data">Adatok</string>
+    <string name="mapStyle">Térképstílus</string>
+    <string name="waiting_gps">Várakozás a GPS-re</string>
+    <string name="actionUploadToOSM">Feltöltés az OSM-re</string>
+    <string name="cut">Az első és utolsó 300 méter levágása</string>
+    <string name="trackVisibilityPref">Nyomvonal láthatósága</string>
+    <string name="description">Leírás</string>
+    <string name="ttsNotAvailable">A szöveg hanggá alakítása nem érhető el</string>
+    <string name="action_edit_comment">Megjegyzés szerkesztése</string>
+    <string name="pref_announcement_mode">Közlemény módja</string>
+
+    <string name="save">Mentés</string>
+    <string name="share">Megosztás</string>
+    <string name="savedToDownloads">Elmentve a letöltésekbe</string>
+    <string name="savingFailed">A mentés sikertelen</string>
+    <string name="info">Információ</string>
+    <string name="OpenStreetMapAttribution">© OpenStreetMap közreműködők</string>
+    <string name="theme">Téma</string>
+    <string name="hintRestart">Indítsa újra az alkalmazást a változtatások alkalmazásához</string>
+    <string name="noComment">Nincs megjegyzés</string>
+</resources>

app/src/main/res/values-hu/theme_setting.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Balázs Úr <balazs@urbalazs.hu>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_theme_setting">
+        <item>Világos</item>
+        <item>Sötét</item>
+    </string-array>
+
+</resources>

app/src/main/res/values-hu/unit_systems.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Balázs Úr <balazs@urbalazs.hu>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_unit_systems">
+        <item>Metrikus</item>
+        <item>Metrikus m/s értékkel</item>
+        <item>Birodalmi</item>
+        <item>Birodalmi méterrel</item>
+    </string-array>
+
+</resources>

app/src/main/res/values-nl/announcement_mode.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_announcement_mode">
+        <item>Altijd</item>
+        <item>Alleen met koptelefoon</item>
+    </string-array>
+
+</resources>

app/src/main/res/values-nl/map_layers.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_map_layers">
+        <item>Mapnik\nStandaard OSM Kaartweergave</item>
+        <item>Humanitarian\nMinimalistische kaart (soms niet beschikbaar)</item>
+        <item>Outdoors\nBeperkte toegang</item>
+        <item>Cyclemap\nBeperkte toegang</item>
+    </string-array>
+
+</resources>

app/src/main/res/values-nl/osm_track_visibility.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string-array name="osm_track_visibility">
+        <item>Zichtbaar</item>
+        <item>Traceerbaar</item>
+        <item>Onzichtbaar</item>
+    </string-array>
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -0,0 +1,158 @@
+<!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <string name="app_name">FitoTrack</string>
+    <string name="workout_add">Toevoegen</string>
+    <string name="stop">Stop</string>
+    <string name="delete">Verwijderen</string>
+    <string name="exporting">Exporteren</string>
+
+    <string name="error">Fout</string>
+    <string name="errorGpxExportFailed">De GPX export is mislukt.</string>
+    <string name="errorExportFailed">Data export is mislukt.</string>
+    <string name="errorImportFailed">Data import is mislukt.</string>
+    <string name="shareFile">Bestand delen</string>
+    <string name="initialising">Initialiseren</string>
+    <string name="preferences">Voorkeuren</string>
+    <string name="workouts">Trainingen</string>
+    <string name="locationData">Locatie data</string>
+    <string name="converting">Converteren</string>
+    <string name="finished">Gereed</string>
+    <string name="loadingFile">Bestand laden</string>
+    <string name="chooseBackupFile">Kies back-up bestand</string>
+
+    <string name="importBackupMessage">WAARSCHUWING: Al je huidige gegevens in de app worden verwijderd. Als je deze niet wilt verliezen, maak dan vooraf een back-up. Weet je zeker dat je de back-up wilt herstellen?</string>
+    <string name="restore">Herstellen</string>
+    <string name="backup">Back-up</string>
+
+    <string name="pref_ringtone_silent">Stil</string>
+
+    <string name="setPreferencesTitle">Voorkeuren opgeven</string>
+    <string name="setPreferencesMessage">Geef je voorkeur voor het eenheidssysteem en je gewicht op bij instellingen.</string>
+
+    <string name="timeMinuteSingular">Minuut</string>
+    <string name="timeMinutePlural">Minuten</string>
+    <string name="timeHourSingular">Uur</string>
+    <string name="timeHourPlural">Uren</string>
+    <string name="and">en</string>
+
+    <string name="announcementGPSStatus">GPS status</string>
+
+    <string name="voiceAnnouncementsTitle">Gesproken aanwijzingen</string>
+
+    <string name="pref_voice_announcements_summary">Configureer de stembesturing voor tijdens de training</string>
+
+    <string name="pref_announcements_config_title">Trigger voor gesproken aanwijzingen</string>
+    <string name="pref_announcements_config_summary">Kies de tijd en afstand tussen de gesproken aanwijzingen</string>
+
+    <string name="pref_announcements_content">Inhoud van de gesproken aanwijzingen</string>
+
+    <string name="gpsLost">GPS signaal verloren</string>
+    <string name="gpsFound">GPS signaal gevonden</string>
+
+    <string name="workoutTime">Tijd</string>
+    <string name="workoutDate">Datum</string>
+    <string name="workoutDuration">Tijdsduur</string>
+    <string name="workoutPauseDuration">Pauze tijd</string>
+    <string name="workoutStartTime">Start Tijd</string>
+    <string name="workoutEndTime">Eind Tijd</string>
+    <string name="workoutDistance">Afstand</string>
+    <string name="workoutPace">Tempo</string>
+    <string name="workoutRoute">Route</string>
+    <string name="workoutSpeed">Snelheid</string>
+    <string name="workoutAvgSpeedShort">Gem. Snelheid</string>
+    <string name="workoutAvgSpeedLong">Gemiddelde Snelheid</string>
+    <string name="workoutTopSpeed">Topsnelheid</string>
+    <string name="workoutBurnedEnergy">Energieverbranding</string>
+    <string name="workoutTotalEnergy">Totale Energie</string>
+    <string name="workoutEnergyConsumption">Energieverbruik</string>
+    <string name="uploading">Uploaden</string>
+    <string name="enterVerificationCode">Verificatiecode invoeren</string>
+    <string name="authenticationFailed">Authenticatie mislukt.</string>
+    <string name="upload">Uploaden</string>
+    <string name="uploadSuccessful">Uploaden gelukt</string>
+    <string name="uploadFailed">Uploaden mislukt</string>
+    <string name="uploadFailedOsmNotAuthorized">Niet geautoriseerd, probeer opnieuw</string>
+
+    <string name="workoutAscent">Oplopend</string>
+    <string name="workoutDescent">Aflopend</string>
+
+    <string name="height">Hoogte</string>
+
+
+    <string name="workoutTypeRunning">Hardlopen</string>
+    <string name="workoutTypeWalking">Wandelen</string>
+    <string name="workoutTypeJogging">Joggen</string>
+    <string name="workoutTypeCycling">Fietsen</string>
+    <string name="workoutTypeHiking">Bergwandelen</string>
+    <string name="workoutTypeUnknown">Onbekend</string>
+
+    <string name="recordWorkout">Training opnemen</string>
+
+    <string name="noGpsTitle">GPS uitgeschakeld</string>
+    <string name="noGpsMessage">Schakel GPS in om je training op te nemen.</string>
+    <string name="enable">Inschakelen</string>
+
+    <string name="comment">Opmerking</string>
+    <string name="enterComment">Opmerking invoeren</string>
+    <string name="okay">Okay</string>
+
+    <string name="stopRecordingQuestion">Stop Opname?</string>
+    <string name="stopRecordingQuestionMessage">Weet je zeker dat je de opname wilt stoppen?</string>
+
+    <!-- leave the underscore because "continue" is a java command -->
+    <string name="continue_">Doorgaan</string>
+
+    <string name="deleteWorkout">Training verwijderen</string>
+    <string name="deleteWorkoutMessage">Weet je zeker dat je de training wilt verwijderen?</string>
+
+    <string name="trackerRunning">Tracker loopt</string>
+    <string name="trackerRunningMessage">Je training wordt opgenomen</string>
+
+    <string name="trackingInfo">Tracking info</string>
+    <string name="trackingInfoDescription">Info over de lopende opname</string>
+
+    <string name="cancel">Annuleren</string>
+    <string name="exportAsGpxFile">Exporteren als GPX bestand</string>
+    <string name="pref_weight">Je gewicht</string>
+    <string name="pref_weight_summary">Je gewicht is nodig om de juiste calorieverbranding te berekening</string>
+    <string name="pref_unit_system">Voorkeur van eenheden</string>
+    <string name="settings">Instellingen</string>
+    <string name="exportData">Exporteer Data</string>
+    <string name="exportDataSummary">Maakt een back-up van alle trainingsdata</string>
+    <string name="importBackup">Importeer data back-up</string>
+    <string name="importBackupSummary">Herstel een gemaakte back-up</string>
+    <string name="gps">GPS</string>
+    <string name="data">Data</string>
+    <string name="mapStyle">Kaartstijl</string>
+    <string name="waiting_gps">Wacht op GPS</string>
+    <string name="actionUploadToOSM">Upload naar OSM</string>
+    <string name="cut">Knip de eerste/laatste 300 meter</string>
+    <string name="trackVisibilityPref">Zichtbaarheid opname</string>
+    <string name="description">Beschrijving</string>
+    <string name="ttsNotAvailable">Tekst-naar-spraak is niet beschikbaar</string>
+    <string name="action_edit_comment">Bewerk opmerking</string>
+    <string name="pref_announcement_mode">Aankondigingsmodus</string>
+
+    <string name="save">Opslaan</string>
+    <string name="share">Delen</string>
+    <string name="savedToDownloads">Opgeslagen in Downloads</string>
+    <string name="savingFailed">Opslaan mislukt</string>
+</resources>

app/src/main/res/values-nl/unit_systems.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_unit_systems">
+        <item>Metrisch</item>
+        <item>Metrisch in m/s</item>
+        <item>Imperial</item>
+        <item>Imperial in meters</item>
+    </string-array>
+
+</resources>

app/src/main/res/values/colors.xml

@@ -27,6 +27,9 @@
     <color name="colorPrimaryBicycling">#523220</color>
     <color name="colorPrimaryDarkBicycling">#462A1D</color>
 
+    <color name="colorPrimaryBicyclingLighter">#6E422A</color>
+    <color name="colorPrimaryDarkBicyclingLighter">#5A3625</color>
+
     <color name="colorAccent">#4CAF50</color>
     <color name="colorAccentDark">#2E7D32</color>
 
@@ -34,5 +37,6 @@
     <color name="colorPrimaryDarkHiking">#007267</color>
 
     <color name="textLighterBlack">#C8000000</color>
+    <color name="textDarkerWhite">#C8FFFFFF</color>
     <color name="textColorLight">#C8414141</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -49,10 +49,17 @@
 
     <string name="timeMinuteSingular">Minute</string>
     <string name="timeMinutePlural">Minutes</string>
+    <string name="timeMinuteShort">min</string>
     <string name="timeHourSingular">Hour</string>
     <string name="timeHourPlural">Hours</string>
+    <string name="timeHourShort">h</string>
+    <string name="timeSecondsShort">s</string>
     <string name="and">and</string>
 
+    <string name="errorEnterValidNumber">Enter a valid number</string>
+    <string name="errorWorkoutAddFuture">The workout cannot be in the future</string>
+    <string name="errorEnterValidDuration">Enter a valid duration</string>
+
     <string name="announcementGPSStatus">GPS Status</string>
 
     <string name="voiceAnnouncementsTitle">Voice Announcements</string>
@@ -83,6 +90,7 @@
     <string name="workoutBurnedEnergy">Burned Energy</string>
     <string name="workoutTotalEnergy">Total Energy</string>
     <string name="workoutEnergyConsumption">Energy Consumption</string>
+    <string name="workoutEdited">This workout has been edited.</string>
     <string name="uploading">Uploading</string>
     <string name="enterVerificationCode">Enter Verification Code</string>
     <string name="authenticationFailed">Authentication failed.</string>
@@ -102,7 +110,14 @@
     <string name="workoutTypeJogging">Jogging</string>
     <string name="workoutTypeCycling">Cycling</string>
     <string name="workoutTypeHiking">Hiking</string>
+    <string name="workoutTypeOther">Other</string>
     <string name="workoutTypeUnknown">Unknown</string>
+    <string name="type">Type</string>
+
+    <string name="enterWorkout">Enter Workout</string>
+
+    <string name="setDuration">Set Duration</string>
+
 
     <string name="recordWorkout">Record Workout</string>
 
@@ -155,4 +170,9 @@
     <string name="share">Share</string>
     <string name="savedToDownloads">Saved to Downloads</string>
     <string name="savingFailed">Saving failed</string>
+    <string name="info">Info</string>
+    <string name="OpenStreetMapAttribution">© OpenStreetMap contributors</string>
+    <string name="theme">Theme</string>
+    <string name="hintRestart">Please restart the app to apply changes</string>
+    <string name="noComment">No comment</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
   ~
   ~ This file is part of FitoTrack
   ~
@@ -20,42 +20,54 @@
 <resources>
 
     <style name="AppThemeNoActionbar" parent="android:Theme.Material.Light.NoActionBar">
-        <!-- Customize your theme here. -->
         <item name="android:colorPrimary">@color/colorPrimary</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:colorAccent">@color/colorAccent</item>
-
     </style>
 
-    <!-- Base application theme. -->
     <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
-        <!-- Custom<color name="colorPrimaryBicycling">#523220</color>
-    <color name="colorPrimaryDarkBicycling">#462A1D</color>ize your theme here. -->
         <item name="android:colorPrimary">@color/colorPrimary</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:colorAccent">@color/colorAccent</item>
-
     </style>
 
-    <!-- Base application theme. -->
     <style name="Running" parent="AppTheme">
-        <!-- Customize your theme here. -->
         <item name="android:colorPrimary">@color/colorPrimaryRunning</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDarkRunning</item>
     </style>
 
-    <!-- Base application theme. -->
     <style name="Bicycling" parent="AppTheme">
-        <!-- Customize your theme here. -->
         <item name="android:colorPrimary">@color/colorPrimaryBicycling</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDarkBicycling</item>
     </style>
 
-    <!-- Base application theme. -->
     <style name="Hiking" parent="AppTheme">
-        <!-- Customize your theme here. -->
         <item name="android:colorPrimary">@color/colorPrimaryHiking</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDarkHiking</item>
     </style>
 
+
+    <style name="AppThemeDark" parent="android:Theme.Material">
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
+    <style name="RunningDark" parent="AppThemeDark">
+        <item name="android:colorPrimary">@color/colorPrimaryRunning</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDarkRunning</item>
+    </style>
+
+    <style name="BicyclingDark" parent="AppThemeDark">
+        <item name="android:colorPrimary">@color/colorPrimaryBicycling</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDarkBicycling</item>
+    </style>
+
+    <style name="HikingDark" parent="AppThemeDark">
+        <item name="android:colorPrimary">@color/colorPrimaryHiking</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDarkHiking</item>
+    </style>
+
+
 </resources>

app/src/main/res/values/theme_setting.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+  ~
+  ~ This file is part of FitoTrack
+  ~
+  ~ FitoTrack is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     FitoTrack is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+    <string-array name="pref_theme_setting">
+        <item>Light</item>
+        <item>Dark</item>
+    </string-array>
+
+    <string-array name="pref_theme_setting_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+</resources>

app/src/main/res/xml/preferences_main.xml

@@ -33,6 +33,13 @@
         android:summary="@string/pref_weight_summary"
         android:title="@string/pref_weight" />
 
+    <ListPreference
+        android:defaultValue="0"
+        android:entries="@array/pref_theme_setting"
+        android:entryValues="@array/pref_theme_setting_values"
+        android:key="themeSetting"
+        android:title="@string/theme" />
+
     <ListPreference
         android:defaultValue="osm.mapnik"
         android:entries="@array/pref_map_layers"

app/src/test/java/de/tadris/fitness/CalorieCalculatorTest.java

@@ -23,6 +23,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import de.tadris.fitness.data.Workout;
+import de.tadris.fitness.data.WorkoutType;
 import de.tadris.fitness.util.CalorieCalculator;
 
 public class CalorieCalculatorTest {
@@ -31,7 +32,7 @@ public class CalorieCalculatorTest {
     public void testCalculation() {
         Workout workout = new Workout();
         workout.avgSpeed = 2.7d;
-        workout.workoutType = Workout.WORKOUT_TYPE_RUNNING;
+        workout.setWorkoutType(WorkoutType.RUNNING);
         workout.duration = 1000L * 60 * 10;
         int calorie = CalorieCalculator.calculateCalories(workout, 80);
         System.out.println("Calories: " + calorie);

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
  *
  * This file is part of FitoTrack
  *
@@ -26,7 +26,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
+#
+# This file is part of FitoTrack
+#
+# FitoTrack is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     FitoTrack is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+android.useAndroidX=true

metadata/en-US/changelogs/420.txt

@@ -0,0 +1,5 @@
+**4.2:**
+
+Localisation:
+- Dutch translation
+- Hungarian translation

metadata/en-US/changelogs/500.txt

@@ -0,0 +1,16 @@
+New features:
+- Manually add workouts (#53)
+- Dark Mode (#48)
+
+Improvements:
+- Altitude correction
+- Detect bluetooth headsets (#51)
+- Show recording on lock screen (#45)
+- OpenStreetMap attribution in the record screen (#52)
+
+Bug-Fixes:
+- Wrong speed values after GPS-signal was lost for some time (#47)
+
+Localisation:
+- update Dutch thanks to albertheres and didierm (#57, #58)
+- update Hungarian thanks to urbalazs (#59)

metadata/hu/full_description.txt

@@ -0,0 +1,6 @@
+A FitoTrack az edzések naplózásához és megtekintéséhez készült mobilalkalmazás. Mindegy, hogy fut, kerékpározik vagy túrázik, a FitoTrack részletes grafikonokkal és statisztikákkal jeleníti meg a legfontosabb információkat. Ez egy nyílt forráskódú és teljesen reklámmentes alkalmazás.
+
+Funkciók:
+* Edzések követése. Válassza ki a követni kívánt sporttípust, és kezdjen el futni, kerékpározni vagy túrázni. Az általános információkat közvetlenül a követő képernyőn lévő térkép alatt láthatja.
+* Edzések megtekintése. Nézze meg az általános információkat, mint például dátum, idő, időtartam, távolság, sebesség és gyorsaság. Nézze meg az útvonalat egy térképen. Dolgozza ki a teljesítményszintjét a sebességdiagramból.
+* Nyílt forráskódú. Nincs benne se hirdetés, se felhasználó-követés. Az alkalmazás forráskódja nyílt és a GPLv3 alapján licencelt.

metadata/hu/short_description.txt

@@ -0,0 +1 @@
+Egy magánéletet tiszteletben tartó edzéskövető

metadata/nl/full_description.txt

@@ -0,0 +1,6 @@
+FitoTrack is een mobiele app voor het opnemen en bekijken van trainingen. Voor zowel voor hardlopen, fietsen als wandelen toont FitoTrack belangrijke informatie met gedetailleerde grafieken en statistieken. Dit is een open source app zonder advertenties.
+
+Eigenschappen:
+* Trainingen opnemen. Kies het type sport die je wilt vastleggen en start met hardlopen, fietsen of wandelen. Je kunt de algemene informatie zien onder de kaart op het opnamescherm.
+* Trainingen bekijken. Bekijk je trainingsinformatie zoals datum, tijd, tijdsduur, afstand, snelheid en tempo. Bekijk de route op de kaart. Onderzoek je prestatieniveau vanaf het snelheidsdiagram.
+* Open Source. Geen advertenties of tracking. En de broncode is open onder de GPLv3 licentie.

metadata/nl/short_description.txt

@@ -0,0 +1 @@
+Een Fitness Tracker die je privacy respecteert