diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021MenuType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021MenuType.java index 582824238..9eb14a4a8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021MenuType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021MenuType.java @@ -56,9 +56,13 @@ public class Huami2021MenuType { put("00000033", "breathing"); put("00000038", "pomodoro"); put("00000039", "alexa2"); + put("0000003B", "thermometer"); put("0000003E", "todo"); put("0000003F", "mi_ai"); put("00000046", "zepp_coach"); + put("00000049", "body_composition"); + put("0000004A", "readiness"); + put("0000004C", "zepp_pay"); put("00000041", "barometer"); put("00000042", "voice_memos"); put("00000044", "sun_moon"); @@ -86,6 +90,7 @@ public class Huami2021MenuType { put("00000011", "female_health"); put("00000012", "breathing"); put("00000013", "spo2"); + put("00000015", "thermometer"); put("00000016", "alarm"); put("00000017", "calendar"); put("00000018", "events"); @@ -98,6 +103,11 @@ public class Huami2021MenuType { put("00000021", "eventreminder"); put("00000023", "mi_ai"); put("00000025", "alexa"); + put("00000027", "workout_shortcuts"); + put("00000028", "apps_shortcuts"); + put("00000029", "body_composition"); + put("0000002A", "readiness"); + put("0000002B", "zepp_pay"); }}; public static final Map controlCenterNameLookup = new HashMap() {{ @@ -116,5 +126,6 @@ public class Huami2021MenuType { put("00000002", "lockscreen"); put("00000005", "findphone"); put("00000019", "eject_water"); + put("0000001A", "headphone"); }}; } 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 77fbb6a72..a2f07d780 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 @@ -69,6 +69,7 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService { PHONE("9", "1"), EVENTS("10", "1"), STRESS("11", "1"), + THERMOMETER("12", "1"), WORLDCLOCK("13", "1"), TODO("17", "1"), COUNTDOWN("18", "1"), @@ -83,7 +84,10 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService { STOPWATCH("25", "1"), ZEPP_COACH("27", "1"), RECOMMENDATION("28", "1"), + BODY_COMPOSITION("33", "1"), + READINESS("34", "1"), ALEXA("35", "1"), + ZEPP_PAY("37", "1"), ; private final String appNum; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java index f2ac6b06c..0c6a6727a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java @@ -68,6 +68,16 @@ public class ZeppOsWatchfaceService extends AbstractZeppOsService { EMERALD_MOONLIGHT(0x00002D0A, R.string.zepp_os_watchface_emerald_moonlight), ROTATING_EARTH(0x00002D0F, R.string.zepp_os_watchface_rotating_earth), SUPERPOSITION(0x00002D0C, R.string.zepp_os_watchface_superposition), + + // Codes are from Balance, not sure if they match on other watches + VAST_SKY(0x00002DB6, R.string.zepp_os_watchface_vast_sky), + LIGHTNING_FLASH(0x00002DB7, R.string.zepp_os_watchface_lightning_flash), + FREE_COMBINATION(0x00002DB9, R.string.zepp_os_watchface_free_combination), + PURE_WHITE(0x00002DBA, R.string.zepp_os_watchface_pure_white), + GUIDER(0x00002DBB, R.string.zepp_os_watchface_guider), + CITY_OF_SPEED(0x00002DBC, R.string.zepp_os_watchface_city_of_speed), + STARRY_SKY(0x00002DBD, R.string.zepp_os_watchface_starry_sky), + THE_ULTIMA(0x00002DBE, R.string.zepp_os_watchface_the_ultima), ; private final int code; diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index f05f651f6..259ec48e4 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -770,6 +770,16 @@ @string/zepp_os_watchface_emerald_moonlight @string/zepp_os_watchface_rotating_earth @string/zepp_os_watchface_superposition + + @string/zepp_os_watchface_vast_sky + @string/zepp_os_watchface_lightning_flash + @string/zepp_os_watchface_free_combination + @string/zepp_os_watchface_pure_white + @string/zepp_os_watchface_guider + @string/zepp_os_watchface_city_of_speed + @string/zepp_os_watchface_starry_sky + @string/zepp_os_watchface_the_ultima + @@ -784,6 +794,14 @@ emerald_moonlight rotating_earth superposition + vast_sky + lightning_flash + free_combination + pure_white + guider + city_of_speed + starry_sky + the_ultima @@ -830,6 +848,12 @@ @string/menuitem_cards @string/menuitem_mi_ai @string/menuitem_zepp_coach + @string/menuitem_zepp_pay + @string/menuitem_readiness + @string/menuitem_body_composition + @string/menuitem_thermometer + @string/menuitem_workout_shortcuts + @string/menuitem_apps_shortcuts @string/menuitem_more @@ -878,6 +902,12 @@ cards mi_ai zepp_coach + zepp_pay + readiness + body_composition + thermometer + workout_shortcuts + apps_shortcuts more @@ -909,6 +939,12 @@ @string/menuitem_stopwatch @string/menuitem_recommendation @string/menuitem_zepp_coach + @string/menuitem_zepp_pay + @string/menuitem_readiness + @string/menuitem_body_composition + @string/menuitem_thermometer + @string/menuitem_workout_shortcuts + @string/menuitem_apps_shortcuts @string/menuitem_alexa @@ -939,6 +975,12 @@ stopwatch recommendation zepp_coach + zepp_pay + readiness + body_composition + thermometer + workout_shortcuts + apps_shortcuts alexa @@ -958,6 +1000,7 @@ @string/menuitem_lockscreen @string/menuitem_findphone @string/menuitem_eject_water + @string/menuitem_headphone @@ -976,6 +1019,7 @@ lockscreen findphone eject_water + headphone diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 49c5eaad9..ba1323e1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1406,6 +1406,12 @@ VO₂ Max Recommendation Zepp Coach + Zepp Pay + Thermometer + Readiness + Body composition + Workout shortcuts + Apps shortcuts Breathing Cycle Tracking Alarm @@ -1464,6 +1470,7 @@ Wi-Fi Lockscreen Eject Water + Headphone Unknown (%s) [UNSUPPORTED] %s Red Fantasy @@ -1476,6 +1483,14 @@ Emerald Moonlight Rotating Earth superposition + Vast Sky + Lightning flash + Free combination + Pure white + Guider + City of speed + Starry sky + The ultima Yesterday\'s Activity Minutes: Hours: