1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-09-09 08:00:39 +02:00
Commit Graph

1688 Commits

Author SHA1 Message Date
Erik Johansson
ab38f13faf Upgrade gradle and use default build tools version 2017-11-20 21:25:47 +01:00
OliE
40750a3b99 catch sql exception on getScaleDataList method 2017-11-12 22:37:46 +01:00
OliE
6c8691aaa0 Update README.md 2017-11-12 16:26:30 +01:00
OliE
e0ffea679b update gradle to version 1.6 v1.6 2017-11-12 16:08:55 +01:00
OliE
6578ba0835 Update README.md 2017-11-12 15:58:26 +01:00
OliE
1cd8830800 Update README.md 2017-11-12 15:51:16 +01:00
OliE
e54a6a376e update body metrics dates and author 2017-11-12 13:50:41 +01:00
OliE
fc6c8138cb added a mi scale v2 photo 2017-11-12 12:19:24 +01:00
OliE
f85d9ff865 delete old doc folder structure 2017-11-12 12:05:57 +01:00
OliE
85625306c1 reorganise doc folder structure 2017-11-12 11:58:46 +01:00
OliE
95b4686bb1 added about page 2017-11-11 14:45:43 +01:00
OliE
1f03c94d7b Merge pull request #95 from erijo/datetime
Unify date and time handling
2017-11-10 13:52:14 +01:00
OliE
bced047f85 Merge pull request #94 from erijo/travis-badge
Point build status badge to travis
2017-11-10 13:51:45 +01:00
Erik Johansson
86e1e97f08 Unify date and time handling
* Present date in the "medium" (default) format (e.g. Nov 9, 2017)
  instead of dd.MM.YYYY (e.g. 09.11.2017). Besides that it is easier
  to read and wraps better in the table view, it is also localized and
  avoids the uncertainty if day or month comes first.

* Similar, time is now presented in a localized format (i.e. 12 or 24
  hour clock is taken from system settings).

* The time pickers are also configured to show a 12 or 24 hour clock
  depending on the system setting.

* Handling of birthday and goal date is now fully done in the user
  settings activity and OpenScale.(add|update)ScaleUser no longer has
  to know which format the date string was in.

* The date and time measurement view now opens the date/time picker
  with the initial date/time set to the measurement's value.
2017-11-09 20:09:14 +01:00
Erik Johansson
60d18c9b50 Point build status badge to travis
Makes it possible to click the badge and get to travis directly.
2017-11-08 22:00:31 +01:00
OliE
481eb17d36 catch user input NumberFormatException
add lean body weight icons
2017-11-08 18:18:43 +01:00
OliE
0a0d338829 added lean body weight measurement
added option to estimate lean body weight
evaluate history measurements with the correct age regarding to the measurement time
2017-11-08 18:12:42 +01:00
OliE
38fb5cca16 Merge pull request #90 from DreamNik/mgb_scales
Mgb scales
2017-11-08 16:51:22 +01:00
DreamNik
0c4fb936fd fix copyright 2017-11-05 14:47:21 +03:00
DreamNik
c28fe981a2 Merge branch 'master' into mgb_scales
# Conflicts:
#	android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
2017-11-05 14:36:05 +03:00
DreamNik
d7c8b6658a initial support for MGB (SWAN) scales 2017-11-05 14:31:07 +03:00
OliE
2e7434df9c added preference categories. 2017-11-01 19:00:03 +01:00
OliE
987efab026 added options to estimate body fat and body water 2017-11-01 18:17:49 +01:00
OliE
d47ac3438f added debug information for mi scale v2 2017-10-31 19:22:45 +01:00
OliE
5556d20cc4 added support for Yunmai SE scale 2017-10-31 19:05:26 +01:00
OliE
896985152a receive weight while on miscale v2 scale 2017-10-31 18:49:47 +01:00
OliE
d7b559aef5 Merge branch 'master' of https://github.com/oliexdev/openScale 2017-10-31 16:22:57 +01:00
OliE
21653b2575 Merge pull request #87 from ashimokawa/miscale2
Initial working support for Mi Scale v2
2017-10-31 16:21:58 +01:00
OliE
8a245a9155 convert initial weight into user scale unit 2017-10-31 14:12:23 +01:00
Andreas Shimokawa
3ccc4b627a fix lbs and catty unit detection 2017-10-28 01:07:31 +02:00
Andreas Shimokawa
e44fe05894 Set scale units to user configured units (kg/lbs/st) 2017-10-28 00:27:15 +02:00
Andreas Shimokawa
b2ec8599b7 Initial working support for Mi Scale v2
Notes:
- This is basically a copy of BluetoothMiScale.java with some data offset adjustments
- The absent realtime measurement characteristic disabled
- No extra body fat etc infos are parsed, just the same data as on the v1 scale are processed
- The scale is not yet switched to kg, it is still operated in catty and there is no HW switch!
2017-10-26 23:16:43 +02:00
OliE
7a1fc9d27e Merge pull request #83 from MatoDroid/patch-3
Updated slovak translation
2017-10-22 11:24:32 +02:00
oliexdev
22d812a2cc add increment and decrement button to data edit mode 2017-10-22 11:22:57 +02:00
oliexdev
eacdb3d2c5 update travis.xml file 2017-10-21 13:48:48 +02:00
oliexdev
45f0263adf deploy on tags 2017-10-21 13:09:59 +02:00
oliexdev
e200fc3654 add overwrite option 2017-10-21 12:55:35 +02:00
oliexdev
998ee70db3 remove apk dev build file 2017-10-21 12:46:07 +02:00
oliexdev
5847f9a04b update apk filename 2017-10-21 12:40:44 +02:00
oliexdev
eba0fffb9c update travis yml file 2017-10-21 12:28:19 +02:00
oliexdev
883e90f36d update CI files 2017-10-21 12:19:46 +02:00
oliexdev
89ac24bc58 Merge branch 'master' of https://github.com/oliexdev/openScale 2017-10-21 12:06:04 +02:00
oliexdev
ce94bb57dc updated travis config file to upload apk to github releases 2017-10-21 12:03:40 +02:00
Martin Jurík
849dbb9591 Updated slovak translation
Fixed some mismatches in slovak translation
2017-10-17 22:02:10 +02:00
oliexdev
833954168d openScale dev build 80 by Travis CI [skip ci] 2017-10-13 13:38:34 +00:00
OliE
3a781c50a6 Merge pull request #80 from MatoDroid/patch-2
Updated translation
2017-10-13 15:35:30 +02:00
Martin Jurík
b672c0b1dc Updated translation
Updated slovak translation
2017-10-10 22:51:36 +02:00
oliexdev
186fe305d9 openScale dev build 78 by Travis CI [skip ci] 2017-10-08 15:01:38 +00:00
OliE
2e4cc6ba1e Merge pull request #78 from roqeer/patch-1
Create strings.xml for Polish language
2017-10-08 16:58:10 +02:00
roqeer
4dbd6af94a Create strings.xml
Polish translation
2017-10-08 15:22:40 +02:00