Milos Kozak
b6809c9d45
fix compiler warning
2018-10-22 21:27:15 +02:00
Milos Kozak
4f107cf3ee
wear flavors
2018-08-29 17:56:34 +02:00
AdrianLxM
8716f57978
timeshift can be negative on watch
2018-08-02 21:40:44 +02:00
Sebastian Lenz
971e258265
cancel TBR request notification on wearable if accepted or no longer valid
2018-07-25 23:48:54 +02:00
Sebastian Lenz
8c49119b15
processing the acceptance of the TBR request from the wearable
2018-07-25 23:47:59 +02:00
Sebastian Lenz
e2ef8f2d74
send notification about TBR request to the wearable
2018-07-25 23:46:06 +02:00
AdrianLxM
6e9e9702e0
icons & wear
2018-07-21 21:21:29 +02:00
Milos Kozak
375025f7f0
remove unused string
2018-07-02 15:55:52 +02:00
AdrianLxM
d8603f07be
remove debug clause and smaller fonts
2018-06-27 20:22:19 +02:00
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
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
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
Johannes Mockenhaupt
bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev: (68 commits)
max connection time to 120 sec
make chart zoomable again
fix NPE
lowest priority for background calculations
wear timestamps long
remove unneeded code
fix landscape overview
synchronized wait
fix build tools for travis
try to fix travis
upgrade build tools
R: resolve thread deadlock during bolus stop
remove unsupported code from korean pump
handle bolus stop prior to delivery correctly
fix translations
better logging
Revert unnecessary change.
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
gradle update
parse more iso formats
...
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/info/nightscout/androidaps/Config.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
# app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
# app/src/main/res/values/strings.xml
# app/src/main/res/xml/pref_others.xml
# app/src/main/res/xml/pref_wear.xml
# gradle/wrapper/gradle-wrapper.properties
# wear/build.gradle
2017-12-05 00:32:47 +01:00
