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

450 commits

Author SHA1 Message Date
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
Milos Kozak 6e5d5c4a26
Merge pull request #769 from jotomo/button-refinement 
Button refinement
 2018-03-17 15:28:41 +01:00
Johannes Mockenhaupt 8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  check for null profile
  remove profile dependency from pump drivers, TRB optimalization
  split enacting TRB and SMB
 2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt de72fba92e
Combo: update button spacing to match overview. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt 6a6359f1ee
Combo: Show count of boluses delivered and TBRs set on pump. 2018-03-17 13:51:13 +01:00
AdrianLxM a2ecfa89a0 history browser chart selection 2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt 194c7a2dbc
Overview: symetric spacing. 2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt 32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments. 2018-03-16 22:11:15 +01:00
AdrianLxM 90f9bf373c
Smallscreen fix 2018-03-16 21:52:02 +01:00
AdrianLxM 067b264ae8 chart menu 3 2018-03-16 19:16:47 +01:00
AdrianLxM 32894a092e chart menu 1 2018-03-16 17:23:02 +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
Milos Kozak db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
AdrianLxM 212a9dcc94 draw basal in profile viewer 2018-03-15 14:08:00 +01:00
Milos Kozak eb2b6f9bd8 Allow bolus record only in new treatment dialog 2018-03-12 17:52:52 +01:00
Milos Kozak a5830cc452 Merge branch 'foodrefactor' into dev 2018-03-12 10:56:14 +01:00
Milos Kozak 38999d6598 food code cleanup 2018-03-12 10:53:23 +01:00
Milos Kozak 39c2d690e4 CS translations 2018-03-10 20:47:17 +01:00
Milos Kozak 8a197f41dc Merge branch 'dialogmmol' into dev 2018-03-10 19:25:41 +01:00
Milos Kozak ec1c43b905 carbs dialog: defaults for mmol, i18n 2018-03-10 19:22:31 +01:00
AdrianLxM 118cdb3dce
buttons gone by default in smallheight 
... same as on default layout
 2018-03-04 20:12:33 +01:00
AdrianLxM cdb58ed143
newinsulin dialog wrap content 2018-03-04 19:57:21 +01:00
AdrianLxM 5a4967e544
newcarb dialog wrap content 2018-03-04 19:56:34 +01:00
Roumen Georgiev 9456a24655
Adding Eating soon mode to options 2018-03-01 16:22:05 +02:00
Milos Kozak e544d44799 overview layout cleanup 2018-02-25 16:20:20 +01:00
Milos Kozak 6eed00fae7 add xdrip icon to cgm button 2018-02-25 15:45:43 +01:00
Johannes Mockenhaupt bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
Milos Kozak da777d9660 HistoryBrowser fill space by bggraph 2018-02-12 19:39:45 +01:00
Milos Kozak d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +01:00
Milos Kozak fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Johannes Mockenhaupt 1985ed379d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.

(cherry picked from commit 43755f0)
 2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt 43755f071d
Add mute button to error dialog. 
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
 2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt 6b4b044cd6
Remove nested layout for better performance. 2018-02-04 00:36:08 +01:00
Milos Kozak 411add616b
Merge pull request #632 from jamorham/dev 
Add Insight Pump Plugin
 2018-02-02 09:21:57 +01:00
Johannes Mockenhaupt 6981c0fec6
Pump needs rest. 
(cherry picked from commit 2e88fb9)
 2018-01-31 00:59:23 +01:00
Milos Kozak af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Johannes Mockenhaupt e3abe04545
Bring back last bolus to combo fragment. 
(cherry picked from commit 108349e)
 2018-01-28 15:30:36 +01:00
Jamorham 3150e7d00f
Add double rounding helper 2018-01-26 22:26:29 +00:00
Jamorham 2f7dc11b9f
Update Insight fragment layouts 2018-01-26 16:46:09 +00:00
Johannes Mockenhaupt 947203b107
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix not attached to the activity
  check for no profile
  check for no profile
  Fix namespace errors.
  Add missing ids to other overview layouts.
  Overview: make checkbox labels toggle state as well.
  minimum of 30 min for unreachable alert
 2018-01-25 16:06:22 +01:00
Johannes Mockenhaupt 0f98c49876
Fix namespace errors. 2018-01-24 16:54:29 +01:00
Johannes Mockenhaupt 2a4f1950b3
Add missing ids to other overview layouts. 2018-01-24 16:53:40 +01:00
Jamorham 7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt 3a02f01374
Overview: make checkbox labels toggle state as well. 2018-01-24 14:10:17 +01:00
Johannes Mockenhaupt 0eba153d8a
Combo: add 'base basal rate' to fragment. 
(cherry picked from commit 2873da5)
 2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt b7f8913cae
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Careportal DB browser
  fix rendering treatments with duration
  more autosens logging
  cancel extending bolus on pump disconnection
  set maxiob=0 only for objective 4
  fix stopping bolus connection error
 2018-01-23 02:04:02 +01:00
Milos Kozak 52e4496add Careportal DB browser 2018-01-22 21:49:01 +01:00
Johannes Mockenhaupt 8fda1a678f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  better handling of wrong profiles
 2018-01-21 14:13:46 +01:00
Milos Kozak 060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +01:00
Johannes Mockenhaupt 20c218ae9a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Overview: move checkboxes before label.
  fix pump unreachable for virtual pump
  getLastAutosensData improvement and logging
  remove readstatus prior every command
  bump 1.57-dev
  better log build verison to Fabric

# Conflicts:
#	app/build.gradle
 2018-01-19 21:05:37 +01:00