Commit graph

1766 commits

Author SHA1 Message Date
AdrianLxM
dc476a6600 wear menu restructuring and status 2017-02-09 17:40:26 +01:00
Milos Kozak
9d7ac0ce81 1.1e 2017-02-09 17:17:40 +01:00
Milos Kozak
a6871f6b4a Merge pull request #145 from LadyViktoria/dev
Add prefernces.json to advanced settings
2017-02-09 17:13:28 +01:00
Milos Kozak
8a2846c516 Merge branch 'dev' into dev 2017-02-09 17:01:05 +01:00
Milos Kozak
9e9637d70b accept temp button visible only if loop selected 2017-02-09 16:51:14 +01:00
Milos Kozak
3aff89acdc fix not attached to activity in bolus progress dialog 2017-02-09 16:45:54 +01:00
Milos Kozak
806cc4a3a7 fix nullpointerexception in reading temp basal status 2017-02-09 16:43:27 +01:00
Milos Kozak
a39416d876 fix nullpointerexception in reading temp basal status 2017-02-09 16:39:07 +01:00
Milos Kozak
caa109dbfd use SafeParse in DanaRStartsActivity 2017-02-09 16:32:44 +01:00
AdrianLxM
4dcbbd3df2 wear cleanup 2017-02-09 16:29:46 +01:00
Milos Kozak
b9b08c1528 fix crash when pump status not loaded yet 2017-02-09 16:29:02 +01:00
Milos Kozak
3d3e849d8a fix null pointer exception in persistentnotification 2017-02-09 16:23:28 +01:00
AdrianLxM
b8c3fe2933 wear wizard including bg and iob toggles 2017-02-09 16:16:31 +01:00
Milos Kozak
7f123e4208 warn on wrong entered sms phone number 2017-02-09 16:14:09 +01:00
Milos Kozak
c015862239 fix crash: not attached to Activity 2017-02-09 16:04:57 +01:00
AdrianLxM
a2723f60e0 wear wizard on watch part first working 2017-02-09 14:25:25 +01:00
LadyViktoria
7fc6de17c1 Add prefernces.json changes 2 2017-02-09 10:41:02 +01:00
LadyViktoria
886c1ea359 Add prefernces.json changes 2017-02-09 09:36:51 +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
bf7a96b3e7 bolus progress dialog without activity context 2017-02-09 03:15:13 +01:00
AdrianLxM
74107f58fe wear first fill bolus working 2017-02-09 01:53:28 +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
viktoria
0bf51710d1 Merged branch dev into dev 2017-02-08 21:23:47 +01:00
Milos Kozak
698ab31d71 show temp targets only if APS enabled in config 2017-02-08 21:04:26 +01:00
Milos Kozak
a43677e4b0 fix pumpcontrol build crash 2017-02-08 20:36:30 +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
e261fa3ec8 wear re-disable fill bolus for virtual pump 2017-02-07 12:02:02 +01:00
AdrianLxM
650111d1b7 wear event for bolus requests to show card early on 2017-02-07 11:09:16 +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
Milos Kozak
adaa20e5e4 Merge pull request #151 from AdrianLxM/patch-15
rounding minutesago instead of truncating it
2017-02-06 12:03:14 +01:00
AdrianLxM
379e3f8ab1 rounding minutesago instead of truncating it 2017-02-05 02:18:13 +01:00
viktoria
b0a9d74b49 Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
	app/src/main/res/values/strings.xml
2017-02-02 19:00:17 +01:00
Milos Kozak
29dff77325 Merge pull request #150 from AdrianLxM/tempbasal-errorstring
Correct error for tempbasals
2017-02-02 17:20:41 +01:00
AdrianLxM
bd75015a58 Correct error for tempbasals 2017-02-01 14:38:55 +01:00
LadyViktoria
1f3b425c44 Remove careportal_temptarget string 2017-01-31 20:28:32 +01:00
Milos Kozak
78fb6f934e measure execution time of every part 2017-01-31 09:52:33 +01:00
Milos Kozak
1b2500dc6c calculate only needed data in AMA 2017-01-31 09:40:05 +01:00
Milos Kozak
9722130299 move all treatments db actions to DatabaseHelper 2017-01-30 20:00:46 +01:00
Milos Kozak
8d0c1dcacf do not calculate autosens for MA 2017-01-30 15:19:50 +01:00