Merge branch 'protected/feeds-model' into 'master'

open drawer onBackPressed() instead of quitting if there's a feed open and...

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

1 files changed, 12 insertions, 1 deletions

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml
index 9f57dda2..3fe12847 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml
@@ -60,6 +60,16 @@
                     android:textAppearance="?attr/textAppearanceTitleSmall"
                     android:textColor="?attr/colorOnSurfaceVariant"/>
             </LinearLayout>
+
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/loading_progress"
+                android:max="100"
+                android:progress="50"
+                android:visibility="gone"
+                android:indeterminate="false"
+                android:layout_gravity="bottom"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
         </FrameLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -67,13 +77,14 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/feeds_swipe_container"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
     <org.fox.ttrss.util.ContextMenuRecyclerView
         android:id="@+id/feeds"
         android:scrollbars="vertical"
-
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />