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

10 files changed, 98 insertions, 104 deletions

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 0f9c4e54..ed0f2354 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -7,8 +7,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="blocksDescendants"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:baselineAligned="true"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_divider.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_divider.xml
index 55aa5fdc..4362dcd2 100644
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_divider.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_divider.xml
@@ -7,8 +7,8 @@
 
     <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        app:dividerInsetEnd="16dp"
-        app:dividerInsetStart="16dp"
+        app:dividerInsetEnd="8dp"
+        app:dividerInsetStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_height="wrap_content"/>
 
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_goback.xml
index 75ba8fe1..84f387ff 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_goback.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="blocksDescendants"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
     android:baselineAligned="true"
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 031c2116..ab280e7f 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
@@ -13,8 +13,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="blocksDescendants"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:baselineAligned="true"
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 ad76bca5..dda0f02c 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
@@ -6,8 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="blocksDescendants"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
     android:baselineAligned="true"
     android:gravity="center_vertical"
     android:orientation="horizontal">
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" />
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
index 6f3198a2..eeb97a22 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -1,78 +1,74 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <group android:id="@+id/menu_group_feeds" >
+        <item
+            android:id="@+id/subscribe_to_feed"
+            android:orderInCategory="1"
+            app:showAsAction=""
+            android:title="@string/subscribe_to_feed"/> <!-- iRroom -->
+    </group>
+    <group android:id="@+id/menu_group_headlines" >
+        <item
+            android:id="@+id/search"
+            android:icon="@drawable/baseline_search_24"
+            app:iconTint="?attr/colorControlNormal"
+            app:showAsAction="ifRoom"
+            android:title="@string/search"/>
+        <item
+            android:id="@+id/headlines_mark_as_read"
+            app:showAsAction=""
+            app:iconTint="?attr/colorControlNormal"
+            android:icon="@drawable/baseline_mark_email_read_24"
+            android:title="@string/headlines_mark_as_read"/>
+        <item
+            android:id="@+id/headlines_select"
+            app:showAsAction="ifRoom"
+            app:iconTint="?attr/colorControlNormal"
+            android:icon="@drawable/baseline_select_all_24"
+            android:title="@string/headlines_select"/>
 
-    <group android:id="@+id/menu_group_logged_in" >
-        <group android:id="@+id/menu_group_feeds" >
-
-            <item
-                android:id="@+id/subscribe_to_feed"
-                android:orderInCategory="1"
-                app:showAsAction=""
-                android:title="@string/subscribe_to_feed"/> <!-- iRroom -->
-        </group>
-        <group android:id="@+id/menu_group_headlines" >
-            <item
-                android:id="@+id/search"
-                android:icon="@drawable/baseline_search_24"
-                app:iconTint="?attr/colorControlNormal"
-                app:showAsAction="ifRoom"
-                android:title="@string/search"/>
-            <item
-                android:id="@+id/headlines_mark_as_read"
-                app:showAsAction=""
-                app:iconTint="?attr/colorControlNormal"
-                android:icon="@drawable/baseline_mark_email_read_24"
-                android:title="@string/headlines_mark_as_read"/>
-            <item
-                android:id="@+id/headlines_select"
-                app:showAsAction="ifRoom"
-                app:iconTint="?attr/colorControlNormal"
-                android:icon="@drawable/baseline_select_all_24"
-                android:title="@string/headlines_select"/>
-
-            <item
-                android:id="@+id/headlines_toggle_sort_order"
-                app:iconTint="?attr/colorControlNormal"
-                android:icon="@drawable/baseline_sort_by_alpha_24"
-                app:showAsAction="ifRoom"
-                android:title="@string/toggle_sort_order"/>
-
-            <item
-                android:id="@+id/headlines_view_mode"
-                app:showAsAction=""
-                android:title="@string/headlines_view_mode"/>
+        <item
+            android:id="@+id/headlines_toggle_sort_order"
+            app:iconTint="?attr/colorControlNormal"
+            android:icon="@drawable/baseline_sort_by_alpha_24"
+            app:showAsAction="ifRoom"
+            android:title="@string/toggle_sort_order"/>
 
-            <item
-                android:id="@+id/headlines_display_mode"
-                app:showAsAction=""
-                android:title="@string/headlines_display_mode"/>
+        <item
+            android:id="@+id/headlines_view_mode"
+            app:showAsAction=""
+            android:title="@string/headlines_view_mode"/>
 
-        </group>
-        <group android:id="@+id/menu_group_article" >
-            <item
-                android:id="@+id/toggle_marked"
-                android:icon="@drawable/baseline_star_outline_24"
-                app:iconTint="?attr/colorControlNormal"
-                app:showAsAction="ifRoom"
-                android:title="@string/article_toggle_marked"/>
-            <item
-                android:id="@+id/toggle_published"
-                android:icon="@drawable/baseline_rss_feed_24"
-                app:iconTint="?attr/colorControlNormal"
-                app:showAsAction="ifRoom"
-                android:title="@string/article_toggle_published"/>
-            <item
-                android:id="@+id/share_article"
-                android:icon="@drawable/baseline_share_24"
-                app:iconTint="?attr/colorControlNormal"
-                app:showAsAction="ifRoom"
-                android:title="@string/share_article"/>
-            <item
-                android:id="@+id/catchup_above"
-                app:showAsAction=""
-                android:title="@string/article_mark_read_above"/>
-        </group>
+        <item
+            android:id="@+id/headlines_display_mode"
+            app:showAsAction=""
+            android:title="@string/headlines_display_mode"/>
 
     </group>
+    <group android:id="@+id/menu_group_article" >
+        <item
+            android:id="@+id/toggle_marked"
+            android:icon="@drawable/baseline_star_outline_24"
+            app:iconTint="?attr/colorControlNormal"
+            app:showAsAction="ifRoom"
+            android:title="@string/article_toggle_marked"/>
+        <item
+            android:id="@+id/toggle_published"
+            android:icon="@drawable/baseline_rss_feed_24"
+            app:iconTint="?attr/colorControlNormal"
+            app:showAsAction="ifRoom"
+            android:title="@string/article_toggle_published"/>
+        <item
+            android:id="@+id/share_article"
+            android:icon="@drawable/baseline_share_24"
+            app:iconTint="?attr/colorControlNormal"
+            app:showAsAction="ifRoom"
+            android:title="@string/share_article"/>
+        <item
+            android:id="@+id/catchup_above"
+            app:showAsAction=""
+            android:title="@string/article_mark_read_above"/>
+    </group>
+
 
     <group android:id="@+id/menu_group_logged_out" >
         <item
diff --git a/org.fox.ttrss/src/main/res/menu/context_category.xml b/org.fox.ttrss/src/main/res/menu/context_category.xml
deleted file mode 100644
index 8f975c0a..00000000
--- a/org.fox.ttrss/src/main/res/menu/context_category.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/browse_headlines"
-        android:title="@string/category_browse_headlines"/>
-
-    <item
-        android:id="@+id/browse_feeds"
-        android:title="@string/category_browse_feeds"/>
-
-    <item
-        android:id="@+id/catchup_category"
-        android:title="@string/catchup"/>
-
-</menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/context_feed.xml b/org.fox.ttrss/src/main/res/menu/context_feed.xml
index 0b0cdc3e..53b610f7 100644
--- a/org.fox.ttrss/src/main/res/menu/context_feed.xml
+++ b/org.fox.ttrss/src/main/res/menu/context_feed.xml
@@ -1,23 +1,19 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/browse_headlines"
+        android:id="@+id/feed_browse_headlines"
         android:title="@string/category_browse_headlines"/>
-    
-    <!-- <item
-        android:id="@+id/browse_articles"
-        android:title="@string/category_browse_articles"/> -->
-    
+
      <item
-        android:id="@+id/browse_feeds"
+        android:id="@+id/feed_browse_feeds"
         android:title="@string/category_browse_feeds"/>
     
     <item
-        android:id="@+id/catchup_feed"
+        android:id="@+id/feed_catchup"
         android:title="@string/catchup"/>
 
     <item
-     	android:id="@+id/unsubscribe_feed"
+     	android:id="@+id/feed_unsubscribe"
         android:title="@string/unsubscribe"/>
     
 </menu>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 27bf2a8a..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,13 @@
             android:title="@string/sort_feeds_by_unread" />
 
         <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="enable_cats"
+            android:title="@string/enable_cats" />
+
+        <SwitchPreferenceCompat
             android:defaultValue="false"
+            android:dependency="enable_cats"
             android:key="browse_cats_like_feeds"
             android:summary="@string/browse_cats_like_feeds_summary"
             android:title="@string/browse_cats_like_feeds" />