Commit graph

740 commits

Author SHA1 Message Date
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
AdrianLxM 7f403166c7 restore preferences 2017-10-06 03:05:36 +02:00
AdrianLxM bd93fc1adb temp target presets 2017-10-06 02:53:23 +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 6d08a608a2 dana layout 2017-10-03 22:37:53 +02:00
Milos Kozak 58ed0416d1 fix conflict 2017-10-03 22:33:35 +02:00
Milos Kozak 3a014949e9 remove firmware check 2017-10-03 18:45:54 +02:00
Milos Kozak 97f69c50fd store pairing key per pump 2017-10-02 22:21:11 +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 2e61bc136f Add files via upload 2017-09-29 09:44:25 +03:00
Roumen Georgiev 3c0a509541 Add files via upload 2017-09-29 09:43:42 +03:00
Roumen Georgiev a152f94f53 Add files via upload 2017-09-29 09:42:42 +03:00
Roumen Georgiev cb982477cd Add files via upload 2017-09-29 09:41:32 +03:00
Roumen Georgiev 271534a64b Add files via upload 2017-09-29 09:40:58 +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
Milos Kozak 8cd8c6b5d9 more progress logging on RS 2017-09-23 12:28:11 +02:00
Milos Kozak 1eeb1c6f7a RS history OK 2017-09-22 14:57:23 +02:00
Milos Kozak fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak c2afa328e3 Merge branch 'dev' into tt-in-wizard 2017-09-18 20:44:54 +02:00
Milos Kozak 04994924c5 GUI tweaking, small fixes 2017-09-18 18:41:45 +02:00
Milos Kozak 7f4888978e warn if basal step is not 0.01 2017-09-18 13:28:00 +02:00
boysim 81aadcc1be Update strings.xml 2017-09-17 17:02:27 +02:00
Milos Kozak 08fca41b5f partial bolus code, messages blocked by sleep :( 2017-09-14 22:53:11 +02:00
Milos Kozak ed6cabe7fa initial RS work 2017-09-13 00:35:03 +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
SMUSTAF1 1fd99a9582 changing the color of the bolus value, for visual clarify and confirmation. Reducing errors. 2017-09-05 13:29:43 +02:00
fedor apanasenko ed8582b36a update russian 2017-09-01 10:37:59 +03:00
Milos Kozak 46f111076f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-31 22:01:25 +02:00
Milos Kozak db952759e1 Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
Radoslav Radev e1c4074663 Update strings.xml 2017-08-31 09:09:26 +03: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 162389a7e0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-27 11:46:25 +02:00
Milos Kozak ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak c9bfd27d93 Merge pull request #396 from warstar2187/dev
KR translation update
2017-08-27 00:38:44 +02:00
warstar2187 761f9f5075 Update strings.xml 2017-08-27 06:09:17 +09:00
Radoslav Radev 6bf120e9da Update strings.xml 2017-08-26 22:59:14 +03:00
Milos Kozak 40d86eb87a fix strings 2017-08-26 14:37:38 +02:00
Milos Kozak 6ea7549e4f update languages 2017-08-26 12:07:37 +02:00
boysim 196e0bb309 Update strings.xml 2017-08-24 23:18:21 +02:00
Patrik Nilsson c91988081f Update strings.xml
Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)
2017-08-21 00:01:12 +02:00
Milos Kozak ab035e3949 Merge pull request #371 from diabetesdt1/patch-2
Update strings.xml
2017-08-20 21:44:21 +02:00
warstar2187 36c25cbd45 Update strings.xml 2017-08-19 21:35:03 +09:00
diabetesdt1 efb9bed3fa Update strings.xml 2017-08-17 22:21:09 +02:00
diabetesdt1 ef42193d95 Update strings.xml
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)

objectives_*_ updated

dia_too_short updated
2017-08-17 22:06:10 +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
diabetesdt1 64446f07c5 Update strings.xml
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
2017-08-17 12:40:14 +02:00
AdrianLxM 8287fe22cf AcceptTempButton visible 2017-08-16 23:22:14 +02:00
AdrianLxM 63793ed358 Show profile switch button in profiles
Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written.
Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE".

This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.
2017-08-16 17:56:57 +02:00
Milos Kozak 4c490c32f7 Merge pull request #361 from MilosKozak/oref-insulincurves
Oref Insulincurves
2017-08-15 10:13:50 +02:00
Milos Kozak 151165809e Dutch language 2017-08-14 21:57:49 +02:00
AdrianLxM 707d5a480c insulincurves - rename peak to peak time 2017-08-14 16:02:07 +02:00
AdrianLxM ced1da09cf insulincurves - i18n 2017-08-14 15:25:37 +02:00
AdrianLxM 085caddeee insulincurves - freepeak 2017-08-14 15:24:55 +02:00
Milos Kozak 377b711896 Merge pull request #352 from diabetesdt1/patch-1
Update strings.xml
2017-08-13 20:31:54 +02:00
Milos Kozak 2770e93ed4 Merge pull request #337 from RoumenGeorgiev/dev
Alarm for StaleData
2017-08-11 18:45:52 +02:00
diabetesdt1 8cd24fd919 Update strings.xml
Replaced "Empfindlichkeit" with "Sensitivität"
2017-08-11 13:28:39 +02:00
diabetesdt1 a69a94a384 Update strings.xml 2017-08-11 12:48:15 +02:00
diabetesdt1 15fc53530d Update strings.xml
Changed Nightscout to NS back (but not on the short Text).
Add more Translations.
Overview-Notification used and not "Popup-Notification".
Removed on short Names the ".
I think "treatment" = "Behandlung" sounds wrong :-|
2017-08-11 12:43:46 +02:00
diabetesdt1 0b62669079 Update strings.xml
typo fixed
2017-08-11 07:30:53 +02:00
Milos Kozak 26fbd450b0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv 2017-08-10 22:39:25 +02:00
Milos Kozak 3ca058ce60 SV language cleanup 2017-08-10 22:33:38 +02:00
diabetesdt1 d78928a264 Update strings.xml
typo fixed and empty strings removed
2017-08-10 21:40:03 +02:00
diabetesdt1 c5b5d65efc Update strings.xml 2017-08-10 21:29:41 +02:00
diabetesdt1 8df0ccdbb1 Update strings.xml
rollback language-names
2017-08-10 21:28:09 +02:00
diabetesdt1 33f5e97ac6 Update strings.xml
add more german translation and typos fixed
2017-08-10 21:12:56 +02:00
Milos Kozak dae82d49fb Merge remote-tracking branch 'patrik/dev' into sv 2017-08-10 16:29:42 +02:00
ellabellakaramella 0766ac812c SV translation 2017-08-10 15:15:40 +02:00
Winfried Kuiper 5b43f11a3f Update strings.xml
Confirmation=Bestätigung statt Konfiguration (configuration)
2017-08-09 22:12:09 +02:00
Winfried Kuiper 99a0edfa06 Update strings.xml
Missing units in german translation
2017-08-09 22:03:59 +02:00
Milos Kozak 2ae0028495 Swedish 2017-08-07 14:06:11 +02:00
RoumenGeorgiev 4f054907cb Merge pull request #1 from MilosKozak/dev
Dev
2017-08-07 09:17:07 +03:00
Milos Kozak 4e4088f164 remove unneeded strings 2017-08-05 18:47:01 +02:00
Milos Kozak f834b3b7e0 remove unneeded texts 2017-08-05 17:43:31 +02:00
Milos Kozak 1604b85d34 Merge branch 'dev' into move-to-range-in-profile 2017-08-05 14:48:41 +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
AdrianLxM 1ac1b77fd4 remove translated string not in default strings and add flag to cancel method 2017-08-03 02:01:52 +02:00
AdrianLxM 23abc0e4e5 Some more German 2017-08-02 00:08:56 +02:00
AdrianLxM 5d51b8f0f9 Some more German 2017-08-01 23:56:16 +02:00
AdrianLxM e30e62e9ab Some German translations, remove unused strings, App name for all 2017-08-01 23:46:58 +02:00