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
159 Commits 8 Branches 11 Tags
Commit Graph

159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jannis
26567d67ec update Readme 2019-08-22 19:55:45 +02:00
jannis
a78616a09a updated Changelog 2019-08-22 18:08:53 +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
4675f986a7 Merge remote-tracking branch 'origin/master' 2019-08-22 17:23:49 +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
a4735ea64a update Readme 2019-08-22 16:51:16 +02:00
jannis
5df026df1b update Readme 2019-08-22 16:50:36 +02:00
jannis
05814b0d01 Added screenshots 2019-08-22 16:47:40 +02:00
jannis
8356756ebb Merge branch 'master' into develop 2019-08-22 16:27:11 +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
9aef1e1426 update Readme 2019-08-20 18:26:54 +02:00
jannis
503a847f31 update Readme 2019-08-20 18:26:26 +02:00
jannis
7983924a47 migrated Roadmap to wiki 2019-08-20 18:21:01 +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
6eb1bfea5e edited Roadmap.md 2019-08-19 19:07:27 +02:00
jannis
93a2496448 edited Roadmap.md 2019-08-19 17:10:37 +02:00
jannis
8433f8a213 Merge remote-tracking branch 'origin/master' 2019-08-19 17:03:18 +02:00
jannis
58784c3078 #1 User defined workout titles and description 2019-08-19 17:03:06 +02:00
jannis
0e26dc23dc „README.md“ ändern 2019-08-19 15:27:41 +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 Scheibe
3d69d03d89 Roadmap.md edited online with Bitbucket 2019-08-18 19:05:05 +00:00
jannis
ac223e762a choose workout type 2019-08-18 20:54:30 +02:00
jannis
f0c23763fa Merge remote-tracking branch 'origin/master' 2019-08-18 20:17:51 +02:00
jannis
ac9af3a03b set title in ActionBar according to activity 2019-08-18 20:13:29 +02:00
jannis
34a6dd3647 Update Copyright notices 2019-08-18 20:03:40 +02:00
Jannis Scheibe
3bd733113f Roadmap.md edited online with Bitbucket 2019-08-18 17:57:43 +00:00
Jannis Scheibe
1d703ddae1 README.md edited online with Bitbucket 2019-08-18 16:51:59 +00:00
Jannis Scheibe
7a6bd57371 README.md edited online with Bitbucket 2019-08-18 16:51:05 +00:00
Jannis Scheibe
e4f2c6acca Roadmap.md created online with Bitbucket 2019-08-18 16:26:52 +00:00
jannis
aa8a213af2 Use waklock for tracking 2019-08-18 16:12:15 +02:00