diff options
author | stefan-niedermann <info@niedermann.it> | 2019-02-09 21:22:18 +0300 |
---|---|---|
committer | stefan-niedermann <info@niedermann.it> | 2019-02-09 21:22:18 +0300 |
commit | 41054d5b7e69e6c861c45873fcb078964b9e7284 (patch) | |
tree | 14ae6ed73b3219a1ec29e19ce629a29c15f5b806 /app/src/main | |
parent | 465ee9294b684eca2dc04e223a4043e91da9af9e (diff) |
Eliminate summary for dark theme since it has only a bool value
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java | 6 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences.xml | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java index ee79f50a..ad859115 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java @@ -1,11 +1,9 @@ package it.niedermann.owncloud.notes.android.fragment; import android.app.Activity; -import android.content.SharedPreferences; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; import android.preference.SwitchPreference; import android.util.Log; import android.widget.Toast; @@ -28,11 +26,7 @@ public class PreferencesFragment extends PreferenceFragment { return true; }); - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); - final SwitchPreference themePref = (SwitchPreference) findPreference(getString(R.string.pref_key_theme)); - themePref.setSummary(sp.getBoolean(getString(R.string.pref_key_theme), false) ? - getString(R.string.pref_value_theme_dark) : getString(R.string.pref_value_theme_light)); themePref.setOnPreferenceChangeListener((Preference preference, Object newValue) -> { Boolean darkTheme = (Boolean) newValue; Notes.setAppTheme(darkTheme); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ac79674..683c54bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -54,9 +54,9 @@ <string name="settings_submit">Connect</string> <string name="settings_submitting">Connecting …</string> <string name="settings_note_mode">Display mode for notes</string> - <string name="settings_theme_title">Theme</string> + <string name="settings_theme_title">Dark theme</string> <string name="settings_font_title">Monospace font</string> - <string name="settings_theme_wifi_only">Sync only on Wi-Fi</string> + <string name="settings_wifi_only">Sync only on Wi-Fi</string> <string name="settings_cert_category">Manage certificates</string> <string name="settings_cert_trust_system">Trust system certificates</string> <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index fed4986a..e40d2a1e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -22,13 +22,12 @@ android:defaultValue="@string/pref_value_wifi_and_mobile" android:icon="@drawable/ic_sync_black_24dp" android:key="@string/pref_key_wifi_only" - android:title="@string/settings_theme_wifi_only" /> + android:title="@string/settings_wifi_only" /> <SwitchPreference android:defaultValue="@string/pref_value_theme_light" android:icon="@drawable/ic_brightness_2_grey_24dp" android:key="@string/pref_key_theme" - android:summary="%s" android:title="@string/settings_theme_title" /> <SwitchPreference |