diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryApiInfo.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryApiInfo.kt index 642566995..de08cdc6b 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryApiInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryApiInfo.kt @@ -13,86 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer.client.data -package com.hippo.ehviewer.client.data; +import android.os.Parcelable +import kotlinx.parcelize.Parcelize -import android.os.Parcel; -import android.os.Parcelable; - -import androidx.annotation.Nullable; - -public class GalleryApiInfo implements Parcelable { - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public GalleryApiInfo createFromParcel(Parcel source) { - return new GalleryApiInfo(source); - } - - @Override - public GalleryApiInfo[] newArray(int size) { - return new GalleryApiInfo[size]; - } - }; - public long gid; - public String token; - public String archiverKey; - public String title; - public String titleJpn; - public int category; - public String thumb; - public String uploader; - public long posted; - public int filecount; - public long filesize; - public boolean expunged; - public float rating; - public int torrentcount; - @Nullable - public String[] tags; - - public GalleryApiInfo() { - } - - protected GalleryApiInfo(Parcel in) { - this.gid = in.readLong(); - this.token = in.readString(); - this.archiverKey = in.readString(); - this.title = in.readString(); - this.titleJpn = in.readString(); - this.category = in.readInt(); - this.thumb = in.readString(); - this.uploader = in.readString(); - this.posted = in.readLong(); - this.filecount = in.readInt(); - this.filesize = in.readLong(); - this.expunged = in.readByte() != 0; - this.rating = in.readFloat(); - this.torrentcount = in.readInt(); - this.tags = in.createStringArray(); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeLong(this.gid); - dest.writeString(this.token); - dest.writeString(this.archiverKey); - dest.writeString(this.title); - dest.writeString(this.titleJpn); - dest.writeInt(this.category); - dest.writeString(this.thumb); - dest.writeString(this.uploader); - dest.writeLong(this.posted); - dest.writeInt(this.filecount); - dest.writeLong(this.filesize); - dest.writeByte(expunged ? (byte) 1 : (byte) 0); - dest.writeFloat(this.rating); - dest.writeInt(this.torrentcount); - dest.writeStringArray(this.tags); - } -} +@Parcelize +class GalleryApiInfo( + var gid: Long = 0, + var token: String? = null, + var archiverKey: String? = null, + var title: String? = null, + var titleJpn: String? = null, + var category: Int = 0, + var thumb: String? = null, + var uploader: String? = null, + var posted: Long = 0, + var filecount: Int = 0, + var filesize: Long = 0, + var expunged: Boolean = false, + var rating: Float = 0f, + var torrentcount: Int = 0, + var tags: Array? +) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.kt index da4267b03..a5ead75fa 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.kt @@ -13,78 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer.client.data -package com.hippo.ehviewer.client.data; +import android.os.Parcelable +import kotlinx.parcelize.Parcelize -import android.os.Parcel; -import android.os.Parcelable; - -public class GalleryComment implements Parcelable { - - public static final Creator CREATOR = new Creator() { - @Override - public GalleryComment createFromParcel(Parcel source) { - return new GalleryComment(source); - } - - @Override - public GalleryComment[] newArray(int size) { - return new GalleryComment[size]; - } - }; +@Parcelize +class GalleryComment( // 0 for uploader comment. can't vote - public long id; - public int score; - public boolean editable; - public boolean voteUpAble; - public boolean voteUpEd; - public boolean voteDownAble; - public boolean voteDownEd; - public boolean uploader; - public String voteState; - public long time; - public String user; - public String comment; - public long lastEdited; - - public GalleryComment() { - } - - protected GalleryComment(Parcel in) { - this.id = in.readLong(); - this.score = in.readInt(); - this.editable = in.readByte() != 0; - this.voteUpAble = in.readByte() != 0; - this.voteUpEd = in.readByte() != 0; - this.voteDownAble = in.readByte() != 0; - this.voteDownEd = in.readByte() != 0; - this.uploader = in.readByte() != 0; - this.voteState = in.readString(); - this.time = in.readLong(); - this.user = in.readString(); - this.comment = in.readString(); - this.lastEdited = in.readLong(); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeLong(this.id); - dest.writeInt(this.score); - dest.writeByte(editable ? (byte) 1 : (byte) 0); - dest.writeByte(voteUpAble ? (byte) 1 : (byte) 0); - dest.writeByte(voteUpEd ? (byte) 1 : (byte) 0); - dest.writeByte(voteDownAble ? (byte) 1 : (byte) 0); - dest.writeByte(voteDownEd ? (byte) 1 : (byte) 0); - dest.writeByte(uploader ? (byte) 1 : (byte) 0); - dest.writeString(this.voteState); - dest.writeLong(this.time); - dest.writeString(this.user); - dest.writeString(this.comment); - dest.writeLong(this.lastEdited); - } -} + @JvmField + var id: Long = 0, + @JvmField + var score: Int = 0, + @JvmField + var editable: Boolean = false, + @JvmField + var voteUpAble: Boolean = false, + @JvmField + var voteUpEd: Boolean = false, + @JvmField + var voteDownAble: Boolean = false, + @JvmField + var voteDownEd: Boolean = false, + @JvmField + var uploader: Boolean = false, + @JvmField + var voteState: String? = null, + @JvmField + var time: Long = 0, + @JvmField + var user: String? = null, + @JvmField + var comment: String? = null, + @JvmField + var lastEdited: Long = 0 +) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryCommentList.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryCommentList.kt index b4f51907f..4d9835d76 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryCommentList.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryCommentList.kt @@ -13,53 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer.client.data -package com.hippo.ehviewer.client.data; +import android.os.Parcelable +import kotlinx.parcelize.Parcelize -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.Arrays; - -public class GalleryCommentList implements Parcelable { - - public static final Creator CREATOR = new Creator() { - @Override - public GalleryCommentList createFromParcel(Parcel in) { - return new GalleryCommentList(in); - } - - @Override - public GalleryCommentList[] newArray(int size) { - return new GalleryCommentList[size]; - } - }; - public GalleryComment[] comments; - public boolean hasMore; - - public GalleryCommentList(GalleryComment[] comments, boolean hasMore) { - this.comments = comments; - this.hasMore = hasMore; - } - - protected GalleryCommentList(Parcel in) { - Parcelable[] array = in.readParcelableArray(getClass().getClassLoader()); - if (array != null) { - comments = Arrays.copyOf(array, array.length, GalleryComment[].class); - } else { - comments = null; - } - hasMore = in.readByte() != 0; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeParcelableArray(comments, flags); - dest.writeByte(hasMore ? (byte) 1 : (byte) 0); - } -} +@Parcelize +class GalleryCommentList( + @JvmField + var comments: Array?, + @JvmField + var hasMore: Boolean +) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt index b4fafee7f..ee8a6b039 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt @@ -13,71 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer.client.data -package com.hippo.ehviewer.client.data; +import android.os.Parcelable +import com.hippo.widget.LoadImageView +import kotlinx.parcelize.Parcelize -import android.os.Parcel; -import android.os.Parcelable; - -import com.hippo.widget.LoadImageView; - -public class GalleryPreview implements Parcelable { - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public GalleryPreview createFromParcel(Parcel source) { - return new GalleryPreview(source); - } - - @Override - public GalleryPreview[] newArray(int size) { - return new GalleryPreview[size]; - } - }; - String imageKey; - String imageUrl; - String pageUrl; - int position; - int offsetX = Integer.MIN_VALUE; - int offsetY = Integer.MIN_VALUE; - int clipWidth = Integer.MIN_VALUE; - int clipHeight = Integer.MIN_VALUE; - - public GalleryPreview() { +@Parcelize +class GalleryPreview( + @JvmField + var imageKey: String? = null, + @JvmField + var imageUrl: String? = null, + @JvmField + var pageUrl: String? = null, + @JvmField + var position: Int = 0, + @JvmField + var offsetX: Int = Int.MIN_VALUE, + @JvmField + var offsetY: Int = Int.MIN_VALUE, + @JvmField + var clipWidth: Int = Int.MIN_VALUE, + @JvmField + var clipHeight: Int = Int.MIN_VALUE, +) : Parcelable { + fun load(view: LoadImageView) { + view.setClip(offsetX, offsetY, clipWidth, clipHeight) + view.load(imageKey!!, imageUrl!!) } - - protected GalleryPreview(Parcel in) { - this.imageUrl = in.readString(); - this.pageUrl = in.readString(); - this.position = in.readInt(); - this.offsetX = in.readInt(); - this.offsetY = in.readInt(); - this.clipWidth = in.readInt(); - this.clipHeight = in.readInt(); - } - - public int getPosition() { - return position; - } - - public void load(LoadImageView view) { - view.setClip(offsetX, offsetY, clipWidth, clipHeight); - view.load(imageKey, imageUrl); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(this.imageUrl); - dest.writeString(this.pageUrl); - dest.writeInt(this.position); - dest.writeInt(this.offsetX); - dest.writeInt(this.offsetY); - dest.writeInt(this.clipWidth); - dest.writeInt(this.clipHeight); - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryTagGroup.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryTagGroup.kt index 7fdf36c13..3891a8112 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryTagGroup.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryTagGroup.kt @@ -13,60 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer.client.data -package com.hippo.ehviewer.client.data; +import android.os.Parcelable +import kotlinx.parcelize.Parcelize -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.ArrayList; - -// TODO Add url field? -public class GalleryTagGroup implements Parcelable { - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public GalleryTagGroup createFromParcel(Parcel source) { - return new GalleryTagGroup(source); - } - - @Override - public GalleryTagGroup[] newArray(int size) { - return new GalleryTagGroup[size]; - } - }; - private final ArrayList mTagList; - public String groupName; - - public GalleryTagGroup() { - mTagList = new ArrayList<>(); +@Parcelize +class GalleryTagGroup( + private val mTagList: ArrayList = arrayListOf(), + @JvmField + var groupName: String? = null +) : Parcelable { + fun addTag(tag: String) { + mTagList.add(tag) } - protected GalleryTagGroup(Parcel in) { - this.groupName = in.readString(); - this.mTagList = in.createStringArrayList(); + fun size(): Int { + return mTagList.size } - public void addTag(String tag) { - mTagList.add(tag); + fun getTagAt(position: Int): String { + return mTagList[position] } - - public int size() { - return mTagList.size(); - } - - public String getTagAt(int position) { - return mTagList.get(position); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(this.groupName); - dest.writeStringList(this.mTagList); - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/LargePreviewSet.kt b/app/src/main/java/com/hippo/ehviewer/client/data/LargePreviewSet.kt index b2b1d7fb0..506a84642 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/LargePreviewSet.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/LargePreviewSet.kt @@ -13,94 +13,52 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer.client.data -package com.hippo.ehviewer.client.data; +import com.hippo.ehviewer.client.EhCacheKeyFactory +import com.hippo.widget.LoadImageView +import com.hippo.yorozuya.collect.IntList +import kotlinx.parcelize.Parcelize -import android.os.Parcel; -import android.os.Parcelable; +@Parcelize +class LargePreviewSet( + private val mPositionList: IntList = IntList(), + private val mImageUrlList: ArrayList = ArrayList(), + private val mPageUrlList: ArrayList = ArrayList() +) : PreviewSet() { -import com.hippo.ehviewer.client.EhCacheKeyFactory; -import com.hippo.widget.LoadImageView; -import com.hippo.yorozuya.collect.IntList; - -import java.util.ArrayList; - -public class LargePreviewSet extends PreviewSet { - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - @Override - public LargePreviewSet createFromParcel(Parcel source) { - return new LargePreviewSet(source); - } - - @Override - public LargePreviewSet[] newArray(int size) { - return new LargePreviewSet[size]; - } - }; - private final IntList mPositionList; - private final ArrayList mImageUrlList; - private final ArrayList mPageUrlList; - - public LargePreviewSet() { - mPositionList = new IntList(); - mImageUrlList = new ArrayList<>(); - mPageUrlList = new ArrayList<>(); + fun addItem(index: Int, imageUrl: String, pageUrl: String) { + mPositionList.add(index) + mImageUrlList.add(imageUrl) + mPageUrlList.add(pageUrl) } - protected LargePreviewSet(Parcel in) { - this.mPositionList = in.readParcelable(IntList.class.getClassLoader()); - this.mImageUrlList = in.createStringArrayList(); - this.mPageUrlList = in.createStringArrayList(); + override fun size(): Int { + return mImageUrlList.size } - public void addItem(int index, String imageUrl, String pageUrl) { - mPositionList.add(index); - mImageUrlList.add(imageUrl); - mPageUrlList.add(pageUrl); + override fun getPosition(index: Int): Int { + return mPositionList[index] } - @Override - public int size() { - return mImageUrlList.size(); + override fun getPageUrlAt(index: Int): String { + return mPageUrlList[index] } - @Override - public int getPosition(int index) { - return mPositionList.get(index); + override fun getGalleryPreview(gid: Long, index: Int): GalleryPreview { + val galleryPreview = GalleryPreview() + galleryPreview.position = mPositionList[index] + galleryPreview.imageKey = EhCacheKeyFactory.getLargePreviewKey(gid, galleryPreview.position) + galleryPreview.imageUrl = mImageUrlList[index] + galleryPreview.pageUrl = mPageUrlList[index] + return galleryPreview } - @Override - public String getPageUrlAt(int index) { - return mPageUrlList.get(index); + override fun load(view: LoadImageView, gid: Long, index: Int) { + view.resetClip() + view.load( + EhCacheKeyFactory.getLargePreviewKey(gid, mPositionList[index]), + mImageUrlList[index] + ) } - - @Override - public GalleryPreview getGalleryPreview(long gid, int index) { - GalleryPreview galleryPreview = new GalleryPreview(); - galleryPreview.position = mPositionList.get(index); - galleryPreview.imageKey = EhCacheKeyFactory.getLargePreviewKey(gid, galleryPreview.position); - galleryPreview.imageUrl = mImageUrlList.get(index); - galleryPreview.pageUrl = mPageUrlList.get(index); - return galleryPreview; - } - - @Override - public void load(LoadImageView view, long gid, int index) { - view.resetClip(); - view.load(EhCacheKeyFactory.getLargePreviewKey(gid, mPositionList.get(index)), - mImageUrlList.get(index)); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeParcelable(this.mPositionList, flags); - dest.writeStringList(this.mImageUrlList); - dest.writeStringList(this.mPageUrlList); - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/NormalPreviewSet.kt b/app/src/main/java/com/hippo/ehviewer/client/data/NormalPreviewSet.kt index de4962209..fa60dcddb 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/NormalPreviewSet.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/NormalPreviewSet.kt @@ -13,123 +13,77 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.hippo.ehviewer.client.data -package com.hippo.ehviewer.client.data; +import com.hippo.widget.LoadImageView +import com.hippo.yorozuya.collect.IntList +import kotlinx.parcelize.Parcelize -import android.os.Parcel; +@Parcelize +class NormalPreviewSet( + private var mPositionList: IntList = IntList(), + private var mImageKeyList: ArrayList = ArrayList(), + private var mImageUrlList: ArrayList = ArrayList(), + private var mOffsetXList: IntList = IntList(), + private var mOffsetYList: IntList = IntList(), + private var mClipWidthList: IntList = IntList(), + private var mClipHeightList: IntList = IntList(), + private var mPageUrlList: ArrayList = ArrayList() +) : PreviewSet() { -import com.hippo.widget.LoadImageView; -import com.hippo.yorozuya.collect.IntList; - -import java.util.ArrayList; - -public class NormalPreviewSet extends PreviewSet { - - public static final Creator CREATOR = new Creator() { - @Override - public NormalPreviewSet createFromParcel(Parcel source) { - return new NormalPreviewSet(source); - } - - @Override - public NormalPreviewSet[] newArray(int size) { - return new NormalPreviewSet[size]; - } - }; - private IntList mPositionList = new IntList(); - private ArrayList mImageKeyList = new ArrayList<>(); - private ArrayList mImageUrlList = new ArrayList<>(); - private IntList mOffsetXList = new IntList(); - private IntList mOffsetYList = new IntList(); - private IntList mClipWidthList = new IntList(); - private IntList mClipHeightList = new IntList(); - private ArrayList mPageUrlList = new ArrayList<>(); - - public NormalPreviewSet() { - } - - protected NormalPreviewSet(Parcel in) { - this.mPositionList = in.readParcelable(IntList.class.getClassLoader()); - this.mImageKeyList = in.createStringArrayList(); - this.mImageUrlList = in.createStringArrayList(); - this.mOffsetXList = in.readParcelable(IntList.class.getClassLoader()); - this.mOffsetYList = in.readParcelable(IntList.class.getClassLoader()); - this.mClipWidthList = in.readParcelable(IntList.class.getClassLoader()); - this.mClipHeightList = in.readParcelable(IntList.class.getClassLoader()); - this.mPageUrlList = in.createStringArrayList(); - } - - private String getImageKey(String imageUrl) { - int index = imageUrl.indexOf('/'); - if (index >= 0) { - return imageUrl.substring(index + 1); + private fun getImageKey(imageUrl: String): String { + val index = imageUrl.indexOf('/') + return if (index >= 0) { + imageUrl.substring(index + 1) } else { - return imageUrl; + imageUrl } } - public void addItem(int position, String imageUrl, int xOffset, int yOffset, int width, - int height, String pageUrl) { - mPositionList.add(position); - mImageKeyList.add(getImageKey(imageUrl)); - mImageUrlList.add(imageUrl); - mOffsetXList.add(xOffset); - mOffsetYList.add(yOffset); - mClipWidthList.add(width); - mClipHeightList.add(height); - mPageUrlList.add(pageUrl); + fun addItem( + position: Int, imageUrl: String, xOffset: Int, yOffset: Int, width: Int, + height: Int, pageUrl: String + ) { + mPositionList.add(position) + mImageKeyList.add(getImageKey(imageUrl)) + mImageUrlList.add(imageUrl) + mOffsetXList.add(xOffset) + mOffsetYList.add(yOffset) + mClipWidthList.add(width) + mClipHeightList.add(height) + mPageUrlList.add(pageUrl) } - @Override - public int size() { - return mPositionList.size(); + override fun size(): Int { + return mPositionList.size() } - @Override - public int getPosition(int index) { - return mPositionList.get(index); + override fun getPosition(index: Int): Int { + return mPositionList[index] } - @Override - public String getPageUrlAt(int index) { - return mPageUrlList.get(index); + override fun getPageUrlAt(index: Int): String { + return mPageUrlList[index] } - @Override - public GalleryPreview getGalleryPreview(long gid, int index) { - GalleryPreview galleryPreview = new GalleryPreview(); - galleryPreview.position = mPositionList.get(index); - galleryPreview.imageKey = mImageKeyList.get(index); - galleryPreview.imageUrl = mImageUrlList.get(index); - galleryPreview.pageUrl = mPageUrlList.get(index); - galleryPreview.offsetX = mOffsetXList.get(index); - galleryPreview.offsetY = mOffsetYList.get(index); - galleryPreview.clipWidth = mClipWidthList.get(index); - galleryPreview.clipHeight = mClipHeightList.get(index); - return galleryPreview; + override fun getGalleryPreview(gid: Long, index: Int): GalleryPreview { + val galleryPreview = GalleryPreview() + galleryPreview.position = mPositionList[index] + galleryPreview.imageKey = mImageKeyList[index] + galleryPreview.imageUrl = mImageUrlList[index] + galleryPreview.pageUrl = mPageUrlList[index] + galleryPreview.offsetX = mOffsetXList[index] + galleryPreview.offsetY = mOffsetYList[index] + galleryPreview.clipWidth = mClipWidthList[index] + galleryPreview.clipHeight = mClipHeightList[index] + return galleryPreview } - @Override - public void load(LoadImageView view, long gid, int index) { - view.setClip(mOffsetXList.get(index), mOffsetYList.get(index), - mClipWidthList.get(index), mClipHeightList.get(index)); - view.load(mImageKeyList.get(index), mImageUrlList.get(index)); + override fun load(view: LoadImageView, gid: Long, index: Int) { + view.setClip( + mOffsetXList[index], mOffsetYList[index], + mClipWidthList[index], mClipHeightList[index] + ) + view.load(mImageKeyList[index], mImageUrlList[index]) } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeParcelable(this.mPositionList, flags); - dest.writeStringList(this.mImageKeyList); - dest.writeStringList(this.mImageUrlList); - dest.writeParcelable(this.mOffsetXList, flags); - dest.writeParcelable(this.mOffsetYList, flags); - dest.writeParcelable(this.mClipWidthList, flags); - dest.writeParcelable(this.mClipHeightList, flags); - dest.writeStringList(this.mPageUrlList); - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java index f7ef251e6..928955e1d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java @@ -226,7 +226,7 @@ public class GalleryPreviewsScene extends BaseToolbarScene { Intent intent = new Intent(context, ReaderActivity.class); intent.setAction(ReaderActivity.ACTION_EH); intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, mGalleryInfo); - intent.putExtra(ReaderActivity.KEY_PAGE, p.getPosition()); + intent.putExtra(ReaderActivity.KEY_PAGE, p.position); startActivity(intent); } } @@ -323,7 +323,7 @@ public class GalleryPreviewsScene extends BaseToolbarScene { GalleryPreview preview = mHelper.getDataAtEx(position); if (preview != null) { preview.load(holder.image); - holder.text.setText(Integer.toString(preview.getPosition() + 1)); + holder.text.setText(Integer.toString(preview.position + 1)); } } holder.itemView.setOnClickListener(v -> onItemClick(position));