Improve UX around settings items (#744)

Fixes #461 

1 files changed, 75 insertions, 79 deletions

diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index abc40a8e..fe488a35 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.preference.PreferenceCategory app:title="@string/pref_autofill_title">
-        <androidx.preference.SwitchPreferenceCompat
+    <PreferenceCategory app:title="@string/pref_autofill_title">
+        <SwitchPreferenceCompat
             app:defaultValue="true"
             app:key="autofill_enable"
             app:title="@string/pref_autofill_enable_title"/>
-        <androidx.preference.ListPreference
+        <ListPreference
             app:defaultValue="file"
             app:entries="@array/oreo_autofill_directory_structure_entries"
             app:entryValues="@array/oreo_autofill_directory_structure_values"
             app:key="oreo_autofill_directory_structure"
             app:title="@string/oreo_autofill_preference_directory_structure"
             app:useSimpleSummaryProvider="true" />
-        <androidx.preference.Preference
+        <Preference
             app:key="autofill_apps"
             app:title="@string/pref_autofill_apps_title"/>
-        <androidx.preference.CheckBoxPreference
+        <CheckBoxPreference
             app:defaultValue="true"
             app:key="autofill_default"
             app:summary="@string/pref_autofill_default_hint"
             app:title="@string/pref_autofill_default_title"/>
-        <androidx.preference.CheckBoxPreference
+        <CheckBoxPreference
             app:defaultValue="false"
             app:key="autofill_always"
             app:title="@string/pref_autofill_always_title"/>
-        <androidx.preference.CheckBoxPreference
+        <CheckBoxPreference
             app:defaultValue="false"
             app:key="autofill_full_path"
             app:summary="@string/pref_autofill_full_path_hint"
             app:title="@string/pref_autofill_full_path_title"/>
-    </androidx.preference.PreferenceCategory>
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory app:title="@string/pref_git_title">
-        <androidx.preference.Preference
+    <PreferenceCategory app:title="@string/pref_git_title">
+        <Preference
             app:key="git_server_info"
             app:title="@string/pref_edit_server_info" />
-        <androidx.preference.Preference
+        <Preference
             app:key="git_config"
             app:title="@string/pref_edit_git_config" />
-        <androidx.preference.Preference
+        <Preference
             app:key="ssh_key"
             app:title="@string/pref_ssh_title" />
-        <androidx.preference.Preference
+        <Preference
             app:key="ssh_keygen"
             app:title="@string/pref_ssh_keygen_title" />
-        <androidx.preference.Preference app:key="clear_saved_pass" />
-        <androidx.preference.Preference
+        <Preference app:key="clear_saved_pass" />
+        <Preference
             app:key="hotp_remember_clear_choice"
             app:title="@string/hotp_remember_clear_choice" />
-        <androidx.preference.Preference
+        <Preference
             app:key="ssh_openkeystore_clear_keyid"
             app:title="@string/ssh_openkeystore_clear_keyid" />
-        <androidx.preference.Preference
+        <Preference
             app:key="ssh_see_key"
             app:title="@string/pref_ssh_see_key_title" />
-        <androidx.preference.Preference
+        <Preference
             app:key="git_delete_repo"
             app:summary="@string/pref_git_delete_repo_summary"
             app:title="@string/pref_git_delete_repo" />
@@ -63,23 +63,23 @@
             app:key="git_external"
             app:summary="@string/pref_external_repository_summary"
             app:title="@string/pref_external_repository" />
-        <androidx.preference.Preference
+        <Preference
             app:dependency="git_external"
             app:key="pref_select_external"
             app:title="@string/pref_select_external_repository" />
-    </androidx.preference.PreferenceCategory>
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory app:title="@string/pref_crypto_title">
+    <PreferenceCategory app:title="@string/pref_crypto_title">
         <me.msfjarvis.openpgpktx.preference.OpenPgpAppPreference
             app:key="openpgp_provider_list"
             app:title="@string/pref_provider_title" />
-        <androidx.preference.Preference
+        <Preference
             app:key="openpgp_key_id_pref"
             app:title="@string/pref_key_title" />
-    </androidx.preference.PreferenceCategory>
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory app:title="@string/password_generator_category_title">
-        <androidx.preference.ListPreference
+    <PreferenceCategory app:title="@string/password_generator_category_title">
+        <ListPreference
             app:key="pref_key_pwgen_type"
             app:title="@string/xkpwgen_pref_gentype_title"
             app:defaultValue="classic"
@@ -87,19 +87,19 @@
             app:entryValues="@array/pwgen_provider_values"
             app:useSimpleSummaryProvider="true"
             app:persistent="true" />
-        <androidx.preference.CheckBoxPreference
+        <CheckBoxPreference
             app:key="pref_key_is_custom_dict"
             app:title="@string/xkpwgen_pref_custom_dict_title"
             app:summaryOn="@string/xkpwgen_pref_custom_dict_summary_on"
             app:summaryOff="@string/xkpwgen_pref_custom_dict_summary_off"/>
-        <androidx.preference.Preference
+        <Preference
             app:key="pref_key_custom_dict"
             app:title="@string/xkpwgen_pref_custom_dict_picker_title"
             app:summary="@string/xkpwgen_pref_custom_dict_picker_summary"
             app:dependency="pref_key_is_custom_dict"/>
-    </androidx.preference.PreferenceCategory>
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory app:title="@string/pref_general_title">
+    <PreferenceCategory app:title="@string/pref_category_general_title">
         <ListPreference
             android:defaultValue="@string/app_theme_def"
             android:key="app_theme"
@@ -107,81 +107,77 @@
             android:entryValues="@array/app_theme_values"
             android:summary="%s"
             android:title="@string/theme_title" />
-        <androidx.preference.EditTextPreference
-            app:defaultValue="45"
-            app:dialogTitle="@string/pref_show_time_summary"
-            android:inputType="number"
-            app:key="general_show_time"
-            app:summary="@string/pref_show_time_summary"
-            app:title="@string/pref_show_time_title" />
-        <androidx.preference.CheckBoxPreference
-            app:defaultValue="true"
-            app:title="@string/show_password_pref_title"
-            app:summary="@string/show_password_pref_summary"
-            app:key="show_password" />
-        <androidx.preference.CheckBoxPreference
-            app:defaultValue="true"
-            app:title="@string/show_extra_content_pref_title"
-            app:summary="@string/show_extra_content_pref_summary"
-            app:key="show_extra_content" />
-        <androidx.preference.CheckBoxPreference
-            app:defaultValue="true"
-            app:dialogTitle="@string/pref_copy_dialog_title"
-            app:key="copy_on_decrypt"
-            app:summary="@string/pref_copy_dialog_title"
-            app:title="@string/pref_copy_title" />
-        <androidx.preference.CheckBoxPreference
-            app:defaultValue="true"
-            app:key="clear_after_copy"
-            app:summary="@string/prefs_clear_after_copy_summary"
-            app:title="@string/prefs_clear_after_copy_title" />
-        <androidx.preference.CheckBoxPreference
+        <ListPreference
+            app:title="@string/pref_sort_order_title"
+            app:defaultValue="FOLDER_FIRST"
+            app:key="sort_order"
+            app:entries="@array/sort_order_entries"
+            app:entryValues="@array/sort_order_values"
+            app:persistent="true"
+            app:summary="%s" />
+        <CheckBoxPreference
             app:defaultValue="true"
             app:key="filter_recursively"
             app:summary="@string/pref_recursive_filter_hint"
             app:title="@string/pref_recursive_filter" />
-        <androidx.preference.CheckBoxPreference
+        <CheckBoxPreference
             app:defaultValue="false"
             app:key="search_on_start"
             app:summary="@string/pref_search_on_start_hint"
             app:title="@string/pref_search_on_start" />
-        <androidx.preference.ListPreference
-            app:title="@string/pref_sort_order_title"
-            app:defaultValue="FOLDER_FIRST"
-            app:key="sort_order"
-            app:entries="@array/sort_order_entries"
-            app:entryValues="@array/sort_order_values"
-            app:persistent="true"
-            app:summary="%s" />
-        <androidx.preference.CheckBoxPreference
+        <CheckBoxPreference
             app:title="@string/pref_show_hidden_title"
             app:summary="@string/pref_show_hidden_summary"
             app:key="show_hidden_folders"
             app:defaultValue="false"
             app:persistent="true" />
-        <androidx.preference.SwitchPreferenceCompat
+        <CheckBoxPreference
             app:key="biometric_auth"
             app:title="@string/biometric_auth_title"
             app:summary="@string/biometric_auth_summary" />
-    </androidx.preference.PreferenceCategory>
+    </PreferenceCategory>
+    <PreferenceCategory app:title="@string/pref_category_title_passwords">
+        <EditTextPreference
+            android:inputType="number"
+            app:defaultValue="45"
+            app:key="general_show_time"
+            app:summary="@string/pref_clipboard_timeout_summary"
+            app:title="@string/pref_clipboard_timeout_title" />
+        <CheckBoxPreference
+            app:defaultValue="true"
+            app:title="@string/show_password_pref_title"
+            app:summary="@string/show_password_pref_summary"
+            app:key="show_password" />
+        <CheckBoxPreference
+            app:defaultValue="true"
+            app:title="@string/show_extra_content_pref_title"
+            app:summary="@string/show_extra_content_pref_summary"
+            app:key="show_extra_content" />
+        <CheckBoxPreference
+            app:defaultValue="true"
+            app:dialogTitle="@string/pref_copy_dialog_title"
+            app:key="copy_on_decrypt"
+            app:summary="@string/pref_copy_dialog_title"
+            app:title="@string/pref_copy_title" />
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory app:title="@string/pref_misc_title">
-        <androidx.preference.Preference
+    <PreferenceCategory app:title="@string/pref_misc_title">
+        <Preference
             app:key="export_passwords"
             app:title="@string/prefs_export_passwords_title"
             app:summary="@string/prefs_export_passwords_summary"/>
 
-        <androidx.preference.CheckBoxPreference
+        <CheckBoxPreference
             app:defaultValue="false"
             app:key="clear_clipboard_20x"
             app:summary="@string/pref_clear_clipboard_hint"
             app:title="@string/pref_clear_clipboard_title" />
-    </androidx.preference.PreferenceCategory>
+    </PreferenceCategory>
 
-    <androidx.preference.PreferenceCategory>
-        <androidx.preference.Preference
+    <PreferenceCategory>
+        <Preference
             app:icon="@mipmap/ic_launcher_round"
             app:key="app_version"
             app:title="@string/prefs_version" />
-    </androidx.preference.PreferenceCategory>
-</androidx.preference.PreferenceScreen>
+    </PreferenceCategory>
+</PreferenceScreen>