Commit graph

305 commits

Author SHA1 Message Date
Milos Kozak
9ec3efbaab fix conflict 2017-10-09 23:14:46 +02:00
Johannes Mockenhaupt
62803f2a4d
Use existing string resource. 2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt
70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile. 2017-10-09 21:03:25 +02:00
Milos Kozak
60086dac8d Merge remote-tracking branch 'origin/dev' into profile 2017-10-07 18:30:55 +02:00
Milos Kozak
a54b9e52d8 Merge pull request #446 from AdrianLxM/numberpicker-update
overview checkboxes cutoff fix
2017-10-07 18:29:56 +02:00
Milos Kozak
ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
AdrianLxM
046c28856c treatments in config builder 2017-10-07 01:18:28 +02:00
AdrianLxM
10d273dac8 checkboxes for NS-Client layouts 2017-10-06 15:48:32 +02:00
AdrianLxM
333b131c1e overview checkboxes cutoff fix 2017-10-06 13:53:55 +02:00
Milos Kozak
f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
Milos Kozak
3d58fe6bb5 cleanup 2017-10-04 23:24:56 +02:00
Milos Kozak
96edac5ddf LocalProfile fix 2017-10-04 23:17:19 +02:00
Milos Kozak
8cecac0a7f more LocalProfile work 2017-10-02 19:57:41 +02:00
Roumen Georgiev
ef803d6a41 In one line 2017-09-29 15:06:23 +03:00
Roumen Georgiev
e004b95a60 Update danar_fragment.xml 2017-09-29 09:50:07 +03:00
Roumen Georgiev
7444bc11fa text identation 2017-09-29 09:47:29 +03:00
Roumen Georgiev
92e2008692 Adding button Icons 2017-09-29 09:40:11 +03:00
Milos Kozak
91b02d4d39 fill dialog refactor & code clean 2017-09-24 14:51:16 +02:00
Milos Kozak
1823cd3f24 extended bolus dialog refactor 2017-09-24 13:00:59 +02:00
Milos Kozak
082414f0d3 CPP support to profile switch 2017-09-24 10:39:54 +02:00
Milos Kozak
349b27e31a NS profile fragment shows all profiles 2017-09-23 23:54:43 +02:00
Johannes Mockenhaupt
627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false.
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt
b1e3b45ce9
Add temp target to Wizard dialog
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
2017-09-09 16:30:17 +02:00
Milos Kozak
db952759e1 Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
Milos Kozak
7da8b2de5c visibility icon 2017-08-29 21:40:06 +02:00
Milos Kozak
7dfe77dc9c single line in configbuilder 2017-08-29 19:47:32 +02:00
Milos Kozak
981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Milos Kozak
ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak
ca3d94a8ca fix merge conflict 2017-08-17 21:21:38 +02:00
Milos Kozak
73c2be5248 isValid implementation 2017-08-17 20:51:24 +02:00
AdrianLxM
92077dcb6a Show profile on tap in Treatments->ProfileSwitch 2017-08-17 17:03:08 +02:00
AdrianLxM
8287fe22cf AcceptTempButton visible 2017-08-16 23:22:14 +02:00
RoumenGeorgiev
714a292d78 fixed wrong pasting 2017-08-04 15:05:09 +03:00
RoumenGeorgiev
529d267b9d Added check for staleData and notification
with every loop
2017-08-04 12:29:48 +03:00
AdrianLxM
36e6cb8497 remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00
Milos Kozak
9cf5c6b6c3 hide all overview buttons by default 2017-08-01 20:52:23 +02:00
Milos Kozak
34d4bec556 move cancel temp to actions 2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35 new temp basal dialog refactor 2017-08-01 20:02:17 +02:00
AdrianLxM
1c0e97c175 recategorize cp icons 2017-07-22 20:57:30 +02:00
AdrianLxM
2e32d12bc0 removed unnecessary text colour and fixed indentation 2017-07-22 14:34:59 +02:00
AdrianLxM
c187bf1575 layout indentation 2017-07-22 14:30:55 +02:00
Roumen Georgiev
54697df358 Moving some buttons to the right categories 2017-07-22 14:27:51 +02:00
AdrianLxM
3d4fa0cebf remove duplicate IDs and indentation fix 2017-07-22 02:15:55 +02:00
AdrianLxM
10d27f0b6a Picture renaming (#311)
* adding icons
2017-07-21 22:24:06 +02:00
Johannes Mockenhaupt
c95879e6ad
Align OpenAS(A)MA fragments with layout of other fragments.
Removes a margin that makes the top elements jump up and
down when flipping through tabs.
2017-07-19 12:32:18 +02:00
Milos Kozak
5a27f9afa1 allow lock screen in nsclient mode 2017-07-03 00:02:54 +02:00
Milos Kozak
e9dba7136d nsclient layout for phones 2017-07-02 11:28:03 +02:00
Milos Kozak
4d16b04acd buttons on overview GONE before profile is loaded 2017-06-30 17:50:30 +02:00
Milos Kozak
37055cd917 allow decimal number in NumberPicker 2017-06-30 17:43:10 +02:00
Milos Kozak
38002be73d check for units null 2017-06-30 10:35:05 +02:00