1555 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
cpfeiffer	e451e8155c	Remember the map so that we can look up the name later, as well, closes #275	2016-04-14 23:55:40 +02:00
cpfeiffer	a8279faa5b	Merge branch 'master' into db-refactoring	2016-04-14 23:28:00 +02:00
cpfeiffer	a460049a1b	Sort by label and blacklist status, hopefully fast enough #275	2016-04-14 23:23:06 +02:00
Andreas Shimokawa	a9e7cdcaa7	use some colors from the theme for charts activity	2016-04-14 17:41:04 +02:00
Andreas Shimokawa	a9b75a63b3	simply derive AbstractGBFragmentActivity from GBActivity instead of FragmentActivity ... This fixes the Actionbar being invisible	2016-04-14 17:16:43 +02:00
Andreas Shimokawa	46086f0408	allow dark theme in charts activity. ... The charts however are still the same	2016-04-14 17:04:49 +02:00
Andreas Shimokawa	faa6a9d906	use android:summary="%s" for ListPreferences	2016-04-14 16:44:44 +02:00
Andreas Shimokawa	f76a1ba16f	allow to switch to dark theme im settings	2016-04-14 16:15:58 +02:00
Andreas Shimokawa	367aced03d	also use theme in settings	2016-04-14 15:34:53 +02:00
Andreas Shimokawa	4bcebca744	Work towards dark theme, remove -v21 specific theme definition	2016-04-14 15:21:25 +02:00
Andreas Shimokawa	a9b4ea8eda	bump buildToolsVersion	2016-04-14 15:17:08 +02:00
Andreas Shimokawa	24cc3725d2	equalize size of connected and disconnected device icons	2016-04-14 11:07:44 +02:00
cpfeiffer	b25a47c398	Immediately disable hr reading and activity tracking when leaving the tab #273	2016-04-13 23:36:14 +02:00
cpfeiffer	e87a357bed	Show separate curves when the time between two measurements is too long #273	2016-04-13 21:38:35 +02:00
cpfeiffer	f52126ed36	Update dependencies	2016-04-13 21:21:25 +02:00
cpfeiffer	ae5d9089d8	Slight improvement to hr charts #178	2016-04-13 21:21:10 +02:00
cpfeiffer	78bf516897	Disabling sleep measurement for continuous measurement is not necessary ... Looks like they don't interfere, after all. #178	2016-04-12 23:25:12 +02:00
cpfeiffer	f15a97d994	Initial live heartrate measurement in the live activity tab #178	2016-04-12 23:12:50 +02:00
Andreas Shimokawa	58d90c2a66	remove obsolete Holo theming	2016-04-12 13:04:28 +02:00
cpfeiffer	7ab31514dc	Rework charts to completely fix crash in charts activity #277	2016-04-11 23:18:12 +02:00
cpfeiffer	f334131119	Updated gradle to 2.12	2016-04-11 19:57:54 +02:00
cpfeiffer	82b4394b40	Ignore generated entities	2016-04-10 21:51:47 +02:00
Lem Dulfo	206b0670a4	Fixed mainClassName error, fix entity generation	2016-04-10 21:46:51 +02:00
cpfeiffer	3fb252f74d	Merge branch 'master' into db-refactoring	2016-04-10 21:38:11 +02:00
cpfeiffer	290d695fec	Add margin for the shadow of the FAB ... Also make the hint color grey, like in the discovery activity	2016-04-10 21:36:32 +02:00
Lem Dulfo	39cba84ab1	Apply gray images on non-connected devices in the list.	2016-04-10 21:11:52 +02:00
Lem Dulfo	e5726075a4	Rework device item layout	2016-04-10 21:11:52 +02:00
Lem Dulfo	eba1ee6dc6	Device disabled icons	2016-04-10 21:11:52 +02:00
Lem Dulfo	70ed14243f	Remove all getActionBar occurences, temporary fix for overlap	2016-04-10 21:11:52 +02:00
Lem Dulfo	83e6e6b85f	Add background image for empty ControlCenter	2016-04-10 21:11:41 +02:00
Lem Dulfo	80a21f2ec2	Move Discovery functionality to FAB	2016-04-10 21:11:41 +02:00
Lem Dulfo	5a3004cbce	AppCompat and FAB, more Material Design	2016-04-10 21:11:41 +02:00
Lem Dulfo	3ef942b5d3	Do not crash on null BT adapter, allows UI work on emulator.	2016-04-10 21:11:41 +02:00
cpfeiffer	5ea107b439	Merge branch 'master' into db-refactoring	2016-04-09 19:19:42 +02:00
cpfeiffer	57ecba16f3	Update Changelog for 0.9.4	2016-04-09 10:05:27 +02:00
cpfeiffer	802e9a8235	OK, revert to connectGatt(false), connect often does not work with true #249	2016-04-09 09:53:03 +02:00
cpfeiffer	22a5aef7d7	Merge branch 'master' into db-refactoring	2016-04-08 23:06:20 +02:00
cpfeiffer	42dda911e4	Fix crash in charts activity, closes #277	2016-04-08 23:02:50 +02:00
cpfeiffer	059c7d0b15	Hopefully fix travis jdk7 build (permgen space issue)	2016-04-08 22:28:06 +02:00
cpfeiffer	3953e4232d	Update gradle build tools to 2.0	2016-04-07 20:53:25 +02:00
cpfeiffer	1e5dbb6a23	OK, just connect(true) is not sufficient #249 ... (we again get connection problems. Let's try this.)	2016-04-07 20:53:25 +02:00
Daniele Gobbetti	a49335fa67	Allow to change stored samples converting only certain old types	2016-04-07 17:52:15 +02:00
Andreas Shimokawa	b1a93c430d	interrupt thread instead of joining to fix ANR	2016-04-07 00:21:21 +02:00
Andreas Shimokawa	6895c5b776	fix xml changelog	2016-04-06 23:29:59 +02:00
Andreas Shimokawa	c7b64b6da7	update Japanese translation from transifex (thanks!)	2016-04-06 23:03:56 +02:00
Andreas Shimokawa	10be21e07b	add Pebble stuff to CHANGELOG.md (Mi Band is still missing)	2016-04-06 23:00:18 +02:00
Andreas Shimokawa	e91b5a07bd	Pebble: change delay between reconects to 1,2,4,8,16,32,64 (max) seconds	2016-04-06 22:55:04 +02:00
Andreas Shimokawa	4055cc1173	bump version	2016-04-06 22:44:50 +02:00
Andreas Shimokawa	94cec55a20	Merge pull request #276 from roidelapluie/reconnect ... Pebble: Smarter reconnection attempts	2016-04-06 22:41:07 +02:00
danielegobbetti	d2af3468f0	Add support for new datalog message added in pebble firmware 3.11 ... This adds support for storing deep sleep data.	2016-04-06 21:48:16 +02:00