Commit graph

2841 commits

Author SHA1 Message Date
AdrianLxM
549b72b032 fix percentage/shift from watch 2017-10-10 21:51:58 +02:00
AdrianLxM
b60ff8ceef max timeshift to 23 2017-10-10 20:47:38 +02:00
AdrianLxM
36784b983e remove cpp import 2017-10-10 20:42:29 +02:00
AdrianLxM
1410b2e706 wear cpp -> general profile 2017-10-10 20:32:43 +02:00
Milos Kozak
982e46d958 prepare profileswitch function for watch 2017-10-10 19:25:21 +02:00
Milos Kozak
77ec52ff23 fix sending profile switch to pump 2017-10-10 19:19:39 +02:00
Milos Kozak
da71cdfca0 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 19:15:07 +02:00
Milos Kozak
24099222f3 Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
Milos Kozak
50de4a5979 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 18:03:50 +02:00
Milos Kozak
d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +02:00
Milos Kozak
c6392ec625 Merge remote-tracking branch 'origin/dev' into profile 2017-10-09 23:15:02 +02:00
Milos Kozak
9ec3efbaab fix conflict 2017-10-09 23:14:46 +02:00
Milos Kozak
230dd5f0a8 Merge pull request #451 from jotomo/checkboxes-and-labels-aligned
Overview: align checkboxes and labels vertically.
2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt
e586e1389e
Overview: align checkboxes and labels vertically. 2017-10-09 22:37:50 +02:00
Milos Kozak
34b3252692 Merge pull request #450 from jotomo/tt-popup
NSTreatmentDialog: use same format for ES reason field as for profile.
2017-10-09 21:51:19 +02:00
Johannes Mockenhaupt
62803f2a4d
Use existing string resource. 2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt
70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile. 2017-10-09 21:03:25 +02:00
Milos Kozak
4687b001e0 more cpp functionality to Profile 2017-10-08 14:41:51 +02:00
Milos Kozak
a617d591b0 fix NPE 2017-10-07 22:29:55 +02:00
Milos Kozak
8f259042d6 fix NPE 2017-10-07 22:24:42 +02:00
Milos Kozak
6618d2fef2 fix negative timeshift 2017-10-07 20:42:56 +02:00
Milos Kozak
60086dac8d Merge remote-tracking branch 'origin/dev' into profile 2017-10-07 18:30:55 +02:00
Milos Kozak
a54b9e52d8 Merge pull request #446 from AdrianLxM/numberpicker-update
overview checkboxes cutoff fix
2017-10-07 18:29:56 +02:00
Milos Kozak
c56ecfced6 Merge pull request #447 from AdrianLxM/treatments-configbuilder2
treatments in config builder
2017-10-07 18:29:44 +02:00
Milos Kozak
9e7c81613c Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-07 18:28:59 +02:00
Milos Kozak
d024164ff0 Merge pull request #448 from jotomo/profile
Use SpinnerHelper in TimeListEdit.
2017-10-07 18:28:23 +02:00
Milos Kozak
ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
Milos Kozak
d6fb912ff9 Singleton & Crashlytics logging part 2 2017-10-07 17:48:03 +02:00
Johannes Mockenhaupt
da3f02648c
Use SpinnerHelper in TimeListEdit.
Resolves the spinner's onItemSelected handler to back invoked
repeatedly on faster devices.
2017-10-07 16:37:24 +02:00
AdrianLxM
046c28856c treatments in config builder 2017-10-07 01:18:28 +02:00
Milos Kozak
0e763724f6 Singleton & Crashlytics logging part 1 2017-10-06 16:39:59 +02:00
Milos Kozak
a1ca4677c0 log exception 2017-10-06 16:07:41 +02:00
AdrianLxM
10d273dac8 checkboxes for NS-Client layouts 2017-10-06 15:48:32 +02:00
AdrianLxM
333b131c1e overview checkboxes cutoff fix 2017-10-06 13:53:55 +02:00
Milos Kozak
4db82fd275 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-06 13:15:57 +02:00
Milos Kozak
32d6e06b07 Merge pull request #444 from AdrianLxM/temptarget-presets
Temptarget presets
2017-10-06 13:15:06 +02:00
Milos Kozak
a670a43346 Merge pull request #445 from AdrianLxM/numberpicker-update
update NP value after manual entry
2017-10-06 12:41:34 +02:00
Milos Kozak
991ebef163 Merge pull request #441 from MilosKozak/fix-zerotemp-misinterpretation
Fix zerotemp misinterpretation
2017-10-06 12:19:00 +02:00
AdrianLxM
1b5ef50eb2 update NP value after manual entry 2017-10-06 03:24:35 +02:00
AdrianLxM
7f403166c7 restore preferences 2017-10-06 03:05:36 +02:00
AdrianLxM
bd93fc1adb temp target presets 2017-10-06 02:53:23 +02:00
Milos Kozak
e0794a6e7f fix time shifting 2017-10-05 00:54:35 +02:00
Milos Kozak
f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
Milos Kozak
3d58fe6bb5 cleanup 2017-10-04 23:24:56 +02:00
Milos Kozak
96edac5ddf LocalProfile fix 2017-10-04 23:17:19 +02:00
AdrianLxM
d6089bef73 Rv2 percent fix 2017-10-04 19:39:41 +02:00
AdrianLxM
7ce282dc4e korean percent fix 2017-10-04 19:38:42 +02:00
Milos Kozak
4f53862808 Merge pull request #439 from MilosKozak/fix-zerotemp-misinterpretation
Do not misinterpret a fake-extended as 0% temp.
2017-10-04 18:12:59 +02:00
Milos Kozak
9f6962cee5 serialize reload of treatments 2017-10-04 18:04:34 +02:00
AdrianLxM
3d2647321b getTempBasalFromHistory -> getRealTempBasalFromHistory 2017-10-04 16:51:54 +02:00