Commit graph

9835 commits

Author SHA1 Message Date
Bart Sopers
28f1dbb47f Correctly display Omnipod information in RL stats 2020-08-21 22:28:42 +02:00
Bart Sopers
53c27b8078 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_omnipod_pump_status 2020-08-21 21:28:09 +02:00
Bart Sopers
ea1be41a0d Restore accidentally removed statement 2020-08-21 21:27:51 +02:00
Bart Sopers
bdccbf907e Show '-' instead of nothing in Omnipod tab when no TBR is active 2020-08-21 21:22:55 +02:00
Bart Sopers
5d426bf697 Add some methods to RileyLinkPumpDevice interface to replace access to PumpStatus in RileyLink module 2020-08-21 21:16:24 +02:00
Bart Sopers
127a369cbb Fix Omnipod tests and remove one unused and one inappropriate dependency from AapsPodStateManager 2020-08-21 17:53:59 +02:00
Philoul
7e9f79b5fb And remove additional <br> at the end of ics, isfs and targets 2020-08-21 17:49:13 +02:00
Philoul
1e3999a9ab Replace valueToUnitsToString by existing Profile.toUnitsString 2020-08-21 17:17:56 +02:00
Philoul
792ab88839 Unit selected for compare profile is AAPS units and not profile1.units
Modification limited to PROFILE_COMPARE mode
RUNNING_PROFILE and CUSTOM_PROFILE modes still show profiles in profile.units
2020-08-21 15:45:45 +02:00
Bart Sopers
90e429abb9 Omnipod: update upstream version info 2020-08-21 15:37:14 +02:00
Bart Sopers
1f3e8a4102 Merge remote-tracking branch 'upstream/2.7.0-rc4' into omnipod_eros_dev 2020-08-21 15:34:47 +02:00
Philoul
d60d714f82 Compare Targets improvements in ProfileViewerDialog
Same units between profile 1 and profile 2
Presentation of both targets by hours (same than ICs, ISFs or basals)
2020-08-21 15:30:20 +02:00
Milos Kozak
7d5dc54656 Merge branch 'dev' into 2.7.0-rc4 2020-08-21 13:42:20 +02:00
Milos Kozak
e7627f4f6c try to fix IllegalStateException 2020-08-21 13:41:48 +02:00
Milos Kozak
2177cfebdc
2.7.0-rc4 2020-08-21 12:55:16 +02:00
Milos Kozak
353c9641dc
New Crowdin updates (#2905)
* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)
2020-08-21 12:52:52 +02:00
Milos Kozak
8c987c8be9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-08-21 10:30:41 +02:00
Milos Kozak
7282f460fc better synchronize graph rendering 2020-08-21 10:29:23 +02:00
Milos Kozak
7854bb1ce4
Merge pull request #2908 from AAPS-Omnipod/dev
Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields
2020-08-21 09:43:20 +02:00
Bart Sopers
c22119bb85 Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields 2020-08-20 18:39:16 +02:00
Bart Sopers
5973857c1d Remove duplicate version 2020-08-20 11:47:56 +02:00
Milos Kozak
4d32b65aab
New Crowdin updates (#2897)
* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Russian)

* New translations strings.xml (Korean)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Italian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)
2020-08-20 11:19:30 +02:00
bartsopers
cf643279e4
Merge pull request #140 from AAPS-Omnipod/omnipod_eros_dev_omnipod_module
Move Omnipod into a separate module (and more)
2020-08-20 02:39:45 +02:00
Bart Sopers
7d63671d7b fix import 2020-08-20 02:30:15 +02:00
Bart Sopers
0e9adda3a4 Make sure that after restart, bolus treatment is added when the app is killed during a bolus 2020-08-20 02:20:05 +02:00
Bart Sopers
557e5ee0e9 Update Omnipod upstream version info 2020-08-20 01:22:03 +02:00
Bart Sopers
7bc41b2281 Merge remote-tracking branch 'upstream/2.7.0-rc3' into omnipod_eros_dev_omnipod_module 2020-08-20 01:13:55 +02:00
Milos Kozak
d58fdec440
Merge pull request #2902 from GermanBluefox/patch-2
Fix too long number in "adj. req. rate: 1.2000000000000000002"
2020-08-19 22:11:36 +02:00
Milos Kozak
09e5c82d4d unify units spacing 2020-08-19 21:24:01 +02:00
bartsopers
dcb9e7bf91
Merge pull request #151 from smuething/daggerization-fixes
Daggerization fixes
2020-08-19 14:34:53 +02:00
Steffen Müthing
eb909ab924 Turn RileyLinkMedtronicService into a singleton 2020-08-19 13:11:29 +02:00
Steffen Müthing
a42c5e701e Add @Inject to RileyLinkMedtronicService constructor
`@Inject`ed types should always have the annotation on their constructor,
otherwise dependency resolution might break.
2020-08-19 13:10:27 +02:00
Steffen Müthing
f3bb80c25b Use dagger to inject MedtronicCommunicationManager into RileyLinkMedtronicService 2020-08-19 13:10:02 +02:00
Steffen Müthing
303faf825a Clean up imports 2020-08-19 13:09:27 +02:00
Steffen Müthing
3191b54208 Turn OmnipodCommunicationManager into a singleton 2020-08-19 13:09:01 +02:00
Steffen Müthing
ba69b2ffd3 Turn MedtronicCommunicationManager into a singleton 2020-08-19 13:08:34 +02:00
Steffen Müthing
680f3f94d6 Inject AndroidInjector into RileyLinkCommunicationManager using dagger 2020-08-19 13:06:21 +02:00
Milos Kozak
9ca20f425f BG input in wizard improvement 2020-08-19 10:58:45 +02:00
Bart Sopers
5d83e2a26b Omnipod: if Cancel bolus has been pressed before the bolus command has been executed, await bolus command execution before cancelling 2020-08-19 02:36:33 +02:00
Bart Sopers
e39c222203 Small Dagger improvements 2020-08-18 23:52:45 +02:00
Andy Rozman
963f0ca851 Merge branch 'omnipod_eros_dev_omnipod_module' of github.com:AAPS-Omnipod/AndroidAPS into omnipod_eros_dev_omnipod_module 2020-08-18 22:33:46 +01:00
Andy Rozman
f58874d666 - added injection into RileyLinkCommunicationManager... It must have been removed... 2020-08-18 22:33:02 +01:00
Bart Sopers
c753ed6859 Remove some more unused Omnipod code 2020-08-18 22:39:52 +02:00
bartsopers
6c3e7a8f43
Merge pull request #143 from smuething/move-protection-to-core
Move protection to core
2020-08-18 20:00:57 +02:00
Steffen Müthing
d0cbaeeb32 Move protection infrastructure to core
The protection infrastructure is useful for other modules like pump drivers,
so it should be in core.
2020-08-18 19:33:50 +02:00
Bart Sopers
56efc3e230 Add missing icons in Omnipod 2020-08-18 19:15:50 +02:00
Bart Sopers
4a0e8aa518 Refresh buttons in Pod Management fragment on EventRileyLinkDeviceStatusChange and indicate when we're still waiting for a RL connection 2020-08-18 19:15:35 +02:00
bartsopers
4a10e0b06b
Merge pull request #144 from smuething/move-singleclickbutton-to-core
Move SingleClickButton to core
2020-08-18 17:15:23 +02:00
Steffen Müthing
75cbc87b4a Move SingleClickButton to core
SingleClickButton is a utility used in a number of modules and such should be
in core. While the app seems to built with the button in app, this wrong
structure should be fixed.

As the button is a UI element, the patch also moves the class to the package
info.nightscout.androidaps.utils.ui.
2020-08-18 15:09:14 +02:00
bartsopers
228441f54c
Merge pull request #139 from smuething/more-daggerization
More daggerization
2020-08-18 12:44:21 +02:00