Commit Graph

138 Commits (afb63adb5c4e58727a78302bbdde1e03bff952be)

Author SHA1 Message Date
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
Julian Gegner 9dfe3a49fe Merge branch 'music-on-phone' into 'main'
music is working on a android phone

See merge request Crondung/hsma_cpd!11
2023-02-26 09:34:24 +00: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 c0fbd35733 Merge branch '12-benachrichtigung-aufs-handy-erstellen' into 12-benachrichtigung-aufs-handy-erstellen-2 2023-02-25 14:18:31 +01:00
Parricc35 b38213a1a4 Merge branch '12-benachrichtigung-aufs-handy-erstellen-2' into 'main'
Resolve "Benachrichtigung aufs Handy erstellen"

See merge request Crondung/hsma_cpd!9
2023-02-25 11:48:20 +00: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 d2773cad54 Merge branch 'Timer-popup' into 'main'
Created Popup for start and stop timer

See merge request Crondung/hsma_cpd!7
2023-02-23 17:05:33 +00: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 9535778d01 3.3.5 version 2023-02-20 22:01:32 +01:00
Julian Gegner 568dbe7245 Merge branch 'Timer-with-interval' into 'main'
Timer with interval

See merge request Crondung/hsma_cpd!5
2023-02-20 20:36:17 +00:00
Parricc35 89c4f7ee3f Change timer_page into interval_page 2023-02-20 21:32:28 +01:00
Parricc35 c99c2c8bc5 wpi 2023-02-20 21:29:05 +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 96372db293 Moved android out of lib 2023-02-20 21:28:24 +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 7a80851e05 Merge branch 'scanner-page' into 'main'
Get Settings input from Scanner Page

See merge request Crondung/hsma_cpd!4
2023-02-20 20:23:18 +00:00