jannis 4ecf319fd4 Merge branch 'develop' into feature-unit_systems ...

# Conflicts:
#	app/src/main/res/values/strings.xml

2019-08-20 18:01:14 +02:00

..

gpx

#3 Export to GPX file

2019-08-20 17:34:02 +02:00

unit

- SettingsActivity

2019-08-19 21:17:17 +02:00

CalorieCalculator.java

Use waklock for tracking

2019-08-18 16:12:15 +02:00

NotificationHelper.java

Use Android service for fetching location

2019-08-19 14:53:22 +02:00

ThemeManager.java

choose workout type

2019-08-18 20:54:30 +02:00

WorkoutTypeCalculator.java

set title in ActionBar according to activity

2019-08-18 20:13:29 +02:00