AdrianLxM
|
f0351834ff
|
default DIA
|
2018-05-06 12:49:03 +02:00 |
|
Johannes Mockenhaupt
|
56cbac3b4d
|
Leftover MainApp.gs rewrite.
|
2018-05-06 11:49:16 +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
|
116222858e
|
update lastApproachingDailyLimit
|
2018-05-05 21:12:09 +02:00 |
|
AdrianLxM
|
d99fafe375
|
restrict aproaching daily limit to once every 30 minutes RS
|
2018-05-05 21:10:15 +02:00 |
|
AdrianLxM
|
5458df0907
|
restrict aproaching daily limit to once every 30 minutes Rv2
|
2018-05-05 21:08:17 +02:00 |
|
AdrianLxM
|
c2315b7bea
|
restrict aproaching daily limit to once every 30 minutes R-Korean
|
2018-05-05 21:03:35 +02:00 |
|
AdrianLxM
|
b43eff8e55
|
restrict aproaching daily limit to once every 30 minutes R
|
2018-05-05 21:02:31 +02:00 |
|
AdrianLxM
|
70b2b1502f
|
restrict wrong password notification to once every 30 seconds
|
2018-05-05 20:59:11 +02:00 |
|
AdrianLxM
|
c8c7e12056
|
Wrong password notification
|
2018-05-05 20:54:10 +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 |
|
Johannes Mockenhaupt
|
d15ada5cd9
|
Combo: Fix visual glitch in fragment.
|
2018-05-04 21:27:54 +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 |
|
Milos Kozak
|
61e6404bbe
|
Merge pull request #995 from MilosKozak/wear-wizard
Wear eCarbs
|
2018-05-04 14:33:55 +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 |
|
Milos Kozak
|
963f1e1abf
|
Merge branch 'dev' into startupwizard
|
2018-05-04 13:26:40 +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 |
|
Milos Kozak
|
91f3db782d
|
SWButton rename option to text
|
2018-05-04 10:20:22 +02:00 |
|
Milos Kozak
|
55661ca7a0
|
SWButton
|
2018-05-04 10:17:50 +02:00 |
|
swissalpine
|
010a2f3fd8
|
Make deviation bars transparent
|
2018-05-04 10:04:45 +02:00 |
|
Milos Kozak
|
88d964f135
|
SW reuse save, cleanup
|
2018-05-04 09:35:57 +02:00 |
|
AdrianLxM
|
c34cc73b1e
|
fix wear wizard
|
2018-05-03 23:08:16 +02:00 |
|
AdrianLxM
|
8d6997f519
|
ecarb ignore 0 carbs
|
2018-05-03 22:08:54 +02:00 |
|
AdrianLxM
|
61f07da1a2
|
ecarb doECarb
|
2018-05-03 22:08:43 +02:00 |
|
AdrianLxM
|
c69a541b75
|
ecarb ash first response
|
2018-05-03 22:08:27 +02:00 |
|
Milos Kozak
|
d1958a3e2d
|
Merge branch 'dev' into startupwizard
|
2018-05-03 21:31:55 +02:00 |
|
Milos Kozak
|
02590ddd72
|
SW remove unneeded code
|
2018-05-03 21:29:34 +02:00 |
|
Milos Kozak
|
cc532b9107
|
SWRadioButton cleanup
|
2018-05-03 20:13:27 +02:00 |
|
Milos Kozak
|
94db444acb
|
SW validator, language, cleanup
|
2018-05-03 20:06:13 +02:00 |
|
Milos Kozak
|
36265ab1c6
|
SWPlugin
|
2018-05-03 18:41:47 +02:00 |
|
AdrianLxM
|
62a38ed537
|
wearwizard fix NPE when CobInfo not available - missing part
|
2018-05-03 17:49:22 +02:00 |
|
AdrianLxM
|
b37b892eea
|
wearwizard fix NPE when CobInfo not available
|
2018-05-03 17:49:17 +02:00 |
|
AdrianLxM
|
fe0f2e3ce6
|
wearwizard settings on phone
|
2018-05-03 17:49:13 +02:00 |
|
AdrianLxM
|
c394c045c9
|
wearwizard reduced watch settings
|
2018-05-03 17:49:09 +02:00 |
|
AdrianLxM
|
bdfce784c0
|
wearwizard ensure watch apk is up to date
|
2018-05-03 17:49:05 +02:00 |
|
AdrianLxM
|
ec106726a7
|
wearwizard trend
|
2018-05-03 17:49:01 +02:00 |
|
AdrianLxM
|
24dd4e1710
|
wearwizard cob
|
2018-05-03 17:48:54 +02:00 |
|
Roumen Georgiev
|
515590cdf6
|
other screens
|
2018-05-03 17:04:56 +03:00 |
|
Roumen Georgiev
|
425ba77200
|
other screens
|
2018-05-03 16:59:23 +03:00 |
|
AdrianLxM
|
012593a480
|
Update NotificationStore.java
|
2018-05-03 12:18:48 +02:00 |
|
Roumen Georgiev
|
083730f476
|
WIP: BGSOURCE screen
|
2018-05-03 09:02:16 +03:00 |
|
Milos Kozak
|
e5ed63a46f
|
fix name on future profile switches
|
2018-05-03 00:13:49 +02:00 |
|
Milos Kozak
|
a35c925930
|
Merge pull request #983 from jotomo/issue-939
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
|
2018-05-02 23:20:29 +02:00 |
|
Johannes Mockenhaupt
|
396268d9c8
|
Send invalid boluses (prime boluses) to watch.
|
2018-05-02 22:49:31 +02:00 |
|
Johannes Mockenhaupt
|
599c87f794
|
Combo: better error message when initialization fails.
|
2018-05-02 22:48:57 +02:00 |
|
Milos Kozak
|
a64bfe7a39
|
Merge pull request #977 from MilosKozak/persistent-text
show bg missing not no profile
|
2018-05-02 22:38:07 +02:00 |
|
Milos Kozak
|
f9bbb72831
|
Merge pull request #979 from MilosKozak/lp-ps-always
LP: Allow ProfileSwitch before pump is connected.
|
2018-05-02 22:37:23 +02:00 |
|
Johannes Mockenhaupt
|
79458a1c73
|
Ignore harmless errors (un)subscribing to the message bus.
|
2018-05-02 22:36:52 +02:00 |
|
Milos Kozak
|
28430cc757
|
fix cob calculation
|
2018-05-02 22:35:51 +02:00 |
|
Milos Kozak
|
e2f28e0ae4
|
fix rounding on bolus delivery
|
2018-05-02 22:20:27 +02:00 |
|
AdrianLxM
|
a3421316ac
|
Allow ProfileSwitch before pump is connected.
https://github.com/MilosKozak/AndroidAPS/issues/969
|
2018-05-02 21:38:45 +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
|
eb594c1867
|
show bg missing not no profile
|
2018-05-02 21:09:04 +02:00 |
|
Milos Kozak
|
4cc952900d
|
show progress reason from iobcobthread
|
2018-05-02 18:39:37 +02:00 |
|
Johannes Mockenhaupt
|
c51635dba4
|
Watch: colored preds.
|
2018-05-02 16:01:40 +02:00 |
|
Milos Kozak
|
e562d0f437
|
Merge pull request #957 from triplem/charging_merged
Charging merged
|
2018-05-02 15:04:00 +02:00 |
|
AdrianLxM
|
926ee535d5
|
use MainApp.gs instead of context 2
|
2018-05-02 14:28:16 +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
|
4a22fd355d
|
Merge remote-tracking branch 'milosremote/dev' into use-gs
|
2018-05-02 14:11:45 +02:00 |
|
AdrianLxM
|
5aa3a88c7f
|
remove direct access to sResources 9
|
2018-05-02 13:59:27 +02:00 |
|
AdrianLxM
|
166f2843df
|
remove direct access to sResources 8
|
2018-05-02 13:58:52 +02:00 |
|
AdrianLxM
|
de4643d16f
|
remove direct access to sResources 8
|
2018-05-02 13:57:28 +02:00 |
|
AdrianLxM
|
74d0c71712
|
remove direct access to sResources 7
|
2018-05-02 13:51:24 +02:00 |
|
AdrianLxM
|
545d1d1586
|
remove direct access to sResources 6
|
2018-05-02 13:50:31 +02:00 |
|
AdrianLxM
|
0e4e36f2b1
|
remove direct access to sResources 5
|
2018-05-02 13:49:24 +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 |
|
AdrianLxM
|
a8382daefd
|
remove direct access to sResources 2
|
2018-05-02 13:36:56 +02:00 |
|
AdrianLxM
|
81ad2779bc
|
remove direct access to sResources 1
|
2018-05-02 13:32:41 +02:00 |
|
AdrianLxM
|
cfaa26d337
|
remove one more gs helper
|
2018-05-02 13:28:58 +02:00 |
|
AdrianLxM
|
20263c9fe4
|
remove other gs helper methods
|
2018-05-02 13:17:57 +02:00 |
|
AdrianLxM
|
73b41a7162
|
some more gs
|
2018-05-02 13:12:08 +02:00 |
|
AdrianLxM
|
7b6402de09
|
use gs function in MainApp to get strings
|
2018-05-02 13:05:22 +02:00 |
|
AdrianLxM
|
2749c1c853
|
refactor cob string
|
2018-05-02 11:19:03 +02:00 |
|
AdrianLxM
|
24bd509ec6
|
COB in ongoing notification
|
2018-05-02 08:30:37 +02:00 |
|
AdrianLxM
|
c445c078e1
|
add g to default COB as well
|
2018-05-02 08:30:34 +02:00 |
|
AdrianLxM
|
915dac8ef3
|
COB in external status
|
2018-05-02 08:30:28 +02:00 |
|
AdrianLxM
|
f75329f5dc
|
move COB string representation to CobInfo
|
2018-05-02 08:30:23 +02:00 |
|
Roumen Georgiev
|
15f4f64c4f
|
using View.generateId() instead of fixed value
|
2018-05-02 09:22:26 +03:00 |
|
Markus M. May
|
2d3d39d1dc
|
Use common helper method for day calculation
|
2018-05-01 23:43:18 +02:00 |
|
Markus M. May
|
a46b038381
|
use correct number format
|
2018-05-01 23:34:40 +02:00 |
|
Markus M. May
|
de92125967
|
Fixes wrong algo
|
2018-05-01 22:49:44 +02:00 |
|
Markus M. May
|
306d45bb3e
|
Fix Boolean thingy
|
2018-05-01 22:15:22 +02:00 |
|
Markus M. May
|
02e9ce105c
|
Add boolean thingie from Adrian ;-)
|
2018-05-01 22:01:08 +02:00 |
|
Markus M. May
|
12d80e96ef
|
Merge latest dev version
|
2018-05-01 21:56:33 +02:00 |
|
Markus M. May
|
e91fd00836
|
Add Unit-Test, as well as fixtures for SSID handling
|
2018-05-01 21:46:37 +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 |
|
Milos Kozak
|
537be09493
|
Merge pull request #950 from jotomo/oreo-persistent-notification-annoyance
Make persistent notification not peak on every update on Oreo.
|
2018-05-01 20:08:17 +02:00 |
|
Milos Kozak
|
eb7b67781c
|
Merge pull request #947 from jotomo/issue-940
Don't create empty future carbs records. Fixes #940.
|
2018-05-01 20:07:46 +02:00 |
|
Milos Kozak
|
c991673de1
|
Merge pull request #948 from MilosKozak/zerotempiob
fix zeroTempIOB
|
2018-05-01 20:06:32 +02:00 |
|
Johannes Mockenhaupt
|
af563474d5
|
Skip predictions below 40.
|
2018-05-01 19:33:27 +02:00 |
|