diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt index 286c13b74..62834745e 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt @@ -7,8 +7,6 @@ import io.legado.app.base.adapter.ItemViewHolder import io.legado.app.constant.BookType import io.legado.app.data.entities.Book import io.legado.app.databinding.ItemBookshelfGridBinding -import io.legado.app.lib.theme.backgroundColor -import io.legado.app.utils.ColorUtils import io.legado.app.utils.invisible import splitties.views.onLongClick @@ -27,7 +25,6 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) : ) = with(binding) { val bundle = payloads.getOrNull(0) as? Bundle if (bundle == null) { - root.setBackgroundColor(ColorUtils.withAlpha(context.backgroundColor, 0.5f)) tvName.text = item.name ivCover.load(item.getDisplayCover(), item.name, item.author) upRefresh(binding, item) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt index 95d027042..08281b3b0 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt @@ -7,8 +7,6 @@ import io.legado.app.base.adapter.ItemViewHolder import io.legado.app.constant.BookType import io.legado.app.data.entities.Book import io.legado.app.databinding.ItemBookshelfListBinding -import io.legado.app.lib.theme.backgroundColor -import io.legado.app.utils.ColorUtils import io.legado.app.utils.invisible import splitties.views.onLongClick @@ -27,7 +25,6 @@ class BooksAdapterList(context: Context, private val callBack: CallBack) : ) = with(binding) { val bundle = payloads.getOrNull(0) as? Bundle if (bundle == null) { - root.setBackgroundColor(ColorUtils.withAlpha(context.backgroundColor, 0.5f)) tvName.text = item.name tvAuthor.text = item.author tvRead.text = item.durChapterTitle diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml index 0816a9a83..648d3b85f 100644 --- a/app/src/main/res/layout/item_bookshelf_grid.xml +++ b/app/src/main/res/layout/item_bookshelf_grid.xml @@ -1,67 +1,90 @@ - + android:clickable="true" + android:focusable="true" + tools:ignore="UnusedAttribute"> - + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + app:layout_constraintTop_toTopOf="parent"> - + android:layout_height="wrap_content"> + + + + + + - + + - - + android:lines="2" + android:text="@string/book_name" + android:textColor="@color/primaryText" + android:textSize="12sp" + tools:ignore="RtlHardcoded,RtlSymmetry" /> - + - + android:layout_height="0dp" + android:background="?android:attr/selectableItemBackground" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" + tools:layout_editor_absoluteX="0dp" /> + + - diff --git a/app/src/main/res/layout/item_bookshelf_list.xml b/app/src/main/res/layout/item_bookshelf_list.xml index 5a9fefbd2..00eb4966f 100644 --- a/app/src/main/res/layout/item_bookshelf_list.xml +++ b/app/src/main/res/layout/item_bookshelf_list.xml @@ -167,13 +167,4 @@ app:layout_constraintVertical_bias="0.0" tools:layout_editor_absoluteX="0dp" /> - - - \ No newline at end of file