caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
5130 commits 1 branch 20 tags 140 MiB
Commit graph

755 commits

Author SHA1 Message Date
PoweRGbg 90a3a66c30 Revert "Merge remote-tracking branch 'upstream/rsoption' into dev" 
This reverts commit 233fb33659, reversing
changes made to f1f8bae2d1.
 2018-06-13 09:49:37 +03:00
Milos Kozak 30dbbb12a8
Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3 
Wizard: fully undo "ok" on constraints violation
 2018-06-09 11:46:41 +02:00
TebbeUbben 2d94133175 Plugin descriptions 2018-06-08 21:19:46 +02:00
AdrianLxM d6184cc151
Wizard: fully undo "ok" on constraints violation 
Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056
 2018-06-07 22:44:09 +02:00
Milos Kozak 65c8cb22ef check for null context 2018-06-05 14:38:00 +02:00
Milos Kozak 5df51e8a6e check for NPE 2018-06-05 14:35:18 +02:00
TebbeUbben 9cf9da0d22 MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED 2018-06-03 23:33:49 +02:00
Milos Kozak d642418e02 resolve NPE 2018-05-23 23:43:41 +02:00
Milos Kozak 53bdb0bf09 asking permissions to notifications 2018-05-22 23:06:17 +02:00
Milos Kozak 66e50f5b62
Merge pull request #1038 from jotomo/upstreaming 
[Polish] Dialog/color consistency, translations and other small stuff
 2018-05-15 13:09:50 +02:00
Johannes Mockenhaupt 25aa6f859f
On bolus cancel request, cancel all boluses. Partially addresses #646. 2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt 1883ac06dd
Use TT color for TT confirmations in dialogs. 2018-05-13 12:14:49 +02:00
Milos Kozak 8d7df64050
Merge pull request #1016 from MilosKozak/pump-notifications 
Pump notifications
 2018-05-10 23:24:45 +02:00
Milos Kozak 8c2d0d80ee
Merge pull request #1017 from MilosKozak/notification-height 
Tests required: Notification height
 2018-05-09 10:16:29 +02:00
AdrianLxM cdc8e45f32
Merge pull request #1015 from jotomo/lemming-treatment 
Fix finding BG in graph for treatments before the first displayed BG.
 2018-05-06 19:51:01 +02:00
Johannes Mockenhaupt ef70c1f244
MainApp.sResources.getColor -> MainApp.gc. 2018-05-06 11:47:15 +02:00
Johannes Mockenhaupt b9c649bd68
Uso blue/orange for carbs/insulin in confirmation dialogs. 
Aligns with the graph's use of using blueish colors insulin and
orange for carbs stuff.
 2018-05-06 11:46:09 +02:00
AdrianLxM 1ac41323e6 fix notification last line cutoff 2018-05-05 21:55:49 +02:00
AdrianLxM 246c8922df Korean wrong password notification 2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt 1e0b7d331a
Fix finding BG in graph for treatments before the first displayed BG. 
(cherry picked from commit 8bdafe3)
 2018-05-05 19:13:38 +02:00
AdrianLxM f511b9ed39
Merge pull request #1000 from MilosKozak/bolusprogress-dismiss 
IDEA: dismiss bolus progress dialog when Queue is empty
 2018-05-04 19:03:11 +02:00
Milos Kozak 57973d4d3a
Merge pull request #1001 from jotomo/carbs-gen-refactor 
Extract and deduplicate eCarbs generation
 2018-05-04 16:10:23 +02:00
Johannes Mockenhaupt 35a6bbb6a7
Set CareportalEvent.MEALBOLUS for eCarbs. 2018-05-04 14:22:43 +02:00
Johannes Mockenhaupt 43cc3c4908
Extract CarbsGenerator class. 2018-05-04 14:18:55 +02:00
swissalpine 10b67a0c11
Update GraphData.java 2018-05-04 12:31:11 +02:00
AdrianLxM 5c8e99b191 dismiss bolus progress dialog when Queue is empty 2018-05-04 12:24:37 +02:00
swissalpine 010a2f3fd8 Make deviation bars transparent 2018-05-04 10:04:45 +02:00
AdrianLxM 012593a480
Update NotificationStore.java 2018-05-03 12:18:48 +02:00
Johannes Mockenhaupt 79458a1c73
Ignore harmless errors (un)subscribing to the message bus. 2018-05-02 22:36:52 +02:00
Johannes Mockenhaupt 3b19db14fd
Clean up. 2018-05-02 21:25:04 +02:00
Johannes Mockenhaupt 22e90743aa
Fix #939. 2018-05-02 21:24:06 +02:00
AdrianLxM d289c5c7d7 use MainApp.gs instead of context 2018-05-02 14:27:23 +02:00
AdrianLxM 3f3959f785 use MainApp.gs instead of getString from Activity/Dialog 2 2018-05-02 14:21:53 +02:00
AdrianLxM 611d761a41 use MainApp.gs instead of getString from Activity/Dialog 2018-05-02 14:16:40 +02:00
AdrianLxM 545d1d1586 remove direct access to sResources 6 2018-05-02 13:50:31 +02:00
AdrianLxM 3979913a6d remove direct access to sResources 4 2018-05-02 13:46:38 +02:00
AdrianLxM 2af62d8e4e remove direct access to sResources 3 2018-05-02 13:42:50 +02:00
Milos Kozak dbca668afd
Merge pull request #952 from jotomo/rainbow 
Fix missing predictions in graph, color them.
 2018-05-01 20:10:59 +02:00
Johannes Mockenhaupt af563474d5
Skip predictions below 40. 2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt 1e80ca22c6
Don't draw invalidated SMBs. 2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt ee61a71181
Sort predictions so they're properly displayed in the graph. 
GraphView library requires a series to be ordered by the x-value.
 2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt 5ef7506e5f
Clean up prediction colors. 2018-05-01 19:16:28 +02:00
Johannes Mockenhaupt 8c3df40fdf
Don't create empty future carbs records. Fixes #940. 
When very few carbs are stretched out (e.g. 10g over 4h), there are
gaps, so that 1g is generated only every 30m. Don't create empty
records in between.
 2018-05-01 12:22:01 +02:00
AdrianLxM 81037cde5c
Merge pull request #935 from jotomo/calculator-carb-only 
Calculator: carb-only handling.
 2018-04-28 19:29:13 +02:00
Johannes Mockenhaupt 5746e37553
Enable Combo & extended carbs without engineering mode as well. 2018-04-27 19:50:59 +02:00
Johannes Mockenhaupt 21f231e2b3
Calculator: carb-only handling. 
If only carbs where entered/calculated, send them to the pump only
 if the pump supports it, otherwise just add it to the DB.
 2018-04-27 19:49:50 +02:00
Milos Kozak e951a924c4
Merge pull request #931 from MilosKozak/cobchart 
align failoverToMinAbsorbtionRate to cobtime
 2018-04-27 10:54:39 +02:00
AdrianLxM 3356004065 don't hide IOB behind COB 2018-04-26 03:43:43 +02:00
AdrianLxM c045a0a41e align failoverToMinAbsorbtionRate to cobtime 2018-04-26 03:17:57 +02:00
Johannes Mockenhaupt 60fbb1eeba
Fix another NPE. 2018-04-24 23:09:07 +02:00