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

73 Commits

Author SHA1 Message Date
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
eea30747cd Merge branch 'master' into feature-unit_systems 
# Conflicts:
#	app/src/main/java/de/tadris/fitness/WorkoutAdapter.java
 2019-08-20 18:00:39 +02:00
jannis
311067136b Merge fixes 2019-08-20 17:53:53 +02:00
jannis
1a074b33f8 Merge branch 'master' into develop 
# Conflicts:
#	app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java
 2019-08-20 17:53:28 +02:00
jannis
77dcc16d81 #6 Better design in Workout List 2019-08-20 17:51:18 +02:00
jannis
c7d18bab9e #3 Export to GPX file 2019-08-20 17:34:02 +02:00
jannis
8eabe26b07 #8 Change "Okay" to "Stop" 2019-08-20 14:34:25 +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
58784c3078 #1 User defined workout titles and description 2019-08-19 17:03:06 +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
cdcf2ddce2 Bug 2019-08-15 20:30:00 +02:00
jannis
dcf53816a5 ListWorkoutActivity 2019-08-15 16:12:15 +02:00
jannis
cc39f89a77 ListWorkoutActivity 2019-08-14 15:28:26 +02:00
jannis
93054f821e Update copyright 2019-08-14 10:41:17 +02:00
jannis
c1651379fc Initial commit 2019-08-14 10:11:03 +02:00