diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java index fcc5ff46ee..d7d54c35cb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java @@ -25,7 +25,7 @@ public class ZeppOsMenuType { * These somewhat match the ones in HuamiMenuType, but not all. The band sends and * receives those as 8-digit upper case hex strings. */ - public static final Map displayItemNameLookup = new HashMap() {{ + public static final Map displayItemNameLookup = new HashMap<>() {{ put("00000001", "personal_activity_intelligence"); put("00000002", "hr"); put("00000003", "workout"); @@ -81,9 +81,11 @@ public class ZeppOsMenuType { put("000F4258", "real_time_heart_rate"); put("000F4263", "watch_storage_space"); put("000F4259", "water_time"); + put("000F653B", "meditation"); + put("0010660A", "zepp_flow"); }}; - public static final Map shortcutsNameLookup = new HashMap() {{ + public static final Map shortcutsNameLookup = new HashMap<>() {{ put("00000001", "hr"); put("00000002", "weather"); put("00000003", "pai"); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java index 0a7c471efd..959ab2561d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java @@ -313,7 +313,7 @@ public class ZeppOsSupport extends AbstractDeviceSupport } } - LOG.warn("Unhandled config {}, will pass to HuamiSupport", config); + LOG.warn("Unhandled config {}", config); super.onSendConfiguration(config); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java index 4bc8f344c4..dddfb05632 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java @@ -93,6 +93,7 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService { ZEPP_PAY("37", "1"), CALORIES("38", "1"), HRV("1047865", "1"), + ZEPP_FLOW("1074698", "1"), ; private final String appNum; diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 492fedf968..bc8195a96e 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1103,6 +1103,8 @@ @string/menuitem_real_time_heart_rate @string/menuitem_watch_storage_space @string/menuitem_water_time + @string/activity_type_meditation + @string/menuitem_zepp_flow @string/menuitem_more @@ -1166,6 +1168,8 @@ real_time_heart_rate watch_storage_space water_time + meditation + zepp_flow more @@ -1206,6 +1210,7 @@ @string/menuitem_workout_shortcuts @string/menuitem_apps_shortcuts @string/menuitem_alexa + @string/menuitem_zepp_flow @@ -1244,6 +1249,7 @@ workout_shortcuts apps_shortcuts alexa + zepp_flow diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 47a2252da7..01c3e17785 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2123,6 +2123,7 @@ Mute Phone Camera Remote Alexa + Zepp Flow DND Stopwatch Activity Goal