Merge remote-tracking branch 'github-oliexdev/master'

.travis.yml

@@ -1,30 +1,37 @@
 language: android
 jdk: oraclejdk8
 
+env:
+  global:
+    - OWNER=${TRAVIS_REPO_SLUG%/*}
+    - DEV=${OWNER/oliexdev/dev}
+    - BRANCH=${TRAVIS_BRANCH/master/}
+    - TAG=${DEV}${BRANCH:+_}${BRANCH}
+
 android:
   components:
     - platform-tools
     - tools
-    - build-tools-27.0.2
-    - android-27
+    - build-tools-28.0.3
+    - android-28
     - extra-android-m2repository
 
 branches:
   except:
-    - travis-dev-build
+    - /^travis-.*-build$/
 
 before_install:
+  - yes | sdkmanager "platforms;android-28"
   - yes | sdkmanager "platforms;android-27"
-  - yes | sdkmanager "platforms;android-26"
 
 before_script:
   - sed -i -r
-    -e 's/applicationId "[^"]+/\0.dev/'
+    -e 's/applicationId "[^"]+/\0.'${DEV}'/'
     -e 's/(versionCode ).*/\1'$(date +%s)'/'
-    -e 's/versionName "[^"]+/\0-dev_'${TRAVIS_COMMIT:0:8}'/'
+    -e 's/versionName "[^"]+/\0-'${DEV}'_'${TRAVIS_COMMIT:0:8}_$(date +%F)'/'
     android_app/app/build.gradle
   - sed -i -r
-    -e 's/(<string name="app_name"[^>]*>[^<]+)/\1 (dev)/'
+    -e 's/(<string name="app_name"[^>]*>[^<]+)/\1 ('${TAG}')/'
     android_app/app/src/main/res/values/strings.xml
   # Create keystore by running:
   #   keytool -genkey -v -keystore debug.keystore -storepass android \
@@ -43,23 +50,25 @@ before_script:
 script: cd android_app && ./gradlew testDebug assembleAndroidTest assembleDebug
 
 before_deploy:
-  - ln -s app/build/outputs/apk/debug/app-debug.apk openScale-dev-build.apk
-  - git tag -f travis-dev-build
+  - ln -s app/build/outputs/apk/debug/app-debug.apk openScale-${TAG}-build.apk
+  - git tag -f travis-${TAG}-build
   - git remote add gh
-    https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git
-  - git push -f gh travis-dev-build
+    https://${OWNER}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git
+  - git push gh :travis-${TAG}-build || true
+  - git push -f gh travis-${TAG}-build
   - git remote remove gh
 
 deploy:
   provider: releases
   api-key: $GITHUB_API_KEY
-  file: openScale-dev-build.apk
+  file: openScale-${TAG}-build.apk
   skip_cleanup: true
-  name: openScale development build
-  body: Automatic openScale development build of $TRAVIS_BRANCH
-    ($TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z').
+  name: openScale development build (${TRAVIS_BRANCH})
+  body: Automatic openScale development build of $TRAVIS_BRANCH branch
+    (commit $TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z').
   prerelease: true
   overwrite: true
   target_commitish: $TRAVIS_COMMIT
   on:
-    branch: master
+    all_branches: true
+    tags: false

CREDITS

@@ -19,6 +19,12 @@ Apache License, Version 2.0
 License: https://www.apache.org/licenses/LICENSE-2.0
 Website: https://github.com/Ereza/CustomActivityOnCrash
 
+Project: Timber
+Copyright 2013 Jake Wharton
+Apache License, Version 2.0
+License: https://www.apache.org/licenses/LICENSE-2.0
+Website: https://github.com/JakeWharton/timber
+
 Project: Low-Power
 Copyright 2016 Lim Phang Moh
 Creative Commons Attribution-ShareAlike 3.0
@@ -54,7 +60,9 @@ License: http://creativecommons.org/licenses/by/3.0/
 * Madebyoliver (https://www.flaticon.com/authors/madebyoliver)
 * Those Icons (https://www.flaticon.com/authors/those-icons)
 * Smashicons (https://www.flaticon.com/authors/smashicons)
-* Swifticons https://www.flaticon.com/authors/swifticons
+* Swifticons (https://www.flaticon.com/authors/swifticons)
+* Darius Dan (https://www.flaticon.com/authors/darius-dan)
+* Pixelmeetup (https://www.flaticon.com/authors/pixelmeetup)
 
 Contributors to openScale are listed on:
 https://github.com/oliexdev/openScale/graphs/contributors

README.md

@@ -13,13 +13,14 @@ Install [openScale-dev-build.apk](https://github.com/oliexdev/openScale/releases
 # Features
 
 - Logs your body metrics (weight, body fat, body water, muscle percentage, lean body mass, bone mass, BMI, BMR, waist/hip circumference, waist-hip ratio, waist-to-height ratio)
+- Widget that can be added to the home screen showing any of the available metrics
 - Keep track of your diet process
 - Display all your data on a chart and table 
 - Import or export your data from/into a CSV file
 - Estimates body metrics (body fat, body water and lean body mass) based on scientic publications
 - Support for multiple users
-- Partially or full support for custom made Bluetooth scale, Xiaomi Mi scale v1/v2, Sanitas SBF70, Medisana BS444, Digoo DG-S038H, Yunmai Mini, Excelvan CF369BLE, Yunmai SE, MGB, Exingtech Y1, Beurer BF700/710/800, Silvercrest SBF75, Runtastic Libra (see [openScale wiki](https://github.com/oliexdev/openScale/wiki/Supported-scales-in-openScale) for details)
-- Partially or full translated into English, German, Japanese, French, Polish, Brazilian portuguese, Slovak, Turkish, Swedish, Spanish, Dutch, Catalan, Norwegian Bokmål
+- Partial or full support for custom made Bluetooth scale, Xiaomi Mi scale v1/v2, Sanitas SBF70, Medisana BS444/BS440, Digoo DG-S038H, Yunmai Mini, Excelvan CF369BLE/CF366BLE, Yunmai SE, MGB, Exingtech Y1, Beurer BF700/BF710/BF800, Silvercrest SBF75, Runtastic Libra, Hesley (Yunchen), iHealth HS3, Easy Home 64050, Accuway, Trisa Body Analyze 4.0 (see [openScale wiki](https://github.com/oliexdev/openScale/wiki/Supported-scales-in-openScale) for details)
+- Partially or full translated into Brazilian Portuguese, Catalan, Chinese (traditional), Croatian, Czech, Danish, Dutch, English, French, Galician, German, Greek, Hebrew, Italian, Japanese, Norwegian Bokmål, Polish, Romanian, Russian, Slovak, Slovenian, Spanish, Swedish, Turkish, Vietnamese
 - No advertising and for free
 - All data belongs to you (no cloud service)
 

android_app/app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.health.openscale"
         testApplicationId "com.health.openscale.test"
         minSdkVersion 19
-        targetSdkVersion 27
-        versionCode 24
-        versionName "1.7.1"
+        targetSdkVersion 28
+        versionCode 29
+        versionName "1.8.2"
 
         javaCompileOptions {
             annotationProcessorOptions { arguments = ["room.schemaLocation":"$projectDir/schemas".toString()] }
@@ -35,13 +35,14 @@ android {
 }
 
 ext {
-    supportLibVersion = '27.1.0'
+    supportLibVersion = '28.0.0'
 }
 
 dependencies {
     implementation "com.android.support:design:${supportLibVersion}"
     implementation "com.android.support:support-v4:${supportLibVersion}"
     implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
 
     // HelloCharts
     implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'
@@ -53,19 +54,22 @@ dependencies {
     implementation 'cat.ereza:customactivityoncrash:2.2.0'
 
     // Room
-    implementation 'android.arch.persistence.room:runtime:1.0.0'
-    annotationProcessor 'android.arch.persistence.room:compiler:1.0.0'
-    androidTestImplementation 'android.arch.persistence.room:testing:1.0.0'
+    implementation 'android.arch.persistence.room:runtime:1.1.1'
+    annotationProcessor 'android.arch.persistence.room:compiler:1.1.1'
+    androidTestImplementation 'android.arch.persistence.room:testing:1.1.1'
+
+    // Timber
+    implementation 'com.jakewharton.timber:timber:4.7.0'
 
     // Local unit tests
     testImplementation 'junit:junit:4.12'
 
     // Instrumented unit tests
     androidTestImplementation "com.android.support:support-annotations:${supportLibVersion}"
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
 }
 
 tasks.withType(Test) {

android_app/app/schemas/com.health.openscale.core.database.AppDatabase/2.json

@@ -57,7 +57,7 @@
             "notNull": true
           },
           {
-            "fieldPath": "lbw",
+            "fieldPath": "lbm",
             "columnName": "lbw",
             "affinity": "REAL",
             "notNull": true