Commit graph

8094 commits

Author SHA1 Message Date
Milos Kozak 1b4d06101d Fix creating careportal entries in Actions tab 2020-01-02 18:25:49 +01:00
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
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
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
Bart Sopers a17defb817 Report implicitly cancelled tbr when deactivating pod or resetting pod state 2019-12-30 13:32:06 -05: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
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
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
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
Andy Rozman 95623c123b - making text for initpod smaller. #47 2019-12-29 22:15:27 +01:00
Bart Sopers 943a9f0e20 Knit in Omnipod translations 2019-12-29 12:21:35 -05:00
Bart Sopers 991bde8182 Processed @ZandMarc's suggestions for init Pod wizard strings 2019-12-29 12:16:18 -05:00
Bart Sopers a79a1c1108 Rename PodInfo*HighFlashLogDump to PodInfo*PulseLog and don't show spaces in hex string when showing the response of these commands (as per suggested by @itsmojo) 2019-12-28 21:56:10 -05:00
Milos Kozak 87f8f419a7
Merge pull request #2273 from Philoul/Steampunk_Auto_granularity
Steampunk watchface, add "Auto Granularity" option
2019-12-28 22:09:46 +01:00
Milos Kozak f1c3b5c23d
New Crowdin translations (#2289)
* New translations strings.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* 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 (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* 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)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)
2019-12-28 22:07:47 +01:00
Milos Kozak 82882c52e6
Merge pull request #2305 from osodebailar/refactor-header-area
refactor overview with new header area and better formated user value…
2019-12-28 22:06:49 +01:00
Milos Kozak e1394ec5dd
Merge pull request #2315 from jotomo/refactor-rename-treatmentsplugin-getcarbtreatments
Refactor: improve misleading method name.
2019-12-28 21:48:57 +01:00
Milos Kozak 05281b7e8b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-12-28 21:45:17 +01:00
Milos Kozak b488ba1b0f exclude codeStyles from .gitignore 2019-12-28 21:45:09 +01:00
Andy Rozman 16da0358eb Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-28 21:22:21 +01:00
Andy Rozman 7628e1d0a7 - fix for #44 2019-12-28 21:22:06 +01:00
Johannes Mockenhaupt 244e99f5c9
Refactor: improve misleading method name. 2019-12-28 17:10:19 +01:00
Andy Rozman a719d44851 - add logging to task 2019-12-28 13:14:07 +01:00
Bart Sopers ae0e18e128 Show error dialog for uncertain bolus 2019-12-27 19:32:50 -05:00
Andy Rozman c3236352d4 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2019-12-27 21:18:02 +01:00
Andy Rozman a55f12ebb8 - temporary solution for Pod Debig thingy 2019-12-27 21:17:35 +01:00
Bart Sopers e8ca4259e1 Rename pulse log related stuff in UI 2019-12-27 14:27:18 -05:00
Bart Sopers 10ab880e28 Retry Get pulse log command in case of failure 2019-12-27 13:51:20 -05:00
Bart Sopers 6d377d7b6a Handle exceptions when retrieving pod pulse log 2019-12-27 13:31:40 -05:00
Bart Sopers 5cbb5c8baa Improve some Omnipod translations 2019-12-27 12:54:59 -05:00