Commit Graph

220 Commits (main)

Author SHA1 Message Date
Julian Gegner 556daa9e90 show phase colors in circularprogressindi 2023-03-01 13:07:01 +01:00
Julian Gegner da7c820dbd better positioning, fixed endless workout 2023-03-01 12:57:02 +01:00
Julian Gegner 9eff2ad177 add circular progress indicator 2023-03-01 12:34:35 +01:00
Julian Gegner c1cf3cce30 handle stop 2023-02-28 15:07:47 +01:00
Julian Gegner 4144bbaf69 wip trying to wrap timerprovider in prokoutprovider 2023-02-28 14:58:32 +01:00
Julian Gegner b01485f27a playing music and iterating throug workout 2023-02-28 13:05:51 +01:00
Kai Mannweiler 2d88553ee8 Remove unnessecary import 2023-02-27 20:37:39 +01:00
Kai Mannweiler 88ec309f55 Remove Errorhandling from scanner 2023-02-27 20:36:59 +01:00
Kai Mannweiler afb63adb5c Make sure to leave onDetect when successful 2023-02-27 20:34:14 +01:00
Kai Mannweiler bb96aaeef9 Added new alerts to scanner page 2023-02-27 20:30:24 +01:00
Kai Mannweiler f0e3a1ff6b Merge branch 'refactroring-ScannerPage' into 32-success-or-failure-alert-after-save 2023-02-27 20:21:11 +01:00
Kai Mannweiler 591317df26 Added Submitformbutton to sleep and relapse 2023-02-27 20:09:11 +01:00
Kai Mannweiler 5b411ef6bf Add AwesomeDialog 2023-02-27 20:02:15 +01:00
Kai Mannweiler d18d484932 Center every page 2023-02-27 19:34:11 +01:00
Kai Mannweiler 2c96f711b6 Add SingleChildScrollView 2023-02-27 19:29:22 +01:00
Kai Mannweiler 6a6b44a555 Moved pageservice to service folder 2023-02-27 17:27:01 +01:00
Kai Mannweiler b96604103d Added initating Settings from QR-Code 2023-02-27 17:15:34 +01:00
Kai Mannweiler 074ebb1871 finally instead of catch to secure if nothing is found an message is deplayed 2023-02-27 17:09:58 +01:00
Kai Mannweiler 3909bfd66c forgot to add handlesuccess 2023-02-27 17:01:44 +01:00
Kai Mannweiler d401882671 Refactoring ScannerPage 2023-02-27 17:00:28 +01:00
Kai Mannweiler 7a402e464c quickfix relapse model 2023-02-27 15:19:03 +01:00
Kai Mannweiler 01d62a291c refactoring mainpage 2023-02-27 14:57:56 +01:00
Kai Mannweiler 95915e759b Start Refactoring mainpage using Settingsprovider 2023-02-27 11:57:55 +01:00
Kai Mannweiler 395749618b quickfix 2023-02-27 11:40:24 +01:00
Kai Mannweiler 9c4a5e0fbb return null if settings cant be correctly loaded 2023-02-27 11:39:42 +01:00
Kai Mannweiler 21470da038 outsource loadsettings to settings_service 2023-02-27 11:27:45 +01:00
Kai Mannweiler d46dd3ff7b Make Settingsfields nullable part 2 2023-02-27 11:21:57 +01:00
Kai Mannweiler 28e46d1806 Settingsfields nullable 2023-02-27 11:19:56 +01:00
Kai Mannweiler b1c6288b2b Add initilized field for Settingsprovider 2023-02-27 11:08:38 +01:00
Kai Mannweiler ba558adecb Check for empty list 2023-02-27 11:07:46 +01:00
Kai Mannweiler cbf384f9e9 Refactoring: DropDown more modular 2023-02-27 02:35:17 +01:00
Kai Mannweiler 63fdda8195 Added DropDown for Relapse 2023-02-27 02:28:26 +01:00
Kai Mannweiler a2ed17fd5c Added SettingsProvider around MyApp 2023-02-27 02:27:42 +01:00
Julian Gegner ec5f23845d Merge branch '29-provider-refactoring' of https://gitlab.com/Crondung/hsma_cpd into 29-provider-refactoring 2023-02-27 01:20:06 +01:00
Julian Gegner b4c0015847 added workout widget and workout provider to handle different workout phases and durations 2023-02-27 01:20:00 +01:00
Kai Mannweiler a574e7f718 Add relapse form 2023-02-26 23:30:00 +01:00
Kai Mannweiler 0b57c14e05 Add relapse db part2 2023-02-26 23:29:47 +01:00
Kai Mannweiler a054906970 Add relapse model and database 2023-02-26 23:24:23 +01:00
Kai Mannweiler 72674a3552 deleted useless code 2023-02-26 22:49:01 +01:00
Julian Gegner 20f5c5e426 add timer widget, provider and util (format) 2023-02-26 19:52:45 +01:00
Julian Gegner 02ffb9b2f7 wip refactor timer 2023-02-26 17:33:32 +01:00
Julian Gegner 68033a64a5 layouting 2023-02-26 17:09:25 +01:00
Julian Gegner 646a97926d refactor timepicker and moodform 2023-02-26 17:07:38 +01:00
Julian Gegner b3f22b2c74 complete mood form provider setup, use mocked database 2023-02-26 16:17:57 +01:00
Julian Gegner c45b38a1df refactor slider to use provider 2023-02-26 14:59:37 +01:00
Julian Gegner 8230a66df1 refactor folder names pt2 2023-02-26 14:10:16 +01:00
Julian Gegner c87a59a0b6 refactor folder names 2023-02-26 14:10:06 +01:00
Julian Gegner 5f7b63d9b5 use getter 2023-02-26 14:08:05 +01:00
Julian Gegner 6895638814 Merge branch '12-benachrichtigung-aufs-handy-erstellen-2' into 'main'
Resolve "Benachrichtigung aufs Handy erstellen"

See merge request Crondung/hsma_cpd!13
2023-02-26 13:05:37 +00:00
Kai Mannweiler 33cecb4979 Merge branch 'main' into '8-datenbank-einbinden'
# Conflicts:
#   lib/widgets/mood_form.dart
#   lib/widgets/sleep_form.dart
2023-02-26 11:49:26 +00:00
Kai Mannweiler 60d8c6653a Merge branch 'prettier-slider' into 'main'
Prettier slider

Closes #28

See merge request Crondung/hsma_cpd!12
2023-02-26 11:48:10 +00:00
Kai Mannweiler df38c25bc4 Fixed Timezone Bug 2023-02-26 12:44:01 +01:00
Julian Gegner f89fb41397 add iconbuttons to change slider value 2023-02-26 11:30:24 +01:00
Julian Gegner 449230e8d9 fix slider bug 2023-02-26 10:44:16 +01:00
Parricc35 6ed9c23901 music is working on a android phone 2023-02-26 00:32:58 +01:00
Julian Gegner 9d08c15119 Merge branch 'main' into '8-datenbank-einbinden'
# Conflicts:
#   lib/main.dart
2023-02-25 18:00:30 +00:00
Julian Gegner e049aceb8f added export button for testing read operation on db 2023-02-25 18:56:07 +01:00
Julian Gegner be600f98c8 add missing tables, functionality for sleep save and read 2023-02-25 18:55:49 +01:00
Julian Gegner c6075848cf init database on appstart 2023-02-25 18:55:03 +01:00
Julian Gegner 265e174889 use int for slider value in form, save model on form complete 2023-02-25 18:54:54 +01:00
Julian Gegner abbbc4a8c4 changed models, added function from db to model 2023-02-25 18:54:23 +01:00
Parricc35 a975a44f4e wip 2023-02-25 15:52:07 +01:00
Julian Gegner 9a13cfb9f1 date to string 2023-02-25 15:30:04 +01:00
Kai Mannweiler 09d5e51377 Test Notification 2023-02-25 14:58:10 +01:00
Kai Mannweiler 36abb7da36 fixed dates before now 2023-02-25 14:39:05 +01:00
Kai Mannweiler d917387bb4 Fixed IOS bug 2023-02-25 14:19:55 +01:00
Kai Mannweiler 16731529a4 Fixed Timezones Bug 2023-02-25 08:35:46 +01:00
Kai Mannweiler 3f3cc26325 Convert Settings to Notificationdates 2023-02-24 20:30:51 +01:00
Kai Mannweiler de7361f9ad Added Notifications 2023-02-24 20:30:28 +01:00
Parricc35 aeeca1d2b7 Merge branch 'timer-fix' into 'Timer-popup'
enable timer to replay music

See merge request Crondung/hsma_cpd!8
2023-02-23 17:05:18 +00:00
Parricc35 b6c3c2e7a7 Reworked Commends 2023-02-22 13:32:23 +01:00
Parricc35 c0eec7e23d I dont get it but it is working with loop 2023-02-22 13:23:17 +01:00
Julian Gegner de5815c71c wip 2023-02-22 01:28:01 +01:00
Julian Gegner 37b941cdd1 enable timer to replay music 2023-02-21 23:28:31 +01:00
Parricc35 4700f52646 Created Popup for start and stop timer 2023-02-21 22:33:03 +01:00
Parricc35 aabdaafadc Added ElevantedCard in mood Page 2023-02-21 20:56:10 +01:00
Parricc35 a5cd12d5cd Merge branch 'feature/sleep-page' into 'main'
Feature/sleep page

See merge request Crondung/hsma_cpd!6
2023-02-21 19:40:05 +00:00
Parricc35 0d4e7e4a92 Nice Cards and silder with input 2023-02-21 13:39:06 +01:00
Parricc35 f0e2ce16f2 wip 2023-02-21 00:20:43 +01:00
Parricc35 79c5b8fa4b neu silder 2023-02-21 00:14:31 +01:00
Parricc35 af40b847d2 wip 2023-02-21 00:02:32 +01:00
Parricc35 9db3d6c2d8 Merge branch 'feature/sleep-page' of https://gitlab.com/Crondung/hsma_cpd into feature/sleep-page 2023-02-21 00:02:00 +01:00
Parricc35 f5ef084997 wip 2023-02-20 23:59:40 +01:00
Julian Gegner 5083722d9f use const 2023-02-20 23:33:51 +01:00
Julian Gegner adc59a6f42 use const 2023-02-20 23:30:45 +01:00
Julian Gegner af5d7844e3 create variables when saving sleep form 2023-02-20 23:28:55 +01:00
Julian Gegner c9e57b06d6 fixed it, but dont know how (: 2023-02-20 23:23:37 +01:00
Parricc35 89c4f7ee3f Change timer_page into interval_page 2023-02-20 21:32:28 +01:00
Parricc35 6978c40656 Merge branch 'Timer-with-interval' of https://gitlab.com/Crondung/hsma_cpd into Timer-with-interval 2023-02-20 21:28:41 +01:00
Parricc35 e45413c2ad Moved android out of lib 2023-02-20 21:27:57 +01:00
Parricc35 0490c81a0f Merge branch 'main' into 'Timer-with-interval'
# Conflicts:
#   lib/pages/timer_page.dart
#   lib/service/settings_service.dart
#   pubspec.lock
#   pubspec.yaml
2023-02-20 20:27:26 +00:00
Parricc35 1504885e43 Change secound to minutes 2023-02-20 21:18:16 +01:00
Parricc35 c51ac602d4 Change naming 2023-02-20 21:12:48 +01:00
Julian Gegner 6d4a958d8c change group to int, show group in appbar if configured 2023-02-20 19:50:09 +01:00
Julian Gegner 5393590687 added popup on successfull scan 2023-02-20 19:32:23 +01:00
Julian Gegner 74946d005c added barcode scanner 2023-02-20 16:23:49 +01:00
Parricc35 878521325e Changed stop to dispose and removed just_audio 2023-02-20 11:05:32 +01:00
Parricc35 f38b2fd903 Timer ist running most of the time with 3 different sounds 2023-02-19 21:55:29 +01:00
Julian Gegner b368baf744 rename settingpage 2023-02-19 17:54:30 +01:00
Julian Gegner acfb9fea70 added nullable chess time property in shared prefs 2023-02-19 17:44:20 +01:00
Julian Gegner ac994ad6e0 write list and nested properties as json 2023-02-19 17:31:46 +01:00
Parricc35 fb31d1db2c sound works and intervall needs improfmends 2023-02-19 15:44:41 +01:00
Julian Gegner f67f44a030 alwas use new instance on shared preferences 2023-02-19 15:06:57 +01:00
Julian Gegner e4cfa701d6 made settingsservice to collection of util functions to prevent diffrent instances and therefore different states 2023-02-19 14:24:39 +01:00
Julian Gegner 8d8a9ccf2c wip 2023-02-17 13:47:52 +01:00
Julian Gegner b67a4f27d0 wip 2023-02-17 11:35:05 +01:00
Julian Gegner 704025870b made widgets reusable, added sleep form 2023-02-16 12:00:02 +01:00
Parricc35 4b2e900bda Merge branch 'feature/ZI-1/backend-mock' into 'main'
Feature/zi 1/backend mock

See merge request Crondung/hsma_cpd!3
2023-02-16 10:04:55 +00:00
Julian Gegner 3348505490 use settings in timer page 2023-02-16 02:08:15 +01:00
Julian Gegner d14dafe61f added record models, settings- and db mock 2023-02-16 01:59:15 +01:00
Julian Gegner 5947e012c5 outsourced mood_form widgets 2023-02-15 23:28:19 +01:00
Julian Gegner 465b4504a9 implemented form for mood 2023-02-15 23:02:29 +01:00
Julian Gegner 92333d7b2d added reusable slider, used it in mood page 2023-02-15 14:30:40 +01:00
Julian Gegner 40018431dd make appbar title change dynamically 2023-02-15 14:30:25 +01:00
Julian Gegner 0792eb1190 wip 2023-02-15 14:03:02 +01:00
Julian Gegner a53750e691 added settings model and file structure 2023-02-15 14:02:56 +01:00
Julian Gegner fe45116beb fixed lint problems 2023-02-14 14:13:32 +01:00
Julian Gegner ba1a6e37e7 added structure with navbar, changed icons 2023-02-14 14:02:26 +01:00
Julian Gegner 62201bf979 remove unnecessary files, added timer 2023-02-14 12:57:06 +01:00
Julian Gegner dd59d70719 initial commit 2023-02-14 11:18:53 +01:00