From 809cd30f0efcf9d19e748b93442a63f06652f954 Mon Sep 17 00:00:00 2001 From: vanous Date: Fri, 2 Jul 2021 09:50:55 +0200 Subject: [PATCH] add transliteration to PineTime, solves #2334 --- .../activities/devicesettings/DeviceSettingsActivity.java | 4 +++- .../devices/pinetime/PineTimeJFCoordinator.java | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java index a3753f862..dcfa9bce1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java @@ -53,7 +53,9 @@ public class DeviceSettingsActivity extends AbstractGBActivity implements if (coordinator.supportsActivityTracking()) { supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_chartstabs); } - supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_transliteration); + if (!ArrayUtils.contains(supportedSettings, R.xml.devicesettings_transliteration)) { + supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_transliteration); + } fragment = DeviceSpecificSettingsFragment.newInstance(device.getAddress(), supportedSettings); } getSupportFragmentManager() diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java index 192fc23a1..d451ea698 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java @@ -23,6 +23,7 @@ import android.net.Uri; import androidx.annotation.NonNull; +import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler; import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider; @@ -139,4 +140,10 @@ public class PineTimeJFCoordinator extends AbstractDeviceCoordinator { protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) { // nothing to delete, yet } + + public int[] getSupportedDeviceSpecificSettings(GBDevice device) { + return new int[]{ + R.xml.devicesettings_transliteration + }; + } }