Merge branch 'dev' into 'master'

disable inline video player until it is tested, disable predraw hacks (memory...

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

10 files changed, 31 insertions, 612 deletions

diff --git a/org.fox.ttrss/src/main/res/drawable/indicator_dot.xml b/org.fox.ttrss/src/main/res/drawable/indicator_dot.xml
new file mode 100644
index 00000000..b6dd6c82
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/indicator_dot.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://github.com/ongakuer/CircleIndicator/issues/160 -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="10dp"
+    android:shape="oval">
+    <solid android:color="?colorTertiary" />
+    <corners android:radius="25dp" />
+</shape>
\ No newline at end of file
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 b0f67761..f1ad3f8c 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
@@ -5,7 +5,7 @@
     android:animateLayoutChanges="true"
     android:layout_height="fill_parent">
 
-    <com.bogdwellers.pinchtozoom.view.ImageViewPager
+    <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/gallery_pager"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
@@ -38,13 +38,14 @@
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin" />
 
-    <me.relex.circleindicator.CircleIndicator
+    <me.relex.circleindicator.CircleIndicator3
         android:id="@+id/gallery_pager_indicator"
         android:layout_width="fill_parent"
         android:layout_height="32dp"
         android:layout_marginBottom="55dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
+        app:ci_drawable="@drawable/indicator_dot"
         android:layout_alignParentStart="true"
         android:visibility="visible" />
 
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml b/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml
index 5bde3166..3c507cba 100644
--- a/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml
@@ -1,6 +1,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/flavorImageHolder"
+    android:id="@+id/flavor_image_holder"
     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 3c0ecb20..85a93f33 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -25,7 +25,6 @@
                 android:id="@+id/headline_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:clickable="true"
                 android:layout_span="2"
                 android:padding="16dp">
 
@@ -100,17 +99,20 @@
             android:layout_height="match_parent" >
 
             <FrameLayout
-                android:id="@+id/flavorImageHolder"
+                android:id="@+id/flavor_image_holder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
                 android:layout_span="2">
 
                 <ProgressBar
-                    android:id="@+id/flavorImageLoadingBar"
+                    android:id="@+id/flavor_image_progressbar"
                     style="?android:attr/progressBarStyleHorizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:indeterminate="false"
                     android:max="100"
                     android:visibility="visible" />
@@ -121,7 +123,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:adjustViewBounds="true"
-                    android:background="@android:color/transparent"
+                    android:background="@null"
                     android:cropToPadding="true"
                     android:scaleType="centerCrop"
                     tools:src="@drawable/ic_launcher_background"
@@ -178,7 +180,8 @@
                 android:textAlignment="viewStart"
                 android:lineSpacingExtra="2sp"
                 android:maxLines="5"
-                android:padding="16dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
                 tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
                 android:textSize="13sp" />
         </TableRow>
@@ -193,8 +196,7 @@
                 android:layout_height="wrap_content"
                 android:layout_span="2"
                 android:gravity="center_vertical"
-                android:paddingBottom="8dp"
-                android:paddingLeft="8dp">
+                android:paddingBottom="8dp">
 
                 <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/selected"
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
deleted file mode 100755
index 72ae99b8..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/headlines_row"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="8dp"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?colorTertiaryContainer"
-    android:orientation="horizontal">
-
-    <FrameLayout
-        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"
-            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:layout_gravity="center" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            tools:text="Sample entry title"
-            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: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_marginTop="4dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_weight="0"
-        android:layout_width="48dp"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="sans-serif-light"
-            android:singleLine="true"
-            android:ellipsize="none"
-            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:paddingEnd="0dp"
-            android:layout_gravity="end"
-            android:layout_height="24dp"
-            android:layout_weight="0.5"
-            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
deleted file mode 100755
index b2b3a21e..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/headlines_row"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="8dp"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?colorTertiaryContainer"
-    android:orientation="horizontal">
-
-    <FrameLayout
-        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"
-            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:layout_gravity="center" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            tools:text="Sample entry title"
-            android:textColor="?colorOnTertiaryContainer"
-            android:textStyle="bold"
-            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: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_marginTop="4dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_weight="0"
-        android:layout_width="48dp"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="sans-serif-light"
-            android:singleLine="true"
-            android:ellipsize="none"
-            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:paddingEnd="0dp"
-            android:layout_gravity="end"
-            android:layout_height="24dp"
-            android:layout_weight="0.5"
-            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
deleted file mode 100755
index 2fbbe062..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/headlines_row"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="8dp"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?colorSurfaceContainerLowest"
-    android:orientation="horizontal">
-
-    <FrameLayout
-        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"
-            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:layout_gravity="center" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            tools:text="Sample entry title"
-            android:textStyle="bold"
-            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: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_marginTop="4dp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_weight="0"
-        android:layout_width="48dp"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="sans-serif-light"
-            android:singleLine="true"
-            android:ellipsize="none"
-            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:paddingEnd="0dp"
-            android:layout_gravity="end"
-            android:layout_height="24dp"
-            android:layout_weight="0.5"
-            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
deleted file mode 100755
index 7cae0fb1..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/headlines_row"
-    app:cardBackgroundColor="?colorSurfaceContainerLowest"
-    android:layout_marginStart="8dp"
-    android:layout_marginEnd="8dp"
-    android:layout_marginTop="8dp"
-    app:strokeWidth="0dp"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TableLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false"
-        android:shrinkColumns="0,1"
-        android:stretchColumns="0,1">
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout
-                android:id="@+id/headline_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="true"
-                android:layout_span="2"
-                android:padding="16dp">
-
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="3"
-                    android:paddingBottom="8dp"
-                    android:singleLine="false"
-                    android:textColor="?colorOnSurface"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
-                    tools:text="Sample entry title which is overwhelmingly long blah blah blah" />
-
-                <LinearLayout
-                    android:id="@+id/linearLayout2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/title"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/feed_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.5"
-                        android:ellipsize="middle"
-                        android:fontFamily="sans-serif-light"
-                        android:singleLine="true"
-                        android:textAlignment="viewStart"
-                        android:textColor="?colorSecondary"
-                        android:textSize="12sp"
-                        tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" />
-
-                    <TextView
-                        android:id="@+id/date"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.5"
-                        android:ellipsize="none"
-                        android:fontFamily="sans-serif-light"
-                        android:singleLine="true"
-                        android:textAlignment="viewEnd"
-                        android:textColor="?colorSecondary"
-                        android:textSize="12sp"
-                        tools:text="Jan 01, 12:00, 1970" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/link_host"
-                    android:layout_width="match_parent"
-                    android:layout_marginTop="8dp"
-                    android:layout_below="@+id/linearLayout2"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="middle"
-                    android:fontFamily="sans-serif-light"
-                    android:singleLine="true"
-                    android:textAlignment="viewStart"
-                    android:textColor="?colorSecondary"
-                    android:textSize="12sp"
-                    tools:text="example.com" />
-
-            </RelativeLayout>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <FrameLayout
-                android:id="@+id/flavorImageHolder"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_span="2">
-
-                <ProgressBar
-                    android:id="@+id/flavorImageLoadingBar"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:visibility="visible" />
-
-                <ImageView
-                    android:id="@+id/flavor_image"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:adjustViewBounds="true"
-                    android:background="@android:color/transparent"
-                    android:cropToPadding="true"
-                    android:scaleType="centerCrop"
-                    tools:src="@drawable/ic_launcher_background"
-                    android:visibility="visible" />
-
-                <TextureView
-                    android:id="@+id/flavor_video"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:adjustViewBounds="true"
-                    android:background="@null"
-                    android:cropToPadding="true"
-                    android:foreground="@null"
-                    android:scaleType="fitCenter"
-                    android:visibility="gone" />
-
-                <ImageView
-                    android:id="@+id/flavor_video_kind"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start|bottom"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginBottom="10dp"
-                    android:scaleType="fitXY"
-                    android:src="@drawable/baseline_play_circle_24"
-                    android:visibility="visible"
-                    app:tint="?colorTertiary" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/gallery_overflow"
-                    style="?attr/materialIconButtonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|end"
-                    android:layout_marginEnd="-8dp"
-                    app:icon="@drawable/baseline_more_vert_24"
-                    app:iconTint="?colorTertiary"/>
-
-            </FrameLayout>
-        </TableRow>
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/excerpt"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_span="2"
-                android:ellipsize="end"
-                android:textAlignment="viewStart"
-                android:lineSpacingExtra="2sp"
-                android:maxLines="5"
-                android:padding="16dp"
-                tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-                android:textSize="13sp" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/headline_footer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_span="2"
-                android:gravity="center_vertical"
-                android:paddingBottom="8dp"
-                android:paddingLeft="8dp">
-
-                <com.google.android.material.checkbox.MaterialCheckBox
-                    android:id="@+id/selected"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:focusable="false" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:ellipsize="middle"
-                    android:fontFamily="sans-serif-light"
-                    android:gravity="center_vertical"
-                    android:singleLine="true"
-                    tools:text="by Author"
-                    android:textAlignment="viewStart"
-                    android:textColor="?colorSecondary"
-                    android:textSize="12sp"
-                    android:textStyle="italic" />
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialIconButtonStyle"
-                    android:id="@+id/score"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="4dp"
-                    app:icon="@drawable/baseline_trending_flat_24" />
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialIconButtonStyle"
-                    android:id="@+id/attachments"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="4dp"
-                    app:icon="@drawable/baseline_attachment_24" />
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialIconButtonStyle"
-                    android:id="@+id/marked"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="4dp"
-                    app:icon="@drawable/baseline_star_outline_24" />
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialIconButtonStyle"
-                    android:id="@+id/published"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="4dp"
-                    app:icon="@drawable/rss" />
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialIconButtonStyle"
-                    android:id="@+id/article_menu_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:paddingLeft="4dp"
-                    android:paddingRight="4dp"
-                    app:icon="@drawable/baseline_more_vert_24" />
-            </LinearLayout>
-        </TableRow>
-    </TableLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index df82688b..6f34b705 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -305,4 +305,7 @@
     <string name="open_on_startup">Open on startup</string>
     <string name="error_success">Operation completed successfully</string>
     <string name="error_bad_request">Error: 400 bad request</string>
+    <string name="headlines_set_display_mode">Set display mode</string>
+    <string name="window_secure_mode_summary">Disables screenshots and hides window contents on non-secure displays</string>
+    <string name="window_secure_mode">Secure window mode</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 8d064587..9e1f6642 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -67,6 +67,12 @@
             android:key="force_phone_layout"
             android:summary="@string/force_phone_layout_summary"
             android:title="@string/force_phone_layout" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="window_secure_mode"
+            android:summary="@string/window_secure_mode_summary"
+            android:title="@string/window_secure_mode" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -134,6 +140,7 @@
             android:summary="@string/prefs_always_downsample_images_long" />
 
         <SwitchPreferenceCompat
+            android:enabled="false"
             android:defaultValue="false"
             android:key="inline_video_player"
             android:summary="@string/prefs_inline_video_player"