From 754af3d7fa19d6fe81418d2bf021a79f54fa54b2 Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Thu, 12 Jun 2025 04:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kazusa/ui/main/explore/ExploreAdapter.kt | 2 - .../kazusa/ui/main/explore/ExploreFragment.kt | 6 + .../legato/kazusa/ui/main/rss/RssFragment.kt | 7 + app/src/main/res/layout/fragment_explore.xml | 8 +- app/src/main/res/layout/fragment_rss.xml | 15 +- app/src/main/res/layout/item_arrange_book.xml | 144 +++++++++--------- app/src/main/res/layout/item_download.xml | 8 +- app/src/main/res/layout/view_search.xml | 2 +- app/src/main/res/menu/main_explore.xml | 9 +- 9 files changed, 104 insertions(+), 97 deletions(-) diff --git a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreAdapter.kt b/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreAdapter.kt index 87ce823af..816a70258 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreAdapter.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreAdapter.kt @@ -48,8 +48,6 @@ class ExploreAdapter(context: Context, val callBack: CallBack) : payloads: MutableList ) { binding.run { - // 移除了 padding 设置 - if (payloads.isEmpty()) { tvName.text = item.bookSourceName } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreFragment.kt b/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreFragment.kt index f1c8e5c7f..c463e2643 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreFragment.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/explore/ExploreFragment.kt @@ -7,12 +7,14 @@ import android.view.SubMenu import android.view.View import android.view.inputmethod.EditorInfo import androidx.core.view.isGone +import androidx.core.view.isVisible import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import androidx.transition.TransitionManager import com.google.android.material.search.SearchBar import com.google.android.material.search.SearchView import io.legato.kazusa.R @@ -208,6 +210,10 @@ class ExploreFragment() : VMBaseFragment(R.layout.fragment_exp val query = "group:${item.title}" searchView.setText(query) upExploreData(query) + }else if (item.itemId == R.id.menu_exp_search) { + TransitionManager.beginDelayedTransition(binding.rootView) + binding.searchBar.visibility = + if (binding.searchBar.isVisible) View.GONE else View.VISIBLE } } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssFragment.kt b/app/src/main/java/io/legato/kazusa/ui/main/rss/RssFragment.kt index fb6aa2fb7..c555896a6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/rss/RssFragment.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/rss/RssFragment.kt @@ -1,11 +1,13 @@ package io.legato.kazusa.ui.main.rss import android.os.Bundle +import android.transition.TransitionManager import android.view.Menu import android.view.MenuItem import android.view.SubMenu import android.view.View import android.view.inputmethod.EditorInfo +import androidx.core.view.isVisible import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle @@ -89,6 +91,11 @@ class RssFragment() : VMBaseFragment(R.layout.fragment_rss), when (item.itemId) { R.id.menu_rss_config -> startActivity() R.id.menu_rss_star -> startActivity() + R.id.menu_rss_search -> { + TransitionManager.beginDelayedTransition(binding.rootView) + binding.searchBar.visibility = + if (binding.searchBar.isVisible) View.GONE else View.VISIBLE + } else -> if (item.groupId == R.id.menu_group_text) { searchView.setText("group:${item.title}") upRssFlowJob("group:${item.title}") diff --git a/app/src/main/res/layout/fragment_explore.xml b/app/src/main/res/layout/fragment_explore.xml index 8f5d5ae56..77a278c1f 100644 --- a/app/src/main/res/layout/fragment_explore.xml +++ b/app/src/main/res/layout/fragment_explore.xml @@ -3,6 +3,7 @@ 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/root_view" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -33,10 +34,9 @@ android:id="@+id/search_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorSurface" + android:visibility="gone" android:layout_marginHorizontal="16dp" - android:hint="@string/search_rss_source" - app:layout_constraintTop_toTopOf="parent" /> + android:hint="@string/search_rss_source" /> @@ -52,7 +52,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - @@ -33,9 +34,9 @@ android:id="@+id/search_bar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:visibility="gone" android:layout_marginHorizontal="16dp" - android:hint="@string/search_rss_source" - app:layout_constraintTop_toTopOf="parent" /> + android:hint="@string/search_rss_source" /> @@ -45,20 +46,18 @@ android:layout_height="match_parent" app:layout_constraintTop_toTopOf="parent" /> - - - + - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:paddingBottom="2dp" + android:singleLine="true" + android:text="@string/book_name" + android:textSize="20sp" + app:layout_constraintStart_toEndOf="@id/checkbox" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/checkbox" + app:layout_constraintBottom_toBottomOf="@id/checkbox"/> - - + - - + + - + - + - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml index ac80bd20e..5f6733c85 100644 --- a/app/src/main/res/layout/item_download.xml +++ b/app/src/main/res/layout/item_download.xml @@ -40,11 +40,11 @@ @@ -52,7 +52,7 @@ + + - - + \ No newline at end of file