Commit graph

6027 commits

Author SHA1 Message Date
Tim Gunn
bcfd5e0149
revert counter logic 2020-05-13 11:36:32 +12:00
Tim Gunn
81ea43b218
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into skip-neutral-temps 2020-05-13 10:34:07 +12:00
Tim Gunn
15df6f3349
merge n fix 2020-05-13 10:14:02 +12:00
Milos Kozak
c03a89db16 HistoryBrowser fix 2020-05-13 00:11:48 +02:00
Tim Gunn
fa74cf4804
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required 2020-05-13 09:37:50 +12:00
Milos Kozak
903555ed9f Dana msg refactor 2020-05-12 23:33:42 +02:00
Milos Kozak
65982ab94a
Merge branch 'dev' into carbs-required 2020-05-12 17:01:29 +02:00
Milos Kozak
666ce54b1f lint & deprecation 2020-05-12 15:07:50 +02:00
Milos Kozak
7060c51681 lint & deprecation 2020-05-12 14:33:47 +02:00
Milos Kozak
b7ef191003 lint & deprecation 2020-05-12 13:34:32 +02:00
Milos Kozak
9c472e4e05 simplify RL code 2020-05-12 12:58:59 +02:00
Milos Kozak
66c567f0e7 lint & deprecation 2020-05-12 12:33:23 +02:00
Milos Kozak
1d1d57a458 fix SPBackupAgent 2020-05-12 00:04:09 +02:00
Milos Kozak
1b625265d0 Merge remote-tracking branch 'origin/master' into dev 2020-05-11 23:53:20 +02:00
Milos Kozak
b5770d8e1b
Merge pull request #2638 from MilosKozak/danarefactor
Dana: refactor to modules
2020-05-11 20:36:50 +02:00
Milos Kozak
b0513be8bf remove crashing dump 2020-05-11 20:15:35 +02:00
Milos Kozak
9e8124bc29 fix dana bolusing dialog 2020-05-11 20:05:12 +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
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
b24690c2fa move RSCommModule 2020-05-10 23:45:49 +02:00
Milos Kozak
2375b159fa resources cleanup 2020-05-10 22:31:36 +02: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
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
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
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
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
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
Milos Kozak
ad472beb4a danars di start 2020-05-06 01:27:38 +02:00
Milos Kozak
cf291b3adc fix after lib update 2020-05-06 01:18:04 +02:00
Milos Kozak
a02bd59dc0 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 23:28:22 +02:00
Milos Kozak
1f4f5600bc NoSplashAppCompatActivity -> core 2020-05-05 23:27:01 +02:00
Milos Kozak
25c1100330 Merge remote-tracking branch 'origin/dev' into rs 2020-05-05 22:49:49 +02:00
Milos Kozak
d114be7344 revert debug code 2020-05-05 22:43:26 +02:00
Milos Kozak
bba7adc9aa fix Runnables after protection check, cleanup 2020-05-05 22:42:16 +02:00
Milos Kozak
8858d3b5f9 Merge remote-tracking branch 'origin/dev' into layout 2020-05-05 22:00:54 +02:00
Milos Kozak
bbf5e6564f new icons 2020-05-05 22:00:35 +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
Andy Rozman
f3c4b4e5e7 Merge branch 'omnipod_eros_dev' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-05-05 13:50:53 +01:00
Andy Rozman
e51e3daeb1 - added Expose attribute to all varaiables in PodSessionState
- OmnipodUtil: Gson now uses only Expose fields
2020-05-05 13:49:55 +01:00
Bart Sopers
9b089621fa Use allowed default for SP.getString in RileyLinkOmnipodService 2020-05-05 13:35:49 +02:00
Andy Rozman
2de1761555 - look at current pump service (either MDT or POD), RL Boradcast Receiver worked with internal instance, which wasn't correct, might need to refactor RileyLinkBroadcastReceiver further to be singelton... 2020-05-05 10:32:25 +01:00
Bart Sopers
32ce3ee18a enable PUMPBTCOMM by default for Omnipod branch 2020-05-05 02:34:08 +02:00
Bart Sopers
53e6cd4ef2 Apply several fixed from @andyrozman after Omnipod dagger merge 2020-05-05 02:03:01 +02:00
Bart Sopers
20f9f88d4b Use allowed default for SP.getString 2020-05-05 01:05:57 +02:00
Bart Sopers
f7f5e0ce19 Replace static reference with member reference 2020-05-05 00:28:27 +02:00
Andy Rozman
7db7e07a70 - added SP to OmnipodUtil 2020-05-04 23:25:03 +01:00
Bart Sopers
7fa1ebfe38 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_dagger_with_initialization_fixes 2020-05-05 00:15:44 +02:00
Milos Kozak
0a63e1f29d Merge branch 'dev' into rs 2020-05-05 00:08:29 +02:00
Bart Sopers
5e3e947d8e Restore more formatting 2020-05-04 23:55:01 +02:00
Bart Sopers
e7fe05dbeb Restore more formatting 2020-05-04 23:52:51 +02:00
Bart Sopers
d8eb777b4c Restore more formatting 2020-05-04 23:36:00 +02:00
Bart Sopers
df2de82810 Apply @andyrozman's fixes for compilation errors 2020-05-04 23:06:15 +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
Milos Kozak
4a17fdc9a0 Merge remote-tracking branch 'origin/dev' into layout 2020-05-04 21:55:20 +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
TebbeUbben
1c075c526e 2.6.1.4 2020-05-04 17:36:37 +02:00
Bart Sopers
1798d260eb Merge branch 'dev' into omnipod_eros_dev_dagger_history_fix 2020-05-04 17:36:29 +02:00
Andy Rozman
6aaca5899c - changed Omnipod module 2020-05-04 11:27:12 +01:00
Milos Kozak
d0221c34aa
Merge pull request #2616 from Philoul/Fix_TemporaryBasal_Crash
Fix Crash TemporyBasal
2020-05-04 11:53:22 +02:00
Milos Kozak
948bb8dc33
Merge pull request #2617 from Philoul/DatabaseHelper_Missing_Function
Add missing function in DatabaseHelper
2020-05-04 11:52:50 +02:00
Milos Kozak
ab9da6e2b6 AlertDialogs -> core 2020-05-04 10:49:19 +02:00
Philoul
3e63d32d60 Add missing function in DatabaseHelper
getExtendedBolusDataFromTime(long from, long to, boolean ascending)
=> I need it for autotune plugin...
2020-05-04 10:40:22 +02:00
Philoul
d44bc87d1b Fix Crash TemporyBasal
Injector missing with extendedbolus
2020-05-04 10:15:21 +02:00
Milos Kozak
2fb0198418 RxBus -> core 2020-05-04 01:36:46 +02:00
Milos Kozak
e1ddde9697 FabricPrivacy -> core 2020-05-04 01:27:47 +02:00
Milos Kozak
5be4a5dd97 AAPSLogger -> core 2020-05-04 00:42:13 +02:00
Milos Kozak
99907ed029 SP -> core 2020-05-04 00:33:27 +02:00
Milos Kozak
7e6f82d068 Lgging cleanup 2020-05-04 00:14:23 +02:00
Milos Kozak
db16434154 build.gradle unify 2020-05-03 22:18:58 +02:00
Milos Kozak
53383461f0 core module 2020-05-03 21:27:42 +02:00
TebbeUbben
abb9505122 Insight: Disable vibration on bolus for firmware version 3 2020-05-03 18:52:26 +02:00
Milos Kozak
c17f8d10ad split dependency to IconsProvider 2020-05-03 17:50:33 +02:00
Andy Rozman
02366cad62 - small cosmetic change 2020-05-03 16:02:41 +01:00