From 90de90328be94441ee65f638ff744c615877970a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 13 Jun 2022 16:37:46 +0300
Subject:  * assorted RTL fixes  * replace several hardcoded strings with
 tools:text items

---
 .../src/main/res/layout/drawer_header.xml          |  8 +++---
 org.fox.ttrss/src/main/res/layout/feeds_goback.xml |  2 +-
 org.fox.ttrss/src/main/res/layout/feeds_row.xml    | 13 +++++----
 .../src/main/res/layout/feeds_row_selected.xml     | 10 ++++---
 .../src/main/res/layout/feeds_row_toggle.xml       |  9 +++---
 .../src/main/res/layout/fragment_article.xml       | 33 ++++++++++++++--------
 .../src/main/res/layout/headlines_row.xml          | 25 +++++++++-------
 .../src/main/res/layout/headlines_row_compact.xml  | 18 +++++++-----
 .../res/layout/headlines_row_selected_compact.xml  | 22 +++++++++------
 .../headlines_row_selected_unread_compact.xml      | 20 +++++++------
 .../src/main/res/layout/headlines_row_unread.xml   | 27 ++++++++++--------
 .../res/layout/headlines_row_unread_compact.xml    | 20 +++++++------
 12 files changed, 125 insertions(+), 82 deletions(-)

diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
index dd72e68c..6779a950 100755
--- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml
+++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
@@ -25,10 +25,10 @@
             android:layout_height="wrap_content"
             android:src="@drawable/ic_settings"
             android:id="@+id/drawer_settings_btn"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:clickable="true"
             android:layout_marginBottom="16dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginEnd="12dp"
             android:transitionName="SETTINGS_REVEAL"
             android:background="@drawable/ripple" />
 
@@ -46,7 +46,7 @@
                 android:id="@+id/drawer_header_login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:textColor="@android:color/primary_text_dark"
                 tools:text="test"
                 android:textSize="14sp"
@@ -59,7 +59,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@android:color/primary_text_dark"
-                android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:layout_marginTop="5dp"
                 tools:text="example.org"
                 android:textSize="14sp"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
index c54955de..bb263237 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
@@ -29,7 +29,7 @@
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="35dp"
+        android:paddingStart="35dp"
         android:singleLine="true"
         android:text=".."
         android:paddingBottom="2dp"
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 64491f2c..7a10bc23 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/feeds_row"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,10 +29,12 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_weight="1"
-        android:ellipsize="end"
-        android:paddingLeft="35dp"
+        android:ellipsize="middle"
+        android:paddingStart="35dp"
+        android:paddingEnd="16dp"
         android:singleLine="true"
-        android:text="Feed"
+        tools:text="Feed title"
+        android:textAlignment="viewStart"
         android:paddingBottom="2dp"
         android:textColor="?feedlistTextColor"
         android:textSize="14sp" />
@@ -42,9 +45,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
+        android:textAlignment="viewEnd"
         android:singleLine="true"
-        android:text="3200"
-        android:layout_marginLeft="16dp"
+        tools:text="3200"
         android:textColor="?unreadCounterColor"
         android:textSize="14sp" />
 
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 a6aa2599..d5b6cb3c 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
@@ -31,10 +31,12 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_weight="1"
-        android:ellipsize="end"
-        android:paddingLeft="35dp"
+        android:ellipsize="middle"
+        android:paddingStart="35dp"
+        android:paddingEnd="16dp"
         android:singleLine="true"
-        tools:text="Feed"
+        tools:text="Feed title"
+        android:textAlignment="viewStart"
         android:paddingBottom="2dp"
         android:textColor="?feedlistSelectedTextColor"
         android:textSize="14sp" />
@@ -45,9 +47,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
+        android:textAlignment="viewEnd"
         android:singleLine="true"
         tools:text="3200"
-        android:layout_marginLeft="16dp"
         android:textColor="?unreadCounterColor"
         android:textSize="14sp" />
 
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 32ef6756..f9f377f6 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
@@ -30,9 +30,11 @@
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="35dp"
+        android:paddingStart="35dp"
+        android:paddingEnd="16dp"
         android:singleLine="true"
-        tools:text="Feed"
+        tools:text="Unread only"
+        android:textAlignment="viewStart"
         android:paddingBottom="2dp"
         android:textColor="?feedlistTextColor"
         android:textSize="14sp" />
@@ -41,7 +43,6 @@
         android:id="@+id/row_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:layout_marginLeft="16dp" />
+        android:layout_weight="0"/>
 
 </LinearLayout>
\ No newline at end of file
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 eb2511d9..013b898c 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -1,5 +1,6 @@
 <FrameLayout 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:layout_height="match_parent"
@@ -42,8 +43,13 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        android:layout_marginEnd="8dp"
+                        android:textAlignment="viewStart"
+                        tools:text="Unreasonably long article title blah blah blah blah blah blah"
                         android:textColor="?articleHeaderTextColor"
-                        android:textSize="18sp" />
+                        android:textSize="18sp"
+                        android:layout_marginRight="8dp"
+                        android:gravity="start" />
 
                     <ImageView
                         android:id="@+id/score"
@@ -54,7 +60,7 @@
                         android:clickable="true"
                         android:layout_marginLeft="8dp"
                         android:src="?ic_action_trending_flat"
-                        android:layout_gravity="center_vertical|right" />
+                        android:layout_gravity="center_vertical|end" />
 
                     <ImageView
                         android:id="@+id/attachments"
@@ -65,7 +71,7 @@
                         android:layout_marginLeft="8dp"
                         android:clickable="true"
                         android:src="?ic_attachment_vert"
-                        android:layout_gravity="center_vertical|right" />
+                        android:layout_gravity="center_vertical|end" />
 
                     <ImageView
                         android:id="@+id/share"
@@ -73,17 +79,18 @@
                         android:layout_width="wrap_content"
                         android:layout_height="24dp"
                         android:layout_weight="0"
-                        android:layout_marginLeft="8dp"
                         android:clickable="true"
                         android:src="?ic_share"
-                        android:layout_gravity="center_vertical|right" />
+                        android:layout_gravity="center_vertical|end" />
                 </LinearLayout>
 
                 <TextView
                     android:id="@+id/comments"
+                    tools:text="comments"
                     android:background="@drawable/ripple"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:textAlignment="viewStart"
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
                     android:paddingTop="8dp"
@@ -98,10 +105,12 @@
 
                     <TextView
                         android:id="@+id/tags"
-                        android:layout_width="wrap_content"
+                        tools:text="alpha, beta, gamma"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="0.7"
                         android:ellipsize="middle"
+                        android:textAlignment="viewStart"
                         android:singleLine="true"
                         android:fontFamily="sans-serif-light"
                         android:textColor="?headlineSecondaryTextColor"
@@ -109,11 +118,12 @@
 
                     <TextView
                         android:id="@+id/date"
-                        android:layout_width="wrap_content"
+                        tools:text="Jan 01, 1970"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="right"
-                        android:layout_marginLeft="10dp"
+                        android:layout_weight="0.3"
+                        android:gravity=""
+                        android:textAlignment="viewEnd"
                         android:fontFamily="sans-serif-light"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="?headlineSecondaryTextColor"
@@ -146,6 +156,7 @@
 
                 <TextView
                     android:id="@+id/note"
+                    tools:text="Article note (if any...)"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
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 41f4ee81..2e997e2c 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -82,18 +82,19 @@
 
                         <TextView
                             android:id="@+id/title"
-                            android:background="@drawable/ripple"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:background="@drawable/ripple"
+                            android:ellipsize="end"
+                            android:textAlignment="viewStart"
                             android:gravity="center_vertical"
+                            android:maxLines="3"
                             android:paddingBottom="8dp"
                             android:singleLine="false"
-                            tools:text="Sample entry title"
                             android:textColor="?headlineExcerptTextColor"
                             android:textSize="18sp"
                             android:textStyle="normal"
-                            android:maxLines="3"
-                            android:ellipsize="end" />
+                            tools:text="Sample entry title" />
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -107,9 +108,10 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="0.5"
-                                android:ellipsize="end"
+                                android:ellipsize="middle"
                                 android:fontFamily="sans-serif-light"
                                 android:gravity="center_vertical"
+                                android:textAlignment="viewStart"
                                 android:singleLine="true"
                                 tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
                                 android:textColor="?headlineSecondaryTextColor"
@@ -122,7 +124,8 @@
                                 android:layout_weight="0.5"
                                 android:ellipsize="none"
                                 android:fontFamily="sans-serif-light"
-                                android:gravity="right|center_vertical"
+                                android:gravity="center_vertical"
+                                android:textAlignment="viewEnd"
                                 android:singleLine="true"
                                 tools:text="Jan 01, 12:00, 1970"
                                 android:textColor="?headlineSecondaryTextColor"
@@ -138,7 +141,7 @@
                     android:id="@+id/flavor_video_kind"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="left|bottom"
+                    android:layout_gravity="start|bottom"
                     android:scaleType="fitXY"
                     android:src="@drawable/ic_play_circle"
                     android:visibility="visible"
@@ -148,7 +151,7 @@
                     android:elevation="4dp"
                     android:tint="?colorAccent"
                     android:layout_marginBottom="8dp"
-                    android:layout_marginLeft="8dp" />
+                    android:layout_marginStart="8dp" />
 
                 <ImageView
                     android:id="@+id/gallery_overflow"
@@ -160,7 +163,7 @@
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:src="@drawable/ic_dots_vertical_circle"
-                    android:layout_gravity="bottom|right"
+                    android:layout_gravity="bottom|end"
                     android:elevation="4dp"
                     android:tint="?colorAccent"
                     android:layout_marginBottom="10dp"
@@ -179,6 +182,7 @@
                 android:layout_height="match_parent"
                 android:layout_span="2"
                 android:ellipsize="end"
+                android:textAlignment="viewStart"
                 android:lineSpacingExtra="2sp"
                 android:maxLines="5"
                 android:padding="16dp"
@@ -212,11 +216,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:ellipsize="end"
+                    android:ellipsize="middle"
                     android:fontFamily="sans-serif-light"
                     android:gravity="center_vertical"
                     android:singleLine="true"
                     tools:text="by Author"
+                    android:textAlignment="viewStart"
                     android:textColor="?headlineSecondaryTextColor"
                     android:textSize="12sp"
                     android:textStyle="italic" />
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 30f86ff0..d139313e 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
@@ -13,7 +13,8 @@
         android:layout_marginRight="16dp"
         android:layout_gravity="center_vertical|left"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp">
 
         <ImageView
             android:clickable="true"
@@ -43,9 +44,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
-            android:text="Sample entry title"
+            tools:text="Sample entry title"
             android:textColor="?headlineExcerptTextColor"
             android:textSize="18sp"
             android:layout_span="2" />
@@ -53,10 +55,11 @@
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
+            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineExcerptTextColor"
             android:textSize="13sp"
             android:layout_span="2"
@@ -71,11 +74,12 @@
                 android:id="@+id/feed_title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
+                android:ellipsize="middle"
                 android:fontFamily="sans-serif-light"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                android:textAlignment="viewStart"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
@@ -100,7 +104,7 @@
             android:singleLine="true"
             android:ellipsize="none"
             android:layout_weight="1"
-            android:text="Jan 01"
+            tools:text="Jan 01"
             android:textColor="?headlineSecondaryTextColor"
             android:textSize="12sp"
             />
@@ -110,7 +114,7 @@
             android:id="@+id/marked"
             android:background="@drawable/ripple"
             android:layout_width="24dp"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
index 0f0805aa..2e449dbb 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
@@ -12,9 +12,10 @@
 
     <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_height="wrap_content"
+        android:layout_marginEnd="16dp">
 
         <ImageView
             android:clickable="true"
@@ -44,9 +45,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
-            android:text="Sample entry title"
+            tools:text="Sample entry title"
             android:textColor="?headlineSelectedTextColor"
             android:textSize="18sp"
             android:layout_span="2" />
@@ -54,10 +56,11 @@
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
+            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             android:textSize="13sp"
             android:layout_span="2"
@@ -72,11 +75,12 @@
                 android:id="@+id/feed_title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
+                android:ellipsize="middle"
                 android:fontFamily="sans-serif-light"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                tools:text="Example Feed"
+                android:textAlignment="viewStart"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
@@ -101,18 +105,18 @@
             android:singleLine="true"
             android:ellipsize="none"
             android:layout_weight="1"
-            android:text="Jan 01"
+            tools:text="Jan 01"
             android:textColor="?headlineSelectedSecondaryTextColor"
             android:textSize="12sp"
             />
 
 
         <ImageView
+            android:id="@+id/marked"
             android:tint="?headlineFooterColor"
             android:background="@drawable/ripple"
-            android:id="@+id/marked"
             android:layout_width="24dp"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
index 070a22e0..024eb7cf 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
@@ -12,9 +12,10 @@
 
     <FrameLayout
         android:layout_marginRight="8dp"
-        android:layout_gravity="center_vertical|left"
+        android:layout_gravity="center_vertical|start"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp">
 
         <ImageView
             android:clickable="true"
@@ -42,9 +43,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
-            android:text="Sample entry title"
+            tools:text="Sample entry title"
             android:textColor="?headlineSelectedTextColor"
             android:textStyle="bold"
             android:textSize="18sp"
@@ -53,10 +55,11 @@
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
+            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             android:textSize="13sp"
             android:layout_span="2"
@@ -71,11 +74,12 @@
                 android:id="@+id/feed_title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
+                android:ellipsize="middle"
                 android:fontFamily="sans-serif-light"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                tools:text="Example Feed"
+                android:textAlignment="viewStart"
                 android:textColor="?headlineSelectedSecondaryTextColor"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
@@ -100,7 +104,7 @@
             android:singleLine="true"
             android:ellipsize="none"
             android:layout_weight="1"
-            android:text="Jan 01"
+            tools:text="Jan 01"
             android:textColor="?headlineSelectedSecondaryTextColor"
             android:textSize="12sp"
             />
@@ -111,7 +115,7 @@
             android:background="@drawable/ripple"
             android:tint="?headlineFooterColor"
             android:layout_width="24dp"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
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
index 02fea821..ba70bb89 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -82,19 +82,20 @@
 
                         <TextView
                             android:id="@+id/title"
-                            android:background="@drawable/ripple"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_span="2"
+                            android:background="@drawable/ripple"
+                            android:ellipsize="end"
                             android:gravity="center_vertical"
+                            android:maxLines="3"
                             android:paddingBottom="8dp"
                             android:singleLine="false"
-                            android:text="Sample entry title"
+                            android:textAlignment="viewStart"
                             android:textColor="?headlineUnreadTextColor"
                             android:textSize="18sp"
                             android:textStyle="bold"
-                            android:ellipsize="end"
-                            android:maxLines="3" />
+                            tools:text="Sample entry title" />
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -108,11 +109,12 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="0.5"
-                                android:ellipsize="end"
+                                android:ellipsize="middle"
                                 android:fontFamily="sans-serif-light"
                                 android:gravity="center_vertical"
+                                android:textAlignment="viewStart"
                                 android:singleLine="true"
-                                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                                tools:text="Example Feed"
                                 android:textColor="?headlineSecondaryTextColor"
                                 android:textSize="12sp" />
 
@@ -123,7 +125,8 @@
                                 android:layout_weight="0.5"
                                 android:ellipsize="none"
                                 android:fontFamily="sans-serif-light"
-                                android:gravity="right|center_vertical"
+                                android:gravity="center_vertical"
+                                android:textAlignment="viewEnd"
                                 android:singleLine="true"
                                 tools:text="Jan 01, 12:00, 1970"
                                 android:textColor="?headlineSecondaryTextColor"
@@ -139,7 +142,7 @@
                     android:id="@+id/flavor_video_kind"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|left"
+                    android:layout_gravity="bottom|start"
                     android:scaleType="fitXY"
                     android:src="@drawable/ic_play_circle"
                     android:visibility="visible"
@@ -147,7 +150,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:tint="?colorAccent"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:layout_marginBottom="8dp" />
 
                 <ImageView
@@ -160,7 +163,7 @@
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:src="@drawable/ic_dots_vertical_circle"
-                    android:layout_gravity="bottom|right"
+                    android:layout_gravity="bottom|end"
                     android:elevation="4dp"
                     android:tint="?colorAccent"
                     android:layout_marginBottom="10dp"
@@ -179,6 +182,7 @@
                 android:layout_height="match_parent"
                 android:layout_span="2"
                 android:ellipsize="end"
+                android:textAlignment="viewStart"
                 android:lineSpacingExtra="2sp"
                 android:maxLines="5"
                 android:padding="16dp"
@@ -212,11 +216,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:ellipsize="end"
+                    android:ellipsize="middle"
                     android:fontFamily="sans-serif-light"
                     android:gravity="center_vertical"
                     android:singleLine="true"
                     tools:text="by Author"
+                    android:textAlignment="viewStart"
                     android:textColor="?headlineSecondaryTextColor"
                     android:textSize="12sp"
                     android:textStyle="italic" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
index 08eacd31..e440188f 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -12,9 +12,10 @@
 
     <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_height="wrap_content"
+        android:layout_marginEnd="16dp">
 
         <ImageView
             android:clickable="true"
@@ -44,9 +45,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
+            android:textAlignment="viewStart"
             android:maxLines="2"
             android:ellipsize="end"
-            android:text="Sample entry title"
+            tools:text="Sample entry title"
             android:textColor="?headlineUnreadTextColor"
             android:textStyle="bold"
             android:textSize="18sp"
@@ -55,10 +57,11 @@
         <TextView
             android:id="@+id/excerpt"
             android:maxLines="2"
+            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineExcerptTextColor"
             android:textSize="13sp"
             android:layout_span="2"
@@ -73,11 +76,12 @@
                 android:id="@+id/feed_title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
+                android:ellipsize="middle"
                 android:fontFamily="sans-serif-light"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                android:textAlignment="viewStart"
                 android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
@@ -102,7 +106,7 @@
             android:singleLine="true"
             android:ellipsize="none"
             android:layout_weight="1"
-            android:text="Jan 01"
+            tools:text="Jan 01"
             android:textColor="?headlineSecondaryTextColor"
             android:textSize="12sp"
             />
@@ -112,7 +116,7 @@
             android:id="@+id/marked"
             android:background="@drawable/ripple"
             android:layout_width="24dp"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-- 
cgit v1.2.3