caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
5278 commits 1 branch 20 tags 140 MiB
Commit graph

226 commits

Author SHA1 Message Date
AdrianLxM 15d373f273 vibrate again 2018-06-27 19:03:29 +02:00
AdrianLxM f160a49ef6 only start one confirm activity 2018-06-27 18:48:09 +02:00
AdrianLxM 815c3c17a9 cleanup. 2018-06-27 18:06:27 +02:00
AdrianLxM a283586a3c autodismissing confirm activity. 2018-06-27 18:06:16 +02:00
AdrianLxM 0fe26fda27 confirm activity working 2018-06-27 18:06:07 +02:00
AdrianLxM aad2b94c8e first confirm activity 2018-06-27 18:05:55 +02:00
AdrianLxM b05b300faf ecarb duration format 2018-05-03 22:08:35 +02:00
AdrianLxM f2168ff36b ecarb hang in activity again 2018-05-03 22:08:19 +02:00
AdrianLxM 76277d11ad ecarb hang in activity 2018-05-03 22:08:11 +02:00
AdrianLxM 71db7b60c9 ecarb first activity 2018-05-03 22:08:02 +02:00
AdrianLxM 917fcb5953 wearwizard reorder menu 2018-05-03 17:49:27 +02:00
AdrianLxM c394c045c9 wearwizard reduced watch settings 2018-05-03 17:49:09 +02:00
AdrianLxM bdfce784c0 wearwizard ensure watch apk is up to date 2018-05-03 17:49:05 +02:00
Johannes Mockenhaupt c51635dba4
Watch: colored preds. 2018-05-02 16:01:40 +02:00
AdrianLxM 9839ad0497
revert wear targetSdkVersion 
... as we use old communication protocol.
 2018-04-18 20:59:40 +02:00
AdrianLxM 2414be85f2
dummy-edit to re-trigger travis 2018-04-10 22:53:27 +02:00
swissalpine 2972138d2a Fix for black number and labels on black background (aaps wear) 2018-04-10 22:14:52 +02:00
Milos Kozak 132400bb9e
Merge pull request #859 from MilosKozak/watchsmb 
Watchsmb
 2018-04-09 15:19:24 +02:00
Markus M. May 79094a92f9 Provide newer support libraries, compile with 27 and target 25 2018-04-04 22:46:44 +02:00
Markus M. May c3bec7e7a6 Revert targetSdkVersion 2018-04-04 21:38:47 +02:00
Markus M. May 9006721873 Version bump butterknife plugin 2018-04-02 22:43:20 +02:00
Markus M. May 6024f0f5ee Remove unnecessary gitignores 2018-04-01 20:49:02 +02:00
Markus M. May 5ef062c22f inital gradle update 2018-04-01 20:49:02 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Johannes Mockenhaupt 612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  Don't overlap time ticks with current time
  history browser chart selection
  Insulin button: allow negative presets, fix adding TT insulin.
  Overview: symetric spacing.
  Carbs button: send carbs to pump if pump supports carbs.
  Carbs button: fix visibility pref, input type, allow negative increments.
  Smallscreen fix
  chart menu 4
  chart menu 3
  chart menu 2
  chart menu 1

# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-03-17 16:45:08 +01:00
AdrianLxM 1738aea4de
Don't overlap time ticks with current time 2018-03-16 23:57:58 +01:00
Johannes Mockenhaupt db00404e43
Merge commit 'origin/dev^' into combo-dev-merge 
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
 2018-03-16 15:44:54 +01:00
Andrew Warrington d8d87e1ffd BaseWatchFace.java: Update chart with bolus and prediction data. (Affects AAPSv2 and Steampunk watch faces.) 2018-03-11 21:18:03 +01:00
Johannes Mockenhaupt 7bd85c5972 Use meal color parameter. 2018-03-08 14:26:50 +01:00
AdrianLxM 0818f3b419 Merge remote-tracking branch 'swissalpineremote/patch-4' into watchsmb2 2018-03-04 20:18:43 +01:00
AdrianLxM d7deaa15eb wear COB string better default 2018-03-04 20:14:58 +01:00
AdrianLxM 62295d001f wear COB in status 2018-03-04 20:13:16 +01:00
AdrianLxM 2f40feef65 wear empty label needed 2018-03-04 15:41:32 +01:00
AdrianLxM d500b15947 wear carbs always colour 2018-03-04 15:40:36 +01:00
AdrianLxM e2b829a60a wear first carbs 2018-03-04 15:37:55 +01:00
AdrianLxM ef75e2759c wear carbonly is valid 2018-03-04 15:09:59 +01:00
AdrianLxM b98dc5c72f wear timeframe bolus 2018-03-04 14:47:30 +01:00
AdrianLxM a4eb82c524 wear bgGraphbuilder isValid bolus 2018-03-04 14:06:19 +01:00
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