From 159a937cabd91557169e971378461c9a77c9a8d6 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 15 Mar 2020 00:23:06 +0100 Subject: [PATCH 01/20] Fossil Hybrid HR: Support button configuration in per-device settings Related: #1751 --- .../DeviceSettingsPreferenceConst.java | 3 +++ .../DeviceSpecificSettingsFragment.java | 6 ++++++ .../devices/qhybrid/QHybridSupport.java | 6 ++++++ .../devices/qhybrid/adapter/WatchAdapter.java | 2 ++ .../adapter/fossil/FossilWatchAdapter.java | 7 ++++++- .../fossil_hr/FossilHRWatchAdapter.java | 19 +++++++++++++++++ .../adapter/misfit/MisfitWatchAdapter.java | 5 +++++ .../ButtonConfigurationPutRequest.java | 12 +++++------ app/src/main/res/values/arrays.xml | 21 +++++++++++++++++++ app/src/main/res/values/strings.xml | 9 ++++++++ .../res/xml/devicesettings_fossilhybridhr.xml | 21 +++++++++++++++++++ 11 files changed, 104 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java index a40bdf45a..b74575ba2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java @@ -25,4 +25,7 @@ public class DeviceSettingsPreferenceConst { public static final String PREF_ALLOW_HIGH_MTU = "allow_high_mtu"; public static final String PREF_SYNC_CALENDAR = "sync_calendar"; public static final String PREF_USE_CUSTOM_DEVICEICON = "use_custom_deviceicon"; + public static final String PREF_BUTTON_1_FUNCTION = "button_1_function"; + public static final String PREF_BUTTON_2_FUNCTION = "button_2_function"; + public static final String PREF_BUTTON_3_FUNCTION = "button_3_function"; } \ No newline at end of file diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java index c451a03c5..2c9ce0c49 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java @@ -39,6 +39,9 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs; import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference; import nodomain.freeyourgadget.gadgetbridge.util.XTimePreferenceFragment; +import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_BUTTON_1_FUNCTION; +import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_BUTTON_2_FUNCTION; +import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_BUTTON_3_FUNCTION; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DATEFORMAT; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SCREEN_ORIENTATION; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TIMEFORMAT; @@ -313,6 +316,9 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat { addPreferenceHandlerFor(PREF_WEARLOCATION); addPreferenceHandlerFor(PREF_SCREEN_ORIENTATION); addPreferenceHandlerFor(PREF_TIMEFORMAT); + addPreferenceHandlerFor(PREF_BUTTON_1_FUNCTION); + addPreferenceHandlerFor(PREF_BUTTON_2_FUNCTION); + addPreferenceHandlerFor(PREF_BUTTON_3_FUNCTION); String displayOnLiftState = prefs.getString(PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_DO_NOT_DISTURB_OFF); boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_DO_NOT_DISTURB_SCHEDULED); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java index f30191093..e5a44b693 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java @@ -330,6 +330,12 @@ public class QHybridSupport extends QHybridBaseSupport { this.watchAdapter.onSetAlarms(alarms); } + @Override + public void onSendConfiguration(String config) { + if (watchAdapter != null) { + watchAdapter.onSendConfiguration(config); + } + } private void loadTimeOffset() { timeOffset = getContext().getSharedPreferences(getContext().getPackageName(), Context.MODE_PRIVATE).getInt("QHYBRID_TIME_OFFSET", 0); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java index e6e39b050..629b14e21 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java @@ -85,6 +85,8 @@ public abstract class WatchAdapter { public abstract void onSetAlarms(ArrayList alarms); + public abstract void onSendConfiguration(String config); + public abstract boolean onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic); public void onMtuChanged(BluetoothGatt gatt, int mtu, int status){}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java index ab030c145..e7c1aba93 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java @@ -151,7 +151,7 @@ public class FossilWatchAdapter extends WatchAdapter { } } - private SharedPreferences getDeviceSpecificPreferences(){ + protected SharedPreferences getDeviceSpecificPreferences(){ return GBApplication.getDeviceSpecificSharedPrefs( getDeviceSupport().getDevice().getAddress() ); @@ -456,6 +456,11 @@ public class FossilWatchAdapter extends WatchAdapter { }); } + @Override + public void onSendConfiguration(String config) { + + } + @Override public boolean onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) { switch (characteristic.getUuid().toString()) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java index a51cbf9b7..41a5eaed8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java @@ -26,6 +26,7 @@ import java.util.TimeZone; import java.util.UUID; import nodomain.freeyourgadget.gadgetbridge.GBApplication; +import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl; @@ -667,8 +668,16 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { String[] menuItems = new String[jsonArray.length()]; for (int i = 0; i < jsonArray.length(); i++) menuItems[i] = jsonArray.getString(i); + SharedPreferences prefs = getDeviceSpecificPreferences(); + String upperButtonApp = prefs.getString(DeviceSettingsPreferenceConst.PREF_BUTTON_1_FUNCTION, "weatherApp"); + String middleButtonApp = prefs.getString(DeviceSettingsPreferenceConst.PREF_BUTTON_2_FUNCTION, "commuteApp"); + String lowerButtonApp = prefs.getString(DeviceSettingsPreferenceConst.PREF_BUTTON_3_FUNCTION, "musicApp"); + queueWrite(new ButtonConfigurationPutRequest( menuItems, + upperButtonApp, + middleButtonApp, + lowerButtonApp, this )); } catch (JSONException e) { @@ -676,6 +685,16 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { } } + @Override + public void onSendConfiguration(String config) { + switch (config) { + case DeviceSettingsPreferenceConst.PREF_BUTTON_1_FUNCTION: + case DeviceSettingsPreferenceConst.PREF_BUTTON_2_FUNCTION: + case DeviceSettingsPreferenceConst.PREF_BUTTON_3_FUNCTION: + overwriteButtons(null); + } + } + @Override public void handleHeartRateCharacteristic(BluetoothGattCharacteristic characteristic) { super.handleHeartRateCharacteristic(characteristic); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java index 3523134c6..8e469093d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java @@ -465,6 +465,11 @@ public class MisfitWatchAdapter extends WatchAdapter { return; } + @Override + public void onSendConfiguration(String config) { + + } + @Override public void overwriteButtons(String jsonConfigString) { uploadFileRequest = new UploadFileRequest((short) 0x0800, new byte[]{ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java index ebea27b27..983dc32c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java @@ -12,11 +12,11 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fos import nodomain.freeyourgadget.gadgetbridge.util.GB; public class ButtonConfigurationPutRequest extends JsonPutRequest { - public ButtonConfigurationPutRequest(String[] menuItems, FossilHRWatchAdapter adapter) { - super(createObject(menuItems), adapter); + public ButtonConfigurationPutRequest(String[] menuItems, String upperButtonApp, String middleButtonApp, String lowerButtonApp, FossilHRWatchAdapter adapter) { + super(createObject(menuItems, upperButtonApp, middleButtonApp, lowerButtonApp), adapter); } - private static JSONObject createObject(String[] menuItems) { + private static JSONObject createObject(String[] menuItems, String upperButtonApp, String middleButtonApp, String lowerButtonApp) { try { return new JSONObject() .put("push", new JSONObject() @@ -24,15 +24,15 @@ public class ButtonConfigurationPutRequest extends JsonPutRequest { .put("commuteApp._.config.destinations", new JSONArray(menuItems)) .put("master._.config.buttons", new JSONArray() .put(new JSONObject() - .put("name", "weatherApp") + .put("name", upperButtonApp) .put("button_evt", "top_short_press_release") ) .put(new JSONObject() - .put("name", "commuteApp") + .put("name", middleButtonApp) .put("button_evt", "middle_short_press_release") ) .put(new JSONObject() - .put("name", "commuteApp") + .put("name", lowerButtonApp) .put("button_evt", "bottom_short_press_release") ) ) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index f0ade9285..a65758012 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -653,4 +653,25 @@ FORWARD REWIND + + @string/menuitem_notifications + @string/menuitem_weather + @string/menuitem_music + @string/hr_appname_stopwatch + @string/menuitem_timer + @string/hr_appname_commute + @string/hr_appname_wellness + @string/hr_appname_workout + + + notificationsPanelApp + weatherApp + musicApp + stopwatchApp + timerApp + commuteApp" + wellnessApp + workoutApp + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b75892ac..ab354ee0f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -794,6 +794,15 @@ Weather Nothing + Wellness + Workout + Stopwatch + Commute + + Upper Button + Middle Button + Lower Button + Event 1 action Event 2 action Event 3 action diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml index 028fa1fe5..a2a2e608b 100644 --- a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml +++ b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml @@ -1,5 +1,26 @@ + + + Date: Sun, 15 Mar 2020 09:44:47 +0100 Subject: [PATCH 02/20] Set max limit on notification body (Fossil Hybrid HR). (#1820) Set max limit on notification body. --- .../fossil/notification/PlayNotificationRequest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java index 977c6e0d2..b3e0c9f09 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java @@ -19,6 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fo import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.Charset; +import java.util.Arrays; import java.util.zip.CRC32; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter; @@ -57,7 +58,9 @@ public abstract class PlayNotificationRequest extends FilePutRequest { byte[] senderBytes = nullTerminatedSender.getBytes(charsetUTF8); String nullTerminatedMessage = StringUtils.terminateNull(message); byte[] messageBytes = nullTerminatedMessage.getBytes(charsetUTF8); - + if (messageBytes.length > 490) { + messageBytes = Arrays.copyOf(messageBytes, 490); + } short mainBufferLength = (short) (lengthBufferLength + uidLength + appBundleCRCLength + titleBytes.length + senderBytes.length + messageBytes.length); ByteBuffer mainBuffer = ByteBuffer.allocate(mainBufferLength); From 9ac36c78392c1db8135312d0bc3414337674551e Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Thu, 12 Mar 2020 09:56:12 +0000 Subject: [PATCH 03/20] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (766 of 766 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pt_BR/ --- app/src/main/res/values-pt-rBR/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6d7ff4cd4..7d542e88e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -848,4 +848,6 @@ Encontrei! Forçar preto no esquema de cores branco Útil se seu relógio possui ponteiros escuros + Localizar meu telefone + Notificações de Gadgetbridge de alta prioridade \ No newline at end of file From 83a76a0dbfe0695a318452b5700f2a9d68765430 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Thu, 12 Mar 2020 12:20:44 +0000 Subject: [PATCH 04/20] Translated using Weblate (Hebrew) Currently translated at 100.0% (766 of 766 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/ --- app/src/main/res/values-he/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 992426208..8ed802fdf 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -838,4 +838,6 @@ מצאתי! לאכוף ערכת צבעים שחור על לבן שימושי לידיים כהות + איתור הטלפון שלי + התראות מ־Gadgetbridge בעדיפות גבוהה \ No newline at end of file From 6ab59557479b5c938efbbebc7616721c546c6ce4 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Thu, 12 Mar 2020 12:57:05 +0000 Subject: [PATCH 05/20] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (768 of 768 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pt_BR/ --- app/src/main/res/values-pt-rBR/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7d542e88e..f19c4cd74 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -850,4 +850,6 @@ Útil se seu relógio possui ponteiros escuros Localizar meu telefone Notificações de Gadgetbridge de alta prioridade + Mostrar ícone de notificação específica do dispositivo + Mostra o ícone de notificação Android específico de um dispositivo em vez do ícone do Gadgetbridge quando conectado \ No newline at end of file From 5c182dd2ffc1d9b83d4b7402130a3d03a444ac3a Mon Sep 17 00:00:00 2001 From: nautilusx Date: Fri, 13 Mar 2020 06:06:49 +0000 Subject: [PATCH 06/20] Translated using Weblate (German) Currently translated at 100.0% (768 of 768 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/ --- app/src/main/res/values-de/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 45b125244..8e63b4def 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -845,4 +845,8 @@ Gefunden! Schwarz-Weiß-Farbschema erzwingen Nützlich, wenn deine Uhr dunkle Zeiger hat + Mein Telefon finden + Gadgetbridge-Benachrichtigungen mit hoher Priorität + Gerätespezifisches Benachrichtigungssymbol anzeigen + Zeige ein gerätespezifisches Android-Benachrichtigungssymbol anstelle des Gadgetbridge-Symbols, wenn eine Verbindung besteht \ No newline at end of file From 1d6b1b049a146a17e7ca60cde0c23ddc703dcf4b Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Thu, 12 Mar 2020 13:42:09 +0000 Subject: [PATCH 07/20] Translated using Weblate (Hebrew) Currently translated at 100.0% (768 of 768 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/ --- app/src/main/res/values-he/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 8ed802fdf..561eab37b 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -840,4 +840,6 @@ שימושי לידיים כהות איתור הטלפון שלי התראות מ־Gadgetbridge בעדיפות גבוהה + הצגת סמל התראה ייעודי למכשיר + הצגת התראת Android תואמת מכשיר במקום הסמל של Gadgetbridge כשיש חיבור \ No newline at end of file From 7268a9343c9380461167295ed100b074bb4cb010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= Date: Thu, 12 Mar 2020 13:56:13 +0000 Subject: [PATCH 08/20] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (768 of 768 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/ --- app/src/main/res/values-zh-rCN/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e141dca60..c56ae10b1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -838,4 +838,6 @@ 如果您双手颜色较深，将会有帮助 查找我的手机 Gadgetbridge 通知高优先级 + 显示设备特定的通知图标 + 显示设备指定的 Android 通知图标以替代已连接时的 Gadgetbridge 图标 \ No newline at end of file From 11223be4453eae3ea4767583441fe3c83d63f4f8 Mon Sep 17 00:00:00 2001 From: homocomputeris Date: Sat, 14 Mar 2020 22:19:02 +0000 Subject: [PATCH 09/20] Translated using Weblate (Russian) Currently translated at 98.4% (756 of 768 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/ --- app/src/main/res/values-ru/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index de90c736f..012ea5aee 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -823,4 +823,9 @@ iTag Разрешить высокий MTU Увеличивает скорость передачи данных, но может не работать на некоторых Android-устройствах. + Включает уведомления календаря, даже когда отключено + Синхронизировать события в календаре + Найти телефон + Показывать собственную иконку устройства + При подключении показывать в уведомлении собственную иконку устройства вместо иконки Gadgetbridge \ No newline at end of file From 0664b5146fcbc84de7e0b6628d81756ee206b352 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Sat, 14 Mar 2020 23:46:47 +0000 Subject: [PATCH 10/20] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (775 of 775 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pt_BR/ --- app/src/main/res/values-pt-rBR/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f19c4cd74..a8763b31a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -852,4 +852,11 @@ Notificações de Gadgetbridge de alta prioridade Mostrar ícone de notificação específica do dispositivo Mostra o ícone de notificação Android específico de um dispositivo em vez do ícone do Gadgetbridge quando conectado + Bem-estar + Treino + Cronômetro + Comutar + Botão superior + Botão do meio + Botão inferior \ No newline at end of file From 656584463f61fc4dadce1f6dbef599f20423b447 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Sun, 15 Mar 2020 08:05:50 +0000 Subject: [PATCH 11/20] Translated using Weblate (Hebrew) Currently translated at 100.0% (775 of 775 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/ --- app/src/main/res/values-he/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 561eab37b..eb828e2ec 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -842,4 +842,11 @@ התראות מ־Gadgetbridge בעדיפות גבוהה הצגת סמל התראה ייעודי למכשיר הצגת התראת Android תואמת מכשיר במקום הסמל של Gadgetbridge כשיש חיבור + רווחה + אימון + שעון עצר + התניידות + כפתור עליון + כפתור אמצעי + כפתור תחתון \ No newline at end of file From 70dfd93215d151557cc3a84d26a8557684c921e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= Date: Sun, 15 Mar 2020 02:15:44 +0000 Subject: [PATCH 12/20] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (775 of 775 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/ --- app/src/main/res/values-zh-rCN/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c56ae10b1..16d63a097 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -840,4 +840,11 @@ Gadgetbridge 通知高优先级 显示设备特定的通知图标 显示设备指定的 Android 通知图标以替代已连接时的 Gadgetbridge 图标 + 健康 + 健身 + 秒表 + 通勤 + 上按钮 + 中按钮 + 下按钮 \ No newline at end of file From 5daa57e8935bb5b5cdd3133c95f9532de657ca42 Mon Sep 17 00:00:00 2001 From: Andy Yang Date: Sun, 15 Mar 2020 10:38:10 +0000 Subject: [PATCH 13/20] Translated using Weblate (Chinese (Traditional)) Currently translated at 57.9% (449 of 775 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hant/ --- app/src/main/res/values-zh-rTW/strings.xml | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 86e4e6d5d..87526176f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -401,4 +401,71 @@ 您即將安裝 %s。 裝置電量不足！ %1$s 電量剩餘：%2$s%% + 經度 + 螢幕逾時 + 螢幕逾時（秒） + 最低心率 + 測試 + 無法連線。藍芽位址無效？ + 不適用 + 正在與 %s 配對… + 未輸入 MAC 位址，無法配對。 + 未提供有效的使用者資料，目前使用假定資料。 + 請確認您的裝置可以被偵測到。已連接的裝置將無法被偵測。請在 Android 6 以上的裝置啟用位置權限（如：GPS）。請對 Gadgetbridge 停用隱私守衛，因為這可能會導致您的手機崩潰並重新啟動。如果在數分鐘後仍未找到任何裝置，請重新啟動您的手機並再試一次。 + 備註： + 正在初始化 + 低電量警告 + 取消以停止振動。 + 上次充電：%s +\n + 匯出資料庫失敗！請檢查您的設定值。 + 韌體安裝完成 + 韌體安裝完成，正在重啟裝置… + 步數 + 卡路里 + 距離 + 尋找手機 + 正在安裝韌體 + 您確定要匯入資料？ + 匯入資料庫時發生錯誤：%1$s + 資料已刪除。 + 資料庫的自動匯出位置已設定為： + 自動匯出 + 立即執行自動匯出 + 正在匯出資料庫… + 取消 + 刪除 + 配對 + 運動 + GPS 誤差校正 + 資源包 + 未知的裝置 + 測試用裝置 + 支付寶（捷徑） + 鬧鐘 + 支付寶 + 通知過濾 + 輸入要進行比對的字，使用換行作為分隔 + 通知過濾已儲存 + 不過濾 + 在包含這些字時顯示 + 在包含這些字時隱藏 + 部份符合 + 完全符合 + 請至少輸入一個字 + 過濾模式 + 模式設定 + 新增小工具 + 貪睡 + 允許較高的 MTU 值 + 提高傳送速度，但可能無法在某些 Android 裝置上使用。 + 啟用日曆事件通知，即便在未連線時 + 同步日曆事件 + 心率 + 步數 + 日期 + 電量 + 天氣 + 找到了！ + 尋找我的手機 \ No newline at end of file From acca1b2b263a672e1c30ce6ea05977ff143d4456 Mon Sep 17 00:00:00 2001 From: nautilusx Date: Mon, 16 Mar 2020 17:45:28 +0000 Subject: [PATCH 14/20] Translated using Weblate (German) Currently translated at 99.8% (774 of 775 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/ --- app/src/main/res/values-de/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8e63b4def..10f5a1199 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -849,4 +849,10 @@ Gadgetbridge-Benachrichtigungen mit hoher Priorität Gerätespezifisches Benachrichtigungssymbol anzeigen Zeige ein gerätespezifisches Android-Benachrichtigungssymbol anstelle des Gadgetbridge-Symbols, wenn eine Verbindung besteht + Wellness + Training + Stoppuhr + Obere Taste + Mittlere Taste + Untere Taste \ No newline at end of file From 9846f202768df65e661d9b8a2b9dddec0bfe159e Mon Sep 17 00:00:00 2001 From: FransM Date: Mon, 16 Mar 2020 18:27:45 +0000 Subject: [PATCH 15/20] Translated using Weblate (Dutch) Currently translated at 100.0% (775 of 775 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/ --- app/src/main/res/values-nl/strings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2c526e21f..51b13ea2f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -836,4 +836,15 @@ Gevonden! Zwart op wit kleurenschema forceren Nuttig als je horloge donkere wijzers heeft + Vind mijn telefoon + Gadgetbridge hoge prioriteit meldingen + Toon apparaat specifieke meldingspictogram + Toon een apparaatspecifiek Android-meldpictogram in plaats van het Gadgetbridge-pictogram indien verbonden + Welzijn + Training + Stopwatch + Woon-werkverkeer + Bovenste knop + Middelste knop + Onderste knop \ No newline at end of file From 3f480b30df421109c5c231d2e5b696c13824a82e Mon Sep 17 00:00:00 2001 From: Kintu Date: Wed, 18 Mar 2020 15:18:30 +0000 Subject: [PATCH 16/20] Translated using Weblate (Catalan) Currently translated at 100.0% (775 of 775 strings) Translation: Freeyourgadget/Gadgetbridge Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ca/ --- app/src/main/res/values-ca/strings.xml | 58 ++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 144d7a464..3fdf5b3a4 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -335,7 +335,7 @@ Accions del botó Especifiqueu les accions en prémer el botó Nombre de pulsacions del botó - Nombre de vegades que cal prémer el botó per activar la difusió de missatge + Nombre de vegades que cal prémer el botó per activar un Esdeveniment 1. Després, prémer el mateix nombre de vegades crearà un Esdeveniment 2, i successivament. Missatge de difusió a enviar Activa el botó d\'acció Activa un acció en prémer un botó un cert nombre de vegades @@ -347,7 +347,7 @@ Notificació d\'objectiu La polsera vibrarà quan l\'objectiu diari de passes siga assolit Elements a mostrar - Escolliu els elements a mostrar en la pantalla de la polsera + Escolliu els elements a mostrar a la pantalla de la polsera Activa la pantalla en alçar-la Gira el canell per canviar la informació No molesteu @@ -437,7 +437,7 @@ No enviïs l\'ACK de les dades d\'activitats Si l\'arribada de les dades d\'activitats no és notificada a la polsera, aquestes dades no s\'eliminaran. Aquesta opció pot ser útil si feu servir el Gadgebridge també amb altres aplicacions. Les dades d\'activitats de la Mi Band es guardaran fins i tot després de sincronitzar. Aquesta opció pot ser útil si feu servir el Gadgebridge també amb altres aplicacions. - Messatge que s\'enviarà quan s\'hagi premut el botó el nombre de vegades establert + Difón el missatge enviat amb l\'esdeveniment. El paràmetre `button_id` és afegit automàticament a cada missatge. Retard després d\'una acció de botó (el nombre és a l\'intent extra de button_id) o 0 per procedir immediatament Desa dades sense processar a la base de dades Desa les dades \"tal qual\", tot augmentant l\'ús de la base de dades per tal de permetre possibles interpretacions més tard. @@ -793,4 +793,56 @@ Fes servir la teva banda per a reproduir el to del telèfon. Aquest aparell requereix una clau d\'autenticació secreta, mantingueu premut sobre l\'aparell per a introduir-la. Consulteu la wiki. Augmenta la velocitat de transferència, però pot ser que no funcioni en alguns aparells Android. + Fossil Q Hybrid + Configuració de Q Hybrid + Rellotge no connectat + intensitat de vibració: + Objectiu en passes + decalat horari + decalat del segon fus horari relatiu a UTC + sobreescriu els botons + utilitza la maneta d\'activitat com a comptador de notificacions + Si us plau, estableix el comptador de passes a un milió per a activar-ho. + Botons sobreescrits + Error al sobreescriure botons + decala el fus horari en + el canvi pot trigar uns segons… + temps decalat en + Desactiva el nou escaneig BLE + Marca aquesta opció si el teu aparell no pot ser trobat durant la detecció + Bangle.js + Y5 + Acció d\'esdeveniment 1 + Acció d\'esdeveniment 2 + Acció d\'esdeveniment 3 + Configuració detallada de premuda de botó + Acció de premuda llarga de botó + Posposa + S\'ha de permetre i activar l\'accés a la localitztació per al correcte funcionament de l\'escaneig + iTag + Permet una alta MTU + Activa les alertes de calendari, fins i tot quan estigui desconnectat + Sincronitza els esdeveniments del calendari + Ritme cardíac + Passes + Data + Minuts actius + Calories + Bateria + El temps + Res + Trobat! + Força l\'esquema de color blanc sobre negre + Útil si si el teu rellotge té les manetes negres + Troba el meu telèfon + Notificacions de Gadgetbridge d\'alta prioritat + Mostra l\'icona de notificació específica de l\'aparell + Mostra l\'icona de notificació d\'Android específica de l\'aparell enlloc de l\'icona de Gadgetbridge quan estigui connectat + Benestar + Entrenament + Cronòmetre + Desplçament + Botó superior + Botó mitger + Botó inferior \ No newline at end of file From 101e2c66642bcfafc2014f479b71a1831d55c374 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Fri, 20 Mar 2020 17:14:00 +0100 Subject: [PATCH 17/20] Fossil Hybrid HR: allow setting vibration strength Also allow re-fetching of configuration again (it updates battery levels) --- .../DeviceSettingsPreferenceConst.java | 1 + .../DeviceSpecificSettingsFragment.java | 2 ++ .../devices/qhybrid/QHybridCoordinator.java | 2 +- .../adapter/fossil_hr/FossilHRWatchAdapter.java | 14 +++++++++++++- app/src/main/res/values/strings.xml | 1 + .../main/res/xml/devicesettings_fossilhybridhr.xml | 10 +++++++++- 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java index b74575ba2..72573b18f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java @@ -28,4 +28,5 @@ public class DeviceSettingsPreferenceConst { public static final String PREF_BUTTON_1_FUNCTION = "button_1_function"; public static final String PREF_BUTTON_2_FUNCTION = "button_2_function"; public static final String PREF_BUTTON_3_FUNCTION = "button_3_function"; + public static final String PREF_VIBRATION_STRENGH_PERCENTAGE = "vibration_strength"; } \ No newline at end of file diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java index 2c9ce0c49..dbd96d8a6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java @@ -45,6 +45,7 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DATEFORMAT; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SCREEN_ORIENTATION; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TIMEFORMAT; +import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_VIBRATION_STRENGH_PERCENTAGE; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WEARLOCATION; import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_ACTIVATE_DISPLAY_ON_LIFT; import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISCONNECT_NOTIFICATION; @@ -319,6 +320,7 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat { addPreferenceHandlerFor(PREF_BUTTON_1_FUNCTION); addPreferenceHandlerFor(PREF_BUTTON_2_FUNCTION); addPreferenceHandlerFor(PREF_BUTTON_3_FUNCTION); + addPreferenceHandlerFor(PREF_VIBRATION_STRENGH_PERCENTAGE); String displayOnLiftState = prefs.getString(PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_DO_NOT_DISTURB_OFF); boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_DO_NOT_DISTURB_SCHEDULED); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java index 4f4802d9c..12d444e82 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java @@ -79,7 +79,7 @@ public class QHybridCoordinator extends AbstractDeviceCoordinator { @Override public boolean supportsActivityDataFetching() { - return false; + return true; } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java index 41a5eaed8..ad8d955e0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java @@ -106,7 +106,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { loadNotificationConfigurations(); queueWrite(new NotificationFilterPutHRRequest(this.notificationConfigurations, this)); - setVibrationStrength((short) 75); + setVibrationStrength(); syncSettings(); @@ -123,6 +123,15 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { queueWrite(new SetDeviceStateRequest(GBDevice.State.INITIALIZED)); } + private void setVibrationStrength() { + Prefs prefs = new Prefs(getDeviceSpecificPreferences()); + int vibrationStrengh = prefs.getInt(DeviceSettingsPreferenceConst.PREF_VIBRATION_STRENGH_PERCENTAGE, 2); + if (vibrationStrengh > 0) { + vibrationStrengh = (vibrationStrengh + 1) * 25; // Seems 0,50,75,100 are working... + } + setVibrationStrength((short) (vibrationStrengh)); + } + @Override public void setVibrationStrength(short strength) { negotiateSymmetricKey(); @@ -692,6 +701,9 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter { case DeviceSettingsPreferenceConst.PREF_BUTTON_2_FUNCTION: case DeviceSettingsPreferenceConst.PREF_BUTTON_3_FUNCTION: overwriteButtons(null); + break; + case DeviceSettingsPreferenceConst.PREF_VIBRATION_STRENGH_PERCENTAGE: + setVibrationStrength(); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab354ee0f..01d37264e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -186,6 +186,7 @@ Increases transfer speed, but might not work on some Android devices. Enables calendar alerts, even when disconnected Sync calendar events + Vibration strength Connect new device button Always visible Visible only if no device is added diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml index a2a2e608b..4217e9401 100644 --- a/app/src/main/res/xml/devicesettings_fossilhybridhr.xml +++ b/app/src/main/res/xml/devicesettings_fossilhybridhr.xml @@ -1,5 +1,6 @@ - + + + From ea606713d724ed695cf5a65da6de0d4a941b4dba Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Fri, 20 Mar 2020 17:21:20 +0100 Subject: [PATCH 18/20] Huami: Igore all-day events when syncing calendar events --- .../gadgetbridge/service/devices/huami/HuamiSupport.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java index 6069ae144..7616846c6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java @@ -1697,6 +1697,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport { int iteration = 0; for (CalendarEvents.CalendarEvent mEvt : mEvents) { + if (mEvt.isAllDay()) { + continue; + } if (iteration >= availableSlots || iteration > 2) { break; } @@ -1724,6 +1727,10 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport { int iteration = 0; for (CalendarEvents.CalendarEvent calendarEvent : calendarEvents) { + if (calendarEvent.isAllDay()) { + continue; + } + if (iteration > 8) { // limit ? break; } From 518edc8e878458a71b8841fdb0bc99bf98eb337c Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Fri, 20 Mar 2020 17:21:40 +0100 Subject: [PATCH 19/20] add changelog (WIP) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64adc34bb..0e9adf892 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ ### Changelog +#### Version 0.43.0 (WIP) +* Initial support for Fossil Hybrid HR (needs complicated key extraction, read wiki) +* Fossil: Allow switching off the Q Icon and use the default Gadgetbridge icon +* Fix VoIP call handling during DND +* Fix find-my-phone for Android 10 +* Huami: Fix crash when calendar event desctription or title was null +* Huami: Igore all-day events when syncing calendar events #### Version 0.42.1 * Fix accepting/rejecting calls on Android 9 From 8d89c397a7035ecaafcdd35045ab875ceea1d1cc Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Fri, 20 Mar 2020 21:52:59 +0100 Subject: [PATCH 20/20] repare release --- CHANGELOG.md | 2 +- app/src/main/res/xml/changelog_master.xml | 8 ++++++++ fastlane/metadata/android/en-US/changelogs/169.txt | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/169.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e9adf892..14baf4985 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ### Changelog -#### Version 0.43.0 (WIP) +#### Version 0.43.0 * Initial support for Fossil Hybrid HR (needs complicated key extraction, read wiki) * Fossil: Allow switching off the Q Icon and use the default Gadgetbridge icon * Fix VoIP call handling during DND diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 5f6349d9b..ed8f95ab3 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -1,5 +1,13 @@ + + Initial support for Fossil Hybrid HR (needs complicated key extraction, read wiki) + Fossil: Allow switching off the Q Icon and use the default Gadgetbridge icon + Fix VoIP call handling during DND + Fix find-my-phone for Android 10 + Huami: Fix crash when calendar event desctription or title was null + Huami: Igore all-day events when syncing calendar events + Fix accepting/rejecting calls on Android 9 Mi Band 3/4, Amazfit Bip/Cor/GTS/GTR: Option to sync calender events as reminder diff --git a/fastlane/metadata/android/en-US/changelogs/169.txt b/fastlane/metadata/android/en-US/changelogs/169.txt new file mode 100644 index 000000000..88e4575e0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/169.txt @@ -0,0 +1,6 @@ +* Initial support for Fossil Hybrid HR (needs complicated key extraction, read wiki) +* Fossil: Allow switching off the Q Icon and use the default Gadgetbridge icon +* Fix VoIP call handling during DND +* Fix find-my-phone for Android 10 +* Huami: Fix crash when calendar event desctription or title was null +* Huami: Igore all-day events when syncing calendar events