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

4673 commits

Author SHA1 Message Date
Milos Kozak 8a3d3d580f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-12 22:03:28 +03:00
AdrianLxM 5f5a2b6a0d
insight constraints 2018-07-12 20:30:19 +02:00
Milos Kozak efefe8ed18
Merge pull request #1211 from jotomo/pluginstats 
PluginStats: used simple class named instead of translated name.
 2018-07-12 21:30:12 +03:00
Milos Kozak 35e93ffafd more debug to autosens 2018-07-12 21:28:35 +03:00
AdrianLxM cb826da403
Revert "Fixed problem with Corr numberpicker when using Insightpump" 2018-07-12 19:37:21 +02:00
swissalpine dcfcd14e96
Update strings.xml 2018-07-12 19:21:47 +02:00
swissalpine 6b24eea5ae
Update strings.xml 2018-07-12 18:57:47 +02:00
Johannes Mockenhaupt 5b9ede15ea
PluginStats: used simple class named instead of translated name. 2018-07-12 15:47:45 +02:00
Milos Kozak e8c1dd5e3b
Merge pull request #1209 from harispoljo/CorrInsight 
Fixed problem with Corr numberpicker when using Insightpump
 2018-07-12 16:10:10 +03:00
Milos Kozak ba945f334b
Merge pull request #1204 from jotomo/pluginstats 
Fabric-log enabled plugins once a day.
 2018-07-12 16:06:10 +03:00
Johannes Mockenhaupt 6302769652
Log app usage type daily. 2018-07-11 20:51:09 +02:00
harispoljo 8b200ba9de
Fixed bug 2018-07-11 19:53:19 +02:00
harisp 395f2313fd Implemented feedback 2018-07-11 18:17:09 +02:00
Milos Kozak d97e195ad1 revert wrong autosens fix 2018-07-11 18:23:58 +03:00
Milos Kozak e4e0e64eef another fix of displaying ext bolus 2018-07-11 18:02:20 +03:00
Milos Kozak 798199852b CS translation 2018-07-11 17:34:41 +03:00
Milos Kozak 613802b12c
Merge pull request #1183 from triplem/autosens_fix 
Autosens fix
 2018-07-11 17:30:29 +03:00
harisp b42ce70daa Fixed problem with corr numberpicker when using insight pump 2018-07-11 14:14:01 +02:00
swissalpine 20b6709ae4
Update strings.xml 2018-07-10 22:54:39 +02:00
swissalpine dbee8e6224
Update strings.xml 2018-07-10 22:50:58 +02:00
swissalpine 9d899a140e
Überarbeitung/Vereinheitlichung der deutschen Übersetzung 2018-07-10 19:08:50 +02:00
Johannes Mockenhaupt 09a1d23bc8
Move logging of app start to Fabric class. 2018-07-10 17:55:50 +02:00
Johannes Mockenhaupt ccaf68d043
Fabric-log enabled plugins once a day. 2018-07-10 13:00:20 +02:00
marie d7cea7883e Adding ')' to the German translation 2018-07-09 20:48:41 +02:00
marie 351bda0240 Adding english text about temp target to objective 2 to in all languages 2018-07-09 19:23:36 +02:00
marie 8b7c552dcb Adding text about temp target to objective 2 2018-07-09 18:51:42 +02:00
Milos Kozak 5a6b7f9dad Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-09 18:16:55 +03:00
Johannes Mockenhaupt 2cd3ec82de
Create note for eCarbs, so it's easier to see what amount/time was used. 
Otherwise iterating on parameters is tedious with only the generated carbs.
 2018-07-07 12:02:44 +02:00
Milos Kozak 506971292e cleanup 2018-07-05 15:36:13 +02:00
Markus M. May afaf729df1 Try to rework the ugly fix 2018-07-04 20:42:31 +02:00
Markus M. May c78117e356 recall getAutosensData, if it is null 2018-07-03 22:35:06 +02:00
Markus M. May a978225428 Cleanup Imports 2018-07-03 22:11:01 +02:00
Markus M. May 5422a8bc20 Cleanup Imports, added a TODO 2018-07-03 22:10:33 +02:00
AdrianLxM e5d8eb163b
Update Treatment.java 2018-07-03 19:25:23 +02:00
AdrianLxM 006528ae4c
Update TreatmentService.java 2018-07-03 19:24:44 +02:00
Milos Kozak 2c06a9cdf9 fixed typo 2018-07-02 19:45:38 +02:00
Milos Kozak 3a0fb59aee Merge branch 'dev' into last-2.0-something-stuff 2018-07-02 18:54:32 +02:00
Milos Kozak 375025f7f0 remove unused string 2018-07-02 15:55:52 +02:00
Milos Kozak 60e9ea05a8 fix objectives typo 2018-07-02 15:52:20 +02:00
Milos Kozak 917ddf0cbe CS translations 2018-07-02 15:04:09 +02:00
Milos Kozak 4919986dc0 setup wizard for pumpcontrol 2018-07-02 12:18:49 +02:00
Milos Kozak bb30171777 fix typo in poctech driver 2018-07-02 10:53:09 +02:00
AdrianLxM 297fe487f7 update with data from pump 2018-07-02 06:54:02 +02:00
AdrianLxM b39fa514c2 alarm on clashes, not on identical treatments 2018-07-02 02:11:25 +02:00
Milos Kozak 98dedf117f
Merge pull request #1167 from triplem/date_util 
Do calculations in a central place
 2018-07-01 22:43:49 +02:00
Johannes Mockenhaupt bf3b4502bf
log origin of offending call 2018-07-01 19:15:27 +02:00
Johannes Mockenhaupt 21313bd418
obligatory format specifier fixes 2018-07-01 19:10:58 +02:00
Johannes Mockenhaupt 290effcd7c
simplyify defaulting to hypo tt. 2018-07-01 18:53:45 +02:00
Johannes Mockenhaupt 5df054a999
more fixes 2018-07-01 18:32:52 +02:00
Johannes Mockenhaupt 9b7d36ffed
bugfix 2018-07-01 18:25:32 +02:00
Johannes Mockenhaupt 6ebb13d28d
alarm on failure to add treatment to db. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt 658af4bcfd
combo: don't attempt to add a bolus record if it already exists in db. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt f12db81f96
treatmentservice: add method to check if record with pump id exists. 2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt 780a4dda36
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l. 2018-07-01 17:21:40 +02:00
AdrianLxM 86ef6a155c
Merge pull request #1171 from jotomo/revert-901 
Revert "Merge pull request #1131 from jotomo/901"
 2018-07-01 17:02:26 +02:00
Markus M. May 6bc60cd8a8 Rework to use already existing method 2018-07-01 13:50:37 +02:00
Johannes Mockenhaupt 33b66e2ce7
Revert "Merge pull request #1131 from jotomo/901" 
This reverts commit 268dec0059, reversing
changes made to ab41541c69.
 2018-06-29 22:43:54 +02:00
Milos Kozak a3862aca2a
Merge pull request #1161 from schmitzn/refactor-strings 
Use positional format strings in translations
 2018-06-29 22:22:44 +02:00
Milos Kozak 2291472b01
Merge pull request #1168 from MilosKozak/milosremote/dev 
ask user if he switches to a HW pump for the first time
 2018-06-29 15:43:48 +02:00
AdrianLxM dccb675198
anrdoid -> android 2018-06-29 14:15:30 +02:00
AdrianLxM 4af7e6c1e6
update warning text 2018-06-29 14:13:33 +02:00
AdrianLxM 5a1d696ab1 ask user if he switches to a HW pump for the first time 2018-06-29 03:52:58 +02:00
Milos Kozak 268dec0059
Merge pull request #1131 from jotomo/901 
Don't loop for values from non-active BG sources
 2018-06-28 22:51:56 +02:00
Markus M. May 468b645486 Do calculations in a central place 2018-06-28 22:36:08 +02:00
Milos Kozak ab41541c69 fix NPE 2018-06-28 22:31:42 +02:00
Milos Kozak 720e938ebf allow longer lowtemp on RS an Rv2 2018-06-28 10:30:45 +02:00
Milos Kozak a99b478eea Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-27 20:13:37 +02:00
Milos Kozak 29032e658f show predictions in nsclient mode 2018-06-27 20:13:25 +02:00
Nico Schmitz 49e10dcaa9 Fix wrong argument in values-cs/strings.xml 2018-06-27 18:46:49 +02:00
Nico Schmitz 44eaa2d2f2 Use positional format strings in translations 2018-06-26 22:52:25 +02:00
Milos Kozak 2b799d9f71 SW: ask for import after storage permission 2018-06-26 13:15:50 +02:00
Milos Kozak 4df3561b4b setup wizard cleanup 2018-06-26 12:53:43 +02:00
Milos Kozak 520f2e1518 plugin descritpions to setup wizard 2018-06-26 12:28:53 +02:00
Milos Kozak 77245c027e prevent NPE 2018-06-26 10:45:56 +02:00
Milos Kozak f7f4385d5d cleanup 2018-06-26 00:20:43 +02:00
Milos Kozak d55612b290 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-26 00:16:31 +02:00
Milos Kozak 44cf82abde fix iob graph axis labels 2018-06-26 00:16:26 +02:00
Johannes Mockenhaupt b6a621528a
Autosens: show 'u's for UAM in output. 2018-06-26 00:01:31 +02:00
Johannes Mockenhaupt 50ffebc679
BgReading.copyFrom: don't update local data. 
Like the 'valid' flag, which is not copied and is not synced with
NS, don't sync sourcePlugin or isFiltered.
Otherwise there might be a race condition if the NS-roundtrip of a
locally received BG updates the sourcePlugin field to null,
thus leaving no values for the loop to loop with.
 2018-06-25 23:02:58 +02:00
Johannes Mockenhaupt 069f0fb7b1
Fix method name. 2018-06-25 22:51:59 +02:00
Milos Kozak 81ad4c54f3 fix bug when uncomplete autosens was stored to the cache 2018-06-25 22:20:00 +02:00
Milos Kozak 6d1fa2ffda Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-25 20:04:03 +02:00
Milos Kozak 4b777f8dcc fix extendedBolusView 2018-06-25 20:03:54 +02:00
Milos Kozak cac6297aae
Merge pull request #1155 from MilosKozak/AdrianLxM-patch-2 
swedish - removed unused string
 2018-06-25 16:01:54 +02:00
Johannes Mockenhaupt e4a72c8175
Fix name of incoming profile from NS with timeshift/percentage. 2018-06-25 12:07:12 +02:00
AdrianLxM e9834acf81
swedish - removed unused string 2018-06-25 00:12:29 +02:00
AdrianLxM 619ba32840
configbuilder fix 2018-06-25 00:07:43 +02:00
Milos Kozak 385f0c7bfe
Merge pull request #1148 from triplem/1133 
1133
 2018-06-24 19:32:18 +02:00
Milos Kozak ee2d6b71d1 add delay to sms bolus command 2018-06-24 18:28:38 +02:00
Markus M. May 07f7c00d85 Move Algo to abstract class 2018-06-24 18:20:28 +02:00
Milos Kozak 15607dc9be follow autosens min/max for clearing cache 2018-06-24 17:54:23 +02:00
Milos Kozak cf8bf419e2
Merge pull request #1147 from TebbeUbben/cb-fix 
Config builder cleanup
 2018-06-24 17:29:29 +02:00
Milos Kozak eb9f489411
Merge pull request #1149 from jotomo/treatment-prefs 
Treatments don't have settings.
 2018-06-24 17:20:59 +02:00
Johannes Mockenhaupt dcdbe7791f
Treatments don't have settings. 
Before this, treatments preferences opened preferencs of the
oref0 sensitivity plugin.
 2018-06-24 16:39:56 +02:00
AdrianLxM 87d24b6e6e
re-initialize on time sync Rv2 2018-06-24 15:46:31 +02:00
AdrianLxM 54e647bbe1
re-initialize after time-sync 2018-06-24 15:43:42 +02:00
Markus M. May faca79d13e Add unit test to PR 2018-06-24 15:43:25 +02:00
TebbeUbben 2b5631e1e7 Config builder cleanup 2018-06-24 15:13:06 +02:00
AdrianLxM 02eceef134
De-initialize Rv2 if time is off by more than 1.5h 2018-06-24 15:03:46 +02:00
AdrianLxM 78949a34ab
De-initialize RS if time is off by more than 1.5h 2018-06-24 15:03:03 +02:00
Milos Kozak c5841063a2
Merge branch 'dev' into rs-sync-warn 2018-06-24 14:03:12 +02:00
Milos Kozak 8c695255d6
Merge pull request #1143 from jotomo/strings 
Rename "Lock screen" -> "Keep screen on".
 2018-06-24 13:58:35 +02:00
AdrianLxM 6a96b546ec
Merge pull request #1127 from MilosKozak/AdrianLxM-patch-5 
Please Review: update determine-basal
 2018-06-24 13:40:46 +02:00
AdrianLxM 5f2f0fff40 time sync in Rv2 as in RS 2018-06-24 13:32:19 +02:00
AdrianLxM 3e53c66365 don't set time on large diff, just warn 2018-06-24 13:27:55 +02:00
AdrianLxM d72cb96d2b
Oref0 sensitivity 24 hours 2018-06-24 13:12:15 +02:00
Johannes Mockenhaupt a8d783874c
Rename "Lock screen" -> "Keep screen on". 2018-06-24 12:50:11 +02:00
Milos Kozak f7609317ba
Merge branch 'dev' into rs-sync-warn 2018-06-24 11:45:33 +02:00
Milos Kozak 2963f0a698
Merge pull request #1140 from triplem/issue_1130_backwards 
Issue 1130 backwards
 2018-06-24 11:44:41 +02:00
Johannes Mockenhaupt 784c071f53
Small oref1 sens corrections. 2018-06-24 01:03:38 +02:00
Markus M. May 7f9c459a4a Merge branch 'issue_1130' into issue_1130_backwards 2018-06-23 22:42:34 +02:00
Markus M. May 8bdaddb389 Allow backwards compatibility to previous solution to add quotes 2018-06-23 22:41:01 +02:00
Milos Kozak cbdd0699ec
Merge pull request #1139 from triplem/issue_1130 
fixes #1130
 2018-06-23 22:20:13 +02:00
Milos Kozak a3fafa521b nsclient for phones layout 2018-06-23 22:17:54 +02:00
Markus M. May e32f33a8d3 fixes #1130 2018-06-23 21:36:18 +02:00
Milos Kozak de2273836e OpenAPS Offline visualization fix 2018-06-23 21:16:08 +02:00
Milos Kozak a4b3b7b2e9 Clean AndroidAPS started button 2018-06-23 20:28:20 +02:00
AdrianLxM 11b8587768
Warn on long time diffs on Rv2 2018-06-23 20:05:59 +02:00
AdrianLxM 1b047bba69
Warn on large time offsets RS 2018-06-23 20:05:05 +02:00
AdrianLxM 9c0665124d
Update strings.xml 2018-06-23 20:04:09 +02:00
Milos Kozak 0d48cc8770 fix parsing SSID 2018-06-23 19:59:11 +02:00
Milos Kozak fb94c93ba6
Merge pull request #1110 from TebbeUbben/foreground-service 
Use a foreground service for the ongoing notification and enforce using it on Oreo and up
 2018-06-23 19:37:33 +02:00
Milos Kozak a3c3c52249 Merge branch 'dev' into sens-cutoff 2018-06-23 18:59:33 +02:00
Milos Kozak bbfe1d2f83 fix NPE in #1136 2018-06-23 18:52:58 +02:00
Milos Kozak f7309c9ff1 Merge branch 'dev' into sens-cutoff 2018-06-23 18:34:46 +02:00
Milos Kozak d59c3c567b
Merge pull request #1132 from jotomo/1129 
Combo: update error message. Fixes #1129.
 2018-06-23 18:32:59 +02:00
Milos Kozak 470487375d
Merge pull request #1136 from TebbeUbben/profile-invalid-fix 
Mark profile as invalid if high target < low target
 2018-06-23 18:24:40 +02:00
Milos Kozak 586665e19f nsclient table mode improvements 2018-06-23 18:24:04 +02:00
TebbeUbben 8adc333ade Mark profile as invalid if high target < low target 2018-06-23 16:02:10 +02:00
AdrianLxM 064a8915a0 downweight Autosens if not enough data 2018-06-23 14:05:12 +02:00
Johannes Mockenhaupt 5c95b785bb
Combo: update error message. Fixes #1129. 2018-06-23 13:33:17 +02:00
Milos Kozak 53ba6d46d5 fix adding zero deviations 2018-06-23 12:27:18 +02:00
Milos Kozak 9c5e389afb move sensitivity plugins to one package 2018-06-23 12:19:55 +02:00
Johannes Mockenhaupt 6cb09d4fcb
Remove BgReading.noise for now, clashes with existing NS data. 
I believe NS uses 'noise' to store the noise level (1 through 3?).
 2018-06-23 11:41:03 +02:00
Johannes Mockenhaupt 73e8a0c876
Rename BgReading.filtered to BgReading.isFiltered and add to NS. 
Avoids collision with 'filtered' value in NS data.
 2018-06-23 11:36:23 +02:00
Johannes Mockenhaupt 6d437b4afa
Test stubs. 2018-06-23 11:35:01 +02:00
Johannes Mockenhaupt c18effd893
Fix detecting BG source from NS entry. 2018-06-23 11:27:56 +02:00
Johannes Mockenhaupt b4db98fa1d
Process xDrip noise data if provided (engineering mode only). 2018-06-23 11:21:05 +02:00
Johannes Mockenhaupt 34ee125666
Add message to constraints if BG is not filtered. 2018-06-23 11:07:16 +02:00
Johannes Mockenhaupt 79dec2e871
Fixes. 2018-06-23 02:59:11 +02:00
Johannes Mockenhaupt 986d9fb01c
Detect source from NSClient BG. 2018-06-23 01:33:13 +02:00
Johannes Mockenhaupt 906cc8a76a
Clean up assigning sourcePlugin, filtered properties. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt 53b9d5cae3
Fix column type. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt aab171932c
Have Bgsource.processNewData return added BGs. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt 922f9ff83d
Refactor DataService to delegate BG processing to BgSources. 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt 7a331e0c94
Don't loop with readings coming from non-active BG source. 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt 6abad56b1f
Replace BgSourceInterface.advancedFilteringSupported. 
Replaced by 'filtered' property on BgReading.
 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt 98c933af57
BgReading: add sourcePlugin and filtered fields. 2018-06-23 01:24:26 +02:00
Milos Kozak 4efb115209 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-22 22:52:23 +02:00
Milos Kozak 8e08a293c1 detect bg source in nsclient 2018-06-22 22:30:03 +02:00
Milos Kozak 8a74646b67 set positive deviations to zero if bg < 80 2018-06-22 21:18:59 +02:00
AdrianLxM 5f6a6dbbbc
update determine-basal 2018-06-22 21:00:59 +02:00
Milos Kozak c139942981 reset autosens on site change (AAPS,WA) 2018-06-22 20:11:45 +02:00
Milos Kozak 8237456030 reset autosens on site change 2018-06-22 20:05:49 +02:00
Milos Kozak 9360151100 Merge branch 'dev' into oref1 2018-06-22 17:55:38 +02:00
Milos Kozak 7bed827f4b
Merge pull request #1119 from jotomo/delete-future-treatments 
Treatments tab: add button (if applicable) to delete future treatments.
 2018-06-22 17:47:37 +02:00
Milos Kozak 9dc667817b
Merge pull request #1120 from schmitzn/sync-butterknife-eventbus 
Synchronize Butterknife / Eventbus (#1090)
 2018-06-22 17:45:55 +02:00
Milos Kozak a3cf7622b6
Merge pull request #1121 from jotomo/tt-context-menu 
TT context menu
 2018-06-22 17:28:20 +02:00
Johannes Mockenhaupt 9b4f3f6e0e
Don't apply loop result if a bolus is in progress. 
While an SMB is rejected by the queue in this scenario, a temp basal
would still be applied, so don't apply loop results if a bolus is
progress or queued at this point.
 2018-06-21 22:58:15 +02:00
Johannes Mockenhaupt 3eed0afe61
Move 'eating soon' TT to top (ordering of dialog). 2018-06-21 22:29:16 +02:00
Johannes Mockenhaupt 58d79892ed
Overview: TT context menu. 2018-06-21 22:06:39 +02:00
Nico Schmitz 4d853c1435 Check for unbound variables 2018-06-21 21:58:12 +02:00
Johannes Mockenhaupt 41ce9677df
Remove duplicate string. 2018-06-21 09:57:35 +02:00
Milos Kozak bd846e7526
Merge pull request #1117 from jotomo/1068-bolus-after-smb 
WIP: Reject SMB if bolus is queued/running or outdated. Fixes 1068.
 2018-06-21 09:30:56 +02:00
AdrianLxM 809ad97cb9
Merge pull request #1118 from jotomo/1096 
Disable slope deviation unless on dev branch, fixes #1096.
 2018-06-21 06:00:17 +02:00
Johannes Mockenhaupt 6002c747e6
Treatments tab: add button (if applicable) to delete future treatments. 2018-06-21 00:38:22 +02:00
Johannes Mockenhaupt 49b84fb550
Reject SMB if bolus is queued/running or outdated. Fixes 1068. 2018-06-21 00:32:23 +02:00
Johannes Mockenhaupt 8036f8bcde
Disable slope deviation unless on dev branch, fixes #1096. 2018-06-21 00:31:35 +02:00
Milos Kozak 5292e09535 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-20 23:56:50 +02:00
Milos Kozak a02961da61 check for NPE 2018-06-20 23:56:38 +02:00
Nico Schmitz c3050740a8 Synchronize Butterknife / Eventbus 2018-06-20 22:57:31 +02:00
Milos Kozak 3ed11f9002 oref1 autosens: count with extra deviations 2018-06-20 20:49:16 +02:00
Milos Kozak 6eef71c4c0
Merge pull request #1116 from TebbeUbben/cb-fix 
Fix for #1115
 2018-06-20 20:43:29 +02:00
TebbeUbben ed10c8cadc Fix for #1115 2018-06-20 20:12:22 +02:00
Milos Kozak 370008f41e oref 0.6.0 sens 2018-06-20 18:39:47 +02:00
Milos Kozak e913cfe454 prepare oref1 plugin 2018-06-19 20:41:40 +02:00
Milos Kozak df021a2dd2
Merge pull request #1111 from jotomo/combo-setup-notification 
Combo setup notification
 2018-06-19 18:41:43 +02:00
Johannes Mockenhaupt 3ed4aa468d
Combo: fix ReadQuickInfoCommand to handle empty bolus history. 2018-06-18 20:19:47 +02:00
Johannes Mockenhaupt ef650b80a1
Combo: show notification on broken setup. 2018-06-18 20:19:30 +02:00
TebbeUbben ef237ed378 DummyService javadoc 2018-06-18 19:43:40 +02:00
Milos Kozak af8e1fb32f
Merge pull request #1078 from MilosKozak/AdrianLxM-patch-1 
restrict local profile DIA to min of 5 on the GUI
 2018-06-18 18:58:29 +02:00
TebbeUbben a590a8be42 Foreground service 2018-06-17 23:33:32 +02:00
Milos Kozak f14ba554f0 RS ble cleanup 2018-06-16 13:18:00 +02:00
Tebbe Ubben 1e4c7178f4
Merge branch 'dev' into dev 2018-06-15 21:10:33 +02:00
Milos Kozak 21b598edfa
Merge pull request #1100 from MilosKozak/rsoption 
Rsoption
 2018-06-15 00:19:08 +02:00
Milos Kozak bcabeac228
Merge pull request #1104 from schmitzn/fix-careportalevent 
Fix bug in CareportalEvent.getHoursFromStart()
 2018-06-15 00:04:47 +02:00
Milos Kozak 5acb689eeb
Merge pull request #1102 from TebbeUbben/new-icon 
New launcher icon
 2018-06-14 23:10:43 +02:00
TebbeUbben da9d586326 Also set round icon if available 2018-06-14 19:43:16 +02:00
TebbeUbben f77e903721 Revert "Use icon for all build configurations" 
This reverts commit e194e0d
 2018-06-14 19:39:00 +02:00
Nico Schmitz 43d787ff88 Simplify isOlderThan() 2018-06-14 12:38:15 +02:00
Nico Schmitz f82240a724 Fix bug in getHoursFromStart() 2018-06-14 12:34:42 +02:00
TebbeUbben e194e0dc48 Use icon for all build configurations 2018-06-13 20:26:46 +02:00
TebbeUbben 9e0dc9bfe5 New launcher icon 2018-06-13 20:23:40 +02:00
Roumen Georgiev 904957d0d2
removing unneeded methods 2018-06-13 18:24:50 +03:00
PoweRGbg a64364de4e removed excessive debugging and unneeded source 2018-06-13 16:17:10 +03:00
PoweRGbg 5a197676fb IT WORKS!!! 2018-06-13 15:57:42 +03:00
PoweRGbg faab8fbc67 setting full userOptions 2018-06-13 11:43:44 +03:00
Milos Kozak 4d2e166620 try to fix crash 2018-06-13 10:41:15 +02:00
PoweRGbg eaffa66946 latest 2018-06-13 11:11:03 +03:00
PoweRGbg 56651691a5 more more 2018-06-13 11:08:47 +03:00
PoweRGbg 64b5783e4a more 2018-06-13 11:07:03 +03:00
PoweRGbg 71c474ef5f danaR changes 2018-06-13 11:04:32 +03:00
PoweRGbg 5634aabd9f more 2018-06-13 11:02:52 +03:00
PoweRGbg 2cb3c15d61 more update 2018-06-13 11:01:43 +03:00
PoweRGbg cd337ecdc8 update to latest changes from Milos 2018-06-13 10:51:06 +03:00
PoweRGbg 434db333b1 reverting changes 2018-06-13 09:56:30 +03:00
PoweRGbg 87bc6ed798 Revert "more debugging output" 
This reverts commit 1adf8718ae.
 2018-06-13 09:49:58 +03:00
PoweRGbg 0f067ef3a7 Revert "more debugging output" 
This reverts commit f1f8bae2d1.
 2018-06-13 09:49:45 +03:00
PoweRGbg 90a3a66c30 Revert "Merge remote-tracking branch 'upstream/rsoption' into dev" 
This reverts commit 233fb33659, reversing
changes made to f1f8bae2d1.
 2018-06-13 09:49:37 +03:00
PoweRGbg 0e40d1e7ef Revert "Revert "more debugging output"" 
This reverts commit 209fb79396.
 2018-06-13 09:49:35 +03:00
PoweRGbg 209fb79396 Revert "more debugging output" 
This reverts commit f1f8bae2d1.
 2018-06-13 09:34:57 +03:00
PoweRGbg 233fb33659 Merge remote-tracking branch 'upstream/rsoption' into dev 2018-06-13 09:14:46 +03:00
Roumen Georgiev f1f8bae2d1 more debugging output 2018-06-13 09:00:04 +03:00
Milos Kozak 082918c776 remove unneded code 2018-06-13 07:44:26 +02:00
Milos Kozak 6fa759a395 remove unneded code 2018-06-13 07:42:57 +02:00
Milos Kozak ecdbe2ac37 setUserOptions cleanup 2018-06-12 23:43:04 +02:00
Milos Kozak d051e081e2 Merge branch 'dev' into rsoption 2018-06-12 21:59:20 +02:00
Milos Kozak d4ed6539d8 poctech units mmol/L 2018-06-12 21:57:33 +02:00
Roumen Georgiev 1adf8718ae more debugging output 2018-06-12 13:30:07 +03:00
Roumen Georgiev 06507bab2c update method names 2018-06-12 12:41:40 +03:00
Roumen Georgiev 978d94499f update method names 2018-06-12 11:03:23 +03:00
Roumen Georgiev f044ab15c0 setting swithces in activity 2018-06-12 10:39:47 +03:00
Roumen Georgiev 01012d817c getting userOptions from v2 2018-06-12 10:29:47 +03:00
Milos Kozak e7eec8fe69 Poctech BG source 2018-06-11 17:26:31 +02:00
TebbeUbben 41a7f57b75 Update Objective views every minute 2018-06-11 16:35:47 +02:00
TebbeUbben 3ac10f4f7a Improved MinimumDurationTask visualization 2018-06-11 16:24:46 +02:00
TebbeUbben 31cb68240b Automatically scroll to currently active objective 2018-06-11 15:45:28 +02:00
Roumen Georgiev 2441214bb8 added SetUserOptions for DanaR 2018-06-11 11:36:32 +03:00
TebbeUbben 97984f8ef3 Improved leftover time display 2018-06-09 23:15:46 +02:00
TebbeUbben 6bc13d9cc0 Don't return false in isStarted if objective has been accomplished 2018-06-09 23:10:54 +02:00
TebbeUbben 0d21a0ab62 Fixed tests 2018-06-09 23:03:31 +02:00
TebbeUbben 005039effc Objectives styling 2018-06-09 22:07:41 +02:00
AdrianLxM 8106907a55 unify padding pills and pumpstatus 2018-06-09 13:53:11 +02:00
AdrianLxM 3a9017ae10
Merge pull request #1092 from TebbeUbben/sw-same-color-scheme 
Same color scheme for SW
 2018-06-09 13:37:31 +02:00
TebbeUbben 934a7e6797 Same color scheme for SW 2018-06-09 13:27:27 +02:00
TebbeUbben 531a926d00 Close navigation drawer on click 2018-06-09 13:17:26 +02:00
Milos Kozak 30dbbb12a8
Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3 
Wizard: fully undo "ok" on constraints violation
 2018-06-09 11:46:41 +02:00
Milos Kozak 6344e88550
Merge pull request #1084 from TebbeUbben/dev 
Config builder styling
 2018-06-09 11:39:16 +02:00
TebbeUbben 09b93078a8 Fixed typos 2018-06-08 23:45:32 +02:00
TebbeUbben 67b6d94fe5 Android Wear was renamed to WearOS 2018-06-08 23:35:18 +02:00
TebbeUbben 5d60f34e26 Better description for MDI plugin 2018-06-08 23:31:57 +02:00
TebbeUbben f7597c93d7 Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
 2018-06-08 23:30:39 +02:00
TebbeUbben 37d543c865 Improvements to descriptions from Adrian 2018-06-08 23:27:52 +02:00
TebbeUbben 506482082d Fixed descriptions 2018-06-08 21:26:12 +02:00
TebbeUbben 029057f1fc Fix typo 2018-06-08 21:25:19 +02:00
TebbeUbben 2d94133175 Plugin descriptions 2018-06-08 21:19:46 +02:00
TebbeUbben f9582d042f Don't restore CheckBoxes and RadioButtons automatically 2018-06-08 20:05:33 +02:00
swissalpine 5bf6057838
Update danar_fragment.xml 2018-06-08 19:22:36 +02:00
swissalpine 87ea018181
Update wear_fragment.xml 2018-06-08 19:22:03 +02:00
swissalpine 3c58b94a28
Update objectives_fragment.xml 2018-06-08 19:19:21 +02:00
swissalpine 5df03e4ea7
Update openapsama_fragment.xml 2018-06-08 19:07:04 +02:00
swissalpine ab599a452b
Update loop_fragment.xml 2018-06-08 19:06:16 +02:00
swissalpine a926c4db86
Update combopump_fragment.xml 2018-06-08 19:05:34 +02:00
swissalpine 76505e0229
Update careportal_fragment.xml 2018-06-08 19:04:31 +02:00
swissalpine 7bd2f629bf
Update bgsource_fragment.xml 2018-06-08 19:02:20 +02:00
AdrianLxM bbf09a62f1
synchronize onDestroyView 2018-06-08 06:20:35 +02:00
AdrianLxM 97bbc00dcf
Don't set text onunbound gui elements 2018-06-08 06:19:02 +02:00
TebbeUbben 38526d64c6 These should not be changed 2018-06-07 23:24:10 +02:00
TebbeUbben e25ebbdafa Protection against callback looping 2018-06-07 23:23:10 +02:00
TebbeUbben aa86a49339 Use real plugin descriptions 2018-06-07 22:55:13 +02:00
TebbeUbben 13cb4c28ed ConfigBuilder styling 2018-06-07 22:54:27 +02:00
AdrianLxM d6184cc151
Wizard: fully undo "ok" on constraints violation 
Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056
 2018-06-07 22:44:09 +02:00
Roumen Georgiev 17a0aba2e5 remove button if pump is DanaR Korean 2018-06-07 09:34:12 +03:00
Roumen Georgiev 6559f57cd9 remove button if pump is DanaR Korean 2018-06-07 09:33:29 +03:00
Roumen Georgiev 4b7f8615bf
Merge pull request #26 from MilosKozak/rsoption 
update
 2018-06-07 09:30:22 +03:00
Roumen Georgiev 9e2074433e remove button if pump is DanaR Korean 2018-06-07 09:26:33 +03:00
Milos Kozak 9e099ec741
Merge pull request #1079 from MilosKozak/AdrianLxM-patch-2 
Ro update by @bogdangorescu
 2018-06-06 23:33:26 +02:00
AdrianLxM c96f860585
Update strings.xml 2018-06-06 23:19:54 +02:00
AdrianLxM 712549e562
Update strings.xml 2018-06-06 23:04:15 +02:00
Milos Kozak 1d13712aec nsclient setup wizard tweaking 2018-06-06 22:58:50 +02:00
AdrianLxM 4c2babb905
Ro formatted false 3rd 2018-06-06 22:44:06 +02:00
AdrianLxM 964efee162
Ro formatted false 2nd 2018-06-06 22:42:36 +02:00
AdrianLxM f343cfe0fa
Ro formatted false 2018-06-06 22:39:51 +02:00
AdrianLxM 0996b0f182
Ro update 2018-06-06 22:09:40 +02:00
Milos Kozak f94d1e85e1 cleanup 2018-06-06 18:32:19 +02:00
Milos Kozak 04fffae811 addd setUserOption to Queue (Dana pumps) 2018-06-06 18:29:40 +02:00
Milos Kozak 6a4bb8a719 layout cleanup 2018-06-06 17:58:59 +02:00
Milos Kozak d2830d1938 DanaRUserOptionActivity update on pump load 2018-06-06 17:13:58 +02:00
Milos Kozak bbeca6b83e cleanup 2018-06-06 16:57:00 +02:00
AdrianLxM 5ec828e16f
restrict local profile DIA to min of 5 on the GUI 2018-06-06 15:18:03 +02:00
Milos Kozak 4adcb88d12
Merge pull request #1067 from jotomo/fill-one-shot-guard 
One-short guards for Fill/Prime dialog.
 2018-06-06 08:47:08 +02:00
Roumen Georgiev 7ef97a5334 files renamed and added icon 2018-06-06 09:28:51 +03:00
Roumen Georgiev f528b708c3 Merge remote-tracking branch 'origin/dev' into dev 2018-06-06 09:22:28 +03:00
Roumen Georgiev fd4662df32 files renamed and added icon 2018-06-06 09:13:21 +03:00
AdrianLxM 1acefd618b
Merge pull request #1076 from MilosKozak/AdrianLxM-cancel-color 
higher contrast ok and cancel buttons
 2018-06-05 22:29:21 +02:00
AdrianLxM e21f99a63d
Merge pull request #1077 from MilosKozak/padding-top 
Slightly more padding on top buttons/fields
 2018-06-05 22:29:11 +02:00
AdrianLxM 5c6d098601
Merge pull request #1073 from jotomo/french-translation-format-specifier-fix 
Fix format specifier in French translation.
 2018-06-05 22:28:55 +02:00
Milos Kozak 65c8cb22ef check for null context 2018-06-05 14:38:00 +02:00
Milos Kozak 7e7e921853 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-05 14:37:47 +02:00
Milos Kozak 5df51e8a6e check for NPE 2018-06-05 14:35:18 +02:00
AdrianLxM 32f4a08fa6 slightly more padding on top buttons/fields 2018-06-05 13:26:43 +02:00
Roumen Georgiev 4a481bf294
Merge branch 'dev' into dev 2018-06-05 12:45:00 +03:00
Roumen Georgiev 54cc768a47 files renamed and added icon 2018-06-05 12:39:55 +03:00
Roumen Georgiev c1b69404d0 files renamed and added icon 2018-06-05 12:19:47 +03:00
Roumen Georgiev 37e6e0268c
Merge pull request #25 from alesinka/master 
adding icons from Alessya
 2018-06-05 10:55:41 +03:00
AdrianLxM 536fe3e5d2
higher contrast ok and cancel buttons 2018-06-05 00:15:41 +02:00
AdrianLxM 171209503e
remove unneeded log statement 2018-06-05 00:04:03 +02:00
AdrianLxM 9d07e3e83f
Merge pull request #1072 from jotomo/silly-idea 
Revert "Update prediction colors to match NS."
 2018-06-04 23:54:22 +02:00
AdrianLxM 4998ebae89
Merge pull request #1071 from TebbeUbben/new-design 
TabLayout + NavigationDrawer
 2018-06-04 23:53:42 +02:00
TebbeUbben 5fa79b1db9 Changed accent color to #009688 2018-06-04 23:34:56 +02:00
TebbeUbben f7b19e37a1 Button for plugin preferences 2018-06-04 21:56:31 +02:00
TebbeUbben 80e9d769e4 Compact version of toolbar 2018-06-04 21:34:21 +02:00
Alessya fbe44b7190 new icon added to danaR tab - user options 2018-06-04 17:48:02 +03:00
Johannes Mockenhaupt d31b90cd3e
Fix format specifier in French translation. 2018-06-04 15:38:06 +02:00
Roumen Georgiev 19e7d507b2 shutdown value can be 0 2018-06-04 10:24:20 +03:00
Roumen Georgiev 1147c28f04 use numberPicker instead of editText 2018-06-04 10:23:01 +03:00
Johannes Mockenhaupt 358108be49
Revert "Update prediction colors to match NS." 
This reverts commit dd41afa
 2018-06-04 03:00:50 +02:00
TebbeUbben 6c1ccebb4a Moved padding to Toolbar 2018-06-03 23:42:10 +02:00
TebbeUbben 9cf9da0d22 MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED 2018-06-03 23:33:49 +02:00
TebbeUbben 263275659a TabLayout + NavigationDrawer 2018-06-03 23:28:04 +02:00
TebbeUbben 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
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