Horis 1 год назад
Родитель
Сommit
5600dba44d

+ 2 - 2
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

+ 3 - 3
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

+ 2 - 2
app/src/main/java/io/legado/app/model/recyclerView/MangaContent.kt → 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 = "",//章节名称
 )

+ 1 - 1
app/src/main/java/io/legado/app/model/recyclerView/ReaderLoading.kt → 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,

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/manga/rv/GestureDetectorWithLongTap.kt → 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

+ 3 - 4
app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt → 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
 

+ 3 - 5
app/src/main/java/io/legado/app/model/recyclerView/MangaVH.kt → 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<VB : ViewBinding>(val binding: VB, private val context: Conte
                     mRetry?.isVisible = true
                     mProgress.isGone = true
                     itemView.updateLayoutParams<ViewGroup.LayoutParams> {
-                        height = MATCH_PARENT
+                        height = ViewGroup.LayoutParams.MATCH_PARENT
                     }
                     return false
                 }
@@ -97,7 +95,7 @@ open class MangaVH<VB : ViewBinding>(val binding: VB, private val context: Conte
                     mFlProgress.isGone = true
                     if (!isHorizontal) {
                         itemView.updateLayoutParams<ViewGroup.LayoutParams> {
-                            height = WRAP_CONTENT
+                            height = ViewGroup.LayoutParams.WRAP_CONTENT
                         }
                     } else {
                         mImage.updateLayoutParams<FrameLayout.LayoutParams> {

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonFrame.kt → 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

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt → 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

+ 3 - 3
app/src/main/res/layout/activity_manga.xml

@@ -5,17 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <io.legado.app.ui.book.manga.rv.WebtoonFrame
+    <io.legado.app.ui.book.manga.recyclerview.WebtoonFrame
         android:id="@+id/webtoonFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <io.legado.app.ui.book.manga.rv.WebtoonRecyclerView
+        <io.legado.app.ui.book.manga.recyclerview.WebtoonRecyclerView
             android:id="@+id/mRecyclerManga"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </io.legado.app.ui.book.manga.rv.WebtoonFrame>
+    </io.legado.app.ui.book.manga.recyclerview.WebtoonFrame>
 
     <io.legado.app.ui.widget.ReaderInfoBarView
         android:id="@+id/infobar"