diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-04-01 15:59:25 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-04-01 15:59:25 +0300 |
| commit | 37a1682d3bc4c044c30869c42608e7359891f278 (patch) | |
| tree | 3b95030dbe074b88504798d10f505e13e8a835f8 /app/src/main/res | |
| parent | 09b1ba9725f17eaf797098381f3059d7b107bef7 (diff) | |
Put appearance and behavior settings into one category
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences.xml | 26 |
2 files changed, 12 insertions, 16 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9835feee..4271a2a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -171,7 +171,7 @@ <string name="settings_branding">Branding</string> <string name="settings_gridview">Grid view</string> <string name="simple_security">Security</string> - <string name="simple_appearance">Appearance</string> + <string name="appearance_and_behavior">Appearance and behavior</string> <string name="simple_synchronization">Synchronization</string> <string name="simple_behavior">Behavior</string> <string name="manage_accounts">Manage accounts</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 87773768..2794f79a 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -26,7 +26,7 @@ <it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory app:layout="@layout/item_preference_category" - app:title="@string/simple_appearance"> + app:title="@string/appearance_and_behavior"> <ListPreference android:defaultValue="@string/pref_value_theme_system_default" @@ -44,26 +44,12 @@ android:layout="@layout/item_pref" android:title="@string/settings_gridview" /> - </it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory> - - <it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory - app:layout="@layout/item_preference_category" - app:title="@string/simple_behavior"> <it.niedermann.owncloud.notes.branding.BrandedSwitchPreference android:defaultValue="@string/pref_value_font_normal" android:icon="@drawable/ic_text_format_grey600_24dp" android:key="@string/pref_key_font" android:layout="@layout/item_pref" android:title="@string/settings_font_title" /> - <ListPreference - android:defaultValue="@string/pref_value_mode_edit" - android:entries="@array/noteMode_entries" - android:entryValues="@array/noteMode_values" - android:icon="@drawable/ic_remove_red_eye_grey_24dp" - android:key="@string/pref_key_note_mode" - android:layout="@layout/item_pref" - android:summary="%s" - android:title="@string/settings_note_mode" /> <ListPreference android:defaultValue="@string/pref_value_font_size_medium" @@ -74,6 +60,16 @@ android:layout="@layout/item_pref" android:summary="%s" android:title="@string/settings_font_size" /> + + <ListPreference + android:defaultValue="@string/pref_value_mode_edit" + android:entries="@array/noteMode_entries" + android:entryValues="@array/noteMode_values" + android:icon="@drawable/ic_remove_red_eye_grey_24dp" + android:key="@string/pref_key_note_mode" + android:layout="@layout/item_pref" + android:summary="%s" + android:title="@string/settings_note_mode" /> </it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory> <it.niedermann.owncloud.notes.branding.BrandedPreferenceCategory |