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

149 Commits

Author SHA1 Message Date
jannis
6369e1a434 Merge branch '1.0' into develop 2019-08-25 11:23:38 +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
aac80d6798 #20 Back-Button in Settings screen crashes on earlier Android versions 2019-08-24 21:13:17 +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
eae7bfb9d9 Localisation fix 2019-08-24 16:25:22 +02:00
jannis
062e785673 update Version to 1.0.3 2019-08-24 11:24:53 +02:00
jannis
da18ef792d Hotfix: #17 Wrong calorie calculation 2019-08-24 10:32:39 +02:00
jannis
f839b99da0 - added F-Droid descriptions 
- set all TileSources to OSM Mapnik
- increased version to 1.0.2
 2019-08-23 18:23:47 +02:00
jannis
a93093ccd0 1.0.1 2019-08-23 16:25:49 +02:00
jannis
733917e4b6 Hotfix: #16 Crash on Android 7 2019-08-23 16:24:51 +02:00
jannis
9942be1877 Ignore undefined properties in Import 2019-08-22 21:46:17 +02:00
jannis
3f8ae45080 fix build 2019-08-22 17:58:14 +02:00
jannis
61ec1581ff Localisation 2019-08-22 17:48:55 +02:00
jannis
2cd1db1721 Translated into German 2019-08-22 17:23:44 +02:00
jannis
d5b9379c85 First start message 2019-08-22 17:04:21 +02:00
jannis
9a228fb2da Notification icon 2019-08-22 16:17:22 +02:00
jannis
31524fc92f Design/Usability 
- show splash screen
- increased FAB menu buttons
- long press on FAB menu triggers recorder with last activity
 2019-08-22 16:08:33 +02:00
jannis
c708a8cc7e Bug 2019-08-21 20:24:44 +02:00
jannis
9e893c5fad #14 Show GPS Status icon in Recorder 2019-08-21 20:23:20 +02:00
jannis
50e8976424 #9 Import/Export feature Bugfixes 2019-08-21 20:09:45 +02:00
jannis
b0217119e7 #7 Make a Logo 2019-08-21 17:35:05 +02:00
jannis
420e2f19f0 #13 Different OSM map layers 
- App switches between layers depending on activity
 2019-08-21 10:59:28 +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
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