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 26f8320f7..dc42cd36a 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 @@ -49,7 +49,6 @@ class GalleryDetail( var language: String? = null, var size: String? = null, var favoriteCount: Int = 0, - var isFavorited: Boolean = false, var ratingCount: Int = 0, val tags: Array, var comments: GalleryCommentList, diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt index 6e4ea79ac..0ab94d98a 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt @@ -198,11 +198,9 @@ object GalleryDetailParser { // isFavorited val gdf = gm.getElementById("gdf") - gd.isFavorited = false if (gdf != null) { val favoriteName = gdf.text().trim() if (favoriteName != "Add to Favorites") { - gd.isFavorited = true gd.favoriteName = gdf.text().trim() PATTERN_FAVORITE_SLOT.find(body)?.run { gd.favoriteSlot = ((groupValues[1].toIntOrNull() ?: 2) - 2) / 19 diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt b/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt index 9668a5404..ce71f30b4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt @@ -96,7 +96,7 @@ fun GalleryInfoBottomSheet( pages.toString(), size, favoriteCount.toString(), - isFavorited.toString(), + (favoriteSlot >= 0).toString(), ratingCount.toString(), rating.toString(), torrentCount.toString(), diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index 4a778970f..6bffb2921 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -875,10 +875,7 @@ class GalleryDetailScene : BaseScene() { private fun updateFavoriteDrawable() { val gd = composeBindingGD ?: return lifecycleScope.launchIO { - val containLocalFav = EhDB.containLocalFavorites(gd.gid) - if (gd.isFavorited || containLocalFav) { - favButtonText = gd.favoriteName ?: getString(R.string.local_favorites) - } + favButtonText = gd.favoriteName ?: getString(R.string.local_favorites) } } @@ -1268,7 +1265,6 @@ class GalleryDetailScene : BaseScene() { private fun onModifyFavoritesSuccess() { if (composeBindingGD != null) { - composeBindingGD!!.isFavorited = composeBindingGD!!.favoriteName != null updateFavoriteDrawable() } }