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

4712 commits

Author SHA1 Message Date
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
Johannes Mockenhaupt eac1d5ffdb
(Hopefully) fix iob(AMA|SMB)shouldBeLimited tests. 
By making sure there is exactly one APS plugin enabled.
 2018-06-23 13:12:29 +02:00
Johannes Mockenhaupt b2a60e2fac
Disable unfinished noise tests. 2018-06-23 12:52:07 +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 940d58fc79
Tests. 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 f8c621dc6a Fixed tests 2018-06-03 11:04:33 +02:00
TebbeUbben a86c654f8d Use real TBR cancels and dismiss their alerts 2018-06-03 10:56:29 +02:00
Johannes Mockenhaupt ef6ee43c32
One-short guards for Fill/Prime dialog. 2018-06-02 18:06:04 +02:00
TebbeUbben f151cbb0bf TBR emulation 2018-06-02 16:37:53 +02:00
Roumen Georgiev 054003460c push new settings to pump 2018-06-01 16:42:56 +03:00
Milos Kozak 96fb4323f8
Merge pull request #1064 from jotomo/purple-pony 
Update prediction colors to match NS.
 2018-06-01 13:57:20 +02:00
Johannes Mockenhaupt ef8f4f1448
Fix unit test. 2018-06-01 12:24:09 +02:00
Roumen Georgiev 75dbf71a70 Merge remote-tracking branch 'origin/dev' into dev 2018-06-01 12:11:29 +03:00
Roumen Georgiev 861f9bdd8d Timeformat reverse 2018-06-01 12:10:08 +03:00
Roumen Georgiev 9569fbf183
Merge branch 'dev' into dev 2018-06-01 12:02:41 +03:00
Roumen Georgiev 908fd9f77e strings update 2018-06-01 11:55:59 +03:00
Roumen Georgiev 85bef0036b back to original 2018-06-01 11:45:31 +03:00
Roumen Georgiev 4581733cd7 some debugging output and forced getting user options 2018-06-01 11:41:37 +03:00
Roumen Georgiev 319e786988 display 666 in backlightontime if no settings read 2018-06-01 10:08:13 +03:00
Roumen Georgiev f3d19aa6f4 convert int values to strings 2018-06-01 09:38:18 +03:00
Johannes Mockenhaupt dd41afa55a
Update prediction colors to match NS. 2018-06-01 02:53:23 +02:00
swissalpine dd60cadd5a
Fix broken cage age 2018-05-31 22:22:22 +02:00
Roumen Georgiev bbb9c681e6 filling in some data 2018-05-31 17:16:30 +03:00
Roumen Georgiev 41af503104 filling in some data 2018-05-31 17:10:09 +03:00
Roumen Georgiev da89ea1643 some formatting 2018-05-31 16:47:58 +03:00
Roumen Georgiev 39e704645b create userOptionsActivity class 2018-05-31 14:45:26 +03:00
Roumen Georgiev e4e4829c73 update of strings 2018-05-31 14:18:43 +03:00
Roumen Georgiev f71372444b strings for danaR options fragment 2018-05-31 13:54:37 +03:00
Markus M. May a587f72de2 Fix wrong usage of event in refactored source 2018-05-30 18:09:41 +02:00
Milos Kozak 418f68153e
Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering 
NSClient as source without advanced filtering
 2018-05-30 08:08:04 +02:00
Markus M. May 0fe744c3e6 Remove unnecessary assignment 2018-05-29 21:44:33 +02:00
Markus M. May 41503800e8 Remove some duplicate code lines 2018-05-29 20:57:55 +02:00
AdrianLxM de1196f34b
NSClient as source without advanced filtering 2018-05-29 12:57:07 +02:00
Milos Kozak 7e57c30ecf SW Exit label 2018-05-25 13:00:08 +02:00
Milos Kozak 35c07d1e60 SW scroll to the top on activity create 2018-05-24 00:13:59 +02:00
Milos Kozak d642418e02 resolve NPE 2018-05-23 23:43:41 +02:00
Milos Kozak 683caf78f8 SW configure insulin button 2018-05-23 13:47:16 +02:00
Milos Kozak a7cfcd56e3 SW fix return to 1st page 2018-05-23 13:20:24 +02:00
Milos Kozak fa2c0ab003
Merge pull request #994 from MilosKozak/startupwizard 
Startupwizard
 2018-05-22 23:07:04 +02:00
Milos Kozak 53bdb0bf09 asking permissions to notifications 2018-05-22 23:06:17 +02:00
Milos Kozak 5d27a28dc9 SW eula 2018-05-22 20:02:38 +02:00
Milos Kozak 250f9f74a0 move askForStoragePermission 2018-05-22 18:59:34 +02:00
Milos Kozak 2626e5bb63 SW android permissions 2018-05-22 17:34:09 +02:00
Milos Kozak 4fa24fb009 SW add more texts 2018-05-20 23:44:09 +02:00
Milos Kozak c723deaf02 SW patient age screen finalization 2018-05-20 22:01:32 +02:00
Milos Kozak b57683eaf5 SW rename package 2018-05-20 21:55:53 +02:00
Milos Kozak f24d296836 SW nsclient screen finalizing 2018-05-20 21:36:17 +02:00
AdrianLxM 953128ffe5
UAM without advanced filtering 2018-05-20 19:17:46 +02:00
Milos Kozak 52a4f9af14 SW loop screen update 2018-05-20 16:29:15 +02:00
Milos Kozak d079052944 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-20 16:18:10 +02:00
Milos Kozak de8557a115 SW sensitivity plugin 2018-05-20 16:17:53 +02:00
Milos Kozak 5b9594bdbb SW create elements package 2018-05-20 15:09:32 +02:00
Milos Kozak d0ed4bd717 SWString fix 2018-05-20 15:01:03 +02:00
Milos Kozak bac1be1944
Merge pull request #1050 from boysim/dev 
Added and improved dutch translations
 2018-05-20 14:46:41 +02:00
Milos Kozak 7714aa9138 Merge branch 'dev' into startupwizard 2018-05-20 14:18:58 +02:00
boysim 5c346f5b79 addedd formattng="false" 2018-05-20 14:18:37 +02:00
Milos Kozak 53cbe05436
Merge pull request #1019 from McHoffi/obj.7-add-info 
Obj.7 add info about using SMB/maxIOB
 2018-05-20 14:14:11 +02:00
boysim e2bfb224f2 dutch typo fixes 2018-05-20 13:36:28 +02:00
boysim da8acd4a1e dutch typo fixes 2018-05-20 12:55:52 +02:00
Simon Pauwels 25b20f13f1
Merge pull request #50 from MilosKozak/dev 
20 mei
 2018-05-20 12:20:49 +02:00
Milos Kozak 948e925d12 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-20 10:56:37 +02:00
Milos Kozak 06e52bb6ae remove duplicated key 2018-05-20 10:56:32 +02:00
Roumen Georgiev 764e035666
remove wizard from backstack and fix the Exit -> returning to SW 2018-05-16 15:35:17 +03:00
Milos Kozak e91d7e0d11
Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2 
Swedish update
 2018-05-15 14:27:39 +02:00
AdrianLxM bf23a8f935
polish update 2018-05-15 14:20:35 +02:00
AdrianLxM bae05b26bb
Update strings.xml 
Thanks Marcus
 2018-05-15 14:03:14 +02:00
Milos Kozak 66e50f5b62
Merge pull request #1038 from jotomo/upstreaming 
[Polish] Dialog/color consistency, translations and other small stuff
 2018-05-15 13:09:50 +02:00
Milos Kozak e58149379a
Merge pull request #1043 from jotomo/issue-646 
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.
 2018-05-15 10:55:04 +02:00
Johannes Mockenhaupt 561c7fb470
Add test. 2018-05-14 00:38:47 +02:00
Johannes Mockenhaupt 25aa6f859f
On bolus cancel request, cancel all boluses. Partially addresses #646. 2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt 29efe11ece
Combo: always send out progress updates (SMB or not). 
Without this, showing SMB progress on wear is broken.

(cherry picked from commit 5ebff72)
 2018-05-13 23:20:29 +02:00
TebbeUbben 3103a0f276 Some styling for SW 2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt 52da1feaf0
i18n: add German translation, layout issues with longer translations. 
Dialog headers (insulin, carbs, prime/fill) now lock proper at least
in English and German.
 2018-05-13 13:35:24 +02:00
Johannes Mockenhaupt 24e672a7f8
Add icon header to calibration dialog. 2018-05-13 12:48:30 +02:00
Johannes Mockenhaupt d80fecc390
Add T.now, plus, minus methods. 2018-05-13 12:44:47 +02:00
Johannes Mockenhaupt d0492462a4
Add time to build version. 2018-05-13 12:32:45 +02:00
Johannes Mockenhaupt 1883ac06dd
Use TT color for TT confirmations in dialogs. 2018-05-13 12:14:49 +02:00
boysim aab85fe298 added dutch translations 2018-05-11 23:23:55 +02:00
boysim bf5e8e7142 added dutch translations 2018-05-11 21:26:42 +02:00
Simon Pauwels f788f5981d
Merge pull request #49 from MilosKozak/dev 
11/05
 2018-05-11 21:05:31 +02:00
Milos Kozak 4fae6c703c SW autostart SetupWizard 2018-05-11 13:14:59 +02:00
Milos Kozak ff2cc04408 SW warn if exported configuration is missing 2018-05-11 13:04:17 +02:00
Milos Kozak 7be418fdf2
Merge pull request #980 from triplem/de 
DE translation
 2018-05-11 09:24:24 +02:00
Markus M. May cdd264686b fix duplicate % 2018-05-11 08:43:24 +02:00
Milos Kozak 337a3d9776 SW show ObjectivesFragment 2018-05-11 08:30:21 +02:00
Milos Kozak 0a51c86afb SW Configure APS button 2018-05-11 00:09:35 +02:00
Milos Kozak 376fffa6ec SW Import settings, Skip wizard 2018-05-10 23:59:20 +02:00
Milos Kozak 8d7df64050
Merge pull request #1016 from MilosKozak/pump-notifications 
Pump notifications
 2018-05-10 23:24:45 +02:00
Milos Kozak e105e5149e
Merge pull request #1032 from jotomo/wear-wizard-tt 
Wear wizard: add TT config option.
 2018-05-10 16:53:34 +02:00
Markus M. May 6d04d4b6e5 use positional indices in formatted strings to allow the usage of the translation editor 2018-05-10 16:53:01 +02:00
Roumen Georgiev 91c0b1a2ec make Objectives visible 2018-05-10 14:36:05 +03:00
Roumen Georgiev 61afdd6e4c cleanup 2018-05-10 14:05:33 +03:00
Roumen Georgiev 9ac081dd1d arrays.xml clean 2018-05-10 14:01:17 +03:00
Roumen Georgiev 016aa1c069 Added insulin descriptions to SW screen 2018-05-10 13:56:50 +03:00
Roumen Georgiev 2fa77d2a8c Added insulin descriptions to SW screen 2018-05-10 13:49:13 +03:00
Roumen Georgiev 33a6135e75 Added insulin descriptions to SW screen 2018-05-10 13:48:18 +03:00
boysim 0227fc0089 added dutch translations 2018-05-10 11:53:38 +02:00
Roumen Georgiev 06180e3bbd Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-10 12:51:12 +03:00
Simon Pauwels a5babe7934
Merge pull request #48 from MilosKozak/dev 
10/05
 2018-05-10 10:59:51 +02:00
Milos Kozak 71b44edea6 SW enable loop 2018-05-09 19:34:15 +02:00
Milos Kozak fb7067b207 SW profile switch 2018-05-09 19:24:20 +02:00
Milos Kozak 1ba828d20a SWFragment 2018-05-09 18:49:42 +02:00
Johannes Mockenhaupt a2a165d510
Wear wizard: make TT option depend on BG being enabled. 2018-05-09 16:46:22 +02:00
Roumen Georgiev e3153230e0 added NSClient followup 2018-05-09 17:11:07 +03:00
Milos Kozak 0060a2ba7f SW show pump status 2018-05-09 15:10:47 +02:00
Roumen Georgiev 50f8bf2d18 fix for screens adding up 2018-05-09 15:55:02 +03:00
Roumen Georgiev bfd61a65a0 fix for screens adding up 2018-05-09 15:44:40 +03:00
Roumen Georgiev 41d736e176 updated to latest from Milos 2018-05-09 15:06:34 +03:00
Roumen Georgiev a7bbf93599
Merge pull request #19 from MilosKozak/startupwizard 
Startupwizard
 2018-05-09 14:49:17 +03:00
Roumen Georgiev 0e8f0669c5
Update SWDefinition.java 2018-05-09 14:48:35 +03:00
Milos Kozak bacb3fb337 SW pump screen 2018-05-09 13:38:17 +02:00
Roumen Georgiev 1f2f2f54fc added SWCheckbox item 2018-05-09 14:15:53 +03:00
Milos Kozak ed43eddc83 SWInfotext 2018-05-09 11:55:21 +02:00
Milos Kozak 61a7d69a65 Merge branch 'dev' into startupwizard 2018-05-09 11:41:05 +02:00
Milos Kozak dbc5e3689a
Merge pull request #1028 from andyrozman/translation_irish 
Translation - Irish (Gaeilge)
 2018-05-09 11:20:52 +02:00
Andy Rozman bacc79970a Added formated=false to some translations. 2018-05-09 10:19:27 +01:00
Milos Kozak 8c2d0d80ee
Merge pull request #1017 from MilosKozak/notification-height 
Tests required: Notification height
 2018-05-09 10:16:29 +02:00
Roumen Georgiev d5a3177c35 trying pump followup screen -NOT WORKING 2018-05-09 11:06:52 +03:00
McHoffi 77522d0770
Update strings.xml 2018-05-09 09:45:53 +02:00
Milos Kozak 0c848b25f6
Merge branch 'dev' into translation_irish 2018-05-09 09:25:11 +02:00
Milos Kozak e29a590cad
Merge pull request #1020 from MilosKozak/dia-refactor 
default DIA
 2018-05-08 23:43:54 +02:00
Milos Kozak 62a83bc197
Merge pull request #1010 from MilosKozak/sv-update 
swedish update
 2018-05-08 23:32:10 +02:00
Milos Kozak 3f568c2724
Merge pull request #1030 from triplem/wifi_connection 
Add isConnected, enable NSClient only, if really connected to internet
 2018-05-08 23:30:51 +02:00
Milos Kozak faba0d9ff6
Merge pull request #1023 from MilosKozak/polish-translation 
Polish translation
 2018-05-08 23:27:14 +02:00
Milos Kozak 8c042b4bc8
Merge pull request #1029 from RadoslavR/patch-58 
bg translation again
 2018-05-08 23:18:52 +02:00
Johannes Mockenhaupt 39905f8e60
Darker UAM, ZT prediction colors. 
They now have the same level of 'brightness'.
 2018-05-08 21:26:52 +02:00
Markus M. May 86a91baad7 Fix translation 2018-05-08 20:56:02 +02:00
Roumen Georgiev 85d4ef4419 trying pump followup screen 2018-05-08 17:09:37 +03:00
Roumen Georgiev e357c7fd1b adding pump selection 2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt ce6e53e9c6
Wear wizard: add TT config option. 2018-05-08 13:28:01 +02:00
Markus M. May b0d8d547d8 Add isConnected, enable NSClient only, if really connected to internet 2018-05-07 20:43:13 +02:00
Radoslav Radev 0164da23a4
Update strings.xml 2018-05-07 21:34:55 +03:00
Markus M. May 5314c24099 Additional translations 2018-05-07 20:25:30 +02:00
Andy Rozman 3baf907267 Initial irish translation 2018-05-07 16:45:38 +01:00
AdrianLxM c6dac2789c one more polish update 2018-05-07 10:30:07 +02:00
AdrianLxM af2c27236b polish update 2018-05-07 10:24:06 +02:00
Johannes Mockenhaupt 785c402848
LP: Don't notify about invalid values during editing. 2018-05-07 02:11:59 +02:00
boysim 2ae6369362 added dutch translations 2018-05-06 22:52:04 +02:00
AdrianLxM 3385a23bdb
Merge pull request #1004 from pedroll/aaps20_rc3 
Spanish translation
 2018-05-06 20:25:17 +02:00
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 cdc8e45f32
Merge pull request #1015 from jotomo/lemming-treatment 
Fix finding BG in graph for treatments before the first displayed BG.
 2018-05-06 19:51:01 +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 9d367c1fa1
Update ObjectivesFragment.java 2018-05-06 18:18:34 +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
AdrianLxM f0351834ff default DIA 2018-05-06 12:49:03 +02:00
McHoffi 36d6edf0db
Update strings.xml 2018-05-06 12:16:51 +02:00
Johannes Mockenhaupt 56cbac3b4d
Leftover MainApp.gs rewrite. 2018-05-06 11:49:16 +02:00
Johannes Mockenhaupt ef70c1f244
MainApp.sResources.getColor -> MainApp.gc. 2018-05-06 11:47:15 +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 116222858e update lastApproachingDailyLimit 2018-05-05 21:12:09 +02:00
AdrianLxM d99fafe375 restrict aproaching daily limit to once every 30 minutes RS 2018-05-05 21:10:15 +02:00
AdrianLxM 5458df0907 restrict aproaching daily limit to once every 30 minutes Rv2 2018-05-05 21:08:17 +02:00
AdrianLxM c2315b7bea restrict aproaching daily limit to once every 30 minutes R-Korean 2018-05-05 21:03:35 +02:00
AdrianLxM b43eff8e55 restrict aproaching daily limit to once every 30 minutes R 2018-05-05 21:02:31 +02:00
AdrianLxM 70b2b1502f restrict wrong password notification to once every 30 seconds 2018-05-05 20:59:11 +02:00
AdrianLxM c8c7e12056 Wrong password notification 2018-05-05 20:54:10 +02:00
AdrianLxM 246c8922df Korean wrong password notification 2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt 1e0b7d331a
Fix finding BG in graph for treatments before the first displayed BG. 
(cherry picked from commit 8bdafe3)
 2018-05-05 19:13:38 +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