caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
5737 commits 1 branch 20 tags 140 MiB
Commit graph

1645 commits

Author SHA1 Message Date
pedroll
0d2a0798f7 Spanish translation 2 2018-05-06 20:04:12 +02:00
pedroll
7b73c59ee5 Spanish translation 2 2018-05-06 20:04:12 +02:00
AdrianLxM
f3967e07d2 polish in gerenal strings.xml 2018-05-06 19:44:58 +02:00
AdrianLxM
858c75095b polish arrays.xml 2018-05-06 19:32:43 +02:00
AdrianLxM
b89ac3049c polish fix strings 2018-05-06 19:30:35 +02:00
AdrianLxM
7b0acd1c4a polish remove translatable=false 2018-05-06 19:29:00 +02:00
AdrianLxM
270f60ac1c polish first - thanks Tomasz K. 2018-05-06 19:25:10 +02:00
McHoffi
06948ca0f4
Update strings.xml 2018-05-06 18:16:42 +02:00
Radoslav Radev
b08332e340
bg translation 2018-05-06 14:49:10 +03:00
McHoffi
36d6edf0db
Update strings.xml 2018-05-06 12:16:51 +02:00
Johannes Mockenhaupt
b9c649bd68
Uso blue/orange for carbs/insulin in confirmation dialogs. 
Aligns with the graph's use of using blueish colors insulin and
orange for carbs stuff.
 2018-05-06 11:46:09 +02:00
AdrianLxM
1ac41323e6 fix notification last line cutoff 2018-05-05 21:55:49 +02:00
AdrianLxM
260e259fb0
Update strings.xml 2018-05-05 15:17:03 +02:00
AdrianLxM
d574c70471
Merge pull request #1011 from Heiner1/dev-strings 
Dev strings
 2018-05-05 10:12:20 +02:00
swissalpine
fb04250c90
Elliminat syntax error 2018-05-05 10:00:30 +02:00
Heiner1
3a0c34e7b6
Update strings.xml 2018-05-05 09:45:10 +02:00
AdrianLxM
499edd7c05
swedish update 2018-05-05 09:20:29 +02:00
Radoslav Radev
9aeb2b6ede
Update strings.xml 2018-05-04 23:51:08 +03:00
Markus M. May
e07aecd62d Further translations 2018-05-04 22:02:32 +02:00
AdrianLxM
1646420c47
base basal -> Basal Base (was Base Temporal) 2018-05-04 20:17:55 +02:00
pedroll
5ff86e9c34 Spanish translation 2018-05-04 19:54:21 +02:00
Milos Kozak
f5a23b2921
Merge branch 'dev' into virtual_pump_Bug863 2018-05-04 19:18:52 +02:00
Andy Rozman
4fb8e899c2 Feature Request/Bug #863 
- merged with dev
- extended PumpType with new setting in PumpDescription
- added Insight pump settings for VirtualPump
 2018-05-04 15:48:46 +01:00
Milos Kozak
61e6404bbe
Merge pull request #995 from MilosKozak/wear-wizard 
Wear eCarbs
 2018-05-04 14:33:55 +02:00
Milos Kozak
963f1e1abf
Merge branch 'dev' into startupwizard 2018-05-04 13:26:40 +02:00
swissalpine
7312bf061a
Update colors.xml 2018-05-04 12:30:28 +02:00
Andy Rozman
f2df13dbfb Merge branch 'dev' into virtual_pump_Bug863 2018-05-04 10:06:18 +01:00
Milos Kozak
55661ca7a0 SWButton 2018-05-04 10:17:50 +02:00
swissalpine
010a2f3fd8 Make deviation bars transparent 2018-05-04 10:04:45 +02:00
Radoslav Radev
52411f7afe
half of the Bulgarian translation 2018-05-03 23:34:50 +03:00
AdrianLxM
fb75346bcd ecarb make settings consistent 2018-05-03 22:08:50 +02:00
Milos Kozak
4539756455 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-03 22:02:12 +02:00
Milos Kozak
dea5ff0080 styles cleanup 2018-05-03 22:01:59 +02:00
Milos Kozak
d1958a3e2d
Merge branch 'dev' into startupwizard 2018-05-03 21:31:55 +02:00
Milos Kozak
02590ddd72 SW remove unneeded code 2018-05-03 21:29:34 +02:00
McHoffi
39e9448c67
Typo fix 2018-05-03 21:20:54 +02:00
Milos Kozak
94db444acb SW validator, language, cleanup 2018-05-03 20:06:13 +02:00
Milos Kozak
36265ab1c6 SWPlugin 2018-05-03 18:41:47 +02:00
AdrianLxM
43dc7d1846 wear cathegorize preferences 2018-05-03 17:49:31 +02:00
AdrianLxM
fe0f2e3ce6 wearwizard settings on phone 2018-05-03 17:49:13 +02:00
Andy Rozman
5b8779f8a7 Feature Request/Bug #863 
- added PumpCapability (to set boolean values)
- added Dana Pumps to PumpType and to VirtulaPumps array
 2018-05-03 15:10:34 +01:00
Roumen Georgiev
515590cdf6 other screens 2018-05-03 17:04:56 +03:00
Roumen Georgiev
425ba77200 other screens 2018-05-03 16:59:23 +03:00
Roumen Georgiev
083730f476 WIP: BGSOURCE screen 2018-05-03 09:02:16 +03:00
Andy Rozman
416bd2ff41 Feature Request/Bug #863 
- added package PumpCommon for common pump files
- added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType
- added PumpType which contains all definitions for pumps
- extended fragement to display Pump Type and Pump Type definitions
- extended plugin to read configuration and set pumpDescription object
- extended pref_virtualpump to add pump type selection
 2018-05-02 23:59:33 +01:00
Markus M. May
07c47a4ba7 Start de translation 2018-05-02 21:45:16 +02:00
AdrianLxM
f1736f048e
Update strings.xml 2018-05-02 20:20:13 +02:00
Milos Kozak
5671b99f30
Merge pull request #974 from MilosKozak/swedish-update 
Swedis Update strings.xml
 2018-05-02 18:02:51 +02:00
CaroGo
a768c03462
Update strings.xml 2018-05-02 17:43:17 +02:00
Milos Kozak
a4ff9d29e2
Merge branch 'dev' into swedish-update 2018-05-02 17:10:01 +02:00
Milos Kozak
42164489c8 cs translations 2018-05-02 17:05:20 +02:00
AdrianLxM
f52451085c
remove translation of language names 2018-05-02 16:41:56 +02:00
AdrianLxM
fb61f3cde2
Update strings.xml 2018-05-02 16:39:28 +02:00
Milos Kozak
efff5d4e10
Merge pull request #966 from jotomo/greener-grass 
Brighter green for "treatment active" for better readability.
 2018-05-02 15:05:27 +02:00
Johannes Mockenhaupt
32323d673b
Brighter green for "treatment active" for better readability. 2018-05-02 15:01:49 +02:00
Markus M. May
12d80e96ef Merge latest dev version 2018-05-01 21:56:33 +02:00
soko78
183f2cd6b3
Update strings.xml 
line 177 & 178 changed "temoräres ziel" into "temporäres ziel"
 2018-05-01 20:30:53 +02:00
Johannes Mockenhaupt
5ef7506e5f
Clean up prediction colors. 2018-05-01 19:16:28 +02:00
Winfried Kuiper
d68f74bb68
Update strings.xml 2018-04-30 23:09:35 +02:00
Markus M. May
099cb6c4e4 add battery charging state 2018-04-29 22:49:43 +02:00
Roumen Georgiev
a0463742fa WIP: language set and validation 2018-04-27 17:04:08 +03:00
Roumen Georgiev
bb38d7644b move onClick in SWRadioButton 2018-04-27 13:30:45 +03:00
AdrianLxM
ee0c811e0d
Merge pull request #912 from jotomo/display-cob 
Add IobCobCalculatorPlugin.getCobInfo().
 2018-04-26 23:52:52 +02:00
Roumen Georgiev
11dc20faca code cleanup 2018-04-26 16:59:56 +03:00
Roumen Georgiev
d75de2f645 show "NEXT" only when isValid() == true 2018-04-26 15:18:01 +03:00
osodebailar
5a74087632 Change iob and cob color for a better uniform look. 
Insulin , iob etc. always in different blue colors,
Cob in orange (ocher) like color
 2018-04-25 16:51:49 +02:00
Roumen Georgiev
dc91e3a544 currentScreen not updating - fixed & center fields 2018-04-25 17:02:10 +03:00
Roumen Georgiev
8333fe8975 get radiobutton values from arrays.xml & no header 2018-04-25 16:45:15 +03:00
Roumen Georgiev
7fb1b32188 moved show() method to SWItem classes 2018-04-25 15:29:20 +03:00
Roumen Georgiev
dda7ca3f95 radio group is generated dynamically 2018-04-25 11:03:33 +03:00
Johannes Mockenhaupt
f4bafc6260
Add IobCobCalculatorPlugin.getCobInfo(). 2018-04-24 23:09:07 +02:00
Milos Kozak
c490499d03 preferences cleanup 2018-04-24 00:11:52 +02:00
Roumen Georgiev
eef4423109 basic navigation works 2018-04-23 17:03:22 +03:00
Roumen Georgiev
76685c3cff WIP: initial work 2018-04-23 15:58:27 +03:00
Andreas Eggen
511b9c6819 Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into dev 2018-04-23 08:26:48 +02:00
Milos Kozak
545b4a51ee
Merge pull request #914 from jotomo/overview-extended-bolus-display 
Overview: hide ext. bolus line if none running; spacings, alignments.
 2018-04-22 23:13:10 +02:00
Johannes Mockenhaupt
896f919f37
Disable roaming (pref) when wifi-only is enabled. 2018-04-22 21:43:31 +02:00
Johannes Mockenhaupt
47770e9c6c
Overview: hide ext. bolus line if none running; spacings, alignments. 2018-04-22 21:31:53 +02:00
osodebailar
e97b35a030 Change headertext label size from large to medium 2018-04-22 19:48:56 +02:00
Milos Kozak
6851adbfd3 NSClient connection settings 2018-04-22 18:24:06 +02:00
TebbeUbben
7c971197c7 Swapped pump started and paused strings inadvertently 2018-04-21 23:29:23 +02:00
Tebbe Ubben
f4e02a4862
Merge branch 'dev' into dev 2018-04-21 23:22:02 +02:00
TebbeUbben
fd776a2a0e Add 0%-TBR to history when pump has been started or stopped 2018-04-21 23:20:33 +02:00
Milos Kozak
c4db1c5e2d move quickwizard preferences under overview 2018-04-21 21:58:07 +02:00
Milos Kozak
1f55078aa3 extract strings from overview preferences 2018-04-21 21:37:50 +02:00
Milos Kozak
cab592efb5 overview preferences cleanup 2018-04-21 21:31:42 +02:00
Milos Kozak
fe762248a5 nsclient preferences cleanup 2018-04-21 21:14:09 +02:00
Milos Kozak
ea59458383 nsclient preferences cleanup 2018-04-21 20:46:55 +02:00
Milos Kozak
c40aaed52f allow to show dev slope in dev 2018-04-21 12:09:09 +02:00
Milos Kozak
c0250dd62c show calculation cob progress on graph 2018-04-21 10:50:55 +02:00
Milos Kozak
c27ceb0a72 better bolus error handling for Dana pumps 2018-04-21 00:02:15 +02:00
Milos Kozak
b554d641a7 setupwizard template 2018-04-20 17:27:31 +02:00
Milos Kozak
41b5636c13 clear autosens cache on new preferences change 2018-04-20 12:44:19 +02:00
AdrianLxM
11b88c7947 Merge remote-tracking branch 'milosremote/dev' into cob-rework 2018-04-19 20:22:14 +02:00
AdrianLxM
ed24a129ae unify Default in settings xml and constants 2018-04-19 19:32:50 +02:00
AdrianLxM
00c05c0e23 totalMinCarbsImpact depending on sensitivty plugin 2018-04-19 12:57:13 +02:00
AdrianLxM
e8406320e0 COB settings 2018-04-19 11:48:00 +02:00
AdrianLxM
2cf438a064 Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418 2018-04-18 16:00:00 +02:00
Johannes Mockenhaupt
5d1c6cd118
Move "show notes ..." pref into Buttons submenu. 2018-04-17 21:03:16 +02:00
AdrianLxM
00a0bf2f1a local profile icons 2018-04-17 20:41:43 +02:00
AdrianLxM
eb2f628f1f unify names of same icon with different resolution 2018-04-17 20:41:33 +02:00
Alessya
05a1b35ccb Rename Icon files 2018-04-17 20:41:21 +02:00
Alessya
8dd589c5fe New icons added for local profile screen 2018-04-17 20:41:07 +02:00
Alessya
91b58446ca Rename Icon files 2018-04-17 15:59:00 +03:00
Alessya
b2fb14e57a New icons added for local profile screen 2018-04-17 15:57:54 +03:00
Johannes Mockenhaupt
c7c90ea919
Proper fix. 2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt
58aa4f1323
Unbreak wizard xml, small fixes. 2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt
447bd9b6a3
Alignments. 
(cherry picked from commit a63c388)
 2018-04-15 00:28:08 +02:00
Johannes Mockenhaupt
9b80221752
Set inputType for notes fields. 
(cherry picked from commit af0807d)
 2018-04-14 10:43:48 +02:00
Johannes Mockenhaupt
f420491611
NewCarbsDialog: cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
bf7e9e4bf3
NewInsulinDialog: add notes field, use relative time, align style. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
719d3d459b
NumberPicker: apply signed, decimal constraints for keyboard usage. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
efcc02775b
FillDialog: add missed validation, notes field, align style. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
bf02edd871
Make visibility of notes field a preference. 2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt
05e07cf943
Align style of labels, i18n. 2018-04-12 21:32:47 +02:00
Johannes Mockenhaupt
4acf0c713a
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 
* origin/dev:
  Adding notes to carbs and to wizard on overview
 2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt
a075d87da1
Remove help dialog. 
(cherry picked from commit b1ef8e1)
 2018-04-12 20:59:24 +02:00
Johannes Mockenhaupt
9b3b228aad
Color active/scheduled bolus/carbs and TT entries in treatment tab. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
d2491ca429
NewCarbsDialog: add duration, help. 2018-04-11 13:05:54 +02:00
Markus M. May
99c8bbc6c2 Adding notes to carbs and to wizard on overview 2018-04-09 22:10:08 +02:00
AdrianLxM
d1d46849ee
Merge pull request #832 from MilosKozak/lp-edit 
LocalProfile reset/save button
 2018-04-09 14:08:22 +02:00
Milos Kozak
9b91b4ab93
Merge branch 'dev' into automatic-careportal-events 2018-04-08 23:53:04 +02:00
TebbeUbben
851cec7240 Renamed alerts.xml to insight_alerts.xml 2018-04-08 20:27:23 +02:00
Milos Kozak
d9279eed2a split MaxIOB for SMB 2018-04-08 20:17:15 +02:00
TebbeUbben
b488e30459 Use uploadError for pump alarms 2018-04-08 18:46:29 +02:00
TebbeUbben
56b2799785 Added insight_real_tbr_cancel option again 2018-04-08 18:32:11 +02:00
TebbeUbben
f8d4dbf6a1 Add pump alerts as notes 2018-04-08 17:22:53 +02:00
AdrianLxM
5c6e598cd6
Merge branch 'dev' into lp-edit 2018-04-08 16:14:43 +02:00
Milos Kozak
78ffae6e47
Merge pull request #849 from jotomo/combo-cleanup 
Combo cleanup
 2018-04-06 21:14:50 +02:00
Milos Kozak
35decd0e53 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-06 21:12:14 +02:00
Milos Kozak
c94d01f22b better time synchronization for danarv2 2018-04-06 18:30:36 +02:00
Johannes Mockenhaupt
623a5e3da1
Combo: remove unused strings, minor code cleanups. 2018-04-06 11:42:33 +02:00
Johannes Mockenhaupt
344d9c1f49
Combo: remove 'read history' button. 
History and basal rate profile are permanently checked and updated. This
functionality would only be needed if driver was fundamentally broken.
 2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt
db4439f1cc
Combo: remove half-backed alerts dialog. 2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt
e937a777ba
Combo: remove superseeded TDD button and dialog. 2018-04-06 11:35:34 +02:00
swissalpine
afebf30bc0
Add string loopdisconnectedfor 2018-04-05 21:55:07 +02:00
AdrianLxM
009f5dfa38 reset -> strings.xml 2018-04-03 18:37:34 +02:00
AdrianLxM
933b1acd7e lp save button 2018-04-03 18:33:13 +02:00
AdrianLxM
75a91997b7 lp reset 2018-04-03 14:34:15 +02:00
Milos Kozak
e9c7bdc7f4 add necessity of profile switch to objectives 2018-03-31 22:30:42 +02:00
Milos Kozak
a91aeec144 fix nsclient layout 2018-03-31 20:32:47 +02:00
Milos Kozak
bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Milos Kozak
259b5fa818
Merge pull request #809 from MilosKozak/tdds-again-merged 
Tdds again merged
 2018-03-28 17:35:23 +02:00
Milos Kozak
fc2da20743 fix conflict 2018-03-28 10:25:58 +02:00
Milos Kozak
e9b499314d PUMP SMS command, connect to pump before reporting SMS STATUS 2018-03-28 10:22:10 +02:00
Milos Kozak
8e6953cc92 activate button on NSProfile fragment 2018-03-26 09:25:57 +02:00
AdrianLxM
a5d0ec45cc Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged 2018-03-26 08:39:24 +02:00
Milos Kozak
afe3d68a10 display SMB reasons 2018-03-25 23:56:52 +02:00
Milos Kozak
8c5a2ab524
Merge pull request #799 from jotomo/prime-fill-refresh 
Prime/fill button refresh and some drive-by improvements
 2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt
7694c80da9
Fix format specifiers in Spanish translation. 2018-03-24 10:53:46 +01:00
Johannes Mockenhaupt
8a7776fd74
Code dedup. 2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt
9838e2fabb
Rework prime/fill button. 2018-03-23 23:06:57 +01:00
Milos Kozak
22f50198fc rename nsclientinternal -> nsclient 2018-03-23 22:44:37 +01:00
Milos Kozak
cbd60cfdbe synchronized access to log in nsclient 2018-03-23 22:37:27 +01:00
Milos Kozak
30f09dc416 show constraints on LoopFragment 2018-03-23 18:23:19 +01:00
Milos Kozak
661595792f rename InsightPump -> Insight 2018-03-23 17:51:05 +01:00
Milos Kozak
15d8719508 collect most limited reason along with all reasons 2018-03-23 17:36:49 +01:00
Milos Kozak
3f5808eca3 show max basal limit on smb fragment 2018-03-23 09:59:07 +01:00
Milos Kozak
ba09538f46 AMA - Autosens cleanup 2018-03-22 22:18:40 +01:00
Milos Kozak
76ee3c51e4 applyMaxIOBConstraints refactor & tests 2018-03-22 21:13:26 +01:00
Milos Kozak
1aba9a2564 applyCarbsConstraints refactor & tests 2018-03-22 10:31:07 +01:00
Milos Kozak
15158fb5ea applyBolusConstraints refactor & tests 2018-03-21 23:01:30 +01:00
Milos Kozak
e2ea44a8a8 applyBasalPercentConstraints reactor & tests part1 2018-03-21 20:24:02 +01:00
Milos Kozak
ca70cbdaec
Merge branch 'dev' into newconstraints 2018-03-21 10:48:23 +01:00
Milos Kozak
15ebfc1193 applyBasalConstraints reactor & tests 2018-03-20 22:09:22 +01:00
AdrianLxM
60247daca2
Revert "Fixed typo: Temorär -> Temporär" 2018-03-20 16:19:51 +01:00
AdrianLxM
a14d698530
small correction to trigger travis again 2018-03-20 15:56:13 +01:00
Mathias Dalheimer
309ee1b9a6 Fixed typo: Temorär -> Temporär 2018-03-20 15:37:47 +01:00
Milos Kozak
c2cfe4e7ea isSMBModeEnabled reactor & tests 2018-03-19 23:14:04 +01:00
Milos Kozak
26ecc3dd60 isAMAModeEnabled reactor & tests 2018-03-19 22:59:25 +01:00
AdrianLxM
954f73eabd TDD 05 2018-03-19 19:10:54 +01:00
Milos Kozak
326229ebbb limitClosedLoop & remove openloop flavor 2018-03-19 17:06:22 +01:00
Milos Kozak
5a96b88499 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into newconstraints 2018-03-19 15:11:50 +01:00
Johannes Mockenhaupt
f918a5f303
More loop results cleanup and i18n. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
d1f1db859b
Translations cleanup. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
379df79bf8
CB.applySMBRequest: return reason when skipping due to frequency. 2018-03-19 14:08:39 +01:00
AdrianLxM
69cfa63fe5 xml-format ro 2018-03-19 13:33:11 +01:00
AdrianLxM
3ade9be7a2 cleanup 2018-03-19 13:32:05 +01:00
Milos Kozak
b0a9f678f0 limitRunningLoop constraint 2018-03-19 13:11:25 +01:00
Milos Kozak
f413c005f6 CS translations 2018-03-19 10:07:28 +01:00
Milos Kozak
1c413cc49f
Merge pull request #771 from jotomo/remove-pre-bolus 
Next round of button updates
 2018-03-19 09:29:27 +01:00
Milos Kozak
0266a79201 show invalid profiles in treatments tab 2018-03-18 23:41:53 +01:00
Johannes Mockenhaupt
da014daec8
Merge branch 'dev' into remove-pre-bolus 2018-03-18 20:48:19 +01:00
Johannes Mockenhaupt
643f3aee6c
Merge branch 'dev' into dev-merge 2018-03-18 20:20:40 +01:00
Milos Kozak
106de14f9a
Merge branch 'dev' into nodefaultprofile 2018-03-18 19:58:36 +01:00
Johannes Mockenhaupt
946ce97dc2
Fix app init. 2018-03-18 19:57:28 +01:00
Johannes Mockenhaupt
89d59584d5
Merge remote-tracking branch 'origin/dev' into dev-merge 
* origin/dev:
  prepend line feed like suggested on jamoto code review
  Rename method to reflect jomoto code review
  Unit tests are always in engmode
  Fix boolean stuff in accordance to code review with adrian
  Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
  Determine directory from logback
  more checks for null profile
  Disallow profile store on pump if on dev branch but not in engineering mode
  Disable profile switch if not in Engineering mode and on dev branch
  Add info to About dialog when engineering mode is enabled.
  On start, show notification if on dev-branch, but not EM, so CL is disabled.
  Add basic Engineering mode.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/MainActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
#	app/src/main/res/values/strings.xml
 2018-03-18 19:47:23 +01:00
Milos Kozak
f7621c4cc5 Profile tests 2018-03-18 15:02:21 +01:00
Milos Kozak
4f43feb12e allow profile to be null 2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt
b54a010614
CarbsButton: replace suspend option with 'hypo tt'. 2018-03-17 22:22:26 +01:00
Johannes Mockenhaupt
17219c08d1
Combo: fragment spacing fix. 2018-03-17 22:12:19 +01:00
Markus M. May
9b020f68db Correct merge 2018-03-17 20:52:19 +01:00
Johannes Mockenhaupt
eae6c73671
Buttons: explicitely state that no action will be taken if nothing selected. 2018-03-17 20:39:58 +01:00
Milos Kozak
3f29ca3b96 more checks for null profile 2018-03-17 18:07:22 +01:00
Johannes Mockenhaupt
612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  Don't overlap time ticks with current time
  history browser chart selection
  Insulin button: allow negative presets, fix adding TT insulin.
  Overview: symetric spacing.
  Carbs button: send carbs to pump if pump supports carbs.
  Carbs button: fix visibility pref, input type, allow negative increments.
  Smallscreen fix
  chart menu 4
  chart menu 3
  chart menu 2
  chart menu 1

# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-03-17 16:45:08 +01:00
Milos Kozak
6e5d5c4a26
Merge pull request #769 from jotomo/button-refinement 
Button refinement
 2018-03-17 15:28:41 +01:00
Johannes Mockenhaupt
8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  check for null profile
  remove profile dependency from pump drivers, TRB optimalization
  split enacting TRB and SMB
 2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt
de72fba92e
Combo: update button spacing to match overview. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt
6a6359f1ee
Combo: Show count of boluses delivered and TBRs set on pump. 2018-03-17 13:51:13 +01:00
AdrianLxM
a2ecfa89a0 history browser chart selection 2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt
7c9824e37d
Insulin button: allow negative presets, fix adding TT insulin. 2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt
194c7a2dbc
Overview: symetric spacing. 2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt
32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments. 2018-03-16 22:11:15 +01:00
AdrianLxM
90f9bf373c
Smallscreen fix 2018-03-16 21:52:02 +01:00
AdrianLxM
47c6c2d9a8 chart menu 4 2018-03-16 19:26:18 +01:00
AdrianLxM
067b264ae8 chart menu 3 2018-03-16 19:16:47 +01:00
AdrianLxM
32894a092e chart menu 1 2018-03-16 17:23:02 +01:00
Johannes Mockenhaupt
db00404e43
Merge commit 'origin/dev^' into combo-dev-merge 
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
 2018-03-16 15:44:54 +01:00
Markus M. May
2c3f28670c Disallow profile store on pump if on dev branch but not in engineering mode 2018-03-15 23:00:08 +01:00
Markus M. May
e38f10dba0 Merge jamoto/engineering-mode 2018-03-15 21:10:18 +01:00
Milos Kozak
db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
AdrianLxM
212a9dcc94 draw basal in profile viewer 2018-03-15 14:08:00 +01:00
Milos Kozak
e9313c5b28 BG autobackfill configurable 2018-03-14 20:21:48 +01:00
Johannes Mockenhaupt
a398d95bb4
Add info to About dialog when engineering mode is enabled. 2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt
637b0c6189
On start, show notification if on dev-branch, but not EM, so CL is disabled. 2018-03-12 23:01:58 +01:00
Milos Kozak
eb2b6f9bd8 Allow bolus record only in new treatment dialog 2018-03-12 17:52:52 +01:00
Milos Kozak
a5830cc452 Merge branch 'foodrefactor' into dev 2018-03-12 10:56:14 +01:00
Milos Kozak
38999d6598 food code cleanup 2018-03-12 10:53:23 +01:00
AdrianLxM
1aaec9142c
Merge pull request #746 from swissalpine/patch-3 
Better layout of the Calculator Dialogue (German)
 2018-03-10 22:37:09 +01:00
swissalpine
203288e93a
Better layout of the Calculator Dialogue (German) 
The string "15-Min.-Trend" was too long, at least on my phone.
 2018-03-10 22:12:16 +01:00
Milos Kozak
39c2d690e4 CS translations 2018-03-10 20:47:17 +01:00
Milos Kozak
8a197f41dc Merge branch 'dialogmmol' into dev 2018-03-10 19:25:41 +01:00
Milos Kozak
ec1c43b905 carbs dialog: defaults for mmol, i18n 2018-03-10 19:22:31 +01:00
AdrianLxM
6904cb8807
Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true 
enable SMB notify by default
 2018-03-08 15:17:28 +01:00
AdrianLxM
5a5e0ca8b6
Merge pull request #734 from MilosKozak/watchsmb2 
Watchface overhaul
 2018-03-08 15:10:53 +01:00
AdrianLxM
118cdb3dce
buttons gone by default in smallheight 
... same as on default layout
 2018-03-04 20:12:33 +01:00
AdrianLxM
cdb58ed143
newinsulin dialog wrap content 2018-03-04 19:57:21 +01:00
AdrianLxM
5a4967e544
newcarb dialog wrap content 2018-03-04 19:56:34 +01:00
AdrianLxM
d2919f9577 Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2 2018-03-04 19:25:26 +01:00
AdrianLxM
7d8674aa61 fix 5m-impact parameter - always was 0 2018-03-02 21:09:09 +01:00
Milos Kozak
ed11bb1d70 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-02 00:00:09 +01:00
Milos Kozak
c61fcdbe3f allow 15 & 30 pump disconnection 2018-03-01 23:59:44 +01:00
Roumen Georgiev
9456a24655
Adding Eating soon mode to options 2018-03-01 16:22:05 +02:00
Milos Kozak
75a6366115 translations cleanup 2018-03-01 15:08:55 +01:00
Milos Kozak
bd6fab3ca3
Merge pull request #721 from jamorham/floatmaxbasal 
Make openapsama_current_basal_safety_multiplier Double instead of Int
 2018-02-26 10:46:29 +01:00
Jamorham
805548dd1e
Make openapsama_current_basal_safety_multiplier Double instead of Integer 2018-02-25 21:30:11 +00:00
Milos Kozak
f62cac1b66 make new i & c buttons visible by default 2018-02-25 17:52:30 +01:00
Milos Kozak
7b91f0d490 allow to open G5 app from CGM button 2018-02-25 17:33:46 +01:00
Milos Kozak
e544d44799 overview layout cleanup 2018-02-25 16:20:20 +01:00
Milos Kozak
6eed00fae7 add xdrip icon to cgm button 2018-02-25 15:45:43 +01:00
Milos Kozak
32f2f4d6fa Merge branch 'g5cal' into buttons 2018-02-25 15:31:43 +01:00
Milos Kozak
cb8fc905bb catch if G5 app is missing 2018-02-25 15:23:25 +01:00
Milos Kozak
a7da0bb67a
Merge pull request #719 from jotomo/buttons 
Moar buttons.
 2018-02-25 11:05:21 +01:00
Jamorham
9d985ec3b7
Add FabricPrivacy 2018-02-22 12:30:36 +00:00
AdrianLxM
c22c22f1d7 wear settings for predictions 2018-02-21 15:56:13 +01:00
JamOrHam
bc2f749ef3
Merge branch 'dev' into dev 2018-02-21 13:43:18 +00:00
Jamorham
67b397b417
Insight: preemptive connection preference option 2018-02-21 12:23:19 +00:00
Milos Kozak
1cb92861b5 Chinese to menu 2018-02-20 17:04:15 +01:00
McHoffi
21d6745d02
Update pref_wear.xml 2018-02-19 20:50:17 +01:00
McHoffi
293eff837b
Update pref_wear.xml 2018-02-19 20:49:53 +01:00
McHoffi
9dcd1c70d5
Update pref_wear.xml 2018-02-19 20:48:54 +01:00
Milos Kozak
dc35c9f6b3 fix typos 2018-02-18 22:56:46 +01:00
boysim
5c9173d14b Added Dutch combo translations 2018-02-18 18:19:46 +01:00
Jamorham
9a76cdb3a1
Insight: add preemptive connection, keep-alive, statistics 2018-02-18 14:57:28 +00:00
Milos Kozak
0fe287bb79
Merge pull request #689 from AdrianLxM/smb-wear2 
no wear vibrations on SMB (optional)
 2018-02-18 12:39:36 +01:00
Johannes Mockenhaupt
bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
AdrianLxM
7b3d370564 Notification on missing profile switch 2018-02-18 01:10:27 +01:00
Johannes Mockenhaupt
d155616c0b
Minor fixes. 2018-02-17 21:08:36 +01:00
Johannes Mockenhaupt
2bccf13213
Add shortname for G5. 2018-02-17 15:40:56 +01:00
Johannes Mockenhaupt
52aa27de05
Sanity check bolus timestamp on start, after bolusing. 2018-02-16 17:33:59 +01:00
AdrianLxM
a23c76f473
Merge branch 'dev' into smb-wear2 2018-02-14 15:03:45 +01:00
AdrianLxM
c821ef97d8 option to enable wear/SMB notifications 2018-02-14 15:02:04 +01:00
Johannes Mockenhaupt
df4ad822fc
Make new behaviour configurable, default on. 
(cherry picked from commit f807592)
 2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt
aae9f7d153
Show notification to check pump date if last bolus is older than 24h. 2018-02-13 20:44:36 +01:00
Milos Kozak
31d493d8ae Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-02-13 18:38:55 +01:00
Milos Kozak
3e06b6a4ed
Merge pull request #687 from jotomo/error-announcements 
Create NS-anouncements for error dialogs and local alerts.
 2018-02-13 18:08:14 +01:00
Milos Kozak
f063fb94d1
Update strings.xml 2018-02-13 18:06:26 +01:00
Johannes Mockenhaupt
f8075927f2
Make new behaviour configurable, default on. 2018-02-13 00:34:24 +01:00
Milos Kozak
6470f7a63e
Update strings.xml 2018-02-12 20:18:44 +01:00
Milos Kozak
5225276259
Update strings.xml 2018-02-12 20:15:47 +01:00
Milos Kozak
da777d9660 HistoryBrowser fill space by bggraph 2018-02-12 19:39:45 +01:00
Milos Kozak
d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +01:00
Milos Kozak
fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Milos Kozak
943205c782 HardLimits refactor 2018-02-11 22:41:10 +01:00
Milos Kozak
0a69a1ab2f FR language 2018-02-11 21:00:09 +01:00
Johannes Mockenhaupt
f88894ea02
Clean up some Combo strings. 2018-02-10 19:07:03 +01:00
swissalpine
db07723e8a
Update strings.xml 2018-02-10 17:59:31 +01:00
Milos Kozak
359b8401b2
Merge pull request #678 from jamorham/dev 
Updates to Insight plugin
 2018-02-10 15:13:35 +01:00
AdrianLxM
4587a47840 add links to about 2018-02-10 14:53:43 +01:00
Jamorham
046de51496
Insight few small changes 2018-02-10 09:29:23 +00:00
Johannes Mockenhaupt
89c832b5aa
Use pager sound instead of smoke detector alarm for bolus error. 
(cherry picked from commit 6767d8b)
 2018-02-08 22:18:41 +01:00
Johannes Mockenhaupt
1985ed379d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.

(cherry picked from commit 43755f0)
 2018-02-08 22:18:38 +01:00
Simon Pauwels
9c95a75ede Added dutch translations (#52) 2018-02-07 23:17:50 +01:00
Johannes Mockenhaupt
483ecadede
Fix dutch translation for Combo's last bolus, minor cleanup. 
(cherry picked from commit c0cf06a)
 2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt
6767d8b767
Use pager sound instead of smoke detector alarm for bolus error. 2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt
43755f071d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
 2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt
c781601cbb
Commit missing string. 2018-02-06 00:04:24 +01:00
Milos Kozak
f094b5cb64
Merge pull request #658 from bogdangorescu/patch-2 
RO translation
 2018-02-04 18:00:37 +01:00
Bog Dan
8c858d2b2d
RO translation - without translatable="false" 
Removed  translatable="false"
 2018-02-04 17:55:59 +02:00
Johannes Mockenhaupt
6b4b044cd6
Remove nested layout for better performance. 2018-02-04 00:36:08 +01:00
Bog Dan
27bf66b501
RO translation 
Added RO translation
 2018-02-04 01:24:18 +02:00
Johannes Mockenhaupt
f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2 
* origin/master:
  Revert "Update strings.xml"
  bump 1.58
  Update strings.xml
  Add issue template.
  Enhance insulin plugin test
  filter null BT devices
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  ES translations
  Dana plugin refactoring
  KO language cleanup
  Update strings.xml
  Update strings.xml
  Bg translation
  add RO language
  CS translations
  ButterKnife to Dana fragment
  bump 1.57a-dev
  Add a unit test for Insulin Plugin

# Conflicts:
#	app/build.gradle
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values/strings.xml
 2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt
f49f3c7e4b
Clean up string resources. 
(cherry picked from commit 4adcffc)
 2018-02-03 16:33:40 +01:00
Milos Kozak
6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
Cukrovka
af5dc7cc7b
Update strings.xml 
Oprava diakritiky.
 2018-02-02 09:36:03 +01:00
Milos Kozak
411add616b
Merge pull request #632 from jamorham/dev 
Add Insight Pump Plugin
 2018-02-02 09:21:57 +01:00
AdrianLxM
aca422dfb6
remove duplicates 2018-02-01 23:55:08 +01:00
Milos Kozak
90b0e6d84a Merge branch 'dev' into smb060 2018-02-01 23:02:00 +01:00
AdrianLxM
cea99a968f
small fixes 2018-02-01 22:09:57 +01:00
AdrianLxM
2e44734b61
Merge branch 'dev' into spanishmerge 2018-02-01 22:07:06 +01:00
AdrianLxM
276784c799 Merge branch 'patch-1' of https://github.com/CaroGo/AndroidAPS into dev180127 2018-02-01 22:02:27 +01:00
Milos Kozak
463031bd31 FR language 2018-02-01 20:17:42 +01:00
Jamorham
73ea3628b2
Extracted insight strings 2018-02-01 10:33:54 +00:00
Milos Kozak
e779dbf221 fix merge conflict 2018-02-01 10:29:00 +01:00
CaroGo
815247dabb
Update strings.xml 
I did a few changes...
 2018-01-31 16:51:00 +01:00
Johannes Mockenhaupt
d336c176fb
Update some descriptions. 2018-01-31 14:07:47 +01:00
Johannes Mockenhaupt
c62ca89931
Fix adding a partial bolus to treatments. 2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt
6981c0fec6
Pump needs rest. 
(cherry picked from commit 2e88fb9)
 2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
e790c87940
Cleanups and strings. 2018-01-31 00:59:23 +01:00
Milos Kozak
af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Jamorham
ef2189fec6
Insight faux cancel tbr option 2018-01-29 21:31:06 +00:00
Johannes Mockenhaupt
1e22599979
Fix format specifier. 2018-01-29 21:07:22 +01:00
Johannes Mockenhaupt
33ad68d26a
Fix string. 2018-01-29 20:13:53 +01:00
Milos Kozak
b11e301391 ES translations 2018-01-29 20:05:16 +01:00
Johannes Mockenhaupt
216359312a
Minor non-code tweaks. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt
2468f23e97
ComboFragment: i18n last bolus. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt
3adda9bf6e
Clean up bolus delivery code. 2018-01-29 13:18:49 +01:00
Milos Kozak
af31c29134 Merge branch 'dev' into smb060 2018-01-29 12:01:02 +01:00
Johannes Mockenhaupt
449dbd79f7
Rename TBR to 'temp basal' 2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt
0655e4e676
SMB: clean up APSResult.toSpanned a bit. 
(cherry picked from commit 10d7c79)
 2018-01-29 03:13:57 +01:00
Milos Kozak
f54452515b KO language cleanup 2018-01-28 23:29:33 +01:00
Johannes Mockenhaupt
9ba6f2144b
Strings fix-up. 2018-01-28 19:30:59 +01:00
Johannes Mockenhaupt
bd87a893c2
Best effort to handle multiple boluses within the same minute. 
(cherry picked from commit cc9094f)
 2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt
3a95c3c4d9
More work for bolusing with pump history records. 
(cherry picked from commit 4bc3e42)
 2018-01-28 17:06:16 +01:00
Johannes Mockenhaupt
8c27b32d07
Let "Initializing" be a pump state, not an action. 2018-01-28 15:48:17 +01:00
Johannes Mockenhaupt
e3abe04545
Bring back last bolus to combo fragment. 
(cherry picked from commit 108349e)
 2018-01-28 15:30:36 +01:00
Johannes Mockenhaupt
b3a60eb5ab
Initial work on basing boluses on pump history. 2018-01-28 15:22:41 +01:00
warstar2187
c297ce88bb
Update strings.xml 2018-01-28 11:01:56 +09:00
warstar2187
76d606fddf
Update strings.xml 2018-01-28 10:51:09 +09:00
Radoslav Radev
d4fe03ac30
Bg translation 2018-01-27 16:12:51 +02:00
Milos Kozak
296d5059d6 SMB options in preferences 2018-01-27 14:47:04 +01:00
Milos Kozak
4af8e14417 Merge branch 'dev' into smb060 2018-01-27 13:47:41 +01:00
Milos Kozak
ce3c888246 add RO language 2018-01-27 13:40:19 +01:00
Jamorham
3150e7d00f
Add double rounding helper 2018-01-26 22:26:29 +00:00
Milos Kozak
b2d9ad8986 Merge branch 'dev' into smb060 2018-01-26 22:49:25 +01:00
Milos Kozak
d634ee7d4b CS translations 2018-01-26 22:10:27 +01:00
Jamorham
2f7dc11b9f
Update Insight fragment layouts 2018-01-26 16:46:09 +00:00
Johannes Mockenhaupt
372e435761
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
  travis accept license manually
  Push carbs only to pumps supporting storing carbs.
  travis to 27.0.2
  sdk27 & butterknife
 2018-01-26 13:53:42 +01:00
Milos Kozak
98e850b1b3 Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
Jamorham
69da0cf57a
Always connected option 2018-01-25 23:21:42 +00:00
Johannes Mockenhaupt
0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args). 2018-01-25 20:28:21 +01:00
Johannes Mockenhaupt
5dcf214d08
Fix German translation. 2018-01-25 20:10:21 +01:00
Jamorham
54e2f7a712
Current work in progress 2018-01-25 17:30:16 +00:00
Johannes Mockenhaupt
947203b107
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix not attached to the activity
  check for no profile
  check for no profile
  Fix namespace errors.
  Add missing ids to other overview layouts.
  Overview: make checkbox labels toggle state as well.
  minimum of 30 min for unreachable alert
 2018-01-25 16:06:22 +01:00
Milos Kozak
ca01168474
Merge pull request #611 from MilosKozak/min_unreachable 
minimum of 30 min for unreachable alert
 2018-01-25 11:24:09 +01:00
Johannes Mockenhaupt
0f98c49876
Fix namespace errors. 2018-01-24 16:54:29 +01:00
Johannes Mockenhaupt
2a4f1950b3
Add missing ids to other overview layouts. 2018-01-24 16:53:40 +01:00
Jamorham
7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt
3a02f01374
Overview: make checkbox labels toggle state as well. 2018-01-24 14:10:17 +01:00
Johannes Mockenhaupt
80f13553dc
Add missing placeholder in Dutch translation. 2018-01-23 12:45:47 +01:00