From 5c6be64329cfa1e8c104a4c4352d73620e0ad3db Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sat, 12 Oct 2019 20:54:17 +0200 Subject: [PATCH 01/12] remove old information from the readme --- README.md | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/README.md b/README.md index e61fd2070..3c2e4308e 100644 --- a/README.md +++ b/README.md @@ -58,41 +58,6 @@ vendor's servers. Please see [FEATURES.md](https://codeberg.org/Freeyourgadget/Gadgetbridge/src/master/FEATURES.md) -## Getting Started (Pebble) - -Please [this wiki article](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Pebble-Getting-Started) - -## How to use (Mi Band 1+2) - -* Invoke the discovery activity manually via the "+" button. It will ask you for some personal info that appears - to be needed for proper steps calculation on the band. If you do not provide these, - some hardcoded default "dummy" values will be used instead. - - When your Mi Band starts to vibrate and blink during the pairing process, - tap it quickly a few times in a row to confirm the pairing with the band. - -1. Configure other notifications as desired -2. Go back to the "Gadgetbridge" activity -3. Tap the Mi Band item to connect if you're not connected yet -4. To test, chose "Debug" from the menu and play around - -**Known Issues:** - -* The initial connection to a Mi Band sometimes takes a little patience. Try to connect a few times, wait, - and try connecting again. This only happens until you have "bonded" with the Mi Band, i.e. until it - knows your MAC address. This behavior may also only occur with older firmware versions. -* If you use other apps like Mi Fit, and "bonding" with Gadgetbridge does not work, please - try to unpair the band in the other app and try again with Gadgetbridge. -* While all Mi Band devices are supported, some firmware versions might work better than others. - You can consult the [projects wiki pages](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band) - to check if your firmware version is fully supported or if an upgrade/downgrade might be beneficial. -* In order to display text notifications on the Mi Band 2, you have to [install a font on the band](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-2). - -## Features (Liveview) - -* set time (automatically upon connection) -* display notifications and vibrate - ## Authors ### Core Team (in order of first code contribution) From 5caa8e909774506e4c103cd6b1ed9f03be86f950 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 15 Oct 2019 20:30:01 +0200 Subject: [PATCH 02/12] Amazfip Bip Lite: Support firmware installation Closes #1681 Closes #1682 --- .../amazfitbip/AmazfitBipLiteCoordinator.java | 3 +- .../amazfitbip/AmazfitBipLiteFWHelper.java | 44 +++++++++ .../AmazfitBipLiteFWInstallHandler.java | 49 ++++++++++ .../AmazfitBipLiteFirmwareInfo.java | 94 +++++++++++++++++++ .../amazfitbip/AmazfitBipLiteSupport.java | 7 +- app/src/main/res/values/strings.xml | 1 + 6 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java index b2ce87a0b..7a252c054 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java @@ -55,7 +55,8 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator { @Override public InstallHandler findInstallHandler(Uri uri, Context context) { - return null; + AmazfitBipLiteFWInstallHandler handler = new AmazfitBipLiteFWInstallHandler(uri, context); + return handler.isValid() ? handler : null; } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java new file mode 100644 index 000000000..812ce5bda --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java @@ -0,0 +1,44 @@ +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip; + +import android.content.Context; +import android.net.Uri; + +import androidx.annotation.NonNull; + +import java.io.IOException; + +import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip.AmazfitBipLiteFirmwareInfo; + +public class AmazfitBipLiteFWHelper extends HuamiFWHelper { + + public AmazfitBipLiteFWHelper(Uri uri, Context context) throws IOException { + super(uri, context); + } + + @NonNull + @Override + protected void determineFirmwareInfo(byte[] wholeFirmwareBytes) { + firmwareInfo = new AmazfitBipLiteFirmwareInfo(wholeFirmwareBytes); + if (!firmwareInfo.isHeaderValid()) { + throw new IllegalArgumentException("Not a an Amazifit Bip Lite firmware"); + } + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java new file mode 100644 index 000000000..0266eb49a --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java @@ -0,0 +1,49 @@ +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip; + +import android.content.Context; +import android.net.Uri; + +import java.io.IOException; + +import nodomain.freeyourgadget.gadgetbridge.R; +import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWHelper; +import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; + +class AmazfitBipLiteFWInstallHandler extends AbstractMiBandFWInstallHandler { + AmazfitBipLiteFWInstallHandler(Uri uri, Context context) { + super(uri, context); + } + + @Override + protected String getFwUpgradeNotice() { + return mContext.getString(R.string.fw_upgrade_notice_amazfitbip_lite, helper.getHumanFirmwareVersion()); + } + + @Override + protected AbstractMiBandFWHelper createHelper(Uri uri, Context context) throws IOException { + return new AmazfitBipLiteFWHelper(uri, context); + } + + @Override + protected boolean isSupportedDeviceType(GBDevice device) { + return device.getType() == DeviceType.AMAZFITBIP_LITE; + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java new file mode 100644 index 000000000..f567362f4 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java @@ -0,0 +1,94 @@ +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip; + +import java.util.HashMap; +import java.util.Map; + +import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType; +import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils; + +public class AmazfitBipLiteFirmwareInfo extends HuamiFirmwareInfo { + + // this is the same as Bip and Cor + private static final byte[] FW_HEADER = new byte[]{ + 0x00, (byte) 0x98, 0x00, 0x20, (byte) 0xA5, 0x04, 0x00, 0x20, (byte) 0xAD, 0x04, 0x00, 0x20, (byte) 0xC5, 0x04, 0x00, 0x20 + }; + + + private static Map crcToVersion = new HashMap<>(); + + static { + // firmware + crcToVersion.put(11059, "1.1.6.02"); + + // Latin Firmware + + + // resources + crcToVersion.put(57510, "1.1.6.02"); + + // font + crcToVersion.put(61054, "8"); + crcToVersion.put(59577, "9 (Latin)"); + } + + public AmazfitBipLiteFirmwareInfo(byte[] bytes) { + super(bytes); + } + + @Override + protected HuamiFirmwareType determineFirmwareType(byte[] bytes) { + if (ArrayUtils.startsWith(bytes, NEWRES_HEADER)) { + if ((bytes.length <= 100000) || (bytes.length > 700000)) { // dont know how to distinguish from Cor/Mi Band 3 .res + return HuamiFirmwareType.INVALID; + } + return HuamiFirmwareType.RES; + } + if (ArrayUtils.startsWith(bytes, FW_HEADER)) { + if (searchString32BitAligned(bytes, "Amazfit Bip Lite")) { + return HuamiFirmwareType.FIRMWARE; + } + return HuamiFirmwareType.INVALID; + } + if (ArrayUtils.startsWith(bytes, WATCHFACE_HEADER)) { + return HuamiFirmwareType.WATCHFACE; + } + if (ArrayUtils.startsWith(bytes, NEWFT_HEADER)) { + if (bytes[10] == 0x01) { + return HuamiFirmwareType.FONT; + } else if (bytes[10] == 0x02 || bytes[10] == 0x0A) { + return HuamiFirmwareType.FONT_LATIN; + } + } + + return HuamiFirmwareType.INVALID; + } + + @Override + public boolean isGenerallyCompatibleWith(GBDevice device) { + return isHeaderValid() && device.getType() == DeviceType.AMAZFITBIP_LITE; + } + + @Override + protected Map getCrcMap() { + return crcToVersion; + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java index fb6c6bb61..339e9317d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java @@ -20,7 +20,10 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip; import android.content.Context; import android.net.Uri; +import java.io.IOException; + import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip.AmazfitBipLiteFWHelper; public class AmazfitBipLiteSupport extends AmazfitBipSupport { @@ -35,7 +38,7 @@ public class AmazfitBipLiteSupport extends AmazfitBipSupport { } @Override - public HuamiFWHelper createFWHelper(Uri uri, Context context) { - return null; + public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException { + return new AmazfitBipLiteFWHelper(uri, context); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbe2a38f4..76abbe50a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -55,6 +55,7 @@ FW/App installer You are about to install the %s. You are about to install the %s firmware on your Amazfit Bip.\n\nPlease make sure to install the .fw file, then the .res file, and finally the .gps file. Your watch will reboot after installing the .fw file.\n\nNote: You do not have to install .res and .gps if these files are exactly the same as the ones previously installed.\n\nPROCEED AT YOUR OWN RISK! + You are about to install the %s firmware on your Amazfit Bip Lite.\n\nPlease make sure to install the .fw file, and after that the .res file. Your watch will reboot after installing the .fw file.\n\nNote: You do not have to install .res if it is exactly the same as the one previously installed.\n\nPROCEED AT YOUR OWN RISK! You are about to install the %s firmware on your Amazfit Cor.\n\nPlease make sure to install the .fw file, and after that the .res file. Your band will reboot after installing the .fw file.\n\nNote: You do not have to install .res if it is exactly the same as the one previously installed.\n\nPROCEED AT YOUR OWN RISK! You are about to install the %s firmware on your Amazfit Cor 2. \n From 97d6827ca00e16afa73fc5324e8b913784c2b4f1 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Sat, 12 Oct 2019 21:52:39 +0000 Subject: [PATCH 03/12] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (711 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pt_BR/ --- app/src/main/res/values-pt-rBR/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3cf8f2bce..db4592514 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -765,8 +765,9 @@ Makibes HR3 Amazfit Bip Lite Encontrar telefone - Ativar encontrar telefone + Ativar \"Encontrar telefone\" Use sua pulseira para reproduzir o toque sonoro do seu celular. Duração do toque sonoro em segundos Duração + Esse dispositivo precisa de sua chave de autenticação secreta, realize pressionamento longo no dispositivo para inseri-lo. Leia o wiki. \ No newline at end of file From 368505eb4150629db9adddc8755254da4a246bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 12 Oct 2019 19:43:20 +0000 Subject: [PATCH 04/12] Translated using Weblate (English) Currently translated at 100.0% (711 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/en/ --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 76abbe50a..3d7ab28a1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -448,7 +448,7 @@ Use heart rate sensor to improve sleep detection Device time offset in hours (for detecting sleep of shift workers) Find phone - Enable find phone + Turn on \\\'Find phone\\\' Use your band to play your phone\'s ringtone. Ring duration in seconds Date format From 591b35732ae549badb5f79e46a1582510ecdf2b3 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Sat, 12 Oct 2019 19:00:14 +0000 Subject: [PATCH 05/12] Translated using Weblate (Hebrew) Currently translated at 99.9% (710 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/ --- app/src/main/res/values-he/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index d60ff5c45..2a292a311 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -759,4 +759,5 @@ ניתן להשתמש בצמיד כדי שהטלפון שלך ישמיע צלצול. משך זמן הצלצול בשניות משך + למכשיר זה נדרש מפתח אימות סודי, יש לגעת נגיעה ארוכה על המכשיר כדי להזין אותו. פרטים נוספים בוויקי. \ No newline at end of file From 06e8e2833c829d2025c462aafb7a157a23c122ce Mon Sep 17 00:00:00 2001 From: FransM Date: Sat, 12 Oct 2019 18:43:53 +0000 Subject: [PATCH 06/12] Translated using Weblate (Dutch) Currently translated at 99.2% (705 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/ --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2fb2246c2..af03566fd 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -347,7 +347,7 @@ Tijd Tijd & datum Knoppen acties - Specificeer actie voor de Mi Band knopdruk + Specificeer actie voor de Mi Band 2 knopdruk Aantal knopdrukken Aantal knopdrukken nodig om een bericht te sturen Uit te sturen bericht From 17a35901c603417ada7f50176bc1ee67bee63b39 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Sat, 12 Oct 2019 21:05:12 +0000 Subject: [PATCH 07/12] Translated using Weblate (French) Currently translated at 100.0% (711 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/ --- app/src/main/res/values-fr/strings.xml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 20c321318..566ef10bc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -433,7 +433,7 @@ Temps de sommeil préféré en heures Activer tâche de fond JS Si activé, autorise l\'affichage de la météo, niveau de batterie, etc. Activité Web View - Connexion + Connexion … Vous êtes sur le point d\'installer le micrologiciel %s sur votre Amazfit Cor. \n \nVeuillez installer le fichier .fw, puis le fichier .res. Votre montre redémarrera après installation du fichier .fw. @@ -626,7 +626,7 @@ Temps de sommeil préféré en heures Mode Filtre Mode Configuration Sauvegarder la configuration - Non connecté, l\'alarme n\'est pas définie + Non connecté, l’alarme n’est pas définie. Notification de déconnexion Paramètres ZeTime Paramètres Fréquence Cardiaque @@ -720,4 +720,19 @@ Temps de sommeil préféré en heures Gamme des graphiques Pas par mois Sommeil par mois + NFC + Utiliser une police personnalisée + Exportation de la base de données … + Exportation et importation + Étapes : %1$02d + État et alarmes + Régler l’alarme après : + 5 minutes + 10 minutes + 20 minutes + 1 heure + Toujours visible + Visible uniquement si aucun appareil n\'est ajouté + Durée de la sonnerie en secondes + Durée \ No newline at end of file From 63de6634cd62d2a9170090348931733780e56cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Est=C3=A9bastien=20Robespi?= Date: Sat, 12 Oct 2019 21:35:47 +0000 Subject: [PATCH 08/12] Translated using Weblate (French) Currently translated at 100.0% (711 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/ --- app/src/main/res/values-fr/strings.xml | 40 ++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 566ef10bc..7609c9530 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -684,14 +684,14 @@ Temps de sommeil préféré en heures Changez la clé auteur à une clé générale sur tous vos appareils Android sur lesquels vous souhaitez vous connecter. La précédente clé par défaut était 0123456789@ABCDE BFH-16 Vous êtes sur le point d\'installer le micrologiciel %s sur votre Amazfit Cor 2. -\n +\n \nVeuillez installer le fichier .fw, puis le fichier .res. Votre montre redémarrera après installation du .fw. \n -\nNote : Il n\'est pas nécessaire d\'installer le fichier .res si celui-ci est identique à celui installé précédemment. -\n -\nCONTINUEZ À VOS RISQUES ! +\nNote : il n\'est pas nécessaire d\'installer le fichier .res si celui-ci est identique à celui installé précédemment. \n -\nNON TESTÉ, IL PEUT ÊTRE NÉCESSAIRE DE FLASH UN micrologiciel BEATS_W SI LE NOM DE L\'APPAREIL EST \"Amazfit Band 2\" +\nCONTINUEZ À VOS RISQUES ! +\n +\nNON TESTÉ, IL PEUT ÊTRE NÉCESSAIRE DE FLASHER UN MICROLOGICIEL BEATS_W SI LE NOM DE L\'APPAREIL EST « Amazfit Band 2 » Néerlandais Turc Ukrainien @@ -735,4 +735,34 @@ Temps de sommeil préféré en heures Visible uniquement si aucun appareil n\'est ajouté Durée de la sonnerie en secondes Durée + La portée des graphs est réglée sur un mois + La portée des graphs est réglée sur une semaine + Mijia Smart Clock + Permettre aux autres applis d\'accéder aux données de fréquence cardiaque en temps réel lorsque Gadgetbridge est connecté + Accès tiers fréq. cardiaque + À activer si votre appareil a une police spéciale embarquée pour prendre en charge les émoticônes + L\'export automatique des données est réglé vers : + Export auto + Export de données + Import de données + Lancer l\'export maintenant + Supprimer les anciennes données + Vider la base de données + Vide la base de données + Attention ! Ce bouton détruit votre base de données et réinitialise. + Réveil + "Dormir %1$ s" + + %d heure + %d heures + + Bouton pour connecter un nouvel appareil + Pour visualiser votre géolocalisation, installez une appli qui lit les fichiers GPX. + Réglages Makibes HR3 + Makibes HR3 + Amazfit Bip Lite + Trouver le téléphone + Activer « Trouver le tél. » + Utilisez votre bande pour lire l\'alarme de votre téléphone. + Cet appareil a besoin d\'une clé d\'auth. Pression longue sur celui-ci pour la saisir. Lisez le wiki. \ No newline at end of file From 9f60d49bee00aa61a6daed135ac5314d195f4ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= Date: Sun, 13 Oct 2019 03:20:53 +0000 Subject: [PATCH 09/12] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (711 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/ --- app/src/main/res/values-zh-rCN/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3bf151cf2..3cdd4d045 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -766,4 +766,5 @@ 使用您的手环以在手机上播放铃声。 铃声将持续数秒 持续 + 此设备需要认证密钥，请在设备上长按以输入密钥。具体请阅读 Wiki 。 \ No newline at end of file From 92780f5abde9af08d0b246c571f0948312ca0991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 12 Oct 2019 19:41:30 +0000 Subject: [PATCH 10/12] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 97.9% (696 of 711 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nb_NO/ --- app/src/main/res/values-nb-rNO/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 8670be201..2d903e5a1 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -755,4 +755,11 @@ For å vise aktivitetsspor, installer et program som kan håndtere GPX-filer. Makibes HR3-innstillinger Makibes HR3 + Amazfit Bip Lite + Finn telefon + Skru på \"Finn telefon\" + Bruk båndet ditt til å spille av telefonens ringetone. + Anropsvarighet i sekunder + Varighet + Denne enheten trenger en hemmelig identitetsbekreftelsesnøkkel. Trykk lenge på enheten for å skrive den inn. Les wiki-en. \ No newline at end of file From 408bcda087a875c14535e6978225b5ec355d3238 Mon Sep 17 00:00:00 2001 From: Marc Laporte Date: Tue, 15 Oct 2019 12:14:36 -0400 Subject: [PATCH 11/12] Fix a typo --- CHANGELOG.md | 2 +- app/src/main/res/xml/changelog_master.xml | 2 +- fastlane/metadata/android/en-US/changelogs/158.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 748b070ab..314a28176 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ #### Version 0.37.0 * Initial Makibes HR3 support -* Amazfit Bip Lite: Inittal working support, firmware update is disabled for now (we do not have any firmware for testing) +* Amazfit Bip Lite: Initial working support, firmware update is disabled for now (we do not have any firmware for testing) * Amazfit Cor 2: Enable Emoji Font setting and 3rd party HR access * Find Phone now also vibration in addition to playing the ring tone * ID115: All settings are now per-device diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index de4646768..fd13a1b16 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -2,7 +2,7 @@ Initial Makibes HR3 support - Amazfit Bip Lite: Inittal working support, firmware update is disabled for now (we do not have any firmware for testing) + Amazfit Bip Lite: Initial working support, firmware update is disabled for now (we do not have any firmware for testing) Amazfit Cor 2: Enable Emoji Font setting and 3rd party HR access Find Phone now also vibration in addition to playing the ring tone ID115: All settings are now per-device diff --git a/fastlane/metadata/android/en-US/changelogs/158.txt b/fastlane/metadata/android/en-US/changelogs/158.txt index ea026740a..7cefbc2e6 100644 --- a/fastlane/metadata/android/en-US/changelogs/158.txt +++ b/fastlane/metadata/android/en-US/changelogs/158.txt @@ -1,5 +1,5 @@ * Initial Makibes HR3 support -* Amazfit Bip Lite: Inittal working support, firmware update is disabled for now (we do not have any firmware for testing) +* Amazfit Bip Lite: Initial working support, firmware update is disabled for now (we do not have any firmware for testing) * Amazfit Cor 2: Enable Emoji Font setting and 3rd party HR access * Find Phone now also vibration in addition to playing the ring tone * ID115: All settings are now per-device From 2c718ecd0153c74d264b74b174c95967f302fcd6 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 15 Oct 2019 20:46:39 +0200 Subject: [PATCH 12/12] bump version, add changelog --- CHANGELOG.md | 3 +++ app/build.gradle | 4 ++-- app/src/main/res/xml/changelog_master.xml | 3 +++ fastlane/metadata/android/en-US/changelogs/159.txt | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/159.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 314a28176..a25b8ee75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ### Changelog +#### Version 0.37.1 +* Amazfit Bip Lite: Support flashing firmware and watchfaces + #### Version 0.37.0 * Initial Makibes HR3 support * Amazfit Bip Lite: Initial working support, firmware update is disabled for now (we do not have any firmware for testing) diff --git a/app/build.gradle b/app/build.gradle index f20bebb8f..90b1f97e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,8 @@ android { targetSdkVersion 27 // Note: always bump BOTH versionCode and versionName! - versionName "0.37.0" - versionCode 158 + versionName "0.37.1" + versionCode 159 vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index fd13a1b16..3b07ec6db 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -1,5 +1,8 @@ + + Amazfit Bip Lite: Support flashing firmware and watchfaces + Initial Makibes HR3 support Amazfit Bip Lite: Initial working support, firmware update is disabled for now (we do not have any firmware for testing) diff --git a/fastlane/metadata/android/en-US/changelogs/159.txt b/fastlane/metadata/android/en-US/changelogs/159.txt new file mode 100644 index 000000000..7aba1f760 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/159.txt @@ -0,0 +1 @@ +* Amazfit Bip Lite: Support flashing firmware and watchfaces