1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-30 11:40:23 +02:00
Commit Graph

2030 Commits

Author SHA1 Message Date
Erik Johansson
5e049eb56d Make measurement key available as a static field as well 2018-03-24 19:50:51 +01:00
Erik Johansson
5385cb1cec Remove unused code 2018-03-24 19:50:51 +01:00
Erik Johansson
4d2491beee Revert " Refactor preferences (#233)"
This reverts commit 34e6856ebf.

Will merge again with history.
2018-03-24 19:49:57 +01:00
Erik Johansson
34e6856ebf Refactor preferences (#233)
* Remove unused code

* Make measurement key available as a static field as well

* Move enable logic to base class

* State dependency explicitly in all measurement views

* Add new class to keep track of settings for a measurement view

* Use new settings class to get hold of estimation settings

* Move handling of estimation/percentage enabled to base class

* Remove unused imports

* Update to c29dea32

* Refactor measurement settings

- Make it possible to disable all measurements (except weight). Fixes
  #226 and fixes #224.

- Add separate preference screens to all measurements to configure
  e.g. if the measurement should be displayed in the overview graph
  (this fixes #225 in a different way compared to previously), if
  relative or absolute weight should be used etc.

- Include reordering of measurements in the main measurement
  preference screen.

* Store empty values for measurements that aren't enabled

* Move dependency handling to settings class

This way it can check dependencies in isEnabled() as well.

* Don't set auto values if measurement is disabled

* Fix initial switch value

* Use instanceof instead of comparing name string

The resource id for the name string should not be known by users of MeasurementView.

* Move measurement on graph settings to settings class
2018-03-24 08:37:42 +01:00
Erik Johansson
f427560a61 Fix problem with labels on overview graph
Make them show up correctly and also refactor the code slightly.
2018-03-22 22:49:51 +01:00
OliE
06549f5b3f disable/enable overview graph lines depending on the graph buttons 2018-03-18 12:04:16 +01:00
Sander
4ddbf44a73 Translated using Weblate (Dutch)
Currently translated at 100.0% (177 of 177 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/nl/
2018-03-17 01:28:35 +01:00
Sander
c11913139d Translated using Weblate (Dutch)
Currently translated at 100.0% (177 of 177 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/nl/
2018-03-17 01:28:05 +01:00
roqeer
2689fb0873 Translation correction
corrected missing end tag
2018-03-15 09:14:25 +01:00
roqeer
db1acc255b Updated translation
Added missing strings with their translations. Some minor corrections.
2018-03-14 21:58:33 +01:00
Erik Johansson
d0d8ba8e85 Don't show soft input by default in input dialog
It takes time to open the soft input and with the new inc/dec buttons
it should not be needed as much. If needed it is quickly summoned by
clicking the input view.

Also it doesn't look nice when the phone is in horizontal mode as then
the soft input takes up the whole screen and one has to push back to
get to the inc/dec buttons.

See discussion in #222.
2018-03-11 22:21:14 +01:00
Erik Johansson
987d2ebf65 List-ify maintainer list 2018-03-11 22:11:52 +01:00
Weblate
dbccca13f1 Merge remote-tracking branch 'origin/master' 2018-03-11 07:15:13 +01:00
Andreas Kleinert
57f4cca213 Translated using Weblate (German)
Currently translated at 100.0% (177 of 177 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/de/
2018-03-11 07:15:13 +01:00
OliE
6fa06aed64 added Erik Johansson as an offical openScale maintainer. Thanks Erik for your help. 2018-03-11 07:15:03 +01:00
Andreas Kleinert
43851c6439 Translated using Weblate (German)
Currently translated at 100.0% (177 of 177 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/de/
2018-03-10 20:03:14 +01:00
OliE
e13fe9ec12 Merge pull request #220 from erijo/issue-218
Handle invalid user being selected in config
2018-03-10 11:25:50 +01:00
OliE
ecf47b4451 Merge pull request #217 from erijo/issue-216
Issue 216
2018-03-10 11:25:23 +01:00
JohnLines
738101457b iHealth HS3 scale (#221)
Initial iHealthHS3 support
2018-03-10 11:23:13 +01:00
Erik Johansson
3014ceb2a2 Handle invalid user being selected in config
Fixed #218
2018-03-08 16:39:00 +01:00
Erik Johansson
e151cc885c Save all values when weight is updated
If weight is updated and some measurements are shown as absolute
values, but saved as percentages, then we must re-save them using the
new weight. Otherwise the measurements will change without actually
having changed.
2018-03-07 20:42:21 +01:00
Erik Johansson
5e058f4e3c Convert evaulation result to absolute weight if needed
Fixes #216
2018-03-07 20:41:51 +01:00
Erik Johansson
403224de88 Move conversion to/from absolute/relative weight to base class 2018-03-07 20:41:00 +01:00
OliE
65824e8ed2 Merge pull request #213 from erijo/next-v2
Improve measurement input dialog
2018-03-06 17:11:49 +01:00
Weblate
caf64a0729 Merge remote-tracking branch 'origin/master' 2018-03-06 17:06:44 +01:00
Martin DroiDsk
ee8c5add10 Translated using Weblate (Slovak)
Currently translated at 96.0% (171 of 178 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/sk/
2018-03-06 17:06:43 +01:00
OliE
ebafa65bec set for new Bluetooth data the silent mode on 2018-03-06 17:06:27 +01:00
Erik Johansson
609093a985 Add repeat listener to inc/dec buttons in input dialog as well 2018-03-05 23:24:19 +01:00
Erik Johansson
50bc6414a3 Improve measurement input dialog
* Add inc and dec buttons to the dialog for quickly doing small
  adjustments in the same way as in activity.

* Improve "next" measurement behavior by not recreating the whole
  dialog and instead update the icon, title, view and buttons.
2018-03-05 23:11:10 +01:00
OliE
d4a968d6e4 colour the measurement order fragment correctly 2018-03-03 10:43:30 +01:00
OliE
e4dd200a60 update openScale version to 1.7.1 2018-03-01 09:08:36 +01:00
Erik Johansson
7f4cc0d814 Release old persistable permission when new export is done 2018-02-28 20:14:39 +01:00
Erik Johansson
58639d4436 Verify that it's possible to get filename from old export
Fixes crash when trying to export to a files that has been removed.
2018-02-28 18:49:12 +01:00
OliE
29e1a14aab Merge branch 'master' into misc 2018-02-28 17:37:03 +01:00
OliE
6d77ac3ef0 Merge pull request #208 from erijo/export
Export
2018-02-28 17:36:02 +01:00
OliE
77a99504b6 fixed bug with 12am/pm and 24 hour time set 2018-02-28 17:35:14 +01:00
Erik Johansson
7f197a058c Center name when in ADD mode 2018-02-27 22:40:17 +01:00
Erik Johansson
7effced15a Update swedish translation 2018-02-27 22:39:58 +01:00
Erik Johansson
fbc7f8e6b6 Don't limit mime type to text/* when importing
When exporting a file to a directory that already has a file with the
same name, android adds " (1)" to the filename. If limiting type to
text/* when picking file to import, then it's not possible to select
that file.
2018-02-27 22:25:47 +01:00
Erik Johansson
6af6f6b9f3 Use ACTION_CREATE_DOCUMENT intent to pick file to export to 2018-02-27 22:22:14 +01:00
Erik Johansson
93df08b973 Bump minSdkVersion to 19 to support ACTION_CREATE_DOCUMENT 2018-02-27 22:22:14 +01:00
Erik Johansson
24c3fb371b Add support for user bound preferences 2018-02-27 22:22:14 +01:00
OliE
b4d11190cc added an option for merging the Bluetooth measurement with the latest measurement 2018-02-27 18:29:59 +01:00
OliE
f1a9f0a71d use generic java reflection to divide and add scale measurements 2018-02-26 19:59:30 +01:00
OliE
3b473329ea use generic java reflection to divide and add scale measurements 2018-02-26 17:33:54 +01:00
OliE
aaf7979551 Merge branch 'context' of git://github.com/erijo/openScale into erijo-context 2018-02-26 17:03:20 +01:00
OliE
0f0acb2929 Merge pull request #204 from erijo/strings
Strings
2018-02-26 16:58:08 +01:00
Erik Johansson
84c9ba03d2 MenuItem doesn't have to be static 2018-02-25 23:09:13 +01:00
Erik Johansson
5c1ef0cf57 Fix fragment leak
By forcing transactions to run before creating new fragment we don't
end up with two fragments due to selectDrawerItem being called twice
during creation.

Fixes #175
2018-02-25 23:08:52 +01:00
Erik Johansson
eb567e9b5a Make sure OpenScale instance only holds an application context 2018-02-25 20:26:08 +01:00