diff --git a/.gitignore b/.gitignore index 87c326a1..2af149b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Built application files *.apk *.ap_ +*.abb # Files for the Dalvik VM *.dex diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index f378ae2a..1899ca97 100644 --- a/android_app/app/build.gradle +++ b/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 { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java index 6e57cc35..ffef525c 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java +++ b/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) + "

Install openScale pro version")) - .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) { diff --git a/android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml b/android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml deleted file mode 100644 index 736989ec..00000000 --- a/android_app/app/src/main/res/drawable/ic_launcher_openscale_light.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml b/android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml deleted file mode 100644 index c2b0a73d..00000000 --- a/android_app/app/src/main/res/drawable/ic_launcher_openscale_pro.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_round.xml deleted file mode 100644 index ca1e239a..00000000 --- a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_light_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml b/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml deleted file mode 100644 index e7598baa..00000000 --- a/android_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_openscale_pro_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android_app/app/src/main/res/values-ar/strings.xml b/android_app/app/src/main/res/values-ar/strings.xml index ed02e707..6a651032 100644 --- a/android_app/app/src/main/res/values-ar/strings.xml +++ b/android_app/app/src/main/res/values-ar/strings.xml @@ -227,7 +227,6 @@ امنح الوصول إلى الموقع الجغرافي في إعدادات أندرويد للبحث عن أجهزة بلوتوث. يمكنك الإلغائ بعد ذلك. لا بتر قدم - يرجى الترقية إلى أوبن سكيل برو لدعم البلوتوث لا يرسل openScale أي بيانات إلى سحابة وعدم وجود إذن للوصول إلى الإنترنت هو ضمان قوي لذلك. \n \nإذا كنت تريد حقا مزامنة وزنك مع GoogleFit أو مع MQTT ، فيمكنك تثبيت openScale sync . diff --git a/android_app/app/src/main/res/values-ca/strings.xml b/android_app/app/src/main/res/values-ca/strings.xml index 61d8dd05..65ad7129 100644 --- a/android_app/app/src/main/res/values-ca/strings.xml +++ b/android_app/app/src/main/res/values-ca/strings.xml @@ -217,7 +217,6 @@ Moderat Intens Extrem - Actualitzeu a openScale pro per a obtenir suport de Bluetooth Donació Nivell de bateria baix (%d%%), carregueu la bateria o canvieu les piles de la bàscula No s’ha pogut connectar amb la bàscula, assegureu-vos que està engegada. diff --git a/android_app/app/src/main/res/values-cs/strings.xml b/android_app/app/src/main/res/values-cs/strings.xml index 6417b8bd..c9f96fc5 100644 --- a/android_app/app/src/main/res/values-cs/strings.xml +++ b/android_app/app/src/main/res/values-cs/strings.xml @@ -253,7 +253,6 @@ Osa Y Dolní část nohy a chodidlo Sledujte a analyzujte své tělesné údaje. - Pro podporu Bluetooth prosím upgradujte na openScale pro Podpora více uživatelů. Chodidlo Dále diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml index 33a29f5a..0ab2f58f 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -217,7 +217,6 @@ Messwertanzeige Gewährleisten Sie den Standortzugriff in den Android-Einstellungen, um nach Bluetooth-Geräten zu suchen. Sie können es anschließend wieder widerrufen. Auf der rechten Achse - Bitte upgraden Sie auf openScale pro für Bluetooth-Unterstützung Spende Niedriger Batteriestand (%d%%), bitte aufladen oder Batterien der Waage austauschen Keine Verbindung zur Waage, bitte prüfen Sie, ob Ihre Waage eingeschaltet ist. diff --git a/android_app/app/src/main/res/values-el/strings.xml b/android_app/app/src/main/res/values-el/strings.xml index 3ee7ee6f..c0d97d58 100644 --- a/android_app/app/src/main/res/values-el/strings.xml +++ b/android_app/app/src/main/res/values-el/strings.xml @@ -217,7 +217,6 @@ Μπάρα μέτρησης Χορηγήστε πρόσβαση τοποθεσίας στις ρυθμίσεις του Android για να ψάχνει συσκευές Bluetooth. Προαιρετικά ανακαλέστε το μεταγενέστερα. Είναι στον δεξιό άξονα - Παρακαλώ αναβαθμίστε σε openScale pro για υποστήριξη Bluetooth Δωρεά Χαμηλό επίπεδο μπαταρίας (%d%%), παρακαλώ φορτίστε ή αλλάξτε τις μπαταρίες της ζυγαριάς Δεν μπορεί να γίνει σύνδεση με την ζυγαριά, παρακαλώ σιγουρευτείτε ότι είναι αναμμένη. diff --git a/android_app/app/src/main/res/values-es/strings.xml b/android_app/app/src/main/res/values-es/strings.xml index db70b796..18dc1069 100644 --- a/android_app/app/src/main/res/values-es/strings.xml +++ b/android_app/app/src/main/res/values-es/strings.xml @@ -217,7 +217,6 @@ Otorgue acceso a la ubicación en la configuración de Android para buscar dispositivos Bluetooth. Opcionalmente puede revocarlo después. Está en el eje derecho Calorías - Cambie a la versión Pro de openScale para obtener la prestación de Bluetooth Donación Queda poca energía (%d%%); recargue o sustituya las baterías de la báscula No se pudo conectar con la báscula; asegúrese de que está encendida. diff --git a/android_app/app/src/main/res/values-fi/strings.xml b/android_app/app/src/main/res/values-fi/strings.xml index 8d353547..d2e2a61c 100644 --- a/android_app/app/src/main/res/values-fi/strings.xml +++ b/android_app/app/src/main/res/values-fi/strings.xml @@ -28,7 +28,6 @@ Suojaa henkilökohtaiset terveystietosi. Tervetuloa \nopenScaleen - Ole hyvä ja päivitä openScale pro-versioon saadaksesi Bluetoorh-tuen Äärimmäinen Vähäinen Keskiverto diff --git a/android_app/app/src/main/res/values-fr/strings.xml b/android_app/app/src/main/res/values-fr/strings.xml index 02512593..bed58835 100644 --- a/android_app/app/src/main/res/values-fr/strings.xml +++ b/android_app/app/src/main/res/values-fr/strings.xml @@ -217,7 +217,6 @@ Barre des mesures Autoriser l’accès à la location pour rechercher des dispositifs Bluetooth. Cette permissions peut être révoquée par la suite. Est sur l’axe de droite - Veuillez mettre à niveau vers openScale pro pour la prise en charge du Bluetooth Don Précédent Suivant diff --git a/android_app/app/src/main/res/values-gl/strings.xml b/android_app/app/src/main/res/values-gl/strings.xml index 3c09c2f6..c1d68c75 100644 --- a/android_app/app/src/main/res/values-gl/strings.xml +++ b/android_app/app/src/main/res/values-gl/strings.xml @@ -212,7 +212,6 @@ Un programa de código aberto para o control de peso e medidas corporais, compatible con básculas Bluetooth. Benvido a \nopenScale - Por favor actualice a openScale pro para ter soporte para Bluetooth Extremo Intenso Moderado diff --git a/android_app/app/src/main/res/values-hr/strings.xml b/android_app/app/src/main/res/values-hr/strings.xml index fd8d8612..488bde9f 100644 --- a/android_app/app/src/main/res/values-hr/strings.xml +++ b/android_app/app/src/main/res/values-hr/strings.xml @@ -235,7 +235,6 @@ Softver otvorenog koda za praćenje težine i tjelesne metrike, s Bluetooth podrškom za vagu. Dobro došli u \nopenScale - Nadogradi na „openScale pro” za Bluetooth podršku Kalorije Na desnoj osi Čitaj/zapiši openScale podatke diff --git a/android_app/app/src/main/res/values-hu/strings.xml b/android_app/app/src/main/res/values-hu/strings.xml index 4bd77ea7..87325870 100644 --- a/android_app/app/src/main/res/values-hu/strings.xml +++ b/android_app/app/src/main/res/values-hu/strings.xml @@ -217,7 +217,6 @@ Éves nézet Mérési sáv A jobb oldali tengelyen - Kérem frissítsen az openScale Pro-ra a Bluetooth támogatáshoz Támogatás üres Nyílt forráskódú szoftver, súly- és testmérések nyomon követése, Bluetooth mérleg támogatással. diff --git a/android_app/app/src/main/res/values-id/strings.xml b/android_app/app/src/main/res/values-id/strings.xml index 6e1db190..06122211 100644 --- a/android_app/app/src/main/res/values-id/strings.xml +++ b/android_app/app/src/main/res/values-id/strings.xml @@ -144,7 +144,6 @@ Anda tidak perlu membuat akun online untuk menggunakan openScale. \n \nMetrik tubuh dihitung dari pengukuran. - Silakan upgrade ke openScale pro untuk dukungan Bluetooth Ringan Sedang Penugasan Pengguna Cerdas diff --git a/android_app/app/src/main/res/values-it/strings.xml b/android_app/app/src/main/res/values-it/strings.xml index 4b4a611b..3d71f9b9 100644 --- a/android_app/app/src/main/res/values-it/strings.xml +++ b/android_app/app/src/main/res/values-it/strings.xml @@ -221,7 +221,6 @@ Calorie Estremo Importante - Passa alla versione pro se vuoi utilizzare il protocollo Bluetooth Proteggi i tuoi dati sanitari personali. Software open-source per la rilevazione del peso e delle metriche corporee, con supporto per la bilancia Bluetooth. Benvenuti su diff --git a/android_app/app/src/main/res/values-iw/strings.xml b/android_app/app/src/main/res/values-iw/strings.xml index 13f33b20..332d8ff4 100644 --- a/android_app/app/src/main/res/values-iw/strings.xml +++ b/android_app/app/src/main/res/values-iw/strings.xml @@ -217,7 +217,6 @@ תצוגה שנתית סרגל מדידה בציר הימני - נא לשדרג לגרסה המקצועית של openScale לתמיכה ב־Bluetooth תרומה עצמת הסוללה נמוכה (%d%%), נא להטעין או להחליף את הסוללות של המשקל לא ניתן להתחבר למשקל, נא לוודא שהוא פעיל. diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml index f1e7c1fc..838f6961 100644 --- a/android_app/app/src/main/res/values-ja/strings.xml +++ b/android_app/app/src/main/res/values-ja/strings.xml @@ -218,7 +218,6 @@ 年表示 測定バー 右軸上に - Bluetooth に対応するには、openScale pro にアップグレードしてください 電池の残量が少なくなっています (%d%%)、体重計の電池を充電または交換してください 体重計に接続できませんでした。オンになっていることを確認してください。 年齢 diff --git a/android_app/app/src/main/res/values-nb/strings.xml b/android_app/app/src/main/res/values-nb/strings.xml index a7779767..f1cc6f8d 100644 --- a/android_app/app/src/main/res/values-nb/strings.xml +++ b/android_app/app/src/main/res/values-nb/strings.xml @@ -217,7 +217,6 @@ Årsvisning Målestav Er på høyre akse - Oppgrader til openScare pro for Blåtannsstøtte Donasjon tom Alder diff --git a/android_app/app/src/main/res/values-nl/strings.xml b/android_app/app/src/main/res/values-nl/strings.xml index dded3e50..5559d481 100644 --- a/android_app/app/src/main/res/values-nl/strings.xml +++ b/android_app/app/src/main/res/values-nl/strings.xml @@ -217,7 +217,6 @@ Meetlat Verleen toegang tot je locatie in de Android-instellingen om te zoeken naar Bluetooth-apparaten. Dit kun je achteraf evt. weer intrekken. Staat op de rechteras - Upgrade naar openScale Pro om Bluetooth-ondersteuning toe te voegen Doneren Laag batterijniveau (%d%%) - verwissel de batterijen Kan niet verbinden met de weegschaal. Controleer of deze aanstaat. diff --git a/android_app/app/src/main/res/values-pl/strings.xml b/android_app/app/src/main/res/values-pl/strings.xml index 5228adb1..8839323a 100644 --- a/android_app/app/src/main/res/values-pl/strings.xml +++ b/android_app/app/src/main/res/values-pl/strings.xml @@ -217,7 +217,6 @@ Zezwól na dostęp do lokalizacji w ustawieniach Androida, aby wyszukać urządzenia Bluetooth. Możesz je potem wyłączyć. Pasek pomiarowy Jest na prawej osi - Zaktualizuj system do openScale pro w celu obsługi Bluetooth Wspomóż Niski poziom baterii (%d%%), naładuj lub wymień baterie wagi Nie można połączyć się z wagą, upewnij się, że jest włączona. diff --git a/android_app/app/src/main/res/values-pt-rBR/strings.xml b/android_app/app/src/main/res/values-pt-rBR/strings.xml index 8d1508ba..4a0938ef 100644 --- a/android_app/app/src/main/res/values-pt-rBR/strings.xml +++ b/android_app/app/src/main/res/values-pt-rBR/strings.xml @@ -229,7 +229,6 @@ Dobra cutânea abdominais Perna e pé Perna - Para utilizar a função Bluetooth, por favor, atualize para a versão openScale pro Pular Próximo Voltar diff --git a/android_app/app/src/main/res/values-pt/strings.xml b/android_app/app/src/main/res/values-pt/strings.xml index 3c33fa3b..92febfc3 100644 --- a/android_app/app/src/main/res/values-pt/strings.xml +++ b/android_app/app/src/main/res/values-pt/strings.xml @@ -210,7 +210,6 @@ Desenvolvimento Guardar registo de depuração para um ficheiro Braço - Por favor, atualize para openScale pro para suporte a Bluetooth Pé Bem-vindo ao \nopenScale diff --git a/android_app/app/src/main/res/values-ru/strings.xml b/android_app/app/src/main/res/values-ru/strings.xml index bd759cb3..f069f441 100644 --- a/android_app/app/src/main/res/values-ru/strings.xml +++ b/android_app/app/src/main/res/values-ru/strings.xml @@ -217,7 +217,6 @@ За год Панель метрик на правой оси - Пожалуйста, обновите до openScale Pro для подддержки Bluetooth Пожертвование Готово Назад diff --git a/android_app/app/src/main/res/values-sk/strings.xml b/android_app/app/src/main/res/values-sk/strings.xml index b9f7293a..00e5dc57 100644 --- a/android_app/app/src/main/res/values-sk/strings.xml +++ b/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. Je na pravej osi - Pre podporu Bluetooth inovujte na openScale pro Vek Vitajte v \nopenScale diff --git a/android_app/app/src/main/res/values-sl/strings.xml b/android_app/app/src/main/res/values-sl/strings.xml index eb378dc6..8aa88c1e 100644 --- a/android_app/app/src/main/res/values-sl/strings.xml +++ b/android_app/app/src/main/res/values-sl/strings.xml @@ -235,7 +235,6 @@ Legenda grafa Prosim, stopi bos/-a na tehtnico Za iskanje naprav Bluetooth v nastavitvah sistema Android omogoči dostop do lokacije. Po želji ga nato lahko prekličeš. - Za podporo Bluetooth nadgradi na openScale pro Gre za odprtokodno programsko opremo z visoko stopnjo preglednosti. 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 znanstvenih publikacij. Branje/pisanje podatkov openScale diff --git a/android_app/app/src/main/res/values-sv/strings.xml b/android_app/app/src/main/res/values-sv/strings.xml index 71cca5c4..9101717a 100644 --- a/android_app/app/src/main/res/values-sv/strings.xml +++ b/android_app/app/src/main/res/values-sv/strings.xml @@ -208,7 +208,6 @@ \n \nAnslut igen för att hämta mätdata. Kalorier - Vänligen uppgradera till openScale pro för Bluetooth-stöd Donation Ålder tom diff --git a/android_app/app/src/main/res/values-ta/strings.xml b/android_app/app/src/main/res/values-ta/strings.xml index e76f059c..53c99956 100644 --- a/android_app/app/src/main/res/values-ta/strings.xml +++ b/android_app/app/src/main/res/values-ta/strings.xml @@ -126,7 +126,6 @@ உங்கள் ப்ளூடூத் அளவானை தேடுகிறது தேடல் முடிந்தது மொழியாக்கத்தில் பங்கேற்க - ஊடலை ஆதரவுக்காக ஓபன்ச்கேல் புரோவுக்கு மேம்படுத்தவும் தவிர் ஓபன்ச்கேல் தரவு ஏற்றுமதி (%s) அதிகபட்சம். ஒரே நேரத்தில் அளவிலான பயனர்களின் எண்ணிக்கை diff --git a/android_app/app/src/main/res/values-tr/strings.xml b/android_app/app/src/main/res/values-tr/strings.xml index a3fbaef0..4bd9ffff 100644 --- a/android_app/app/src/main/res/values-tr/strings.xml +++ b/android_app/app/src/main/res/values-tr/strings.xml @@ -217,7 +217,6 @@ Bluetooth aygıtlarını aramak için Android ayarlarından konum erişim izni verin. İsteğe bağlı olarak daha sonra iptal edebilirsiniz. Sağ eksende Kaloriler - Bluetooth desteği için openScale paralı sürüme yükseltin Bağış Düşük pil düzeyi (%d%%), lütfen tartının pilini değiştirin veya doldurun Tartı ile bağlantı kurulamıyor, lütfen açık olduğundan emin olun. diff --git a/android_app/app/src/main/res/values-uk/strings.xml b/android_app/app/src/main/res/values-uk/strings.xml index 1cb2aa66..686d357a 100644 --- a/android_app/app/src/main/res/values-uk/strings.xml +++ b/android_app/app/src/main/res/values-uk/strings.xml @@ -215,7 +215,6 @@ Середній Інтенсивний Екстремальний - Оновіться до openScale pro версії для підтримки Bluetooth Підтримати Панель вимірювань На вісі праворуч diff --git a/android_app/app/src/main/res/values-zh-rCN/strings.xml b/android_app/app/src/main/res/values-zh-rCN/strings.xml index 38cb7c6a..4b4a1229 100644 --- a/android_app/app/src/main/res/values-zh-rCN/strings.xml +++ b/android_app/app/src/main/res/values-zh-rCN/strings.xml @@ -44,7 +44,6 @@ 带蓝牙秤支持的开源体重和身体指标跟踪软件。 欢迎来到 \nopenScale - 要获取蓝牙支持功能，请升级到openScale pro 腿 小腿和足 脚 diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index 9a8c230b..5b2d8feb 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -256,7 +256,6 @@ Foot Lower leg and foot Leg - Please upgrade to openScale pro for Bluetooth support Welcome to\nopenScale Open-source software weight and body metrics tracker, with Bluetooth scale support. Protect your personal health data. diff --git a/android_app/gradle/wrapper/gradle-wrapper.jar b/android_app/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a..a4b76b95 100644 Binary files a/android_app/gradle/wrapper/gradle-wrapper.jar and b/android_app/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android_app/gradle/wrapper/gradle-wrapper.properties b/android_app/gradle/wrapper/gradle-wrapper.properties index d1130dea..eb1a55be 100644 --- a/android_app/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/android_app/gradlew b/android_app/gradlew index 91a7e269..f5feea6d 100755 --- a/android_app/gradlew +++ b/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" "$@" diff --git a/android_app/gradlew.bat b/android_app/gradlew.bat index aec99730..9b42019c 100644 --- a/android_app/gradlew.bat +++ b/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 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 159464c1..553be53c 100644 --- a/fastlane/Fastfile +++ b/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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/48.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/48.txt deleted file mode 100644 index 58d29420..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/48.txt +++ /dev/null @@ -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 \ No newline at end of file diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/49.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/49.txt deleted file mode 100644 index aea6776c..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/49.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/50.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/50.txt deleted file mode 100644 index a2044050..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/50.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/51.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/51.txt deleted file mode 100644 index a6349a97..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/51.txt +++ /dev/null @@ -1,3 +0,0 @@ -- added support for Libra like trendlines -- updated some translations -- fixed minor bug diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/52.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/52.txt deleted file mode 100644 index 23f3ce64..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/52.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/53.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/53.txt deleted file mode 100644 index 076fef95..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/53.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/54.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/54.txt deleted file mode 100644 index 76780d6b..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/54.txt +++ /dev/null @@ -1,2 +0,0 @@ -- shows converted values in graph -- fixed crash when marker is selected and measurement is deslected diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/55.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/55.txt deleted file mode 100644 index 3645b7d2..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/55.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/56.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/56.txt deleted file mode 100644 index 1a8f3884..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/56.txt +++ /dev/null @@ -1 +0,0 @@ -- set target version for compatibility to 29 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/57.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/57.txt deleted file mode 100644 index 594fa182..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/57.txt +++ /dev/null @@ -1,2 +0,0 @@ -- fix for Android 12 Bluetooth permission -- support for Beurer BF720 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/58.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/58.txt deleted file mode 100644 index a300a201..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/58.txt +++ /dev/null @@ -1 +0,0 @@ -- fixed for Android 12 installations errors and crashes diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/59.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/59.txt deleted file mode 100644 index 954c5aa9..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/59.txt +++ /dev/null @@ -1 +0,0 @@ -- fixed for Android 12 backup errors and Bluetooth connection erros diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/60.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/60.txt deleted file mode 100644 index c0adcff1..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/60.txt +++ /dev/null @@ -1 +0,0 @@ -- fixed another bug for Android 12 Bluetooth connection error diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/61.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/61.txt deleted file mode 100644 index 33ea89c6..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/61.txt +++ /dev/null @@ -1,3 +0,0 @@ -- add support for Sanita SBF72, Beurer BF720 and new 1byone scale -- fixed reference user bug -- fixed minor bugs diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/62.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/62.txt deleted file mode 100644 index dc9bb170..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/62.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/63.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/63.txt deleted file mode 100644 index ef80c928..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/63.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/64.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/64.txt deleted file mode 100644 index b57121f7..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/64.txt +++ /dev/null @@ -1,3 +0,0 @@ -- switch to Material 3 theme -- fixed some color issues -- added simple moving average option diff --git a/fastlane/metadata/openScale_light/en-GB/changelogs/65.txt b/fastlane/metadata/openScale_light/en-GB/changelogs/65.txt deleted file mode 100644 index 8bd1eb19..00000000 --- a/fastlane/metadata/openScale_light/en-GB/changelogs/65.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_light/en-GB/full_description.txt b/fastlane/metadata/openScale_light/en-GB/full_description.txt deleted file mode 100644 index 81fd1d90..00000000 --- a/fastlane/metadata/openScale_light/en-GB/full_description.txt +++ /dev/null @@ -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. - -

Bluetooth scales (pro version)

- -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. - -Note: Please install openScale pro version to enable Bluetooth support - -

Privacy

-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). - -

Supported metrics

-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. - -Note: don't worry if you think the list is too long: metrics you don't use can be disabled and hidden. - -

Other features

-- 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 - -

Support

-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 diff --git a/fastlane/metadata/openScale_light/en-GB/images/featureGraphic.png b/fastlane/metadata/openScale_light/en-GB/images/featureGraphic.png deleted file mode 100644 index 2185848d..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/featureGraphic.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/icon.png b/fastlane/metadata/openScale_light/en-GB/images/icon.png deleted file mode 100644 index 9f4a425b..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/icon.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/1_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/1_en-GB.png deleted file mode 100644 index 00ac28e4..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/1_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/2_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/2_en-GB.png deleted file mode 100644 index f642a824..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/2_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/3_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/3_en-GB.png deleted file mode 100644 index b4c20d4a..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/3_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/4_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/4_en-GB.png deleted file mode 100644 index c2e7d0ed..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/4_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/5_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/5_en-GB.png deleted file mode 100644 index 11a39ddc..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/5_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/6_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/6_en-GB.png deleted file mode 100644 index 5bd23d1d..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/6_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/7_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/7_en-GB.png deleted file mode 100644 index 1fd1e626..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/7_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/8_en-GB.png b/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/8_en-GB.png deleted file mode 100644 index b3e9a6d2..00000000 Binary files a/fastlane/metadata/openScale_light/en-GB/images/phoneScreenshots/8_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_light/en-GB/short_description.txt b/fastlane/metadata/openScale_light/en-GB/short_description.txt deleted file mode 100644 index bc7affcf..00000000 --- a/fastlane/metadata/openScale_light/en-GB/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source weight and body metrics tracker \ No newline at end of file diff --git a/fastlane/metadata/openScale_light/en-GB/title.txt b/fastlane/metadata/openScale_light/en-GB/title.txt deleted file mode 100644 index e21db42b..00000000 --- a/fastlane/metadata/openScale_light/en-GB/title.txt +++ /dev/null @@ -1 +0,0 @@ -openScale light \ No newline at end of file diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/48.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/48.txt deleted file mode 100644 index 58d29420..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/48.txt +++ /dev/null @@ -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 \ No newline at end of file diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/49.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/49.txt deleted file mode 100644 index aea6776c..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/49.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/50.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/50.txt deleted file mode 100644 index a2044050..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/50.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/51.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/51.txt deleted file mode 100644 index a6349a97..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/51.txt +++ /dev/null @@ -1,3 +0,0 @@ -- added support for Libra like trendlines -- updated some translations -- fixed minor bug diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/52.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/52.txt deleted file mode 100644 index 23f3ce64..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/52.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/53.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/53.txt deleted file mode 100644 index 076fef95..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/53.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/54.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/54.txt deleted file mode 100644 index 76780d6b..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/54.txt +++ /dev/null @@ -1,2 +0,0 @@ -- shows converted values in graph -- fixed crash when marker is selected and measurement is deslected diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/55.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/55.txt deleted file mode 100644 index 3645b7d2..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/55.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/56.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/56.txt deleted file mode 100644 index 1a8f3884..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/56.txt +++ /dev/null @@ -1 +0,0 @@ -- set target version for compatibility to 29 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/57.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/57.txt deleted file mode 100644 index 594fa182..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/57.txt +++ /dev/null @@ -1,2 +0,0 @@ -- fix for Android 12 Bluetooth permission -- support for Beurer BF720 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/58.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/58.txt deleted file mode 100644 index a300a201..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/58.txt +++ /dev/null @@ -1 +0,0 @@ -- fixed for Android 12 installations errors and crashes diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/59.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/59.txt deleted file mode 100644 index 954c5aa9..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/59.txt +++ /dev/null @@ -1 +0,0 @@ -- fixed for Android 12 backup errors and Bluetooth connection erros diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/60.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/60.txt deleted file mode 100644 index c0adcff1..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/60.txt +++ /dev/null @@ -1 +0,0 @@ -- fixed another bug for Android 12 Bluetooth connection error diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/61.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/61.txt deleted file mode 100644 index 33ea89c6..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/61.txt +++ /dev/null @@ -1,3 +0,0 @@ -- add support for Sanita SBF72, Beurer BF720 and new 1byone scale -- fixed reference user bug -- fixed minor bugs diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/62.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/62.txt deleted file mode 100644 index dc9bb170..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/62.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/63.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/63.txt deleted file mode 100644 index ef80c928..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/63.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/64.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/64.txt deleted file mode 100644 index b57121f7..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/64.txt +++ /dev/null @@ -1,3 +0,0 @@ -- switch to Material 3 theme -- fixed some color issues -- added simple moving average option diff --git a/fastlane/metadata/openScale_pro/en-GB/changelogs/65.txt b/fastlane/metadata/openScale_pro/en-GB/changelogs/65.txt deleted file mode 100644 index 8bd1eb19..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/changelogs/65.txt +++ /dev/null @@ -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 diff --git a/fastlane/metadata/openScale_pro/en-GB/full_description.txt b/fastlane/metadata/openScale_pro/en-GB/full_description.txt deleted file mode 100644 index 61d0866e..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/full_description.txt +++ /dev/null @@ -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. - -

Bluetooth scales

-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. - -

Privacy

-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). - -

Supported metrics

-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. - -Note: don't worry if you think the list is too long: metrics you don't use can be disabled and hidden. - -

Other features

-- 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 - -

Supported Bluetooth scales

-- 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. - -

Support

-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 diff --git a/fastlane/metadata/openScale_pro/en-GB/images/featureGraphic.png b/fastlane/metadata/openScale_pro/en-GB/images/featureGraphic.png deleted file mode 100644 index 2185848d..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/featureGraphic.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/icon.png b/fastlane/metadata/openScale_pro/en-GB/images/icon.png deleted file mode 100644 index e2ce0fbb..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/icon.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/1_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/1_en-GB.png deleted file mode 100644 index 00ac28e4..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/1_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/2_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/2_en-GB.png deleted file mode 100644 index f642a824..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/2_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/3_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/3_en-GB.png deleted file mode 100644 index b4c20d4a..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/3_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/4_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/4_en-GB.png deleted file mode 100644 index c2e7d0ed..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/4_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/5_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/5_en-GB.png deleted file mode 100644 index 11a39ddc..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/5_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/6_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/6_en-GB.png deleted file mode 100644 index 5bd23d1d..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/6_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/7_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/7_en-GB.png deleted file mode 100644 index 1fd1e626..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/7_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/8_en-GB.png b/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/8_en-GB.png deleted file mode 100644 index b3e9a6d2..00000000 Binary files a/fastlane/metadata/openScale_pro/en-GB/images/phoneScreenshots/8_en-GB.png and /dev/null differ diff --git a/fastlane/metadata/openScale_pro/en-GB/short_description.txt b/fastlane/metadata/openScale_pro/en-GB/short_description.txt deleted file mode 100644 index 5c54de77..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Open-source weight and body metrics tracker, with support for Bluetooth scales \ No newline at end of file diff --git a/fastlane/metadata/openScale_pro/en-GB/title.txt b/fastlane/metadata/openScale_pro/en-GB/title.txt deleted file mode 100644 index 7e3f2e77..00000000 --- a/fastlane/metadata/openScale_pro/en-GB/title.txt +++ /dev/null @@ -1 +0,0 @@ -openScale pro \ No newline at end of file