Commit graph

164 commits

Author SHA1 Message Date
AdrianLxM
c6a3efb60e wear adaptive prediction timeframe 2018-02-21 14:23:52 +01:00
AdrianLxM
8ee7309d86 smb and bolus on wear 2018-02-21 01:56:06 +01:00
AdrianLxM
f6253284de show boluses on bigchart 2018-02-20 15:39:02 +01:00
AdrianLxM
126322053e pass bolus data to wear graph builder 2018-02-20 14:14:27 +01:00
AdrianLxM
c10468e90f small cleanup 2018-02-20 13:58:25 +01:00
AdrianLxM
6a1b777bc3 include bigchart watchface for very small watches 2018-02-20 13:51:00 +01:00
Andrew Warrington
0f9273093a BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:34:03 +01:00
Andrew Warrington
44e6c874c0 BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:31:54 +01:00
Andrew Warrington
13ad74f77b Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). 2018-01-06 14:21:31 +01:00
Andrew Warrington
02e7752c3e Cockpit watch face: Double-tap opens MainMenuActivity 2018-01-05 11:58:57 +01:00
AdrianLxM
41fb92815b request new data on preference change 2018-01-04 12:22:08 +01:00
AdrianLxM
5270f2cc69 narrower temp basal line for steampunk watchface 2018-01-03 18:58:02 +01:00
AdrianLxM
a75ff0d1f6 darker and gracile steampunk-chart 2018-01-03 18:13:38 +01:00
Andrew Warrington
267bdd6a43 Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files. 2018-01-03 16:33:39 +01:00
Andrew Warrington
512341e603 Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen. 2018-01-03 15:24:06 +01:00
AdrianLxM
99f0bbb478 move steampunk md to main dir 2018-01-03 14:00:57 +01:00
Andrew Warrington
7ac413553b 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. 2018-01-03 10:58:10 +01:00
Andrew Warrington
8b37826335 Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). 2018-01-03 10:41:18 +01:00
Andrew Warrington
37f262efdc Steampunk watch face - unit testing complete. 2018-01-03 01:18:13 +01:00
Andrew Warrington
7b0cc80369 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"). 2018-01-02 15:11:59 +01:00
Andrew Warrington
5609fbf738 Steampunk watchface (moto360 support - ignores the chin) 2018-01-02 00:30:20 +01:00
Andrew Warrington
c43afd9d28 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-28 01:03:02 +01:00
Andrew Warrington
b180569695 Show watch basal rates, whether temporary or normal. 2017-12-18 21:58:02 +01:00
Andrew Warrington
bc8b93045b Steampunk watchface (mmol support)
Includes delta granularity in the watch preferences.
2017-12-17 23:07:44 +01:00
Andrew Warrington
9e6f124097 Steampunk watchface (interim commit) 2017-12-12 23:17:25 +01:00
Andrew Warrington
ac37d691ee Steampunk watch face addition of mmol/L drawable 2017-12-12 06:15:47 +01:00
Andrew Warrington
c453eababb Steampunk watch face layout changes 2017-12-11 07:15:57 +01:00
Andrew Warrington
74e833c873 Steampunk watch face (for testing) 2017-12-10 21:39:21 +01:00
Andrew Warrington
c3aef7b6f2 Steampunk watch face (not yet functional) 2017-12-10 03:29:14 +01:00
Andrew Warrington
2d3333deda Steampunk watch face (not yet functional) 2017-12-09 14:23:43 +01:00
AdrianLxM
0701dc4a52 make chart zoomable again 2017-12-04 20:08:57 +01:00
AdrianLxM
c83f966d92 wear timestamps long 2017-12-04 18:40:13 +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
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
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
AdrianLxM
f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +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
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
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
c8dc7bf9c8 wear menu list layout 2017-02-11 02:50:18 +01:00
AdrianLxM
705f563f2f wear TTarget -> TempT 2017-02-10 21:27:50 +01:00
AdrianLxM
108095ad77 wear confirmation timeout and larger text for editplusminus 2017-02-10 21:20:47 +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
aff82642af wear multiple watch situation and disable fillbolus for wider testing 2017-02-09 23:39:23 +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
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
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
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
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
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
12e78656b7 wear settings 2016-11-24 16:23:31 +01:00