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

3 files changed, 1 insertions, 49 deletions

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>