prune unnecessary views, add some corners to detail activity on tablets

4 files changed, 30 insertions, 18 deletions

diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
index 6c1284e7..09534bc7 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml
@@ -5,8 +5,6 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
     <FrameLayout
         android:id="@+id/sw600dp_anchor"
         android:layout_width="match_parent"
@@ -21,21 +19,38 @@
         android:baselineAligned="false"
         android:orientation="horizontal" >
 
-        <FrameLayout
-            android:paddingRight="4dp"
-            android:id="@+id/headlines_fragment"
+        <com.google.android.material.navigation.NavigationView
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/navigation_view"
+            android:background="?colorSurfaceContainer"
             android:layout_width="0dp"
+            android:layout_weight="0.3"
             android:layout_height="match_parent"
-            android:layout_weight="0.3">
+            android:padding="8dp"
+            app:shapeAppearance="@style/ShapeAppearanceHeadlinesTablet"
+            android:layout_gravity="start">
+
+        <FrameLayout
+            android:id="@+id/headlines_fragment"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
         </FrameLayout>
 
+        </com.google.android.material.navigation.NavigationView>
+
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:layout_width="0dp"
             android:layout_weight="0.7"
-            android:elevation="4dp"
             android:layout_height="match_parent">
 
+            <com.google.android.material.appbar.AppBarLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+            </com.google.android.material.appbar.AppBarLayout>
+
             <FrameLayout
                 android:layout_width="match_parent"
                 android:id="@+id/article_fragment"
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
index 2987bab3..b6a6f19d 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
@@ -39,7 +39,6 @@
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="0dp"
             android:layout_weight="0.75"
-            android:elevation="4dp"
             android:layout_height="match_parent">
 
             <com.google.android.material.appbar.AppBarLayout
@@ -56,8 +55,6 @@
                     android:layout_width="match_parent"
                     android:background="?colorSurfaceContainer"
                     android:minHeight="?attr/actionBarSize"/>
-
-
             </com.google.android.material.appbar.AppBarLayout>
 
             <FrameLayout
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
deleted file mode 100644
index 4ea81118..00000000
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/layout_master_phone" />
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 2b44ac4b..f97f66f8 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -15,6 +15,14 @@
         <item name="cornerSizeBottomRight">16dp</item>
     </style>
 
+    <style name="ShapeAppearanceHeadlinesTablet">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopLeft">0dp</item>
+        <item name="cornerSizeTopRight">16dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+    </style>
+
     <!-- https://stackoverflow.com/a/73782598 -->
     <style name="AppPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
         <item name="switchPreferenceCompatStyle">@style/AppSwitchPreference</item>