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

14 files changed, 22 insertions, 22 deletions

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"/>