mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-31 12:01:54 +02:00
Code Issues Releases Wiki Activity
776 Commits 2 Branches 60 Tags
v1.7.1
Commit Graph

776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OliE
e4dd200a60 update openScale version to 1.7.1 v1.7.1 2018-03-01 09:08:36 +01:00
OliE
90430e3cc5 Merge pull request #211 from erijo/export-cleanup 
Release old persistable permission when new export is done
 2018-03-01 08:45:55 +01:00
Erik Johansson
7f4cc0d814 Release old persistable permission when new export is done 2018-02-28 20:14:39 +01:00
OliE
7830704cb4 Merge pull request #210 from erijo/export-fix 
Verify that it's possible to get filename from old export
 2018-02-28 19:07:49 +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
4b40035895 Merge pull request #209 from erijo/misc 
Misc
 2018-02-28 17:43:20 +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
b2656bbbfc Merge branch 'erijo-context' 2018-02-26 17:06:15 +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
Erik Johansson
05540fd103 Unregister fragment update listener when destorying view 2018-02-25 20:25:07 +01:00
Erik Johansson
ebea3814c7 Update swedish translation accordingly 2018-02-25 20:16:13 +01:00
Erik Johansson
e23051e549 fat/water -> body fat/water 2018-02-25 20:12:02 +01:00
OliE
bdbbe9c779 merge last measurement to the Bluetooth measurement. 2018-02-25 18:09:16 +01:00
OliE
e1d74bf94f try to fix the problem if the broadcast receiver is not probably unregistered. 2018-02-25 16:29:04 +01:00
OliE
2982543669 fixed average calculation in graph fragment. 2018-02-25 15:58:59 +01:00
Erik Johansson
05e93749af Body height -> height 2018-02-24 21:53:01 +01:00
Erik Johansson
2143763800 Unify measurement strings 
- Remove percentage from strings as fat, water and muscle can all be
  in both % and kg now.

- Always call it just fat, water and muscle without the "body"
  prefix. There should be no risk for someone thinking it's some other
  kind of fat.
 2018-02-24 21:53:01 +01:00
Erik Johansson
56552bcfbc Add missing escape 2018-02-24 21:53:01 +01:00
Erik Johansson
f95b8fa53c Remove unused strings 2018-02-24 21:53:01 +01:00
OliE
924cb33e99 update German translation 2018-02-24 16:51:59 +01:00
OliE
6854b9704e fixed to show the correct regression line 2018-02-24 16:31:27 +01:00
OliE
5f9610ec03 removed average count label on graph data points to reduce the label width 2018-02-24 08:31:39 +01:00
OliE
aec66b63a9 fix user add GUI unit test 2018-02-24 08:19:40 +01:00
OliE
0cba796169 Merge branch 'master' of https://github.com/oliexdev/openScale 2018-02-24 07:39:16 +01:00
Weblate
c788649eb3 Merge remote-tracking branch 'origin/master' 2018-02-24 07:39:09 +01:00
Erik Johansson
94f92df0ca Translated using Weblate (Swedish) 
Currently translated at 100.0% (193 of 193 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/sv/
 2018-02-24 07:39:09 +01:00
OliE
4037451f63 Merge pull request #201 from erijo/menu 
Move table menu to toolbar
 2018-02-24 07:39:05 +01:00
OliE
7fbb4a9f12 colour action button foreground icon black 2018-02-24 07:38:56 +01:00
Erik Johansson
772487d860 Translated using Weblate (Swedish) 
Currently translated at 100.0% (193 of 193 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/sv/
 2018-02-23 21:25:20 +01:00
Erik Johansson
49fb2fab4f Hide subpage view when there is only one page 2018-02-23 20:50:53 +01:00
Erik Johansson
ea3303d802 Move import/export/share to toolbar menu 2018-02-23 20:47:09 +01:00
OliE
dd6c9b2098 added a menue entry to show in the graph fragment weeks in months or year 2018-02-23 17:43:52 +01:00
Erik Johansson
72070ca8a0 Translated using Weblate (Swedish) 
Currently translated at 100.0% (192 of 192 strings)

Translation: openScale/Strings
Translate-URL: https://hosted.weblate.org/projects/openscale/strings/sv/
 2018-02-22 21:30:34 +01:00
OliE
1805d775f3 Merge pull request #200 from erijo/unregister 
Add missing listener unregister
 2018-02-22 21:13:20 +01:00
Erik Johansson
fba3016912 Add missing listener unregister 
Also don't call getContext() directly as that requries newer API version.
 2018-02-22 21:07:37 +01:00