bitPickups/bitPicksAktivpause
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
103 commits 5 branches 10 tags 29 MiB
Commit graph

103 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sergej A
b88d96e4bc Updated string(ru) for HelpActivity 2016-09-13 12:52:48 +02:00
Jannik
db15d6aeb7 New Strings for the help 
Added french and german translation for the help site
 2016-09-13 12:40:22 +02:00
Jannik
8b40c7dcfa Extended Help 
Extended the help xml with new operational support
 2016-09-13 12:30:09 +02:00
Sergej A
689aaab84d Updated strings(eng,ger,ru) 
For HelpActivity
 2016-09-13 12:12:16 +02:00
Jannik
0695759176 Changes in Translation 2016-09-13 11:42:08 +02:00
Sergej A
f14a03f592 Changed HelpActivity and layout for it 2016-09-13 11:39:52 +02:00
Jannik
b55aa21a1c String 
Translations for the new help
 2016-09-13 11:28:54 +02:00
Jannik
19bd41a28d First changes after second feedback 
New break - Red Countdown timer in the break periods
first layout for the new help site
 2016-09-13 10:47:21 +02:00
Sergej A
a866ea53a1 Removed BugReport folder 2016-09-09 13:40:33 +02:00
Jannik
bf72ea6675 Small Break Bug 
Break Activtiy stays now, while leaving the app
 2016-09-09 12:24:39 +02:00
Jannik
09b9e06fa7 Last bug correction 
- About Site: Justify the gitHub Link and the SECUSE Link
- Made some correction in the README file
- Small link correction in strings.xml
 2016-09-09 11:29:35 +02:00
Jannik
2a12a2ebaa Last small corrections 
New icons for help and about, new readme, package renaming
 2016-09-08 13:40:53 +02:00
Sergej A
9173c1605c Bug fixes, code cleaning 🤔 
Fixed bug(SeekBar in BreakReminder, Break and Profile Activity), updated
some Images
 2016-09-04 19:19:30 +02:00
Jannik
775ebe3eba New Pic 
Play/Stop Button
 2016-09-04 18:38:31 +02:00
Jannik
1d87fc66ec Code Cleaning 
Deleting old classes
 2016-09-04 17:52:30 +02:00
Jannik
5d5fe72d0e DB2 
DB2
 2016-09-04 16:11:17 +02:00
Jannik
c01577bc59 DB Update 
DB now has no more '20 seconds' in its description (German, English,
French and Russian)
 2016-09-04 16:11:17 +02:00
Sergej A
aeaa9300d2 Bug fix #20,25 2016-09-04 16:04:59 +02:00
Sergej A
2746eb832c Updated database and strings (russian language) 2016-09-04 11:09:20 +02:00