Merge branch 'protected/unified-headlines-loader' into 'master'

let's try setting active article when going back from detail mode, also stop...

See merge request tt-rss/tt-rss-android!32

25 files changed, 75 insertions, 98 deletions

diff --git a/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml
new file mode 100644
index 00000000..749ffa26
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml
@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="51.06383"
+        android:viewportHeight="51.06383">
+    <group android:translateX="-10.468085"
+            android:translateY="-10.468085">
+      <path
+          android:pathData="M-9.8995,-7.7102h94.3666v92.4381h-94.3666z"
+          android:fillColor="#5c5c5c"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M5.668,58.0128a8.3196,8.3198 0,1 0,16.6393 0a8.3196,8.3198 0,1 0,-16.6393 0z"
+          android:strokeAlpha="1"
+          android:strokeWidth="0.69765961"
+          android:fillColor="#808080"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="m45.8796,66.3326 l-11.7862,0A28.4254,28.426 0,0 0,5.668 37.9066l0,-11.7864A40.2116,40.2124 0,0 1,45.8796 66.3326Z"
+          android:strokeAlpha="1"
+          android:strokeWidth="0.69765961"
+          android:fillColor="#808080"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z"
+          android:strokeAlpha="1"
+          android:strokeWidth="2.01254654"
+          android:fillColor="#808080"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z"
+          android:strokeAlpha="1"
+          android:strokeWidth="2.01254654"
+          android:fillColor="#808080"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+    </group>
+</vector>
diff --git a/org.fox.ttrss/src/main/res/drawable/rss.xml b/org.fox.ttrss/src/main/res/drawable/rss.xml
new file mode 100644
index 00000000..f97e14a2
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/rss.xml
@@ -0,0 +1 @@
+<!-- drawable/rss.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M6.18,15.64A2.18,2.18 0 0,1 8.36,17.82C8.36,19 7.38,20 6.18,20C5,20 4,19 4,17.82A2.18,2.18 0 0,1 6.18,15.64M4,4.44A15.56,15.56 0 0,1 19.56,20H16.73A12.73,12.73 0 0,0 4,7.27V4.44M4,10.1A9.9,9.9 0 0,1 13.9,20H11.07A7.07,7.07 0 0,0 4,12.93V10.1Z" /></vector>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/drawable/rss_box.xml b/org.fox.ttrss/src/main/res/drawable/rss_box.xml
new file mode 100644
index 00000000..45b40cea
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/rss_box.xml
@@ -0,0 +1 @@
+<!-- drawable/rss_box.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M7.5,15A1.5,1.5 0 0,0 6,16.5A1.5,1.5 0 0,0 7.5,18A1.5,1.5 0 0,0 9,16.5A1.5,1.5 0 0,0 7.5,15M6,10V12A6,6 0 0,1 12,18H14A8,8 0 0,0 6,10M6,6V8A10,10 0 0,1 16,18H18A12,12 0 0,0 6,6Z" /></vector>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
index 59c1b086..823afb9b 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
@@ -54,7 +54,7 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:id="@+id/article_fragment"
-                app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
+                app:layout_behavior="org.fox.ttrss.util.DetailActivityScrollingViewBehavior"
                 android:layout_height="match_parent"/>
 
             <com.google.android.material.bottomappbar.BottomAppBar
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
index b6a6f19d..63b8c3e2 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
@@ -61,7 +61,7 @@
                 android:id="@+id/headlines_fragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_behavior=".util.FabAwareScrollingViewBehavior" />
+                app:layout_behavior="org.fox.ttrss.util.FabAwareScrollingViewBehavior" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/master_fab"
diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
index f44bb74b..b0f67761 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        app:icon="?ic_dots_vertical"
+        app:icon="@drawable/baseline_more_vert_24"
         android:layout_alignParentRight="true"
         android:layout_marginTop="48dp"
         app:iconTint="?colorTertiary" />
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
index f4c580a3..75ba8fe1 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
@@ -20,7 +20,7 @@
         android:layout_height="21dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
-        android:src="?ic_go_back"
+        android:src="@drawable/baseline_arrow_back_24"
         app:tint="?colorTertiary" />
 
     <TextView
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
index 32e20c26..0f9c4e54 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -23,7 +23,7 @@
             android:layout_weight="0"
             android:scaleType="fitXY"
             app:tint="?colorOnPrimaryContainer"
-            android:src="?ic_rss_box" />
+            android:src="@drawable/rss" />
 
         <TextView
             android:id="@+id/title"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
index c12c732d..031c2116 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -29,7 +29,7 @@
             android:layout_weight="0"
             android:scaleType="fitXY"
             app:tint="?colorOnTertiaryContainer"
-            android:src="?ic_rss_box" />
+            android:src="@drawable/rss" />
 
         <TextView
             android:id="@+id/title"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
index d4451bbe..ad76bca5 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
@@ -20,7 +20,7 @@
         android:layout_weight="0"
         android:scaleType="fitXY"
         app:tint="?colorOnPrimaryContainer"
-        android:src="?ic_rss_box" />
+        android:src="@drawable/rss_box" />
 
     <TextView
         android:id="@+id/title"
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
index 2783a1e4..647c3ae9 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
@@ -12,7 +12,6 @@
 	   <org.fox.ttrss.util.ContextMenuRecyclerView
 	       android:id="@+id/headlines_list"
 		   android:background="?colorSurfaceContainer"
-           android:drawSelectorOnTop="true"
 		   android:scrollbars="vertical"
 	       android:layout_width="match_parent"
 	       android:layout_height="match_parent" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 52bbae56..3659589d 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -212,7 +212,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_action_trending_flat" />
+                    app:icon="@drawable/baseline_trending_flat_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -222,7 +222,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_attachment" />
+                    app:icon="@drawable/baseline_attachment_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -232,7 +232,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_star_outline" />
+                    app:icon="@drawable/baseline_star_outline_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -242,7 +242,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_rss_box" />
+                    app:icon="@drawable/rss" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -252,7 +252,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_dots_vertical" />
+                    app:icon="@drawable/baseline_more_vert_24" />
             </LinearLayout>
         </TableRow>
     </TableLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
index 352aad91..7090668a 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
@@ -103,6 +103,6 @@
             android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
index 5721dcb8..72ae99b8 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
@@ -101,8 +101,9 @@
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
             android:paddingEnd="0dp"
+            android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
index 06813e04..b2b3a21e 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
@@ -105,6 +105,6 @@
             android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
index 6aa1bdcd..2fbbe062 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
@@ -105,6 +105,6 @@
             android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index 4b20d9cb..3365f476 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -212,7 +212,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_action_trending_flat" />
+                    app:icon="@drawable/baseline_trending_flat_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -222,7 +222,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_attachment" />
+                    app:icon="@drawable/baseline_attachment_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -232,7 +232,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_star_outline" />
+                    app:icon="@drawable/baseline_star_outline_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -242,7 +242,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_rss_box" />
+                    app:icon="@drawable/rss" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -252,7 +252,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_dots_vertical" />
+                    app:icon="@drawable/baseline_more_vert_24" />
             </LinearLayout>
         </TableRow>
     </TableLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
index 55a6ba77..4e75d44b 100644
--- a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
@@ -14,7 +14,7 @@
 
     <FrameLayout
         android:id="@+id/article_fragment"
-        app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
+        app:layout_behavior="org.fox.ttrss.util.DetailActivityScrollingViewBehavior"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     </FrameLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
index b4cb6b59..e32d5fbe 100644
--- a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
@@ -29,7 +29,7 @@
 
         <FrameLayout
             android:id="@+id/headlines_fragment"
-            app:layout_behavior=".util.FabAwareScrollingViewBehavior"
+            app:layout_behavior="org.fox.ttrss.util.FabAwareScrollingViewBehavior"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
diff --git a/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml
new file mode 100644
index 00000000..d49922f9
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background_variant"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml
index 7d54a029..e11ef016 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -3,29 +3,6 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
-        <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item>
-        <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
-        <item name="ic_star">@drawable/baseline_star_24</item>
-        <item name="ic_star_outline">@drawable/baseline_star_outline_24</item>
-        <item name="ic_share">@drawable/baseline_share_24</item>
-        <item name="ic_inbox">@drawable/baseline_inbox_24</item>
-        <item name="ic_go_back">@drawable/baseline_arrow_back_24</item>
-        <item name="ic_settings">@drawable/baseline_settings_24</item>
-        <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item>
-        <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item>
-        <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item>
-        <item name="ic_archive">@drawable/baseline_archive_24</item>
-        <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item>
-        <item name="ic_restore">@drawable/baseline_restore_24</item>
-        <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item>
-        <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item>
-        <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item>
-        <item name="ic_attachment">@drawable/baseline_attachment_24</item>
-        <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item>
-        <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item>
-        <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item>
-        <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
-
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index daf2323c..55344e51 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -1,29 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="ic_rss_box" format="reference"/>
-    <attr name="ic_checkbox_marked" format="reference" />
-    <attr name="ic_star" format="reference" />
-    <attr name="ic_star_outline" format="reference" />
-    <attr name="ic_share" format="reference" />
-    <attr name="ic_go_back" format="reference" />
-    <attr name="ic_settings" format="reference" />
-    <attr name="ic_filter_variant" format="reference" />
-    <attr name="ic_cloud_download" format="reference" />
-    <attr name="ic_cloud_upload" format="reference" />
-    <attr name="ic_archive" format="reference" />
-    <attr name="ic_fresh" format="reference" />
-    <attr name="ic_folder_outline" format="reference" />
-    <attr name="ic_dots_vertical" format="reference" />
-    <attr name="ic_dots_vertical_circle" format="reference" />
-    <attr name="ic_attachment" format="reference" />
-    <attr name="ic_attachment_vert" format="reference" />
-    <declare-styleable name="ScrimInsetsView">
-        <attr format="reference|color" name="insetForeground">
-        </attr></declare-styleable>
-    <attr name="drawer_header" format="reference" />
-    <attr name="ic_restore" format="reference" />
-    <attr name="ic_inbox" format="reference" />
-    <attr name="ic_action_trending_up" format="reference" />
-    <attr name="ic_action_trending_flat" format="reference" />
-    <attr name="ic_action_trending_down" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 6a67013a..fb7e6309 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -303,4 +303,5 @@
     <string name="check_for_updates">Check for updates</string>
     <string name="dont_open_anything">Nothing</string>
     <string name="open_on_startup">Open on startup</string>
+    <string name="error_success">Operation completed successfully</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index 68a57811..15be8c17 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -4,29 +4,6 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
-        <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item>
-        <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
-        <item name="ic_star">@drawable/baseline_star_24</item>
-        <item name="ic_star_outline">@drawable/baseline_star_outline_24</item>
-        <item name="ic_share">@drawable/baseline_share_24</item>
-        <item name="ic_inbox">@drawable/baseline_inbox_24</item>
-        <item name="ic_go_back">@drawable/baseline_arrow_back_24</item>
-        <item name="ic_settings">@drawable/baseline_settings_24</item>
-        <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item>
-        <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item>
-        <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item>
-        <item name="ic_archive">@drawable/baseline_archive_24</item>
-        <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item>
-        <item name="ic_restore">@drawable/baseline_restore_24</item>
-        <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item>
-        <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item>
-        <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item>
-        <item name="ic_attachment">@drawable/baseline_attachment_24</item>
-        <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item>
-        <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item>
-        <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item>
-        <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
-
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 81fbd5f1..8d064587 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -44,7 +44,7 @@
             android:title="@string/sort_feeds_by_unread" />
 
         <SwitchPreferenceCompat
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="enable_cats"
             android:title="@string/enable_cats" />
 
@@ -108,7 +108,6 @@
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
-            android:dependency="headlines_mark_read_scroll"
             android:key="headlines_swipe_to_dismiss"
             android:summary="@string/pref_headlines_swipe_to_dismiss_long"
             android:title="@string/pref_headlines_swipe_to_dismiss" />