Commit graph

1000 commits

Author SHA1 Message Date
Milos Kozak
13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt
f33d55b092
Trim combo prefs. 2017-10-17 19:37:32 +02:00
Johannes Mockenhaupt
5131b8b62f
Remove combo hacks outside of combo plugin. 2017-10-17 12:20:48 +02:00
Johannes Mockenhaupt
41ebabe5e7
Merge remote-tracking branch 'origin/dev' into combo-v2
* origin/dev: (126 commits)
  ConfigBuilder: hide disabled plugins by default.
  sum on name for LP
  log to debug not error
  logger reformat
  logging
  rhinoAMA first full run
  rhinoAMA first crashfree call
  rhino some more cleanups
  rhino logging and cleanups
  rhino MA looping
  rhino first real detemine-basal call
  rhino small refactor
  NDK filters to work around j2v8 vs. libBleCommandUtil issue.
  NewTreatmentDialog: sanitize inputs, fixes #417.
  rhino complex parameter passing
  rhino first parameter passing
  rhino function passing
  first rhino
  location permission for BLE scanning
  use customized name only for LocalProfile
  ...
2017-10-17 12:16:43 +02:00
Johannes Mockenhaupt
d123e7b7c0
Remove duplicate values in strings.xml. 2017-10-17 11:40:24 +02:00
Johannes Mockenhaupt
60c9a984b5
Refactor, clean out stuff, add RuffyCommands interface. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
960586b79d
ExperimentalBolusCommand: update progress when starting to programm the pump. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
dc7dd15571
Update pref descriptions. 2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
fd7f4ae145
Option to ignore TBR failures: also ignore errors when reading pump state.
(cherry picked from commit 82052e8)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
add3011e4b
Update pref descriptions
(cherry picked from commit 13e358a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
a76fbefee8
Add pref to disable all pump comm alerts.
(cherry picked from commit f074a5b)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
c8c445c608
Add option to skip small TBR changes, add summaries to prefs.
(cherry picked from commit a76b03a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
81b97b5278
Add option to ignore setting a TBR as long as it does't occur twice in a row.
(cherry picked from commit 238e85c)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
17dd6df527
Move config options to preferences.
(cherry picked from commit 24657ed)
2017-10-17 11:27:20 +02:00
Milos Kozak
3b90d02e05 show status on Dana fragment too 2017-10-13 13:31:32 +02:00
Milos Kozak
02c57fb9a3 RS connection improvement 2017-10-13 13:17:17 +02:00
Milos Kozak
e40033dcb8 formated=false 2017-10-13 09:24:02 +02:00
Milos Kozak
bee60eb0e3 CS translations 2017-10-13 09:16:15 +02:00
AdrianLxM
f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
AdrianLxM
39b18915d0 Align LP GUI 2017-10-11 20:19:42 +02:00
AdrianLxM
e6565c1911 reuse button on profile switch 2017-10-11 00:25:44 +02:00
Milos Kozak
24099222f3 Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
Milos Kozak
d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +02:00
Milos Kozak
c6392ec625 Merge remote-tracking branch 'origin/dev' into profile 2017-10-09 23:15:02 +02:00
Milos Kozak
9ec3efbaab fix conflict 2017-10-09 23:14:46 +02:00
Milos Kozak
230dd5f0a8 Merge pull request #451 from jotomo/checkboxes-and-labels-aligned
Overview: align checkboxes and labels vertically.
2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt
e586e1389e
Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +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
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
Johannes Mockenhaupt
1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (53 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/res/values/strings.xml
2017-09-18 22:54:35 +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
Johannes Mockenhaupt
c8f7b535c2
Remove code to determine pump capabilities for the time being. 2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt
4d2fa19ad4
Merge branch 'bolus-progress' into rework
* bolus-progress:
  wip
  wip
  wip
  more
  more
  Remove TODOs for extended bolus.
  wip cancelling
  Initial take on bolus cancellation.
  Initial take on bolus progress reporting.
  Add alternative SetTbrCommand for pumps with different behaviour.
  Formatting.
2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt
1d3411ba56
Show connection, execution time in combo fragment.
(cherry picked from commit 4078c23)
2017-08-27 12:36:28 +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
Johannes Mockenhaupt
52d2b425b8
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (21 commits)
  1.5h
  Don't change schema.
  Fix comparing non-primitives.
  Generify MainApp.getSpecificPlugin.
  Fix some warnings / simplify a bit.
  Remove now unused dia, insulinInterfaceId from Treatment.
  correct supercall
  Use bolusstep granularity in fill dialog
  bugfix: fill as invalid treatments if triggered from phone
  add invalid treatments to charts in "invalid" colour
  Use bolusstep as step for insulin correction in wizard
  Update strings.xml
  fix of fix :(
  small refactoring
  Multiply time passed instead of divide dia.
  Update strings.xml
  Fix initalizing profile with default values.
  moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
  Update strings.xml
  Update strings.xml
  ...
2017-08-23 16:36:06 +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
Johannes Mockenhaupt
bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (35 commits)
  fix displaying target in mmol
  Profile.getValuesList: don't add trailing newline.
  Fix some warnings.
  Use OK/Cancel buttons for profile removal dialog.
  static variables -> object variables
  Avoid npe if no string is assigned to the profile switch
  isValid implementation
  Show profile on tap in Treatments->ProfileSwitch
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-19 22:38:58 +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
Johannes Mockenhaupt
fabaf7c2ef
more 2017-08-17 19:04:43 +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
Johannes Mockenhaupt
a19e49e5f8
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (27 commits)
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  Overview: format target using unit specific format.
  Dutch language
  insulincurves - notification on short DIA
  insulincurves - forgotten string updated
  insulincurves - rename peak to peak time
  insulincurves - remove unused base fragment
  insulincurves - i18n
  insulincurves - ActivityGraph fix double plotting
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-17 10:08:15 +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
Timm Korte
882f9d7869 Merge remote-tracking branch 'milosremote/dev' into develop 2017-08-13 23:57:07 +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
Timm Korte
e7249bf72e Merge remote-tracking branch 'milosremote/dev' into develop 2017-08-10 11:13:21 +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
Timm Korte
07822811ac Merge remote-tracking branch 'milosremote/dev' into develop 2017-08-07 22:16:37 +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
Savek-CC
d520643d45 Merge branch 'develop' into 'mainline'
# Conflicts:
#   app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
2017-08-06 22:35:07 +00: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
Johannes Mockenhaupt
4a1684eb92
Merge remote-tracking branch 'origin/dev' into stable
* origin/dev:
  remove canceltemp button from all layouts and click handling from overview fragment
  correct logging
  fix cancel real temp basals from actions
  color for active temp
  remove translated string not in default strings and add flag to cancel method
  Some more German
  Some more German
  Some German translations, remove unused strings, App name for all
  Update strings.xml
  CS translations
  hide all overview buttons by default
  move cancel temp to actions
  new temp basal dialog refactor
  fix virtual pump crash
  Disconnect pump: cancel temp before setting new to make sure it will last as expected
  remove notes strings as well
  remove notes from temp basal upload
  cancel current temp before activating superbolus
2017-08-05 11:02:13 +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
Radoslav Radev
39891bbad9 Update strings.xml 2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330 CS translations 2017-08-01 22:17:39 +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
Milos Kozak
6828e11dd9 remove notes strings as well 2017-08-01 17:25:43 +02:00
AdrianLxM
bfd96b0635 Merge branch 'stable' into '1_5f'
# Conflicts:
#   app/src/main/res/values/strings.xml
2017-07-29 16:55:55 +00:00
AdrianLxM
2697ac9420 battery and insulinstate 2017-07-27 12:20:59 +02:00
AdrianLxM
13173e48c1 tbr capability in ComboFragment 2017-07-26 22:16:35 +02:00
AdrianLxM
76c0b999ff determine max possible tbr firstshot 2017-07-26 18:11:45 +02:00
Milos Kozak
0914e67c11 typo 2017-07-25 19:25:58 +02:00
Milos Kozak
f1e21053b5 use key instead of string 2017-07-25 19:24:51 +02:00
Johannes Mockenhaupt
e6eee42081
Merge remote-tracking branch 'origin/dev' into combo
* origin/dev:
  recategorize cp icons
  removed unnecessary text colour and fixed indentation
  layout indentation
  Moving some buttons to the right categories
  removed empty ghost files
  remove duplicate IDs and indentation fix
  Picture renaming (#311)
2017-07-24 02:25:28 +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
3bd865a870
Merge remote-tracking branch 'origin/dev' into combo
* origin/dev:
  1.5e
  Let CircadianPercentageProfileFragment inherit from SubscriberFragment.
  Fix after merge-conflict cleanup
  Files renamed
  Added icons for home, actions and care portal screens
  update bg translation
  synchronize interval access from other classes
  remove unnecessary semicolons
  spanish emptiy string
  remove extra strings
  self asignment -> comment
  string comparison
  Add color of chart to corresponding lables/scale
  Update InsulinFastactingProlongedFragment.java
  Update InsulinFastactingFragment.java
  Extract SubscriberFragment base class.
  Have most fragments update their content in onResume.
2017-07-21 17:42:27 +02:00
Johannes Mockenhaupt
893a604ef9
Fix combo_fragment blunder. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
a28efb4be0
Add "pump error (message)" as a field in Combo fragement. 2017-07-21 17:40:12 +02:00
AdrianLxM
6d1c0feeab Merge pull request #302 from AdrianLxM/cleanups
Cleanups
2017-07-21 16:46:48 +02:00
AdrianLxM
31fcf34a2d Fix after merge-conflict cleanup 2017-07-21 11:59:36 +02:00
PoweRGbg
059e58c640 Files renamed 2017-07-21 11:55:12 +02:00
Milos Kozak
c68eccc328 Merge pull request #306 from boikonur/dev 2017-07-20 20:49:35 +02:00
Boyko Kazakov
3b1407b8dd Added icons for home, actions and care portal screens 2017-07-20 20:57:45 +03:00
Radoslav Radev
3098f0bdfa update bg translation 2017-07-20 09:24:35 +03:00
AdrianLxM
1ba11ed006 spanish emptiy string 2017-07-20 01:06:21 +02:00
AdrianLxM
b5cb68be73 remove extra strings 2017-07-20 01:06:00 +02:00
Johannes Mockenhaupt
a7c77bc177
Add "pump error (message)" as a field in Combo fragement. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
8cdd604b84
Merge remote-tracking branch 'origin/dev' into combo
* origin/dev:
  bulgarian removed non-translatable
  synchronize interval access
  nsclient remove debug data that puts stress on the broadcast system 3
  nsclient remove debug data that puts stress on the broadcast system 2
  nsclient remove debug data that puts stress on the broadcast system
  Align OpenAS(A)MA fragments with layout of other fragments.
  local broadcasts better setting title
  setting to disable local broadcasts in NSClient
  removed some "unneeded" translations
  wear tdd weighted
  wear TDD status
  wear menu simplification
  Translated latest additions strings.xml
  ns client quickfix now catch all
  NS client quickfix - catch even more
  catch TransactionTooLargeException
  TT new "old" logic for temp targets
  TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-07-19 19:54:50 +02:00
AdrianLxM
732e225c7d bulgarian removed non-translatable 2017-07-19 19:50:40 +02:00
Milos Kozak
3475b64e1b Merge pull request #299 from MilosKozak/dev-nsclient-quickfix
NSClient quickfix
2017-07-19 18:53:38 +02:00
Milos Kozak
62ff62a31f Merge pull request #290 from PoweRGbg/patch-1 2017-07-19 17:21:15 +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
AdrianLxM
cfe8e0a23a local broadcasts better setting title 2017-07-18 22:18:10 +02:00
AdrianLxM
c753873769 setting to disable local broadcasts in NSClient 2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt
7fa59c6c16
Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
5f43f0f147
* Fix stale data in Combo tab after error
* Add info about last command ran to the Combo tab
* Don't refresh data more than once a minute.
* Specify not only error, but also command that raised the error in
  alert notification
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
6faa1614ac
ComboFragment: rename Update Button to Refresh. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
ccd81c67fd
UI for pump state. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8dd714b390
UI crimes 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8ecf6922f7
Misc improvements:
* Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading).
* Return all possible states in PumpState
* Add absolute TBR to PumpState
* Add NoOpCommand to fetch state data from pump
* Display returned pump state in Combo fragment/tab.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
ab9908438e
Add Combo short name. 2017-07-18 20:54:57 +02:00
Milos Kozak
253c2a34e5
combo plugin skeleton 2017-07-18 20:54:13 +02:00
PoweRGbg
c3f85faede removed some "unneeded" translations 2017-07-18 18:10:24 +03:00
Johannes Mockenhaupt
7eacd5021c
Use target ranges from profile, rather than fixed values from prefs. 2017-07-18 13:04:15 +02:00
PoweRGbg
7216418f44 Translated latest additions strings.xml 2017-07-17 11:37:00 +03:00
Milos Kozak
26ebceb4d9 Merge pull request #288 from AdrianLxM/wear-overviewnotification 2017-07-15 16:31:45 +02:00
Boyko Kazakov
7a2db43347 Added Images for different resolutions 2017-07-15 17:03:38 +03:00
AdrianLxM
b79beda971 wear pass through overview notifications 2017-07-15 16:03:04 +02:00
AdrianLxM
39ee68e62a cpp-watch external-function 2017-07-10 04:44:46 +02:00
Milos Kozak
0b5abae44f fix conflict 2017-07-07 15:10:29 +02:00
Milos Kozak
8de7e05dd5 weightedaverage sensitivity 2017-07-07 15:08:21 +02:00
drnoname82
e12e4ec55e Update strings.xml 2017-07-07 01:03:20 +02:00
Milos Kozak
7b9e5fec1e autosens warning 2017-07-04 00:16:35 +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
09e5fdc61b sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
Milos Kozak
96e4a25f9e typo 2017-06-30 11:40:12 +02:00
Milos Kozak
38002be73d check for units null 2017-06-30 10:35:05 +02:00
Milos Kozak
9e8c91319e move ns version to about dialog 2017-06-30 09:55:47 +02:00
Milos Kozak
39c6ae5eae fix merge conflict 2017-06-30 09:35:20 +02:00
Milos Kozak
fec4e60359 Merge pull request #269 from AdrianLxM/percentagevisualization
visualize absolute rate emulation as percentage
2017-06-30 00:00:47 +02:00
AdrianLxM
fcab1a267b adapt diadivisor 2017-06-29 19:39:58 +02:00
AdrianLxM
16e360f200 visualize absolute rate emulation as percentage 2017-06-29 14:14:40 +02:00
Milos Kozak
a8338b2dd1 careportal dialog number picker 2017-06-29 01:37:58 +02:00
Milos Kozak
f58f70bdca wizard tweaking 2017-06-28 23:11:17 +02:00
Milos Kozak
491f0837c8 allow manual input in NumberPicker 2017-06-27 23:23:44 +02:00
Milos Kozak
c3876c730b numberpicker in wizard dialog 2017-06-27 23:16:23 +02:00
Milos Kozak
4fc935f0bd bolus dialog numberpickers 2017-06-27 19:14:32 +02:00
Milos Kozak
ef4a1feda2 numberpicker in calibration dialog 2017-06-27 17:06:23 +02:00
Milos Kozak
341b0660a8 calibration dialog cancel button 2017-06-27 15:25:11 +02:00
Milos Kozak
9fb428c128 fix conflict 2017-06-27 13:52:47 +02:00
Milos Kozak
103836717a fix conflict 2017-06-27 13:51:45 +02:00
Milos Kozak
7b1b9c9881 dialog widths 2017-06-27 00:11:23 +02:00
Milos Kozak
dbd721319e ns uploader status 2017-06-26 22:39:01 +02:00
Milos Kozak
47a9d4b9c8 ns pump status 2017-06-26 12:44:03 +02:00
Milos Kozak
3f641f9c30 carbs absorption settings 2017-06-25 11:16:19 +02:00
Milos Kozak
5360129e5f sensitivity plugins 2017-06-24 11:04:09 +02:00
Milos Kozak
240f9618f5 Merge branch 'dev' into newautosens 2017-06-21 09:04:38 +02:00
Milos Kozak
3e7c4b1350 NS high & low alarms with sound 2017-06-21 07:28:04 +02:00
Milos Kozak
7f92f42923 cob on overview 2017-06-20 20:30:50 +02:00
Milos Kozak
134efb04bf fix merge conflict 2017-06-20 20:01:09 +02:00
Milos Kozak
a3757877a3 fix landscape mode 2017-06-20 19:56:25 +02:00
Milos Kozak
80962e33d7 allow to ignore profileswitch events 2017-06-20 19:52:46 +02:00
Milos Kozak
e90812634b work from old autosens branch 2017-06-16 14:37:43 +02:00
Milos Kozak
fb7af2f317 ns alarm setting in xml 2017-06-15 21:33:45 +02:00
Milos Kozak
43b70f9efc loop, MA, AMA new design 2017-06-13 20:48:53 +02:00
Milos Kozak
1de64f06c2 simplify danar activities, fix profiles 2017-06-12 23:31:50 +02:00
Milos Kozak
b41a942d11 update supported NS & NSclient versions 2017-06-12 09:30:04 +02:00
Milos Kozak
77659e20e7 ns alarms & getBasal fix 2017-06-11 17:22:54 +02:00
Milos Kozak
f6650e33e4 remove test buttons 2017-06-10 22:04:59 +02:00
Milos Kozak
1153c33200 tempbasal & extendedbolus 3way sync 2017-06-08 18:15:17 +02:00
Milos Kozak
4d30ba9cdb treatments PumpHistory and NS mark 2017-06-07 19:43:19 +02:00
Milos Kozak
17f59df597 gui tweaking, pump battery event 2017-06-06 08:21:11 +02:00
Milos Kozak
7c7638a7a1 extract color resources 2017-06-05 15:34:22 +02:00
Milos Kozak
e0a6db22a2 run rendering calculations on background 2017-06-05 15:16:07 +02:00
Milos Kozak
1702ce7702 adjusting nsclient mode 2017-06-04 00:46:44 +02:00
Milos Kozak
b40cf99201 gui tweaking 2017-06-03 22:43:35 +02:00
Milos Kozak
d365fcd6a4 fix bugs & design tweaking 2017-06-02 23:25:11 +02:00
Milos Kozak
f267c85377 it compiles now with profiles 2017-06-02 10:25:49 +02:00
Milos Kozak
b3d18b2537 disable bolus when pump is suspended 2017-05-30 18:23:07 +02:00
Milos Kozak
f5f7d28cc1 temp basal dialog design 2017-05-30 18:10:05 +02:00
Milos Kozak
3861bece54 extended bolus dialog 2017-05-30 15:07:44 +02:00
Milos Kozak
a9b251ce12 Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-26 10:31:46 +02:00
Milos Kozak
bb4302c02f Merge branch 'dev' into history 2017-05-26 10:24:48 +02:00
Milos Kozak
0b8499cb7f Merge pull request #251 from AdrianLxM/historytest1
lint disable 'ExtraTranslation'
2017-05-26 10:23:51 +02:00
AdrianLxM
8b81960ceb remove unused strings from russion translation 2017-05-26 10:10:57 +02:00
Milos Kozak
650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
AdrianLxM
cc4419f57a lint ExtraTranslation 2017-05-26 10:00:41 +02:00
AdrianLxM
99b8e48031 lint ExtraTranslation 2017-05-26 09:58:38 +02:00
Milos Kozak
5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak
87993c6163 return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
fedor apanasenko
4406bb3f06 Update strings.xml 2017-05-25 09:51:08 +03:00
Milos Kozak
86af9eab3d stop extended bolus in actions 2017-05-24 20:37:58 +02:00
Milos Kozak
2ae30fe9b4 temptarget design 2017-05-24 19:42:23 +02:00
Milos Kozak
bb9c68fd4d Merge remote-tracking branch 'origin/dev' into history 2017-05-24 19:18:30 +02:00
Milos Kozak
f936580734 Russsian language 2017-05-24 18:46:19 +02:00
Milos Kozak
5208f23661 Temptargets under treatments 2017-05-23 23:56:53 +02:00
Milos Kozak
771fbdc303 sync of treatments, tempbasals, extended tested and working 2017-05-23 22:59:06 +02:00
Milos Kozak
8db1bd5ae5 tempbasal ns sync 2017-05-23 20:15:14 +02:00
Milos Kozak
6394421017 boluses working 2017-05-22 22:10:56 +02:00
Milos Kozak
6cd046459a original treatmens plugin removed, temp basals working 2017-05-22 20:58:05 +02:00
Milos Kozak
3330c6a3fd Merge branch 'dev' into history 2017-05-21 16:46:13 +02:00
Milos Kozak
462849af12 russian language entry 2017-05-21 10:06:34 +02:00
Milos Kozak
56d54a6988 italian language 2017-05-20 20:41:23 +02:00
Milos Kozak
8c5ce7290d more work on treatments fragment 2017-05-16 17:48:58 +02:00
Milos Kozak
3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +02:00
Milos Kozak
86c975e9d6 Add Italian language 2017-05-16 13:39:24 +02:00
Milos Kozak
45477f96ee Merge pull request #243 from AdrianLxM/xdripstatusline
basal and bolus step in DanaR Fragment
2017-05-16 13:28:39 +02:00
AdrianLxM
572e726678 basal and bolus step in DanaR Fragment 2017-05-16 13:10:02 +02:00
Milos Kozak
6fff6f63a4 bolus dialog redesign 2017-05-16 12:09:32 +02:00
Milos Kozak
4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak
704ad383e9 careportal layout part1 2017-05-15 21:10:43 +02:00
Milos Kozak
25110cfea4 move database actions from pump to treatments plugin 2017-05-15 18:44:40 +02:00
Milos Kozak
c6830baf8f Merge branch 'dev' into history 2017-05-12 16:35:07 +02:00
Milos Kozak
abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
AdrianLxM
a60afbceb9 typo 2017-05-12 16:08:48 +02:00
AdrianLxM
a9e093ad0d some German translations 2017-05-12 16:06:14 +02:00
AdrianLxM
c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +02:00
Milos Kozak
e005d6bd69 Merge branch 'dev' into history 2017-05-12 13:05:57 +02:00
Milos Kozak
df424ea5ff overview buttons 2017-05-12 11:06:33 +02:00
Milos Kozak
b782a5b8dc Merge branch 'dev' into history 2017-05-12 00:39:20 +02:00
Milos Kozak
a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Radoslav Radev
d58ddf48c6 Update strings.xml 2017-05-11 17:01:49 +03:00
Milos Kozak
7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00
Milos Kozak
6b9048cd61 Merge pull request #234 from warstar2187/korean
Korean translation update
2017-05-11 09:27:58 +02:00
Milos Kozak
51d52f6b3d Merge branch 'DanaRv2' into history 2017-05-10 21:53:31 +02:00
Milos Kozak
5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +02:00
AdrianLxM
298d7a7d9c Merge branch 'dev' into xdripstatusline 2017-05-09 23:26:31 +02:00
AdrianLxM
1fa3a2a697 bgi on watch status (optional) 2017-05-09 23:23:37 +02:00
Milos Kozak
d313df0d19 removing treatments 2017-05-09 20:47:02 +02:00
Milos Kozak
554fb51a75 profile layout 2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07 smaller font size on careportal buttons 2017-05-09 18:36:13 +02:00