Commit graph

938 commits

Author SHA1 Message Date
AdrianLxM
acf7e36d61 wear bgGraphbuilder switch to non-deprecated methods 2018-03-04 13:56:17 +01:00
AdrianLxM
5a80215578 wear timeticks 2018-03-04 13:35:17 +01:00
AdrianLxM
a503bfaeef wear endtime in lowres 2018-03-04 12:50:06 +01:00
AdrianLxM
436e03aa03 wear only print valid boluses 2018-02-24 18:10:59 +01:00
swissalpine
60df8da729
Add files via upload 2018-02-21 20:49:32 +01:00
swissalpine
24ccb1bef3
Update round_activity_bigchart_small.xml 2018-02-21 16:59:07 +01:00
swissalpine
0781266dd2
Update rect_activity_bigchart_small.xml 2018-02-21 16:57:42 +01:00
swissalpine
f0886b4476
Add files via upload 2018-02-21 16:56:25 +01:00
swissalpine
20a005c899
Update NOChart.java 2018-02-21 16:55:25 +01:00
swissalpine
90ce3a524f
Update BIGChart.java 2018-02-21 16:53:31 +01:00
AdrianLxM
28c2779408 wear hour tics for predictions 2018-02-21 15:11:38 +01:00
AdrianLxM
8db4a05e1c wear high/low line fit to predictions 2018-02-21 14:32:48 +01:00
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
Johannes Mockenhaupt
f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2
* 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
2018-02-03 16:45:29 +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
Johannes Mockenhaupt
d54b99c559
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* 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
2018-01-13 23:18:44 +01:00
Markus M. May
f5cc2debd7 Cleanup gradle build files 2018-01-13 21:34:38 +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
Johannes Mockenhaupt
3aafcc9854
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* 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
2018-01-06 00:30:04 +01:00
Andrew Warrington
02e7752c3e Cockpit watch face: Double-tap opens MainMenuActivity 2018-01-05 11:58:57 +01:00
Johannes Mockenhaupt
ead299442a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* 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
2018-01-04 21:38:19 +01:00
AdrianLxM
41fb92815b request new data on preference change 2018-01-04 12:22:08 +01:00
Johannes Mockenhaupt
abdad220f6
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* 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)
2018-01-03 20:16:50 +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
Johannes Mockenhaupt
d0f876659e
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Ensure basal rate shown as a percentage if required according to user preferences.
  Show watch basal rates, whether temporary or normal.
2017-12-28 00:15:05 +01:00
AdrianLxM
bd4e51e1f9
Merge pull request #546 from andrew-warrington/dev
Always show basal rates on watch, whether temporary or normal.
2017-12-27 23:17:52 +01:00
Johannes Mockenhaupt
0e61032dec
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  wear update
  RS create bond
  add scrollview
  QuickWizard detailed settings

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-12-27 18:19:51 +01:00
AdrianLxM
9387665df9
wear update 2017-12-27 14:57:54 +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