* 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
* origin/dev:
Cleanup gradle build files
Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
Avoid race condition checking for an active TBR.
Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).
# Conflicts:
# app/build.gradle
* origin/dev:
Cockpit watch face: Double-tap opens MainMenuActivity
prevent processing incomplete profiles
set defaults for display range
actual bg in objective 1
warn if wrong profile is detected
* origin/dev:
allow old data on the wf
request new data on preference change
accept local NS data broadcast even when ns_upload_only is selected
remove logging
* origin/dev:
improve GUI response
narrower temp basal line for steampunk watchface
darker and gracile steampunk-chart
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files.
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen.
move steampunk md to main dir
Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit.
Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).
Steampunk watch face - unit testing complete.
Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low").
Steampunk watchface (moto360 support - ignores the chin)
Steampunk watchface (mmol support) Includes delta granularity in the watch preferences.
Steampunk watchface (interim commit)
Steampunk watch face addition of mmol/L drawable
Steampunk watch face layout changes
Steampunk watch face (for testing)
Steampunk watch face (not yet functional)
Steampunk watch face (not yet functional)
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)
Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely
New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)
Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely
New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
* origin/dev: (126 commits)
ConfigBuilder: hide disabled plugins by default.
sum on name for LP
log to debug not error
logger reformat
logging
rhinoAMA first full run
rhinoAMA first crashfree call
rhino some more cleanups
rhino logging and cleanups
rhino MA looping
rhino first real detemine-basal call
rhino small refactor
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
NewTreatmentDialog: sanitize inputs, fixes#417.
rhino complex parameter passing
rhino first parameter passing
rhino function passing
first rhino
location permission for BLE scanning
use customized name only for LocalProfile
...
* 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
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
Editor->File and Code Templates->Catch Statement body
to
log.error("Unhandled exception", e);
to also do this for newly generated code.
(cherry picked from commit c2ae29f)
(cherry picked from commit 6031a25)
