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 |
|
Roumen Georgiev
|
39e704645b
|
create userOptionsActivity class
|
2018-05-31 14:45:26 +03:00 |
|
Roumen Georgiev
|
e4e4829c73
|
update of strings
|
2018-05-31 14:18:43 +03:00 |
|
Roumen Georgiev
|
f71372444b
|
strings for danaR options fragment
|
2018-05-31 13:54:37 +03:00 |
|
Markus M. May
|
a587f72de2
|
Fix wrong usage of event in refactored source
|
2018-05-30 18:09:41 +02:00 |
|
Milos Kozak
|
418f68153e
|
Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering
NSClient as source without advanced filtering
|
2018-05-30 08:08:04 +02:00 |
|
Markus M. May
|
0fe744c3e6
|
Remove unnecessary assignment
|
2018-05-29 21:44:33 +02:00 |
|
Markus M. May
|
41503800e8
|
Remove some duplicate code lines
|
2018-05-29 20:57:55 +02:00 |
|
AdrianLxM
|
de1196f34b
|
NSClient as source without advanced filtering
|
2018-05-29 12:57:07 +02:00 |
|
Milos Kozak
|
7e57c30ecf
|
SW Exit label
|
2018-05-25 13:00:08 +02:00 |
|
Milos Kozak
|
35c07d1e60
|
SW scroll to the top on activity create
|
2018-05-24 00:13:59 +02:00 |
|
Milos Kozak
|
d642418e02
|
resolve NPE
|
2018-05-23 23:43:41 +02:00 |
|
Milos Kozak
|
683caf78f8
|
SW configure insulin button
|
2018-05-23 13:47:16 +02:00 |
|
Milos Kozak
|
a7cfcd56e3
|
SW fix return to 1st page
|
2018-05-23 13:20:24 +02:00 |
|
Milos Kozak
|
fa2c0ab003
|
Merge pull request #994 from MilosKozak/startupwizard
Startupwizard
|
2018-05-22 23:07:04 +02:00 |
|
Milos Kozak
|
53bdb0bf09
|
asking permissions to notifications
|
2018-05-22 23:06:17 +02:00 |
|
Milos Kozak
|
5d27a28dc9
|
SW eula
|
2018-05-22 20:02:38 +02:00 |
|
Milos Kozak
|
250f9f74a0
|
move askForStoragePermission
|
2018-05-22 18:59:34 +02:00 |
|
Milos Kozak
|
2626e5bb63
|
SW android permissions
|
2018-05-22 17:34:09 +02:00 |
|
Milos Kozak
|
4fa24fb009
|
SW add more texts
|
2018-05-20 23:44:09 +02:00 |
|
Milos Kozak
|
c723deaf02
|
SW patient age screen finalization
|
2018-05-20 22:01:32 +02:00 |
|
Milos Kozak
|
b57683eaf5
|
SW rename package
|
2018-05-20 21:55:53 +02:00 |
|
Milos Kozak
|
f24d296836
|
SW nsclient screen finalizing
|
2018-05-20 21:36:17 +02:00 |
|
AdrianLxM
|
953128ffe5
|
UAM without advanced filtering
|
2018-05-20 19:17:46 +02:00 |
|
Milos Kozak
|
52a4f9af14
|
SW loop screen update
|
2018-05-20 16:29:15 +02:00 |
|
Milos Kozak
|
d079052944
|
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard
|
2018-05-20 16:18:10 +02:00 |
|
Milos Kozak
|
de8557a115
|
SW sensitivity plugin
|
2018-05-20 16:17:53 +02:00 |
|
Milos Kozak
|
5b9594bdbb
|
SW create elements package
|
2018-05-20 15:09:32 +02:00 |
|
Milos Kozak
|
d0ed4bd717
|
SWString fix
|
2018-05-20 15:01:03 +02:00 |
|
Milos Kozak
|
bac1be1944
|
Merge pull request #1050 from boysim/dev
Added and improved dutch translations
|
2018-05-20 14:46:41 +02:00 |
|
Milos Kozak
|
7714aa9138
|
Merge branch 'dev' into startupwizard
|
2018-05-20 14:18:58 +02:00 |
|
boysim
|
5c346f5b79
|
addedd formattng="false"
|
2018-05-20 14:18:37 +02:00 |
|
Milos Kozak
|
53cbe05436
|
Merge pull request #1019 from McHoffi/obj.7-add-info
Obj.7 add info about using SMB/maxIOB
|
2018-05-20 14:14:11 +02:00 |
|
boysim
|
e2bfb224f2
|
dutch typo fixes
|
2018-05-20 13:36:28 +02:00 |
|
boysim
|
da8acd4a1e
|
dutch typo fixes
|
2018-05-20 12:55:52 +02:00 |
|
Simon Pauwels
|
25b20f13f1
|
Merge pull request #50 from MilosKozak/dev
20 mei
|
2018-05-20 12:20:49 +02:00 |
|
Milos Kozak
|
948e925d12
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-20 10:56:37 +02:00 |
|
Milos Kozak
|
06e52bb6ae
|
remove duplicated key
|
2018-05-20 10:56:32 +02:00 |
|
Roumen Georgiev
|
764e035666
|
remove wizard from backstack and fix the Exit -> returning to SW
|
2018-05-16 15:35:17 +03:00 |
|
Milos Kozak
|
e91d7e0d11
|
Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2
Swedish update
|
2018-05-15 14:27:39 +02:00 |
|
AdrianLxM
|
bf23a8f935
|
polish update
|
2018-05-15 14:20:35 +02:00 |
|
AdrianLxM
|
bae05b26bb
|
Update strings.xml
Thanks Marcus
|
2018-05-15 14:03:14 +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 |
|
Milos Kozak
|
e58149379a
|
Merge pull request #1043 from jotomo/issue-646
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.
|
2018-05-15 10:55:04 +02:00 |
|
Johannes Mockenhaupt
|
561c7fb470
|
Add test.
|
2018-05-14 00:38:47 +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
|
29efe11ece
|
Combo: always send out progress updates (SMB or not).
Without this, showing SMB progress on wear is broken.
(cherry picked from commit 5ebff72)
|
2018-05-13 23:20:29 +02:00 |
|
TebbeUbben
|
3103a0f276
|
Some styling for SW
|
2018-05-13 13:40:34 +02:00 |
|
Johannes Mockenhaupt
|
52da1feaf0
|
i18n: add German translation, layout issues with longer translations.
Dialog headers (insulin, carbs, prime/fill) now lock proper at least
in English and German.
|
2018-05-13 13:35:24 +02:00 |
|
Johannes Mockenhaupt
|
24e672a7f8
|
Add icon header to calibration dialog.
|
2018-05-13 12:48:30 +02:00 |
|
Johannes Mockenhaupt
|
d80fecc390
|
Add T.now, plus, minus methods.
|
2018-05-13 12:44:47 +02:00 |
|
Johannes Mockenhaupt
|
d0492462a4
|
Add time to build version.
|
2018-05-13 12:32:45 +02:00 |
|
Johannes Mockenhaupt
|
1883ac06dd
|
Use TT color for TT confirmations in dialogs.
|
2018-05-13 12:14:49 +02:00 |
|
boysim
|
aab85fe298
|
added dutch translations
|
2018-05-11 23:23:55 +02:00 |
|
boysim
|
bf5e8e7142
|
added dutch translations
|
2018-05-11 21:26:42 +02:00 |
|
Simon Pauwels
|
f788f5981d
|
Merge pull request #49 from MilosKozak/dev
11/05
|
2018-05-11 21:05:31 +02:00 |
|
Milos Kozak
|
4fae6c703c
|
SW autostart SetupWizard
|
2018-05-11 13:14:59 +02:00 |
|
Milos Kozak
|
ff2cc04408
|
SW warn if exported configuration is missing
|
2018-05-11 13:04:17 +02:00 |
|
Milos Kozak
|
7be418fdf2
|
Merge pull request #980 from triplem/de
DE translation
|
2018-05-11 09:24:24 +02:00 |
|
Markus M. May
|
cdd264686b
|
fix duplicate %
|
2018-05-11 08:43:24 +02:00 |
|
Milos Kozak
|
337a3d9776
|
SW show ObjectivesFragment
|
2018-05-11 08:30:21 +02:00 |
|
Milos Kozak
|
0a51c86afb
|
SW Configure APS button
|
2018-05-11 00:09:35 +02:00 |
|
Milos Kozak
|
376fffa6ec
|
SW Import settings, Skip wizard
|
2018-05-10 23:59:20 +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
|
e105e5149e
|
Merge pull request #1032 from jotomo/wear-wizard-tt
Wear wizard: add TT config option.
|
2018-05-10 16:53:34 +02:00 |
|
Markus M. May
|
6d04d4b6e5
|
use positional indices in formatted strings to allow the usage of the translation editor
|
2018-05-10 16:53:01 +02:00 |
|
Roumen Georgiev
|
91c0b1a2ec
|
make Objectives visible
|
2018-05-10 14:36:05 +03:00 |
|
Roumen Georgiev
|
61afdd6e4c
|
cleanup
|
2018-05-10 14:05:33 +03:00 |
|
Roumen Georgiev
|
9ac081dd1d
|
arrays.xml clean
|
2018-05-10 14:01:17 +03:00 |
|
Roumen Georgiev
|
016aa1c069
|
Added insulin descriptions to SW screen
|
2018-05-10 13:56:50 +03:00 |
|
Roumen Georgiev
|
2fa77d2a8c
|
Added insulin descriptions to SW screen
|
2018-05-10 13:49:13 +03:00 |
|
Roumen Georgiev
|
33a6135e75
|
Added insulin descriptions to SW screen
|
2018-05-10 13:48:18 +03:00 |
|
boysim
|
0227fc0089
|
added dutch translations
|
2018-05-10 11:53:38 +02:00 |
|
Roumen Georgiev
|
06180e3bbd
|
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-10 12:51:12 +03:00 |
|
Simon Pauwels
|
a5babe7934
|
Merge pull request #48 from MilosKozak/dev
10/05
|
2018-05-10 10:59:51 +02:00 |
|
Milos Kozak
|
71b44edea6
|
SW enable loop
|
2018-05-09 19:34:15 +02:00 |
|
Milos Kozak
|
fb7067b207
|
SW profile switch
|
2018-05-09 19:24:20 +02:00 |
|
Milos Kozak
|
1ba828d20a
|
SWFragment
|
2018-05-09 18:49:42 +02:00 |
|
Johannes Mockenhaupt
|
a2a165d510
|
Wear wizard: make TT option depend on BG being enabled.
|
2018-05-09 16:46:22 +02:00 |
|
Roumen Georgiev
|
e3153230e0
|
added NSClient followup
|
2018-05-09 17:11:07 +03:00 |
|
Milos Kozak
|
0060a2ba7f
|
SW show pump status
|
2018-05-09 15:10:47 +02:00 |
|
Roumen Georgiev
|
50f8bf2d18
|
fix for screens adding up
|
2018-05-09 15:55:02 +03:00 |
|
Roumen Georgiev
|
bfd61a65a0
|
fix for screens adding up
|
2018-05-09 15:44:40 +03:00 |
|
Roumen Georgiev
|
41d736e176
|
updated to latest from Milos
|
2018-05-09 15:06:34 +03:00 |
|
Roumen Georgiev
|
a7bbf93599
|
Merge pull request #19 from MilosKozak/startupwizard
Startupwizard
|
2018-05-09 14:49:17 +03:00 |
|
Roumen Georgiev
|
0e8f0669c5
|
Update SWDefinition.java
|
2018-05-09 14:48:35 +03:00 |
|
Milos Kozak
|
bacb3fb337
|
SW pump screen
|
2018-05-09 13:38:17 +02:00 |
|
Roumen Georgiev
|
1f2f2f54fc
|
added SWCheckbox item
|
2018-05-09 14:15:53 +03:00 |
|
Milos Kozak
|
ed43eddc83
|
SWInfotext
|
2018-05-09 11:55:21 +02:00 |
|
Milos Kozak
|
61a7d69a65
|
Merge branch 'dev' into startupwizard
|
2018-05-09 11:41:05 +02:00 |
|
Milos Kozak
|
dbc5e3689a
|
Merge pull request #1028 from andyrozman/translation_irish
Translation - Irish (Gaeilge)
|
2018-05-09 11:20:52 +02:00 |
|
Andy Rozman
|
bacc79970a
|
Added formated=false to some translations.
|
2018-05-09 10:19:27 +01:00 |
|
Milos Kozak
|
8c2d0d80ee
|
Merge pull request #1017 from MilosKozak/notification-height
Tests required: Notification height
|
2018-05-09 10:16:29 +02:00 |
|
Roumen Georgiev
|
d5a3177c35
|
trying pump followup screen -NOT WORKING
|
2018-05-09 11:06:52 +03:00 |
|
McHoffi
|
77522d0770
|
Update strings.xml
|
2018-05-09 09:45:53 +02:00 |
|
Milos Kozak
|
0c848b25f6
|
Merge branch 'dev' into translation_irish
|
2018-05-09 09:25:11 +02:00 |
|
Milos Kozak
|
e29a590cad
|
Merge pull request #1020 from MilosKozak/dia-refactor
default DIA
|
2018-05-08 23:43:54 +02:00 |
|
Milos Kozak
|
62a83bc197
|
Merge pull request #1010 from MilosKozak/sv-update
swedish update
|
2018-05-08 23:32:10 +02:00 |
|
Milos Kozak
|
3f568c2724
|
Merge pull request #1030 from triplem/wifi_connection
Add isConnected, enable NSClient only, if really connected to internet
|
2018-05-08 23:30:51 +02:00 |
|
Milos Kozak
|
faba0d9ff6
|
Merge pull request #1023 from MilosKozak/polish-translation
Polish translation
|
2018-05-08 23:27:14 +02:00 |
|
Milos Kozak
|
8c042b4bc8
|
Merge pull request #1029 from RadoslavR/patch-58
bg translation again
|
2018-05-08 23:18:52 +02:00 |
|