Commit graph

4358 commits

Author SHA1 Message Date
Roumen Georgiev
01012d817c getting userOptions from v2 2018-06-12 10:29:47 +03:00
Milos Kozak
e7eec8fe69 Poctech BG source 2018-06-11 17:26:31 +02:00
Roumen Georgiev
2441214bb8 added SetUserOptions for DanaR 2018-06-11 11:36:32 +03:00
AdrianLxM
8106907a55 unify padding pills and pumpstatus 2018-06-09 13:53:11 +02:00
AdrianLxM
3a9017ae10
Merge pull request #1092 from TebbeUbben/sw-same-color-scheme
Same color scheme for SW
2018-06-09 13:37:31 +02:00
TebbeUbben
934a7e6797 Same color scheme for SW 2018-06-09 13:27:27 +02:00
TebbeUbben
531a926d00 Close navigation drawer on click 2018-06-09 13:17:26 +02: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
Milos Kozak
6344e88550
Merge pull request #1084 from TebbeUbben/dev
Config builder styling
2018-06-09 11:39:16 +02:00
TebbeUbben
09b93078a8 Fixed typos 2018-06-08 23:45:32 +02:00
TebbeUbben
67b6d94fe5 Android Wear was renamed to WearOS 2018-06-08 23:35:18 +02:00
TebbeUbben
5d60f34e26 Better description for MDI plugin 2018-06-08 23:31:57 +02:00
TebbeUbben
f7597c93d7 Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
2018-06-08 23:30:39 +02:00
TebbeUbben
37d543c865 Improvements to descriptions from Adrian 2018-06-08 23:27:52 +02:00
TebbeUbben
506482082d Fixed descriptions 2018-06-08 21:26:12 +02:00
TebbeUbben
029057f1fc Fix typo 2018-06-08 21:25:19 +02:00
TebbeUbben
2d94133175 Plugin descriptions 2018-06-08 21:19:46 +02:00
TebbeUbben
f9582d042f Don't restore CheckBoxes and RadioButtons automatically 2018-06-08 20:05:33 +02:00
swissalpine
5bf6057838
Update danar_fragment.xml 2018-06-08 19:22:36 +02:00
swissalpine
87ea018181
Update wear_fragment.xml 2018-06-08 19:22:03 +02:00
swissalpine
3c58b94a28
Update objectives_fragment.xml 2018-06-08 19:19:21 +02:00
swissalpine
5df03e4ea7
Update openapsama_fragment.xml 2018-06-08 19:07:04 +02:00
swissalpine
ab599a452b
Update loop_fragment.xml 2018-06-08 19:06:16 +02:00
swissalpine
a926c4db86
Update combopump_fragment.xml 2018-06-08 19:05:34 +02:00
swissalpine
76505e0229
Update careportal_fragment.xml 2018-06-08 19:04:31 +02:00
swissalpine
7bd2f629bf
Update bgsource_fragment.xml 2018-06-08 19:02:20 +02:00
AdrianLxM
bbf09a62f1
synchronize onDestroyView 2018-06-08 06:20:35 +02:00
AdrianLxM
97bbc00dcf
Don't set text onunbound gui elements 2018-06-08 06:19:02 +02:00
TebbeUbben
38526d64c6 These should not be changed 2018-06-07 23:24:10 +02:00
TebbeUbben
e25ebbdafa Protection against callback looping 2018-06-07 23:23:10 +02:00
TebbeUbben
aa86a49339 Use real plugin descriptions 2018-06-07 22:55:13 +02:00
TebbeUbben
13cb4c28ed ConfigBuilder styling 2018-06-07 22:54:27 +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
Roumen Georgiev
17a0aba2e5 remove button if pump is DanaR Korean 2018-06-07 09:34:12 +03:00
Roumen Georgiev
6559f57cd9 remove button if pump is DanaR Korean 2018-06-07 09:33:29 +03:00
Roumen Georgiev
4b7f8615bf
Merge pull request #26 from MilosKozak/rsoption
update
2018-06-07 09:30:22 +03:00
Roumen Georgiev
9e2074433e remove button if pump is DanaR Korean 2018-06-07 09:26:33 +03:00
Milos Kozak
9e099ec741
Merge pull request #1079 from MilosKozak/AdrianLxM-patch-2
Ro update by @bogdangorescu
2018-06-06 23:33:26 +02:00
AdrianLxM
c96f860585
Update strings.xml 2018-06-06 23:19:54 +02:00
AdrianLxM
712549e562
Update strings.xml 2018-06-06 23:04:15 +02:00
Milos Kozak
1d13712aec nsclient setup wizard tweaking 2018-06-06 22:58:50 +02:00
AdrianLxM
4c2babb905
Ro formatted false 3rd 2018-06-06 22:44:06 +02:00
AdrianLxM
964efee162
Ro formatted false 2nd 2018-06-06 22:42:36 +02:00
AdrianLxM
f343cfe0fa
Ro formatted false 2018-06-06 22:39:51 +02:00
AdrianLxM
0996b0f182
Ro update 2018-06-06 22:09:40 +02:00
Milos Kozak
f94d1e85e1 cleanup 2018-06-06 18:32:19 +02:00
Milos Kozak
04fffae811 addd setUserOption to Queue (Dana pumps) 2018-06-06 18:29:40 +02:00
Milos Kozak
6a4bb8a719 layout cleanup 2018-06-06 17:58:59 +02:00
Milos Kozak
d2830d1938 DanaRUserOptionActivity update on pump load 2018-06-06 17:13:58 +02:00
Milos Kozak
bbeca6b83e cleanup 2018-06-06 16:57:00 +02:00
Milos Kozak
4adcb88d12
Merge pull request #1067 from jotomo/fill-one-shot-guard
One-short guards for Fill/Prime dialog.
2018-06-06 08:47:08 +02:00
Roumen Georgiev
7ef97a5334 files renamed and added icon 2018-06-06 09:28:51 +03:00
Roumen Georgiev
f528b708c3 Merge remote-tracking branch 'origin/dev' into dev 2018-06-06 09:22:28 +03:00
Roumen Georgiev
fd4662df32 files renamed and added icon 2018-06-06 09:13:21 +03:00
AdrianLxM
1acefd618b
Merge pull request #1076 from MilosKozak/AdrianLxM-cancel-color
higher contrast ok and cancel buttons
2018-06-05 22:29:21 +02:00
AdrianLxM
e21f99a63d
Merge pull request #1077 from MilosKozak/padding-top
Slightly more padding on top buttons/fields
2018-06-05 22:29:11 +02:00
AdrianLxM
5c6d098601
Merge pull request #1073 from jotomo/french-translation-format-specifier-fix
Fix format specifier in French translation.
2018-06-05 22:28:55 +02:00
Milos Kozak
65c8cb22ef check for null context 2018-06-05 14:38:00 +02:00
Milos Kozak
7e7e921853 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-05 14:37:47 +02:00
Milos Kozak
5df51e8a6e check for NPE 2018-06-05 14:35:18 +02:00
AdrianLxM
32f4a08fa6 slightly more padding on top buttons/fields 2018-06-05 13:26:43 +02:00
Roumen Georgiev
4a481bf294
Merge branch 'dev' into dev 2018-06-05 12:45:00 +03:00
Roumen Georgiev
54cc768a47 files renamed and added icon 2018-06-05 12:39:55 +03:00
Roumen Georgiev
c1b69404d0 files renamed and added icon 2018-06-05 12:19:47 +03:00
Roumen Georgiev
37e6e0268c
Merge pull request #25 from alesinka/master
adding icons from Alessya
2018-06-05 10:55:41 +03:00
AdrianLxM
536fe3e5d2
higher contrast ok and cancel buttons 2018-06-05 00:15:41 +02:00
AdrianLxM
171209503e
remove unneeded log statement 2018-06-05 00:04:03 +02:00
AdrianLxM
9d07e3e83f
Merge pull request #1072 from jotomo/silly-idea
Revert "Update prediction colors to match NS."
2018-06-04 23:54:22 +02:00
AdrianLxM
4998ebae89
Merge pull request #1071 from TebbeUbben/new-design
TabLayout + NavigationDrawer
2018-06-04 23:53:42 +02:00
TebbeUbben
5fa79b1db9 Changed accent color to #009688 2018-06-04 23:34:56 +02:00
TebbeUbben
f7b19e37a1 Button for plugin preferences 2018-06-04 21:56:31 +02:00
TebbeUbben
80e9d769e4 Compact version of toolbar 2018-06-04 21:34:21 +02:00
Alessya
fbe44b7190 new icon added to danaR tab - user options 2018-06-04 17:48:02 +03:00
Johannes Mockenhaupt
d31b90cd3e
Fix format specifier in French translation. 2018-06-04 15:38:06 +02:00
Roumen Georgiev
19e7d507b2 shutdown value can be 0 2018-06-04 10:24:20 +03:00
Roumen Georgiev
1147c28f04 use numberPicker instead of editText 2018-06-04 10:23:01 +03:00
Johannes Mockenhaupt
358108be49
Revert "Update prediction colors to match NS."
This reverts commit dd41afa
2018-06-04 03:00:50 +02:00
TebbeUbben
6c1ccebb4a Moved padding to Toolbar 2018-06-03 23:42:10 +02:00
TebbeUbben
9cf9da0d22 MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED 2018-06-03 23:33:49 +02:00
TebbeUbben
263275659a TabLayout + NavigationDrawer 2018-06-03 23:28:04 +02:00
TebbeUbben
f8c621dc6a Fixed tests 2018-06-03 11:04:33 +02:00
TebbeUbben
a86c654f8d Use real TBR cancels and dismiss their alerts 2018-06-03 10:56:29 +02:00
Johannes Mockenhaupt
ef6ee43c32
One-short guards for Fill/Prime dialog. 2018-06-02 18:06:04 +02:00
TebbeUbben
f151cbb0bf TBR emulation 2018-06-02 16:37:53 +02:00
Roumen Georgiev
054003460c push new settings to pump 2018-06-01 16:42:56 +03:00
Milos Kozak
96fb4323f8
Merge pull request #1064 from jotomo/purple-pony
Update prediction colors to match NS.
2018-06-01 13:57:20 +02:00
Johannes Mockenhaupt
ef8f4f1448
Fix unit test. 2018-06-01 12:24:09 +02:00
Roumen Georgiev
75dbf71a70 Merge remote-tracking branch 'origin/dev' into dev 2018-06-01 12:11:29 +03:00
Roumen Georgiev
861f9bdd8d Timeformat reverse 2018-06-01 12:10:08 +03:00
Roumen Georgiev
9569fbf183
Merge branch 'dev' into dev 2018-06-01 12:02:41 +03:00
Roumen Georgiev
908fd9f77e strings update 2018-06-01 11:55:59 +03:00
Roumen Georgiev
85bef0036b back to original 2018-06-01 11:45:31 +03:00
Roumen Georgiev
4581733cd7 some debugging output and forced getting user options 2018-06-01 11:41:37 +03:00
Roumen Georgiev
319e786988 display 666 in backlightontime if no settings read 2018-06-01 10:08:13 +03:00
Roumen Georgiev
f3d19aa6f4 convert int values to strings 2018-06-01 09:38:18 +03:00
Johannes Mockenhaupt
dd41afa55a
Update prediction colors to match NS. 2018-06-01 02:53:23 +02:00
swissalpine
dd60cadd5a
Fix broken cage age 2018-05-31 22:22:22 +02:00
Roumen Georgiev
bbb9c681e6 filling in some data 2018-05-31 17:16:30 +03:00
Roumen Georgiev
41af503104 filling in some data 2018-05-31 17:10:09 +03:00
Roumen Georgiev
da89ea1643 some formatting 2018-05-31 16:47:58 +03:00