diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/BookAdapter.kt b/app/src/main/java/io/legato/kazusa/ui/book/search/BookAdapter.kt index 60aa49cea..d0d99e1cb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/BookAdapter.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/search/BookAdapter.kt @@ -6,22 +6,23 @@ import io.legato.kazusa.base.adapter.ItemViewHolder import io.legato.kazusa.base.adapter.RecyclerAdapter import io.legato.kazusa.data.entities.Book import io.legato.kazusa.databinding.ItemFilletTextBinding +import io.legato.kazusa.databinding.ItemSearchHistoryBinding class BookAdapter(context: Context, val callBack: CallBack) : - RecyclerAdapter(context) { + RecyclerAdapter(context) { override fun getItemId(position: Int): Long { return position.toLong() } - override fun getViewBinding(parent: ViewGroup): ItemFilletTextBinding { - return ItemFilletTextBinding.inflate(inflater, parent, false) + override fun getViewBinding(parent: ViewGroup): ItemSearchHistoryBinding { + return ItemSearchHistoryBinding.inflate(inflater, parent, false) } override fun convert( holder: ItemViewHolder, - binding: ItemFilletTextBinding, + binding: ItemSearchHistoryBinding, item: Book, payloads: MutableList ) { @@ -30,7 +31,7 @@ class BookAdapter(context: Context, val callBack: CallBack) : } } - override fun registerListener(holder: ItemViewHolder, binding: ItemFilletTextBinding) { + override fun registerListener(holder: ItemViewHolder, binding: ItemSearchHistoryBinding) { holder.itemView.apply { setOnClickListener { getItem(holder.layoutPosition)?.let { diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/HistoryKeyAdapter.kt b/app/src/main/java/io/legato/kazusa/ui/book/search/HistoryKeyAdapter.kt index c224033ac..bfcde9630 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/HistoryKeyAdapter.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/search/HistoryKeyAdapter.kt @@ -5,11 +5,12 @@ import io.legato.kazusa.base.adapter.ItemViewHolder import io.legato.kazusa.base.adapter.RecyclerAdapter import io.legato.kazusa.data.entities.SearchKeyword import io.legato.kazusa.databinding.ItemFilletTextBinding +import io.legato.kazusa.databinding.ItemSearchHistoryBinding import io.legato.kazusa.ui.widget.anima.explosion_field.ExplosionField import splitties.views.onLongClick class HistoryKeyAdapter(activity: SearchActivity, val callBack: CallBack) : - RecyclerAdapter(activity) { + RecyclerAdapter(activity) { private val explosionField = ExplosionField.attach2Window(activity) @@ -17,13 +18,13 @@ class HistoryKeyAdapter(activity: SearchActivity, val callBack: CallBack) : return position.toLong() } - override fun getViewBinding(parent: ViewGroup): ItemFilletTextBinding { - return ItemFilletTextBinding.inflate(inflater, parent, false) + override fun getViewBinding(parent: ViewGroup): ItemSearchHistoryBinding { + return ItemSearchHistoryBinding.inflate(inflater, parent, false) } override fun convert( holder: ItemViewHolder, - binding: ItemFilletTextBinding, + binding: ItemSearchHistoryBinding, item: SearchKeyword, payloads: MutableList ) { @@ -32,7 +33,7 @@ class HistoryKeyAdapter(activity: SearchActivity, val callBack: CallBack) : } } - override fun registerListener(holder: ItemViewHolder, binding: ItemFilletTextBinding) { + override fun registerListener(holder: ItemViewHolder, binding: ItemSearchHistoryBinding) { holder.itemView.apply { setOnClickListener { getItemByLayoutPosition(holder.layoutPosition)?.let { diff --git a/app/src/main/res/drawable/bg_bottom_sheet_handle.xml b/app/src/main/res/drawable/bg_bottom_sheet_handle.xml new file mode 100644 index 000000000..4a3321990 --- /dev/null +++ b/app/src/main/res/drawable/bg_bottom_sheet_handle.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 395ab655b..5b408d035 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -19,8 +19,8 @@ android:layout_height="wrap_content" android:background="@drawable/shape_card_view" android:orientation="vertical" - android:layout_margin="6dp" - android:padding="10dp"> + android:layout_margin="16dp" + android:padding="16dp"> @@ -54,43 +54,48 @@ android:id="@+id/tv_book_show" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="6dp" + android:paddingHorizontal="16dp" + android:paddingVertical="12dp" android:text="@string/bookshelf" - android:visibility="gone" /> + android:visibility="visible" /> + android:paddingHorizontal="16dp" + android:paddingVertical="8dp" + android:visibility="visible" /> + android:orientation="horizontal" + android:paddingHorizontal="16dp" + android:paddingVertical="8dp"> - - + android:layout_gravity="center_vertical" + android:text="@string/searchHistory" /> + + + android:layout_height="match_parent" + android:paddingHorizontal="12dp" /> diff --git a/app/src/main/res/layout/activity_search_content.xml b/app/src/main/res/layout/activity_search_content.xml index 9b657b4c4..1c5700ba9 100644 --- a/app/src/main/res/layout/activity_search_content.xml +++ b/app/src/main/res/layout/activity_search_content.xml @@ -32,11 +32,9 @@ android:id="@+id/ll_search_base_info" android:layout_width="match_parent" android:layout_height="36dp" - android:elevation="5dp" + android:layout_marginHorizontal="16dp" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingLeft="10dp" - android:paddingRight="10dp" app:layout_constraintBottom_toBottomOf="parent"> diff --git a/app/src/main/res/layout/dialog_auto_read.xml b/app/src/main/res/layout/dialog_auto_read.xml index 12430572c..ba1f70bd7 100644 --- a/app/src/main/res/layout/dialog_auto_read.xml +++ b/app/src/main/res/layout/dialog_auto_read.xml @@ -4,14 +4,23 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="16dp" + android:paddingHorizontal="16dp" + android:paddingVertical="8dp" android:orientation="vertical"> + + - - + android:orientation="vertical" + android:gravity="center_horizontal"> - + - + + + + android:orientation="vertical" + android:gravity="center_horizontal"> + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_read_aloud.xml b/app/src/main/res/layout/dialog_read_aloud.xml index fbcfcbeaf..6490388a8 100644 --- a/app/src/main/res/layout/dialog_read_aloud.xml +++ b/app/src/main/res/layout/dialog_read_aloud.xml @@ -6,10 +6,33 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingTop="6dp" - android:paddingRight="16dp" - android:paddingBottom="6dp"> + android:paddingHorizontal="16dp" + android:paddingVertical="8dp"> + + + + + + + + - + android:paddingVertical="16dp" + android:paddingHorizontal="16dp"> - + + + + + @@ -30,14 +44,12 @@ style="@style/Widget.Material3.Button.TonalButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/font_weight_text" /> @@ -45,7 +57,6 @@ android:id="@+id/tv_text_indent" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/Widget.Material3.Button.TonalButton" android:text="@string/text_indent" /> @@ -54,7 +65,7 @@ @@ -124,7 +135,7 @@ @@ -135,21 +146,19 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginBottom="4dp" - android:alpha="0.75" android:text="@string/page_anim" android:textSize="12sp" /> @@ -159,7 +168,6 @@ style="@style/Widget.Material3.Chip.Filter" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="4dp" android:text="@string/page_anim_cover" /> @@ -209,7 +217,7 @@ diff --git a/app/src/main/res/layout/fragment_bookshelf1.xml b/app/src/main/res/layout/fragment_bookshelf1.xml index 6faed4da1..3d53c5ab0 100644 --- a/app/src/main/res/layout/fragment_bookshelf1.xml +++ b/app/src/main/res/layout/fragment_bookshelf1.xml @@ -11,7 +11,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorSurface" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + app:liftOnScroll="false" + android:stateListAnimator="@null"> + android:paddingHorizontal="16dp"/> diff --git a/app/src/main/res/layout/fragment_explore.xml b/app/src/main/res/layout/fragment_explore.xml index 7dd088f73..8f5d5ae56 100644 --- a/app/src/main/res/layout/fragment_explore.xml +++ b/app/src/main/res/layout/fragment_explore.xml @@ -33,6 +33,7 @@ android:id="@+id/search_bar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?attr/colorSurface" android:layout_marginHorizontal="16dp" android:hint="@string/search_rss_source" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_my_config.xml b/app/src/main/res/layout/fragment_my_config.xml index bfeb27a1d..1a5be0fca 100644 --- a/app/src/main/res/layout/fragment_my_config.xml +++ b/app/src/main/res/layout/fragment_my_config.xml @@ -17,6 +17,8 @@ style="?attr/collapsingToolbarLayoutLargeSize" app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge" app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge" + app:contentScrim="?attr/colorSurface" + app:titleCollapseMode="scale" app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> + + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 592f36f79..b6bb9b0fa 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -74,7 +74,6 @@ true true @style/Widget.App.TabLayout - @style/CollapsingToolbar - -