Commit graph

481 commits

Author SHA1 Message Date
Philoul 2ae4cc3c03 Merge remote-tracking branch 'Nightscout/dev' into New/AddCorrPercentInWizard
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
2021-12-11 02:33:41 +01:00
Milos Kozak 17b4d6e7ed Wear: less static more injection 2021-12-10 15:19:19 +01:00
Milos Kozak 29559c0413 move SP to shared module 2021-12-10 12:17:03 +01:00
Milos Kozak 0a25fa3c9a share code between aap and wear 2021-12-10 08:58:23 +01:00
Philoul b05a9b7683 Remove rounding CalculatedCorrection 2021-12-09 23:50:55 +01:00
Philoul 88b2a8d0d7 Add selector to allow correction in percentage 2021-12-07 21:38:05 +01:00
Milos Kozak 85140a9c2e Loop cleanup 2021-11-30 17:08:31 +01:00
Milos Kozak 68793233e8 NumberPicker -> kt 2021-11-23 19:53:45 +01:00
AdrianLxM e4c3e4c560
Update NotificationHolderImpl.kt 2021-11-20 22:20:08 +01:00
Milos Kozak 9fb20917c5 unify xDrip broadcasts 2021-11-18 15:47:22 +01:00
Milos Kozak 88a8d08f56 restore xdrip broadcast 2021-11-11 14:23:22 +01:00
Milos Kozak 3dc2f073fe Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-11-10 17:10:48 +01:00
Milos Kozak 584e91f8dc prepare XDripBroadcast 2021-11-10 17:10:10 +01:00
Dominik Dzienia c2c6bb810a Fixes #882 by aggregating DAO query for temporary basals and moving it outside loop 2021-11-09 19:51:22 +01:00
Milos Kozak 04de964e97 cleanup 2021-11-09 17:57:51 +01:00
Milos Kozak 2b20aa3e38 fix EditQuickWizardDialog 2021-11-07 21:57:10 +01:00
Milos Kozak 0db34981d4 rename CommandQueue 2021-11-07 17:19:06 +01:00
Milos Kozak 756957ed8c resourceHelper -> rh 2021-11-04 10:56:12 +01:00
Milos Kozak 1dd64b5958 relocate default profile 2021-10-30 14:14:37 +02:00
Milos Kozak 6663b9db4f better handle missed bg readings 2021-10-30 13:43:22 +02:00
Philoul 4616d11c5d Remove EatReminder/BolusReminder if Carbs/Bolus entered before remind 2021-10-26 22:39:52 +02:00
Philoul c3ef4af700 Fix delta 2021-10-25 10:09:32 +02:00
Philoul 2ace719e2a Add Bolus Reminder to CarbsDialog 2021-10-22 16:15:26 +02:00
Milos Kozak e01f6f6cb0 SpinnerHelper update 2021-10-17 17:47:41 +02:00
Milos Kozak 1f65ee38c7 RxBusWrapper -> RxBus 2021-10-15 14:56:22 +02:00
Milos Kozak a963f140c6 lints 2021-10-15 13:24:22 +02:00
Milos Kozak 5906c5f0fa SpinnerHelper -> kt 2021-10-14 22:43:23 +02:00
Andrei Vereha 0cd9beb2cf merge with dev 2021-09-25 13:55:57 +02:00
Milos Kozak b40428c986
Merge pull request #607 from Philoul/NewUelLog
New UserEntries
2021-09-22 18:20:06 +02:00
Milos Kozak d33f62b23d remove PowerMockRunner where possible 2021-09-21 21:57:56 +02:00
Andrei Vereha 09675de3f1 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dash 2021-09-20 18:32:52 +02:00
Milos Kozak 374e251801 remove @Jvm directives where possible 2021-09-20 17:20:09 +02:00
Milos Kozak b80e2a7648 Improve COB handling 2021-09-19 09:59:35 +02:00
Andrei Vereha cb86438c27
Revert "Revert "avereha/merge dev 2"" 2021-09-15 18:38:27 +02:00
Andrei Vereha 7fff6fc564
Revert "avereha/merge dev 2" 2021-09-15 00:12:35 +02:00
Andrei Vereha efad748939 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-2 2021-09-14 23:55:15 +02:00
Milos Kozak ba71e0db9b more Profile validity checks 2021-09-13 19:06:32 +02:00
Andrei Vereha d4b0935d6b Merge remote-tracking branch 'upstream/dev' into dash 2021-09-13 18:39:23 +02:00
Milos Kozak d18c05205c Resolve warnings 2021-09-07 12:08:19 +02:00
Milos Kozak 0e928bbb9c compileSdkVersion 30 2021-08-06 00:08:49 +02:00
AdrianLxM fa27d409ce refactor build helper 2021-07-31 13:25:20 +02:00
Philoul d0cde1b07a Add UserEntries for Alerts (Pump unreachable and Missing BG Readings) 2021-07-14 17:30:09 +02:00
Milos Kozak 74dfe80433 immutable flag for PendingIntent 2021-06-02 16:56:13 +02:00
Milos Kozak 596012ab10 move logs, eng_mode to AAPS directory 2021-05-31 15:29:42 +02:00
Milos Kozak 9d29cafbe6 remove old db code 2021-05-29 23:38:19 +02:00
Milos Kozak 6735d22934 OfflineEvent -> room 2021-05-28 16:06:44 +02:00
Milos Kozak 11f00d1776 make it compile with kotlin 1.4 2021-05-20 19:42:44 +02:00
Milos Kozak b548325059 lints 2021-05-18 22:31:08 +02:00
Milos Kozak a1c1355ce6 MVVM like for overview 2021-05-17 21:05:24 +02:00
Milos Kozak 37e3c4532a Profiles -> room (no NS sync yet) 2021-04-29 20:42:45 +02:00