Commit graph

713 commits

Author SHA1 Message Date
AdrianLxM 05d40e4af0 wear better toasts 2017-02-13 14:18:23 +01:00
AdrianLxM e85e651c56 wear full status support and product flavour with/without controls on wear 2017-02-13 01:55:35 +01:00
AdrianLxM 6fcee9ea3f pump shortStatus String in interface 2017-02-13 00:15:02 +01:00
AdrianLxM c0b287ba00 wear target statusO 2017-02-12 17:32:53 +01:00
AdrianLxM 6c5028b4be CPP dismiss info when focus is lost 2017-02-11 22:18:28 +01:00
AdrianLxM 104c146b2f Merge pull request #63 from AdrianLxM/patch-16
LadyViktoria validation lib plus safety
2017-02-11 21:12:22 +01:00
AdrianLxM e4c529fa1f reenable safety function 2017-02-11 19:59:20 +01:00
AdrianLxM d9103b6823 wear wizard confirm reformat, connection stability, prime not in menu per default 2017-02-11 19:51:33 +01:00
AdrianLxM 6cb192b876 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5 2017-02-11 18:09:22 +01:00
AdrianLxM b57253af5e wear add carbs to bolus-wizard confirmation 2017-02-11 17:54:47 +01:00
viktoria 06ee59b42c Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/build.gradle
2017-02-11 16:06:37 +01:00
Milos Kozak e1341e79bf Merge pull request #161 from warstar2187/master
Fix ExtendedBolusStep
2017-02-11 16:03:31 +01:00
viktoria 56f15a3cf7 Deprecation DataBaseHelper - use Long for .limit 2017-02-11 14:33:22 +01:00
Milos Kozak c5081c378b Merge pull request #169 from LadyViktoria/wip-deprecation-danarStats
Deprecation DanaR Stats
2017-02-11 14:23:45 +01:00
viktoria 0ffddcdefa Deprecation TimeListEdit - add design support libraries 2017-02-11 14:01:37 +01:00
viktoria a4591af392 Deprecation colors 2017-02-11 14:00:44 +01:00
viktoria 1217c22b43 Deprecation DanaR Stats 2017-02-11 13:44:43 +01:00
AdrianLxM 5ea7913a41 wear actionstringhandler use correct actualBG() 2017-02-11 02:58:22 +01:00
AdrianLxM 638b9c263c Merge pull request #61 from MilosKozak/dev
Dev
2017-02-11 02:55:14 +01:00
viktoria 580a296177 use validation lib in cpp - small changes 2017-02-11 00:47:14 +01:00
AdrianLxM 9dae8b4e56 wear don't enact 0carbs/0bolus on wizard result 2017-02-11 00:32:45 +01:00
viktoria 7877235972 Merged branch dev into dev 2017-02-11 00:16:55 +01:00
viktoria 279c67bb70 use validation lib in cpp - add snackbar 2017-02-11 00:16:25 +01:00
Milos Kozak 1e4fa1b93e fix not enacting extended 2017-02-10 21:45:46 +01:00
Milos Kozak 2e40c7b605 sms calibrations 2017-02-10 21:20:55 +01:00
LadyViktoria 49e08f3357 use validation lib in cpp - add counter 2017-02-10 18:00:10 +01:00
LadyViktoria e0627bd815 use validation lib in cpp - add a timer 2017-02-10 17:39:09 +01:00
LadyViktoria 48a158b036 use validation lib in cpp - better event handling 2017-02-10 17:29:59 +01:00
Milos Kozak 83667be8cc extract sending intent to a function 2017-02-10 17:25:32 +01:00
Milos Kozak 8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
LadyViktoria 11d0f1aebf better keyboard handling in fragments 2017-02-10 14:24:56 +01:00
warstar2187 9458e0effa Update DanaRKoreanPlugin.java 2017-02-10 20:59:44 +09:00
warstar2187 61f1acdcb0 Update DanaRPlugin.java 2017-02-10 20:59:06 +09:00
AdrianLxM 384e36a1f3 wear remove bolus enaction for testing 2017-02-10 12:52:54 +01:00
LadyViktoria 80de9c0cd8 use validation lib in cpp 2017-02-10 11:34:05 +01:00
AdrianLxM 4220d7712a wear wizard working 2017-02-10 06:07:31 +01:00
AdrianLxM 9785d507a8 wear temp targets working 2017-02-10 02:36:38 +01:00
AdrianLxM 8ece312b6a Merge pull request #60 from MilosKozak/dev
Dev
2017-02-09 23:47:12 +01:00
AdrianLxM aff82642af wear multiple watch situation and disable fillbolus for wider testing 2017-02-09 23:39:23 +01:00
Milos Kozak 90061c6f25 Show log 2017-02-09 22:29:21 +01:00
AdrianLxM 3ff41af939 wear bolus activity and refactoring 2017-02-09 20:54:41 +01:00
Milos Kozak ed7dd48612 remove TODOs 2017-02-09 20:18:22 +01:00
AdrianLxM dc476a6600 wear menu restructuring and status 2017-02-09 17:40:26 +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
Milos Kozak b9b08c1528 fix crash when pump status not loaded yet 2017-02-09 16:29:02 +01:00