From 0afe331d3d13295c0ed27b5a7ba68dc743aebf4a Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 6 Jan 2023 11:02:44 +0800 Subject: [PATCH] Rename GalleryInfoImpl to BaseGalleryInfo --- .../client/data/{GalleryInfoImpl.kt => BaseGalleryInfo.kt} | 2 +- .../java/com/hippo/ehviewer/client/data/GalleryDetail.kt | 4 +--- .../hippo/ehviewer/client/parser/GalleryDetailParser.java | 4 ++-- .../com/hippo/ehviewer/client/parser/GalleryListParser.java | 4 ++-- app/src/main/java/com/hippo/ehviewer/dao/BookmarkInfo.kt | 5 ++--- app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt | 4 ++-- app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt | 4 ++-- .../main/java/com/hippo/ehviewer/dao/LocalFavoriteInfo.kt | 4 ++-- .../java/com/hippo/ehviewer/download/DownloadManager.java | 4 ++-- .../hippo/ehviewer/preference/RestoreDownloadPreference.kt | 5 ++--- 10 files changed, 18 insertions(+), 22 deletions(-) rename app/src/main/java/com/hippo/ehviewer/client/data/{GalleryInfoImpl.kt => BaseGalleryInfo.kt} (98%) diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfoImpl.kt b/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt similarity index 98% rename from app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfoImpl.kt rename to app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt index d0690eca3..ad555876d 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfoImpl.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt @@ -21,7 +21,7 @@ import androidx.room.PrimaryKey import kotlinx.parcelize.Parcelize @Parcelize -open class GalleryInfoImpl( +open class BaseGalleryInfo( @PrimaryKey @ColumnInfo(name = "GID") override var gid: Long = 0, diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.kt index 5b3ecc5cd..2f812ce34 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.kt @@ -15,8 +15,6 @@ */ package com.hippo.ehviewer.client.data -import kotlinx.parcelize.Parcelize - // @Parcelize class GalleryDetail( // @JvmField @@ -72,7 +70,7 @@ class GalleryDetail( @JvmField var previewSet: PreviewSet? = null, -) : GalleryInfoImpl() +) : BaseGalleryInfo() // ) : GalleryInfo by galleryInfo // Delegating 'Parcelable' is not allowed diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java index cabb416c8..fdd3f3859 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java +++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java @@ -26,7 +26,7 @@ import com.hippo.ehviewer.client.data.GalleryComment; import com.hippo.ehviewer.client.data.GalleryCommentList; import com.hippo.ehviewer.client.data.GalleryDetail; import com.hippo.ehviewer.client.data.GalleryInfo; -import com.hippo.ehviewer.client.data.GalleryInfoImpl; +import com.hippo.ehviewer.client.data.BaseGalleryInfo; import com.hippo.ehviewer.client.data.GalleryTagGroup; import com.hippo.ehviewer.client.data.LargePreviewSet; import com.hippo.ehviewer.client.data.NormalPreviewSet; @@ -290,7 +290,7 @@ public class GalleryDetailParser { Elements elements = gnd.select("a"); for (int i = 0; i < elements.size(); i++) { Element element = elements.get(i); - GalleryInfo gi = new GalleryInfoImpl(); + GalleryInfo gi = new BaseGalleryInfo(); GalleryDetailUrlParser.Result result = GalleryDetailUrlParser.parse(element.attr("href")); if (result != null) { gi.setGid(result.gid); diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java index b69d53aab..feb00e9fd 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java +++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java @@ -24,7 +24,7 @@ import androidx.annotation.NonNull; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.client.EhUtils; import com.hippo.ehviewer.client.data.GalleryInfo; -import com.hippo.ehviewer.client.data.GalleryInfoImpl; +import com.hippo.ehviewer.client.data.BaseGalleryInfo; import com.hippo.ehviewer.client.exception.ParseException; import com.hippo.util.ExceptionUtils; import com.hippo.util.JsoupUtils; @@ -111,7 +111,7 @@ public class GalleryListParser { } private static GalleryInfo parseGalleryInfo(Element e) { - GalleryInfo gi = new GalleryInfoImpl(); + GalleryInfo gi = new BaseGalleryInfo(); // Title, gid, token (required), tags Element glname = JsoupUtils.getElementByClass(e, "glname"); diff --git a/app/src/main/java/com/hippo/ehviewer/dao/BookmarkInfo.kt b/app/src/main/java/com/hippo/ehviewer/dao/BookmarkInfo.kt index 9258fa0b4..73ea57749 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/BookmarkInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/BookmarkInfo.kt @@ -2,11 +2,10 @@ package com.hippo.ehviewer.dao import androidx.room.ColumnInfo import androidx.room.Entity -import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.client.data.GalleryInfoImpl +import com.hippo.ehviewer.client.data.BaseGalleryInfo @Entity(tableName = "BOOKMARKS") -class BookmarkInfo : GalleryInfoImpl() { +class BookmarkInfo : BaseGalleryInfo() { @JvmField @ColumnInfo(name = "PAGE") var page = 0 diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt b/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt index 7eb7a887a..fe89b1399 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadInfo.kt @@ -4,10 +4,10 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.client.data.GalleryInfoImpl +import com.hippo.ehviewer.client.data.BaseGalleryInfo @Entity(tableName = "DOWNLOADS") -class DownloadInfo() : GalleryInfoImpl() { +class DownloadInfo() : BaseGalleryInfo() { @JvmField @ColumnInfo(name = "STATE") var state = 0 diff --git a/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt b/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt index 7b43e212a..57876581d 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.kt @@ -3,10 +3,10 @@ package com.hippo.ehviewer.dao import androidx.room.ColumnInfo import androidx.room.Entity import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.client.data.GalleryInfoImpl +import com.hippo.ehviewer.client.data.BaseGalleryInfo @Entity(tableName = "HISTORY") -class HistoryInfo() : GalleryInfoImpl() { +class HistoryInfo() : BaseGalleryInfo() { @JvmField @ColumnInfo(name = "TIME") var time: Long = 0 diff --git a/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoriteInfo.kt b/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoriteInfo.kt index ebf4c61c4..04ef247a0 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoriteInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/dao/LocalFavoriteInfo.kt @@ -3,10 +3,10 @@ package com.hippo.ehviewer.dao import androidx.room.ColumnInfo import androidx.room.Entity import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.client.data.GalleryInfoImpl +import com.hippo.ehviewer.client.data.BaseGalleryInfo @Entity(tableName = "LOCAL_FAVORITES") -class LocalFavoriteInfo() : GalleryInfoImpl() { +class LocalFavoriteInfo() : BaseGalleryInfo() { @JvmField @ColumnInfo(name = "TIME") var time: Long = 0 diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java index b734792d3..3a4a012bc 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java @@ -25,7 +25,7 @@ import androidx.annotation.Nullable; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.client.data.GalleryInfo; -import com.hippo.ehviewer.client.data.GalleryInfoImpl; +import com.hippo.ehviewer.client.data.BaseGalleryInfo; import com.hippo.ehviewer.dao.DownloadInfo; import com.hippo.ehviewer.dao.DownloadLabel; import com.hippo.ehviewer.spider.SpiderDen; @@ -578,7 +578,7 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener { new AsyncTask() { @Override protected Void doInBackground(Void... voids) { - GalleryInfo galleryInfo = new GalleryInfoImpl(); + GalleryInfo galleryInfo = new BaseGalleryInfo(); for (DownloadInfo downloadInfo : list) { galleryInfo.setGid(downloadInfo.getGid()); galleryInfo.setToken(downloadInfo.getToken()); diff --git a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt index f5b1bea94..293179528 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.kt @@ -26,8 +26,7 @@ import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.EhEngine.fillGalleryListByApi import com.hippo.ehviewer.client.EhUrl -import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.client.data.GalleryInfoImpl +import com.hippo.ehviewer.client.data.BaseGalleryInfo import com.hippo.ehviewer.download.DownloadManager import com.hippo.ehviewer.spider.SpiderInfo import com.hippo.ehviewer.spider.SpiderQueen @@ -164,7 +163,7 @@ class RestoreDownloadPreference constructor( } } - private class RestoreItem : GalleryInfoImpl() { + private class RestoreItem : BaseGalleryInfo() { var dirname: String? = null } } \ No newline at end of file