From 6d4f236526dcd30ac2b358e09081f62846670df7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 12 May 2025 15:40:22 +0300
Subject: - rename 'selected' views to 'active' - no longer let detailactivity
 to persist on configuration change in   order to properly handle different
 tablet portrait/landscape layouts - stop keeping active article as objects,
 use ID instead to prevent   deserialization desyncs

---
 .../res/layout/headlines_row_compact_active.xml    | 108 ++++++++++++++++++++
 .../layout/headlines_row_compact_active_unread.xml | 110 +++++++++++++++++++++
 .../res/layout/headlines_row_compact_selected.xml  | 108 --------------------
 .../headlines_row_compact_selected_unread.xml      | 110 ---------------------
 org.fox.ttrss/src/main/res/menu/activity_main.xml  |   5 +-
 5 files changed, 222 insertions(+), 219 deletions(-)
 create mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
 create mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml

(limited to 'org.fox.ttrss/src/main/res')

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
new file mode 100755
index 00000000..5721dcb8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
@@ -0,0 +1,108 @@
+<?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_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/headlines_row_compact_active_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
new file mode 100755
index 00000000..06813e04
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
@@ -0,0 +1,110 @@
+<?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="?ic_star_outline" />
+    </LinearLayout>
+</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
deleted file mode 100755
index 5721dcb8..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected.xml
+++ /dev/null
@@ -1,108 +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_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/headlines_row_compact_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_unread.xml
deleted file mode 100755
index 06813e04..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_selected_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="?ic_star_outline" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
index 1650f366..6f3198a2 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -66,7 +66,10 @@
                 app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/share_article"/>
-
+            <item
+                android:id="@+id/catchup_above"
+                app:showAsAction=""
+                android:title="@string/article_mark_read_above"/>
         </group>
 
     </group>
-- 
cgit v1.2.3-54-g00ecf