Commit graph

192 commits

Author SHA1 Message Date
Milos Kozak 65982ab94a
Merge branch 'dev' into carbs-required 2020-05-12 17:01:29 +02:00
Milos Kozak 5368b5c109 update manifests 2020-05-11 17:41:03 +02:00
Milos Kozak 14b9ee3798 update manifests 2020-05-11 17:32:02 +02:00
Milos Kozak 5dea964b89 final dana renaming 2020-05-11 16:58:59 +02:00
Milos Kozak 311f9dd119 danar module 2020-05-10 11:03:19 +02:00
Tim Gunn c9cf2cbae4
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-10 13:05:30 +12:00
Milos Kozak a99be409eb dana module 2020-05-09 20:18:12 +02:00
Milos Kozak 67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Bart Sopers c1fc6d4864 Merge branch 'dev' into omnipod_eros_dev 2020-05-07 21:11:12 +02:00
Milos Kozak 25c1100330 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 22:49:49 +02:00
Dominik Dzienia 9a3cc5af82 Adds support for preferences directory, list of preferences to import, additional check on imported preferences metadata 2020-05-05 18:42:53 +02:00
Bart Sopers ce435be382 Fix merge error 2020-05-04 23:56:24 +02:00
Bart Sopers d8eb777b4c Restore more formatting 2020-05-04 23:36:00 +02:00
Bart Sopers acf6b50b66 Restore formatting in AndroidManifest.xml 2020-05-04 23:22:42 +02:00
Bart Sopers 71d5409344 Revert "- removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent"
This reverts commit ea0b89cbf8.
2020-05-04 22:50:08 +02:00
Andy Rozman ea0b89cbf8 - removed dependencies to omnipod: Myprefernces, ActivitiesmOdules, AppComponent
- fixed commpiling problem
- removed OmnipodService from Manifest
2020-05-04 17:51:06 +01:00
Tim Gunn a1450feb2b
Merge branch 'display-carsReq' of github.com:twain47/AndroidAPS into carbs-required 2020-05-03 16:45:45 +12:00
Andy Rozman a3b0c8ce3b - changed code to use dagger 2020-04-24 11:00:31 +01:00
Andy Rozman 88554ee376 Merge branch 'dev' into omnipod_eros_dev 2020-04-04 20:25:09 +01:00
Milos Kozak 5ce8b998d9 RS v3 encryption 2020-03-26 20:25:20 +01:00
Milos Kozak d1d49a8db2 improve PairingProgressDialog 2020-03-24 21:00:43 +01:00
Milos Kozak 9f0ac545f3
Merge pull request #2524 from MilosKozak/TOTP
SMS TOTP
2020-03-20 18:38:51 +01:00
Milos Kozak 7db4481db9
Merge pull request #2454 from twain47/key-value-backups
Use google key/value backup agent for settings and objectives
2020-03-20 18:36:19 +01:00
Milos Kozak a12762f034 Move OTP settings to preferences 2020-03-20 17:31:30 +01:00
Milos Kozak 99aec40534 Merge branch 'dev' into dagger3 2020-03-10 22:39:26 +01:00
Milos Kozak bec6d99036 register Network receiver in code (SDK28) 2020-03-10 22:20:36 +01:00
Brian Quinion b1097880f4 Add carbs required to overview. Add notification with option to ignore carbs suggestions for 5, 15 or 30min 2020-03-10 18:46:14 +00:00
TebbeUbben 7d9c1f8af9 Use "Display time-sensitive notifications" for Insight alerts 2020-03-09 23:07:55 +01:00
Bart Sopers 3eea2598f2 Merge tag '2.6.0' into omnipod_eros_dev 2020-03-03 21:33:31 +01:00
Brian Quinion 262a47a18d Use google key/value store for settings and objectives backup 2020-02-20 02:00:37 +00:00
Milos Kozak 348936e1b8 IobCobCalculatorPlugin injection 2019-12-30 13:40:42 +01:00
Andy Rozman c589993985 - added Pod debug button (its 5th button and needs to be enabled in configuration)
- changed PodHistoryActivity to use PodHistory entries, removed filter for now, and values are not yet supported
- added configuration for debug button
- extended DatabaseHelper t retrive PodHistory for last day...
2019-12-25 19:21:22 +01:00
Milos Kozak 2ce590a700 BolusProgressDialog refactor 2019-12-20 21:52:37 +01:00
Milos Kozak 83fe8527ce ErrorDialog refactor 2019-12-20 19:46:07 +01:00
Milos Kozak e58b7f8040 Simplify NSClient 2019-12-19 21:59:07 +01:00
Milos Kozak 8a4b17f6f9 cleanup 2019-12-18 23:37:34 +01:00
Milos Kozak e15a2d6b88 move AutoStartReceiver 2019-12-17 23:24:54 +01:00
Milos Kozak 1c0eb9f803 Stats activity 2019-12-09 19:03:26 +01:00
Andy Rozman 0749a7864c - Added library for Wizard pages and all the classes for the integration.
- integration of Init Pod Wizard is done from visual point of view, now it just needs to be connected to driver
2019-11-23 20:31:29 +00:00
Milos Kozak 450f4fabf0 Survey 2019-10-08 21:20:04 +02:00
Andy Rozman 8581b00e8a Merge branch 'omnipod_eros_andy' of https://github.com/andyrozman/AndroidAPS into omnipod_eros_andy 2019-08-30 11:29:29 +01:00
Andy Rozman 3438c3ed23 Merge branch 'omnipod_eros_bart' into omnipod_eros_andy 2019-08-30 10:52:25 +01:00
Andy Rozman 86a7117e63 Merge branch 'dev' into omnipod_eros_andy 2019-08-30 10:51:19 +01:00
Andy Rozman b7b47970ed - started working on PodInitWizard
- changed OmnipodCommunicationManagerInterface a little to include operation Type and Receiver Interface (not fully done yet, but what is there can be used)
- started working on PodManagamentActivity.kt
2019-08-30 10:39:40 +01:00
Bart Sopers 75ae6844f3 Merge branch 'dev' into omnipod_eros_bart 2019-08-28 23:53:06 +02:00
Milos Kozak b04641e466 Revert "DataService as JobIntentService"
This reverts commit e0c2e7d579.
2019-08-26 15:06:34 +02:00
Bart Sopers ca325c18e9 Merge branch 'omnipod_eros_andy' into omnipod_eros_bart 2019-08-11 15:56:45 +02:00
Milos Kozak 5b4a88ed1b remove NSClient restart receiver 2019-08-09 16:00:41 +02:00
Milos Kozak e0c2e7d579 DataService as JobIntentService 2019-08-09 14:17:17 +02:00
Milos Kozak 7db98bf810 Splash logo 2019-08-01 16:29:20 +02:00