Milos Kozak
5a12d15c8c
upgrade build tools
2017-12-03 21:15:12 +01:00
Andrew Warrington
9dca53f968
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
2017-12-03 18:53:52 +01:00
Andrew Warrington
ff0607d010
Update following testing! Bug fixes:
...
- 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
2017-11-28 21:33:43 +01:00
Andrew Warrington
dcf79c710c
Update following testing! Bug fixes:
...
- 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
2017-11-28 09:24:52 +01:00
Andrew Warrington
d1fbaa29c9
Ready for review. Summary of all changes to date: New watch faces AAPSv2 and AAPS(Cockpit) work on both round and rectangular screens. Tested on Asus Zenwatch 3, Moto 360 42mm, and Sony Smart Watch 3. New watch settings included, to add/remove individual data items from the display. WatchUpdaterService and BaseWatchFace both updated to enable switching on and off of individual data items.
2017-11-22 22:46:43 +01:00
Johannes Mockenhaupt
cc6c34e46c
Revert inadvertent changes to wear activities.
2017-11-22 11:29:12 +01:00
Andrew Warrington
78dd6d165b
Addition of the "airplane cockpit" watch face -- unfinished. This commit is not yet ready to be merged into dev as more work is required for compatibility with multiple watches.
2017-11-19 22:14:28 +01:00
Johannes Mockenhaupt
46fdd47ac0
Fixes and cleanups.
2017-11-18 21:32:01 +01:00
Andrew Warrington
bc485a4783
Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces.
...
Inclusion of Home2 ("AAPSv2") watch face for round.
2017-11-15 23:07:44 +01:00
Andrew Warrington
45a26da8b3
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
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.
2017-11-12 21:46:32 +01:00
Andrew Warrington
d70860bd97
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
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.
2017-11-05 21:41:50 +01:00
Johannes Mockenhaupt
03443f3358
Dead code be gone.
2017-10-29 21:39:25 +01:00
Johannes Mockenhaupt
394a42837a
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
...
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
2017-10-28 13:43:25 +02:00
Johannes Mockenhaupt
7b3f474b58
Upgrade to Android Studio 3.0.
2017-10-25 22:49:50 +02:00
Johannes Mockenhaupt
41ebabe5e7
Merge remote-tracking branch 'origin/dev' into combo-v2
...
* 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
...
2017-10-17 12:16:43 +02:00
AdrianLxM
f751638a7f
enabling wearcontrols from preferences
2017-10-12 18:01:10 +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
Johannes Mockenhaupt
5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep.
...
Gets rid of all those pointless InterruptedException catching.
(cherry picked from commit 6acaa2b)
2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt
c50fad81bb
Log exceptions in catch blocks rather than printing to console.
...
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)
2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt
e399fac8dc
Try to be clever about slow screen updates when scrolling.
2017-08-27 18:45:25 +02:00
AdrianLxM
7bc0a18f6e
Version-Number in settings
2017-08-08 02:06:46 +02:00
AdrianLxM
5569b42ac3
wear wizard percentage
2017-07-26 09:58:51 +02:00
AdrianLxM
50c26f28fd
wear TDD status
2017-07-17 22:39:48 +02:00
AdrianLxM
387cfcccaf
wear menu simplification
2017-07-17 22:39:00 +02:00
AdrianLxM
7fa8ea7224
cpp-watch working2
2017-07-10 04:46:29 +02:00
AdrianLxM
85d028abff
cpp watch openactivity
2017-07-10 04:45:08 +02:00
AdrianLxM
e81b217c94
wear show oaps result/reason
2017-07-03 01:47:58 +02:00
AdrianLxM
f0521c0197
nighttime watchface
2017-06-30 01:49:32 +02:00
Milos Kozak
43231cc362
use System.currentTimeMillis()
2017-06-15 23:12:12 +02:00
AdrianLxM
37e00d33aa
wear setting for single temp target instead of range
2017-04-30 20:20:04 +02:00
Milos Kozak
c18fcfda62
revert sdk to 23
2017-04-22 10:18:31 +02:00
Milos Kozak
0a2105ac50
wear target 25
2017-04-21 12:27:16 +02:00
AdrianLxM
1c522d4a4d
wear 5 minute steps for duration of temp targets
2017-02-19 22:42:31 +01:00
AdrianLxM
74562ae548
wear settings same background as menu
2017-02-15 16:27:46 +01:00
AdrianLxM
f0fc3f6688
wear added viktoria's design
2017-02-13 17:48:11 +01:00
AdrianLxM
56e5fae27d
wear allow multiple input layouts
2017-02-13 16:54:06 +01:00
AdrianLxM
e85e651c56
wear full status support and product flavour with/without controls on wear
2017-02-13 01:55:35 +01:00
AdrianLxM
65d1624a5f
wear carb restriction
2017-02-12 19:50:25 +01:00
AdrianLxM
d9103b6823
wear wizard confirm reformat, connection stability, prime not in menu per default
2017-02-11 19:51:33 +01:00
AdrianLxM
6cb192b876
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5
2017-02-11 18:09:22 +01:00
AdrianLxM
b57253af5e
wear add carbs to bolus-wizard confirmation
2017-02-11 17:54:47 +01:00
AdrianLxM
16c7731206
update wear.iml
2017-02-11 02:54:54 +01:00
AdrianLxM
c8dc7bf9c8
wear menu list layout
2017-02-11 02:50:18 +01:00
viktoria
5915503ac5
delete wear.iml
2017-02-11 01:50:51 +01:00
viktoria
3176f33a9e
fix gitignore
2017-02-11 01:50:25 +01:00
AdrianLxM
9dae8b4e56
wear don't enact 0carbs/0bolus on wizard result
2017-02-11 00:32:45 +01:00
AdrianLxM
705f563f2f
wear TTarget -> TempT
2017-02-10 21:27:50 +01:00
Milos Kozak
2e40c7b605
sms calibrations
2017-02-10 21:20:55 +01:00
AdrianLxM
108095ad77
wear confirmation timeout and larger text for editplusminus
2017-02-10 21:20:47 +01:00
Milos Kozak
83667be8cc
extract sending intent to a function
2017-02-10 17:25:32 +01:00
Milos Kozak
8db3f258cd
xdrip calibration
2017-02-10 16:53:39 +01:00
AdrianLxM
bdcff12b01
wear keep data when looking/swiping back
2017-02-10 12:00:38 +01:00
AdrianLxM
4220d7712a
wear wizard working
2017-02-10 06:07:31 +01:00
AdrianLxM
9785d507a8
wear temp targets working
2017-02-10 02:36:38 +01:00
AdrianLxM
93de296113
update wear.iml
2017-02-09 23:46:41 +01:00
AdrianLxM
aff82642af
wear multiple watch situation and disable fillbolus for wider testing
2017-02-09 23:39:23 +01:00
Milos Kozak
715d15b51f
CS translations
2017-02-09 22:44:42 +01:00
AdrianLxM
eb96cf6713
wear temp target activity
2017-02-09 21:40:00 +01:00
AdrianLxM
3ff41af939
wear bolus activity and refactoring
2017-02-09 20:54:41 +01:00
Milos Kozak
ed7dd48612
remove TODOs
2017-02-09 20:18:22 +01:00
AdrianLxM
dc476a6600
wear menu restructuring and status
2017-02-09 17:40:26 +01:00
AdrianLxM
4dcbbd3df2
wear cleanup
2017-02-09 16:29:46 +01:00
AdrianLxM
b8c3fe2933
wear wizard including bg and iob toggles
2017-02-09 16:16:31 +01:00
AdrianLxM
a2723f60e0
wear wizard on watch part first working
2017-02-09 14:25:25 +01:00
AdrianLxM
6737cdf365
wear close activity when paused
2017-02-09 07:04:52 +01:00
AdrianLxM
ef2654d3eb
wear better bolus layout
2017-02-09 06:32:29 +01:00
AdrianLxM
cb2319d1f2
wear first gui draft bolus
2017-02-09 04:50:36 +01:00
AdrianLxM
8d6760081e
wear circle watchface fix
2017-02-09 00:15:14 +01:00
AdrianLxM
b8588b2c3c
wear action menu refactored and opens on double tap
2017-02-09 00:00:54 +01:00
Milos Kozak
a43677e4b0
fix pumpcontrol build crash
2017-02-08 20:36:30 +01:00
AdrianLxM
6556ddda37
wear menu mockup
2017-02-08 17:06:07 +01:00
AdrianLxM
d2d0d4b51a
wear confirm roundtrip working
2017-02-08 15:15:22 +01:00
AdrianLxM
8e9d73e3a3
wear sending confirmation requests
2017-02-08 11:53:26 +01:00
AdrianLxM
d1a3645be7
wear dismiss progressnotification on cancel + stub for treatment confirmation
2017-02-08 10:22:35 +01:00
AdrianLxM
20d32d042f
wear bolusprogress cleanup
2017-02-07 12:08:13 +01:00
AdrianLxM
5cff42cd92
wear toggle setting to enable watch vibration on bolus
2017-02-07 09:29:59 +01:00
AdrianLxM
f4b553fe52
Wear added bolusprogress and dismiss when finished
2017-02-07 09:17:19 +01:00
AdrianLxM
10d71325dd
Wear separate cancel action extra with bolus progress card
2017-02-06 21:10:55 +01:00
AdrianLxM
8c37809751
Wear cancel bolus via content intent to progress card
2017-02-06 19:35:27 +01:00
AdrianLxM
7ec3ff2a17
Wear bolus progress as card
2017-02-06 16:52:39 +01:00
Milos Kozak
90924e607f
1.1d
2017-01-30 14:36:04 +01:00
Milos Kozak
607ac8b897
AMA execution time
2017-01-30 14:30:46 +01:00
Milos Kozak
3f90ad6a5c
sync profile to pump
2017-01-28 23:45:14 +01:00
AdrianLxM
0b31062480
Remove diff meta info from unresolved merge conflict
...
Should remove the "unsupported module" error in Android Studio
2017-01-24 01:24:05 +01:00
Milos Kozak
b2be49e631
simple profile layout
2016-12-29 22:40:30 +01:00
Milos Kozak
0059266791
loop status font size
2016-12-29 14:23:05 +01:00
Milos Kozak
9a47e521d2
show result in loop plugin when correct basal settoo
2016-12-28 22:30:38 +01:00
Milos Kozak
d6f4135d6e
travis
2016-12-28 15:58:44 +01:00
Milos Kozak
13f2fce31e
product flavors dimensions update
2016-12-27 18:47:48 +01:00
Milos Kozak
2ca698dba3
git ignore wear/wear.iml
2016-12-27 16:28:10 +01:00
Milos Kozak
34fce81563
fix build warning
2016-12-27 16:21:04 +01:00
Milos Kozak
cd41bff2bb
SMS command BG
2016-12-27 12:17:26 +01:00
Milos Kozak
79aee157e3
redundant code cleanup
2016-12-24 14:13:35 +01:00
Milos Kozak
37d539ce3e
remove duplicated function
2016-12-15 19:10:07 +01:00
Milos Kozak
407ea423cb
detect if extended bolus is enabled, detect easy ui mode
2016-12-13 21:35:49 +01:00
Milos Kozak
4a2a15d394
smarter plugin selection and handling
2016-12-11 22:55:45 +01:00
Milos Kozak
064de0f64e
synchronize pump time
2016-12-09 09:31:51 +01:00
Milos Kozak
8f98ad1b15
do not process remote profile if not selected
2016-12-07 22:12:48 +01:00
Milos Kozak
2dea4615c0
basal rates set
2016-12-06 23:46:36 +01:00
Milos Kozak
4b389c2cad
dana drivers switching working
2016-12-03 17:42:08 +01:00
Milos Kozak
db2fd55f7c
copy files for Korean DanaR
2016-11-29 20:52:40 +01:00
Milos Kozak
36d5f1dc29
proper danar errors detection
2016-11-29 18:28:36 +01:00
AdrianLxM
896503918c
wear extract strings
2016-11-29 15:01:00 +01:00
AdrianLxM
70338ac158
wear PoweRGbg fixes
2016-11-28 18:42:19 +01:00
AdrianLxM
96e6303a42
wear no single value line for better distinction to basal lines
2016-11-27 17:26:39 +01:00
AdrianLxM
b02fba11e8
wear cleanup unused resources
2016-11-27 14:51:08 +01:00
AdrianLxM
736c87a9cc
wear low bit mode
2016-11-27 06:25:04 +01:00
AdrianLxM
299e235f4b
wear adopt basal to light theme
2016-11-27 06:24:44 +01:00
AdrianLxM
d53217dfe0
wear active-inactive mode
2016-11-27 06:24:22 +01:00
viktoria
39c5278b37
wear axis in bright mode fix
2016-11-27 06:15:37 +01:00
AdrianLxM
a32c3ef15e
wear add clockwise lib
2016-11-26 14:21:01 +01:00
AdrianLxM
389344cfb9
wear integrate colors
2016-11-26 07:11:12 +01:00
AdrianLxM
3adb6b2c15
Merge branch 'watchface-colors' of https://github.com/LadyViktoria/AndroidAPS into wear-working1
2016-11-26 07:10:48 +01:00
AdrianLxM
87d49c03c8
wear product flavors
2016-11-26 07:10:22 +01:00
AdrianLxM
ee80a220f1
wear double tap will change timeframe
2016-11-26 07:10:11 +01:00
AdrianLxM
a69c1150ea
tap tests
2016-11-26 07:09:57 +01:00
AdrianLxM
a261a1b687
wear add iml
2016-11-25 16:45:05 +01:00
AdrianLxM
12e78656b7
wear settings
2016-11-24 16:23:31 +01:00
AdrianLxM
b306de49dc
wear Emma
2016-11-24 16:23:31 +01:00
AdrianLxM
8a466506fb
wear avgDelta on all watchfaces
2016-11-24 16:23:31 +01:00
AdrianLxM
ef0e30b2b3
wear big chart avgDelta working
2016-11-24 16:23:31 +01:00
AdrianLxM
58d2c87870
wear all watchfaces active
2016-11-24 16:23:31 +01:00
AdrianLxM
d8f4de8b22
wear highlight basals
2016-11-24 16:23:31 +01:00
AdrianLxM
8af4ac0daf
wear bigchart fully functional
2016-11-24 16:23:31 +01:00
AdrianLxM
afa5faf834
wear basal live
2016-11-24 16:23:31 +01:00
AdrianLxM
552fdaa9de
wear watch painting basals
2016-11-24 16:23:31 +01:00
AdrianLxM
2b17fc5155
wear painting temps
2016-11-24 16:23:31 +01:00
AdrianLxM
70c3969f85
wear something is painting
2016-11-24 16:23:31 +01:00
AdrianLxM
b93273d706
wear status working
2016-11-24 16:23:31 +01:00
AdrianLxM
e2c3069374
resend(), bigchart watchface layout overhaul, fix nullpointer exception, only send when enabled
2016-11-24 16:23:31 +01:00
AdrianLxM
2e0ac569eb
wear first bg and delta on watch
2016-11-24 16:23:31 +01:00
AdrianLxM
2fd93a8e31
wear installing on watch
2016-11-24 16:23:31 +01:00
