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, 44 insertions, 0 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