更新关于界面

搜索书籍界面切换至SearchBar与SearchView
This commit is contained in:
HapeLee committed 2025-08-06 17:52:07 +08:00
1 parent 3db111e87d
commit ccaf8973fe
18 files changed
+798 -490

No files matched your search

+297 -23
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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_width="match_parent"
@@ -7,41 +7,315 @@
android:orientation="vertical"
tools:context="io.legato.kazusa.ui.about.AboutActivity">
<io.legato.kazusa.ui.widget.TitleBar
android:id="@+id/title_bar"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/about">
android:fitsSystemWindows="true">
<LinearLayout
android:id="@+id/ll_about"
<com.google.android.material.appbar.CollapsingToolbarLayout
style="?attr/collapsingToolbarLayoutMediumStyle"
android:layout_width="match_parent"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge"
app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:titleCollapseMode="scale">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:navigationIcon="@drawable/ic_arrow_back"
app:title="@string/about" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_card_view"
android:layout_marginVertical="8dp"
android:orientation="vertical"
android:layout_margin="16dp"
android:padding="16dp">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<TextView
<com.google.android.material.card.MaterialCardView
android:id="@+id/cd_about"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/app_name"
android:textSize="20sp"
android:textStyle="bold" />
android:layout_marginStart="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:strokeWidth="0dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher" />
</com.google.android.material.card.MaterialCardView>
<TextView
android:id="@+id/tv_app_summary"
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/app_name"
android:layout_marginEnd="16dp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/cd_about"
app:layout_constraintTop_toTopOf="@id/cd_about" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="16dp"
android:text="@string/about_description"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/cd_about"
app:layout_constraintTop_toBottomOf="@id/tv_name" />
<LinearLayout
android:id="@+id/ll_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/about_description" />
</LinearLayout>
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cd_about">
</io.legato.kazusa.ui.widget.TitleBar>
<com.google.android.material.card.MaterialCardView
android:layout_width="8dp"
android:layout_height="match_parent"
android:layout_marginVertical="8dp"
android:layout_marginEnd="12dp"
app:cardBackgroundColor="?attr/colorTertiary"
app:strokeWidth="0dp" />
<FrameLayout
android:id="@+id/fl_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_web"
style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
app:icon="@drawable/ic_web_outline" />
</LinearLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_github"
style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
app:icon="@drawable/ic_github" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_update"
style="@style/Widget.Material3Expressive.Button.TonalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/check_update"
app:icon="@drawable/ic_import" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_contributors"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_btn">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/contributors"
android:textSize="16sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/contributors_summary"
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_update_log"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_contributors">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/update_log"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_privacy_policy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_update_log">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/privacy_policy"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_license"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_privacy_policy">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/license"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_disclaimer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_license">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/disclaimer"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_crash_log"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_disclaimer">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/crash_log"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_save_log"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_crash_log">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/save_log"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_create_heap_dump"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="60dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
app:layout_constraintTop_toBottomOf="@id/ll_save_log">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/create_heap_dump"
android:textSize="16sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
+114 -81
View File
@@ -1,34 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.book.search.SearchActivity">
<io.legato.kazusa.ui.widget.TitleBar
android:id="@+id/title_bar"
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentInsetStartWithNavigation="0dp"
app:contentLayout="@layout/view_search"
app:layout_constraintTop_toTopOf="parent"
app:title="搜索" />
android:backgroundTint="?attr/colorSurface"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/refresh_progress_bar"
android:layout_width="match_parent"
android:layout_height="2dp"
android:visibility="gone"
android:indeterminate="true"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
<com.google.android.material.search.SearchBar
android:id="@+id/search_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/search_book_key"
app:menu="@menu/book_search"
app:navigationIconTint="?attr/colorOnSurface" />
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/refresh_progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/app_bar">
</com.google.android.material.progressindicator.LinearProgressIndicator>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/tv_empty_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="16dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(๑`^´๑)"
android:textSize="30sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:text="@string/search_empty" />
</LinearLayout>
<io.legato.kazusa.ui.widget.dynamiclayout.DynamicFrameLayout
android:id="@+id/content_view"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/refresh_progress_bar">
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
@@ -39,72 +71,75 @@
</io.legato.kazusa.ui.widget.dynamiclayout.DynamicFrameLayout>
<LinearLayout
android:id="@+id/ll_input_help"
<com.google.android.material.search.SearchView
android:id="@+id/search_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar">
<TextView
android:id="@+id/tv_book_show"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
android:paddingVertical="12dp"
android:text="@string/bookshelf"
android:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_bookshelf_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:visibility="visible" />
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingHorizontal="16dp"
android:paddingVertical="4dp">
<TextView
android:id="@+id/tv_history"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textStyle="bold"
android:layout_gravity="center_vertical"
android:text="@string/searchHistory" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_clear_history"
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconGravity="textStart"
app:icon="@drawable/ic_clear_all" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_history_key"
android:id="@+id/ll_input_help"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingHorizontal="12dp" />
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:visibility="visible">
</LinearLayout>
<TextView
android:id="@+id/tv_book_show"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:text="@string/bookshelf"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_bookshelf_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingHorizontal="16dp"
android:paddingVertical="4dp">
<TextView
android:id="@+id/tv_history"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/searchHistory"
android:textSize="16sp"
android:textStyle="bold" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_clear_history"
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/ic_clear_all"
app:iconGravity="textStart" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_history_key"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</com.google.android.material.search.SearchView>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fb_start_stop"
@@ -114,9 +149,7 @@
android:contentDescription="@string/stop"
android:src="@drawable/ic_stop_black_24dp"
android:visibility="invisible"
app:fabSize="mini"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
android:layout_gravity="bottom|end" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
+2 -1
View File
@@ -4,7 +4,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:padding="16dp"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:scrollbars="none">
+19 -14
View File
@@ -1,30 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rootView"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="2dp"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:background="@drawable/selector_fillet_btn_bg"
android:gravity="center"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:minHeight="36dp"
android:backgroundTint="?attr/colorSurfaceContainer"
android:clipToPadding="false"
android:clipChildren="false">
android:gravity="center_vertical">
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="关键词"
android:textSize="14sp"
android:textColor="?attr/colorOnSurface"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="16dp"
android:layout_weight="1"
android:maxLines="1"
android:ellipsize="end"
android:paddingHorizontal="4dp" />
android:text="@string/text"
android:textSize="16sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_delete"
style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
app:backgroundTint="@android:color/transparent"
app:icon="@drawable/ic_baseline_close" />
</LinearLayout>
-1
View File
@@ -3,7 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/search_view"
android:theme="?attr/actionBarStyle"
android:background="@drawable/bg_searchview"
android:layout_width="match_parent"
android:layout_height="wrap_content"