From af7cc116474664bf05e80ec2f64e778a54fba103 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 6 Jan 2023 11:04:18 +0800
Subject: [PATCH] Extract properties to a standalone AbstractGalleryInfo

---
 .../client/data/AbstractGalleryInfo.kt        | 25 +++++++++++++++++++
 .../hippo/ehviewer/client/data/GalleryInfo.kt | 24 +-----------------
 2 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt

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
new file mode 100644
index 000000000..960c5a674
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt
@@ -0,0 +1,25 @@
+package com.hippo.ehviewer.client.data
+
+interface AbstractGalleryInfo {
+    var gid: Long
+    var token: String?
+    var title: String?
+    var titleJpn: String?
+    var thumb: String?
+    var category: Int
+    var posted: String?
+    var uploader: String?
+    var disowned: Boolean
+    var rating: Float
+    var rated: Boolean
+    var simpleTags: Array<String>?
+    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?
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt
index 410ab35d4..d74018ab4 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt
@@ -18,29 +18,7 @@ package com.hippo.ehviewer.client.data
 import android.os.Parcelable
 import java.util.regex.Pattern
 
-interface GalleryInfo : Parcelable {
-    var gid: Long
-    var token: String?
-    var title: String?
-    var titleJpn: String?
-    var thumb: String?
-    var category: Int
-    var posted: String?
-    var uploader: String?
-    var disowned: Boolean
-    var rating: Float
-    var rated: Boolean
-    var simpleTags: Array<String>?
-    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?
-
+interface GalleryInfo : AbstractGalleryInfo, Parcelable {
     fun generateSLang() {
         simpleLanguage = simpleTags?.let { generateSLangFromTags(it) }
             ?: title?.let { generateSLangFromTitle(it) }