Merge branch 'protected/bottomappbar' into 'master'

wip bottom appbar

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

8 files changed, 257 insertions, 374 deletions

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index e75980b0..eba96d75 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -1,157 +1,145 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/article_fragment"
-    android:layout_width="fill_parent"
     android:background="?colorSurfaceContainer"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/article_fullscreen_video"
-        android:visibility="invisible"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
-
-    <com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
+        android:background="?colorSurfaceContainer"
         android:layout_height="wrap_content">
 
-        <com.google.android.material.appbar.AppBarLayout
+        <com.google.android.material.card.MaterialCardView
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:strokeWidth="0dp"
+            app:shapeAppearance="@style/ShapeAppearanceArticleHeader"
             android:layout_width="match_parent"
-            android:background="?colorSurfaceContainer"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
-            <com.google.android.material.card.MaterialCardView
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:strokeWidth="0dp"
-                app:shapeAppearance="@style/ShapeAppearanceArticleHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+        <LinearLayout
+            android:id="@+id/article_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/article_header"
+                android:orientation="horizontal"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="match_parent">
 
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
+                <TextView
+                    android:id="@+id/title"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textColor="?colorPrimary"
+                    tools:text="Unreasonably long article title blah blah blah blah blah blah"
+                    android:textSize="18sp"
+                    android:gravity="start" />
 
-                    <TextView
-                        android:id="@+id/title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textColor="?colorPrimary"
-                        tools:text="Unreasonably long article title blah blah blah blah blah blah"
-                        android:textSize="18sp"
-                        android:gravity="start" />
+            </LinearLayout>
 
-                </LinearLayout>
+            <TextView
+                android:id="@+id/comments"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                tools:text="comments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="viewStart"
+                android:layout_weight="1"
+                android:fontFamily="sans-serif-light"
+                android:layout_marginTop="8dp"
+                android:textColor="?colorPrimary"
+                android:textSize="12sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp">
 
                 <TextView
-                    android:id="@+id/comments"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    tools:text="comments"
-                    android:layout_width="match_parent"
+                    android:id="@+id/tags"
+                    tools:text="alpha, beta, gamma"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="0.7"
+                    android:ellipsize="middle"
                     android:textAlignment="viewStart"
-                    android:layout_weight="1"
+                    android:singleLine="true"
                     android:fontFamily="sans-serif-light"
-                    android:layout_marginTop="8dp"
-                    android:textColor="?colorPrimary"
+                    android:textColor="?colorSecondary"
                     android:textSize="12sp" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/date"
+                    tools:text="Jan 01, 1970"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginBottom="8dp"
-                    android:layout_marginTop="8dp">
-
-                    <TextView
-                        android:id="@+id/tags"
-                        tools:text="alpha, beta, gamma"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.7"
-                        android:ellipsize="middle"
-                        android:textAlignment="viewStart"
-                        android:singleLine="true"
-                        android:fontFamily="sans-serif-light"
-                        android:textColor="?colorSecondary"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:id="@+id/date"
-                        tools:text="Jan 01, 1970"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.3"
-                        android:textAlignment="viewEnd"
-                        android:fontFamily="sans-serif-light"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="?colorSecondary"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-                <LinearLayout
+                    android:layout_weight="0.3"
+                    android:textAlignment="viewEnd"
+                    android:fontFamily="sans-serif-light"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?colorSecondary"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/note_container"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    app:cardBackgroundColor="?colorTertiaryContainer"
+                    android:layout_margin="8dp"
+                    app:strokeWidth="0dp"
+                    android:layout_height="match_parent">
 
-                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/note_container"
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        app:cardBackgroundColor="?colorTertiaryContainer"
                         android:layout_margin="8dp"
-                        app:strokeWidth="0dp"
-                        android:layout_height="match_parent">
+                        android:layout_height="wrap_content">
 
-                        <LinearLayout
+                        <TextView
+                            android:id="@+id/note"
+                            tools:text="Article note (if any...)"
+                            android:layout_gravity="center_vertical"
                             android:layout_width="match_parent"
-                            android:layout_margin="8dp"
-                            android:layout_height="wrap_content">
-
-                            <TextView
-                                android:id="@+id/note"
-                                tools:text="Article note (if any...)"
-                                android:layout_gravity="center_vertical"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="8dp"
-                                android:textColor="?colorOnTertiaryContainer"
-                                android:layout_weight="1"
-                                android:textSize="12sp"/>
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                app:tint="?colorOnTertiaryContainer"
-                                android:src="@drawable/baseline_note_24"/>
-
-                        </LinearLayout>
-                    </com.google.android.material.card.MaterialCardView>
-
-                </LinearLayout>
-            </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="8dp"
+                            android:textColor="?colorOnTertiaryContainer"
+                            android:layout_weight="1"
+                            android:textSize="12sp"/>
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            app:tint="?colorOnTertiaryContainer"
+                            android:src="@drawable/baseline_note_24"/>
+
+                    </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
 
-        </com.google.android.material.appbar.AppBarLayout>
+            </LinearLayout>
+        </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
-        <com.telefonica.nestedscrollwebview.NestedScrollWebView
-            android:id="@+id/article_content"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-    </com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout>
+    <com.telefonica.nestedscrollwebview.NestedScrollWebView
+        android:id="@+id/article_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
-</FrameLayout>
\ No newline at end of file
+</com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml
index 1a687b1d..2f962418 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.viewpager.widget.ViewPager
+<androidx.viewpager2.widget.ViewPager2
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/article_pager"
     android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml
deleted file mode 100755
index 4ce8c1dd..00000000
--- a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/headlines_fragment"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    	android:id="@+id/headlines_swipe_container"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent" >
-    
-	   <ListView
-	       android:id="@+id/headlines_list"
-		   android:background="?colorSurfaceContainer"
-           android:drawSelectorOnTop="true"
-		   android:padding="8dp"
-		   android:dividerHeight="8dp"
-		   android:divider="@null"
-	       android:layout_width="match_parent"
-	       android:layout_height="match_parent" />
-	</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-</FrameLayout>
\ No newline at end of file
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 fd328276..352aad91 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
@@ -4,21 +4,23 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="16dp"
-        android:layout_gravity="center_vertical|left"
+        android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp">
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
@@ -36,7 +38,6 @@
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -44,94 +45,64 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
             android:textColor="?colorPrimary"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorSecondary"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?colorSecondary"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
-                android:textAlignment="viewStart"
-                android:textColor="?colorSecondary"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
-
+            android:layout_marginTop="4dp" />
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
-            android:textColor="?colorPrimary"
+            android:textColor="?colorSecondary"
             android:textSize="12sp"
             />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
+            android:paddingEnd="0dp"
+            android:layout_gravity="end"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             app:icon="?ic_star_outline" />
-
     </LinearLayout>
-
-    <!-- <ImageView
-        android:id="@+id/article_menu_button"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:layout_weight="0"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:src="@drawable/ic_action_overflow" /> -->
-
-
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
index 6030df54..5721dcb8 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
@@ -4,16 +4,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:background="?colorTertiaryContainer"
-    android:textColor="?colorOnTertiaryContainer"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="16dp"
         android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -21,6 +21,7 @@
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
@@ -38,7 +39,6 @@
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -46,91 +46,63 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textColor="?colorOnTertiaryContainer"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorOnTertiaryContainer"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            android:textColor="?colorOnTertiaryContainer"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed"
-                android:textAlignment="viewStart"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
-
+            android:layout_marginTop="4dp" />
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
             android:textColor="?colorSecondary"
             android:textSize="12sp"
             />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:clickable="true"
+            android:paddingEnd="0dp"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             app:icon="?ic_star_outline" />
-
     </LinearLayout>
-
-    <!-- <ImageView
-        android:id="@+id/article_menu_button"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:layout_weight="0"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:src="@drawable/ic_action_overflow" /> -->
-
-
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml
index 0d8d930d..06813e04 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml
@@ -4,38 +4,41 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:background="?colorTertiaryContainer"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="8dp"
         android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp">
+        android:layout_marginEnd="16dp">
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
+            android:layout_gravity="center"
             android:id="@+id/text_image"/>
 
         <ImageView
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:src="@drawable/check_sm"
-            android:id="@+id/text_checked"/>
+            android:id="@+id/text_checked"
+            android:layout_gravity="center" />
 
     </FrameLayout>
 
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -43,89 +46,65 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
+            android:textColor="?colorOnTertiaryContainer"
             android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorOnTertiaryContainer"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            android:textColor="?colorOnTertiaryContainer"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed"
-                android:textAlignment="viewStart"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
-
+            android:layout_marginTop="4dp" />
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
             android:textColor="?colorSecondary"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
+            android:paddingEnd="0dp"
+            android:layout_gravity="end"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             app:icon="?ic_star_outline" />
-
     </LinearLayout>
-
-    <!-- <ImageView
-        android:id="@+id/article_menu_button"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:layout_weight="0"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:src="@drawable/ic_action_overflow" /> -->
-
-
 </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 222d19d1..6aa1bdcd 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
@@ -4,15 +4,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
-    android:padding="@dimen/activity_horizontal_margin"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:background="?colorSurfaceContainerLowest"
-    tools:ignore="HardcodedText" >
+    android:orientation="horizontal">
 
     <FrameLayout
-        android:layout_marginRight="16dp"
         android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,6 +21,7 @@
 
         <ImageView
             android:clickable="true"
+            android:focusable="true"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
@@ -37,7 +39,6 @@
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -45,78 +46,65 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
             android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_span="2" />
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/feed_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+            android:textColor="?colorSecondary"
+            android:textSize="12sp"
+            android:layout_marginTop="4dp" />
 
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
-            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            android:textColor="?colorSecondary"
             android:textSize="13sp"
-            android:layout_span="2"
-            android:paddingTop="4dp" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TextView
-                android:id="@+id/feed_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:fontFamily="sans-serif-light"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
-                android:textAlignment="viewStart"
-                android:textSize="12sp"
-                android:layout_weight="0.5"
-                android:paddingTop="4dp" />
-
-        </LinearLayout>
+            android:layout_marginTop="4dp" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/headline_footer"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:layout_width="wrap_content"
+        android:layout_width="48dp"
         android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
-            android:textColor="?colorSecondary"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_weight="1"
+            android:textAlignment="viewEnd"
+            android:layout_weight="0.5"
             tools:text="Jan 01"
-            android:textSize="12sp" />
+            android:textColor="?colorSecondary"
+            android:textSize="12sp"
+            />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
+            android:paddingEnd="0dp"
+            android:layout_gravity="end"
+            android:layout_height="24dp"
+            android:layout_weight="0.5"
             app:icon="?ic_star_outline" />
-
     </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
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 429b27c0..420b6f3a 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
@@ -2,16 +2,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/detail_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:visibility="gone"
-        android:src="@drawable/baseline_open_in_browser_24"
-        android:layout_margin="16dp" />
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -25,7 +16,7 @@
         android:id="@+id/article_fragment"
         app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent">
     </FrameLayout>
 
     <FrameLayout
@@ -35,5 +26,22 @@
         android:layout_width="0dp">
     </FrameLayout>
 
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/detail_bottom_appbar"
+        app:backgroundTint="?colorSurfaceContainerHigh"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_gravity="bottom"
+        app:menu="@menu/bottombar_detail" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/detail_fab"
+        android:layout_gravity="end|bottom"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="38dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/baseline_open_in_browser_24" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>