1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-04 01:09:47 +01:00

Merge branch 'master' of github.com:Freeyourgadget/Gadgetbridge into fossil-q-hybrid

This commit is contained in:
dakhnod 2019-10-11 22:35:50 +02:00
commit a2a0bc08dd
59 changed files with 310 additions and 284 deletions

View File

@ -78,9 +78,13 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.AMAZFITBIP;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.AMAZFITCOR;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.AMAZFITCOR2;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.HPLUS;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.ID115;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.MIBAND;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.MIBAND2;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.MIBAND3;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.MIBAND4;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.ZETIME;
import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.fromKey;
import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_CHANNEL_ID;
@ -99,7 +103,7 @@ public class GBApplication extends Application {
private static SharedPreferences sharedPrefs;
private static final String PREFS_VERSION = "shared_preferences_version";
//if preferences have to be migrated, increment the following and add the migration logic in migratePrefs below; see http://stackoverflow.com/questions/16397848/how-can-i-migrate-android-preferences-with-a-new-version
private static final int CURRENT_PREFS_VERSION = 4;
private static final int CURRENT_PREFS_VERSION = 5;
private static LimitedQueue mIDSenderLookup = new LimitedQueue(16);
private static Prefs prefs;
private static GBPrefs gbPrefs;
@ -761,6 +765,67 @@ public class GBApplication extends Application {
Log.w(TAG, "error acquiring DB lock");
}
}
if (oldVersion < 5) {
try (DBHandler db = acquireDB()) {
DaoSession daoSession = db.getDaoSession();
List<Device> activeDevices = DBHelper.getActiveDevices(daoSession);
for (Device dbDevice : activeDevices) {
SharedPreferences deviceSpecificSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier());
if (deviceSpecificSharedPrefs != null) {
SharedPreferences.Editor deviceSharedPrefsEdit = deviceSpecificSharedPrefs.edit();
DeviceType deviceType = fromKey(dbDevice.getType());
String newWearside = null;
String newOrientation = null;
String newTimeformat = null;
switch (deviceType) {
case AMAZFITBIP:
case AMAZFITCOR:
case AMAZFITCOR2:
case MIBAND:
case MIBAND2:
case MIBAND3:
case MIBAND4:
newWearside = prefs.getString("mi_wearside", "left");
break;
case HPLUS:
newWearside = prefs.getString("hplus_wrist", "left");
newTimeformat = prefs.getString("hplus_timeformat", "24h");
break;
case ID115:
newWearside = prefs.getString("id115_wrist", "left");
newOrientation = prefs.getString("id115_screen_orientation", "horizontal");
break;
case ZETIME:
newWearside = prefs.getString("zetime_wrist", "left");
newTimeformat = prefs.getInt("zetime_timeformat", 1) == 2 ? "am/pm" : "24h";
break;
}
if (newWearside != null) {
deviceSharedPrefsEdit.putString("wearlocation", newWearside);
}
if (newOrientation != null) {
deviceSharedPrefsEdit.putString("screen_orientation", newOrientation);
}
if (newTimeformat != null) {
deviceSharedPrefsEdit.putString("timeformat", newTimeformat);
}
deviceSharedPrefsEdit.apply();
}
}
editor.remove("hplus_timeformat");
editor.remove("hplus_wrist");
editor.remove("id115_wrist");
editor.remove("id115_screen_orientation");
editor.remove("mi_wearside");
editor.remove("zetime_timeformat");
editor.remove("zetime_wrist");
} catch (Exception e) {
Log.w(TAG, "error acquiring DB lock");
}
}
editor.putString(PREFS_VERSION, Integer.toString(CURRENT_PREFS_VERSION));
editor.apply();
}

View File

@ -1,5 +1,8 @@
package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
public class DeviceSettingsPreferenceConst {
public static final String PREF_DATEFORMAT = "dateformat";
public static final String PREF_TIMEFORMAT = "timeformat";
}
public static final String PREF_WEARLOCATION = "wearlocation";
public static final String PREF_SCREEN_ORIENTATION = "screen_orientation";
}

View File

@ -21,8 +21,8 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference;
import nodomain.freeyourgadget.gadgetbridge.util.XTimePreferenceFragment;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_ACTIVATE_DISPLAY_ON_LIFT;
import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DATEFORMAT;
import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISCONNECT_NOTIFICATION;
import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISCONNECT_NOTIFICATION_END;
import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISCONNECT_NOTIFICATION_START;
@ -289,6 +289,9 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat {
addPreferenceHandlerFor(PREF_DISPLAY_ITEMS);
addPreferenceHandlerFor(PREF_LANGUAGE);
addPreferenceHandlerFor(PREF_EXPOSE_HR_THIRDPARTY);
addPreferenceHandlerFor(PREF_WEARLOCATION);
addPreferenceHandlerFor(PREF_SCREEN_ORIENTATION);
addPreferenceHandlerFor(PREF_TIMEFORMAT);
String displayOnLiftState = prefs.getString(PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_DO_NOT_DISTURB_OFF);
boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_DO_NOT_DISTURB_SCHEDULED);

View File

@ -128,8 +128,6 @@ public final class HPlusConstants {
public static final String PREF_HPLUS_SCREENTIME = "hplus_screentime";
public static final String PREF_HPLUS_ALLDAYHR = "hplus_alldayhr";
public static final String PREF_HPLUS_TIMEFORMAT = "hplus_timeformat";
public static final String PREF_HPLUS_WRIST = "hplus_wrist";
public static final String PREF_HPLUS_SIT_START_TIME = "hplus_sit_start_time";
public static final String PREF_HPLUS_SIT_END_TIME = "hplus_sit_end_time";
public static final String PREF_HPLUS_UNICODE = "hplus_unicode";

View File

@ -43,6 +43,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.GBException;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@ -196,10 +197,10 @@ public class HPlusCoordinator extends AbstractDeviceCoordinator {
}
}
public static byte getTimeMode(String address) {
String tmode = prefs.getString(HPlusConstants.PREF_HPLUS_TIMEFORMAT, getContext().getString(R.string.p_timeformat_24h));
public static byte getTimeMode(String deviceAddress) {
String tmode = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress).getString(DeviceSettingsPreferenceConst.PREF_TIMEFORMAT, "24h");
if(tmode.equals(getContext().getString(R.string.p_timeformat_24h))) {
if ("24h".equals(tmode)) {
return HPlusConstants.ARG_TIMEMODE_24H;
}else{
return HPlusConstants.ARG_TIMEMODE_12H;
@ -269,12 +270,14 @@ public class HPlusCoordinator extends AbstractDeviceCoordinator {
return (byte) 255;
}
public static byte getUserWrist(String address) {
String value = prefs.getString(HPlusConstants.PREF_HPLUS_WRIST, getContext().getString(R.string.left));
//FIXME: unused
public static byte getUserWrist(String deviceAddress) {
SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(deviceAddress);
String value = sharedPreferences.getString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION, "left");
if(value.equals(getContext().getString(R.string.left))){
if ("left".equals(value)) {
return HPlusConstants.ARG_WRIST_LEFT;
}else{
} else {
return HPlusConstants.ARG_WRIST_RIGHT;
}
}
@ -290,10 +293,19 @@ public class HPlusCoordinator extends AbstractDeviceCoordinator {
public static void setUnicodeSupport(String address, boolean state){
SharedPreferences.Editor editor = prefs.getPreferences().edit();
editor.putBoolean(HPlusConstants.PREF_HPLUS_UNICODE + "_" + address, state);
editor.commit();
editor.apply();
}
public static boolean getUnicodeSupport(String address){
return (prefs.getBoolean(HPlusConstants.PREF_HPLUS_UNICODE + "_" + address, false));
}
@Override
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
//R.xml.devicesettings_wearlocation, // disabled, since it is never used in code
R.xml.devicesettings_timeformat
};
}
}

View File

@ -60,7 +60,6 @@ public class HuamiConst {
public static final String PREF_DISPLAY_ITEMS = "display_items";
public static final String PREF_LANGUAGE = "language";
public static final String PREF_DATEFORMAT = "dateformat";
public static final String PREF_EXPOSE_HR_THIRDPARTY = "expose_hr_thirdparty";
public static final String PREF_USE_CUSTOM_FONT = "use_custom_font";

View File

@ -47,7 +47,7 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {
try {
BluetoothDevice device = candidate.getDevice();
String name = device.getName();
if (name != null && (name.equalsIgnoreCase("Amazfit Bip Watch") || name.equalsIgnoreCase("Amazfit Bip Lite"))) {
if (name != null && (name.equalsIgnoreCase("Amazfit Bip Watch"))) {
return DeviceType.AMAZFITBIP;
}
} catch (Exception ex) {
@ -81,6 +81,7 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_amazfitbip,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_custom_emoji_font,
R.xml.devicesettings_liftwrist_display,
R.xml.devicesettings_disconnectnotification,

View File

@ -0,0 +1,60 @@
/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele
Gobbetti, João Paulo Barraca
This file is part of Gadgetbridge.
Gadgetbridge is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Gadgetbridge is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.net.Uri;
import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator {
private static final Logger LOG = LoggerFactory.getLogger(AmazfitBipLiteCoordinator.class);
@Override
public DeviceType getDeviceType() {
return DeviceType.AMAZFITBIP_LITE;
}
@NonNull
@Override
public DeviceType getSupportedType(GBDeviceCandidate candidate) {
try {
BluetoothDevice device = candidate.getDevice();
String name = device.getName();
if (name != null && name.equalsIgnoreCase("Amazfit Bip Lite")) {
return DeviceType.AMAZFITBIP_LITE;
}
} catch (Exception ex) {
LOG.error("unable to check device support", ex);
}
return DeviceType.UNKNOWN;
}
@Override
public InstallHandler findInstallHandler(Uri uri, Context context) {
return null;
}
}

View File

@ -84,6 +84,7 @@ public class AmazfitCorCoordinator extends HuamiCoordinator {
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_amazfitcor,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_custom_emoji_font,
R.xml.devicesettings_liftwrist_display,
R.xml.devicesettings_disconnectnotification,

View File

@ -86,6 +86,7 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator {
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_amazfitcor,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_liftwrist_display,
R.xml.devicesettings_disconnectnotification,
R.xml.devicesettings_pairingkey};

View File

@ -84,6 +84,7 @@ public class MiBand2Coordinator extends HuamiCoordinator {
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_miband2,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_donotdisturb_withauto,
R.xml.devicesettings_liftwrist_display,
R.xml.devicesettings_rotatewrist_cycleinfo,

View File

@ -25,6 +25,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import androidx.annotation.NonNull;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
@ -75,4 +77,15 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator {
return false;
}
@Override
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_miband2,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_donotdisturb_withauto,
R.xml.devicesettings_liftwrist_display,
R.xml.devicesettings_rotatewrist_cycleinfo,
R.xml.devicesettings_pairingkey
};
}
}

View File

@ -103,6 +103,7 @@ public class MiBand3Coordinator extends HuamiCoordinator {
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_miband3,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_dateformat,
R.xml.devicesettings_nightmode,
R.xml.devicesettings_donotdisturb_withauto,

View File

@ -88,6 +88,7 @@ public class MiBand4Coordinator extends HuamiCoordinator {
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_miband3,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_dateformat,
R.xml.devicesettings_nightmode,
R.xml.devicesettings_liftwrist_display,

View File

@ -23,9 +23,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
import static nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport.BASE_UUID;
public class ID115Constants {
public static final String PREF_WRIST = "id115_wrist";
public static final String PREF_SCREEN_ORIENTATION = "id115_screen_orientation";
public static final UUID UUID_SERVICE_ID115 = UUID.fromString(String.format(BASE_UUID, "0AF0"));
public static final UUID UUID_CHARACTERISTIC_WRITE_NORMAL = UUID.fromString(String.format(BASE_UUID, "0AF6"));
public static final UUID UUID_CHARACTERISTIC_NOTIFY_NORMAL = UUID.fromString(String.format(BASE_UUID, "0AF7"));

View File

@ -31,6 +31,7 @@ import java.util.Collections;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import nodomain.freeyourgadget.gadgetbridge.GBException;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@ -154,4 +155,12 @@ public class ID115Coordinator extends AbstractDeviceCoordinator {
public boolean supportsFindDevice() {
return false;
}
@Override
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_screenorientation
};
}
}

View File

@ -23,7 +23,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.Version;
public final class MiBandConst {
public static final String PREF_USER_ALIAS = "mi_user_alias";
public static final String PREF_MIBAND_WEARSIDE = "mi_wearside";
public static final String PREF_MIBAND_ADDRESS = "development_miaddr"; // FIXME: should be prefixed mi_
public static final String PREF_MIBAND_ALARMS = "mi_alarms";
public static final String PREF_MIBAND_DONT_ACK_TRANSFER = "mi_dont_ack_transfer";

View File

@ -22,7 +22,6 @@ import android.app.Activity;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.le.ScanFilter;
import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import android.os.ParcelUuid;
@ -38,6 +37,7 @@ import de.greenrobot.dao.query.QueryBuilder;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.GBException;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@ -228,10 +228,10 @@ public class MiBandCoordinator extends AbstractDeviceCoordinator {
return info;
}
public static int getWearLocation(String miBandAddress) throws IllegalArgumentException {
public static int getWearLocation(String deviceAddress) throws IllegalArgumentException {
int location = 0; //left hand
Prefs prefs = GBApplication.getPrefs();
if ("right".equals(prefs.getString(MiBandConst.PREF_MIBAND_WEARSIDE, "left"))) {
Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
if ("right".equals(prefs.getString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION, "left"))) {
location = 1; // right hand
}
return location;
@ -261,6 +261,7 @@ public class MiBandCoordinator extends AbstractDeviceCoordinator {
@Override
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_lowlatency_fwupdate,
R.xml.devicesettings_fake_timeoffset
};

View File

@ -124,7 +124,6 @@ public class ZeTimeConstants {
public static final byte INACTIVITY_TYPE = (byte) 0x08;
public static final byte LOW_POWER_TYPE = (byte) 0x09;
// watch settings
public static final String PREF_WRIST = "zetime_wrist";
public static final byte WEAR_ON_LEFT_WRIST = (byte) 0x00;
public static final byte WEAR_ON_RIGHT_WRIST = (byte) 0x01;
@ -160,7 +159,6 @@ public class ZeTimeConstants {
public static final String PREF_ACTIVITY_TRACKING = "zetime_activity_tracking";
public static final String PREF_HANDMOVE_DISPLAY = "zetime_handmove_display";
public static final String PREF_CALORIES_TYPE = "zetime_calories_type";
public static final String PREF_TIME_FORMAT = "zetime_time_format";
public static final String PREF_DATE_FORMAT = "zetime_date_format";
public static final String PREF_ALARM_SIGNALING = "zetime_alarm_signaling";

View File

@ -22,11 +22,12 @@ import android.bluetooth.le.ScanFilter;
import android.content.Context;
import android.net.Uri;
import java.util.Collection;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import nodomain.freeyourgadget.gadgetbridge.GBException;
import java.util.Collection;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@ -37,9 +38,6 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
/**
* Created by lightwars on 06.02.18.
*/
public class ZeTimeCoordinator extends AbstractDeviceCoordinator {
@Override
@ -135,7 +133,7 @@ public class ZeTimeCoordinator extends AbstractDeviceCoordinator {
}
@Override
protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) {
}
@ -161,4 +159,12 @@ public class ZeTimeCoordinator extends AbstractDeviceCoordinator {
@Override
public boolean supportsUnicodeEmojis() { return true; }
@Override
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_timeformat,
R.xml.devicesettings_wearlocation,
};
}
}

View File

@ -22,6 +22,7 @@ import android.preference.Preference;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivity;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
public class ZeTimePreferenceActivity extends AbstractSettingsActivity {
@Override
@ -43,8 +44,6 @@ public class ZeTimePreferenceActivity extends AbstractSettingsActivity {
addPreferenceHandlerFor(ZeTimeConstants.PREF_SCREENTIME);
addPreferenceHandlerFor(ZeTimeConstants.PREF_WRIST);
addPreferenceHandlerFor(ZeTimeConstants.PREF_ANALOG_MODE);
addPreferenceHandlerFor(ZeTimeConstants.PREF_ACTIVITY_TRACKING);
@ -57,8 +56,6 @@ public class ZeTimePreferenceActivity extends AbstractSettingsActivity {
addPreferenceHandlerFor(ZeTimeConstants.PREF_CALORIES_TYPE);
addPreferenceHandlerFor(ZeTimeConstants.PREF_TIME_FORMAT);
addPreferenceHandlerFor(ZeTimeConstants.PREF_DATE_FORMAT);
addPreferenceHandlerFor(ZeTimeConstants.PREF_INACTIVITY_ENABLE);

View File

@ -39,6 +39,7 @@ public enum DeviceType {
MIBAND3(14, R.drawable.ic_device_miband2, R.drawable.ic_device_miband2_disabled, R.string.devicetype_miband3),
AMAZFITCOR2(15, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_amazfit_cor2),
MIBAND4(16, R.drawable.ic_device_miband2, R.drawable.ic_device_miband2_disabled, R.string.devicetype_miband4),
AMAZFITBIP_LITE(17, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_amazfit_bip_lite),
VIBRATISSIMO(20, R.drawable.ic_device_lovetoy, R.drawable.ic_device_lovetoy_disabled, R.string.devicetype_vibratissimo),
LIVEVIEW(30, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_liveview),
HPLUS(40, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_hplus),

View File

@ -33,6 +33,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.service.devices.casiogb6900.CasioGB6900DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.hplus.HPlusSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip.AmazfitBipLiteSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip.AmazfitBipSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor.AmazfitCorSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor2.AmazfitCor2Support;
@ -138,6 +139,9 @@ public class DeviceSupportFactory {
case AMAZFITBIP:
deviceSupport = new ServiceDeviceSupport(new AmazfitBipSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
break;
case AMAZFITBIP_LITE:
deviceSupport = new ServiceDeviceSupport(new AmazfitBipLiteSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
break;
case AMAZFITCOR:
deviceSupport = new ServiceDeviceSupport(new AmazfitCorSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING));
break;

View File

@ -53,6 +53,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.Logging;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
@ -127,7 +128,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
import nodomain.freeyourgadget.gadgetbridge.util.Version;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
@ -1502,7 +1502,7 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
case MiBandConst.PREF_SWIPE_UNLOCK:
setBandScreenUnlock(builder);
break;
case HuamiConst.PREF_DATEFORMAT:
case DeviceSettingsPreferenceConst.PREF_DATEFORMAT:
setDateFormat(builder);
break;
case HuamiConst.PREF_LANGUAGE:
@ -1511,6 +1511,9 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
case HuamiConst.PREF_EXPOSE_HR_THIRDPARTY:
setExposeHRThridParty(builder);
break;
case DeviceSettingsPreferenceConst.PREF_WEARLOCATION:
setWearLocation(builder);
break;
}
builder.queue(getQueue());
} catch (IOException e) {

View File

@ -0,0 +1,43 @@
/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Matthieu
Baerts, Roi Greenberg
This file is part of Gadgetbridge.
Gadgetbridge is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Gadgetbridge is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip;
import android.content.Context;
import android.net.Uri;
import java.io.IOException;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
public class AmazfitBipLiteSupport extends AmazfitBipSupport {
@Override
public byte getCryptFlags() {
return (byte) 0x80;
}
@Override
protected byte getAuthFlags() {
return 0x00;
}
@Override
public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
return null;
}
}

View File

@ -30,6 +30,7 @@ import java.util.TimeZone;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
import nodomain.freeyourgadget.gadgetbridge.devices.id115.ID115Constants;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
@ -296,11 +297,11 @@ public class ID115Support extends AbstractBTLEDeviceSupport {
}
ID115Support setWrist(TransactionBuilder builder) {
String value = GBApplication.getPrefs().getString(ID115Constants.PREF_WRIST,
String value = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION,
"left");
byte wrist;
if (value.equals("left")) {
if ("left".equals(value)) {
wrist = ID115Constants.CMD_ARG_LEFT;
} else {
wrist = ID115Constants.CMD_ARG_RIGHT;
@ -314,11 +315,11 @@ public class ID115Support extends AbstractBTLEDeviceSupport {
}
ID115Support setScreenOrientation(TransactionBuilder builder) {
String value = GBApplication.getPrefs().getString(ID115Constants.PREF_SCREEN_ORIENTATION,
String value = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getString(DeviceSettingsPreferenceConst.PREF_SCREEN_ORIENTATION,
"horizontal");
byte orientation;
if (value.equals("horizontal")) {
if ("horizontal".equals(value)) {
orientation = ID115Constants.CMD_ARG_HORIZONTAL;
} else {
orientation = ID115Constants.CMD_ARG_VERTICAL;

View File

@ -39,6 +39,7 @@ import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
@ -147,7 +148,7 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
try {
TransactionBuilder builder = performInitialized("sendConfiguration");
switch (config) {
case ZeTimeConstants.PREF_WRIST:
case DeviceSettingsPreferenceConst.PREF_WEARLOCATION:
setWrist(builder);
break;
case ZeTimeConstants.PREF_SCREENTIME:
@ -170,7 +171,7 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
case ZeTimeConstants.PREF_CALORIES_TYPE:
setCaloriesType(builder);
break;
case ZeTimeConstants.PREF_TIME_FORMAT:
case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT:
setTimeFormate(builder);
break;
case ZeTimeConstants.PREF_DATE_FORMAT:
@ -1421,7 +1422,7 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
// function serving the settings
private void setWrist(TransactionBuilder builder) {
String value = GBApplication.getPrefs().getString(ZeTimeConstants.PREF_WRIST, "left");
String value = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION, "left");
byte[] wrist = {ZeTimeConstants.CMD_PREAMBLE,
ZeTimeConstants.CMD_USAGE_HABITS,
@ -1430,7 +1431,7 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
(byte) 0x0,
ZeTimeConstants.WEAR_ON_LEFT_WRIST,
ZeTimeConstants.CMD_END};
if (value.equals("right")) {
if ("right".equals(value)) {
wrist[5] = ZeTimeConstants.WEAR_ON_RIGHT_WRIST;
}
@ -1681,8 +1682,11 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
}
private void setTimeFormate(TransactionBuilder builder) {
Prefs prefs = GBApplication.getPrefs();
int type = prefs.getInt(ZeTimeConstants.PREF_TIME_FORMAT, 0);
String timeFormat = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getString(DeviceSettingsPreferenceConst.PREF_TIMEFORMAT, "24h");
int type = 1;
if ("am/pm".equals(timeFormat)) {
type = 2;
}
byte[] timeformat = {ZeTimeConstants.CMD_PREAMBLE,
ZeTimeConstants.CMD_TIME_SURFACE_SETTINGS,
@ -1961,8 +1965,17 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
SharedPreferences.Editor prefs = GBApplication.getPrefs().getPreferences().edit();
prefs.putString(ZeTimeConstants.PREF_DATE_FORMAT, Integer.toString(msg[5]));
prefs.putString(ZeTimeConstants.PREF_TIME_FORMAT, Integer.toString(msg[6]));
prefs.apply();
String timeFormat = "24h";
SharedPreferences.Editor prefsEditor = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).edit();
if (msg[6] == 2) {
timeFormat = "am/pm";
}
prefsEditor.putString(DeviceSettingsPreferenceConst.PREF_TIMEFORMAT, timeFormat);
prefsEditor.apply();
}
private void getSignaling(byte[] msg) {
@ -2021,12 +2034,12 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport {
}
private void getWrist(byte[] msg) {
SharedPreferences.Editor prefs = GBApplication.getPrefs().getPreferences().edit();
SharedPreferences.Editor prefs = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).edit();
if (ZeTimeConstants.WEAR_ON_LEFT_WRIST == msg[5]) {
prefs.putString(ZeTimeConstants.PREF_WRIST, "left");
prefs.putString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION, "left");
} else if (ZeTimeConstants.WEAR_ON_RIGHT_WRIST == msg[5]) {
prefs.putString(ZeTimeConstants.PREF_WRIST, "right");
prefs.putString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION, "right");
}
prefs.apply();
}

View File

@ -45,6 +45,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.casiogb6900.CasioGB6900Devic
import nodomain.freeyourgadget.gadgetbridge.devices.hplus.EXRIZUK8Coordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.hplus.HPlusCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.hplus.MakibesF68Coordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip.AmazfitBipLiteCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3.MakibesHR3Coordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.hplus.Q8Coordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip.AmazfitBipCoordinator;
@ -205,6 +206,7 @@ public class DeviceHelper {
List<DeviceCoordinator> result = new ArrayList<>();
result.add(new MiScale2DeviceCoordinator()); // Note: must come before MiBand2 because detection is hacky, atm
result.add(new AmazfitBipCoordinator()); // Note: must come before MiBand2 because detection is hacky, atm
result.add(new AmazfitBipLiteCoordinator()); // Note: must come before MiBand2 because detection is hacky, atm
result.add(new AmazfitCorCoordinator()); // Note: must come before MiBand2 because detection is hacky, atm
result.add(new AmazfitCor2Coordinator()); // Note: must come before MiBand2 because detection is hacky, atm
result.add(new MiBand3Coordinator()); // Note: must come before MiBand2 because detection is hacky, atm

View File

@ -182,7 +182,6 @@
<string name="pref_title_screentime">Продължителност на включен екран</string>
<string name="prefs_title_all_day_heart_rate">Измерване на сърдечния ритъм през целия ден</string>
<string name="preferences_hplus_settings">HPlus/Makibes настройки</string>
<string name="preferences_id115_settings">ID115 настройки</string>
<string name="prefs_screen_orientation">Ориентация на екрана</string>
<string name="pref_header_auto_export">Автоматичен експорт</string>
<string name="pref_title_auto_export_enabled">Включване на автоматичен експорт</string>
@ -238,10 +237,6 @@
<string name="message_cannot_pair_no_mac">Липсва MAC адрес, не може да се установи връзка</string>
<string name="preferences_category_device_specific_settings">Специфични настройки за устройствата</string>
<string name="preferences_miband_settings">Mi Band / Amazfit настройки</string>
<string name="preferences_miband2_settings">Mi Band 2 настройки</string>
<string name="preferences_miband3_settings">Mi Band 3 настройки</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip настройки</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor настройки</string>s
<string name="male">Мъж</string>
<string name="female">Жена</string>
<string name="other">Друг</string>
@ -305,9 +300,6 @@
<string name="zetime_calories_type">Вид калории</string>
<string name="zetime_calories_type_active">Само активно изгорени калории</string>
<string name="zetime_calories_type_all">Активно и неактивно изгорени калории</string>
<string name="zetime_time_format">Часови формат</string>
<string name="zetime_time_format_24h">24часа</string>
<string name="zetime_time_format_12h">12часа</string>
<string name="zetime_date_format">Формат на датата</string>
<string name="zetime_date_format_1">ГГ/ММ/ДД</string>
<string name="zetime_date_format_2">ДД/ММ/ГГ</string>

View File

@ -208,7 +208,6 @@
<string name="message_cannot_pair_no_mac">No s\'ha proporcionat cap adreça MAC. No es pot emparellar.</string>
<string name="preferences_category_device_specific_settings">Configuració d\'aparells específics</string>
<string name="preferences_miband_settings">Configuració de Mi Band / Amazfit</string>
<string name="preferences_amazfitbip_settings">Configuració d\'Amazfit Bip</string>
<string name="male">Home</string>
<string name="female">Dona</string>
<string name="other">Altre</string>
@ -396,7 +395,6 @@
\nPROCEDIU SOTA LA VOSTRA PRÒPIA RESPONSABILITAT!</string>
<string name="blacklist_all_for_notifications">Bloqueja totes les notifications</string>
<string name="whitelist_all_for_notifications">Permet totes les notificacions</string>
<string name="preferences_id115_settings">Configuració de ID115</string>
<string name="prefs_screen_orientation">Orientació de la pantalla</string>
<string name="controlcenter_calibrate_device">Calibra l\'aparell</string>
<string name="pref_title_notifications_timeout">Temps mínim entre notificacions</string>
@ -572,10 +570,7 @@
<string name="horizontal">Horitzontal</string>
<string name="vertical">Vertical</string>
<string name="devicetype_id115">ID115</string>
<string name="preferences_amazfitcor_settings">Configuració d\'Amazfit Cor</string>s
<string name="menuitem_notifications">Notificacions</string>
<string name="preferences_miband2_settings">Configuració de Mi Band 2</string>
<string name="preferences_miband3_settings">Configuració de Mi Band 3</string>
<string name="menuitem_more">Més</string>
<string name="menuitem_music">Música</string>
<string name="watch9_pairing_tap_hint">Quan el vostre aparell vibri, sacsegeu-lo o premeu-ne el botó.</string>
@ -659,9 +654,6 @@
<string name="zetime_calories_type">Tipus de calories</string>
<string name="zetime_calories_type_active">Només les calories cremades de forma activa</string>
<string name="zetime_calories_type_all">Calories cremades de forma activa i en repòs</string>
<string name="zetime_time_format">Format d\'hora</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Format de data</string>
<string name="zetime_date_format_1">AA/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/AA</string>

View File

@ -532,15 +532,11 @@
<string name="pref_summary_rtl">Povolte, nepodporuje-li vaše zařízení jazyky zprava doleva</string>
<string name="pref_rtl_max_line_length">Maximální délka řádku pro jazyky zprava doleva</string>
<string name="pref_rtl_max_line_length_summary">Prodlužuje/zkracuje text řádků jazyků zprava doleva</string>
<string name="preferences_id115_settings">Nastavení ID115</string>
<string name="prefs_screen_orientation">Orientace displeje</string>
<string name="pref_auto_fetch">Synchronizovat automaticky</string>
<string name="pref_auto_fetch_summary">Synchronizovat při odemčení obrazovky. Musí být nastaven zámek obrazovky!</string>
<string name="pref_auto_fetch_limit_fetches">Minimální doba mezi synchronizacemi</string>
<string name="pref_auto_fetch_limit_fetches_summary">Synchronizovat každých %d minut</string>
<string name="preferences_miband2_settings">Nastavení Mi Band 2</string>
<string name="preferences_miband3_settings">Nastavení Mi Band 3</string>
<string name="preferences_amazfitcor_settings">Nastavení Amazfit Cor</string>s
<string name="horizontal">Na šířku</string>
<string name="vertical">Na výšku</string>
<string name="watch9_pairing_tap_hint">Po zavibrování stiskněte tlačítko, nebo se zařízením zatřeste.</string>
@ -647,9 +643,6 @@
<string name="zetime_calories_type">Nastavení kalorií</string>
<string name="zetime_calories_type_active">Pouze spálené kalorie</string>
<string name="zetime_calories_type_all">Aktivní a neaktivní spálené kalorie</string>
<string name="zetime_time_format">Formát času</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Formát datumu</string>
<string name="zetime_date_format_1">YY/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/YY</string>

View File

@ -441,7 +441,6 @@
<string name="_pebble_watch_reply">Antworten</string>
<string name="controlcenter_connect">Verbinden…</string>
<string name="pref_title_pebble_enable_bgjs">Hintergrund JS aktivieren</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip Einstellungen</string>
<string name="simplified_chinese">Vereinfachtes Chinesisch</string>
<string name="traditional_chinese">Traditionelles Chinesisch</string>
<string name="english">Englisch</string>
@ -551,10 +550,6 @@
<string name="title_activity_watch9_calibration">Watch 9 kalibrieren</string>
<string name="watch9_calibration_hint">Stelle die Zeit ein, die dir dein Gerät gerade anzeigt.</string>
<string name="controlcenter_calibrate_device">Gerät kalibrieren</string>
<string name="preferences_id115_settings">ID115 Einstellungen</string>
<string name="preferences_miband2_settings">Mi Band 2 Einstellungen</string>
<string name="preferences_miband3_settings">Mi Band 3 Einstellungen</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor Einstellungen</string>s
<string name="horizontal">Horizontal</string>
<string name="vertical">Vertikal</string>
<string name="you_slept">Du hast von %1$s bis %2$s geschlafen</string>
@ -653,9 +648,6 @@
<string name="zetime_title_heartrate">Herzfrequenz Einstellungen</string>
<string name="zetime_title_heart_rate_alarm">Herzfrequenz Alarm</string>
<string name="zetime_heart_rate_alarm_enable">Herzfrequenz Alarm aktivieren</string>
<string name="zetime_time_format">Zeitformat</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Datumsformat</string>
<string name="zetime_date_format_1">JJ/MM/TT</string>
<string name="zetime_date_format_2">TT/MM/JJ</string>

View File

@ -210,7 +210,6 @@
<string name="message_cannot_pair_no_mac">Δεν πέρασε καμία διεύθυνση MAC, δεν είναι δυνατή η σύζευξη.</string>
<string name="preferences_category_device_specific_settings">Ρυθμίσεις ανάλογα με τον τύπο συσκευής</string>
<string name="preferences_miband_settings">Ρυθμίσεις για Mi Band / Amazfit</string>
<string name="preferences_amazfitbip_settings">Ρυθμίσεις για Amazfit Bip</string>
<string name="male">Άνδρας</string>
<string name="female">Γυναίκα</string>
<string name="other">Άλλο</string>
@ -541,11 +540,7 @@
<string name="pref_auto_fetch_limit_fetches">Ελάχιστος χρόνος μεταξύ λήψης δεδομένων</string>
<string name="pref_auto_fetch_limit_fetches_summary">Λήψη δεδομένων κάθε %d λεπτά</string>
<string name="controlcenter_calibrate_device">Ρύθμιση (καλιμπράρισμα) συσκευής</string>
<string name="preferences_id115_settings">Ρυθμίσεις ID115</string>
<string name="prefs_screen_orientation">Προσανατολισμός οθόνης</string>
<string name="preferences_miband2_settings">Ρυθμίσεις Mi Band 2</string>
<string name="preferences_miband3_settings">Ρυθμίσεις Mi Band 3</string>
<string name="preferences_amazfitcor_settings">Ρυθμίσεις Amazfit Cor</string>s
<string name="horizontal">Οριζόντια</string>
<string name="vertical">Κάθετα</string>
<string name="watch9_pairing_tap_hint">Όταν το smartwatch δονείται, κουνήστε το ή πατήστε το κουμπί του.</string>
@ -656,9 +651,6 @@
<string name="zetime_calories_type">Τύπος θερμίδων</string>
<string name="zetime_calories_type_active">Ενεργές μόνο θερμίδες που έχετε κάψει</string>
<string name="zetime_calories_type_all">Ενεργές και ανενεργές θερμίδες</string>
<string name="zetime_time_format">Μορφή ώρας</string>
<string name="zetime_time_format_24h">24ωρη</string>
<string name="zetime_time_format_12h">12ωρη</string>
<string name="zetime_date_format">Μορφή ημερομηνίας</string>
<string name="zetime_date_format_1">ΕΕ/ΜΜ/ΗΗ</string>
<string name="zetime_date_format_2">ΗΗ/ΜΜ/ΕΕ</string>

View File

@ -448,7 +448,6 @@
\n
\n¡PROCEDE BAJO TU PROPIA RESPONSABILIDAD !</string>
<string name="pref_title_charts_swipe">Permitir deslizar hacia izquierda/derecha en los gráficos de actividad</string>
<string name="preferences_amazfitbip_settings">Ajustes Amazfit Bip</string>
<string name="automatic">Automático</string>
<string name="simplified_chinese">Chino simplificado</string>
<string name="traditional_chinese">Chino tradicional</string>
@ -534,12 +533,8 @@
<string name="pref_rtl_max_line_length_summary">Alarga o acorta las líneas de texto de derecha a izquierda si contiene separaciones</string>
<string name="pref_title_pebble_gatt_clientonly">Sólo cliente GATT</string>
<string name="pref_summary_pebble_gatt_clientonly">Esto es solo para Pebble 2 y experimental, intente esto si tiene problemas de conectividad</string>
<string name="preferences_id115_settings">Ajustes ID115</string>
<string name="prefs_screen_orientation">Orientación de pamtalla</string>
<string name="pref_auto_fetch_summary">Extracciones suceden al desbloquear la pantalla. Sólo funciona si se establece un mecanismo de bloqueo!</string>
<string name="preferences_miband2_settings">Ajustes Mi Band 2</string>
<string name="preferences_miband3_settings">Ajustes Mi Band 3</string>
<string name="preferences_amazfitcor_settings">Ajustes Amazfit Cor</string>s
<string name="horizontal">"Horizontal "</string>
<string name="vertical">Vertical</string>
<string name="notif_battery_low">%1$s batería baja</string>
@ -648,9 +643,6 @@
<string name="zetime_handmove_display_summary">Gire la muñeca para activar o desactivar la pantalla.</string>
<string name="zetime_calories_type">Tipo de calorías</string>
<string name="zetime_calories_type_active">Solo activo para quemar calorías</string>
<string name="zetime_time_format">Formato de hora</string>
<string name="zetime_time_format_24h">24H</string>
<string name="zetime_time_format_12h">12H</string>
<string name="zetime_date_format">Formato de fecha</string>
<string name="zetime_date_format_1">aa/mm/dd</string>
<string name="zetime_date_format_2">dd/mm/aa</string>

View File

@ -181,7 +181,6 @@
<string name="pref_title_screentime">Ekraani avatuse kestus</string>
<string name="prefs_title_all_day_heart_rate">Kogu päeva südame löögisageduse mõõtmine</string>
<string name="preferences_hplus_settings">HPlus/Makibes seaded</string>
<string name="preferences_id115_settings">ID115 seaded</string>
<string name="prefs_screen_orientation">Ekraani suund</string>
<string name="zetime_title_settings">ZeTime seaded</string>
<string name="zetime_title_heartrate">Südame löögisageduse seaded</string>
@ -201,9 +200,6 @@
<string name="zetime_calories_type">Kalorite tüüp</string>
<string name="zetime_calories_type_active">Ainult aktiivselt põletatud kalorid</string>
<string name="zetime_calories_type_all">Aktiivselt ja passiivselt põletatud kalorid</string>
<string name="zetime_time_format">Kellaaja vorming</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Kuupäeva vorming</string>
<string name="zetime_prefs_inactivity_repetitions">Kordused</string>
<string name="zetime_prefs_inactivity_mo">Esmaspäev</string>

View File

@ -442,7 +442,6 @@ Temps de sommeil préféré en heures</string>
\n
\nCONTINUEZ À VOS RISQUES !</string>
<string name="pref_title_charts_swipe">Permettre le balayage gauche/droite dans les graphiques d\'activité</string>
<string name="preferences_amazfitbip_settings">Paramètres Amazfit Bip</string>
<string name="automatic">Automatique</string>
<string name="simplified_chinese">Chinois simplifié</string>
<string name="traditional_chinese">Chinois traditionnel</string>
@ -529,15 +528,11 @@ Temps de sommeil préféré en heures</string>
\nÀ VOS RISQUES ET PÉRILS !"</string>
<string name="pref_title_pebble_gatt_clientonly">client GATT uniquement</string>
<string name="pref_summary_pebble_gatt_clientonly">C\'est uniquement pour les Pebble 2 et expérimental, à essayer si vous avez des problèmes de connectivité</string>
<string name="preferences_id115_settings">réglages ID115</string>
<string name="prefs_screen_orientation">Orientation de l\'écran</string>
<string name="pref_auto_fetch">Récupérer automatiquement les données d\'activité</string>
<string name="pref_auto_fetch_summary">Récupération au déverrouillage de l\'écran. Fonctionne uniquement si un mécanisme de verrouillage est configuré !</string>
<string name="pref_auto_fetch_limit_fetches">Temps minimum entre synchronisations</string>
<string name="pref_auto_fetch_limit_fetches_summary">Synchronisation toutes les %d minutes</string>
<string name="preferences_miband2_settings">Réglages Mi Band 2</string>
<string name="preferences_miband3_settings">Réglages Mi Band 3</string>
<string name="preferences_amazfitcor_settings">Réglages Amazfit Cor</string>s
<string name="horizontal">Horizontal</string>
<string name="vertical">Vertical</string>
<string name="russian">Russe</string>
@ -650,9 +645,6 @@ Temps de sommeil préféré en heures</string>
<string name="zetime_calories_type">Type de calories</string>
<string name="zetime_calories_type_active">Seulement les calories brûlées activement</string>
<string name="zetime_calories_type_all">Calories brûlées activement et au repos</string>
<string name="zetime_time_format">Format de l\'heure</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Format de la date</string>
<string name="zetime_date_format_1">aaaa/mm/jj</string>
<string name="zetime_date_format_2">jj/mm/aaaa</string>

View File

@ -500,7 +500,6 @@
<string name="pref_title_charts_swipe">Permitir deslizar a esquerda/dereita nas gráficas de actividade</string>
<string name="preferences_amazfitbip_settings">Axustes de Amazfit Bip</string>
<string name="automatic">Automático</string>
<string name="simplified_chinese">Chinés simplificado</string>
<string name="traditional_chinese">Chinés tradicional</string>

View File

@ -531,14 +531,10 @@
<string name="pref_auto_fetch_limit_fetches_summary">מתבצע אחזור כל %d דקות</string>
<string name="devicetype_mykronoz_zetime">MyKronoz ZeTime</string>
<string name="russian">רוסית</string>
<string name="preferences_id115_settings">הגדרות ID115</string>
<string name="prefs_screen_orientation">כיוון המסך</string>
<string name="horizontal">אופקי</string>
<string name="vertical">אנכי</string>
<string name="devicetype_id115">ID115</string>
<string name="preferences_miband2_settings">הגדרות Mi Band 2</string>
<string name="preferences_miband3_settings">הגדרות Mi Band 3</string>
<string name="preferences_amazfitcor_settings">הגדרות Amazfit Cor</string>s
<string name="menuitem_notifications">התראות</string>
<string name="menuitem_more">עוד</string>
<string name="menuitem_music">מוזיקה</string>
@ -644,9 +640,6 @@
<string name="zetime_calories_type">סוג קלוריות</string>
<string name="zetime_calories_type_active">קלוריות פעילות שנשרפו בלבד</string>
<string name="zetime_calories_type_all">קלוריות פעילות ובלתי פעילות שנשרפו בלבד</string>
<string name="zetime_time_format">תצורת זמן</string>
<string name="zetime_time_format_24h">24 שעות</string>
<string name="zetime_time_format_12h">12 שעות</string>
<string name="zetime_date_format">תצורת תאריך</string>
<string name="zetime_date_format_1">YY/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/YY</string>

View File

@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources><string name="app_name">Gadgetbridge</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip Postavke</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor Postavke</string>s
<string name="male">Muško</string>
<string name="female">Žensko</string>
<string name="other">Ostalo</string>

View File

@ -400,23 +400,16 @@
<string name="discovery_dont_pair">Nem párosított</string>
<string name="action_donate">Támogatás</string>
<string name="controlcenter_connect">Csatlakoztatás…</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip beállítások</string>
<string name="pref_title_weather">Időjárás</string>
<string name="pref_auto_fetch">Aktivitás adatok automata letöltése</string>
<string name="horizontal">Vízszintes</string>
<string name="vertical">Függőleges</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor beállítások</string>s
<string name="preferences_miband2_settings">Mi Band 2 beállítások</string>
<string name="preferences_miband3_settings">Mi Band 3 beállítások</string>
<string name="controlcenter_change_led_color">LED szín változtatása</string>
<string name="controlcenter_change_fm_frequency">FM Frekvencia Változtatása</string>
<string name="pref_title_rtl">Jobbról-Balra</string>
<string name="debugactivity_really_factoryreset_title">Biztos a gyári beállítások visszaállításában\?</string>
<string name="zetime_analog_mode">Analóg mód</string>
<string name="zetime_handmove_display_summary">Képernyő be és kikapcsolása csukló forgatása által.</string>
<string name="zetime_time_format">Időformátum</string>
<string name="zetime_time_format_24h">24 óra</string>
<string name="zetime_time_format_12h">12 óra</string>
<string name="zetime_date_format">Dátum formátum</string>
<string name="zetime_prefs_inactivity_repetitions">Ismétlés</string>
<string name="zetime_prefs_inactivity_mo">Hétfő</string>

View File

@ -422,7 +422,6 @@
<string name="pref_title_auto_export_interval">Intervallo di esportazione</string>
<string name="pref_summary_auto_export_interval">Esporta ogni %d ora/e</string>
<string name="unknown_state">Stato sconosciuto</string>
<string name="preferences_amazfitbip_settings">Impostazioni Amazfit Bip</string>
<string name="prefs_title_heartrate_measurement_interval">Misurazione battito continua</string>
<string name="interval_one_minute">ogni minuto</string>
<string name="interval_five_minutes">ogni 5 minuti</string>
@ -534,12 +533,8 @@
<string name="pref_summary_rtl">Abilita questo se il tuo dispositivo non mostra le lingue lette da destra a sinistra</string>
<string name="pref_rtl_max_line_length">Lunghezza massima delle linee</string>
<string name="pref_rtl_max_line_length_summary">Aumenta o diminuisci il numero di righe con cui separare il testo da destra a sinistra</string>
<string name="preferences_id115_settings">"Impostazioni per ID115 "</string>
<string name="prefs_screen_orientation">Orientamento dello schermo</string>
<string name="pref_auto_fetch_limit_fetches">Tempo minimo tra le sincronizzazioni</string>
<string name="preferences_miband2_settings">Impostazioni per Mi Band 2</string>
<string name="preferences_miband3_settings">Impostazioni per Mi Band 3</string>
<string name="preferences_amazfitcor_settings">Impostazioni per Amazfit Cor</string>s
<string name="horizontal">Orizzontale</string>
<string name="vertical">Verticale</string>
<string name="watch9_pairing_tap_hint">Quando il tuo orologio vibra, scuotilo o premi il tasto.</string>
@ -630,8 +625,6 @@
<string name="activity_prefs_alarm_max_heart_rate">Frequenza cardiaca massima</string>
<string name="activity_prefs_alarm_min_heart_rate">Frequenza cardiaca minima</string>
<string name="zetime_handmove_display_summary">Ruota il polso per attivare o disattivare il display.</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Formato data</string>
<string name="zetime_date_format_1">AA/MM/GG</string>
<string name="zetime_date_format_2">GG/MM/AA</string>
@ -656,7 +649,6 @@
<string name="zetime_calories_type">Tipo calorie</string>
<string name="zetime_calories_type_active">Solo calorie bruciate attivamente</string>
<string name="zetime_calories_type_all">Calorie bruciate attivamente e passivamente</string>
<string name="zetime_time_format">Formato ora</string>
<string name="zetime_prefs_inactivity_repetitions">Ripetizioni</string>
<string name="zetime_title_alarm_signaling">Imposta il tipo di segnale per l\'allarme</string>
<string name="zetime_signaling_none">Silenzioso</string>

View File

@ -439,7 +439,6 @@
<string name="pref_summary_pebble_enable_bgjs">有効にすると、ウォッチフェースに天気、バッテリー情報等を表示することができます。</string>
<string name="activity_web_view">Web View アクティビティ</string>
<string name="pref_title_charts_swipe">チャートアクティビティで左/右のスワイプを有効にする</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip 設定</string>
<string name="prefs_title_heartrate_measurement_interval">終日心拍数計測</string>
<string name="interval_one_minute">1分間に 1 回</string>
<string name="interval_five_minutes">5 分ごと</string>
@ -533,15 +532,11 @@
<string name="pref_summary_rtl">お使いのデバイスが右から左の言語を表示できない場合はこれを有効にします</string>
<string name="pref_rtl_max_line_length">右から左への最大行長</string>
<string name="pref_rtl_max_line_length_summary">右から左のテキストの行を伸長または短縮して分けます</string>
<string name="preferences_id115_settings">ID115 設定</string>
<string name="prefs_screen_orientation">画面の向き</string>
<string name="pref_auto_fetch">アクティビティデータの自動取得</string>
<string name="pref_auto_fetch_summary">画面のロック解除時に取得を行います。ロック機構が設定されている場合のみ動作します!</string>
<string name="pref_auto_fetch_limit_fetches">取得の間隔の最小時間</string>
<string name="pref_auto_fetch_limit_fetches_summary">%d 分ごとに取得します</string>
<string name="preferences_miband2_settings">Mi Band 2 設定</string>
<string name="preferences_miband3_settings">Mi Band 3 設定</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor 設定</string>
<string name="horizontal">横向き</string>
<string name="vertical">縦向き</string>
<string name="watch9_pairing_tap_hint">ウォッチが振動したとき、デバイスを振るか、ボタンを押してください。</string>

View File

@ -328,7 +328,6 @@
<string name="pairing_unable_to_pair_with">%1$s (%2$s)에 페어링 불가능</string>
<string name="pairing_in_progress">연결 생성 중: %1$s (%2$s)</string>
<string name="pairing_already_bonded">이미 %1$s (%2$s)에 연결이 생성되었으며 연결하는 중…</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip 설정</string>
<string name="discovery_connected_devices_hint">기기를 발견 가능하도록 설정하세요. 현재 연결된 기기는 나타나지 않을 가능성이 높습니다. 안드로이드 6.0 이상의 버전에서는 위치(예: GPS) 기능을 활성화하세요. Privacy Guard가 설정되어 있다면 오작동을 일으킬 가능성이 있으므로 가젯브릿지를 예외 처리하세요. 몇 분 안에 기기가 발견되지 않는다면, 기기를 재시작하고 다시 시도하세요.</string>
<string name="vibration_try">시도하기</string>
<string name="pref_screen_notification_profile_email">이메일 알림</string>
@ -531,7 +530,6 @@
<string name="pref_title_weather">날씨</string>
<string name="pref_title_pebble_gatt_clientonly">"GATT client 만 "</string>
<string name="pref_summary_pebble_gatt_clientonly">"이것은 Pebble2 만의 것이고 실험적입니다. 만약 연결 문제가 있다면 시도해보세요 "</string>
<string name="preferences_id115_settings">ID115 설정</string>
<string name="prefs_screen_orientation">화면 방향</string>
<string name="pref_header_auto_export">자동 추출</string>
<string name="pref_title_auto_export_enabled">자동 추출 활성화</string>
@ -542,9 +540,6 @@
<string name="pref_auto_fetch_summary">가져 오기는 화면 잠금 해제시 발생합니다. 잠금 메커니즘이 설정된 경우에만 작동합니다!</string>
<string name="pref_auto_fetch_limit_fetches">가져오는 최소 시간</string>
<string name="pref_auto_fetch_limit_fetches_summary">매 %d 분마다 데이터 가져오기</string>
<string name="preferences_miband2_settings">Mi Band 2 설정</string>
<string name="preferences_miband3_settings">Mi Band 3 설정</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor 설정</string>s
<string name="horizontal">수평</string>
<string name="vertical">수직</string>
<string name="watch9_pairing_tap_hint">시계가 진동하면 장치를 흔들거나 버튼을 누르십시오.</string>

View File

@ -195,7 +195,6 @@
<string name="message_cannot_pair_no_mac">Ingen MAC-adresse sendt, kan ikke parre.</string>
<string name="preferences_category_device_specific_settings">Enhetsspesifikke innstillinger</string>
<string name="preferences_miband_settings">Mi Band / Amazfit -innstillinger</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip-innstillinger</string>
<string name="male">Mann</string>
<string name="female">Kvinne</string>
<string name="other">Annet</string>
@ -536,11 +535,7 @@
<string name="pref_auto_fetch_limit_fetches_summary">Henter hvert %d minutt</string>
<string name="controlcenter_calibrate_device">Kalibrer enhet</string>
<string name="pref_title_notifications_timeout">Minimumstid mellom merknad</string>
<string name="preferences_id115_settings">ID115-innstillinger</string>
<string name="prefs_screen_orientation">Skjermretning</string>
<string name="preferences_miband2_settings">Mi Band 2-innstillinger</string>
<string name="preferences_miband3_settings">Mi Band 3-innstillinger</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor-inntillinger</string>s
<string name="horizontal">Vannrett</string>
<string name="vertical">Loddrett</string>
<string name="watch9_pairing_tap_hint">Når din klokke vibrerer, rist enheten eller på dens knapp.</string>
@ -637,9 +632,6 @@
<string name="zetime_activity_tracking">Aktivitetssporing</string>
<string name="zetime_handmove_display">Håndbevegelse</string>
<string name="zetime_calories_type">Kaloritype</string>
<string name="zetime_time_format">Tidsformat</string>
<string name="zetime_time_format_24h">24t</string>
<string name="zetime_time_format_12h">12t</string>
<string name="zetime_date_format">Datoformat</string>
<string name="zetime_date_format_1">ÅÅ/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/ÅÅ</string>

View File

@ -217,7 +217,6 @@
<string name="message_cannot_pair_no_mac">Geen MAC adres doorgegeven, kan niet koppelen.</string>
<string name="preferences_category_device_specific_settings">Toestel specifieke instellingen</string>
<string name="preferences_miband_settings">Mi Band / Amazfit instellingen</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip instellingen</string>
<string name="male">Mannelijk</string>
<string name="female">Vrouwelijk</string>
<string name="other">Anders</string>
@ -536,11 +535,7 @@
<string name="menuitem_settings">Instellingen</string>
<string name="menuitem_alipay">Alipay</string>
<string name="controlcenter_calibrate_device">Kalibreer apparaat</string>
<string name="preferences_id115_settings">ID115 instellingen</string>
<string name="prefs_screen_orientation">Scherm orientatie</string>
<string name="preferences_miband2_settings">Mi Band 2 instellingen</string>
<string name="preferences_miband3_settings">Mi Band 3 instellingen</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor instellingen</string>s
<string name="horizontal">Horizontaal</string>
<string name="vertical">Verticaal</string>
<string name="watch9_pairing_tap_hint">Wanneer het horloge trilt, schud het of druk op de knop.</string>
@ -651,9 +646,6 @@
<string name="zetime_calories_type">Soort calorieën</string>
<string name="zetime_calories_type_active">Alleen calorieën verbrand gedurende activiteiten</string>
<string name="zetime_calories_type_all">Verbrande calorieën actief en inactief</string>
<string name="zetime_time_format">Tijd formaat</string>
<string name="zetime_time_format_24h">24 uur</string>
<string name="zetime_time_format_12h">12 uur</string>
<string name="zetime_date_format">Datum formaat</string>
<string name="zetime_date_format_1">YY/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/YY</string>

View File

@ -335,7 +335,6 @@
<string name="prefs_title_all_day_heart_rate">Całodobowy pomiar tętna</string>
<string name="pref_header_auto_export">Automatyczny eksport</string>
<string name="pref_summary_auto_export_interval">Eksportowanie co %d godzin</string>
<string name="preferences_amazfitbip_settings">Ustawienia Amazfit Bip</string>
<string name="prefs_title_heartrate_measurement_interval">Całodobowy pomiar tętna</string>
<string name="interval_one_minute">raz na minutę</string>
<string name="interval_five_minutes">raz na 5 minut</string>
@ -396,7 +395,6 @@
<string name="pref_title_pebble_always_ack_pebblekit">Natychmiastowe potwierdzenia PebbleKit</string>
<string name="pref_summary_pebble_always_ack_pebblekit">Spowoduje, że wiadomości wysyłane do zewnętrznych aplikacji będą zawsze natychmiast potwierdzane</string>
<string name="pref_title_screentime">Czas włączenia ekranu</string>
<string name="preferences_id115_settings">Ustawienia ID115</string>
<string name="prefs_screen_orientation">Orientacja ekranu</string>
<string name="pref_title_auto_export_enabled">Auto eksport włączony</string>
<string name="pref_title_auto_export_location">Ścieżka eksportu</string>
@ -404,9 +402,6 @@
<string name="pref_auto_fetch_summary">Pobranie danych nastąpi po odblokowaniu ekranu. Działa tylko jeśli blokada jest włączona!</string>
<string name="pref_auto_fetch_limit_fetches">Minimalny odstęp czasu pomiędzy pobraniami</string>
<string name="pref_auto_fetch_limit_fetches_summary">Pobieranie co %d minut(y)</string>
<string name="preferences_miband2_settings">Ustawienia Mi Band 2</string>
<string name="preferences_miband3_settings">Ustawienia Mi Band 3</string>
<string name="preferences_amazfitcor_settings">Ustawienia Amazfit Cor</string>s
<string name="horizontal">Poziomo</string>
<string name="vertical">Pionowo</string>
<string name="discovery_connected_devices_hint">Upewnij się, że urządzenie (opaska/smartwatch) jest wykrywalne. Aktualnie połączone urządzenia prawdopodobnie nie będą wykrywalne. Na Androidzie 6+ włącz dostęp do lokalizacji (GPS). Wyłącz Privacy Guard dla Gadgetbridge, ponieważ mogą ze sobą kolidować. Jeżeli urządzenie nie zostanie wykryte w przeciągu paru minut, spróbuj ponownie po ponownym uruchomieniu telefonu.</string>

View File

@ -394,7 +394,6 @@
<string name="pref_title_auto_export_location">Localização da exportação</string>
<string name="pref_title_auto_export_interval">Intervalo de exportação</string>
<string name="pref_summary_auto_export_interval">Exportar a cada %d hora(s)</string>
<string name="preferences_amazfitbip_settings">Ajustes do Amazfit Bip</string>
<string name="discovery_connected_devices_hint">Permita que seu dispositivo seja detectado. Os dispositivos já pareados não serão detectados. Para o Android 6 ou superior, é necessário habilitar a localização de GPS. Desative o Privacy Guard para o Gadgetbridge, pois o telefone poderá travar ou reiniciar caso esteja ativo. Se nenhum dispositivo for encontrado após alguns minutos, tente novamente após reiniciar seu dispositivo móvel.</string>
<string name="prefs_title_heartrate_measurement_interval">Medição diária de frequência cardíaca</string>
<string name="interval_one_minute">a cada minuto</string>
@ -551,15 +550,11 @@
<string name="pref_auto_fetch_limit_fetches_summary">Coleta a cada %d minutos</string>
<string name="devicetype_mykronoz_zetime">MyKronoz ZeTime</string>
<string name="russian">Russo</string>
<string name="preferences_id115_settings">Configurações ID115</string>
<string name="prefs_screen_orientation">Orientação da tela</string>
<string name="horizontal">Horizontal</string>
<string name="vertical">Vertical</string>
<string name="devicetype_id115">ID115</string>
<string name="preferences_amazfitcor_settings">Configurações do Amazfit Cor</string>s
<string name="menuitem_notifications">Notificações</string>
<string name="preferences_miband2_settings">Configurações do Mi Band 2</string>
<string name="preferences_miband3_settings">Configurações do Mi Band 3</string>
<string name="menuitem_more">Mais</string>
<string name="menuitem_music">Música</string>
<string name="watch9_pairing_tap_hint">Quando seu relógio vibrar, agite o dispositivo ou pressione seu botão.</string>
@ -657,9 +652,6 @@
<string name="zetime_calories_type">Tipo de calorias</string>
<string name="zetime_calories_type_active">Só ativar calorias queimadas</string>
<string name="zetime_calories_type_all">Calorias queimadas ativas e inativas</string>
<string name="zetime_time_format">Formato da hora</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Formato da data</string>
<string name="zetime_date_format_1">AA/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/AA</string>

View File

@ -420,17 +420,12 @@
<string name="pref_title_enable_calendar_sync">Sincronizar calendário</string>
<string name="pref_title_pebble_gatt_clientonly">Apenas cliente GATT</string>
<string name="pref_summary_pebble_gatt_clientonly">Usado apenas para o Pebble 2, experimente se estiver a ter problemas de ligação</string>
<string name="preferences_id115_settings">Configurações ID115</string>
<string name="prefs_screen_orientation">Orientação do ecrã</string>
<string name="pref_header_auto_export">Exportação automática</string>
<string name="pref_title_auto_export_enabled">Exportação automática ativa</string>
<string name="pref_title_auto_export_location">Exportar localização</string>
<string name="pref_title_auto_export_interval">Intervalo de exportação</string>
<string name="pref_summary_auto_export_interval">Exportar a cada %d horas</string>
<string name="preferences_miband2_settings">Configurações Mi Band 2</string>
<string name="preferences_miband3_settings">Configurações Mi Band 3</string>
<string name="preferences_amazfitbip_settings">Configurações Amazfit Bip</string>
<string name="preferences_amazfitcor_settings">Configurações Amazfit Cor</string>s
<string name="horizontal">Horizontal</string>
<string name="vertical">Vertical</string>
<string name="watch9_pairing_tap_hint">Quando o seu relógio vibrar, agite-o ou carregue no botão.</string>

View File

@ -420,7 +420,6 @@
<string name="_pebble_watch_open_on_phone">Открыть в устройстве</string>
<string name="_pebble_watch_mute">Отключить звук</string>
<string name="_pebble_watch_reply">Ответить</string>
<string name="preferences_amazfitbip_settings">Настройки Amazfit Bip</string>
<string name="stats_title">Зоны скорости</string>
<string name="stats_x_axis_label">Всего минут</string>
<string name="stats_y_axis_label">Шагов в минуту</string>
@ -530,7 +529,6 @@
<string name="devicetype_teclast_h30">Teclast H30</string>
<string name="devicetype_xwatch">XWatch</string>
<string name="devicetype_mykronoz_zetime">MyKronoz ZeTime</string>
<string name="preferences_id115_settings">Настройки ID115</string>
<string name="prefs_screen_orientation">Ориентация экрана</string>
<string name="pref_auto_fetch">Автозагрузка данных об активности</string>
<string name="pref_auto_fetch_summary">Загрузка данных при каждой разблокировке экрана. Это работает только при включенной блокировке экрана!</string>
@ -549,10 +547,7 @@
<string name="choose_auto_export_location">Куда сохранять данные при экспорте</string>
<string name="notification_channel_name">Уведомления Gadgetbridge</string>
<string name="menuitem_activity">Активность</string>
<string name="preferences_amazfitcor_settings">Настройки Amazfit Cor</string>s
<string name="menuitem_notifications">Уведомления</string>
<string name="preferences_miband2_settings">Настройки Mi Band 2</string>
<string name="preferences_miband3_settings">Настройки Mi Band 3</string>
<string name="menuitem_more">Ещё</string>
<string name="menuitem_music">Музыка</string>
<string name="controlcenter_calibrate_device">Калибровать устройство</string>

View File

@ -246,7 +246,6 @@
<string name="message_cannot_pair_no_mac">Adresa MAC neprišla, nemôžem spárovať.</string>
<string name="preferences_category_device_specific_settings">Špecifické nastavenia zariadení</string>
<string name="preferences_miband_settings">Nastavenia Mi Band / Amazfit</string>
<string name="preferences_amazfitbip_settings">Nastavenia Amazfit Bip</string>
<string name="male">Muž</string>
<string name="female">Žena</string>
<string name="other">Iné</string>

View File

@ -321,9 +321,6 @@
<string name="prefs_screen_orientation">Орієнтація екрана</string>
<string name="pref_title_auto_export_enabled">Автоматичний експорт увімкнено</string>
<string name="tap_a_device_to_connect">Натисніть на пристрій для підключення</string>
<string name="preferences_miband2_settings">Налаштування Mi Band 2</string>
<string name="preferences_miband3_settings">Налаштування Mi Band 3</string>
<string name="preferences_amazfitbip_settings">Налаштування Amazfit Bip</string>
<string name="horizontal">Горизонтально</string>
<string name="vertical">Вертикально</string>
<string name="vibration_try">Спробувати</string>
@ -359,7 +356,6 @@
<string name="pairing">Утворення пари з %s…</string>
<string name="pairing_unable_to_pair_with">Не вдалось утворити пару з %1$s (%2$s)</string>
<string name="pairing_in_progress">Зв\'язування в процесі: %1$s (%2$s)</string>
<string name="preferences_amazfitcor_settings">Налаштування Amazfit Cor</string>s
<string name="watch9_pairing_tap_hint">Коли ваш годинник вібруватиме, потрясіть пристрій або натисніть його кнопку.</string>
<string name="stats_x_axis_label">Всього хвилин</string>
<string name="weeksleepchart_sleep_a_week">Сон за тиждень</string>
@ -458,7 +454,6 @@
<string name="pref_title_pebble_forcele">Завжди надавати перевагу BLE</string>
<string name="pref_title_screentime">Тривалість роботи екрану</string>
<string name="preferences_hplus_settings">Налаштування HPlus/Makibes</string>
<string name="preferences_id115_settings">Налаштування ID115</string>
<string name="zetime_title_settings">Налаштування ZeTime</string>
<string name="zetime_title_heartrate">Налаштування серцебиття</string>
<string name="zetime_title_screentime">Тривалість екрану в секундах</string>
@ -466,9 +461,6 @@
<string name="activity_prefs_alarm_min_heart_rate">Мінімальне серцебиття</string>
<string name="zetime_analog_mode">Аналоговий режим</string>
<string name="zetime_analog_mode_hands">Лише вручну</string>
<string name="zetime_time_format">Формат часу</string>
<string name="zetime_time_format_24h">24г</string>
<string name="zetime_time_format_12h">12г</string>
<string name="zetime_date_format">Формат дати</string>
<string name="zetime_date_format_1">РР/ММ/ДД</string>
<string name="zetime_date_format_2">ДД/ММ/РР</string>

View File

@ -198,7 +198,6 @@
<string name="message_cannot_pair_no_mac">没有 MAC 地址通过, 不能配对。</string>
<string name="preferences_category_device_specific_settings">设备特定设置</string>
<string name="preferences_miband_settings">小米手环/米动手环设置</string>
<string name="preferences_amazfitbip_settings">米动手表青春版设置</string>
<string name="male"></string>
<string name="female"></string>
<string name="other">其它</string>
@ -502,15 +501,11 @@
<string name="pref_title_pebble_gatt_clientonly">仅限 GATT 客户端</string>
<string name="pref_summary_pebble_gatt_clientonly">这是仅为 Pebble 2 的选项,且为试验性质,如果您遇到连接性问题,请尝试</string>
<string name="pref_title_pebble_always_ack_pebblekit">提前 ACK PebbleKit</string>
<string name="preferences_id115_settings">ID115 设置</string>
<string name="prefs_screen_orientation">屏幕朝向</string>
<string name="pref_auto_fetch">自动获取活动数据</string>
<string name="pref_auto_fetch_summary">屏幕解锁时会自动获取。仅在设置了锁定机制才会有效!</string>
<string name="pref_auto_fetch_limit_fetches">刷新最小间隔</string>
<string name="pref_auto_fetch_limit_fetches_summary">每隔 %d 分钟刷新</string>
<string name="preferences_miband2_settings">小米手环2 设置</string>
<string name="preferences_miband3_settings">小米手环3 设置</string>
<string name="preferences_amazfitcor_settings">米动手环设置</string>s
<string name="horizontal">横向</string>
<string name="vertical">纵向</string>
<string name="watch9_pairing_tap_hint">当您的手环震动时,晃动设备或者按下按钮。</string>
@ -651,9 +646,6 @@
<string name="zetime_calories_type">卡路里类型</string>
<string name="zetime_calories_type_active">仅运动消耗的热量</string>
<string name="zetime_calories_type_all">运行和非运动消耗的热量</string>
<string name="zetime_time_format">时间格式</string>
<string name="zetime_time_format_24h">24小时制</string>
<string name="zetime_time_format_12h">12小时制</string>
<string name="zetime_date_format">日期格式</string>
<string name="zetime_date_format_1">YY/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/YY</string>

View File

@ -546,14 +546,6 @@
<item>0</item>
<item>1</item>
</string-array>
<string-array name="zetime_time_format">
<item name="1">@string/zetime_time_format_24h</item>
<item name="2">@string/zetime_time_format_12h</item>
</string-array>
<string-array name="zetime_time_format_values">
<item>1</item>
<item>2</item>
</string-array>
<string-array name="zetime_date_format">
<item name="1">@string/zetime_date_format_1</item>
<item name="2">@string/zetime_date_format_2</item>

View File

@ -189,7 +189,6 @@
<!-- Makibes HR3 Preferences -->
<string name="preferences_makibes_hr3_settings">Makibes HR3 settings</string>
<!-- ID115 Preferences -->
<string name="preferences_id115_settings">ID115 settings</string>
<string name="prefs_screen_orientation">Screen orientation</string>
<!-- ZeTime Preferences -->
<string name="zetime_title_settings">ZeTime settings</string>
@ -210,9 +209,6 @@
<string name="zetime_calories_type">Calories type</string>
<string name="zetime_calories_type_active">Only active burnt calories</string>
<string name="zetime_calories_type_all">Active and inactive burnt calories</string>
<string name="zetime_time_format">Time format</string>
<string name="zetime_time_format_24h">24h</string>
<string name="zetime_time_format_12h">12h</string>
<string name="zetime_date_format">Date format</string>
<string name="zetime_date_format_1">YY/MM/DD</string>
<string name="zetime_date_format_2">DD/MM/YY</string>
@ -293,10 +289,6 @@
<string name="message_cannot_pair_no_mac">No MAC address passed, cannot pair.</string>
<string name="preferences_category_device_specific_settings">Device specific settings</string>
<string name="preferences_miband_settings">Mi Band / Amazfit settings</string>
<string name="preferences_miband2_settings">Mi Band 2 settings</string>
<string name="preferences_miband3_settings">Mi Band 3 settings</string>
<string name="preferences_amazfitbip_settings">Amazfit Bip settings</string>
<string name="preferences_amazfitcor_settings">Amazfit Cor settings</string>s
<string name="male">Male</string>
<string name="female">Female</string>
<string name="other">Other</string>
@ -655,6 +647,7 @@
<string name="devicetype_miband3">Mi Band 3</string>
<string name="devicetype_miband4">Mi Band 4</string>
<string name="devicetype_amazfit_bip">Amazfit Bip</string>
<string name="devicetype_amazfit_bip_lite">Amazfit Bip Lite</string>
<string name="devicetype_amazfit_cor">Amazfit Cor</string>
<string name="devicetype_amazfit_cor2">Amazfit Cor 2</string>
<string name="devicetype_vibratissimo">Vibratissimo</string>

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:defaultValue="horizontal"
android:entries="@array/orientation"
android:entryValues="@array/orientation_values"
android:key="screen_orientation"
android:summary="%s"
android:title="@string/prefs_screen_orientation" />
</androidx.preference.PreferenceScreen>

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:defaultValue="left"
android:entries="@array/wearside"
android:entryValues="@array/wearside_values"
android:key="wearlocation"
android:summary="%s"
android:title="@string/prefs_wearside" />
</androidx.preference.PreferenceScreen>

View File

@ -9,14 +9,6 @@
android:maxLength="17"
android:title="@string/miband_prefs_alias" />
<ListPreference
android:defaultValue="left"
android:entries="@array/wearside"
android:entryValues="@array/wearside_values"
android:key="mi_wearside"
android:title="@string/prefs_wearside"
android:summary="%s" />
<EditTextPreference
android:defaultValue="10000"
android:inputType="number"

View File

@ -562,22 +562,6 @@
android:key="pref_category_hplus_general"
android:title="@string/pref_header_general">
<ListPreference
android:defaultValue="left"
android:entries="@array/wearside"
android:entryValues="@array/wearside_values"
android:key="hplus_wrist"
android:title="@string/prefs_wearside"
android:summary="%s" />
<ListPreference
android:defaultValue="24h"
android:entries="@array/pref_timeformat_entries"
android:entryValues="@array/pref_timeformat_values"
android:key="hplus_timeformat"
android:title="@string/pref_title_timeformat"
android:summary="%s" />
<EditTextPreference
android:defaultValue="5"
android:key="hplus_screentime"
@ -592,33 +576,7 @@
</PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen
android:icon="@drawable/ic_device_h30_h10"
android:key="pref_key_id115"
android:title="@string/preferences_id115_settings">
<PreferenceCategory
android:key="pref_category_id115_general"
android:title="@string/pref_header_general">
<ListPreference
android:defaultValue="left"
android:entries="@array/wearside"
android:entryValues="@array/wearside_values"
android:key="id115_wrist"
android:title="@string/prefs_wearside"
android:summary="%s" />
<ListPreference
android:defaultValue="horizontal"
android:entries="@array/orientation"
android:entryValues="@array/orientation_values"
android:key="id115_screen_orientation"
android:title="@string/prefs_screen_orientation"
android:summary="%s" />
</PreferenceCategory>
</PreferenceScreen>
<Preference
<Preference
android:icon="@drawable/ic_device_zetime"
android:key="pref_key_zetime"
android:title="@string/zetime_title_settings"/>

View File

@ -4,13 +4,6 @@
android:key="pref_category_zetime_general"
android:title="@string/pref_header_general">
<ListPreference
android:defaultValue="left"
android:entries="@array/wearside"
android:entryValues="@array/wearside_values"
android:key="zetime_wrist"
android:title="@string/prefs_wearside"
android:summary="%s" />
<EditTextPreference
android:inputType="number"
android:maxLength="5"
@ -151,14 +144,6 @@
android:title="@string/zetime_analog_mode"
android:summary="%s" />
<ListPreference
android:defaultValue="1"
android:entries="@array/zetime_time_format"
android:entryValues="@array/zetime_time_format_values"
android:key="zetime_time_format"
android:title="@string/zetime_time_format"
android:summary="%s" />
<ListPreference
android:defaultValue="2"
android:entries="@array/zetime_date_format"