Commit graph

9163 commits

Author SHA1 Message Date
Milos Kozak 237d40afe6
Merge pull request #2637 from MilosKozak/AdrianLxM-patch-1
fix Java -> Kotlin nullability issue
2020-05-11 16:59:51 +02:00
Milos Kozak 5dea964b89 final dana renaming 2020-05-11 16:58:59 +02:00
Milos Kozak 441e5fdf3e extend pump interface for neutral temps 2020-05-11 14:50:35 +02:00
AdrianLxM 28dd3dedac
fix Java -> Kotlin nullability issue 2020-05-11 13:34:10 +02:00
Tim Gunn a4f4894985
fixes 2020-05-11 21:54:32 +12:00
Tim Gunn add8b71ea3
Internationalisation 2020-05-11 21:51:32 +12:00
Tim Gunn ea3ce995d8
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-11 21:14:33 +12:00
Milos Kozak 5b269f6156 cleanup resources 2020-05-11 01:41:58 +02:00
Milos Kozak b24690c2fa move RSCommModule 2020-05-10 23:45:49 +02:00
Milos Kozak cc53aff3d0
Merge pull request #2636 from rkresha/dev
Extra doube-quote
2020-05-10 22:34:34 +02:00
Milos Kozak 2375b159fa resources cleanup 2020-05-10 22:31:36 +02:00
Rob Kresha 8321ff3126 Extra doube-quote
Fix for #2624
2020-05-10 14:57:26 -05:00
Milos Kozak b43e7e5930
Merge pull request #2627 from Philoul/TempBasal_Icon_Switched
Temp Basal new icons for temp basal in overview
2020-05-10 21:11:41 +02:00
Milos Kozak 9ac88f7def remove mdtp library 2020-05-10 21:07:58 +02:00
Milos Kozak 05f73cd3ff elimitate careportal 2020-05-10 20:10:08 +02:00
Milos Kozak 09a9c963ed
Merge pull request #2635 from MilosKozak/AdrianLxM-patch-1
Kotlin interface not stricter than Java superclass
2020-05-10 19:11:03 +02:00
Milos Kozak f727b25bb3 cleanup 2020-05-10 18:42:20 +02:00
AdrianLxM cd84597058
Kotlin interface not stricter than Java superclass
Intrinsic check in Kotlin if view is null lead to crashes.
view is not even used so we can accept null.
2020-05-10 16:56:48 +02:00
Milos Kozak 54e68ef248 clean up 2020-05-10 11:49:37 +02:00
Tim Gunn efc25ddcd5
Use preferences 2020-05-10 21:25:14 +12:00
Tim Gunn a501b37159
Show animation if carbs are required 2020-05-10 21:24:46 +12:00
Tim Gunn 68d0e33a9b
Use background for animation 2020-05-10 21:24:09 +12:00
Tim Gunn 9070a1f394
Add Preferences for local carbs req alerts 2020-05-10 21:23:44 +12:00
Tim Gunn 26f487a697
Extend local notification framework 2020-05-10 21:22:42 +12:00
Tim Gunn e8062e1209
Add Red Carb Icon 2020-05-10 21:21:45 +12: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 7fc631a729 RS -> danaRS finished 2020-05-09 10:52:20 +02:00
Philoul 84f032a7a2 Revert "Temp Basal icon switched"
I replace first proposal with a new one with 3 icons

This reverts commit 24112eb4
2020-05-08 17:58:01 +02:00
Philoul 7708e5961a Add new icons for basal on ovenview fragment
I also add photoshop files (it's bitmap but it's easier to work with them)
2020-05-08 17:56:02 +02:00
Milos Kozak 040c76d839 move pass 1 2020-05-08 14:59:30 +02:00
Milos Kozak 61a077542c DanaRPump -> danars 2020-05-08 11:56:02 +02:00
Milos Kozak 73d132649d fix tests 2020-05-08 11:37:14 +02:00
Milos Kozak 67b4be6963 Merge remote-tracking branch 'origin/dev' into rs2 2020-05-08 11:08:45 +02:00
Milos Kozak 15207d1bf1 Omni comments 2 2020-05-08 01:09:30 +02:00
Milos Kozak 7dc7c9528b Omni comments 2020-05-08 00:23:17 +02:00
Milos Kozak 25bf92300b Merge remote-tracking branch 'origin/dev' into dev2 2020-05-07 23:44:46 +02:00
Milos Kozak 70e9d3e88a fix tests 2020-05-07 23:40:59 +02:00
Milos Kozak 51396de73d
Merge pull request #2628 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Updates from Omnipod repo
2020-05-07 22:09:35 +02:00
Bart Sopers eb6eebe853 Restore version for upstream merge from Omnipod repo 2020-05-07 21:17:32 +02:00
Bart Sopers 7f2448adeb Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-05-07 21:16:36 +02:00
Bart Sopers c1fc6d4864 Merge branch 'dev' into omnipod_eros_dev 2020-05-07 21:11:12 +02:00
Milos Kozak 120c526b80 move to core 2020-05-07 09:54:36 +02:00
Philoul 24112eb437 Temp Basal icon switched 2020-05-07 08:29:03 +02:00
Andy Rozman 5527c3d70d - remove omnipod as option from config builder 2020-05-07 01:04:29 +01:00
Andy Rozman 674cd1c0ae Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-07 00:43:18 +01:00
Andy Rozman 4f79b49e10 - changed loader to OmnipodUtil
- Modules
2020-05-06 23:34:05 +01:00
Bart Sopers 25e0b8b190 Add dagger stuff 2020-05-06 23:38:56 +02:00
Bart Sopers bafffad44a Use transient keyword instead of Gson annotation for PodSessionState members that should be exluded of (de)serialization 2020-05-06 21:41:33 +02:00