diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/epixpro/GarminEpixProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/epix/GarminEpixProCoordinator.java similarity index 86% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/epixpro/GarminEpixProCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/epix/GarminEpixProCoordinator.java index dfbc470df..bfa5b4571 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/epixpro/GarminEpixProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/epix/GarminEpixProCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.epixpro; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.epix; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/fenix/Fenix6SapphireSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/fenix/GarminFenix6SapphireSCoordinator.java similarity index 73% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/fenix/Fenix6SapphireSCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/fenix/GarminFenix6SapphireSCoordinator.java index 9f4b94b15..ac0301053 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/fenix/Fenix6SapphireSCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/fenix/GarminFenix6SapphireSCoordinator.java @@ -1,11 +1,11 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.fenix; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.fenix; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminCoordinator; -public class Fenix6SapphireSCoordinator extends GarminCoordinator { +public class GarminFenix6SapphireSCoordinator extends GarminCoordinator { @Override protected Pattern getSupportedDeviceName() { return Pattern.compile("^fenix 6 Sapphire$"); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/forerunner245/GarminForerunner245Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/forerunner/GarminForerunner245Coordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/forerunner245/GarminForerunner245Coordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/forerunner/GarminForerunner245Coordinator.java index b797d6125..5da1f7390 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/forerunner245/GarminForerunner245Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/forerunner/GarminForerunner245Coordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.forerunner245; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.forerunner; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2s/GarminInstinct2SCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SCoordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2s/GarminInstinct2SCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SCoordinator.java index 994b0d83c..020ac99ef 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2s/GarminInstinct2SCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2s; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2ssolar/GarminInstinct2SSolarCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SSolarCoordinator.java similarity index 86% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2ssolar/GarminInstinct2SSolarCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SSolarCoordinator.java index a9d91f488..3911a1dc5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2ssolar/GarminInstinct2SSolarCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SSolarCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2ssolar; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2soltac/GarminInstinct2SolTacCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SolTacCoordinator.java similarity index 86% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2soltac/GarminInstinct2SolTacCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SolTacCoordinator.java index 79612dbf6..a6c02bfad 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2soltac/GarminInstinct2SolTacCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SolTacCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2soltac; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2solar/GarminInstinct2SolarCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SolarCoordinator.java similarity index 87% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2solar/GarminInstinct2SolarCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SolarCoordinator.java index fbc9b522f..81e5334f0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2solar/GarminInstinct2SolarCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2SolarCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2solar; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminCoordinator; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2xsolar/GarminInstinct2XSolarCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2XSolarCoordinator.java similarity index 86% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2xsolar/GarminInstinct2XSolarCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2XSolarCoordinator.java index 26d1594de..821638e2c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinct2xsolar/GarminInstinct2XSolarCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinct2XSolarCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2xsolar; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinctcrossover/GarminInstinctCrossoverCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinctCrossoverCoordinator.java similarity index 87% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinctcrossover/GarminInstinctCrossoverCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinctCrossoverCoordinator.java index b564e5bfd..0bf08324c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinctcrossover/GarminInstinctCrossoverCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinctCrossoverCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinctcrossover; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminCoordinator; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinctsolar/GarminInstinctSolarCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinctSolarCoordinator.java similarity index 89% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinctsolar/GarminInstinctSolarCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinctSolarCoordinator.java index 10830ec0c..1a5601f23 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/instinctsolar/GarminInstinctSolarCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/instinct/GarminInstinctSolarCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinctsolar; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/swim2/GarminSwim2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/swim/GarminSwim2Coordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/swim2/GarminSwim2Coordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/swim/GarminSwim2Coordinator.java index 843c09a9b..54f7ff30d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/swim2/GarminSwim2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/swim/GarminSwim2Coordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.swim2; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.swim; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/venu2plus/GarminVenu2PlusCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/venu/GarminVenu2PlusCoordinator.java similarity index 86% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/venu2plus/GarminVenu2PlusCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/venu/GarminVenu2PlusCoordinator.java index 0078214a4..97d151fb9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/venu2plus/GarminVenu2PlusCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/venu/GarminVenu2PlusCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.venu2plus; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.venu; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/venu3/GarminVenu3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/venu/GarminVenu3Coordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/venu3/GarminVenu3Coordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/venu/GarminVenu3Coordinator.java index a7d7c6d21..66edd79d7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/venu3/GarminVenu3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/venu/GarminVenu3Coordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.venu3; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.venu; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive4/GarminVivoActive4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive4Coordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive4/GarminVivoActive4Coordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive4Coordinator.java index 98942509a..fd37ad913 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive4/GarminVivoActive4Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive4Coordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivoactive4; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivoactive; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive4s/GarminVivoActive4SCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive4SCoordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive4s/GarminVivoActive4SCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive4SCoordinator.java index 994fb635f..afbb43747 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive4s/GarminVivoActive4SCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive4SCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivoactive4s; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivoactive; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive5/GarminVivoActive5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive5Coordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive5/GarminVivoActive5Coordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive5Coordinator.java index 386f20b73..51fb39286 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivoactive5/GarminVivoActive5Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivoactive/GarminVivoActive5Coordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivoactive5; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivoactive; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivomove/GarminVivomoveHrCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivomove/GarminVivomoveHrCoordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivomove/GarminVivomoveHrCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivomove/GarminVivomoveHrCoordinator.java index e4afea2e9..49b12e38c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivomove/GarminVivomoveHrCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivomove/GarminVivomoveHrCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivomove; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivomove; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivomove/GarminVivomoveStyleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivomove/GarminVivomoveStyleCoordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivomove/GarminVivomoveStyleCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivomove/GarminVivomoveStyleCoordinator.java index 9c59f53cc..1dcb41b1f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivomove/GarminVivomoveStyleCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivomove/GarminVivomoveStyleCoordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivomove; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivomove; import java.util.regex.Pattern; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivosmart5/GarminVivosmart5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivosmart/GarminVivosmart5Coordinator.java similarity index 85% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivosmart5/GarminVivosmart5Coordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivosmart/GarminVivosmart5Coordinator.java index 302241542..1d41a552f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/vivosmart5/GarminVivosmart5Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/watches/vivosmart/GarminVivosmart5Coordinator.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivosmart5; +package nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivosmart; import java.util.regex.Pattern; 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 50674b3b8..9ddf0e824 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java @@ -50,25 +50,25 @@ import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBuds2ProDe import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBudsDeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBudsLiveDeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBudsProDeviceCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.epixpro.GarminEpixProCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.fenix.Fenix6SapphireSCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.forerunner245.GarminForerunner245Coordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2xsolar.GarminInstinct2XSolarCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.swim2.GarminSwim2Coordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinctsolar.GarminInstinctSolarCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2s.GarminInstinct2SCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2ssolar.GarminInstinct2SSolarCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2solar.GarminInstinct2SolarCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinct2soltac.GarminInstinct2SolTacCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.instinctcrossover.GarminInstinctCrossoverCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.venu2plus.GarminVenu2PlusCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.venu3.GarminVenu3Coordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivoactive4.GarminVivoActive4Coordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivoactive4s.GarminVivoActive4SCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivoactive5.GarminVivoActive5Coordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivomove.GarminVivomoveHrCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivomove.GarminVivomoveStyleCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.garmin.vivosmart5.GarminVivosmart5Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.epix.GarminEpixProCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.fenix.GarminFenix6SapphireSCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.forerunner.GarminForerunner245Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct.GarminInstinct2XSolarCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.swim.GarminSwim2Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct.GarminInstinctSolarCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct.GarminInstinct2SCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct.GarminInstinct2SSolarCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct.GarminInstinct2SolarCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct.GarminInstinct2SolTacCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.instinct.GarminInstinctCrossoverCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.venu.GarminVenu2PlusCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.venu.GarminVenu3Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivoactive.GarminVivoActive4Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivoactive.GarminVivoActive4SCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivoactive.GarminVivoActive5Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivomove.GarminVivomoveHrCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivomove.GarminVivomoveStyleCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.garmin.watches.vivosmart.GarminVivosmart5Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.hplus.EXRIZUK8Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.hplus.HPlusCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.hplus.MakibesF68Coordinator; @@ -348,7 +348,7 @@ public enum DeviceType { NUTMINI(NutCoordinator.class), VIVOMOVE_HR(GarminVivomoveHrCoordinator.class), GARMIN_EPIX_PRO(GarminEpixProCoordinator.class), - GARMIN_FENIX_6_SAPPHIRE(Fenix6SapphireSCoordinator.class), + GARMIN_FENIX_6_SAPPHIRE(GarminFenix6SapphireSCoordinator.class), GARMIN_FORERUNNER_245(GarminForerunner245Coordinator.class), GARMIN_SWIM_2(GarminSwim2Coordinator.class), GARMIN_INSTINCT_SOLAR(GarminInstinctSolarCoordinator.class),