Commit graph

9182 commits

Author SHA1 Message Date
Andy Rozman 7097689c28 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-02 09:47:28 +01:00
Andy Rozman ef037470af - trying to do Profile another way 2020-01-02 09:47:13 +01:00
Bart Sopers b08045b326 Automatically retry bolus cancellation and show error when setting TBR fails due to a PodFaultException 2020-01-02 01:08:18 +01:00
Milos Kozak 9e9ae3cf91 Allow date in CarbsDialog 2020-01-02 00:40:03 +01:00
Andy Rozman 57c35bad58 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-02 00:22:11 +01:00
Andy Rozman 0fdcb862a6 - small logging so that we can fix this date parsing problem 2020-01-02 00:11:09 +01:00
Milos Kozak d71f036dba Revert in range color 2020-01-01 23:44:13 +01:00
Milos Kozak 1b513cabbd
New Crowdin translations (#2316)
* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (French)
2020-01-01 23:40:54 +01:00
Bart Sopers 2e926c5d8e Fix compile error 2020-01-01 23:40:38 +01:00
Milos Kozak f1a72a3897
Merge pull request #2321 from osodebailar/refactor-header-area
issue #2318 Refactor header area destroys layout on Atom . Fixed smal…
2020-01-01 23:40:14 +01:00
Milos Kozak bcc3829915 NSClient rafactor 2020-01-01 23:23:16 +01:00
Bart Sopers 511c078659 Revert "Add string resource"
This reverts commit 5f4c12e487.
2020-01-01 23:19:16 +01:00
Bart Sopers 5f4c12e487 Add string resource 2020-01-01 23:02:32 +01:00
Andy Rozman 5230a2dda0 - moved PumpHistoryEntryGroup to commons package
- added ProfileUtil with method to show basal profile so that we can display it
- changed PodHistoryActivity to display values (for Bolus, TBR and SetProfile)
2020-01-01 18:45:15 +01:00
Milos Kozak cc125986ac stats layout 2019-12-31 15:04:20 +01:00
Milos Kozak f8b2b596c6 TDD, TIR calculator 2019-12-31 14:40:06 +01:00
Milos Kozak 416735e916 WizardDialogInfo, ProfileFunction 2019-12-31 13:25:28 +01:00
Milos Kozak db9b453276 remove setDefaultUncaughtExceptionHandler temporary 2019-12-31 12:01:15 +01:00
Milos Kozak 7518537108 wizard injection 2019-12-31 11:57:58 +01:00
Milos Kozak 1610470089 ActivityMonitor injection 2019-12-31 09:41:02 +01:00
Milos Kozak 7706e51954 more injections, quickwizard 2019-12-31 00:37:36 +01:00
Milos Kozak 040d999004 Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3 2019-12-30 23:27:01 +01:00
Milos Kozak 1242236821 Source plugins injection 2019-12-30 23:26:48 +01:00
Andy Rozman 827eee0c3a - removed cancel TBR 2019-12-30 21:35:30 +01:00
Andy Rozman af44d4e7f7 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-30 21:26:35 +01:00
Andy Rozman 8610f47cdf - remove cancel TBR from OmnipoPump code 2019-12-30 21:25:35 +01:00
Milos Kozak ba4d70b264
Merge pull request #2323 from MilosKozak/dagger3d
Dagger3d
2019-12-30 20:12:55 +01:00
AdrianLxM a12026c73e inject instead of static get 2019-12-30 19:52:51 +01:00
AdrianLxM 389ef01861 resolve cyclic dependency 2019-12-30 19:46:11 +01:00
Bart Sopers a17defb817 Report implicitly cancelled tbr when deactivating pod or resetting pod state 2019-12-30 13:32:06 -05:00
Milos Kozak 65f107b01d wearplugin -> dagger 2019-12-30 19:23:17 +01:00
Bart Sopers 05d09e3530 Revert "Prevent TBR from being cancelled twice when setting a new TBR"
This reverts commit 12a71b8d3e.
2019-12-30 13:11:30 -05:00
Andy Rozman 1668b2634c - extension for ErrorHelperActiviity to prevent NPE 2019-12-30 18:43:44 +01:00
Andy Rozman 9de968cb26 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-30 18:37:26 +01:00
Andy Rozman 17ab0db4c3 - extended ErrorDialog to support adding to clipboard
- changed PodDebug code to send code there...
- fixed Bolus code
2019-12-30 18:34:49 +01:00
Bart Sopers 168dffc7fc Don't emit sound for pulse log dialog 2019-12-30 12:04:00 -05:00
Andy Rozman b463f915e1 - fixed cancel Tbr reporting 2019-12-30 17:50:30 +01:00
Andy Rozman f110ab2ba3 - database bolus + treatments AAPS
- database TBR + treatments AAPS
- refactoring bolus a little
2019-12-30 17:30:54 +01:00
Andy Rozman 0260b68fa8 - fixes for init pod #44 2019-12-30 14:38:19 +01:00
Milos Kozak 348936e1b8 IobCobCalculatorPlugin injection 2019-12-30 13:40:42 +01:00
Andy Rozman 54464cf2b6 - added cpying to cplipboard for PodInfoRecentPulseLog (#41)
- added returning pumpId from addToHistory method, so that we can use it
2019-12-30 13:06:05 +01:00
Milos Kozak 295ce489bf LoopPlugin injection 2019-12-30 11:35:49 +01:00
osodebailar bff51df41d issue #2318 Refactor header area destroys layout on Atom . Fixed small_layout to 'extra small' displays like atom 2019-12-30 11:02:26 +01:00
Milos Kozak 270c1c69f4 APS plugins injection 2019-12-30 10:28:56 +01:00
Milos Kozak 716053229a RandomBgPlugin injection 2019-12-30 10:02:40 +01:00
Milos Kozak 2f59cd4f09 TreatmentsCareportalFragment -> kt 2019-12-30 09:50:26 +01:00
Milos Kozak 9ceeaa3136 TreatmentsBolusFragment -> kt 2019-12-30 09:23:02 +01:00
Milos Kozak 7d255d014d resources to SPImplementation 2019-12-30 08:50:27 +01:00
Milos Kozak fef74726b2 daggerize 2019-12-30 00:53:44 +01:00
Andy Rozman 9dee52cd0f Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-29 22:15:58 +01:00