diff --git a/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt index 4c302b9ec..d529ac105 100644 --- a/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt @@ -85,10 +85,9 @@ class ImportBookActivity : BaseImportBookActivity(), override fun onMenuItemClick(item: MenuItem?): Boolean { when (item?.itemId) { - R.id.menu_del_selection -> - viewModel.deleteDoc(adapter.selectedUris) { - adapter.removeSelection() - } + R.id.menu_del_selection -> viewModel.deleteDoc(adapter.selectedUris) { + adapter.removeSelection() + } } return false } diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 4efad59ca..f68411af8 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -115,7 +115,6 @@ class BookInfoActivity : binding.refreshLayout?.setColorSchemeColors(accentColor) binding.arcView.setBgColor(backgroundColor) binding.llInfo.setBackgroundColor(backgroundColor) - binding.scrollView.setBackgroundColor(backgroundColor) binding.flAction.setBackgroundColor(bottomBackground) binding.tvShelf.setTextColor(getPrimaryTextColor(ColorUtils.isColorLight(bottomBackground))) binding.tvToc.text = getString(R.string.toc_s, getString(R.string.loading)) @@ -423,9 +422,6 @@ class BookInfoActivity : } } } - scrollView.setOnScrollChangeListener { _, _, scrollY, _, _ -> - refreshLayout?.isEnabled = (scrollY <= 0) - } refreshLayout?.setOnRefreshListener { refreshLayout.isRefreshing = false refreshBook() diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml index a99fab5b2..e983365d3 100644 --- a/app/src/main/res/layout/activity_book_info.xml +++ b/app/src/main/res/layout/activity_book_info.xml @@ -10,395 +10,401 @@ android:id="@+id/bg_book" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="centerCrop" android:contentDescription="@string/bg_image" + android:scaleType="centerCrop" app:layout_constraintTop_toTopOf="parent" /> - + android:layout_height="match_parent" + android:background="#50000000" + android:orientation="vertical"> - + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:themeMode="dark" + app:title="@string/book_info" /> - - - - - - - - - - - - - + + android:focusable="true" + android:padding="0dp" + android:scrollbarStyle="outsideOverlay" + android:scrollbars="vertical"> + android:layout_height="0dp" + android:orientation="vertical"> - + android:layout_marginTop="8dp"> - + android:layout_height="78dp" + android:layout_marginTop="90dp" + app:arcDirectionTop="true" + app:arcHeight="36dp" + app:bgColor="@color/background" /> - + android:layout_centerHorizontal="true" + android:layout_margin="3dp" + app:cardCornerRadius="5dp" + app:cardElevation="8dp"> - + + + + + + android:paddingBottom="8dp"> - - - - - - - - - - + android:text="@string/book_name" + android:textColor="@color/primaryText" + android:textSize="18sp" + tools:ignore="RtlHardcoded" /> - + android:layout_gravity="center" + android:layout_marginBottom="6dp" + android:gravity="center" + android:visibility="gone" /> + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingBottom="8dp"> - - - + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingTop="3dp" + android:paddingBottom="3dp" + tools:ignore="UseCompoundDrawables"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + android:layout_marginTop="8dp" + android:clickable="true" + android:focusable="true" + android:minHeight="48dp" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:text="@string/book_intro" + android:textColor="@color/secondaryText" + android:textSize="14sp" + android:visibility="visible" + tools:ignore="RtlHardcoded,RtlSymmetry" /> - - - + - + - + - + - + - +