bump settings

7 files changed, 392 insertions, 320 deletions

diff --git a/News-Android-App/src/main/res/xml/pref_about.xml b/News-Android-App/src/main/res/xml/pref_about.xml
index fb63a8ee..d3afd95a 100644
--- a/News-Android-App/src/main/res/xml/pref_about.xml
+++ b/News-Android-App/src/main/res/xml/pref_about.xml
@@ -1,40 +1,50 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <Preference
-        android:key="cb_license"
-        android:title="@string/pref_license"
-        android:summary="@string/pref_license_summary">
-
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://www.gnu.org/licenses/license-list.html#AGPLv3.0" />
-    </Preference>
-
-    <Preference
-        android:key="cb_reportIssue"
-        android:title="@string/pref_report_issue"
-        android:summary="@string/pref_report_issue_summary">
-
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/nextcloud/news-android/issues" />
-    </Preference>
-
-    <Preference
-        android:key="cb_contribute"
-        android:title="@string/pref_contribute"
-        android:summary="@string/pref_contribute_summary">
-
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/nextcloud/news-android" />
-    </Preference>
-
-    <Preference
-        android:key="cb_version"
-        android:title="@string/pref_version"
-        android:summary="@string/current_version">
-    </Preference>
-
-
-</PreferenceScreen>
\ No newline at end of file
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:title="@string/pref_header_about"
+        app:iconSpaceReserved="false">
+
+        <Preference
+            android:key="cb_license"
+            android:title="@string/pref_license"
+            android:summary="@string/pref_license_summary"
+            app:iconSpaceReserved="false">
+
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://www.gnu.org/licenses/license-list.html#AGPLv3.0" />
+        </Preference>
+
+        <Preference
+            android:key="cb_reportIssue"
+            android:title="@string/pref_report_issue"
+            android:summary="@string/pref_report_issue_summary"
+            app:iconSpaceReserved="false">
+
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/nextcloud/news-android/issues" />
+        </Preference>
+
+        <Preference
+            android:key="cb_contribute"
+            android:title="@string/pref_contribute"
+            android:summary="@string/pref_contribute_summary"
+            app:iconSpaceReserved="false">
+
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/nextcloud/news-android" />
+        </Preference>
+
+        <Preference
+            android:key="cb_version"
+            android:title="@string/pref_version"
+            android:summary="@string/current_version"
+            app:iconSpaceReserved="false">
+        </Preference>
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/xml/pref_data_sync.xml b/News-Android-App/src/main/res/xml/pref_data_sync.xml
index 03c8d0c6..a7949657 100644
--- a/News-Android-App/src/main/res/xml/pref_data_sync.xml
+++ b/News-Android-App/src/main/res/xml/pref_data_sync.xml
@@ -1,71 +1,82 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <!--
-         NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
-         dismiss it.
-    -->
-    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
-    <!--
-    <ListPreference
-        android:defaultValue="180"
-        android:entries="@array/pref_sync_frequency_titles"
-        android:entryValues="@array/pref_sync_frequency_values"
-        android:key="sync_frequency"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_sync_frequency" />
-    -->
-    <!--
-         This preference simply launches an intent when selected. Use this UI sparingly, per
-         design guidelines.
-    -->
+    <PreferenceCategory
+        app:title="@string/pref_header_data_sync"
+        app:iconSpaceReserved="false">
 
-    <Preference
-        android:key="pref_sync_settings"
-        android:title="@string/action_sync_settings" >
-    </Preference>
+        <!--
+             NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
+             dismiss it.
+        -->
+        <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
+        <!--
+        <ListPreference
+            android:defaultValue="180"
+            android:entries="@array/pref_sync_frequency_titles"
+            android:entryValues="@array/pref_sync_frequency_values"
+            android:key="sync_frequency"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_sync_frequency" />
+        -->
+        <!--
+             This preference simply launches an intent when selected. Use this UI sparingly, per
+             design guidelines.
+        -->
 
-    
-    <!-- 
-    <ListPreference
-        android:defaultValue="100"
-        android:entries="@array/pref_data_sync_max_items"
-        android:entryValues="@array/pref_data_sync_max_items_values"
-        android:key="sync_max_items"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_data_sync_max_items" />
-    -->
-    
-    <EditTextPreference
-        android:key="edt_clearCache"                
-        android:maxLines="1"
-        android:singleLine="true"
-        android:title="@string/pref_title_clearCache" />
+        <Preference
+            android:key="pref_sync_settings"
+            android:title="@string/action_sync_settings"
+            app:iconSpaceReserved="false">
+        </Preference>
 
 
-    <ListPreference
-        android:defaultValue="0"
-        android:entries="@array/pref_data_sync_image_cache"
-        android:entryValues="@array/pref_data_sync_image_cache_values"
-        android:key="lv_cacheImagesOffline"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_CacheImagesOffline" />
+        <!--
+        <ListPreference
+            android:defaultValue="100"
+            android:entries="@array/pref_data_sync_max_items"
+            android:entryValues="@array/pref_data_sync_max_items_values"
+            android:key="sync_max_items"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_data_sync_max_items" />
+        -->
 
-    <!--
-    <SwitchPreference
-        android:key="cb_cacheImagesOffline"
-        android:title="@string/pref_title_CacheImagesOffline" />
-    -->
-    
-    <ListPreference
-        android:defaultValue="500"
-        android:entries="@array/pref_data_sync_max_cache_size"
-        android:entryValues="@array/pref_data_sync_max_cache_size_values"
-        android:key="sp_max_cache_size"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_Max_Cache_Size" />
-    
-</PreferenceScreen>
\ No newline at end of file
+        <EditTextPreference
+            android:key="edt_clearCache"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:title="@string/pref_title_clearCache"
+            app:iconSpaceReserved="false"/>
+
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_data_sync_image_cache"
+            android:entryValues="@array/pref_data_sync_image_cache_values"
+            android:key="lv_cacheImagesOffline"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_CacheImagesOffline"
+            app:iconSpaceReserved="false"/>
+
+        <!--
+        <SwitchPreference
+            android:key="cb_cacheImagesOffline"
+            android:title="@string/pref_title_CacheImagesOffline" />
+        -->
+
+        <ListPreference
+            android:defaultValue="500"
+            android:entries="@array/pref_data_sync_max_cache_size"
+            android:entryValues="@array/pref_data_sync_max_cache_size_values"
+            android:key="sp_max_cache_size"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_Max_Cache_Size"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/xml/pref_display.xml b/News-Android-App/src/main/res/xml/pref_display.xml
index 6e12ef27..5162e41a 100644
--- a/News-Android-App/src/main/res/xml/pref_display.xml
+++ b/News-Android-App/src/main/res/xml/pref_display.xml
@@ -1,62 +1,76 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!--
-         NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
-         dismiss it.
-    -->
-    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
-    
-    <ListPreference
-        android:defaultValue="0"
-        android:entries="@array/pref_display_apptheme"
-        android:entryValues="@array/pref_display_apptheme_values"
-        android:key="sp_app_theme"
-        android:title="@string/pref_title_app_theme" />
-
-    <SwitchPreference
-        android:key="cb_oled_mode"
-        android:title="@string/pref_oled_mode"
-        android:summary="@string/pref_oled_mode_summary"
-        android:defaultValue="false" />
-
-
-    <ListPreference
-        android:defaultValue="0"
-        android:entries="@array/pref_display_feed_list_layout"
-        android:entryValues="@array/pref_display_feed_list_layout_values"
-        android:key="sp_feed_list_layout"
-        android:title="@string/pref_title_feed_list_layout" />
-
-
-    <ListPreference
-        android:defaultValue="1.0"
-        android:entries="@array/pref_display_font_size"
-        android:entryValues="@array/pref_display_font_size_values"
-        android:key="sp_font_size"
-        android:title="@string/pref_title_font_size" />
-
-
-    <ListPreference
-        android:defaultValue="0"
-        android:entries="@array/pref_display_browser"
-        android:entryValues="@array/pref_display_browser_values"
-        android:key="sp_display_browser"
-        android:title="@string/pref_display_browser" />
-
-    <MultiSelectListPreference
-        android:entries="@array/pref_display_news_detail_actionbar_icons"
-        android:entryValues="@array/pref_display_news_detail_actionbar_icons_values"
-        android:key="sp_news_detail_actionbar_icons"
-        android:defaultValue="@array/pref_display_news_detail_actionbar_icons_default_values"
-        android:title="@string/pref_display_news_detail_actionbar_icons_title" />
-    
-    <!--
-         This preference simply launches an intent when selected. Use this UI sparingly, per
-         design guidelines.
-    -->
-    <!--
-    <Preference android:title="@string/pref_title_system_sync_settings" >
-        <intent android:action="android.settings.SYNC_SETTINGS" />
-    </Preference>
-    -->
-</PreferenceScreen>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:title="@string/pref_header_display"
+        app:iconSpaceReserved="false">
+
+        <!--
+             NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
+             dismiss it.
+        -->
+        <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_display_apptheme"
+            android:entryValues="@array/pref_display_apptheme_values"
+            android:key="sp_app_theme"
+            android:title="@string/pref_title_app_theme"
+            app:iconSpaceReserved="false"/>
+
+        <SwitchPreference
+            android:key="cb_oled_mode"
+            android:title="@string/pref_oled_mode"
+            android:summary="@string/pref_oled_mode_summary"
+            android:defaultValue="false"
+            app:iconSpaceReserved="false"/>
+
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_display_feed_list_layout"
+            android:entryValues="@array/pref_display_feed_list_layout_values"
+            android:key="sp_feed_list_layout"
+            android:title="@string/pref_title_feed_list_layout"
+            app:iconSpaceReserved="false"/>
+
+
+        <ListPreference
+            android:defaultValue="1.0"
+            android:entries="@array/pref_display_font_size"
+            android:entryValues="@array/pref_display_font_size_values"
+            android:key="sp_font_size"
+            android:title="@string/pref_title_font_size"
+            app:iconSpaceReserved="false"/>
+
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_display_browser"
+            android:entryValues="@array/pref_display_browser_values"
+            android:key="sp_display_browser"
+            android:title="@string/pref_display_browser"
+            app:iconSpaceReserved="false"/>
+
+        <MultiSelectListPreference
+            android:entries="@array/pref_display_news_detail_actionbar_icons"
+            android:entryValues="@array/pref_display_news_detail_actionbar_icons_values"
+            android:key="sp_news_detail_actionbar_icons"
+            android:defaultValue="@array/pref_display_news_detail_actionbar_icons_default_values"
+            android:title="@string/pref_display_news_detail_actionbar_icons_title"
+            app:iconSpaceReserved="false"/>
+
+        <!--
+             This preference simply launches an intent when selected. Use this UI sparingly, per
+             design guidelines.
+        -->
+        <!--
+        <Preference android:title="@string/pref_title_system_sync_settings" >
+            <intent android:action="android.settings.SYNC_SETTINGS" />
+        </Preference>
+        -->
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
diff --git a/News-Android-App/src/main/res/xml/pref_empty.xml b/News-Android-App/src/main/res/xml/pref_empty.xml
index 781030ab..7a784dd9 100644
--- a/News-Android-App/src/main/res/xml/pref_empty.xml
+++ b/News-Android-App/src/main/res/xml/pref_empty.xml
@@ -1,3 +1,3 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen>
     <!-- This layout definition is EMPTY ON PURPOSE, it's needed to initialise a settings screen to add a first-section header to -->
-</PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/xml/pref_general.xml b/News-Android-App/src/main/res/xml/pref_general.xml
index da9fd822..99a96527 100644
--- a/News-Android-App/src/main/res/xml/pref_general.xml
+++ b/News-Android-App/src/main/res/xml/pref_general.xml
@@ -1,107 +1,122 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- 
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="example_checkbox"
-        android:summary="@string/pref_description_social_recommendations"
-        android:title="@string/pref_title_social_recommendations" />
-	-->
-    <!-- NOTE: EditTextPreference accepts EditText attributes. -->
-    <!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
-    
-    <!-- 
-    <de.luhmer.owncloudnewsreader.preference.SigninPreference
-        android:key="sPref_signInDialog"
-		android:title="Sign In" />
-    -->
-    
-    <!-- 
-    <EditTextPreference
-        android:key="edt_username"
-        android:capitalize="words"
-        android:defaultValue="@string/pref_default_username"
-        android:inputType="text"        
-        android:maxLines="1"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
-        android:title="@string/pref_title_username" />
-    
-    <EditTextPreference
-        android:key="edt_password"                
-        android:maxLines="1"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
-        android:title="@string/pref_title_password"
-        android:inputType="textPassword" />
-    
-    
-    <EditTextPreference
-        android:key="edt_owncloudRootPath"
-        android:defaultValue="@string/pref_default_owncloudRootPath"               
-        android:maxLines="1"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
-        android:title="@string/pref_title_owncloudRootPath"
-        android:inputType="textUri" />
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    -->
-    
-    <!-- 
-    <SwitchPreference
-        android:key="cb_AllowAllSSLCertificates"
-        android:title="@string/pref_title_AllowAllSSLCertificates" />
+    <PreferenceCategory
+        app:title="@string/pref_header_general"
+        app:iconSpaceReserved="false">
 
+        <!--
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="example_checkbox"
+            android:summary="@string/pref_description_social_recommendations"
+            android:title="@string/pref_title_social_recommendations" />
+        -->
+        <!-- NOTE: EditTextPreference accepts EditText attributes. -->
+        <!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
+
+        <!--
+        <de.luhmer.owncloudnewsreader.preference.SigninPreference
+            android:key="sPref_signInDialog"
+            android:title="Sign In" />
+        -->
+
+        <!--
+        <EditTextPreference
+            android:key="edt_username"
+            android:capitalize="words"
+            android:defaultValue="@string/pref_default_username"
+            android:inputType="text"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_title_username" />
+
+        <EditTextPreference
+            android:key="edt_password"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_title_password"
+            android:inputType="textPassword" />
+
+
+        <EditTextPreference
+            android:key="edt_owncloudRootPath"
+            android:defaultValue="@string/pref_default_owncloudRootPath"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_title_owncloudRootPath"
+            android:inputType="textUri" />
+
+        -->
+
+        <!--
+        <SwitchPreference
+            android:key="cb_AllowAllSSLCertificates"
+            android:title="@string/pref_title_AllowAllSSLCertificates" />
+
+        -->
+
+        <SwitchPreference
+            android:key="cb_AutoSyncOnStart"
+            android:title="@string/pref_title_AutoSyncOnStart"
+            app:iconSpaceReserved="false"/>
+
+        <SwitchPreference
+            android:key="cb_ShowOnlyUnread"
+            android:title="@string/pref_title_ShowOnlyUnread"
+            app:iconSpaceReserved="false"/>
+
+        <SwitchPreference
+            android:key="cb_NavigateWithVolumeButtons"
+            android:title="@string/pref_title_NavigateWithVolumeButtons"
+            app:iconSpaceReserved="false"/>
+
+        <SwitchPreference
+            android:key="cb_MarkAsReadWhileScrolling"
+            android:title="@string/pref_title_MarkAsReadWhileScrolling"
+            app:iconSpaceReserved="false"/>
+
+        <SwitchPreference
+            android:key="cb_openInBrowserDirectly"
+            android:title="@string/pref_title_OpenInBrowserDirectly"
+            app:iconSpaceReserved="false"/>
+
+
+        <ListPreference
+            android:defaultValue="1"
+            android:entries="@array/pref_general_sort_order"
+            android:entryValues="@array/pref_general_sort_order_values_not_translated"
+            android:key="sp_sort_order"
+            android:title="@string/pref_title_general_sort_order"
+            app:iconSpaceReserved="false"/>
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_general_search_in"
+            android:entryValues="@array/pref_general_search_in_values"
+            android:key="sp_search_in"
+            android:title="@string/pref_title_general_search_in"
+            app:iconSpaceReserved="false"/>
+
+        <!--
+             NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
+             dismiss it.
+        -->
+        <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
+        <!--
+        <ListPreference
+            android:defaultValue="-1"
+            android:entries="@array/pref_example_list_titles"
+            android:entryValues="@array/pref_example_list_values"
+            android:key="example_list"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_add_friends_to_messages" />
     -->
-    
-    <SwitchPreference
-        android:key="cb_AutoSyncOnStart"
-        android:title="@string/pref_title_AutoSyncOnStart" />
-    
-    <SwitchPreference
-        android:key="cb_ShowOnlyUnread"
-        android:title="@string/pref_title_ShowOnlyUnread" />
-    
-    <SwitchPreference
-        android:key="cb_NavigateWithVolumeButtons"
-        android:title="@string/pref_title_NavigateWithVolumeButtons" />
-    
-    <SwitchPreference
-        android:key="cb_MarkAsReadWhileScrolling"
-        android:title="@string/pref_title_MarkAsReadWhileScrolling" />
-
-    <SwitchPreference
-        android:key="cb_openInBrowserDirectly"
-        android:title="@string/pref_title_OpenInBrowserDirectly" />
-
-
-    <ListPreference
-        android:defaultValue="1"
-        android:entries="@array/pref_general_sort_order"
-        android:entryValues="@array/pref_general_sort_order_values_not_translated"
-        android:key="sp_sort_order"
-        android:title="@string/pref_title_general_sort_order" />
-
-    <ListPreference
-        android:defaultValue="0"
-        android:entries="@array/pref_general_search_in"
-        android:entryValues="@array/pref_general_search_in_values"
-        android:key="sp_search_in"
-        android:title="@string/pref_title_general_search_in" />
-
-    <!--
-         NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
-         dismiss it.
-    -->
-    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
-    <!-- 
-    <ListPreference
-        android:defaultValue="-1"
-        android:entries="@array/pref_example_list_titles"
-        android:entryValues="@array/pref_example_list_values"
-        android:key="example_list"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_add_friends_to_messages" />
--->
-</PreferenceScreen>
\ No newline at end of file
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/xml/pref_headers.xml b/News-Android-App/src/main/res/xml/pref_headers.xml
index afba2066..6c1ff03a 100644
--- a/News-Android-App/src/main/res/xml/pref_headers.xml
+++ b/News-Android-App/src/main/res/xml/pref_headers.xml
@@ -1,37 +1,50 @@
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- These settings headers are only used on tablets. -->
 
-    <header
+    <Preference
+        android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$EmptyPreferenceFragment"
+        android:title=""
+        app:iconSpaceReserved="false"/>
+
+    <Preference
         android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$GeneralPreferenceFragment"
-        android:title="@string/pref_header_general" />
+        android:title="@string/pref_header_general"
+        app:iconSpaceReserved="false"/>
 
-    <header
+    <Preference
         android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$DisplayPreferenceFragment"
-        android:title="@string/pref_header_display" />
+        android:title="@string/pref_header_display"
+        app:iconSpaceReserved="false"/>
 
-    <header
+    <Preference
         android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$NotificationPreferenceFragment"
-        android:title="@string/pref_header_notifications" />
+        android:title="@string/pref_header_notifications"
+        app:iconSpaceReserved="false"/>
 
-    <header
+    <Preference
         android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$DataSyncPreferenceFragment"
-        android:title="@string/pref_header_data_sync" />
+        android:title="@string/pref_header_data_sync"
+        app:iconSpaceReserved="false"/>
 
-    <header
+    <Preference
         android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$AboutPreferenceFragment"
-        android:title="@string/pref_header_about" />
+        android:title="@string/pref_header_about"
+        app:iconSpaceReserved="false"/>
 
 
     <!--
-    <header
+    <Preference
         android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$PodcastPreferenceFragment"
-        android:title="@string/pref_header_podcast" />
+        android:title="@string/pref_header_podcast"
+        app:iconSpaceReserved="false"/>
     -->
 
     <!--
-    <header
+    <Preference
         android:fragment="de.luhmer.owncloudnewsreader.SettingsActivity$DataSyncPreferenceFragment"
-        android:title="@string/pref_header_data_sync" />
+        android:title="@string/pref_header_data_sync"
+        app:iconSpaceReserved="false"/>
 -->
-</preference-headers>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/xml/pref_notification.xml b/News-Android-App/src/main/res/xml/pref_notification.xml
index b251a987..03ad5458 100644
--- a/News-Android-App/src/main/res/xml/pref_notification.xml
+++ b/News-Android-App/src/main/res/xml/pref_notification.xml
@@ -1,34 +1,43 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="cb_showNotificationNewArticles"
-        android:title="@string/pref_title_notification_new_articles_available" />
+    <PreferenceCategory
+        app:title="@string/pref_header_notifications"
+        app:iconSpaceReserved="false">
 
-    <!--
-         A 'parent' preference, which enables/disables child preferences (below)
-         when checked/unchecked.
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="cb_showNotificationNewArticles"
+            android:title="@string/pref_title_notification_new_articles_available"
+            app:iconSpaceReserved="false"/>
+
+        <!--
+             A 'parent' preference, which enables/disables child preferences (below)
+             when checked/unchecked.
+        -->
+    <!--    <SwitchPreference
+            android:defaultValue="true"
+            android:key="notifications_new_message"
+            android:title="@string/pref_title_new_message_notifications" />
+    -->
+        <!-- Allows the user to choose a ringtone in the 'notification' category. -->
+        <!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
+        <!-- NOTE: RingtonePreference's summary should be set to its value by the activity code. -->
+    <!--    <RingtonePreference
+            android:defaultValue="content://settings/system/notification_sound"
+            android:dependency="notifications_new_message"
+            android:key="notifications_new_message_ringtone"
+            android:ringtoneType="notification"
+            android:title="@string/pref_title_ringtone" />
+    -->
+        <!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
+    <!--    <SwitchPreference
+            android:defaultValue="true"
+            android:dependency="notifications_new_message"
+            android:key="notifications_new_message_vibrate"
+            android:title="@string/pref_title_vibrate" />
     -->
-<!--    <SwitchPreference
-        android:defaultValue="true"
-        android:key="notifications_new_message"
-        android:title="@string/pref_title_new_message_notifications" />
--->
-    <!-- Allows the user to choose a ringtone in the 'notification' category. -->
-    <!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
-    <!-- NOTE: RingtonePreference's summary should be set to its value by the activity code. -->
-<!--    <RingtonePreference
-        android:defaultValue="content://settings/system/notification_sound"
-        android:dependency="notifications_new_message"
-        android:key="notifications_new_message_ringtone"
-        android:ringtoneType="notification"
-        android:title="@string/pref_title_ringtone" />
--->
-    <!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
-<!--    <SwitchPreference
-        android:defaultValue="true"
-        android:dependency="notifications_new_message"
-        android:key="notifications_new_message_vibrate"
-        android:title="@string/pref_title_vibrate" />
--->
-</PreferenceScreen>
\ No newline at end of file
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file