|
8 | 8 | import android.text.TextUtils; |
9 | 9 |
|
10 | 10 | import androidx.annotation.Nullable; |
| 11 | +import androidx.annotation.StringRes; |
11 | 12 | import androidx.appcompat.app.AlertDialog; |
12 | 13 | import androidx.appcompat.widget.Toolbar; |
13 | 14 | import androidx.preference.EditTextPreference; |
14 | 15 | import androidx.preference.Preference; |
| 16 | +import androidx.preference.PreferenceCategory; |
15 | 17 | import androidx.preference.PreferenceFragmentCompat; |
16 | 18 |
|
17 | 19 | import com.espressif.espblufi.R; |
@@ -68,22 +70,28 @@ public void onCreate(Bundle savedInstanceState) { |
68 | 70 | mApp = BlufiApp.getInstance(); |
69 | 71 |
|
70 | 72 | getVersionInfo(); |
71 | | - findPreference(getString(R.string.settings_version_key)).setSummary(mAppVersionName); |
72 | | - findPreference(getString(R.string.settings_blufi_version_key)).setSummary(BlufiClient.VERSION); |
| 73 | + findPreference(R.string.settings_version_key).setSummary(mAppVersionName); |
| 74 | + findPreference(R.string.settings_blufi_version_key).setSummary(BlufiClient.VERSION); |
73 | 75 |
|
74 | | - mMtuPref = findPreference(getString(R.string.settings_mtu_length_key)); |
| 76 | + mMtuPref = findPreference(R.string.settings_mtu_length_key); |
75 | 77 | int mtuLen = (int) mApp.settingsGet(KEY_MTU_LENGTH, BlufiConstants.DEFAULT_MTU_LENGTH); |
76 | 78 | mMtuPref.setOnPreferenceChangeListener(this); |
77 | 79 | if (mtuLen >= BlufiConstants.MIN_MTU_LENGTH && mtuLen <= BlufiConstants.MAX_MTU_LENGTH) { |
78 | 80 | mMtuPref.setSummary(String.valueOf(mtuLen)); |
79 | 81 | } |
| 82 | + PreferenceCategory blufiCategory = findPreference(R.string.settings_category_blufi_key); |
| 83 | + blufiCategory.removePreference(mMtuPref); |
80 | 84 |
|
81 | | - mBlePrefixPref = findPreference(getString(R.string.settings_ble_prefix_key)); |
| 85 | + mBlePrefixPref = findPreference(R.string.settings_ble_prefix_key); |
82 | 86 | mBlePrefixPref.setOnPreferenceChangeListener(this); |
83 | 87 | String blePrefix = (String) mApp.settingsGet(KEY_BLE_PREFIX, BlufiConstants.BLUFI_PREFIX); |
84 | 88 | mBlePrefixPref.setSummary(blePrefix); |
85 | 89 |
|
86 | | - mVersionCheckPref = findPreference(getString(R.string.settings_upgrade_check_key)); |
| 90 | + mVersionCheckPref = findPreference(R.string.settings_upgrade_check_key); |
| 91 | + } |
| 92 | + |
| 93 | + public <T extends Preference> T findPreference(@StringRes int res) { |
| 94 | + return findPreference(getString(res)); |
87 | 95 | } |
88 | 96 |
|
89 | 97 | private void getVersionInfo() { |
|
0 commit comments