From b8ee311f7013840d2a0e55fe435467a6a3675368 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sun, 26 Oct 2025 14:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20#146?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kazusa/ui/rss/article/RssSortActivity.kt  | 17 ++++++++
 app/src/main/res/drawable/tab_right_fade.xml  |  9 ++++
 .../main/res/layout/activity_rss_artivles.xml | 43 +++++++++++++++++--
 .../main/res/layout/fragment_rss_articles.xml |  1 +
 .../main/res/layout/item_rss_article_1.xml    |  2 +-
 .../main/res/layout/item_rss_article_2.xml    |  2 +-
 .../main/res/layout/item_rss_article_3.xml    |  2 +-
 7 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/tab_right_fade.xml

diff --git a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt b/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt
index d12af0fbe..e4623d14d 100644
--- a/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/rss/article/RssSortActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.viewModels
+import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
@@ -122,6 +123,22 @@ class RssSortActivity : VMBaseActivity<ActivityRssArtivlesBinding, RssSortViewMo
                 tab.text = sortList[position].first
             }.attach()
         }
+
+        binding.btnExpandTabs.setOnClickListener {
+            val popup = PopupMenu(this, it)
+            sortList.forEachIndexed { index, pair ->
+                popup.menu.add(0, index, index, pair.first)
+            }
+            popup.setOnMenuItemClickListener { item ->
+                binding.viewPager.setCurrentItem(item.itemId, true)
+                true
+            }
+            popup.setOnDismissListener {
+                binding.btnExpandTabs.isChecked = false
+            }
+            popup.show()
+        }
+
     }
 
     private fun setSourceVariable() {
diff --git a/app/src/main/res/drawable/tab_right_fade.xml b/app/src/main/res/drawable/tab_right_fade.xml
new file mode 100644
index 000000000..655cd7943
--- /dev/null
+++ b/app/src/main/res/drawable/tab_right_fade.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="@android:color/transparent"
+        android:endColor="?attr/colorSurface"
+        android:angle="0" />
+</shape>
+
+
diff --git a/app/src/main/res/layout/activity_rss_artivles.xml b/app/src/main/res/layout/activity_rss_artivles.xml
index 8b44bf114..044b65069 100644
--- a/app/src/main/res/layout/activity_rss_artivles.xml
+++ b/app/src/main/res/layout/activity_rss_artivles.xml
@@ -36,12 +36,47 @@
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tab_layout"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:paddingHorizontal="16dp"/>
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:paddingEnd="10dp">
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:clipToPadding="false"
+                android:clipChildren="false">
+
+                <com.google.android.material.tabs.TabLayout
+                    android:id="@+id/tab_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    app:tabMode="scrollable"
+                    android:scrollbars="none" />
+
+                <View
+                    android:layout_width="40dp"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="end"
+                    android:background="@drawable/tab_right_fade" />
+
+            </FrameLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_expand_tabs"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:checkable="true"
+                app:iconGravity="textStart"
+                style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
+                app:icon="@drawable/m3_split_button_chevron_avd" />
+
+        </LinearLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/fragment_rss_articles.xml b/app/src/main/res/layout/fragment_rss_articles.xml
index 11853e9a9..38c015b92 100644
--- a/app/src/main/res/layout/fragment_rss_articles.xml
+++ b/app/src/main/res/layout/fragment_rss_articles.xml
@@ -8,6 +8,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:padding="4dp"
         android:clipToPadding="false" />
 
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_rss_article_1.xml b/app/src/main/res/layout/item_rss_article_1.xml
index 2f85967ff..315b944ca 100644
--- a/app/src/main/res/layout/item_rss_article_1.xml
+++ b/app/src/main/res/layout/item_rss_article_1.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.card.MaterialCardView 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:layout_margin="8dp"
+    android:layout_margin="4dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:strokeWidth="0dp"
diff --git a/app/src/main/res/layout/item_rss_article_2.xml b/app/src/main/res/layout/item_rss_article_2.xml
index 627b0dceb..bf401d198 100644
--- a/app/src/main/res/layout/item_rss_article_2.xml
+++ b/app/src/main/res/layout/item_rss_article_2.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.card.MaterialCardView 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:layout_margin="8dp"
+    android:layout_margin="4dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:strokeWidth="0dp"
diff --git a/app/src/main/res/layout/item_rss_article_3.xml b/app/src/main/res/layout/item_rss_article_3.xml
index 47d530b71..530737af1 100644
--- a/app/src/main/res/layout/item_rss_article_3.xml
+++ b/app/src/main/res/layout/item_rss_article_3.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.card.MaterialCardView 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:layout_margin="8dp"
+    android:layout_margin="4dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:strokeWidth="0dp"