Commit graph

122 commits

Author SHA1 Message Date
Christopher Beckmann
44580ec8ca Reworked the filter buttons. 2018-05-14 05:59:52 +02:00
Christopher Beckmann
11ff7ae10f Added a label to exercise sets that shows the minimum time it takes to complete an exercise set. Also some minor bugfixes. 2018-05-07 13:19:54 +02:00
Christopher Beckmann
ae8803acfc Fixes #7. 2018-03-21 15:45:03 +01:00
Christopher Beckmann
2836c7292a Fixes #20. Fixes #16. Default sets can not be deleted anymore and can be hidden via the settings. 2018-03-21 15:08:34 +01:00
Christopher Beckmann
3e5df921c4 Fixes #12. 2018-03-21 13:27:05 +01:00
Christopher Beckmann
3aaf275e24 Fixes #11, Worked on Issue #16. Still missing the deletion prevention. 2018-03-21 13:24:31 +01:00
Christopher Beckmann
718f0ec419 Remove idea folder. Fixes #10. 2017-11-27 14:11:38 +01:00
Christopher Beckmann
335b5f5de2 Remove idea. 2017-11-27 14:06:59 +01:00
Christopher Beckmann
04c8489826 Updated Locale. 2017-11-22 13:41:46 +01:00
Christopher Beckmann
297e8ac055 Updated Locale. 2017-11-12 20:16:59 +01:00
Christopher Beckmann
a6f0da5e34 Prevent the Service from restarting if it should be killed. 2017-11-12 20:06:47 +01:00
Christopher Beckmann
7d17c30f95 New Icons. About Page now shows designer. German name changed to Aktive Pause. 2017-11-12 19:57:05 +01:00
Christopher Beckmann
44e18a7240 Bugfix: Dialog should now correctly show. 2017-11-06 16:20:41 +01:00
Christopher Beckmann
66626cc56a Bugfix. Scheduled Timer should now correctly set no timer if no days were selected. 2017-11-04 13:43:36 +01:00
Christopher Beckmann
a95b02c009 Fixed the FAB position in the EditExerciseSetActivity 2017-11-04 00:36:16 +01:00
Christopher Beckmann
cd04770bc7 Added german translation and cleaned the german string.xml. Fixes #9. Added some help content. #9. 2017-11-03 16:55:54 +01:00
Christopher Beckmann
fc41166b0d Update Readme.md 2017-11-03 15:30:01 +01:00
Christopher Beckmann
5fef5af935 Drawables updated again. Continuous Mode now complete. Fixes #6. 2017-11-03 14:48:08 +01:00
Christopher Beckmann
36fc5f3c21 timer scheduling now working.. Fixed #4. 2017-11-03 04:09:30 +01:00
Christopher Beckmann
ec02b353fc Merge remote-tracking branch 'origin/master' 2017-11-03 03:48:05 +01:00
Christopher Beckmann
77554f6c45 Cleanup. Something went wrong with the last commit. 2017-11-03 03:46:43 +01:00
Christopher Beckmann
2bf53e9200 Added the tutorial texts en/de. Major progress towards Issue #4. and Issue #6. Continuous mode already works when swiping away the notification. 2017-11-03 03:39:39 +01:00
Christopher Beckmann
22dbef45bb Some code cleanup. TimerService is getting too big. 2017-11-03 00:15:15 +01:00
Christopher Beckmann
aef796cc40 Receivers moved into the Service. 2017-11-02 23:27:24 +01:00
Christopher Beckmann
4d72fdd076 Snooze implemented. Fixed #5 2017-11-02 19:45:22 +01:00
Christopher Beckmann
c110d5924c Continuous Mode implementation. Still some more functions missing. 2017-11-02 19:11:20 +01:00
Christopher Beckmann
fda52b318d Reset Settings Activity to not show the NavigationDrawer. Added a TimePreference for the scheduler. Also added the Continuous Setting. 2017-11-02 11:22:56 +01:00
Christopher Beckmann
2b40798857 SettingsActivity with Drawer is just to much work. This is the farthest I have come to get it working. 2017-11-01 16:59:29 +01:00
Christopher Beckmann
058e614513 Fixes #2. Newly added Sets are now at the top. 2017-10-26 14:46:52 +02:00
Christopher Beckmann
2750147dc2 Cleanup and Javadoc. 2017-10-26 14:24:21 +02:00
Christopher Beckmann
8f993b749d Cleanup and Javadoc. 2017-10-26 14:10:32 +02:00
Christopher Beckmann
2159c59c3e Cleanup. 2017-10-26 13:25:53 +02:00
Christopher Beckmann
cc83286330 Cleanup of old code and Bugfixing. 2017-10-26 13:22:25 +02:00
Christopher Beckmann
6e25bf1155 Performance increase. (now caching images) Minor bugfixes. 2017-10-25 16:59:23 +02:00
Christopher Beckmann
99ed19908d Added Images. Added Settings page. Exercise Time is now settable through the settings page. Added a "keep_screen_on_during_exercise" setting as well. 2017-10-25 16:14:53 +02:00
Christopher Beckmann
167e792d00 Minor fixes and added german translation. 2017-09-09 01:01:19 +02:00
Christopher Beckmann
857dd427a2 Corrected Database integration. Exercises are now filterable when choosing them. The ExerciseScreen is now better :) 2017-09-09 00:07:24 +02:00
Christopher Beckmann
b715d442db The TimerActivity now lets you choose the break time as well. 2017-09-08 17:42:29 +02:00
Christopher Beckmann
0d42da010c Exercises can now be done. A Notification will be displayed when the timer is done. The Exercise Dialog is added. 2017-09-08 17:05:48 +02:00
Christopher Beckmann
65d8a6fe10 Exercises can now be added and deleted to and from Sets.
Spinner now saves the last pressed entry.
2017-09-07 02:04:21 +02:00
Christopher Beckmann
73d454eb96 The ExerciseSet can now be chosen in the TimerActivity. The splash screen as well as the tutorial have been built in. The navigation drawer is now functional. You can now create and delete exercise sets via the ManageExerciseSetsActivity. Started building the EditExerciseSetActivity, where should be able to edit an exercise set. 2017-09-06 11:27:39 +02:00
Christopher Beckmann
0d7b3a52fc Added a screen for the break and also introduced ExerciseSets. Database restructured and added methods to the SQLDatabaseHelper. 2017-09-03 18:34:32 +02:00
Christopher Beckmann
955ecf1d8f Added the TimerService and the remade the activity for viewing the timer. 2017-08-30 12:48:48 +02:00
Sergej A
02922df3ef Updated navigation drawer
New drawer design
2016-09-15 16:30:46 +02:00
Jannik
eccd2f2212 New drawer logo
5 new pngs for the drawer
2016-09-15 15:38:37 +02:00
Jannik
053ebd384c App Icon and small changes
- New App Icon
- Small timer while exercising in breaks
- About string changes
2016-09-15 15:29:05 +02:00
Sergej A
d688e71f3c Small change in strings 2016-09-13 13:56:01 +02:00
Sergej A
63340700d0 Merge branch 'master' of https://github.com/SecUSo/privacy-friendly-break-reminder 2016-09-13 13:46:56 +02:00
Sergej A
4f05ae3fb7 Cleaned up 2016-09-13 13:46:10 +02:00
Jannik
f5bb946cb0 small translation changes 2016-09-13 12:54:55 +02:00