From 7f76e58e4e9ff48b66146d244d486d902a2fdfdc Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 15 Nov 2022 21:46:00 +0800 Subject: [PATCH] Move GalleryInfoBottomSheet out of scene package to allow obfuscate and repackage --- .../hippo/ehviewer/ui/{scene => }/GalleryInfoBottomSheet.kt | 5 ++--- .../java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) rename app/src/main/java/com/hippo/ehviewer/ui/{scene => }/GalleryInfoBottomSheet.kt (97%) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoBottomSheet.kt b/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt similarity index 97% rename from app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoBottomSheet.kt rename to app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt index 31de15f8c..fda75a5d9 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoBottomSheet.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.ehviewer.ui.scene +package com.hippo.ehviewer.ui import android.os.Bundle import android.view.LayoutInflater @@ -31,7 +31,6 @@ import com.hippo.ehviewer.UrlOpener import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryDetail -import com.hippo.ehviewer.ui.MainActivity import com.hippo.ehviewer.ui.scene.BaseScene.LENGTH_SHORT import com.hippo.util.addTextToClipboard import com.hippo.util.getClipboardManager @@ -171,7 +170,7 @@ class GalleryInfoBottomSheet(detail: GalleryDetail) : BottomSheetDialogFragment( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InfoHolder { return InfoHolder( mInflater.inflate( - if (viewType == Companion.TYPE_HEADER) R.layout.item_gallery_info_header else R.layout.item_gallery_info_data, + if (viewType == TYPE_HEADER) R.layout.item_gallery_info_header else R.layout.item_gallery_info_data, parent, false ) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index ad3432339..de9251141 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -98,6 +98,7 @@ import com.hippo.ehviewer.gallery.GalleryProvider2; import com.hippo.ehviewer.spider.SpiderDen; import com.hippo.ehviewer.ui.CommonOperations; import com.hippo.ehviewer.ui.GalleryActivity; +import com.hippo.ehviewer.ui.GalleryInfoBottomSheet; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.ui.annotation.WholeLifeCircle; import com.hippo.ehviewer.widget.GalleryRatingBar;