From 7f5b495480d180499b8cc83403bc5a2b45cf885e Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 10 May 2015 13:08:28 +0200 Subject: [PATCH] Move Mi Band MAC address setting to Mi Band Settings --- .../gadgetbridge/ControlCenter.java | 3 ++- .../freeyourgadget/gadgetbridge/GB.java | 2 -- .../gadgetbridge/SettingsActivity.java | 16 -------------- .../gadgetbridge/miband/MiBandConst.java | 2 +- .../miband/MiBandPreferencesActivity.java | 22 ++++++++++++++++--- app/src/main/res/xml/miband_preferences.xml | 16 +++++++++++--- app/src/main/res/xml/preferences.xml | 13 ++--------- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java index 0c0fcd6dc..18eb7bbef 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java @@ -25,6 +25,7 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.adapter.GBDeviceAdapter; import nodomain.freeyourgadget.gadgetbridge.discovery.DiscoveryActivity; +import nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst; public class ControlCenter extends Activity { @@ -209,7 +210,7 @@ public class ControlCenter extends Activity { } SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); - String miAddr = sharedPrefs.getString(GB.PREF_DEVELOPMENT_MIBAND_ADDRESS, null); + String miAddr = sharedPrefs.getString(MiBandConst.PREF_MIBAND_ADDRESS, null); if (miAddr != null && miAddr.length() > 0) { GBDevice miDevice = new GBDevice(miAddr, "MI", DeviceType.MIBAND); if (!availableDevices.contains(miDevice)) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java index 531df7b62..2fad1fedb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java @@ -22,8 +22,6 @@ public class GB { public static final int NOTIFICATION_ID = 1; private static final String TAG = "GB"; - public static final String PREF_DEVELOPMENT_MIBAND_ADDRESS = "development_miaddr"; - public static Notification createNotification(String text, Context context) { Intent notificationIntent = new Intent(context, ControlCenter.class); notificationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SettingsActivity.java index eac298401..9919ca289 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SettingsActivity.java @@ -42,21 +42,5 @@ public class SettingsActivity extends AbstractSettingsActivity { } }); - final Preference developmentMiaddr = findPreference(GB.PREF_DEVELOPMENT_MIBAND_ADDRESS); - developmentMiaddr.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newVal) { - Intent refreshIntent = new Intent(ControlCenter.ACTION_REFRESH_DEVICELIST); - LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(refreshIntent); - preference.setSummary(newVal.toString()); - return true; - } - - }); - } - - @Override - protected String[] getPreferenceKeysWithSummary() { - return new String[] { GB.PREF_DEVELOPMENT_MIBAND_ADDRESS }; } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandConst.java index f525f6175..2005d3226 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandConst.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandConst.java @@ -8,5 +8,5 @@ public interface MiBandConst { String PREF_USER_GENDER = "mi_user_gender"; String PREF_USER_HEIGHT_CM = "mi_user_height_cm"; String PREF_USER_WEIGHT_KG = "mi_user_weight_kg"; - String PREF_MIBAND_ADDRESS = GB.PREF_DEVELOPMENT_MIBAND_ADDRESS; + String PREF_MIBAND_ADDRESS = "development_miaddr"; // FIXME: should be prefixed mi_ } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandPreferencesActivity.java index 6c55ac8eb..dd6c5a14e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandPreferencesActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandPreferencesActivity.java @@ -1,9 +1,12 @@ package nodomain.freeyourgadget.gadgetbridge.miband; +import android.content.Intent; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceActivity; +import android.support.v4.content.LocalBroadcastManager; +import nodomain.freeyourgadget.gadgetbridge.ControlCenter; import nodomain.freeyourgadget.gadgetbridge.GB; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivity; @@ -14,17 +17,30 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.miband_preferences); + + final Preference developmentMiaddr = findPreference(MiBandConst.PREF_MIBAND_ADDRESS); + developmentMiaddr.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newVal) { + Intent refreshIntent = new Intent(ControlCenter.ACTION_REFRESH_DEVICELIST); + LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(refreshIntent); + preference.setSummary(newVal.toString()); + return true; + } + + }); + } @Override protected String[] getPreferenceKeysWithSummary() { - String[] prefsWithSummary = { + return new String[]{ MiBandConst.PREF_USER_ALIAS, MiBandConst.PREF_USER_YEAR_OF_BIRTH, MiBandConst.PREF_USER_GENDER, MiBandConst.PREF_USER_HEIGHT_CM, - MiBandConst.PREF_USER_WEIGHT_KG + MiBandConst.PREF_USER_WEIGHT_KG, + MiBandConst.PREF_MIBAND_ADDRESS }; - return prefsWithSummary; } } diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml index 04fbd8abf..0a6ce7852 100644 --- a/app/src/main/res/xml/miband_preferences.xml +++ b/app/src/main/res/xml/miband_preferences.xml @@ -9,8 +9,8 @@ android:title="@string/miband_prefs_alias" /> @@ -23,17 +23,27 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 1646bdbd9..f9f7ba7d0 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -14,6 +14,7 @@ - - - - - \ No newline at end of file +