From c3835b8a65b942e5c17037334a55e225300e00a0 Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 20 Jun 2023 19:43:42 +0800 Subject: [PATCH] Drop unused field in GalleryInfo --- .../hippo/ehviewer/client/data/AbstractGalleryInfo.kt | 3 --- .../com/hippo/ehviewer/client/data/BaseGalleryInfo.kt | 9 --------- app/src/main/rust/src/parser/list.rs | 6 ------ 3 files changed, 18 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt index cba9dd666..1db663c99 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt @@ -16,9 +16,6 @@ interface AbstractGalleryInfo { var pages: Int var thumbWidth: Int var thumbHeight: Int - var spanSize: Int - var spanIndex: Int - var spanGroupIndex: Int var simpleLanguage: String? var favoriteSlot: Int var favoriteName: String? diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt index c420613ad..ee4d2b199 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt @@ -68,15 +68,6 @@ open class BaseGalleryInfo( @Ignore override var thumbHeight: Int = 0, - @Ignore - override var spanSize: Int = 0, - - @Ignore - override var spanIndex: Int = 0, - - @Ignore - override var spanGroupIndex: Int = 0, - @ColumnInfo(name = "SIMPLE_LANGUAGE") override var simpleLanguage: String? = null, diff --git a/app/src/main/rust/src/parser/list.rs b/app/src/main/rust/src/parser/list.rs index 414e0aa81..ec1b0b013 100644 --- a/app/src/main/rust/src/parser/list.rs +++ b/app/src/main/rust/src/parser/list.rs @@ -31,9 +31,6 @@ pub struct BaseGalleryInfo { pages: i32, thumbWidth: i32, thumbHeight: i32, - spanSize: i32, - spanIndex: i32, - spanGroupIndex: i32, simpleLanguage: String, favoriteSlot: i32, favoriteName: Option, @@ -149,9 +146,6 @@ pub fn parseGalleryInfo(env: JNIEnv, _class: JClass, input: JString) -> jobject pages: 0, thumbWidth: 0, thumbHeight: 0, - spanSize: 0, - spanIndex: 0, - spanGroupIndex: 0, simpleLanguage: "".to_string(), favoriteSlot: 0, favoriteName: None,