luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-30 17:22:11 -07:00
Code Issues Packages Projects Releases Wiki Activity
199 Commits 8 Branches 11 Tags
Commit Graph

36 Commits

Author SHA1 Message Date
jannis
cde4eb5940 #39 Consider ascent value when calculating calories 2020-01-22 12:12:11 +01:00
jannis
2d776a3864 #42 Imperial units wrong 2020-01-17 21:42:28 +01:00
jannis
d75e84d8d9 #36 Pace with the format MM’SS” 2020-01-17 21:39:26 +01:00
jannis
f71c75f180 #29 Option to save backup to internal storage 2020-01-09 16:25:46 +01:00
jannis
2df035ef78 Code cleanup 2020-01-04 13:57:17 +01:00
jannis
7b15571e1b Refactor Backup/Restore Process 2019-12-26 00:23:15 +01:00
jannis
b494868f83 Update copyright 2019-12-08 13:05:01 +01:00
jannis
b4afba8a9c Better calorie calculation 2019-12-04 21:47:15 +01:00
jannis
9c3e4021f8 Delete workouts via long press in workout list 2019-09-11 18:07:10 +02:00
jannis
82e383e953 Data Import up to 5 times faster and more secure if it fails 2019-09-10 20:01:44 +02:00
jannis
99182791f9 put map style setting into data backup 2019-09-10 20:01:14 +02:00
jannis
393fd4aba9 Use running calorie calculation for hiking 2019-08-25 13:23:29 +02:00
jannis
a7d683ad4e Merge branch '1.0' into develop 2019-08-25 13:17:38 +02:00
jannis
179e271cbf Fix Unit "Imperial with meters" 2019-08-25 12:47:41 +02:00
jannis
1e789a6b67 - Gather height data from pressure sensor 
- Calculate absolute height by combining GPS and sensor
- Show height diagram
 2019-08-25 11:21:23 +02:00
jannis
9c4d06fe53 Merge branch 'master' into develop 2019-08-24 18:54:42 +02:00
jannis
7d2e3a063d Don't reset firstStart-Dialog on import 2019-08-24 16:27:09 +02:00
jannis
da18ef792d Hotfix: #17 Wrong calorie calculation 2019-08-24 10:32:39 +02:00
jannis
9942be1877 Ignore undefined properties in Import 2019-08-22 21:46:17 +02:00
jannis
50e8976424 #9 Import/Export feature Bugfixes 2019-08-21 20:09:45 +02:00
jannis
28535f653a #12 Save workout when App is being closed 2019-08-21 10:25:14 +02:00
jannis
9329670ca8 #9 Ability to Import and Export data 
- Import and Export Backups working
 2019-08-20 22:54:02 +02:00
jannis
2f71b2a3d5 Open settings, Weight / Unit calculation feature stable 
- #5 Change weight of user
- #4 Units defined by user
 2019-08-20 18:15:28 +02:00
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
jannis
c7d18bab9e #3 Export to GPX file 2019-08-20 17:34:02 +02:00
jannis
9b52fb0be1 Merge branch 'master' into feature-unit_systems 
# Conflicts:
#	app/src/main/java/de/tadris/fitness/Instance.java
#	app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java
 2019-08-20 14:22:54 +02:00
jannis
d0e42e3382 - SettingsActivity 
- set Units and weight
- not tested
 2019-08-19 21:17:17 +02:00
jannis
336d0890ea Merge remote-tracking branch 'origin/master' 2019-08-19 14:53:35 +02:00
jannis
0ea7535c50 Use Android service for fetching location 2019-08-19 14:53:22 +02:00
jannis
ac223e762a choose workout type 2019-08-18 20:54:30 +02:00
jannis
ac9af3a03b set title in ActionBar according to activity 2019-08-18 20:13:29 +02:00
jannis
aa8a213af2 Use waklock for tracking 2019-08-18 16:12:15 +02:00
jannis
c7ddf0ed58 Delete Workouts, Recording Information, Automtic pause, GPX-library added for future export 2019-08-18 15:53:58 +02:00
jannis
7e406db592 Show workouts 2019-08-17 20:39:57 +02:00
jannis
4aa8a5c6aa Record workout, List workouts 2019-08-17 16:52:15 +02:00
jannis
dcf53816a5 ListWorkoutActivity 2019-08-15 16:12:15 +02:00