1822 commits

Author	SHA1	Message	Date
Milos Kozak	f7609317ba	Merge branch 'dev' into rs-sync-warn	2018-06-24 11:45:33 +02:00
Johannes Mockenhaupt	784c071f53	Small oref1 sens corrections.	2018-06-24 01:03:38 +02:00
Milos Kozak	a3fafa521b	nsclient for phones layout	2018-06-23 22:17:54 +02:00
Milos Kozak	a4b3b7b2e9	Clean AndroidAPS started button	2018-06-23 20:28:20 +02:00
AdrianLxM	9c0665124d	Update strings.xml	2018-06-23 20:04:09 +02:00
Milos Kozak	d59c3c567b	Merge pull request #1132 from jotomo/1129 ... Combo: update error message. Fixes #1129.	2018-06-23 18:32:59 +02:00
Milos Kozak	586665e19f	nsclient table mode improvements	2018-06-23 18:24:04 +02:00
Johannes Mockenhaupt	5c95b785bb	Combo: update error message. Fixes #1129.	2018-06-23 13:33:17 +02:00
Milos Kozak	9360151100	Merge branch 'dev' into oref1	2018-06-22 17:55:38 +02:00
Milos Kozak	7bed827f4b	Merge pull request #1119 from jotomo/delete-future-treatments ... Treatments tab: add button (if applicable) to delete future treatments.	2018-06-22 17:47:37 +02:00
Johannes Mockenhaupt	58d79892ed	Overview: TT context menu.	2018-06-21 22:06:39 +02:00
Johannes Mockenhaupt	41ce9677df	Remove duplicate string.	2018-06-21 09:57:35 +02:00
Johannes Mockenhaupt	6002c747e6	Treatments tab: add button (if applicable) to delete future treatments.	2018-06-21 00:38:22 +02:00
Milos Kozak	370008f41e	oref 0.6.0 sens	2018-06-20 18:39:47 +02:00
Milos Kozak	e913cfe454	prepare oref1 plugin	2018-06-19 20:41:40 +02:00
Johannes Mockenhaupt	ef650b80a1	Combo: show notification on broken setup.	2018-06-18 20:19:30 +02:00
Nico Schmitz	d88b4da5a9	Don't show statuslight preferences in NSCLIENT build	2018-06-17 22:41:34 +02:00
Nico Schmitz	f46a81a7be	Add overview_statuslights to overview_fragment_smallheight.xml	2018-06-17 21:02:42 +02:00
Nico Schmitz	87d7fed75b	Remove margin of status light layout	2018-06-16 14:03:45 +02:00
Nico Schmitz	aa4f506961	Update to current upstream/dev branch	2018-06-16 02:51:33 +02:00
Nico Schmitz	db36d6e3f5	Change colors and refactor code	2018-06-16 02:18:03 +02:00
Tebbe Ubben	1e4c7178f4	Merge branch 'dev' into dev	2018-06-15 21:10:33 +02:00
Nico Schmitz	14a17efecc	Update colors	2018-06-15 19:36:49 +02:00
Milos Kozak	21b598edfa	Merge pull request #1100 from MilosKozak/rsoption ... Rsoption	2018-06-15 00:19:08 +02:00
Milos Kozak	5acb689eeb	Merge pull request #1102 from TebbeUbben/new-icon ... New launcher icon	2018-06-14 23:10:43 +02:00
Nico Schmitz	1604b53327	Fix bugs, refactor code and add preferences	2018-06-14 20:49:58 +02:00
Nico Schmitz	18c6bdd4ef	Improve layout xml	2018-06-13 21:35:21 +02:00
TebbeUbben	9e0dc9bfe5	New launcher icon	2018-06-13 20:23:40 +02:00
Nico Schmitz	217583d601	Use getBatteryLevel() for BAT status. Refactor code and layout.	2018-06-13 19:58:52 +02:00
Nico Schmitz	f28fca668f	Integrate info fields from swissalpine/dev-work	2018-06-13 00:07:13 +02:00
Nico Schmitz	5ba6f02b93	Remove reservoir TextView	2018-06-12 23:31:46 +02:00
Nico Schmitz	4ebc149783	Add changes of schmitzn/reservoir-view	2018-06-12 23:28:11 +02:00
Milos Kozak	d051e081e2	Merge branch 'dev' into rsoption	2018-06-12 21:59:20 +02:00
Milos Kozak	e7eec8fe69	Poctech BG source	2018-06-11 17:26:31 +02:00
TebbeUbben	3ac10f4f7a	Improved MinimumDurationTask visualization	2018-06-11 16:24:46 +02:00
TebbeUbben	005039effc	Objectives styling	2018-06-09 22:07:41 +02:00
AdrianLxM	8106907a55	unify padding pills and pumpstatus	2018-06-09 13:53:11 +02:00
TebbeUbben	934a7e6797	Same color scheme for SW	2018-06-09 13:27:27 +02:00
Milos Kozak	6344e88550	Merge pull request #1084 from TebbeUbben/dev ... Config builder styling	2018-06-09 11:39:16 +02:00
TebbeUbben	09b93078a8	Fixed typos	2018-06-08 23:45:32 +02:00
TebbeUbben	67b6d94fe5	Android Wear was renamed to WearOS	2018-06-08 23:35:18 +02:00
TebbeUbben	5d60f34e26	Better description for MDI plugin	2018-06-08 23:31:57 +02:00
TebbeUbben	f7597c93d7	Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java	2018-06-08 23:30:39 +02:00
TebbeUbben	37d543c865	Improvements to descriptions from Adrian	2018-06-08 23:27:52 +02:00
TebbeUbben	506482082d	Fixed descriptions	2018-06-08 21:26:12 +02:00
TebbeUbben	029057f1fc	Fix typo	2018-06-08 21:25:19 +02:00
TebbeUbben	2d94133175	Plugin descriptions	2018-06-08 21:19:46 +02:00
TebbeUbben	f9582d042f	Don't restore CheckBoxes and RadioButtons automatically	2018-06-08 20:05:33 +02:00
swissalpine	5bf6057838	Update danar_fragment.xml	2018-06-08 19:22:36 +02:00
swissalpine	87ea018181	Update wear_fragment.xml	2018-06-08 19:22:03 +02:00
swissalpine	3c58b94a28	Update objectives_fragment.xml	2018-06-08 19:19:21 +02:00
swissalpine	5df03e4ea7	Update openapsama_fragment.xml	2018-06-08 19:07:04 +02:00
swissalpine	ab599a452b	Update loop_fragment.xml	2018-06-08 19:06:16 +02:00
swissalpine	a926c4db86	Update combopump_fragment.xml	2018-06-08 19:05:34 +02:00
swissalpine	76505e0229	Update careportal_fragment.xml	2018-06-08 19:04:31 +02:00
swissalpine	7bd2f629bf	Update bgsource_fragment.xml	2018-06-08 19:02:20 +02:00
TebbeUbben	38526d64c6	These should not be changed	2018-06-07 23:24:10 +02:00
TebbeUbben	e25ebbdafa	Protection against callback looping	2018-06-07 23:23:10 +02:00
TebbeUbben	13cb4c28ed	ConfigBuilder styling	2018-06-07 22:54:27 +02:00
Roumen Georgiev	17a0aba2e5	remove button if pump is DanaR Korean	2018-06-07 09:34:12 +03:00
Roumen Georgiev	6559f57cd9	remove button if pump is DanaR Korean	2018-06-07 09:33:29 +03:00
Roumen Georgiev	4b7f8615bf	Merge pull request #26 from MilosKozak/rsoption ... update	2018-06-07 09:30:22 +03:00
Roumen Georgiev	9e2074433e	remove button if pump is DanaR Korean	2018-06-07 09:26:33 +03:00
AdrianLxM	c96f860585	Update strings.xml	2018-06-06 23:19:54 +02:00
AdrianLxM	712549e562	Update strings.xml	2018-06-06 23:04:15 +02:00
AdrianLxM	4c2babb905	Ro formatted false 3rd	2018-06-06 22:44:06 +02:00
AdrianLxM	964efee162	Ro formatted false 2nd	2018-06-06 22:42:36 +02:00
AdrianLxM	f343cfe0fa	Ro formatted false	2018-06-06 22:39:51 +02:00
AdrianLxM	0996b0f182	Ro update	2018-06-06 22:09:40 +02:00
Milos Kozak	6a4bb8a719	layout cleanup	2018-06-06 17:58:59 +02:00
Roumen Georgiev	7ef97a5334	files renamed and added icon	2018-06-06 09:28:51 +03:00
Roumen Georgiev	f528b708c3	Merge remote-tracking branch 'origin/dev' into dev	2018-06-06 09:22:28 +03:00
Roumen Georgiev	fd4662df32	files renamed and added icon	2018-06-06 09:13:21 +03:00
AdrianLxM	1acefd618b	Merge pull request #1076 from MilosKozak/AdrianLxM-cancel-color ... higher contrast ok and cancel buttons	2018-06-05 22:29:21 +02:00
AdrianLxM	e21f99a63d	Merge pull request #1077 from MilosKozak/padding-top ... Slightly more padding on top buttons/fields	2018-06-05 22:29:11 +02:00
AdrianLxM	5c6d098601	Merge pull request #1073 from jotomo/french-translation-format-specifier-fix ... Fix format specifier in French translation.	2018-06-05 22:28:55 +02:00
AdrianLxM	32f4a08fa6	slightly more padding on top buttons/fields	2018-06-05 13:26:43 +02:00
Roumen Georgiev	4a481bf294	Merge branch 'dev' into dev	2018-06-05 12:45:00 +03:00
Roumen Georgiev	54cc768a47	files renamed and added icon	2018-06-05 12:39:55 +03:00
Roumen Georgiev	c1b69404d0	files renamed and added icon	2018-06-05 12:19:47 +03:00
Roumen Georgiev	37e6e0268c	Merge pull request #25 from alesinka/master ... adding icons from Alessya	2018-06-05 10:55:41 +03:00
AdrianLxM	536fe3e5d2	higher contrast ok and cancel buttons	2018-06-05 00:15:41 +02:00
AdrianLxM	9d07e3e83f	Merge pull request #1072 from jotomo/silly-idea ... Revert "Update prediction colors to match NS."	2018-06-04 23:54:22 +02:00
AdrianLxM	4998ebae89	Merge pull request #1071 from TebbeUbben/new-design ... TabLayout + NavigationDrawer	2018-06-04 23:53:42 +02:00
TebbeUbben	5fa79b1db9	Changed accent color to #009688	2018-06-04 23:34:56 +02:00
TebbeUbben	f7b19e37a1	Button for plugin preferences	2018-06-04 21:56:31 +02:00
TebbeUbben	80e9d769e4	Compact version of toolbar	2018-06-04 21:34:21 +02:00
Alessya	fbe44b7190	new icon added to danaR tab - user options	2018-06-04 17:48:02 +03:00
Johannes Mockenhaupt	d31b90cd3e	Fix format specifier in French translation.	2018-06-04 15:38:06 +02:00
Roumen Georgiev	1147c28f04	use numberPicker instead of editText	2018-06-04 10:23:01 +03:00
Johannes Mockenhaupt	358108be49	Revert "Update prediction colors to match NS." ... This reverts commit dd41afa	2018-06-04 03:00:50 +02:00
TebbeUbben	6c1ccebb4a	Moved padding to Toolbar	2018-06-03 23:42:10 +02:00
TebbeUbben	263275659a	TabLayout + NavigationDrawer	2018-06-03 23:28:04 +02:00
TebbeUbben	a86c654f8d	Use real TBR cancels and dismiss their alerts	2018-06-03 10:56:29 +02:00
TebbeUbben	f151cbb0bf	TBR emulation	2018-06-02 16:37:53 +02:00
Roumen Georgiev	9569fbf183	Merge branch 'dev' into dev	2018-06-01 12:02:41 +03:00
Roumen Georgiev	908fd9f77e	strings update	2018-06-01 11:55:59 +03:00
Johannes Mockenhaupt	dd41afa55a	Update prediction colors to match NS.	2018-06-01 02:53:23 +02:00
Roumen Georgiev	41af503104	filling in some data	2018-05-31 17:10:09 +03:00
Roumen Georgiev	da89ea1643	some formatting	2018-05-31 16:47:58 +03:00
Roumen Georgiev	39e704645b	create userOptionsActivity class	2018-05-31 14:45:26 +03:00
Roumen Georgiev	e4e4829c73	update of strings	2018-05-31 14:18:43 +03:00
Roumen Georgiev	f71372444b	strings for danaR options fragment	2018-05-31 13:54:37 +03:00
Milos Kozak	7e57c30ecf	SW Exit label	2018-05-25 13:00:08 +02:00
Milos Kozak	35c07d1e60	SW scroll to the top on activity create	2018-05-24 00:13:59 +02:00
Milos Kozak	683caf78f8	SW configure insulin button	2018-05-23 13:47:16 +02:00
Milos Kozak	fa2c0ab003	Merge pull request #994 from MilosKozak/startupwizard ... Startupwizard	2018-05-22 23:07:04 +02:00
Milos Kozak	53bdb0bf09	asking permissions to notifications	2018-05-22 23:06:17 +02:00
Milos Kozak	2626e5bb63	SW android permissions	2018-05-22 17:34:09 +02:00
Milos Kozak	4fa24fb009	SW add more texts	2018-05-20 23:44:09 +02:00
Milos Kozak	b57683eaf5	SW rename package	2018-05-20 21:55:53 +02:00
Milos Kozak	f24d296836	SW nsclient screen finalizing	2018-05-20 21:36:17 +02:00
Milos Kozak	52a4f9af14	SW loop screen update	2018-05-20 16:29:15 +02:00
Milos Kozak	de8557a115	SW sensitivity plugin	2018-05-20 16:17:53 +02:00
Milos Kozak	bac1be1944	Merge pull request #1050 from boysim/dev ... Added and improved dutch translations	2018-05-20 14:46:41 +02:00
Milos Kozak	7714aa9138	Merge branch 'dev' into startupwizard	2018-05-20 14:18:58 +02:00
boysim	5c346f5b79	addedd formattng="false"	2018-05-20 14:18:37 +02:00
Milos Kozak	53cbe05436	Merge pull request #1019 from McHoffi/obj.7-add-info ... Obj.7 add info about using SMB/maxIOB	2018-05-20 14:14:11 +02:00
boysim	e2bfb224f2	dutch typo fixes	2018-05-20 13:36:28 +02:00
boysim	da8acd4a1e	dutch typo fixes	2018-05-20 12:55:52 +02:00
Simon Pauwels	25b20f13f1	Merge pull request #50 from MilosKozak/dev ... 20 mei	2018-05-20 12:20:49 +02:00
Milos Kozak	948e925d12	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-05-20 10:56:37 +02:00
Milos Kozak	06e52bb6ae	remove duplicated key	2018-05-20 10:56:32 +02:00
Milos Kozak	e91d7e0d11	Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2 ... Swedish update	2018-05-15 14:27:39 +02:00
AdrianLxM	bf23a8f935	polish update	2018-05-15 14:20:35 +02:00
AdrianLxM	bae05b26bb	Update strings.xml ... Thanks Marcus	2018-05-15 14:03:14 +02:00
TebbeUbben	3103a0f276	Some styling for SW	2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt	52da1feaf0	i18n: add German translation, layout issues with longer translations. ... Dialog headers (insulin, carbs, prime/fill) now lock proper at least in English and German.	2018-05-13 13:35:24 +02:00
Johannes Mockenhaupt	24e672a7f8	Add icon header to calibration dialog.	2018-05-13 12:48:30 +02:00
Johannes Mockenhaupt	1883ac06dd	Use TT color for TT confirmations in dialogs.	2018-05-13 12:14:49 +02:00
boysim	aab85fe298	added dutch translations	2018-05-11 23:23:55 +02:00
boysim	bf5e8e7142	added dutch translations	2018-05-11 21:26:42 +02:00
Simon Pauwels	f788f5981d	Merge pull request #49 from MilosKozak/dev ... 11/05	2018-05-11 21:05:31 +02:00
Milos Kozak	4fae6c703c	SW autostart SetupWizard	2018-05-11 13:14:59 +02:00
Milos Kozak	ff2cc04408	SW warn if exported configuration is missing	2018-05-11 13:04:17 +02:00
Milos Kozak	7be418fdf2	Merge pull request #980 from triplem/de ... DE translation	2018-05-11 09:24:24 +02:00
Markus M. May	cdd264686b	fix duplicate %	2018-05-11 08:43:24 +02:00
Milos Kozak	0a51c86afb	SW Configure APS button	2018-05-11 00:09:35 +02:00
Milos Kozak	376fffa6ec	SW Import settings, Skip wizard	2018-05-10 23:59:20 +02:00
Milos Kozak	e105e5149e	Merge pull request #1032 from jotomo/wear-wizard-tt ... Wear wizard: add TT config option.	2018-05-10 16:53:34 +02:00
Markus M. May	6d04d4b6e5	use positional indices in formatted strings to allow the usage of the translation editor	2018-05-10 16:53:01 +02:00
Roumen Georgiev	91c0b1a2ec	make Objectives visible	2018-05-10 14:36:05 +03:00
Milos Kozak	d5137a061b	Merge branch 'dev' into virtual_pump_Bug863	2018-05-10 13:19:44 +02:00
Roumen Georgiev	61afdd6e4c	cleanup	2018-05-10 14:05:33 +03:00
Roumen Georgiev	9ac081dd1d	arrays.xml clean	2018-05-10 14:01:17 +03:00
Roumen Georgiev	016aa1c069	Added insulin descriptions to SW screen	2018-05-10 13:56:50 +03:00
Roumen Georgiev	33a6135e75	Added insulin descriptions to SW screen	2018-05-10 13:48:18 +03:00
boysim	0227fc0089	added dutch translations	2018-05-10 11:53:38 +02:00
Roumen Georgiev	06180e3bbd	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev	2018-05-10 12:51:12 +03:00
Simon Pauwels	a5babe7934	Merge pull request #48 from MilosKozak/dev ... 10/05	2018-05-10 10:59:51 +02:00
Milos Kozak	fb7067b207	SW profile switch	2018-05-09 19:24:20 +02:00
Milos Kozak	1ba828d20a	SWFragment	2018-05-09 18:49:42 +02:00
Johannes Mockenhaupt	a2a165d510	Wear wizard: make TT option depend on BG being enabled.	2018-05-09 16:46:22 +02:00
Roumen Georgiev	e3153230e0	added NSClient followup	2018-05-09 17:11:07 +03:00
Roumen Georgiev	a7bbf93599	Merge pull request #19 from MilosKozak/startupwizard ... Startupwizard	2018-05-09 14:49:17 +03:00
Milos Kozak	bacb3fb337	SW pump screen	2018-05-09 13:38:17 +02:00
Milos Kozak	ed43eddc83	SWInfotext	2018-05-09 11:55:21 +02:00
Milos Kozak	61a7d69a65	Merge branch 'dev' into startupwizard	2018-05-09 11:41:05 +02:00
Milos Kozak	dbc5e3689a	Merge pull request #1028 from andyrozman/translation_irish ... Translation - Irish (Gaeilge)	2018-05-09 11:20:52 +02:00
Andy Rozman	bacc79970a	Added formated=false to some translations.	2018-05-09 10:19:27 +01:00
Milos Kozak	8c2d0d80ee	Merge pull request #1017 from MilosKozak/notification-height ... Tests required: Notification height	2018-05-09 10:16:29 +02:00
McHoffi	77522d0770	Update strings.xml	2018-05-09 09:45:53 +02:00
Milos Kozak	0c848b25f6	Merge branch 'dev' into translation_irish	2018-05-09 09:25:11 +02:00
Milos Kozak	62a83bc197	Merge pull request #1010 from MilosKozak/sv-update ... swedish update	2018-05-08 23:32:10 +02:00
Milos Kozak	faba0d9ff6	Merge pull request #1023 from MilosKozak/polish-translation ... Polish translation	2018-05-08 23:27:14 +02:00
Milos Kozak	8c042b4bc8	Merge pull request #1029 from RadoslavR/patch-58 ... bg translation again	2018-05-08 23:18:52 +02:00
Johannes Mockenhaupt	39905f8e60	Darker UAM, ZT prediction colors. ... They now have the same level of 'brightness'.	2018-05-08 21:26:52 +02:00
Markus M. May	86a91baad7	Fix translation	2018-05-08 20:56:02 +02:00
Roumen Georgiev	e357c7fd1b	adding pump selection	2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt	ce6e53e9c6	Wear wizard: add TT config option.	2018-05-08 13:28:01 +02:00
Radoslav Radev	0164da23a4	Update strings.xml	2018-05-07 21:34:55 +03:00
Markus M. May	5314c24099	Additional translations	2018-05-07 20:25:30 +02:00
Andy Rozman	3baf907267	Initial irish translation	2018-05-07 16:45:38 +01:00
AdrianLxM	c6dac2789c	one more polish update	2018-05-07 10:30:07 +02:00
AdrianLxM	af2c27236b	polish update	2018-05-07 10:24:06 +02:00
boysim	2ae6369362	added dutch translations	2018-05-06 22:52:04 +02:00
AdrianLxM	3385a23bdb	Merge pull request #1004 from pedroll/aaps20_rc3 ... Spanish translation	2018-05-06 20:25:17 +02:00
pedroll	0d2a0798f7	Spanish translation 2	2018-05-06 20:04:12 +02:00
pedroll	7b73c59ee5	Spanish translation 2	2018-05-06 20:04:12 +02:00
AdrianLxM	f3967e07d2	polish in gerenal strings.xml	2018-05-06 19:44:58 +02:00
AdrianLxM	858c75095b	polish arrays.xml	2018-05-06 19:32:43 +02:00
AdrianLxM	b89ac3049c	polish fix strings	2018-05-06 19:30:35 +02:00
AdrianLxM	7b0acd1c4a	polish remove translatable=false	2018-05-06 19:29:00 +02:00
AdrianLxM	270f60ac1c	polish first - thanks Tomasz K.	2018-05-06 19:25:10 +02:00
McHoffi	06948ca0f4	Update strings.xml	2018-05-06 18:16:42 +02:00
Radoslav Radev	b08332e340	bg translation	2018-05-06 14:49:10 +03:00
McHoffi	36d6edf0db	Update strings.xml	2018-05-06 12:16:51 +02:00
Johannes Mockenhaupt	b9c649bd68	Uso blue/orange for carbs/insulin in confirmation dialogs. ... Aligns with the graph's use of using blueish colors insulin and orange for carbs stuff.	2018-05-06 11:46:09 +02:00
AdrianLxM	1ac41323e6	fix notification last line cutoff	2018-05-05 21:55:49 +02:00
AdrianLxM	260e259fb0	Update strings.xml	2018-05-05 15:17:03 +02:00
AdrianLxM	d574c70471	Merge pull request #1011 from Heiner1/dev-strings ... Dev strings	2018-05-05 10:12:20 +02:00
swissalpine	fb04250c90	Elliminat syntax error	2018-05-05 10:00:30 +02:00
Heiner1	3a0c34e7b6	Update strings.xml	2018-05-05 09:45:10 +02:00
AdrianLxM	499edd7c05	swedish update	2018-05-05 09:20:29 +02:00
Radoslav Radev	9aeb2b6ede	Update strings.xml	2018-05-04 23:51:08 +03:00
Markus M. May	e07aecd62d	Further translations	2018-05-04 22:02:32 +02:00
AdrianLxM	1646420c47	base basal -> Basal Base (was Base Temporal)	2018-05-04 20:17:55 +02:00
pedroll	5ff86e9c34	Spanish translation	2018-05-04 19:54:21 +02:00
Milos Kozak	f5a23b2921	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 19:18:52 +02:00
Andy Rozman	4fb8e899c2	Feature Request/Bug #863 ... - merged with dev - extended PumpType with new setting in PumpDescription - added Insight pump settings for VirtualPump	2018-05-04 15:48:46 +01:00
Milos Kozak	61e6404bbe	Merge pull request #995 from MilosKozak/wear-wizard ... Wear eCarbs	2018-05-04 14:33:55 +02:00
Milos Kozak	963f1e1abf	Merge branch 'dev' into startupwizard	2018-05-04 13:26:40 +02:00
swissalpine	7312bf061a	Update colors.xml	2018-05-04 12:30:28 +02:00
Andy Rozman	f2df13dbfb	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 10:06:18 +01:00
Milos Kozak	55661ca7a0	SWButton	2018-05-04 10:17:50 +02:00
swissalpine	010a2f3fd8	Make deviation bars transparent	2018-05-04 10:04:45 +02:00
Radoslav Radev	52411f7afe	half of the Bulgarian translation	2018-05-03 23:34:50 +03:00
AdrianLxM	fb75346bcd	ecarb make settings consistent	2018-05-03 22:08:50 +02:00
Milos Kozak	4539756455	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard	2018-05-03 22:02:12 +02:00
Milos Kozak	dea5ff0080	styles cleanup	2018-05-03 22:01:59 +02:00
Milos Kozak	d1958a3e2d	Merge branch 'dev' into startupwizard	2018-05-03 21:31:55 +02:00
Milos Kozak	02590ddd72	SW remove unneeded code	2018-05-03 21:29:34 +02:00
McHoffi	39e9448c67	Typo fix	2018-05-03 21:20:54 +02:00
Milos Kozak	94db444acb	SW validator, language, cleanup	2018-05-03 20:06:13 +02:00
Milos Kozak	36265ab1c6	SWPlugin	2018-05-03 18:41:47 +02:00
AdrianLxM	43dc7d1846	wear cathegorize preferences	2018-05-03 17:49:31 +02:00
AdrianLxM	fe0f2e3ce6	wearwizard settings on phone	2018-05-03 17:49:13 +02:00
Andy Rozman	5b8779f8a7	Feature Request/Bug #863 ... - added PumpCapability (to set boolean values) - added Dana Pumps to PumpType and to VirtulaPumps array	2018-05-03 15:10:34 +01:00
Roumen Georgiev	515590cdf6	other screens	2018-05-03 17:04:56 +03:00
Roumen Georgiev	425ba77200	other screens	2018-05-03 16:59:23 +03:00
Roumen Georgiev	083730f476	WIP: BGSOURCE screen	2018-05-03 09:02:16 +03:00
Andy Rozman	416bd2ff41	Feature Request/Bug #863 ... - added package PumpCommon for common pump files - added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType - added PumpType which contains all definitions for pumps - extended fragement to display Pump Type and Pump Type definitions - extended plugin to read configuration and set pumpDescription object - extended pref_virtualpump to add pump type selection	2018-05-02 23:59:33 +01:00
Markus M. May	07c47a4ba7	Start de translation	2018-05-02 21:45:16 +02:00
AdrianLxM	f1736f048e	Update strings.xml	2018-05-02 20:20:13 +02:00
Milos Kozak	5671b99f30	Merge pull request #974 from MilosKozak/swedish-update ... Swedis Update strings.xml	2018-05-02 18:02:51 +02:00
CaroGo	a768c03462	Update strings.xml	2018-05-02 17:43:17 +02:00
Milos Kozak	a4ff9d29e2	Merge branch 'dev' into swedish-update	2018-05-02 17:10:01 +02:00
Milos Kozak	42164489c8	cs translations	2018-05-02 17:05:20 +02:00
AdrianLxM	f52451085c	remove translation of language names	2018-05-02 16:41:56 +02:00
AdrianLxM	fb61f3cde2	Update strings.xml	2018-05-02 16:39:28 +02:00
Milos Kozak	efff5d4e10	Merge pull request #966 from jotomo/greener-grass ... Brighter green for "treatment active" for better readability.	2018-05-02 15:05:27 +02:00
Johannes Mockenhaupt	32323d673b	Brighter green for "treatment active" for better readability.	2018-05-02 15:01:49 +02:00
Markus M. May	12d80e96ef	Merge latest dev version	2018-05-01 21:56:33 +02:00
soko78	183f2cd6b3	Update strings.xml ... line 177 & 178 changed "temoräres ziel" into "temporäres ziel"	2018-05-01 20:30:53 +02:00
Johannes Mockenhaupt	5ef7506e5f	Clean up prediction colors.	2018-05-01 19:16:28 +02:00
Winfried Kuiper	d68f74bb68	Update strings.xml	2018-04-30 23:09:35 +02:00
Markus M. May	099cb6c4e4	add battery charging state	2018-04-29 22:49:43 +02:00
Roumen Georgiev	a0463742fa	WIP: language set and validation	2018-04-27 17:04:08 +03:00
Roumen Georgiev	bb38d7644b	move onClick in SWRadioButton	2018-04-27 13:30:45 +03:00
AdrianLxM	ee0c811e0d	Merge pull request #912 from jotomo/display-cob ... Add IobCobCalculatorPlugin.getCobInfo().	2018-04-26 23:52:52 +02:00
Roumen Georgiev	11dc20faca	code cleanup	2018-04-26 16:59:56 +03:00
Roumen Georgiev	d75de2f645	show "NEXT" only when isValid() == true	2018-04-26 15:18:01 +03:00
osodebailar	5a74087632	Change iob and cob color for a better uniform look. ... Insulin , iob etc. always in different blue colors, Cob in orange (ocher) like color	2018-04-25 16:51:49 +02:00
Roumen Georgiev	dc91e3a544	currentScreen not updating - fixed & center fields	2018-04-25 17:02:10 +03:00
Roumen Georgiev	8333fe8975	get radiobutton values from arrays.xml & no header	2018-04-25 16:45:15 +03:00
Roumen Georgiev	7fb1b32188	moved show() method to SWItem classes	2018-04-25 15:29:20 +03:00
Roumen Georgiev	dda7ca3f95	radio group is generated dynamically	2018-04-25 11:03:33 +03:00
Johannes Mockenhaupt	f4bafc6260	Add IobCobCalculatorPlugin.getCobInfo().	2018-04-24 23:09:07 +02:00
Milos Kozak	c490499d03	preferences cleanup	2018-04-24 00:11:52 +02:00
Roumen Georgiev	eef4423109	basic navigation works	2018-04-23 17:03:22 +03:00
Roumen Georgiev	76685c3cff	WIP: initial work	2018-04-23 15:58:27 +03:00
Andreas Eggen	511b9c6819	Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into dev	2018-04-23 08:26:48 +02:00
Milos Kozak	545b4a51ee	Merge pull request #914 from jotomo/overview-extended-bolus-display ... Overview: hide ext. bolus line if none running; spacings, alignments.	2018-04-22 23:13:10 +02:00
Johannes Mockenhaupt	896f919f37	Disable roaming (pref) when wifi-only is enabled.	2018-04-22 21:43:31 +02:00
Johannes Mockenhaupt	47770e9c6c	Overview: hide ext. bolus line if none running; spacings, alignments.	2018-04-22 21:31:53 +02:00
osodebailar	e97b35a030	Change headertext label size from large to medium	2018-04-22 19:48:56 +02:00
Milos Kozak	6851adbfd3	NSClient connection settings	2018-04-22 18:24:06 +02:00
TebbeUbben	7c971197c7	Swapped pump started and paused strings inadvertently	2018-04-21 23:29:23 +02:00
Tebbe Ubben	f4e02a4862	Merge branch 'dev' into dev	2018-04-21 23:22:02 +02:00
TebbeUbben	fd776a2a0e	Add 0%-TBR to history when pump has been started or stopped	2018-04-21 23:20:33 +02:00
Milos Kozak	c4db1c5e2d	move quickwizard preferences under overview	2018-04-21 21:58:07 +02:00
Milos Kozak	1f55078aa3	extract strings from overview preferences	2018-04-21 21:37:50 +02:00
Milos Kozak	cab592efb5	overview preferences cleanup	2018-04-21 21:31:42 +02:00
Milos Kozak	fe762248a5	nsclient preferences cleanup	2018-04-21 21:14:09 +02:00
Milos Kozak	ea59458383	nsclient preferences cleanup	2018-04-21 20:46:55 +02:00
Milos Kozak	c40aaed52f	allow to show dev slope in dev	2018-04-21 12:09:09 +02:00
Milos Kozak	c0250dd62c	show calculation cob progress on graph	2018-04-21 10:50:55 +02:00
Milos Kozak	c27ceb0a72	better bolus error handling for Dana pumps	2018-04-21 00:02:15 +02:00
Milos Kozak	b554d641a7	setupwizard template	2018-04-20 17:27:31 +02:00
Milos Kozak	41b5636c13	clear autosens cache on new preferences change	2018-04-20 12:44:19 +02:00
AdrianLxM	11b88c7947	Merge remote-tracking branch 'milosremote/dev' into cob-rework	2018-04-19 20:22:14 +02:00
AdrianLxM	ed24a129ae	unify Default in settings xml and constants	2018-04-19 19:32:50 +02:00
AdrianLxM	00c05c0e23	totalMinCarbsImpact depending on sensitivty plugin	2018-04-19 12:57:13 +02:00
AdrianLxM	e8406320e0	COB settings	2018-04-19 11:48:00 +02:00
AdrianLxM	2cf438a064	Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418	2018-04-18 16:00:00 +02:00
Johannes Mockenhaupt	5d1c6cd118	Move "show notes ..." pref into Buttons submenu.	2018-04-17 21:03:16 +02:00
AdrianLxM	00a0bf2f1a	local profile icons	2018-04-17 20:41:43 +02:00
AdrianLxM	eb2f628f1f	unify names of same icon with different resolution	2018-04-17 20:41:33 +02:00
Alessya	05a1b35ccb	Rename Icon files	2018-04-17 20:41:21 +02:00
Alessya	8dd589c5fe	New icons added for local profile screen	2018-04-17 20:41:07 +02:00
Alessya	91b58446ca	Rename Icon files	2018-04-17 15:59:00 +03:00
Alessya	b2fb14e57a	New icons added for local profile screen	2018-04-17 15:57:54 +03:00
Johannes Mockenhaupt	c7c90ea919	Proper fix.	2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt	58aa4f1323	Unbreak wizard xml, small fixes.	2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt	447bd9b6a3	Alignments. ... (cherry picked from commit a63c388)	2018-04-15 00:28:08 +02:00
Johannes Mockenhaupt	9b80221752	Set inputType for notes fields. ... (cherry picked from commit af0807d)	2018-04-14 10:43:48 +02:00
Johannes Mockenhaupt	f420491611	NewCarbsDialog: cleanups.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	bf7e9e4bf3	NewInsulinDialog: add notes field, use relative time, align style.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	719d3d459b	NumberPicker: apply signed, decimal constraints for keyboard usage.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	efcc02775b	FillDialog: add missed validation, notes field, align style.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	bf02edd871	Make visibility of notes field a preference.	2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt	05e07cf943	Align style of labels, i18n.	2018-04-12 21:32:47 +02:00
Johannes Mockenhaupt	4acf0c713a	Merge remote-tracking branch 'origin/dev' into carbs-gen-pr ... * origin/dev: Adding notes to carbs and to wizard on overview	2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt	a075d87da1	Remove help dialog. ... (cherry picked from commit b1ef8e1)	2018-04-12 20:59:24 +02:00
Johannes Mockenhaupt	9b3b228aad	Color active/scheduled bolus/carbs and TT entries in treatment tab.	2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt	d2491ca429	NewCarbsDialog: add duration, help.	2018-04-11 13:05:54 +02:00
Markus M. May	99c8bbc6c2	Adding notes to carbs and to wizard on overview	2018-04-09 22:10:08 +02:00
AdrianLxM	d1d46849ee	Merge pull request #832 from MilosKozak/lp-edit ... LocalProfile reset/save button	2018-04-09 14:08:22 +02:00
Milos Kozak	9b91b4ab93	Merge branch 'dev' into automatic-careportal-events	2018-04-08 23:53:04 +02:00
TebbeUbben	851cec7240	Renamed alerts.xml to insight_alerts.xml	2018-04-08 20:27:23 +02:00
Milos Kozak	d9279eed2a	split MaxIOB for SMB	2018-04-08 20:17:15 +02:00
TebbeUbben	b488e30459	Use uploadError for pump alarms	2018-04-08 18:46:29 +02:00
TebbeUbben	56b2799785	Added insight_real_tbr_cancel option again	2018-04-08 18:32:11 +02:00
TebbeUbben	f8d4dbf6a1	Add pump alerts as notes	2018-04-08 17:22:53 +02:00
AdrianLxM	5c6e598cd6	Merge branch 'dev' into lp-edit	2018-04-08 16:14:43 +02:00
Milos Kozak	78ffae6e47	Merge pull request #849 from jotomo/combo-cleanup ... Combo cleanup	2018-04-06 21:14:50 +02:00
Milos Kozak	35decd0e53	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-04-06 21:12:14 +02:00
Milos Kozak	c94d01f22b	better time synchronization for danarv2	2018-04-06 18:30:36 +02:00
Johannes Mockenhaupt	623a5e3da1	Combo: remove unused strings, minor code cleanups.	2018-04-06 11:42:33 +02:00
Johannes Mockenhaupt	344d9c1f49	Combo: remove 'read history' button. ... History and basal rate profile are permanently checked and updated. This functionality would only be needed if driver was fundamentally broken.	2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt	db4439f1cc	Combo: remove half-backed alerts dialog.	2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt	e937a777ba	Combo: remove superseeded TDD button and dialog.	2018-04-06 11:35:34 +02:00
swissalpine	afebf30bc0	Add string loopdisconnectedfor	2018-04-05 21:55:07 +02:00
AdrianLxM	009f5dfa38	reset -> strings.xml	2018-04-03 18:37:34 +02:00
AdrianLxM	933b1acd7e	lp save button	2018-04-03 18:33:13 +02:00
AdrianLxM	75a91997b7	lp reset	2018-04-03 14:34:15 +02:00
Milos Kozak	e9c7bdc7f4	add necessity of profile switch to objectives	2018-03-31 22:30:42 +02:00
Milos Kozak	a91aeec144	fix nsclient layout	2018-03-31 20:32:47 +02:00
Milos Kozak	bcb733e42c	Plugins refactor	2018-03-31 00:36:03 +02:00
Milos Kozak	259b5fa818	Merge pull request #809 from MilosKozak/tdds-again-merged ... Tdds again merged	2018-03-28 17:35:23 +02:00
Milos Kozak	fc2da20743	fix conflict	2018-03-28 10:25:58 +02:00
Milos Kozak	e9b499314d	PUMP SMS command, connect to pump before reporting SMS STATUS	2018-03-28 10:22:10 +02:00
Milos Kozak	8e6953cc92	activate button on NSProfile fragment	2018-03-26 09:25:57 +02:00
AdrianLxM	a5d0ec45cc	Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged	2018-03-26 08:39:24 +02:00
Milos Kozak	afe3d68a10	display SMB reasons	2018-03-25 23:56:52 +02:00
Milos Kozak	8c5a2ab524	Merge pull request #799 from jotomo/prime-fill-refresh ... Prime/fill button refresh and some drive-by improvements	2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt	7694c80da9	Fix format specifiers in Spanish translation.	2018-03-24 10:53:46 +01:00
Johannes Mockenhaupt	8a7776fd74	Code dedup.	2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt	9838e2fabb	Rework prime/fill button.	2018-03-23 23:06:57 +01:00
Milos Kozak	22f50198fc	rename nsclientinternal -> nsclient	2018-03-23 22:44:37 +01:00
Milos Kozak	cbd60cfdbe	synchronized access to log in nsclient	2018-03-23 22:37:27 +01:00
Milos Kozak	30f09dc416	show constraints on LoopFragment	2018-03-23 18:23:19 +01:00
Milos Kozak	661595792f	rename InsightPump -> Insight	2018-03-23 17:51:05 +01:00
Milos Kozak	15d8719508	collect most limited reason along with all reasons	2018-03-23 17:36:49 +01:00
Milos Kozak	3f5808eca3	show max basal limit on smb fragment	2018-03-23 09:59:07 +01:00
Milos Kozak	ba09538f46	AMA - Autosens cleanup	2018-03-22 22:18:40 +01:00
Milos Kozak	76ee3c51e4	applyMaxIOBConstraints refactor & tests	2018-03-22 21:13:26 +01:00
Milos Kozak	1aba9a2564	applyCarbsConstraints refactor & tests	2018-03-22 10:31:07 +01:00
Milos Kozak	15158fb5ea	applyBolusConstraints refactor & tests	2018-03-21 23:01:30 +01:00
Milos Kozak	e2ea44a8a8	applyBasalPercentConstraints reactor & tests part1	2018-03-21 20:24:02 +01:00
Milos Kozak	ca70cbdaec	Merge branch 'dev' into newconstraints	2018-03-21 10:48:23 +01:00
Milos Kozak	15ebfc1193	applyBasalConstraints reactor & tests	2018-03-20 22:09:22 +01:00
AdrianLxM	60247daca2	Revert "Fixed typo: Temorär -> Temporär"	2018-03-20 16:19:51 +01:00
AdrianLxM	a14d698530	small correction to trigger travis again	2018-03-20 15:56:13 +01:00
Mathias Dalheimer	309ee1b9a6	Fixed typo: Temorär -> Temporär	2018-03-20 15:37:47 +01:00
Milos Kozak	c2cfe4e7ea	isSMBModeEnabled reactor & tests	2018-03-19 23:14:04 +01:00
Milos Kozak	26ecc3dd60	isAMAModeEnabled reactor & tests	2018-03-19 22:59:25 +01:00
AdrianLxM	954f73eabd	TDD 05	2018-03-19 19:10:54 +01:00
Milos Kozak	326229ebbb	limitClosedLoop & remove openloop flavor	2018-03-19 17:06:22 +01:00
Milos Kozak	5a96b88499	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into newconstraints	2018-03-19 15:11:50 +01:00