Move devicesettings_transliteration to settings of each device

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java

@@ -59,10 +59,6 @@ public class DeviceSettingsActivity extends AbstractGBActivity implements
                     supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_chartstabs);
                 }
 
-                // FIXME: this does not belong here
-                if (!ArrayUtils.contains(supportedSettings, R.xml.devicesettings_transliteration)) {
-                    supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_transliteration);
-                }
                 fragment = DeviceSpecificSettingsFragment.newInstance(device.getAddress(), supportedSettings, supportedLanguages);
             }
             getSupportFragmentManager()

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java

@@ -155,7 +155,8 @@ public class CasioGB6900DeviceCoordinator extends AbstractDeviceCoordinator {
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[] {
-                R.xml.devicesettings_disconnectnotification_noshed
+                R.xml.devicesettings_disconnectnotification_noshed,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java

@@ -166,7 +166,8 @@ public class CasioGBX100DeviceCoordinator extends AbstractDeviceCoordinator {
                 R.xml.devicesettings_key_vibration,
                 R.xml.devicesettings_operating_sounds,
                 R.xml.devicesettings_fake_ring_duration,
-                R.xml.devicesettings_autoremove_message
+                R.xml.devicesettings_autoremove_message,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java

@@ -181,6 +181,7 @@ public class FitProDeviceCoordinator extends AbstractDeviceCoordinator {
                 R.xml.devicesettings_vibrations_enable,
                 R.xml.devicesettings_notifications_enable,
                 R.xml.devicesettings_fitpro,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java

@@ -324,7 +324,8 @@ public class HPlusCoordinator extends AbstractDeviceCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 //R.xml.devicesettings_wearlocation, // disabled, since it is never used in code
-                R.xml.devicesettings_timeformat
+                R.xml.devicesettings_timeformat,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java

@@ -101,7 +101,8 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java

@@ -90,7 +90,8 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_buttonactions_with_longpress,
                 R.xml.devicesettings_device_actions,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java

@@ -81,6 +81,7 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator {
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
                 R.xml.devicesettings_relax_firmware_checks,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java

@@ -95,7 +95,8 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_device_actions,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java

@@ -101,7 +101,8 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_device_actions,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java

@@ -101,7 +101,8 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_device_actions,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java

@@ -97,7 +97,8 @@ public class AmazfitCorCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java

@@ -99,7 +99,8 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java

@@ -98,7 +98,8 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java

@@ -97,7 +97,8 @@ public class AmazfitGTRLiteCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_sync_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java

@@ -104,7 +104,8 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java

@@ -104,7 +104,8 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java

@@ -98,7 +98,8 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java

@@ -104,7 +104,8 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java

@@ -104,7 +104,8 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java

@@ -91,7 +91,8 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java

@@ -98,7 +98,8 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java

@@ -98,7 +98,8 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java

@@ -98,7 +98,8 @@ public class AmazfitVergeLCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_buttonactions_with_longpress,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java

@@ -104,7 +104,8 @@ public class AmazfitXCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java

@@ -86,7 +86,8 @@ public class MiBand2Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_buttonactions,
                 R.xml.devicesettings_reserve_alarms_calendar,
                 R.xml.devicesettings_bt_connected_advertisement,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java

@@ -90,7 +90,8 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_donotdisturb_withauto,
                 R.xml.devicesettings_liftwrist_display,
                 R.xml.devicesettings_rotatewrist_cycleinfo,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java

@@ -114,7 +114,8 @@ public class MiBand3Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
-                R.xml.devicesettings_pairingkey
+                R.xml.devicesettings_pairingkey,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java

@@ -101,7 +101,8 @@ public class MiBand4Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java

@@ -101,7 +101,8 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java

@@ -98,7 +98,8 @@ public class ZeppECoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
                 R.xml.devicesettings_pairingkey,
-                R.xml.devicesettings_high_mtu
+                R.xml.devicesettings_high_mtu,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java

@@ -160,7 +160,8 @@ public class ID115Coordinator extends AbstractDeviceCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_wearlocation,
-                R.xml.devicesettings_screenorientation
+                R.xml.devicesettings_screenorientation,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java

@@ -167,6 +167,7 @@ public class LefunDeviceCoordinator extends AbstractDeviceCoordinator {
                 R.xml.devicesettings_longsit,
                 R.xml.devicesettings_hydration_reminder,
                 R.xml.devicesettings_lefun_interface_language,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java

@@ -196,7 +196,8 @@ public class WatchXPlusDeviceCoordinator extends AbstractDeviceCoordinator {
                 R.xml.devicesettings_find_phone,
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_power_mode,
-                R.xml.devicesettings_watchxplus
+                R.xml.devicesettings_watchxplus,
+                R.xml.devicesettings_transliteration
         };
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java

@@ -272,7 +272,8 @@ public class MakibesHR3Coordinator extends AbstractDeviceCoordinator {
                 R.xml.devicesettings_liftwrist_display,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_donotdisturb_no_auto,
-                R.xml.devicesettings_find_phone
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java

@@ -219,7 +219,8 @@ public class PebbleCoordinator extends AbstractDeviceCoordinator {
         return new int[]{
                 R.xml.devicesettings_autoremove_notifications,
                 R.xml.devicesettings_canned_reply_16,
-                R.xml.devicesettings_canned_dismisscall_16
+                R.xml.devicesettings_canned_dismisscall_16,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java

@@ -248,7 +248,8 @@ public class QHybridCoordinator extends AbstractDeviceCoordinator {
                     R.xml.devicesettings_autoremove_notifications,
                     R.xml.devicesettings_canned_dismisscall_16,
                     R.xml.devicesettings_pairingkey,
-                    R.xml.devicesettings_custom_deviceicon
+                    R.xml.devicesettings_custom_deviceicon,
+                    R.xml.devicesettings_transliteration
             };
         }
         if (isHybridHR()) {

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java

@@ -145,7 +145,8 @@ public class TLW64Coordinator extends AbstractDeviceCoordinator {
         return new int[]{
                 R.xml.devicesettings_liftwrist_display_noshed,
                 R.xml.devicesettings_longsit_noshed,
-                R.xml.devicesettings_timeformat
+                R.xml.devicesettings_timeformat,
+                R.xml.devicesettings_transliteration
         };
     }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java

@@ -167,6 +167,7 @@ public class ZeTimeCoordinator extends AbstractDeviceCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_wearlocation,
                 R.xml.devicesettings_sync_calendar,
+                R.xml.devicesettings_transliteration
         };
     }
 }