Commit graph

2251 commits

Author SHA1 Message Date
AdrianLxM 124ec6e992 rhino small refactor 2017-10-15 11:51:12 +02:00
Johannes Mockenhaupt 7c04787004
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
j2v8 only provides files for x86 and arm-v7a while libBleCommandUtil
provides x64 libs as well. This fails to load since x86 & x64 can't be mixed
and Android ends up loading libBleCommandUtil's x64 variant (on a x64
device) and then failing since there's no x64 version of j2v8.

This excludes all libBleCommandUtil ibs except those that match j2v8.

Revert this when we switch away from j2v8.

(cherry picked from commit 09036dc)
2017-10-15 11:19:34 +02:00
Johannes Mockenhaupt a9adcee974
NewTreatmentDialog: sanitize inputs, fixes #417.
Inputs are now check as they're being made and cleared if they
exceed constraints. This is the same behaviour the Calculator
dialog shows.
2017-10-15 10:45:12 +02:00
AdrianLxM 9008ef6f6f rhino complex parameter passing 2017-10-15 03:55:03 +02:00
AdrianLxM 303d35118e rhino first parameter passing 2017-10-15 03:50:18 +02:00
AdrianLxM 81b611ad92 rhino function passing 2017-10-15 03:21:32 +02:00
AdrianLxM 7f2451934c first rhino 2017-10-15 02:52:57 +02:00
Milos Kozak 1db158670a location permission for BLE scanning 2017-10-14 13:36:38 +02:00
Milos Kozak 1994cd707c use customized name only for LocalProfile 2017-10-14 10:39:32 +02:00
Milos Kozak 3b90d02e05 show status on Dana fragment too 2017-10-13 13:31:32 +02:00
Milos Kozak 02c57fb9a3 RS connection improvement 2017-10-13 13:17:17 +02:00
Milos Kozak c99830968a adjust enforcing new temp basal on user request 2017-10-13 12:39:34 +02:00
Milos Kozak f235b5fb02 use basalStep instead of fixed value 2017-10-13 12:07:33 +02:00
Milos Kozak 9a4e457d2b fix RS events parsing 2017-10-13 11:54:50 +02:00
Milos Kozak e40033dcb8 formated=false 2017-10-13 09:24:02 +02:00
Milos Kozak bee60eb0e3 CS translations 2017-10-13 09:16:15 +02:00
Milos Kozak 1f3c54eb73 split sgvs before broadcast 2017-10-13 08:35:29 +02:00
Milos Kozak 6124ef25a4 report wrong alarm data #2 2017-10-13 08:21:37 +02:00
Milos Kozak 91e286b2ae report wrong alarm data 2017-10-13 08:11:30 +02:00
Milos Kozak 45a2eba0c2 fix NPE 2017-10-13 08:06:27 +02:00
AdrianLxM 71d95bea92 fix ic isf 2017-10-13 02:56:49 +02:00
AdrianLxM 869b3eff5f Spinner set selection delayed 2017-10-12 23:56:58 +02:00
AdrianLxM 746d71bcff remove wear flavours 2017-10-12 18:24:48 +02:00
AdrianLxM f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
AdrianLxM 944e334231 migrate CPP->LP working 2017-10-12 12:44:17 +02:00
AdrianLxM 6f97e52a07 migrate CPP->LP partial 2017-10-12 12:36:06 +02:00
AdrianLxM 45c07d4106 U/h -> U 2017-10-11 23:38:08 +02:00
AdrianLxM 4667a047ea add sum to basal in lp 2017-10-11 20:57:43 +02:00
AdrianLxM 39b18915d0 Align LP GUI 2017-10-11 20:19:42 +02:00
AdrianLxM 339c33bd75 Spinner - selection events only after first touch 2017-10-11 19:25:09 +02:00
AdrianLxM 374983e1ae only inflate elements when needed 2017-10-11 07:59:41 +02:00
AdrianLxM c181aaaf34 Basal sum in label 2017-10-11 02:32:17 +02:00
AdrianLxM e6565c1911 reuse button on profile switch 2017-10-11 00:25:44 +02:00
AdrianLxM 02369b952b a little safer< 2017-10-10 22:54:24 +02:00
AdrianLxM 398e950f8e fix percentage concatenation on profile names 2017-10-10 22:11:06 +02:00
AdrianLxM 549b72b032 fix percentage/shift from watch 2017-10-10 21:51:58 +02:00
AdrianLxM b60ff8ceef max timeshift to 23 2017-10-10 20:47:38 +02:00
AdrianLxM 36784b983e remove cpp import 2017-10-10 20:42:29 +02:00
AdrianLxM 1410b2e706 wear cpp -> general profile 2017-10-10 20:32:43 +02:00
Milos Kozak 982e46d958 prepare profileswitch function for watch 2017-10-10 19:25:21 +02:00
Milos Kozak 77ec52ff23 fix sending profile switch to pump 2017-10-10 19:19:39 +02:00
Milos Kozak da71cdfca0 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 19:15:07 +02:00
Milos Kozak 24099222f3 Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
Milos Kozak 50de4a5979 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 18:03:50 +02:00
Milos Kozak d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +02:00
Milos Kozak c6392ec625 Merge remote-tracking branch 'origin/dev' into profile 2017-10-09 23:15:02 +02:00
Milos Kozak 9ec3efbaab fix conflict 2017-10-09 23:14:46 +02:00
Milos Kozak 230dd5f0a8 Merge pull request #451 from jotomo/checkboxes-and-labels-aligned
Overview: align checkboxes and labels vertically.
2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt e586e1389e
Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +02:00
Johannes Mockenhaupt 62803f2a4d
Use existing string resource. 2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt 70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile. 2017-10-09 21:03:25 +02:00
Milos Kozak 4687b001e0 more cpp functionality to Profile 2017-10-08 14:41:51 +02:00
Milos Kozak 8f259042d6 fix NPE 2017-10-07 22:24:42 +02:00
Milos Kozak 6618d2fef2 fix negative timeshift 2017-10-07 20:42:56 +02:00
Milos Kozak 60086dac8d Merge remote-tracking branch 'origin/dev' into profile 2017-10-07 18:30:55 +02:00
Milos Kozak a54b9e52d8 Merge pull request #446 from AdrianLxM/numberpicker-update
overview checkboxes cutoff fix
2017-10-07 18:29:56 +02:00
Milos Kozak c56ecfced6 Merge pull request #447 from AdrianLxM/treatments-configbuilder2
treatments in config builder
2017-10-07 18:29:44 +02:00
Milos Kozak 9e7c81613c Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-07 18:28:59 +02:00
Milos Kozak ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
Milos Kozak d6fb912ff9 Singleton & Crashlytics logging part 2 2017-10-07 17:48:03 +02:00
Johannes Mockenhaupt da3f02648c
Use SpinnerHelper in TimeListEdit.
Resolves the spinner's onItemSelected handler to back invoked
repeatedly on faster devices.
2017-10-07 16:37:24 +02:00
AdrianLxM 046c28856c treatments in config builder 2017-10-07 01:18:28 +02:00
Milos Kozak 0e763724f6 Singleton & Crashlytics logging part 1 2017-10-06 16:39:59 +02:00
Milos Kozak a1ca4677c0 log exception 2017-10-06 16:07:41 +02:00
AdrianLxM 10d273dac8 checkboxes for NS-Client layouts 2017-10-06 15:48:32 +02:00
AdrianLxM 333b131c1e overview checkboxes cutoff fix 2017-10-06 13:53:55 +02:00
Milos Kozak 4db82fd275 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-06 13:15:57 +02:00
Milos Kozak 32d6e06b07 Merge pull request #444 from AdrianLxM/temptarget-presets
Temptarget presets
2017-10-06 13:15:06 +02:00
Milos Kozak a670a43346 Merge pull request #445 from AdrianLxM/numberpicker-update
update NP value after manual entry
2017-10-06 12:41:34 +02:00
AdrianLxM 1b5ef50eb2 update NP value after manual entry 2017-10-06 03:24:35 +02:00
AdrianLxM 7f403166c7 restore preferences 2017-10-06 03:05:36 +02:00
AdrianLxM bd93fc1adb temp target presets 2017-10-06 02:53:23 +02:00
Milos Kozak e0794a6e7f fix time shifting 2017-10-05 00:54:35 +02:00
Milos Kozak f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
Milos Kozak 3d58fe6bb5 cleanup 2017-10-04 23:24:56 +02:00
Milos Kozak 96edac5ddf LocalProfile fix 2017-10-04 23:17:19 +02:00
AdrianLxM d6089bef73 Rv2 percent fix 2017-10-04 19:39:41 +02:00
AdrianLxM 7ce282dc4e korean percent fix 2017-10-04 19:38:42 +02:00
Milos Kozak 9f6962cee5 serialize reload of treatments 2017-10-04 18:04:34 +02:00
AdrianLxM 3d2647321b getTempBasalFromHistory -> getRealTempBasalFromHistory 2017-10-04 16:51:54 +02:00
AdrianLxM 9e2968f21a Do not misinterpret a fake-extended as 0% temp. 2017-10-04 16:00:48 +02:00
Milos Kozak 8bf5933c88 refactor TimeListEdit 2017-10-04 15:46:23 +02:00
Milos Kozak 6d08a608a2 dana layout 2017-10-03 22:37:53 +02:00
Milos Kozak 58ed0416d1 fix conflict 2017-10-03 22:33:35 +02:00
Milos Kozak 067494fae1 RS hightempbasal 2017-10-03 22:27:06 +02:00
Milos Kozak 2a98a7e9ba RS bolus code 2017-10-03 21:47:36 +02:00
Milos Kozak f5dfff7491 RS APS messages 2017-10-03 20:58:09 +02:00
Milos Kozak 3a014949e9 remove firmware check 2017-10-03 18:45:54 +02:00
Milos Kozak a5730cb982 initialize only with proper protocol 2017-10-02 22:44:10 +02:00
Milos Kozak 97f69c50fd store pairing key per pump 2017-10-02 22:21:11 +02:00
Milos Kozak 8cecac0a7f more LocalProfile work 2017-10-02 19:57:41 +02:00
Milos Kozak 1a5b72f745 Fix time parsing 2017-10-02 17:38:45 +02:00
Roumen Georgiev ef803d6a41 In one line 2017-09-29 15:06:23 +03:00
Roumen Georgiev e004b95a60 Update danar_fragment.xml 2017-09-29 09:50:07 +03:00
Roumen Georgiev 7444bc11fa text identation 2017-09-29 09:47:29 +03:00
Roumen Georgiev 2e61bc136f Add files via upload 2017-09-29 09:44:25 +03:00
Roumen Georgiev 3c0a509541 Add files via upload 2017-09-29 09:43:42 +03:00
Roumen Georgiev a152f94f53 Add files via upload 2017-09-29 09:42:42 +03:00
Roumen Georgiev cb982477cd Add files via upload 2017-09-29 09:41:32 +03:00
Roumen Georgiev 271534a64b Add files via upload 2017-09-29 09:40:58 +03:00
Roumen Georgiev 92e2008692 Adding button Icons 2017-09-29 09:40:11 +03:00
Milos Kozak ba54dacffb 1.54-dev 2017-09-25 19:51:05 +02:00
Milos Kozak 8bbee37b70 fix TB & EB is not set 2017-09-25 19:38:27 +02:00
Milos Kozak 73687442c8 Merge branch 'dev' into rs 2017-09-25 19:36:01 +02:00
Milos Kozak dc6cbadbdf fix TB & EB is not set 2017-09-25 19:34:49 +02:00
Milos Kozak d9f59840b6 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food 2017-09-24 22:47:50 +02:00
Milos Kozak 4fbe7d1000 food database support 2017-09-24 22:47:18 +02:00
Milos Kozak 91b02d4d39 fill dialog refactor & code clean 2017-09-24 14:51:16 +02:00
Milos Kozak 3c7abff88d remove unused imports 2017-09-24 14:28:26 +02:00
Milos Kozak 1823cd3f24 extended bolus dialog refactor 2017-09-24 13:00:59 +02:00
Milos Kozak 547f09ffbd allow to view profile from overview 2017-09-24 11:45:32 +02:00
Milos Kozak c79b750a9c reactor OptionsToShow 2017-09-24 11:08:04 +02:00
Milos Kozak 082414f0d3 CPP support to profile switch 2017-09-24 10:39:54 +02:00
Milos Kozak 349b27e31a NS profile fragment shows all profiles 2017-09-23 23:54:43 +02:00
Milos Kozak 6393ee5e10 CPP functionality to Profile.class 2017-09-23 23:12:08 +02:00
Milos Kozak b3bcb778e0 check for NPE in posted dialogs 2017-09-23 20:12:53 +02:00
Milos Kozak c3a0f5ddad split BLE to separate class 2017-09-23 15:03:07 +02:00
Milos Kozak 144a227d14 more progress logging on R 2017-09-23 12:53:41 +02:00
Milos Kozak 8cd8c6b5d9 more progress logging on RS 2017-09-23 12:28:11 +02:00
Milos Kozak 4ed2896f76 remove duplicated code 2017-09-23 10:56:00 +02:00
Milos Kozak 1eeb1c6f7a RS history OK 2017-09-22 14:57:23 +02:00
SMUSTAF1 81fe9ebdcc Clear the SMS text field if the user removes the old number. 2017-09-20 13:54:05 +02:00
Milos Kozak e1903840dd handle received foods in nsclient 2017-09-20 10:20:50 +02:00
Johannes Mockenhaupt 99c2f797ea
Fix imports. 2017-09-18 22:58:18 +02:00
Johannes Mockenhaupt 1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (53 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/res/values/strings.xml
2017-09-18 22:54:35 +02:00
Milos Kozak fdc3c49a2a fix merge conflits 2017-09-18 22:03:26 +02:00
Milos Kozak cd7c7733ea bump 1.53 2017-09-18 21:59:01 +02:00
Milos Kozak b797530c9d BG & IOB contribution on by default in wizard 2017-09-18 21:57:35 +02:00
Milos Kozak d2815e4045 check for NaN 2017-09-18 21:52:06 +02:00
Milos Kozak d7f8d75d06 Revert "Rounding issues visible in nightscout insulin field" 2017-09-18 21:24:22 +02:00
Milos Kozak a98d2e846f Merge pull request #419 from dylanleonard/feature_time_spinner_fix
Time Spinner Local Profile Fix
2017-09-18 21:06:34 +02:00
Dylan Leonard d8590fe8f1 Clarified boolean logic with parentheses :) 2017-09-18 15:04:46 -04:00
Milos Kozak bf748f3d4b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-18 20:56:42 +02:00
Milos Kozak 8785bc63d5 loadEvents after bolus in separate thread 2017-09-18 20:54:53 +02:00
Milos Kozak c2afa328e3 Merge branch 'dev' into tt-in-wizard 2017-09-18 20:44:54 +02:00
Milos Kozak 42ee7c668e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-18 20:43:24 +02:00
Milos Kozak 8daf9e5c2c use notification for bolus delivery failed message when window has been destroyed 2017-09-18 20:40:03 +02:00
Milos Kozak 17fa2617f7 fix null pointer exception 2017-09-18 20:23:05 +02:00
Dylan Leonard 4f5987b72a Added cases to accept both a.m./p.m. and AM/PM 2017-09-18 14:20:28 -04:00
Milos Kozak 3f7819937b split JSON arrays to 50 elements 2017-09-18 20:10:53 +02:00
Milos Kozak aa89e8f886 Merge pull request #421 from wouterla/dev
Rounding issues visible in nightscout insulin field
2017-09-18 19:46:40 +02:00
Milos Kozak 04994924c5 GUI tweaking, small fixes 2017-09-18 18:41:45 +02:00
Milos Kozak 7f4888978e warn if basal step is not 0.01 2017-09-18 13:28:00 +02:00
Milos Kozak 6cee6c0f51 RS extended disabled warning 2017-09-18 12:59:56 +02:00
Milos Kozak e3ad396f65 more work on service 2017-09-18 12:57:07 +02:00
Milos Kozak ee4d8b7748 some work on history 2017-09-18 09:10:27 +02:00
boysim 81aadcc1be Update strings.xml 2017-09-17 17:02:27 +02:00
Wouter Lagerweij 02c2213545 Changed rounding to use BigDecimals to avoid noisy long doubles in output 2017-09-17 14:27:49 +02:00
Dylan Leonard 91f0c21306 Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called 2017-09-16 19:30:07 -04:00
Wouter Lagerweij aaa3f648d0 Removed unused imports 2017-09-17 00:56:00 +02:00