remove pro and light version updated for releasing openScale 2.5.4 oss version

.gitignore

@@ -1,6 +1,7 @@
 # Built application files
 *.apk
 *.ap_
+*.abb
 
 # Files for the Dalvik VM
 *.dex

android_app/app/build.gradle

@@ -8,8 +8,8 @@ android {
         testApplicationId "com.health.openscale.test"
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 65
-        versionName "2.5.3"
+        versionCode 66
+        versionName "2.5.4"
 
         manifestPlaceholders = [
                 appIcon: "@drawable/ic_launcher_openscale",
@@ -50,39 +50,21 @@ android {
             }
         }
 
-        light {
-            def keystoreLightPropertiesFile = rootProject.file("../../openScale_light.keystore")
-            def keystoreLightProperties = new Properties()
+        oss {
+            def keystoreOSSPropertiesFile = rootProject.file("../../openScale_oss.keystore")
+            def keystoreOSSProperties = new Properties()
             try {
-                keystoreLightProperties.load(new FileInputStream(keystoreLightPropertiesFile))
+                keystoreOSSProperties.load(new FileInputStream(keystoreOSSPropertiesFile))
             }
             catch (FileNotFoundException e) {
-                keystoreLightProperties = null;
+                keystoreOSSProperties = null;
             }
 
-            if (keystoreLightProperties != null) {
-                storeFile file(rootDir.getCanonicalPath() + '/' + keystoreLightProperties['releaseKeyStore'])
-                keyAlias keystoreLightProperties['releaseKeyAlias']
-                keyPassword keystoreLightProperties['releaseKeyPassword']
-                storePassword keystoreLightProperties['releaseStorePassword']
-            }
-        }
-
-        pro {
-            def keystoreProPropertiesFile = rootProject.file("../../openScale_pro.keystore")
-            def keystoreProProperties = new Properties()
-            try {
-                keystoreProProperties.load(new FileInputStream(keystoreProPropertiesFile))
-            }
-            catch (FileNotFoundException e) {
-                keystoreProProperties = null;
-            }
-
-            if (keystoreProProperties != null) {
-                storeFile file(rootDir.getCanonicalPath() + '/' + keystoreProProperties['releaseKeyStore'])
-                keyAlias keystoreProProperties['releaseKeyAlias']
-                keyPassword keystoreProProperties['releaseKeyPassword']
-                storePassword keystoreProProperties['releaseStorePassword']
+            if (keystoreOSSProperties != null) {
+                storeFile file(rootDir.getCanonicalPath() + '/' + keystoreOSSProperties['releaseKeyStore'])
+                keyAlias keystoreOSSProperties['releaseKeyAlias']
+                keyPassword keystoreOSSProperties['releaseKeyPassword']
+                storePassword keystoreOSSProperties['releaseStorePassword']
             }
         }
     }
@@ -104,29 +86,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             signingConfig signingConfigs.release
         }
-        light {
+        oss {
             archivesBaseName = "openScale-"+defaultConfig.versionName
-            manifestPlaceholders = [
-                    appIcon: "@drawable/ic_launcher_openscale_light",
-                    appIconRound: "@mipmap/ic_launcher_openscale_light_round"
-            ]
-            applicationIdSuffix ".light"
-            versionNameSuffix "-light"
+            applicationIdSuffix ".oss"
+            versionNameSuffix "-oss"
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            signingConfig signingConfigs.light
-        }
-        pro {
-            archivesBaseName = "openScale-"+defaultConfig.versionName
-            manifestPlaceholders = [
-                    appIcon: "@drawable/ic_launcher_openscale_pro",
-                    appIconRound: "@mipmap/ic_launcher_openscale_pro_round"
-            ]
-            applicationIdSuffix ".pro"
-            versionNameSuffix "-pro"
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            signingConfig signingConfigs.pro
+            signingConfig signingConfigs.oss
         }
     }
     compileOptions {

android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java

@@ -242,16 +242,6 @@ public class MainActivity extends AppCompatActivity
 
         navigationBottomView.setSelectedItemId(prefs.getInt("lastFragmentId", R.id.nav_overview));
 
-        if (BuildConfig.BUILD_TYPE == "light") {
-            ImageView launcherIcon = navigationView.getHeaderView(0).findViewById(R.id.profileImageView);
-            launcherIcon.setImageResource(R.drawable.ic_launcher_openscale_light);
-            navigationView.getMenu().findItem(R.id.nav_donation).setVisible(false);
-        } else if (BuildConfig.BUILD_TYPE == "pro") {
-            ImageView launcherIcon = navigationView.getHeaderView(0).findViewById(R.id.profileImageView);
-            launcherIcon.setImageResource(R.drawable.ic_launcher_openscale_pro);
-            navigationView.getMenu().findItem(R.id.nav_donation).setVisible(false);
-        }
-
         if (prefs.getBoolean("firstStart", true)) {
             Intent appIntroIntent = new Intent(this, AppIntroActivity.class);
             startActivityForResult(appIntroIntent, APPINTRO_REQUEST);
@@ -555,21 +545,6 @@ public class MainActivity extends AppCompatActivity
     }
 
     private void invokeConnectToBluetoothDevice() {
-        if (BuildConfig.BUILD_TYPE == "light") {
-            AlertDialog infoDialog = new AlertDialog.Builder(this)
-                .setMessage(Html.fromHtml(getResources().getString(R.string.label_upgrade_to_openScale_pro) + "<br><br> <a href=\"https://play.google.com/store/apps/details?id=com.health.openscale.pro\">Install openScale pro version</a>"))
-                .setPositiveButton(getResources().getString(R.string.label_ok), null)
-                .setIcon(R.drawable.ic_launcher_openscale_light)
-                .setTitle("openScale " + BuildConfig.VERSION_NAME)
-                .create();
-
-            infoDialog.show();
-
-            ((TextView)infoDialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
-
-            return;
-        }
-
         final OpenScale openScale = OpenScale.getInstance();
 
         if (openScale.getSelectedScaleUserId() == -1) {

android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml

@@ -1,81 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group android:scaleX="0.15877852"
-        android:scaleY="0.15877852"
-        android:translateX="16.74"
-        android:translateY="16.74">
-        <path
-            android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
-            android:strokeWidth="3"
-            android:fillColor="#33b6ea"
-            android:strokeColor="#00000000"/>
-        <path
-            android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"
-            android:fillColor="#33b6ea"/>
-        <path
-            android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"
-            android:fillColor="#303C42"/>
-        <path
-            android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"
-            android:fillColor="#F2F2F2"/>
-        <path
-            android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:startY="129.01874"
-                    android:startX="231.57214"
-                    android:endY="440.8289"
-                    android:endX="566.51764"
-                    android:type="linear">
-                    <item android:offset="0" android:color="#19000000"/>
-                    <item android:offset="1" android:color="#00000000"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:startY="108.81792"
-                    android:startX="-35.247547"
-                    android:endY="360.55725"
-                    android:endX="504.58307"
-                    android:type="linear">
-                    <item android:offset="0" android:color="#33FFFFFF"/>
-                    <item android:offset="1" android:color="#00FFFFFF"/>
-                </gradient>
-            </aapt:attr>
-        </path>
-        <path
-            android:pathData="M79.047,305.33h199.064v97.59h-199.064z"
-            android:strokeLineJoin="bevel"
-            android:strokeWidth="7.37556124"
-            android:fillColor="#99cc00"
-            android:strokeColor="#99cc00"
-            android:strokeLineCap="round"/>
-        <path
-            android:pathData="M87.832,321.199L100.884,321.199L100.884,377.928L87.832,377.928Z"
-            android:fillColor="#ffffff"
-            android:strokeColor="#00000000"/>
-        <path
-            android:pathData="M113.498,337.095L126.551,337.095L126.551,377.928L113.498,377.928ZM113.498,321.199L126.551,321.199v10.646L113.498,331.845Z"
-            android:fillColor="#ffffff"
-            android:strokeColor="#00000000"/>
-        <path
-            android:pathData="m166.946,371.001q-2.698,3.573 -5.943,5.25 -3.245,1.677 -7.51,1.677 -7.474,0 -12.359,-5.87 -4.885,-5.906 -4.885,-15.021 0,-9.151 4.885,-14.984 4.885,-5.87 12.359,-5.87 4.266,0 7.51,1.677 3.245,1.677 5.943,5.286v-6.052h13.125v36.714q0,9.844 -6.234,15.021 -6.198,5.214 -18.01,5.214 -3.828,0 -7.401,-0.583 -3.573,-0.583 -7.182,-1.786v-10.172q3.427,1.969 6.708,2.917 3.281,0.984 6.599,0.984 6.417,0 9.406,-2.807 2.99,-2.807 2.99,-8.786zM158.342,345.59q-4.047,0 -6.307,2.99 -2.26,2.99 -2.26,8.458 0,5.615 2.188,8.531 2.188,2.88 6.38,2.88 4.083,0 6.344,-2.99 2.26,-2.99 2.26,-8.422 0,-5.469 -2.26,-8.458 -2.26,-2.99 -6.344,-2.99z"
-            android:fillColor="#ffffff"
-            android:strokeColor="#00000000"/>
-        <path
-            android:pathData="m233.738,353.064v24.865h-13.125v-4.047,-14.911q0,-5.359 -0.255,-7.365 -0.219,-2.005 -0.802,-2.953 -0.766,-1.276 -2.078,-1.969 -1.313,-0.729 -2.99,-0.729 -4.083,0 -6.417,3.172 -2.333,3.135 -2.333,8.714L205.738,377.928L192.686,377.928v-56.729h13.052v21.875q2.953,-3.573 6.271,-5.25 3.318,-1.714 7.328,-1.714 7.073,0 10.719,4.339 3.682,4.339 3.682,12.615z"
-            android:fillColor="#ffffff"
-            android:strokeColor="#00000000"/>
-        <path
-            android:pathData="m260.17,325.501v11.594h13.453v9.333h-13.453v17.318q0,2.844 1.13,3.865 1.13,0.984 4.484,0.984h6.708v9.333h-11.193q-7.729,0 -10.974,-3.208 -3.208,-3.245 -3.208,-10.974L247.118,346.428h-6.49v-9.333h6.49v-11.594z"
-            android:fillColor="#ffffff"
-            android:strokeColor="#00000000"/>
-    </group>
-</vector>

android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml

@@ -1,73 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="0.15877852"
-      android:scaleY="0.15877852"
-      android:translateX="16.74"
-      android:translateY="16.74">
-    <path
-        android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z"
-        android:strokeWidth="3"
-        android:fillColor="#33b6ea"
-        android:strokeColor="#00000000"/>
-    <path
-        android:pathData="m458.444,435.591c0,12.322 -10.075,22.352 -22.452,22.352l-404.138,0c-12.377,0 -22.452,-10.03 -22.452,-22.352l0,-402.348c0,-12.322 10.075,-22.352 22.452,-22.352l404.138,0c12.377,0 22.452,10.03 22.452,22.352l0,402.348z"
-        android:fillColor="#33b6ea"/>
-    <path
-        android:pathData="M234.667,64c-51.281,0 -99.5,19.969 -135.76,56.24c-4.167,4.167 -4.167,10.917 0,15.083l60.333,60.333c4.167,4.167 10.917,4.167 15.083,0c33.271,-33.271 87.417,-33.271 120.688,0c2.083,2.083 4.813,3.125 7.542,3.125s5.458,-1.042 7.542,-3.125l60.333,-60.333c4.167,-4.167 4.167,-10.917 0,-15.083C334.167,83.969 285.948,64 234.667,64z"
-        android:fillColor="#303C42"/>
-    <path
-        android:pathData="M302.177,173.406c-19.563,-16.021 -43.542,-24.031 -67.51,-24.031c-10.073,0 -20.078,1.741 -29.826,4.57l-13.799,-30.362c-2.417,-5.354 -8.729,-7.75 -14.125,-5.292c-5.365,2.438 -7.729,8.76 -5.292,14.125l13.361,29.395c-6.214,3.271 -12.236,7.013 -17.829,11.595L121.76,128.01c31.198,-27.604 70.896,-42.677 112.906,-42.677s81.708,15.073 112.906,42.677L302.177,173.406z"
-        android:fillColor="#F2F2F2"/>
-    <path
-        android:pathData="m471.303,396.814 l0.519,-184.642 -101.944,-92.793 -0.714,0.125c1.391,3.697 0.633,8.116 -2.389,11.287l-59.918,62.867c-2.069,2.17 -4.78,3.337 -7.49,3.467 -2.71,0.131 -4.717,-2.181 -6.787,-4.152 -33.042,-31.487 -90.502,-30.972 -123.544,3.696 -2.999,3.147 -6.107,0.56 -9.848,-0.61 69.563,63.97 204.795,194.348 281.942,273.248 19.432,-22.652 51.932,66.551 24.548,-85.533 -1.877,-10.424 6.146,46.77 6.146,35.079z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:startY="129.01874"
-            android:startX="231.57214"
-            android:endY="440.8289"
-            android:endX="566.51764"
-            android:type="linear">
-          <item android:offset="0" android:color="#19000000"/>
-          <item android:offset="1" android:color="#00000000"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M426.667,0h-384C19.135,0 0,19.135 0,42.667v384c0,23.531 19.135,42.667 42.667,42.667h384c23.531,0 42.667,-19.135 42.667,-42.667v-384C469.333,19.135 450.198,0 426.667,0z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:startY="108.81792"
-            android:startX="-35.247547"
-            android:endY="360.55725"
-            android:endX="504.58307"
-            android:type="linear">
-          <item android:offset="0" android:color="#33FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M57.954,299.002h199.064v97.59h-199.064z"
-        android:strokeLineJoin="bevel"
-        android:strokeWidth="7.37556124"
-        android:fillColor="#ff4444"
-        android:strokeColor="#ff4444"
-        android:strokeLineCap="round"/>
-    <path
-        android:pathData="m106.509,358.663v21.438L93.457,380.101v-56.365h13.052v5.979q2.698,-3.573 5.979,-5.25 3.281,-1.714 7.547,-1.714 7.547,0 12.396,6.016 4.849,5.979 4.849,15.422 0,9.443 -4.849,15.458 -4.849,5.979 -12.396,5.979 -4.266,0 -7.547,-1.677 -3.281,-1.714 -5.979,-5.286zM115.186,332.231q-4.193,0 -6.453,3.099 -2.224,3.063 -2.224,8.859 0,5.797 2.224,8.896 2.26,3.063 6.453,3.063 4.193,0 6.38,-3.063 2.224,-3.063 2.224,-8.896 0,-5.833 -2.224,-8.896 -2.187,-3.062 -6.38,-3.062z"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"/>
-    <path
-        android:pathData="m177.311,334.856q-1.714,-0.802 -3.427,-1.167 -1.677,-0.401 -3.391,-0.401 -5.031,0 -7.766,3.245 -2.698,3.208 -2.698,9.224v18.813h-13.052v-40.833h13.052v6.708q2.516,-4.01 5.76,-5.833 3.281,-1.859 7.839,-1.859 0.656,0 1.422,0.073 0.766,0.036 2.224,0.219z"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"/>
-    <path
-        android:pathData="m203.306,332.085q-4.339,0 -6.635,3.135 -2.26,3.099 -2.26,8.969 0,5.87 2.26,9.005 2.297,3.099 6.635,3.099 4.266,0 6.526,-3.099 2.26,-3.135 2.26,-9.005 0,-5.87 -2.26,-8.969 -2.26,-3.135 -6.526,-3.135zM203.306,322.752q10.536,0 16.443,5.688 5.943,5.688 5.943,15.75 0,10.063 -5.943,15.75 -5.906,5.688 -16.443,5.688 -10.573,0 -16.552,-5.688 -5.943,-5.688 -5.943,-15.75 0,-10.063 5.943,-15.75 5.979,-5.688 16.552,-5.688z"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"/>
-  </group>
-</vector>

android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/seed"/>
-    <foreground android:drawable="@drawable/ic_launcher_openscale_light"/>
-    <monochrome android:drawable="@drawable/ic_notification_openscale_monochrome"/>
-</adaptive-icon>

android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/seed"/>
-    <foreground android:drawable="@drawable/ic_launcher_openscale_pro"/>
-    <monochrome android:drawable="@drawable/ic_notification_openscale_monochrome"/>
-</adaptive-icon>

android_app/app/src/main/res/values-ar/strings.xml

@@ -227,7 +227,6 @@
     <string name="permission_location_service_info">امنح الوصول إلى الموقع الجغرافي في إعدادات أندرويد للبحث عن أجهزة بلوتوث. يمكنك الإلغائ بعد ذلك.</string>
     <string name="amputation_level_none">لا بتر</string>
     <string name="amputation_level_foot">قدم</string>
-    <string name="label_upgrade_to_openScale_pro">يرجى الترقية إلى أوبن سكيل برو لدعم البلوتوث</string>
     <string name="label_slide_privacy_main_text">لا يرسل openScale أي بيانات إلى سحابة وعدم وجود إذن للوصول إلى الإنترنت هو ضمان قوي لذلك.
 \n
 \nإذا كنت تريد حقا مزامنة وزنك مع GoogleFit أو مع MQTT ، فيمكنك تثبيت <a href="https://play.google.com/store/apps/details?id=com.health.openscale.sync"> openScale sync </a>.</string>

android_app/app/src/main/res/values-ca/strings.xml

@@ -217,7 +217,6 @@
     <string name="activity_level_moderate">Moderat</string>
     <string name="activity_level_heavy">Intens</string>
     <string name="activity_level_extreme">Extrem</string>
-    <string name="label_upgrade_to_openScale_pro">Actualitzeu a openScale pro per a obtenir suport de Bluetooth</string>
     <string name="action_donation">Donació</string>
     <string name="info_scale_low_battery">Nivell de bateria baix (%d%%), carregueu la bateria o canvieu les piles de la bàscula</string>
     <string name="info_bluetooth_connection_error_scale_offline">No s’ha pogut connectar amb la bàscula, assegureu-vos que està engegada.</string>

android_app/app/src/main/res/values-cs/strings.xml

@@ -253,7 +253,6 @@
     <string name="label_y_axis">Osa Y</string>
     <string name="amputation_level_lower_leg_foot">Dolní část nohy a chodidlo</string>
     <string name="label_slide_metrics_top_text">Sledujte a analyzujte své tělesné údaje.</string>
-    <string name="label_upgrade_to_openScale_pro">Pro podporu Bluetooth prosím upgradujte na openScale pro</string>
     <string name="label_slide_user_top_text">Podpora více uživatelů.</string>
     <string name="amputation_level_foot">Chodidlo</string>
     <string name="app_intro_next_button">Dále</string>

android_app/app/src/main/res/values-de/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_measurement_bar">Messwertanzeige</string>
     <string name="permission_location_service_info">Gewährleisten Sie den Standortzugriff in den Android-Einstellungen, um nach Bluetooth-Geräten zu suchen. Sie können es anschließend wieder widerrufen.</string>
     <string name="label_is_on_right_axis">Auf der rechten Achse</string>
-    <string name="label_upgrade_to_openScale_pro">Bitte upgraden Sie auf openScale pro für Bluetooth-Unterstützung</string>
     <string name="action_donation">Spende</string>
     <string name="info_scale_low_battery">Niedriger Batteriestand (%d%%), bitte aufladen oder Batterien der Waage austauschen</string>
     <string name="info_bluetooth_connection_error_scale_offline">Keine Verbindung zur Waage, bitte prüfen Sie, ob Ihre Waage eingeschaltet ist.</string>

android_app/app/src/main/res/values-el/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_measurement_bar">Μπάρα μέτρησης</string>
     <string name="permission_location_service_info">Χορηγήστε πρόσβαση τοποθεσίας στις ρυθμίσεις του Android για να ψάχνει συσκευές Bluetooth. Προαιρετικά ανακαλέστε το μεταγενέστερα.</string>
     <string name="label_is_on_right_axis">Είναι στον δεξιό άξονα</string>
-    <string name="label_upgrade_to_openScale_pro">Παρακαλώ αναβαθμίστε σε openScale pro για υποστήριξη Bluetooth</string>
     <string name="action_donation">Δωρεά</string>
     <string name="info_scale_low_battery">Χαμηλό επίπεδο μπαταρίας (%d%%), παρακαλώ φορτίστε ή αλλάξτε τις μπαταρίες της ζυγαριάς</string>
     <string name="info_bluetooth_connection_error_scale_offline">Δεν μπορεί να γίνει σύνδεση με την ζυγαριά, παρακαλώ σιγουρευτείτε ότι είναι αναμμένη.</string>

android_app/app/src/main/res/values-es/strings.xml

@@ -217,7 +217,6 @@
     <string name="permission_location_service_info">Otorgue acceso a la ubicación en la configuración de Android para buscar dispositivos Bluetooth. Opcionalmente puede revocarlo después.</string>
     <string name="label_is_on_right_axis">Está en el eje derecho</string>
     <string name="label_calories">Calorías</string>
-    <string name="label_upgrade_to_openScale_pro">Cambie a la versión Pro de openScale para obtener la prestación de Bluetooth</string>
     <string name="action_donation">Donación</string>
     <string name="info_scale_low_battery">Queda poca energía (%d%%); recargue o sustituya las baterías de la báscula</string>
     <string name="info_bluetooth_connection_error_scale_offline">No se pudo conectar con la báscula; asegúrese de que está encendida.</string>

android_app/app/src/main/res/values-fi/strings.xml

@@ -28,7 +28,6 @@
     <string name="label_slide_privacy_top_text">Suojaa henkilökohtaiset terveystietosi.</string>
     <string name="label_slide_welcome_top_text">Tervetuloa
 \nopenScaleen</string>
-    <string name="label_upgrade_to_openScale_pro">Ole hyvä ja päivitä openScale pro-versioon saadaksesi Bluetoorh-tuen</string>
     <string name="activity_level_extreme">Äärimmäinen</string>
     <string name="activity_level_mild">Vähäinen</string>
     <string name="activity_level_moderate">Keskiverto</string>

android_app/app/src/main/res/values-fr/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_measurement_bar">Barre des mesures</string>
     <string name="permission_location_service_info">Autoriser l’accès à la location pour rechercher des dispositifs Bluetooth. Cette permissions peut être révoquée par la suite.</string>
     <string name="label_is_on_right_axis">Est sur l’axe de droite</string>
-    <string name="label_upgrade_to_openScale_pro">Veuillez mettre à niveau vers openScale pro pour la prise en charge du Bluetooth</string>
     <string name="action_donation">Don</string>
     <string name="app_intro_back_button">Précédent</string>
     <string name="app_intro_next_button">Suivant</string>

android_app/app/src/main/res/values-gl/strings.xml

@@ -212,7 +212,6 @@
     <string name="label_slide_welcome_main_text">Un programa de código aberto para o control de peso e medidas corporais, compatible con básculas Bluetooth.</string>
     <string name="label_slide_welcome_top_text">Benvido a
 \nopenScale</string>
-    <string name="label_upgrade_to_openScale_pro">Por favor actualice a openScale pro para ter soporte para Bluetooth</string>
     <string name="activity_level_extreme">Extremo</string>
     <string name="activity_level_heavy">Intenso</string>
     <string name="activity_level_moderate">Moderado</string>

android_app/app/src/main/res/values-hr/strings.xml

@@ -235,7 +235,6 @@
     <string name="label_slide_welcome_main_text">Softver otvorenog koda za praćenje težine i tjelesne metrike, s Bluetooth podrškom za vagu.</string>
     <string name="label_slide_welcome_top_text">Dobro došli u
 \nopenScale</string>
-    <string name="label_upgrade_to_openScale_pro">Nadogradi na „openScale pro” za Bluetooth podršku</string>
     <string name="label_calories">Kalorije</string>
     <string name="label_is_on_right_axis">Na desnoj osi</string>
     <string name="permission_read_write_data_label">Čitaj/zapiši openScale podatke</string>

android_app/app/src/main/res/values-hu/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_year_view">Éves nézet</string>
     <string name="label_measurement_bar">Mérési sáv</string>
     <string name="label_is_on_right_axis">A jobb oldali tengelyen</string>
-    <string name="label_upgrade_to_openScale_pro">Kérem frissítsen az openScale Pro-ra a Bluetooth támogatáshoz</string>
     <string name="action_donation">Támogatás</string>
     <string name="label_empty">üres</string>
     <string name="label_slide_welcome_main_text">Nyílt forráskódú szoftver, súly- és testmérések nyomon követése, Bluetooth mérleg támogatással.</string>

android_app/app/src/main/res/values-id/strings.xml

@@ -144,7 +144,6 @@
     <string name="label_slide_user_main_text">Anda tidak perlu membuat akun online untuk menggunakan openScale.
 \n
 \nMetrik tubuh dihitung dari pengukuran.</string>
-    <string name="label_upgrade_to_openScale_pro">Silakan upgrade ke openScale pro untuk dukungan Bluetooth</string>
     <string name="activity_level_mild">Ringan</string>
     <string name="activity_level_moderate">Sedang</string>
     <string name="label_smartUserAssign">Penugasan Pengguna Cerdas</string>

android_app/app/src/main/res/values-it/strings.xml

@@ -221,7 +221,6 @@
     <string name="label_calories">Calorie</string>
     <string name="activity_level_extreme">Estremo</string>
     <string name="activity_level_heavy">Importante</string>
-    <string name="label_upgrade_to_openScale_pro">Passa alla versione pro se vuoi utilizzare il protocollo Bluetooth</string>
     <string name="label_slide_privacy_top_text">Proteggi i tuoi dati sanitari personali.</string>
     <string name="label_slide_welcome_main_text">Software open-source per la rilevazione del peso e delle metriche corporee, con supporto per la bilancia Bluetooth.</string>
     <string name="label_slide_welcome_top_text">Benvenuti su

android_app/app/src/main/res/values-iw/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_year_view">תצוגה שנתית</string>
     <string name="label_measurement_bar">סרגל מדידה</string>
     <string name="label_is_on_right_axis">בציר הימני</string>
-    <string name="label_upgrade_to_openScale_pro">נא לשדרג לגרסה המקצועית של openScale לתמיכה ב־Bluetooth</string>
     <string name="action_donation">תרומה</string>
     <string name="info_scale_low_battery">עצמת הסוללה נמוכה (%d%%), נא להטעין או להחליף את הסוללות של המשקל</string>
     <string name="info_bluetooth_connection_error_scale_offline">לא ניתן להתחבר למשקל, נא לוודא שהוא פעיל.</string>

android_app/app/src/main/res/values-ja/strings.xml

@@ -218,7 +218,6 @@
     <string name="label_year_view">年表示</string>
     <string name="label_measurement_bar">測定バー</string>
     <string name="label_is_on_right_axis">右軸上に</string>
-    <string name="label_upgrade_to_openScale_pro">Bluetooth に対応するには、openScale pro にアップグレードしてください</string>
     <string name="info_scale_low_battery">電池の残量が少なくなっています (%d%%)、体重計の電池を充電または交換してください</string>
     <string name="info_bluetooth_connection_error_scale_offline">体重計に接続できませんでした。オンになっていることを確認してください。</string>
     <string name="label_age">年齢</string>

android_app/app/src/main/res/values-nb/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_year_view">Årsvisning</string>
     <string name="label_measurement_bar">Målestav</string>
     <string name="label_is_on_right_axis">Er på høyre akse</string>
-    <string name="label_upgrade_to_openScale_pro">Oppgrader til openScare pro for Blåtannsstøtte</string>
     <string name="action_donation">Donasjon</string>
     <string name="label_empty">tom</string>
     <string name="label_age">Alder</string>

android_app/app/src/main/res/values-nl/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_measurement_bar">Meetlat</string>
     <string name="permission_location_service_info">Verleen toegang tot je locatie in de Android-instellingen om te zoeken naar Bluetooth-apparaten. Dit kun je achteraf evt. weer intrekken.</string>
     <string name="label_is_on_right_axis">Staat op de rechteras</string>
-    <string name="label_upgrade_to_openScale_pro">Upgrade naar openScale Pro om Bluetooth-ondersteuning toe te voegen</string>
     <string name="action_donation">Doneren</string>
     <string name="info_scale_low_battery">Laag batterijniveau (%d%%) - verwissel de batterijen</string>
     <string name="info_bluetooth_connection_error_scale_offline">Kan niet verbinden met de weegschaal. Controleer of deze aanstaat.</string>

android_app/app/src/main/res/values-pl/strings.xml

@@ -217,7 +217,6 @@
     <string name="permission_location_service_info">Zezwól na dostęp do lokalizacji w ustawieniach Androida, aby wyszukać urządzenia Bluetooth. Możesz je potem wyłączyć.</string>
     <string name="label_measurement_bar">Pasek pomiarowy</string>
     <string name="label_is_on_right_axis">Jest na prawej osi</string>
-    <string name="label_upgrade_to_openScale_pro">Zaktualizuj system do openScale pro w celu obsługi Bluetooth</string>
     <string name="action_donation">Wspomóż</string>
     <string name="info_scale_low_battery">Niski poziom baterii (%d%%), naładuj lub wymień baterie wagi</string>
     <string name="info_bluetooth_connection_error_scale_offline">Nie można połączyć się z wagą, upewnij się, że jest włączona.</string>

android_app/app/src/main/res/values-pt-rBR/strings.xml

@@ -229,7 +229,6 @@
     <string name="label_caliper2_male">Dobra cutânea abdominais</string>
     <string name="amputation_level_lower_leg_foot">Perna e pé</string>
     <string name="amputation_level_leg">Perna</string>
-    <string name="label_upgrade_to_openScale_pro">Para utilizar a função Bluetooth, por favor, atualize para a versão openScale pro</string>
     <string name="app_intro_skip_button">Pular</string>
     <string name="app_intro_next_button">Próximo</string>
     <string name="app_intro_back_button">Voltar</string>

android_app/app/src/main/res/values-pt/strings.xml

@@ -210,7 +210,6 @@
     <string name="label_development">Desenvolvimento</string>
     <string name="label_debug_log">Guardar registo de depuração para um ficheiro</string>
     <string name="amputation_level_arm">Braço</string>
-    <string name="label_upgrade_to_openScale_pro">Por favor, atualize para openScale pro para suporte a Bluetooth</string>
     <string name="amputation_level_foot">Pé</string>
     <string name="label_slide_welcome_top_text">Bem-vindo ao
 \nopenScale</string>

android_app/app/src/main/res/values-ru/strings.xml

@@ -217,7 +217,6 @@
     <string name="label_year_view">За год</string>
     <string name="label_measurement_bar">Панель метрик</string>
     <string name="label_is_on_right_axis">на правой оси</string>
-    <string name="label_upgrade_to_openScale_pro">Пожалуйста, обновите до openScale Pro для подддержки Bluetooth</string>
     <string name="action_donation">Пожертвование</string>
     <string name="app_intro_done_button">Готово</string>
     <string name="app_intro_back_button">Назад</string>

android_app/app/src/main/res/values-sk/strings.xml

@@ -208,7 +208,6 @@
 \n
 \nPodržte tlačidlo na spodnej časti váhy pre prepnutie do režimu párovania, a pripojte sa znovu pre získanie hesla zariadenia.</string>
     <string name="label_is_on_right_axis">Je na pravej osi</string>
-    <string name="label_upgrade_to_openScale_pro">Pre podporu Bluetooth inovujte na openScale pro</string>
     <string name="label_age">Vek</string>
     <string name="label_slide_welcome_top_text">Vitajte v
 \nopenScale</string>

android_app/app/src/main/res/values-sl/strings.xml

@@ -235,7 +235,6 @@
     <string name="label_enable_legend">Legenda grafa</string>
     <string name="info_step_on_scale">Prosim, stopi bos/-a na tehtnico</string>
     <string name="permission_location_service_info">Za iskanje naprav Bluetooth v nastavitvah sistema Android omogoči dostop do lokacije. Po želji ga nato lahko prekličeš.</string>
-    <string name="label_upgrade_to_openScale_pro">Za podporo Bluetooth nadgradi na openScale pro</string>
     <string name="label_slide_opensource_top_text">Gre za odprtokodno programsko opremo z visoko stopnjo preglednosti.</string>
     <string name="label_slide_metrics_main_text">openScale podpira več kot 22 telesnih podatkov.\n\nNastavi ga tako, da prikazuje tiste, ki te zanimajo.\n\nČe manjka telesna maščoba, vsebnost vode in čvrsta telesna masa, jih lahko oceniš na podlagi <a href="https://github.com/oliexdev/openScale/wiki/Body-metric-estimations">znanstvenih publikacij</a>.</string>
     <string name="permission_read_write_data_label">Branje/pisanje podatkov openScale</string>

android_app/app/src/main/res/values-sv/strings.xml

@@ -208,7 +208,6 @@
 \n
 \nAnslut igen för att hämta mätdata.</string>
     <string name="label_calories">Kalorier</string>
-    <string name="label_upgrade_to_openScale_pro">Vänligen uppgradera till openScale pro för Bluetooth-stöd</string>
     <string name="action_donation">Donation</string>
     <string name="label_age">Ålder</string>
     <string name="label_empty">tom</string>

android_app/app/src/main/res/values-ta/strings.xml

@@ -126,7 +126,6 @@
     <string name="label_bluetooth_searching">உங்கள் ப்ளூடூத் அளவானை தேடுகிறது</string>
     <string name="label_bluetooth_searching_finished">தேடல் முடிந்தது</string>
     <string name="label_contribute_translation">மொழியாக்கத்தில் பங்கேற்க</string>
-    <string name="label_upgrade_to_openScale_pro">ஊடலை ஆதரவுக்காக ஓபன்ச்கேல் புரோவுக்கு மேம்படுத்தவும்</string>
     <string name="app_intro_skip_button">தவிர்</string>
     <string name="label_share_subject">ஓபன்ச்கேல் தரவு ஏற்றுமதி (%s)</string>
     <string name="error_max_scale_users">அதிகபட்சம். ஒரே நேரத்தில் அளவிலான பயனர்களின் எண்ணிக்கை</string>

android_app/app/src/main/res/values-tr/strings.xml

@@ -217,7 +217,6 @@
     <string name="permission_location_service_info">Bluetooth aygıtlarını aramak için Android ayarlarından konum erişim izni verin. İsteğe bağlı olarak daha sonra iptal edebilirsiniz.</string>
     <string name="label_is_on_right_axis">Sağ eksende</string>
     <string name="label_calories">Kaloriler</string>
-    <string name="label_upgrade_to_openScale_pro">Bluetooth desteği için openScale paralı sürüme yükseltin</string>
     <string name="action_donation">Bağış</string>
     <string name="info_scale_low_battery">Düşük pil düzeyi (%d%%), lütfen tartının pilini değiştirin veya doldurun</string>
     <string name="info_bluetooth_connection_error_scale_offline">Tartı ile bağlantı kurulamıyor, lütfen açık olduğundan emin olun.</string>

android_app/app/src/main/res/values-uk/strings.xml

@@ -215,7 +215,6 @@
     <string name="activity_level_moderate">Середній</string>
     <string name="activity_level_heavy">Інтенсивний</string>
     <string name="activity_level_extreme">Екстремальний</string>
-    <string name="label_upgrade_to_openScale_pro">Оновіться до openScale pro версії для підтримки Bluetooth</string>
     <string name="action_donation">Підтримати</string>
     <string name="label_measurement_bar">Панель вимірювань</string>
     <string name="label_is_on_right_axis">На вісі праворуч</string>

android_app/app/src/main/res/values-zh-rCN/strings.xml

@@ -44,7 +44,6 @@
     <string name="label_slide_welcome_main_text">带蓝牙秤支持的开源体重和身体指标跟踪软件。</string>
     <string name="label_slide_welcome_top_text">欢迎来到
 \nopenScale</string>
-    <string name="label_upgrade_to_openScale_pro">要获取蓝牙支持功能，请升级到openScale pro</string>
     <string name="amputation_level_leg">腿</string>
     <string name="amputation_level_lower_leg_foot">小腿和足</string>
     <string name="amputation_level_foot">脚</string>

android_app/app/src/main/res/values/strings.xml

@@ -256,7 +256,6 @@
     <string name="amputation_level_foot">Foot</string>
     <string name="amputation_level_lower_leg_foot">Lower leg and foot</string>
     <string name="amputation_level_leg">Leg</string>
-    <string name="label_upgrade_to_openScale_pro">Please upgrade to openScale pro for Bluetooth support</string>
     <string name="label_slide_welcome_top_text">Welcome to\nopenScale</string>
     <string name="label_slide_welcome_main_text">Open-source software weight and body metrics tracker, with Bluetooth scale support.</string>
     <string name="label_slide_privacy_top_text">Protect your personal health data.</string>

android_app/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,8 @@
-#Thu Nov 05 13:59:58 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip

android_app/gradlew

@@ -1,79 +1,130 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -82,83 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

android_app/gradlew.bat

@@ -1,4 +1,22 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -8,26 +26,30 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,54 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

fastlane/Fastfile

@@ -44,8 +44,8 @@ platform :android do
         )
     end
 
-    desc "Generate openScale light version"
-    lane :light do |options|
+    desc "Generate openScale oss version"
+    lane :oss do |options|
         gradle(
             task: "clean", 
             project_dir: 'android_app/'
@@ -53,12 +53,12 @@ platform :android do
         gradle(
             task: "assemble",
             project_dir: 'android_app/',
-            build_type: "Light"
+            build_type: "oss"
         )
     end
 
-    desc "Generate openScale pro version"
-    lane :pro do |options|
+    desc "Deploy a new openScale oss version to Google Play"
+    lane :deployOSS do
         gradle(
             task: "clean", 
             project_dir: 'android_app/'
@@ -66,47 +66,16 @@ platform :android do
         gradle(
             task: "assemble",
             project_dir: 'android_app/',
-            build_type: "Pro"
-        )
-    end
-
-    desc "Deploy a new openScale light version to Google Play"
-    lane :deployLight do
-        gradle(
-            task: "clean", 
-            project_dir: 'android_app/'
-        )
-        gradle(
-            task: "assemble",
-            project_dir: 'android_app/',
-            build_type: "Light"
+            build_type: "oss"
         )
         upload_to_play_store(
-            package_name: "com.health.openscale.light",
+            package_name: "com.health.openscale.oss",
             track: "production",
-            metadata_path: "fastlane/metadata/openScale_light/",
-            apk: "android_app/app/build/outputs/apk/light/openScale-#{versionName}-light.apk"
+            metadata_path: "fastlane/metadata/android/",
+            apk: "android_app/app/build/outputs/apk/oss/openScale-#{versionName}-oss.apk"
         )
     end
 
-    desc "Deploy a new openScale pro version to Google Play"
-    lane :deployPro do
-        gradle(
-            task: "clean", 
-            project_dir: 'android_app/'
-        )
-        gradle(
-            task: "assemble",
-            project_dir: 'android_app/',
-            build_type: "Pro"
-        )
-        upload_to_play_store(
-            package_name: "com.health.openscale.pro",
-            track: "production",
-            metadata_path: "fastlane/metadata/openScale_pro/",
-            apk: "android_app/app/build/outputs/apk/pro/openScale-#{versionName}-pro.apk"
-        )
-    end
 
     desc "Deploy a new version to GitHub"
     lane :deployGitHubRelease do

fastlane/metadata/openScale_light/en-GB/changelogs/48.txt

@@ -1,5 +0,0 @@
-* added an App introduction
-* added support for Soehnle Shape Sense scales
-* enhanced support for Yunmai scale
-* set CSV date format to ISO 8601:2004
-* fixed minor bugs

fastlane/metadata/openScale_light/en-GB/changelogs/49.txt

@@ -1,9 +0,0 @@
-- added support for Vigorun YG and Quanta QTBL10 scale
-- added fastlane support
-- integration of Androidx navigation component
-- replaced obsoleted preferences with Androidx preferences
-- replaced png file with svg files
-- integration of DayNight theme
-- use of live data to have always up-to-date measurements
-- added support for round launcher icons
-- fixed minor bug

fastlane/metadata/openScale_light/en-GB/changelogs/50.txt

@@ -1,11 +0,0 @@
-- added support for assisted weighing (e.g. for babies or pets)
-- additional support for people with amputations
-- added support for Vigorun YG and Quanta QTBL10 scale
-- added fastlane support
-- integration of Androidx navigation component
-- replaced obsoleted preferences with Androidx preferences
-- replaced png file with svg files
-- integration of DayNight theme
-- use of live data to have always up-to-date measurements
-- added support for round launcher icons
-- fixed minor bug

fastlane/metadata/openScale_light/en-GB/changelogs/51.txt

@@ -1,3 +0,0 @@
-- added support for Libra like trendlines
-- updated some translations
-- fixed minor bug

fastlane/metadata/openScale_light/en-GB/changelogs/52.txt

@@ -1,9 +0,0 @@
-Version 2.3.3
-- fixed background and image colour in dark mode
-- fixed a crash when selecting a Bluetooth device during the slideshow
-- fixed crash when disable and enable measurements with no data
-
-Version 2.3.2
-- added support for Libra like trendlines
-- updated some translations
-- fixed minor bug

fastlane/metadata/openScale_light/en-GB/changelogs/53.txt

@@ -1,4 +0,0 @@
-Version 2.3.4
-- fixed crash during startup if trendline is enabled
-- don't include zero measurements in the trendline calculation
-- catch error if context is lost during a Bluetooth search

fastlane/metadata/openScale_light/en-GB/changelogs/54.txt

@@ -1,2 +0,0 @@
-- shows converted values in graph
-- fixed crash when marker is selected and measurement is deslected

fastlane/metadata/openScale_light/en-GB/changelogs/55.txt

@@ -1,6 +0,0 @@
-- basic support for Beurer BF105, BF600, BF850, BF950 and Silvercrest SBF77
-- add support for OKOK 1.1 scales
-- bring muscle mass eval sheet to proper ranges
-- fix body fat calculation for 1 byone scales
-- added support for Hoffen BBS-8107 scale
-- minor bug fixes

fastlane/metadata/openScale_light/en-GB/changelogs/56.txt

@@ -1 +0,0 @@
-- set target version for compatibility to 29

fastlane/metadata/openScale_light/en-GB/changelogs/57.txt

@@ -1,2 +0,0 @@
-- fix for Android 12 Bluetooth permission
-- support for Beurer BF720

fastlane/metadata/openScale_light/en-GB/changelogs/58.txt

@@ -1 +0,0 @@
-- fixed for Android 12 installations errors and crashes

fastlane/metadata/openScale_light/en-GB/changelogs/59.txt

@@ -1 +0,0 @@
-- fixed for Android 12 backup errors and Bluetooth connection erros

fastlane/metadata/openScale_light/en-GB/changelogs/60.txt

@@ -1 +0,0 @@
-- fixed another bug for Android 12 Bluetooth connection error

fastlane/metadata/openScale_light/en-GB/changelogs/61.txt

@@ -1,3 +0,0 @@
-- add support for Sanita SBF72, Beurer BF720 and new 1byone scale
-- fixed reference user bug
-- fixed minor bugs

fastlane/metadata/openScale_light/en-GB/changelogs/62.txt

@@ -1,7 +0,0 @@
-- redesign overview, table and statistic fragements
-- overview shows every measurements in a recycler view
-- table has fix column and header and is vertical/horizontal scrollable
-- statistic fragment shows each measurement as a graph with average, minimum, maximum values depending on the last 7/30 days, all days, custom reference date or custom time range
-- goal can be disabled or enabled
-- support Sinocare CW286, Beurer BF915 bluetooth bathroom scale
-- fixed minor bugs

fastlane/metadata/openScale_light/en-GB/changelogs/63.txt

@@ -1,5 +0,0 @@
-- support for Huawei HiLink body scale
-- additional support for OKOK/Chipsea-BLE based scale
-- add notification permission support for Android 13
-- add support Android 13 custom backup folder (after an openScale update the backup folder needs to be set again!)
-- fixed minor bugs

fastlane/metadata/openScale_light/en-GB/changelogs/64.txt

@@ -1,3 +0,0 @@
-- switch to Material 3 theme
-- fixed some color issues
-- added simple moving average option

fastlane/metadata/openScale_light/en-GB/changelogs/65.txt

@@ -1,5 +0,0 @@
-- initial support for icomon bluetooth scale
-- support for nameless OKOK scales (Myria MY4836)
-- support for ES-26BB-B scale
-- support for AE-BS06 scale
-- fixed some button color issues

fastlane/metadata/openScale_light/en-GB/full_description.txt

@@ -1,39 +0,0 @@
-Monitor and track your weight, BMI, body fat, body water, muscle and other body metrics in an open source app that:
-* has an easy to use user interface with graphs,
-* doesn't require you to create an account,
-* can be configured to only show the metrics you care about, and
-* respects your privacy and lets you decide what to do with your data.
-
-<h2><b>Bluetooth scales (pro version)</b></h2>
-
-openScale has built-in support for a number of Bluetooth (BLE or "smart") scales from  many manufacturers, e.g. Beurer, Sanitas, Yunmai, Xiaomi, etc. (see model list below). Together with our users we constantly improve and extend the set of supported scales and in many cases pick up where the original app falls short.
-
-For scales without Bluetooth, or Bluetooth scales not (yet) supported by openScale, measurements can be manually entered in a quick and easy way.
-
-<b>Note:</b> Please install openScale pro version to enable Bluetooth support
-
-<h2><b>Privacy</b></h2>
-This app has no ads and requests no unnecessary permissions. The location permission is only needed to find a Bluetooth scale. Once found the permission can be revoked (or never granted if Bluetooth isn't used).
-
-<h2><b>Supported metrics</b></h2>
-Weight, BMI (body mass index), body water, muscle, LBM (lean body mass), body fat, bone mass, waist circumference, waist-to-height ratio, hip circumference, waist-hip ratio, visceral fat, chest circumference, thigh circumference, biceps circumference, neck circumference, body fat caliper, BMR (basal metabolic rate), TDEE (Total Daily Energy Expenditure) and Calories. Each entry can also have an optional comment.
-
-<b>Note:</b> don't worry if you think the list is too long: metrics you don't use can be disabled and hidden.
-
-<h2><b>Other features</b></h2>
-- Synchronize your weight to GoogleFit with openScale sync
-- Resizable widget to show the latest measurement on the home screen
-- Configure your weight unit: kg, lb or st
-- Set a goal to help keep your diet
-- Displays all your data on a chart and in a table to track your progress
-- Evaluates measurements and gives a quick visual feedback to show you if you're within or outside the recommended range given your age, sex, height etc.
-- Import or export your data from/into a CSV (comma separated value) file
-- Supports body fat, body water and lean body mass estimations based on scientific publications. Useful if your scale doesn't support those measurements.
-- Support for multiple users
-- Support for assisted weighing (e.g. for babies or pets)
-- Support for people with amputations
-- Partially or fully translated into more than 27 languages
-- Optional dark theme selectable
-
-<h2><b>Support</b></h2>
-If you find a bug, have an idea on how to improve openScale or have a question, please visit the openScale project page on GitHub: https://github.com/oliexdev/openScale

fastlane/metadata/openScale_light/en-GB/short_description.txt

@@ -1 +0,0 @@
-Open-source weight and body metrics tracker

fastlane/metadata/openScale_light/en-GB/title.txt

@@ -1 +0,0 @@
-openScale light

fastlane/metadata/openScale_pro/en-GB/changelogs/48.txt

@@ -1,5 +0,0 @@
-* added an App introduction
-* added support for Soehnle Shape Sense scales
-* enhanced support for Yunmai scale
-* set CSV date format to ISO 8601:2004
-* fixed minor bugs

fastlane/metadata/openScale_pro/en-GB/changelogs/49.txt

@@ -1,9 +0,0 @@
-- added support for Vigorun YG and Quanta QTBL10 scale
-- added fastlane support
-- integration of Androidx navigation component
-- replaced obsoleted preferences with Androidx preferences
-- replaced png file with svg files
-- integration of DayNight theme
-- use of live data to have always up-to-date measurements
-- added support for round launcher icons
-- fixed minor bug

fastlane/metadata/openScale_pro/en-GB/changelogs/50.txt

@@ -1,11 +0,0 @@
-- added support for assisted weighing (e.g. for babies or pets)
-- additional support for people with amputations
-- added support for Vigorun YG and Quanta QTBL10 scale
-- added fastlane support
-- integration of Androidx navigation component
-- replaced obsoleted preferences with Androidx preferences
-- replaced png file with svg files
-- integration of DayNight theme
-- use of live data to have always up-to-date measurements
-- added support for round launcher icons
-- fixed minor bug

fastlane/metadata/openScale_pro/en-GB/changelogs/51.txt

@@ -1,3 +0,0 @@
-- added support for Libra like trendlines
-- updated some translations
-- fixed minor bug

fastlane/metadata/openScale_pro/en-GB/changelogs/52.txt

@@ -1,9 +0,0 @@
-Version 2.3.3
-- fixed background and image colour in dark mode
-- fixed a crash when selecting a Bluetooth device during the slideshow
-- fixed crash when disable and enable measurements with no data
-
-Version 2.3.2
-- added support for Libra like trendlines
-- updated some translations
-- fixed minor bug

fastlane/metadata/openScale_pro/en-GB/changelogs/53.txt

@@ -1,4 +0,0 @@
-Version 2.3.4
-- fixed crash during startup if trendline is enabled
-- don't include zero measurements in the trendline calculation
-- catch error if context is lost during a Bluetooth search

fastlane/metadata/openScale_pro/en-GB/changelogs/54.txt

@@ -1,2 +0,0 @@
-- shows converted values in graph
-- fixed crash when marker is selected and measurement is deslected

fastlane/metadata/openScale_pro/en-GB/changelogs/55.txt

@@ -1,6 +0,0 @@
-- basic support for Beurer BF105, BF600, BF850, BF950 and Silvercrest SBF77
-- add support for OKOK 1.1 scales
-- bring muscle mass eval sheet to proper ranges
-- fix body fat calculation for 1 byone scales
-- added support for Hoffen BBS-8107 scale
-- minor bug fixes

fastlane/metadata/openScale_pro/en-GB/changelogs/56.txt

@@ -1 +0,0 @@
-- set target version for compatibility to 29

fastlane/metadata/openScale_pro/en-GB/changelogs/57.txt

@@ -1,2 +0,0 @@
-- fix for Android 12 Bluetooth permission
-- support for Beurer BF720

fastlane/metadata/openScale_pro/en-GB/changelogs/58.txt

@@ -1 +0,0 @@
-- fixed for Android 12 installations errors and crashes

fastlane/metadata/openScale_pro/en-GB/changelogs/59.txt

@@ -1 +0,0 @@
-- fixed for Android 12 backup errors and Bluetooth connection erros

fastlane/metadata/openScale_pro/en-GB/changelogs/60.txt

@@ -1 +0,0 @@
-- fixed another bug for Android 12 Bluetooth connection error

fastlane/metadata/openScale_pro/en-GB/changelogs/61.txt

@@ -1,3 +0,0 @@
-- add support for Sanita SBF72, Beurer BF720 and new 1byone scale
-- fixed reference user bug
-- fixed minor bugs

fastlane/metadata/openScale_pro/en-GB/changelogs/62.txt

@@ -1,7 +0,0 @@
-- redesign overview, table and statistic fragements
-- overview shows every measurements in a recycler view
-- table has fix column and header and is vertical/horizontal scrollable
-- statistic fragment shows each measurement as a graph with average, minimum, maximum values depending on the last 7/30 days, all days, custom reference date or custom time range
-- goal can be disabled or enabled
-- support Sinocare CW286, Beurer BF915 bluetooth bathroom scale
-- fixed minor bugs

fastlane/metadata/openScale_pro/en-GB/changelogs/63.txt

@@ -1,5 +0,0 @@
-- support for Huawei HiLink body scale
-- additional support for OKOK/Chipsea-BLE based scale
-- add notification permission support for Android 13
-- add support Android 13 custom backup folder (after an openScale update the backup folder needs to be set again!)
-- fixed minor bugs

fastlane/metadata/openScale_pro/en-GB/changelogs/64.txt

@@ -1,3 +0,0 @@
-- switch to Material 3 theme
-- fixed some color issues
-- added simple moving average option

fastlane/metadata/openScale_pro/en-GB/changelogs/65.txt

@@ -1,5 +0,0 @@
-- initial support for icomon bluetooth scale
-- support for nameless OKOK scales (Myria MY4836)
-- support for ES-26BB-B scale
-- support for AE-BS06 scale
-- fixed some button color issues

fastlane/metadata/openScale_pro/en-GB/full_description.txt

@@ -1,56 +0,0 @@
-Monitor and track your weight, BMI, body fat, body water, muscle and other body metrics in an open source app that:
-* has an easy to use user interface with graphs,
-* doesn't require you to create an account,
-* can be configured to only show the metrics you care about, and
-* respects your privacy and lets you decide what to do with your data.
-
-<h2><b>Bluetooth scales</b></h2>
-openScale has built-in support for a number of Bluetooth (BLE or "smart") scales from  many manufacturers, e.g. Beurer, Sanitas, Yunmai, Xiaomi, etc. (see model list below). Together with our users we constantly improve and extend the set of supported scales and in many cases pick up where the original app falls short.
-
-For scales without Bluetooth, or Bluetooth scales not (yet) supported by openScale, measurements can be manually entered in a quick and easy way.
-
-<h2><b>Privacy</b></h2>
-This app has no ads and requests no unnecessary permissions. The location permission is only needed to find a Bluetooth scale. Once found the permission can be revoked (or never granted if Bluetooth isn't used).
-
-<h2><b>Supported metrics</b></h2>
-Weight, BMI (body mass index), body water, muscle, LBM (lean body mass), body fat, bone mass, waist circumference, waist-to-height ratio, hip circumference, waist-hip ratio, visceral fat, chest circumference, thigh circumference, biceps circumference, neck circumference, body fat caliper, BMR (basal metabolic rate), TDEE (Total Daily Energy Expenditure) and Calories. Each entry can also have an optional comment.
-
-<b>Note:</b> don't worry if you think the list is too long: metrics you don't use can be disabled and hidden.
-
-<h2><b>Other features</b></h2>
-- Synchronize your weight to GoogleFit with openScale sync
-- Resizable widget to show the latest measurement on the home screen
-- Configure your weight unit: kg, lb or st
-- Set a goal to help keep your diet
-- Displays all your data on a chart and in a table to track your progress
-- Evaluates measurements and gives a quick visual feedback to show you if you're within or outside the recommended range given your age, sex, height etc.
-- Import or export your data from/into a CSV (comma separated value) file
-- Supports body fat, body water and lean body mass estimations based on scientific publications. Useful if your scale doesn't support those measurements.
-- Support for multiple users
-- Support for assisted weighing (e.g. for babies or pets)
-- Support for people with amputations
-- Partially or fully translated into more than 27 languages
-- Optional dark theme selectable
-
-<h2><b>Supported Bluetooth scales</b></h2>
-- Custom made Bluetooth scale
-- Beurer BF700, BF710, BF800, BF105, BF720, BF600, BF850 and BF950
-- Digoo DG-S038H
-- Excelvan CF369BLE
-- Exingtech Y1
-- Hesley (Yunchen)
-- MGB
-- Medisana BS444, BS440
-- Runtastic Libra
-- Sanitas SBF70
-- Silvercrest SBF75, SBF77
-- Xiaomi Mi scale v1 and v2
-- Yunmai Mini and SE
-- iHealth HS3
-- Easy Home 64050
-- and many more
-
-Please see https://github.com/oliexdev/openScale/wiki/Supported-scales-in-openScale for the full list and the level of support for each scale.
-
-<h2><b>Support</b></h2>
-If you find a bug, have an idea on how to improve openScale or have a question, please visit the openScale project page on GitHub: https://github.com/oliexdev/openScale