diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt index 80a6f5811..e792e9324 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt @@ -23,7 +23,7 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) : item: Book, payloads: MutableList ) = binding.run { - binding.ivCover.transitionName = "book_${item.bookUrl}" + binding.cdCover.transitionName = "book_${item.bookUrl}" if (payloads.isEmpty()) { tvName.text = item.name ivCover.load(item.getDisplayCover(), item.name, item.author, false, item.origin) @@ -66,13 +66,13 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) : binding.cvContent.setOnClickListener { getItem(holder.layoutPosition)?.let { - callBack.open(it, binding.ivCover) + callBack.open(it, binding.cdCover) } } binding.cvContent.setOnLongClickListener { getItem(holder.layoutPosition)?.let { - callBack.openBookInfo(it, binding.ivCover) + callBack.openBookInfo(it, binding.cdCover) } true } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt index dea21bbfe..d85101f19 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCompact.kt @@ -23,7 +23,7 @@ class BooksAdapterGridCompact(context: Context, private val callBack: CallBack) item: Book, payloads: MutableList ) = binding.run { - binding.ivCover.transitionName = "book_${item.bookUrl}" + binding.cvContent.transitionName = "book_${item.bookUrl}" if (payloads.isEmpty()) { tvName.text = item.name ivCover.load(item.getDisplayCover(), item.name, item.author, false, item.origin) @@ -76,13 +76,13 @@ class BooksAdapterGridCompact(context: Context, private val callBack: CallBack) binding.cvContent.setOnClickListener { getItem(holder.layoutPosition)?.let { - callBack.open(it, binding.ivCover) + callBack.open(it, binding.cvContent) } } binding.cvContent.setOnLongClickListener { getItem(holder.layoutPosition)?.let { - callBack.openBookInfo(it, binding.ivCover) + callBack.openBookInfo(it, binding.cvContent) } true } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt index 5c7bb289d..047381b90 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGridCover.kt @@ -24,7 +24,7 @@ class BooksAdapterGridCover(context: Context, private val callBack: CallBack) : item: Book, payloads: MutableList ) = binding.run { - binding.ivCover.transitionName = "book_${item.bookUrl}" + binding.cvContent.transitionName = "book_${item.bookUrl}" if (payloads.isEmpty()) { tvName.gone() ivCover.load(item.getDisplayCover(), item.name, item.author, false, item.origin) @@ -77,13 +77,13 @@ class BooksAdapterGridCover(context: Context, private val callBack: CallBack) : binding.cvContent.setOnClickListener { getItem(holder.layoutPosition)?.let { - callBack.open(it, binding.ivCover) + callBack.open(it, binding.cvContent) } } binding.cvContent.setOnLongClickListener { getItem(holder.layoutPosition)?.let { - callBack.openBookInfo(it, binding.ivCover) + callBack.openBookInfo(it, binding.cvContent) } true } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt index e09b4a363..9579e29f2 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGrid.kt @@ -149,10 +149,10 @@ class BooksAdapterGrid(context: Context, callBack: CallBack) : fun registerListener(item: Any) { binding.cvContent.setOnClickListener { - callBack.onItemClick(item, binding.ivCover) + callBack.onItemClick(item, binding.cdCover) } binding.cvContent.onLongClick { - callBack.onItemLongClick(item, binding.ivCover) + callBack.onItemLongClick(item, binding.cdCover) } } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt index 7c604c8d6..3e4bf4f57 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCompact.kt @@ -99,10 +99,10 @@ class BooksAdapterGridCompact(context: Context, callBack: CallBack) : fun registerListener(item: Any) { binding.cvContent.setOnClickListener { - callBack.onItemClick(item, binding.ivCover) + callBack.onItemClick(item, binding.cvContent) } binding.cvContent.onLongClick { - callBack.onItemLongClick(item, binding.ivCover) + callBack.onItemLongClick(item, binding.cvContent) } } @@ -156,10 +156,10 @@ class BooksAdapterGridCompact(context: Context, callBack: CallBack) : fun registerListener(item: Any) { binding.cvContent.setOnClickListener { - callBack.onItemClick(item, binding.ivCover) + callBack.onItemClick(item, binding.cvContent) } binding.cvContent.onLongClick { - callBack.onItemLongClick(item, binding.ivCover) + callBack.onItemLongClick(item, binding.cvContent) } } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt index 37cca56ca..7fdeb5598 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterGridCover.kt @@ -99,10 +99,10 @@ class BooksAdapterGridCover(context: Context, callBack: CallBack) : fun registerListener(item: Any) { binding.cvContent.setOnClickListener { - callBack.onItemClick(item, binding.ivCover) + callBack.onItemClick(item, binding.cvContent) } binding.cvContent.onLongClick { - callBack.onItemLongClick(item, binding.ivCover) + callBack.onItemLongClick(item, binding.cvContent) } } @@ -156,10 +156,10 @@ class BooksAdapterGridCover(context: Context, callBack: CallBack) : fun registerListener(item: Any) { binding.cvContent.setOnClickListener { - callBack.onItemClick(item, binding.ivCover) + callBack.onItemClick(item, binding.cvContent) } binding.cvContent.onLongClick { - callBack.onItemLongClick(item, binding.ivCover) + callBack.onItemLongClick(item, binding.cvContent) } } diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml index f7beb0567..3cb5ff78c 100644 --- a/app/src/main/res/layout/item_bookshelf_grid.xml +++ b/app/src/main/res/layout/item_bookshelf_grid.xml @@ -25,19 +25,27 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + app:strokeWidth="0dp"> + + + + + app:layout_constraintEnd_toEndOf="@id/cd_cover" + app:layout_constraintStart_toStartOf="@id/cd_cover" + app:layout_constraintTop_toTopOf="@id/cd_cover" /> + app:layout_constraintEnd_toEndOf="@id/cd_cover" + app:layout_constraintTop_toTopOf="@id/cd_cover"> - + app:strokeWidth="0dp"> + + + + + app:layout_constraintEnd_toEndOf="@id/cd_cover" + app:layout_constraintStart_toStartOf="@id/cd_cover" + app:layout_constraintTop_toTopOf="@id/cd_cover" /> + app:layout_constraintEnd_toEndOf="@id/cd_cover" + app:layout_constraintTop_toTopOf="@id/cd_cover"> @@ -98,8 +107,8 @@ android:layout_marginBottom="2dp" android:layout_marginEnd="4dp" android:layout_marginStart="2dp" - app:layout_constraintTop_toTopOf="@id/iv_cover" - app:layout_constraintEnd_toEndOf="@id/iv_cover" + app:layout_constraintEnd_toEndOf="@id/cd_cover" + app:layout_constraintTop_toTopOf="@id/cd_cover" app:layout_constraintStart_toEndOf="@id/iv_cover1" app:layout_constraintBottom_toTopOf="@id/iv_cover4"/> @@ -111,8 +120,8 @@ android:layout_marginStart="4dp" android:layout_marginBottom="4dp" android:layout_marginEnd="2dp" - app:layout_constraintStart_toStartOf="@id/iv_cover" - app:layout_constraintBottom_toBottomOf="@id/iv_cover" + app:layout_constraintBottom_toBottomOf="@id/cd_cover" + app:layout_constraintStart_toStartOf="@id/cd_cover" app:layout_constraintTop_toBottomOf="@id/iv_cover1" app:layout_constraintEnd_toStartOf="@id/iv_cover4"/> @@ -124,8 +133,8 @@ android:layout_marginEnd="4dp" android:layout_marginBottom="4dp" android:layout_marginStart="2dp" - app:layout_constraintBottom_toBottomOf="@id/iv_cover" - app:layout_constraintEnd_toEndOf="@id/iv_cover" + app:layout_constraintBottom_toBottomOf="@id/cd_cover" + app:layout_constraintEnd_toEndOf="@id/cd_cover" app:layout_constraintTop_toBottomOf="@id/iv_cover2" app:layout_constraintStart_toEndOf="@id/iv_cover3"/>