diff --git a/CHANGELOG.md b/CHANGELOG.md index ca9d5c2cfa..1b1cd53690 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * Initial support for Colmi V73 * Initial support for D3, Qecnato S10 (GloryFit) * Initial support for Galaxy Buds3 Pro -* Initial support for Garmin Edge 130, Edge 840, Edge 1040, Forerunner 920, GPSMAP 66s, Lily 2 +* Initial support for Garmin Edge 130, Edge 840, Edge 1040, Forerunner 920, GPSMAP 66s, Lily 2, Tactix 8 * Initial support for Yawell R05 * Initial support for Sanitas SBM67 / SilverCrest SBM67 blood pressure meter * Initial support for Zendure SolarFlow (tested only 800 Pro) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/tactix/GarminTactix8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/tactix/GarminTactix8Coordinator.java new file mode 100644 index 0000000000..fe19e34394 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/tactix/GarminTactix8Coordinator.java @@ -0,0 +1,18 @@ +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.tactix; + +import java.util.regex.Pattern; + +import nodomain.freeyourgadget.gadgetbridge.R; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.GarminWatchCoordinator; + +public class GarminTactix8Coordinator extends GarminWatchCoordinator { + @Override + protected Pattern getSupportedDeviceName() { + return Pattern.compile("^tactix 8( - [\\d+]+mm)?$"); + } + + @Override + public int getDeviceNameResource() { + return R.string.devicetype_garmin_tactix_8; + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java index 39dd836573..c7cf8ced75 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java @@ -145,6 +145,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.lily.GarminLi import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.lily.GarminLily2Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.quatix.GarminQuatix8Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.swim.GarminSwim2Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.tactix.GarminTactix8Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.venu.GarminVenu2Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.venu.GarminVenu2PlusCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.venu.GarminVenu2SCoordinator; @@ -676,6 +677,7 @@ public enum DeviceType { GARMIN_FORERUNNER_955(GarminForerunner955Coordinator.class), GARMIN_FORERUNNER_965(GarminForerunner965Coordinator.class), GARMIN_QUATIX_8(GarminQuatix8Coordinator.class), + GARMIN_TACTIX_8(GarminTactix8Coordinator.class), GARMIN_SWIM_2(GarminSwim2Coordinator.class), GARMIN_INREACH_MINI_2(GarminInReachMini2.class), GARMIN_INSTINCT(GarminInstinctCoordinator.class), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40c15e2dce..df9845c5f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1966,6 +1966,7 @@ Garmin Fenix 7X Pro Garmin Fenix 8 Garmin Quatix 8 + Garmin Tactix 8 Garmin Descent Mk3 Garmin Descent G2 Garmin inReach Mini 2 diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 9481303efa..67b6b481cc 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -7,7 +7,7 @@ Initial support for Colmi V73 Initial support for D3, Qecnato S10 (GloryFit) Initial support for Galaxy Buds3 Pro - Initial support for Garmin Edge 130, Edge 840, Edge 1040, Forerunner 920, GPSMAP 66s, Lily 2 + Initial support for Garmin Edge 130, Edge 840, Edge 1040, Forerunner 920, GPSMAP 66s, Lily 2, Tactix 8 Initial support for Yawell R05 Initial support for Sanitas SBM67 / SilverCrest SBM67 blood pressure meter Initial support for Zendure SolarFlow (tested only 800 Pro) diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java index c1f41ddf72..c7679b58b7 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java @@ -98,6 +98,7 @@ public class AbstractDeviceCoordinatorTest extends TestBase { put("Venu Sq", DeviceType.GARMIN_VENU_SQ); put("fenix 8 - 51mm", DeviceType.GARMIN_FENIX_8); // #4226 put("quatix 8 - 51mm", DeviceType.GARMIN_QUATIX_8); // #5575 + put("tactix 8 - 51mm", DeviceType.GARMIN_TACTIX_8); // #5772 put("Forerunner 265S", DeviceType.GARMIN_FORERUNNER_265S); put("Forerunner 955", DeviceType.GARMIN_FORERUNNER_955); // #4124 put("Enduro", DeviceType.GARMIN_ENDURO); // #5347 diff --git a/src/mainline/fastlane/metadata/android/en-US/changelogs/244.txt b/src/mainline/fastlane/metadata/android/en-US/changelogs/244.txt index 9442930d76..e33bd44b6f 100644 --- a/src/mainline/fastlane/metadata/android/en-US/changelogs/244.txt +++ b/src/mainline/fastlane/metadata/android/en-US/changelogs/244.txt @@ -1,6 +1,6 @@ • Optional internet access with Internethelper • Health Connect integration -• Support for 20 new devices +• Support for 21 new devices • Workout parsing fixes across multiple devices • Improved charts