From c3a696c9fbb7449fc87164650a59ac9b22b6b2a1 Mon Sep 17 00:00:00 2001 From: Horis <8674809+821938089@users.noreply.github.com> Date: Thu, 6 Mar 2025 14:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/model/ReadManga.kt | 4 ++-- .../java/io/legado/app/ui/book/manga/ReadMangaActivity.kt | 6 +++--- .../book/manga/entities}/MangaContent.kt | 4 ++-- .../book/manga/entities}/ReaderLoading.kt | 2 +- .../{rv => recyclerview}/GestureDetectorWithLongTap.kt | 2 +- .../ui/book/manga/{rv => recyclerview}/MangaAdapter.kt | 7 +++---- .../book/manga/recyclerview}/MangaVH.kt | 8 +++----- .../ui/book/manga/{rv => recyclerview}/WebtoonFrame.kt | 2 +- .../manga/{rv => recyclerview}/WebtoonRecyclerView.kt | 2 +- app/src/main/res/layout/activity_manga.xml | 6 +++--- 10 files changed, 20 insertions(+), 23 deletions(-) rename app/src/main/java/io/legado/app/{model/recyclerView => ui/book/manga/entities}/MangaContent.kt (77%) rename app/src/main/java/io/legado/app/{model/recyclerView => ui/book/manga/entities}/ReaderLoading.kt (78%) rename app/src/main/java/io/legado/app/ui/book/manga/{rv => recyclerview}/GestureDetectorWithLongTap.kt (97%) rename app/src/main/java/io/legado/app/ui/book/manga/{rv => recyclerview}/MangaAdapter.kt (97%) rename app/src/main/java/io/legado/app/{model/recyclerView => ui/book/manga/recyclerview}/MangaVH.kt (94%) rename app/src/main/java/io/legado/app/ui/book/manga/{rv => recyclerview}/WebtoonFrame.kt (98%) rename app/src/main/java/io/legado/app/ui/book/manga/{rv => recyclerview}/WebtoonRecyclerView.kt (99%) diff --git a/app/src/main/java/io/legado/app/model/ReadManga.kt b/app/src/main/java/io/legado/app/model/ReadManga.kt index ec9aa00c1..52d4dc4eb 100644 --- a/app/src/main/java/io/legado/app/model/ReadManga.kt +++ b/app/src/main/java/io/legado/app/model/ReadManga.kt @@ -19,8 +19,8 @@ import io.legado.app.help.book.update import io.legado.app.help.config.AppConfig import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.globalExecutor -import io.legado.app.model.recyclerView.MangaContent -import io.legado.app.model.recyclerView.ReaderLoading +import io.legado.app.ui.book.manga.entities.MangaContent +import io.legado.app.ui.book.manga.entities.ReaderLoading import io.legado.app.model.webBook.WebBook import io.legado.app.utils.NetworkUtils import io.legado.app.utils.mapIndexed diff --git a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt index 698f3102f..db4d3cbb9 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt @@ -39,14 +39,14 @@ import io.legado.app.help.config.AppConfig import io.legado.app.help.storage.Backup import io.legado.app.lib.dialogs.alert import io.legado.app.model.ReadManga -import io.legado.app.model.recyclerView.MangaContent -import io.legado.app.model.recyclerView.ReaderLoading +import io.legado.app.ui.book.manga.entities.MangaContent +import io.legado.app.ui.book.manga.entities.ReaderLoading import io.legado.app.receiver.NetworkChangedListener import io.legado.app.ui.book.changesource.ChangeBookSourceDialog import io.legado.app.ui.book.info.BookInfoActivity import io.legado.app.ui.book.manga.config.MangaFooterConfig import io.legado.app.ui.book.manga.config.MangaFooterSettingDialog -import io.legado.app.ui.book.manga.rv.MangaAdapter +import io.legado.app.ui.book.manga.recyclerview.MangaAdapter import io.legado.app.ui.book.read.MangaMenu import io.legado.app.ui.book.read.ReadBookActivity.Companion.RESULT_DELETED import io.legado.app.ui.book.toc.TocActivityResult diff --git a/app/src/main/java/io/legado/app/model/recyclerView/MangaContent.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContent.kt similarity index 77% rename from app/src/main/java/io/legado/app/model/recyclerView/MangaContent.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContent.kt index 151fa3ec8..464ad1bff 100644 --- a/app/src/main/java/io/legado/app/model/recyclerView/MangaContent.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContent.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.recyclerView +package io.legado.app.ui.book.manga.entities data class MangaContent( @@ -8,5 +8,5 @@ data class MangaContent( val mImageUrl: String = "",//当前URL var mDurChapterPos: Int = 0,//当前章节位置 var mDurChapterCount: Int = 0,//当前章节内容总数 - var mChapterName:String="",//章节名称 + var mChapterName: String = "",//章节名称 ) \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/model/recyclerView/ReaderLoading.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/ReaderLoading.kt similarity index 78% rename from app/src/main/java/io/legado/app/model/recyclerView/ReaderLoading.kt rename to app/src/main/java/io/legado/app/ui/book/manga/entities/ReaderLoading.kt index 6bc12d442..0baba90a4 100644 --- a/app/src/main/java/io/legado/app/model/recyclerView/ReaderLoading.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/entities/ReaderLoading.kt @@ -1,4 +1,4 @@ -package io.legado.app.model.recyclerView +package io.legado.app.ui.book.manga.entities data class ReaderLoading( val mChapterIndex: Int = 0, diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/GestureDetectorWithLongTap.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt similarity index 97% rename from app/src/main/java/io/legado/app/ui/book/manga/rv/GestureDetectorWithLongTap.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt index cc5397d47..8d07390dc 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/GestureDetectorWithLongTap.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/GestureDetectorWithLongTap.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.manga.rv +package io.legado.app.ui.book.manga.recyclerview import android.content.Context import android.os.Handler diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt similarity index 97% rename from app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt index c0d4a22ae..3a67e97af 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaAdapter.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.manga.rv +package io.legado.app.ui.book.manga.recyclerview import android.content.Context import android.util.SparseArray @@ -22,9 +22,8 @@ import io.legado.app.databinding.BookComicRvBinding import io.legado.app.help.glide.progress.ProgressManager import io.legado.app.model.BookCover import io.legado.app.model.ReadManga -import io.legado.app.model.recyclerView.MangaContent -import io.legado.app.model.recyclerView.MangaVH -import io.legado.app.model.recyclerView.ReaderLoading +import io.legado.app.ui.book.manga.entities.MangaContent +import io.legado.app.ui.book.manga.entities.ReaderLoading import io.legado.app.utils.getCompatDrawable import java.util.Collections diff --git a/app/src/main/java/io/legado/app/model/recyclerView/MangaVH.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaVH.kt similarity index 94% rename from app/src/main/java/io/legado/app/model/recyclerView/MangaVH.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaVH.kt index 4b1919f32..067830aea 100644 --- a/app/src/main/java/io/legado/app/model/recyclerView/MangaVH.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/MangaVH.kt @@ -1,12 +1,10 @@ -package io.legado.app.model.recyclerView +package io.legado.app.ui.book.manga.recyclerview import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.Drawable import android.view.Gravity import android.view.ViewGroup -import android.view.ViewGroup.LayoutParams.MATCH_PARENT -import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import android.widget.Button import android.widget.FrameLayout import android.widget.ProgressBar @@ -82,7 +80,7 @@ open class MangaVH(val binding: VB, private val context: Conte mRetry?.isVisible = true mProgress.isGone = true itemView.updateLayoutParams { - height = MATCH_PARENT + height = ViewGroup.LayoutParams.MATCH_PARENT } return false } @@ -97,7 +95,7 @@ open class MangaVH(val binding: VB, private val context: Conte mFlProgress.isGone = true if (!isHorizontal) { itemView.updateLayoutParams { - height = WRAP_CONTENT + height = ViewGroup.LayoutParams.WRAP_CONTENT } } else { mImage.updateLayoutParams { diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonFrame.kt similarity index 98% rename from app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonFrame.kt index 9ef050cf6..f373bc781 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonFrame.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.manga.rv +package io.legado.app.ui.book.manga.recyclerview import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonRecyclerView.kt similarity index 99% rename from app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt rename to app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonRecyclerView.kt index ffdfd0b42..f70479cf6 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/WebtoonRecyclerView.kt @@ -1,4 +1,4 @@ -package io.legado.app.ui.book.manga.rv +package io.legado.app.ui.book.manga.recyclerview import android.animation.AnimatorSet import android.animation.ValueAnimator diff --git a/app/src/main/res/layout/activity_manga.xml b/app/src/main/res/layout/activity_manga.xml index b81c9a38f..864dc723d 100644 --- a/app/src/main/res/layout/activity_manga.xml +++ b/app/src/main/res/layout/activity_manga.xml @@ -5,17 +5,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - +