diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index 2d0acf0d..5d918931 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -166,7 +166,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL mContent = MessageListFragment.getInstance(mThreadId, 0, null, false); break; case TYPE_SETTINGS: - mContent = SettingsFragment.newInstance(R.xml.settings_simple); + mContent = SettingsFragment.newInstance(R.xml.settings_main); break; case TYPE_SEARCH: mContent = new SearchFragment(); @@ -276,11 +276,8 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL case android.R.id.home: onKeyUp(KeyEvent.KEYCODE_BACK, null); break; - case R.id.simple_settings: - mPrefs.edit().putBoolean(SettingsFragment.SIMPLE_PREFS, - !mPrefs.getBoolean(SettingsFragment.SIMPLE_PREFS, true)).apply(); case R.id.menu_settings: - switchContent(SettingsFragment.newInstance(R.xml.settings_simple), true); + switchContent(SettingsFragment.newInstance(R.xml.settings_main), true); break; case R.id.menu_search: switchContent(new SearchFragment(), true); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java index 6ec2312e..9d7680b7 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java @@ -145,16 +145,6 @@ public abstract class QKActivity extends AppCompatActivity { // Overflow icon colorOverflowButtonWhenReady(color); - // Settings expansion - ArrayList views = new ArrayList<>(); - View decor = getWindow().getDecorView(); - decor.findViewsWithText(views, getString(R.string.menu_show_all_prefs), View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION); - decor.findViewsWithText(views, getString(R.string.menu_show_fewer_prefs), View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION); - android.widget.TextView connected = !views.isEmpty() ? (android.widget.TextView) views.get(0) : null; - if (connected != null) { - connected.setTextColor(color); - } - // Other icons for (int i = 0; i < menu.size(); i++) { MenuItem menuItem = menu.getItem(i); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index e7e84941..3e7c4eb3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -24,7 +24,6 @@ import android.preference.PreferenceScreen; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; @@ -140,7 +139,6 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public static final String MMS_PROXY = "mms_proxy"; public static final String AUTOMATICALLY_CONFIGURE_MMS = "pref_key_automatically_configure_mms"; public static final String MMS_CONTACT_SUPPORT = "pref_key_mms_contact_support"; - public static final String SIMPLE_PREFS = "pref_key_simple"; public static final String DONATE = "pref_key_donate"; public static final String DISMISSED_READ = "pref_key_dismiss_read"; public static final String MAX_MMS_ATTACHMENT_SIZE = "pref_mms_max_attachment_size"; @@ -201,9 +199,6 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O mRes = mContext.getResources(); mResource = args.getInt("category", R.xml.settings); - if (mResource == R.xml.settings_simple || mResource == R.xml.settings_main) { - mResource = mPrefs.getBoolean(SIMPLE_PREFS, true) ? R.xml.settings_simple : R.xml.settings_main; - } addPreferencesFromResource(mResource); // Set `this` to be the preferences click/change listener for all the preferences. @@ -607,9 +602,6 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O }) .show(); break; - case SIMPLE_PREFS: - mContext.onOptionsItemSelected(mContext.getMenu().findItem(R.id.simple_settings)); - break; case DONATE: DonationManager.getInstance(mContext).showDonateDialog(); break; @@ -727,12 +719,5 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O inflater.inflate(R.menu.settings, menu); mContext.setTitle(R.string.title_settings); - - MenuItem simplePrefs = menu.findItem(R.id.simple_settings); - if (mPrefs.getBoolean(SettingsFragment.SIMPLE_PREFS, true)) { - simplePrefs.setTitle(R.string.menu_show_all_prefs); - } else { - simplePrefs.setTitle(R.string.menu_show_fewer_prefs); - } } } diff --git a/QKSMS/src/main/res/menu/settings.xml b/QKSMS/src/main/res/menu/settings.xml index 481a79dc..199ed8ca 100644 --- a/QKSMS/src/main/res/menu/settings.xml +++ b/QKSMS/src/main/res/menu/settings.xml @@ -3,11 +3,6 @@ - - diff --git a/QKSMS/src/main/res/xml/settings_simple.xml b/QKSMS/src/main/res/xml/settings_simple.xml deleted file mode 100644 index 2adc3ea8..00000000 --- a/QKSMS/src/main/res/xml/settings_simple.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file