From d70c5be15ac31eef30ea5b7551606e822b262fd5 Mon Sep 17 00:00:00 2001 From: tarsin Date: Sun, 14 May 2023 14:08:59 +0800 Subject: [PATCH] Refactor package structure --- app/src/main/cpp/gifutils.c | 4 +-- .../ehviewer/download/DownloadManager.kt | 2 +- .../ehviewer/gallery/ArchivePageLoader.kt | 4 +-- .../hippo/ehviewer/gallery/EhPageLoader.kt | 2 +- .../com/hippo/{ => ehviewer}/image/Image.kt | 2 +- .../ehviewer/preference/AccountPreference.kt | 2 +- .../preference/ImageLimitsPreference.kt | 2 +- .../ehviewer/preference/ProxyPreference.kt | 2 +- .../ehviewer/preference/TaskPreference.kt | 2 +- .../com/hippo/ehviewer/spider/SpiderDen.kt | 4 +-- .../com/hippo/ehviewer/spider/SpiderQueen.kt | 2 +- .../com/hippo/ehviewer/ui/CommonOperations.kt | 2 +- .../com/hippo/ehviewer/ui/MainActivity.kt | 6 ++-- .../ehviewer/ui/fragment/AdvancedFragment.kt | 2 +- .../ehviewer/ui/fragment/DownloadFragment.kt | 2 +- .../ehviewer/ui/fragment/FilterFragment.kt | 7 +++-- .../ehviewer/ui/fragment/HostsFragment.kt | 7 +++-- .../hippo/ehviewer/ui/scene/DownloadsScene.kt | 29 ++++++++++--------- .../hippo/ehviewer/ui/scene/FavoritesScene.kt | 21 +++++++------- .../hippo/ehviewer/ui/scene/GalleryAdapter.kt | 8 ++--- .../ehviewer/ui/scene/GalleryCommentsScene.kt | 19 ++++++------ .../ehviewer/ui/scene/GalleryDetailScene.kt | 12 ++++---- .../ehviewer/ui/scene/GalleryListScene.kt | 28 ++++++++++-------- .../ehviewer/ui/scene/GalleryPreviewScreen.kt | 2 +- .../hippo/ehviewer/ui/scene/HistoryScene.kt | 2 +- .../hippo/ehviewer/ui/scene/ProgressScene.kt | 5 ++-- .../hippo/ehviewer/ui/scene/SearchBarScene.kt | 2 +- .../widget}/AddDeleteDrawable.java | 2 +- .../widget}/BaseDialogBuilder.kt | 2 +- .../widget}/BringOutTransition.java | 5 +--- .../widget}/CheckBoxDialogBuilder.kt | 2 +- .../{ => ehviewer}/widget/ContentLayout.kt | 17 ++++++----- .../widget/DialogWebChromeClient.java | 1 - .../{ => ehviewer}/widget/DrawerView.java | 2 +- .../widget}/EditTextDialogBuilder.kt | 2 +- .../hippo/{ => ehviewer}/widget/FabLayout.kt | 2 +- .../widget/GalleryInfoContentHelper.kt | 2 +- .../ehviewer/widget/ImageSearchLayout.kt | 2 +- .../widget/IndicatingListView.java | 2 +- .../widget/LinkifyTextView.java | 2 +- .../widget}/ListCheckBoxDialogBuilder.kt | 2 +- .../widget/ObservedTextView.java | 2 +- .../{ => ehviewer}/widget/RadioGridGroup.java | 2 +- .../com/hippo/ehviewer/widget/SearchLayout.kt | 8 ++--- .../widget/SimpleGridLayout.java | 2 +- .../widget}/URLImageGetter.kt | 4 +-- .../widget}/UnikeryDrawable.kt | 3 +- .../widget}/ViewTransition.java | 2 +- .../widget}/WrapDrawable.java | 2 +- .../easyrecyclerview/EasyRecyclerView.java | 2 +- .../easyrecyclerview/FastScroller.java | 2 +- .../easyrecyclerview/HandlerDrawable.java | 2 +- .../easyrecyclerview/LayoutManagerUtils.java | 2 +- .../MarginItemDecoration.java | 2 +- .../easyrecyclerview/SimpleHolder.java | 2 +- .../SimpleSmoothScroller.java | 2 +- .../widget}/preference/DialogPreference.java | 4 +-- .../widget}/preference/MessagePreference.java | 2 +- .../widget}/preference/UrlPreference.kt | 2 +- .../widget/pullrefresh/PullRefresh.kt | 2 +- .../pullrefresh/PullRefreshIndicator.kt | 2 +- .../PullRefreshIndicatorTransform.kt | 2 +- .../widget/pullrefresh/PullRefreshState.kt | 2 +- .../AutoStaggeredGridLayoutManager.kt | 2 +- .../tachiyomi/ui/reader/ReaderActivity.kt | 4 +-- .../tachiyomi/ui/reader/loader/PageLoader.kt | 2 +- .../tachiyomi/ui/reader/model/ReaderPage.kt | 2 +- .../setting/ReaderColorFilterSettings.kt | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- .../layout/dialog_list_checkbox_builder.xml | 2 +- .../main/res/layout/dialog_recycler_view.xml | 2 +- app/src/main/res/layout/drawer_list_rv.xml | 2 +- .../main/res/layout/item_gallery_comment.xml | 2 +- .../res/layout/preference_recyclerview.xml | 2 +- app/src/main/res/layout/scene_download.xml | 8 ++--- app/src/main/res/layout/scene_favorites.xml | 6 ++-- .../res/layout/scene_gallery_comments.xml | 6 ++-- .../main/res/layout/scene_gallery_list.xml | 6 ++-- app/src/main/res/layout/scene_searchbar.xml | 4 +-- app/src/main/res/layout/search_normal.xml | 4 +-- .../main/res/layout/widget_content_layout.xml | 4 +-- app/src/main/res/xml/about_settings.xml | 4 +-- app/src/main/res/xml/eh_settings.xml | 2 +- 83 files changed, 177 insertions(+), 173 deletions(-) rename app/src/main/java/com/hippo/{ => ehviewer}/image/Image.kt (99%) rename app/src/main/java/com/hippo/{drawable => ehviewer/widget}/AddDeleteDrawable.java (99%) rename app/src/main/java/com/hippo/{app => ehviewer/widget}/BaseDialogBuilder.kt (85%) rename app/src/main/java/com/hippo/{view => ehviewer/widget}/BringOutTransition.java (94%) rename app/src/main/java/com/hippo/{app => ehviewer/widget}/CheckBoxDialogBuilder.kt (97%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/ContentLayout.kt (98%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/DrawerView.java (98%) rename app/src/main/java/com/hippo/{app => ehviewer/widget}/EditTextDialogBuilder.kt (98%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/FabLayout.kt (99%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/IndicatingListView.java (98%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/LinkifyTextView.java (98%) rename app/src/main/java/com/hippo/{app => ehviewer/widget}/ListCheckBoxDialogBuilder.kt (98%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/ObservedTextView.java (98%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/RadioGridGroup.java (99%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/SimpleGridLayout.java (99%) rename app/src/main/java/com/hippo/{text => ehviewer/widget}/URLImageGetter.kt (89%) rename app/src/main/java/com/hippo/{drawable => ehviewer/widget}/UnikeryDrawable.kt (97%) rename app/src/main/java/com/hippo/{view => ehviewer/widget}/ViewTransition.java (99%) rename app/src/main/java/com/hippo/{drawable => ehviewer/widget}/WrapDrawable.java (98%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/easyrecyclerview/EasyRecyclerView.java (99%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/easyrecyclerview/FastScroller.java (99%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/easyrecyclerview/HandlerDrawable.java (97%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/easyrecyclerview/LayoutManagerUtils.java (99%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/easyrecyclerview/MarginItemDecoration.java (97%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/easyrecyclerview/SimpleHolder.java (94%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/easyrecyclerview/SimpleSmoothScroller.java (96%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/preference/DialogPreference.java (99%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/preference/MessagePreference.java (98%) rename app/src/main/java/com/hippo/{ => ehviewer/widget}/preference/UrlPreference.kt (96%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/pullrefresh/PullRefresh.kt (99%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/pullrefresh/PullRefreshIndicator.kt (99%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/pullrefresh/PullRefreshIndicatorTransform.kt (98%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/pullrefresh/PullRefreshState.kt (99%) rename app/src/main/java/com/hippo/{ => ehviewer}/widget/recyclerview/AutoStaggeredGridLayoutManager.kt (98%) diff --git a/app/src/main/cpp/gifutils.c b/app/src/main/cpp/gifutils.c index cf8177497..bd962275e 100644 --- a/app/src/main/cpp/gifutils.c +++ b/app/src/main/cpp/gifutils.c @@ -43,14 +43,14 @@ static void doRewrite(byte *addr, size_t size) { } JNIEXPORT void JNICALL -Java_com_hippo_image_ImageKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) { +Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) { byte *addr = (*env)->GetDirectBufferAddress(env, buffer); size_t size = (*env)->GetDirectBufferCapacity(env, buffer); doRewrite(addr, size); } JNIEXPORT void JNICALL -Java_com_hippo_image_ImageKt_rewriteGifSource2(JNIEnv *env, jclass clazz, jint fd) { +Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource2(JNIEnv *env, jclass clazz, jint fd) { struct stat64 st; fstat64(fd, &st); size_t size = st.st_size; diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt index e5b07de65..319cf6be8 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt @@ -23,12 +23,12 @@ import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.dao.DownloadInfo import com.hippo.ehviewer.dao.DownloadLabel +import com.hippo.ehviewer.image.Image import com.hippo.ehviewer.spider.SpiderDen import com.hippo.ehviewer.spider.SpiderQueen import com.hippo.ehviewer.spider.SpiderQueen.OnSpiderListener import com.hippo.ehviewer.spider.readCompatFromUniFile import com.hippo.ehviewer.spider.write -import com.hippo.image.Image import com.hippo.yorozuya.ConcurrentPool import com.hippo.yorozuya.MathUtils import com.hippo.yorozuya.ObjectUtils diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt index 86438e965..4aea8938d 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt +++ b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt @@ -21,8 +21,8 @@ import android.net.Uri import android.os.ParcelFileDescriptor import android.util.Log import com.hippo.ehviewer.Settings -import com.hippo.image.Image -import com.hippo.image.rewriteGifSource +import com.hippo.ehviewer.image.Image +import com.hippo.ehviewer.image.rewriteGifSource import com.hippo.unifile.UniFile import com.hippo.yorozuya.FileUtils import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt index 8be745ea3..c48544812 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt +++ b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt @@ -16,11 +16,11 @@ package com.hippo.ehviewer.gallery import com.hippo.ehviewer.client.data.GalleryInfo +import com.hippo.ehviewer.image.Image import com.hippo.ehviewer.spider.SpiderQueen import com.hippo.ehviewer.spider.SpiderQueen.Companion.obtainSpiderQueen import com.hippo.ehviewer.spider.SpiderQueen.Companion.releaseSpiderQueen import com.hippo.ehviewer.spider.SpiderQueen.OnSpiderListener -import com.hippo.image.Image import com.hippo.unifile.UniFile import com.hippo.yorozuya.SimpleHandler import java.util.Locale diff --git a/app/src/main/java/com/hippo/image/Image.kt b/app/src/main/java/com/hippo/ehviewer/image/Image.kt similarity index 99% rename from app/src/main/java/com/hippo/image/Image.kt rename to app/src/main/java/com/hippo/ehviewer/image/Image.kt index 89068d771..97f04f163 100644 --- a/app/src/main/java/com/hippo/image/Image.kt +++ b/app/src/main/java/com/hippo/ehviewer/image/Image.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License along with EhViewer. * If not, see . */ -package com.hippo.image +package com.hippo.ehviewer.image import android.graphics.ColorSpace import android.graphics.ImageDecoder diff --git a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt index d0e5212e2..6e9c95aa3 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt @@ -26,7 +26,7 @@ import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.ui.SettingsActivity import com.hippo.ehviewer.ui.scene.BaseScene -import com.hippo.preference.MessagePreference +import com.hippo.ehviewer.widget.preference.MessagePreference import com.hippo.util.addTextToClipboard import okhttp3.Cookie import okhttp3.HttpUrl.Companion.toHttpUrl diff --git a/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt index acbe4a52f..15d92a251 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt @@ -9,7 +9,7 @@ import androidx.appcompat.app.AlertDialog import androidx.lifecycle.lifecycleScope import com.hippo.ehviewer.R import com.hippo.ehviewer.ui.SettingsActivity -import com.hippo.preference.DialogPreference +import com.hippo.ehviewer.widget.preference.DialogPreference import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.withUIContext diff --git a/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt index 0fd54edf3..6cd151c43 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt @@ -29,8 +29,8 @@ import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.EhProxySelector import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings +import com.hippo.ehviewer.widget.preference.DialogPreference import com.hippo.network.InetValidator -import com.hippo.preference.DialogPreference import com.hippo.yorozuya.MathUtils import com.hippo.yorozuya.ViewUtils diff --git a/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt index 4181c0144..bb598bd83 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt @@ -21,7 +21,7 @@ import androidx.appcompat.app.AlertDialog import com.google.android.material.snackbar.Snackbar import com.hippo.ehviewer.R import com.hippo.ehviewer.ui.SettingsActivity -import com.hippo.preference.DialogPreference +import com.hippo.ehviewer.widget.preference.DialogPreference import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt index f2b02bbed..cc59f1331 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt @@ -28,8 +28,8 @@ import com.hippo.ehviewer.client.getImageKey import com.hippo.ehviewer.coil.edit import com.hippo.ehviewer.coil.read import com.hippo.ehviewer.gallery.SUPPORT_IMAGE_EXTENSIONS -import com.hippo.image.Image.CloseableSource -import com.hippo.image.rewriteGifSource2 +import com.hippo.ehviewer.image.Image.CloseableSource +import com.hippo.ehviewer.image.rewriteGifSource2 import com.hippo.unifile.UniFile import com.hippo.unifile.openOutputStream import com.hippo.util.sendTo diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt index e0d3c725c..54dd67ea1 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt @@ -37,7 +37,7 @@ import com.hippo.ehviewer.client.parser.GalleryDetailParser.parsePreviewList import com.hippo.ehviewer.client.parser.GalleryDetailParser.parsePreviewPages import com.hippo.ehviewer.client.parser.GalleryMultiPageViewerPTokenParser import com.hippo.ehviewer.client.parser.GalleryPageUrlParser -import com.hippo.image.Image +import com.hippo.ehviewer.image.Image import com.hippo.unifile.UniFile import com.hippo.util.ExceptionUtils import eu.kanade.tachiyomi.util.lang.launchIO diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt index 66d1a7602..1b19809d8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt @@ -21,7 +21,6 @@ import android.content.Intent import android.os.Build import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat -import com.hippo.app.ListCheckBoxDialogBuilder import com.hippo.ehviewer.EhApplication.Companion.favouriteStatusRouter import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R @@ -31,6 +30,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.client.exception.EhException import com.hippo.ehviewer.download.DownloadService import com.hippo.ehviewer.ui.scene.BaseScene +import com.hippo.ehviewer.widget.ListCheckBoxDialogBuilder import com.hippo.unifile.UniFile import com.hippo.util.requestPermission import com.hippo.yorozuya.collect.LongList diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt index a226442ef..b4508d622 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt @@ -50,8 +50,6 @@ import androidx.navigation.ui.onNavDestinationSelected2 import androidx.navigation.ui.setupWithNavController import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.snackbar.Snackbar -import com.hippo.app.BaseDialogBuilder -import com.hippo.app.EditTextDialogBuilder import com.hippo.ehviewer.AppConfig import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings @@ -62,13 +60,15 @@ import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser import com.hippo.ehviewer.client.parser.GalleryPageUrlParser import com.hippo.ehviewer.databinding.ActivityMainBinding import com.hippo.ehviewer.download.DownloadService +import com.hippo.ehviewer.image.Image import com.hippo.ehviewer.ui.login.LoginActivity import com.hippo.ehviewer.ui.scene.BaseScene import com.hippo.ehviewer.ui.scene.GalleryDetailScene import com.hippo.ehviewer.ui.scene.GalleryListScene import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs import com.hippo.ehviewer.ui.scene.ProgressScene -import com.hippo.image.Image +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.EditTextDialogBuilder import com.hippo.util.addTextToClipboard import com.hippo.util.getClipboardManager import com.hippo.util.getParcelableExtraCompat diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt index 3bd3911c1..18b00783d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt @@ -27,7 +27,6 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat import androidx.lifecycle.lifecycleScope import androidx.preference.Preference -import com.hippo.app.BaseDialogBuilder import com.hippo.ehviewer.AppConfig import com.hippo.ehviewer.BuildConfig import com.hippo.ehviewer.EhDB @@ -36,6 +35,7 @@ import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.data.FavListUrlBuilder import com.hippo.ehviewer.ui.scene.BaseScene +import com.hippo.ehviewer.widget.BaseDialogBuilder import com.hippo.util.ExceptionUtils import com.hippo.util.LogCat import com.hippo.util.ReadableTime diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt index e43742f80..a1a6d85dc 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt @@ -21,12 +21,12 @@ import android.os.Bundle import androidx.activity.result.contract.ActivityResultContracts import androidx.lifecycle.lifecycleScope import androidx.preference.Preference -import com.hippo.app.BaseDialogBuilder import com.hippo.ehviewer.AppConfig import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.ui.keepNoMediaFileStatus import com.hippo.ehviewer.ui.scene.BaseScene +import com.hippo.ehviewer.widget.BaseDialogBuilder import com.hippo.unifile.UniFile import com.hippo.util.ExceptionUtils import eu.kanade.tachiyomi.util.lang.launchNonCancellable diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt index 8e6ee1c24..ea382a18b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt @@ -37,11 +37,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.checkbox.MaterialCheckBox import com.google.android.material.textfield.TextInputLayout -import com.hippo.app.BaseDialogBuilder import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhFilter import com.hippo.ehviewer.dao.Filter -import com.hippo.view.ViewTransition +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.ViewTransition import com.hippo.yorozuya.ViewUtils class FilterFragment : BaseFragment() { @@ -73,7 +73,8 @@ class FilterFragment : BaseFragment() { val recyclerView = inflater.inflate(R.layout.rv_layout, container, false) as RecyclerView val tip = getTipView(R.string.filter) - mViewTransition = ViewTransition(recyclerView, tip) + mViewTransition = + ViewTransition(recyclerView, tip) val fab = getFabViewAndShow() val drawable = ContextCompat.getDrawable(requireActivity(), R.drawable.big_filter) drawable?.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt index e4190dcc4..faa0bcd5a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt @@ -30,11 +30,11 @@ import androidx.fragment.app.DialogFragment import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.textfield.TextInputLayout -import com.hippo.app.BaseDialogBuilder import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.Hosts import com.hippo.ehviewer.R -import com.hippo.view.ViewTransition +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.ViewTransition class HostsFragment : BaseFragment(), View.OnClickListener { private var hosts: Hosts? = null @@ -56,7 +56,8 @@ class HostsFragment : BaseFragment(), View.OnClickListener { ): View { val recyclerView = inflater.inflate(R.layout.rv_layout, container, false) as RecyclerView val tip = getTipView(R.string.hosts) - mViewTransition = ViewTransition(recyclerView, tip) + mViewTransition = + ViewTransition(recyclerView, tip) val fab = getFabViewAndShow() adapter = HostsAdapter() recyclerView.adapter = adapter diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt index f941a3571..a6ab24e06 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt @@ -45,13 +45,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator import androidx.recyclerview.widget.StaggeredGridLayoutManager import arrow.core.partially1 import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.hippo.app.BaseDialogBuilder -import com.hippo.app.CheckBoxDialogBuilder -import com.hippo.app.EditTextDialogBuilder -import com.hippo.easyrecyclerview.EasyRecyclerView -import com.hippo.easyrecyclerview.EasyRecyclerView.CustomChoiceListener -import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener -import com.hippo.easyrecyclerview.HandlerDrawable import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings @@ -68,13 +61,20 @@ import com.hippo.ehviewer.download.DownloadService.Companion.clear import com.hippo.ehviewer.spider.SpiderDen import com.hippo.ehviewer.ui.widget.EhAsyncCropThumb import com.hippo.ehviewer.ui.widget.setMD3Content +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.CheckBoxDialogBuilder +import com.hippo.ehviewer.widget.EditTextDialogBuilder +import com.hippo.ehviewer.widget.FabLayout +import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener +import com.hippo.ehviewer.widget.FabLayout.OnExpandListener +import com.hippo.ehviewer.widget.ViewTransition +import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView +import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView.CustomChoiceListener +import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener +import com.hippo.ehviewer.widget.easyrecyclerview.HandlerDrawable +import com.hippo.ehviewer.widget.recyclerview.AutoStaggeredGridLayoutManager +import com.hippo.ehviewer.widget.recyclerview.STRATEGY_MIN_SIZE import com.hippo.unifile.UniFile -import com.hippo.view.ViewTransition -import com.hippo.widget.FabLayout -import com.hippo.widget.FabLayout.OnClickFabListener -import com.hippo.widget.FabLayout.OnExpandListener -import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager -import com.hippo.widget.recyclerview.STRATEGY_MIN_SIZE import com.hippo.yorozuya.FileUtils import com.hippo.yorozuya.ObjectUtils import com.hippo.yorozuya.collect.LongList @@ -247,7 +247,8 @@ class DownloadsScene : // Workaround (fabLayout.parent as ViewGroup).removeView(fabLayout) container!!.addView(fabLayout) - mViewTransition = ViewTransition(content, tip) + mViewTransition = + ViewTransition(content, tip) val drawable = ContextCompat.getDrawable(requireContext(), R.drawable.big_download) drawable!!.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight) tip.setCompoundDrawables(null, drawable, null, null) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt index ea847453a..597b33c8a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt @@ -41,11 +41,6 @@ import com.google.android.material.datepicker.DateValidatorPointBackward import com.google.android.material.datepicker.DateValidatorPointForward import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.hippo.app.BaseDialogBuilder -import com.hippo.drawable.AddDeleteDrawable -import com.hippo.easyrecyclerview.EasyRecyclerView -import com.hippo.easyrecyclerview.EasyRecyclerView.CustomChoiceListener -import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings @@ -56,12 +51,17 @@ import com.hippo.ehviewer.client.data.FavListUrlBuilder import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.client.parser.FavoritesParser import com.hippo.ehviewer.ui.CommonOperations +import com.hippo.ehviewer.widget.AddDeleteDrawable +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.ContentLayout +import com.hippo.ehviewer.widget.FabLayout +import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener +import com.hippo.ehviewer.widget.FabLayout.OnExpandListener import com.hippo.ehviewer.widget.GalleryInfoContentHelper +import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView +import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView.CustomChoiceListener +import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener import com.hippo.util.getParcelableCompat -import com.hippo.widget.ContentLayout -import com.hippo.widget.FabLayout -import com.hippo.widget.FabLayout.OnClickFabListener -import com.hippo.widget.FabLayout.OnExpandListener import com.hippo.yorozuya.ObjectUtils import com.hippo.yorozuya.SimpleHandler import com.hippo.yorozuya.ViewUtils @@ -229,7 +229,8 @@ class FavoritesScene : updateSearchBar() updateJumpFab() val colorID = theme.resolveColor(com.google.android.material.R.attr.colorOnSurface) - mActionFabDrawable = AddDeleteDrawable(context, colorID) + mActionFabDrawable = + AddDeleteDrawable(context, colorID) mFabLayout!!.primaryFab!!.setImageDrawable(mActionFabDrawable) mFabLayout!!.setExpanded(expanded = false, animation = false) mFabLayout!!.setAutoCancel(true) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt index eec903536..913cd2211 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.kt @@ -24,13 +24,13 @@ import androidx.annotation.IntDef import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ItemDecoration import androidx.recyclerview.widget.StaggeredGridLayoutManager -import com.hippo.easyrecyclerview.MarginItemDecoration import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager -import com.hippo.widget.recyclerview.STRATEGY_MIN_SIZE -import com.hippo.widget.recyclerview.STRATEGY_SUITABLE_SIZE +import com.hippo.ehviewer.widget.easyrecyclerview.MarginItemDecoration +import com.hippo.ehviewer.widget.recyclerview.AutoStaggeredGridLayoutManager +import com.hippo.ehviewer.widget.recyclerview.STRATEGY_MIN_SIZE +import com.hippo.ehviewer.widget.recyclerview.STRATEGY_SUITABLE_SIZE abstract class GalleryAdapter( private val mResources: Resources, diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt index 118462e63..3cd3019fb 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt @@ -60,9 +60,6 @@ import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.hippo.app.BaseDialogBuilder -import com.hippo.app.EditTextDialogBuilder -import com.hippo.easyrecyclerview.EasyRecyclerView import com.hippo.ehviewer.R import com.hippo.ehviewer.WindowInsetsAnimationHelper import com.hippo.ehviewer.client.EhEngine @@ -78,17 +75,20 @@ import com.hippo.ehviewer.ui.jumpToReaderByPage import com.hippo.ehviewer.ui.navWithUrl import com.hippo.ehviewer.ui.openBrowser import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs -import com.hippo.text.URLImageGetter +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.EditTextDialogBuilder +import com.hippo.ehviewer.widget.FabLayout +import com.hippo.ehviewer.widget.LinkifyTextView +import com.hippo.ehviewer.widget.ObservedTextView +import com.hippo.ehviewer.widget.URLImageGetter +import com.hippo.ehviewer.widget.ViewTransition +import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView import com.hippo.util.ExceptionUtils import com.hippo.util.ReadableTime import com.hippo.util.TextUrl import com.hippo.util.addTextToClipboard import com.hippo.util.getParcelableCompat import com.hippo.util.toBBCode -import com.hippo.view.ViewTransition -import com.hippo.widget.FabLayout -import com.hippo.widget.LinkifyTextView -import com.hippo.widget.ObservedTextView import com.hippo.yorozuya.AnimationUtils import com.hippo.yorozuya.SimpleAnimatorListener import com.hippo.yorozuya.StringUtils @@ -276,7 +276,8 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh mFab!!.setOnClickListener(this) addAboveSnackView(mEditPanel) addAboveSnackView(mFabLayout) - mViewTransition = ViewTransition(mRecyclerView, tip) + mViewTransition = + ViewTransition(mRecyclerView, tip) updateView(false) return view } 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 85c59a349..d357d34a3 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 @@ -116,9 +116,6 @@ import coil.annotation.ExperimentalCoilApi import coil.imageLoader import com.google.android.material.progressindicator.CircularProgressIndicator import com.google.android.material.snackbar.Snackbar -import com.hippo.app.BaseDialogBuilder -import com.hippo.app.CheckBoxDialogBuilder -import com.hippo.app.EditTextDialogBuilder import com.hippo.ehviewer.EhApplication.Companion.galleryDetailCache import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R @@ -162,17 +159,20 @@ import com.hippo.ehviewer.ui.widget.EhAsyncPreview import com.hippo.ehviewer.ui.widget.GalleryDetailHeaderCard import com.hippo.ehviewer.ui.widget.GalleryDetailRating import com.hippo.ehviewer.ui.widget.setMD3Content +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.CheckBoxDialogBuilder +import com.hippo.ehviewer.widget.EditTextDialogBuilder import com.hippo.ehviewer.widget.GalleryRatingBar import com.hippo.ehviewer.widget.GalleryRatingBar.OnUserRateListener -import com.hippo.text.URLImageGetter +import com.hippo.ehviewer.widget.ObservedTextView +import com.hippo.ehviewer.widget.URLImageGetter +import com.hippo.ehviewer.widget.recyclerview.calculateSuitableSpanCount import com.hippo.util.AppHelper import com.hippo.util.ExceptionUtils import com.hippo.util.ReadableTime import com.hippo.util.addTextToClipboard import com.hippo.util.getParcelableCompat import com.hippo.util.getSystemService -import com.hippo.widget.ObservedTextView -import com.hippo.widget.recyclerview.calculateSuitableSpanCount import com.hippo.yorozuya.FileUtils import com.hippo.yorozuya.ViewUtils import com.hippo.yorozuya.collect.IntList diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt index c7d7903e8..b36cfc392 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt @@ -52,11 +52,6 @@ import com.google.android.material.datepicker.DateValidatorPointBackward import com.google.android.material.datepicker.DateValidatorPointForward import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.hippo.app.BaseDialogBuilder -import com.hippo.app.EditTextDialogBuilder -import com.hippo.drawable.AddDeleteDrawable -import com.hippo.easyrecyclerview.EasyRecyclerView -import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener import com.hippo.ehviewer.EhApplication.Companion.favouriteStatusRouter import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.FavouriteStatusRouter @@ -88,14 +83,19 @@ import com.hippo.ehviewer.ui.CommonOperations import com.hippo.ehviewer.ui.addToFavorites import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter import com.hippo.ehviewer.ui.removeFromFavorites +import com.hippo.ehviewer.widget.AddDeleteDrawable +import com.hippo.ehviewer.widget.BaseDialogBuilder +import com.hippo.ehviewer.widget.BringOutTransition +import com.hippo.ehviewer.widget.EditTextDialogBuilder +import com.hippo.ehviewer.widget.FabLayout +import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener +import com.hippo.ehviewer.widget.FabLayout.OnExpandListener import com.hippo.ehviewer.widget.GalleryInfoContentHelper import com.hippo.ehviewer.widget.SearchLayout +import com.hippo.ehviewer.widget.ViewTransition +import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView +import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener import com.hippo.util.getParcelableCompat -import com.hippo.view.BringOutTransition -import com.hippo.view.ViewTransition -import com.hippo.widget.FabLayout -import com.hippo.widget.FabLayout.OnClickFabListener -import com.hippo.widget.FabLayout.OnExpandListener import com.hippo.yorozuya.AnimationUtils import com.hippo.yorozuya.SimpleAnimatorListener import com.hippo.yorozuya.StringUtils @@ -359,7 +359,10 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H container!!.addView(binding.fabLayout) val paddingTopSB = resources.getDimensionPixelOffset(R.dimen.gallery_padding_top_search_bar) val paddingBottomFab = resources.getDimensionPixelOffset(R.dimen.gallery_padding_bottom_fab) - mViewTransition = BringOutTransition(binding.contentLayout, binding.searchLayout) + mViewTransition = BringOutTransition( + binding.contentLayout, + binding.searchLayout, + ) mHelper = GalleryListHelper() binding.contentLayout.setHelper(mHelper!!) binding.contentLayout.fastScroller.setOnDragHandlerListener(this) @@ -397,7 +400,8 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H binding.fabLayout.addOnExpandListener(this) addAboveSnackView(binding.fabLayout) val colorID = theme.resolveColor(com.google.android.material.R.attr.colorOnSurface) - mActionFabDrawable = AddDeleteDrawable(context, colorID) + mActionFabDrawable = + AddDeleteDrawable(context, colorID) binding.fabLayout.primaryFab!!.setImageDrawable(mActionFabDrawable) mSearchFab!!.setOnClickListener { onApplySearch() } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt index b49a0bbc2..458cc4794 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt @@ -58,8 +58,8 @@ import com.hippo.ehviewer.ui.navToReader import com.hippo.ehviewer.ui.widget.EhPreviewItem import com.hippo.ehviewer.ui.widget.rememberDialogState import com.hippo.ehviewer.ui.widget.setMD3Content +import com.hippo.ehviewer.widget.recyclerview.calculateSuitableSpanCount import com.hippo.util.getParcelableCompat -import com.hippo.widget.recyclerview.calculateSuitableSpanCount import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import moe.tarsin.coroutines.runSuspendCatching diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt index 4d7327a2a..f56783012 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt @@ -64,7 +64,6 @@ import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.itemContentType import androidx.paging.compose.itemKey import arrow.core.partially1 -import com.hippo.app.BaseDialogBuilder import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings @@ -80,6 +79,7 @@ import com.hippo.ehviewer.ui.widget.Deferred import com.hippo.ehviewer.ui.widget.GalleryInfoListItem import com.hippo.ehviewer.ui.widget.rememberDialogState import com.hippo.ehviewer.ui.widget.setMD3Content +import com.hippo.ehviewer.widget.BaseDialogBuilder import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.system.pxToDp diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt index b8e24c729..1e06f407f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt @@ -25,8 +25,8 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhEngine +import com.hippo.ehviewer.widget.ViewTransition import com.hippo.util.ExceptionUtils -import com.hippo.view.ViewTransition import com.hippo.yorozuya.ViewUtils import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.withUIContext @@ -153,7 +153,8 @@ class ProgressScene : BaseScene(), View.OnClickListener { mTip!!.setCompoundDrawables(null, drawable, null, null) mTip!!.setOnClickListener(this) mTip!!.text = mError - mViewTransition = ViewTransition(progress, mTip) + mViewTransition = + ViewTransition(progress, mTip) if (mValid) { mViewTransition!!.showView(0, false) } else { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt index 338f6b337..1d2fccbbb 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt @@ -19,11 +19,11 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.search.SearchView import com.google.android.material.search.SearchView.TransitionListener import com.google.android.material.shape.MaterialShapeDrawable -import com.hippo.app.BaseDialogBuilder import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.EhTagDatabase import com.hippo.ehviewer.databinding.SceneSearchbarBinding +import com.hippo.ehviewer.widget.BaseDialogBuilder import com.hippo.ehviewer.widget.SearchDatabase import eu.kanade.tachiyomi.util.lang.withUIContext import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java b/app/src/main/java/com/hippo/ehviewer/widget/AddDeleteDrawable.java similarity index 99% rename from app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java rename to app/src/main/java/com/hippo/ehviewer/widget/AddDeleteDrawable.java index f511ff43b..98d9ade96 100644 --- a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/AddDeleteDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.drawable; +package com.hippo.ehviewer.widget; import android.animation.ObjectAnimator; import android.content.Context; diff --git a/app/src/main/java/com/hippo/app/BaseDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/widget/BaseDialogBuilder.kt similarity index 85% rename from app/src/main/java/com/hippo/app/BaseDialogBuilder.kt rename to app/src/main/java/com/hippo/ehviewer/widget/BaseDialogBuilder.kt index e0b442862..7b8011095 100644 --- a/app/src/main/java/com/hippo/app/BaseDialogBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/BaseDialogBuilder.kt @@ -1,4 +1,4 @@ -package com.hippo.app +package com.hippo.ehviewer.widget import android.content.Context import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/com/hippo/view/BringOutTransition.java b/app/src/main/java/com/hippo/ehviewer/widget/BringOutTransition.java similarity index 94% rename from app/src/main/java/com/hippo/view/BringOutTransition.java rename to app/src/main/java/com/hippo/ehviewer/widget/BringOutTransition.java index a64c7ba1b..b74b435bb 100644 --- a/app/src/main/java/com/hippo/view/BringOutTransition.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/BringOutTransition.java @@ -14,15 +14,12 @@ * limitations under the License. */ -package com.hippo.view; +package com.hippo.ehviewer.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.view.View; -import com.hippo.ehviewer.widget.SearchLayout; -import com.hippo.widget.ContentLayout; - public class BringOutTransition extends ViewTransition { public BringOutTransition(ContentLayout contentLayout, SearchLayout mSearchLayout) { diff --git a/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/widget/CheckBoxDialogBuilder.kt similarity index 97% rename from app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.kt rename to app/src/main/java/com/hippo/ehviewer/widget/CheckBoxDialogBuilder.kt index b35d9778e..1d17ddc5d 100644 --- a/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/CheckBoxDialogBuilder.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.app +package com.hippo.ehviewer.widget import android.content.Context import android.view.LayoutInflater diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.kt b/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.kt similarity index 98% rename from app/src/main/java/com/hippo/widget/ContentLayout.kt rename to app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.kt index 51455dd64..7778362f8 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.widget +package com.hippo.ehviewer.widget import android.app.Activity import android.content.Context @@ -27,15 +27,14 @@ import android.widget.Toast import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener -import com.hippo.easyrecyclerview.HandlerDrawable -import com.hippo.easyrecyclerview.LayoutManagerUtils -import com.hippo.easyrecyclerview.LayoutManagerUtils.OnScrollToPositionListener import com.hippo.ehviewer.R import com.hippo.ehviewer.databinding.WidgetContentLayoutBinding +import com.hippo.ehviewer.widget.ViewTransition.OnShowViewListener +import com.hippo.ehviewer.widget.easyrecyclerview.HandlerDrawable +import com.hippo.ehviewer.widget.easyrecyclerview.LayoutManagerUtils +import com.hippo.ehviewer.widget.easyrecyclerview.LayoutManagerUtils.OnScrollToPositionListener import com.hippo.util.ExceptionUtils import com.hippo.util.getParcelableCompat -import com.hippo.view.ViewTransition -import com.hippo.view.ViewTransition.OnShowViewListener import com.hippo.yorozuya.IntIdGenerator import com.hippo.yorozuya.LayoutUtils import com.hippo.yorozuya.collect.IntList @@ -241,7 +240,11 @@ class ContentLayout(context: Context, attrs: AttributeSet? = null) : FrameLayout val drawable = ContextCompat.getDrawable(context, R.drawable.big_sad_pandroid)!! drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight) binding.tip.setCompoundDrawables(null, drawable, null, null) - mViewTransition = ViewTransition(binding.contentView, binding.progress, binding.tip) + mViewTransition = ViewTransition( + binding.contentView, + binding.progress, + binding.tip, + ) mViewTransition.setOnShowViewListener(this) binding.recyclerView.addOnScrollListener(mOnScrollListener) binding.refreshLayout.setOnRefreshListener(mOnRefreshListener) diff --git a/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java b/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java index 894d41c77..9e13c8172 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java @@ -26,7 +26,6 @@ import android.webkit.WebView; import android.widget.EditText; import android.widget.TextView; -import com.hippo.app.BaseDialogBuilder; import com.hippo.ehviewer.R; public class DialogWebChromeClient extends WebChromeClient { diff --git a/app/src/main/java/com/hippo/widget/DrawerView.java b/app/src/main/java/com/hippo/ehviewer/widget/DrawerView.java similarity index 98% rename from app/src/main/java/com/hippo/widget/DrawerView.java rename to app/src/main/java/com/hippo/ehviewer/widget/DrawerView.java index 79fe08ac4..695479d33 100644 --- a/app/src/main/java/com/hippo/widget/DrawerView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/DrawerView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget; +package com.hippo.ehviewer.widget; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/widget/EditTextDialogBuilder.kt similarity index 98% rename from app/src/main/java/com/hippo/app/EditTextDialogBuilder.kt rename to app/src/main/java/com/hippo/ehviewer/widget/EditTextDialogBuilder.kt index d616b7036..36264b6c4 100644 --- a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/EditTextDialogBuilder.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.app +package com.hippo.ehviewer.widget import android.content.Context import android.content.DialogInterface diff --git a/app/src/main/java/com/hippo/widget/FabLayout.kt b/app/src/main/java/com/hippo/ehviewer/widget/FabLayout.kt similarity index 99% rename from app/src/main/java/com/hippo/widget/FabLayout.kt rename to app/src/main/java/com/hippo/ehviewer/widget/FabLayout.kt index c30107478..e4d8f7822 100644 --- a/app/src/main/java/com/hippo/widget/FabLayout.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/FabLayout.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.widget +package com.hippo.ehviewer.widget import android.animation.Animator import android.content.Context diff --git a/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt b/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt index 7d47d279f..b095c609c 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt @@ -21,7 +21,7 @@ import android.os.Parcelable import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.FavouriteStatusRouter import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.widget.ContentLayout.ContentHelper +import com.hippo.ehviewer.widget.ContentLayout.ContentHelper import com.hippo.yorozuya.IntIdGenerator import java.time.Instant import java.time.ZoneOffset diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt index be9c3a708..99d8b65e7 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt @@ -34,7 +34,7 @@ import com.hippo.ehviewer.AppConfig import com.hippo.ehviewer.R import com.hippo.ehviewer.client.data.ListUrlBuilder import com.hippo.ehviewer.client.exception.EhException -import com.hippo.image.Image +import com.hippo.ehviewer.image.Image import com.hippo.unifile.UniFile import com.hippo.util.pickVisualMedia import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/hippo/widget/IndicatingListView.java b/app/src/main/java/com/hippo/ehviewer/widget/IndicatingListView.java similarity index 98% rename from app/src/main/java/com/hippo/widget/IndicatingListView.java rename to app/src/main/java/com/hippo/ehviewer/widget/IndicatingListView.java index b81e912eb..45271e764 100644 --- a/app/src/main/java/com/hippo/widget/IndicatingListView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/IndicatingListView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget; +package com.hippo.ehviewer.widget; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/hippo/widget/LinkifyTextView.java b/app/src/main/java/com/hippo/ehviewer/widget/LinkifyTextView.java similarity index 98% rename from app/src/main/java/com/hippo/widget/LinkifyTextView.java rename to app/src/main/java/com/hippo/ehviewer/widget/LinkifyTextView.java index 6b0bec70b..83cf8868d 100644 --- a/app/src/main/java/com/hippo/widget/LinkifyTextView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/LinkifyTextView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget; +package com.hippo.ehviewer.widget; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.kt b/app/src/main/java/com/hippo/ehviewer/widget/ListCheckBoxDialogBuilder.kt similarity index 98% rename from app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.kt rename to app/src/main/java/com/hippo/ehviewer/widget/ListCheckBoxDialogBuilder.kt index 371872ba9..41099efa2 100644 --- a/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/ListCheckBoxDialogBuilder.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.app +package com.hippo.ehviewer.widget import android.content.Context import android.view.LayoutInflater diff --git a/app/src/main/java/com/hippo/widget/ObservedTextView.java b/app/src/main/java/com/hippo/ehviewer/widget/ObservedTextView.java similarity index 98% rename from app/src/main/java/com/hippo/widget/ObservedTextView.java rename to app/src/main/java/com/hippo/ehviewer/widget/ObservedTextView.java index 10ec2df14..c753a6d48 100644 --- a/app/src/main/java/com/hippo/widget/ObservedTextView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/ObservedTextView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget; +package com.hippo.ehviewer.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/hippo/widget/RadioGridGroup.java b/app/src/main/java/com/hippo/ehviewer/widget/RadioGridGroup.java similarity index 99% rename from app/src/main/java/com/hippo/widget/RadioGridGroup.java rename to app/src/main/java/com/hippo/ehviewer/widget/RadioGridGroup.java index 3c25fd036..712bc32b8 100644 --- a/app/src/main/java/com/hippo/widget/RadioGridGroup.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/RadioGridGroup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget; +package com.hippo.ehviewer.widget; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt index 629594d6f..8bf5e78e6 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt @@ -40,15 +40,13 @@ import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout.OnTabSelectedListener -import com.hippo.app.BaseDialogBuilder -import com.hippo.easyrecyclerview.EasyRecyclerView -import com.hippo.easyrecyclerview.MarginItemDecoration -import com.hippo.easyrecyclerview.SimpleHolder import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.ListUrlBuilder import com.hippo.ehviewer.client.exception.EhException -import com.hippo.widget.RadioGridGroup +import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView +import com.hippo.ehviewer.widget.easyrecyclerview.MarginItemDecoration +import com.hippo.ehviewer.widget.easyrecyclerview.SimpleHolder import com.hippo.yorozuya.NumberUtils import com.hippo.yorozuya.ViewUtils diff --git a/app/src/main/java/com/hippo/widget/SimpleGridLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SimpleGridLayout.java similarity index 99% rename from app/src/main/java/com/hippo/widget/SimpleGridLayout.java rename to app/src/main/java/com/hippo/ehviewer/widget/SimpleGridLayout.java index f2543adc6..ce749af07 100644 --- a/app/src/main/java/com/hippo/widget/SimpleGridLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SimpleGridLayout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget; +package com.hippo.ehviewer.widget; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/hippo/text/URLImageGetter.kt b/app/src/main/java/com/hippo/ehviewer/widget/URLImageGetter.kt similarity index 89% rename from app/src/main/java/com/hippo/text/URLImageGetter.kt rename to app/src/main/java/com/hippo/ehviewer/widget/URLImageGetter.kt index 8bc1650a2..3a0b5d950 100644 --- a/app/src/main/java/com/hippo/text/URLImageGetter.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/URLImageGetter.kt @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.text +package com.hippo.ehviewer.widget import android.graphics.drawable.Drawable import android.text.Html.ImageGetter -import com.hippo.drawable.UnikeryDrawable -import com.hippo.widget.ObservedTextView class URLImageGetter( private val mTextView: ObservedTextView, diff --git a/app/src/main/java/com/hippo/drawable/UnikeryDrawable.kt b/app/src/main/java/com/hippo/ehviewer/widget/UnikeryDrawable.kt similarity index 97% rename from app/src/main/java/com/hippo/drawable/UnikeryDrawable.kt rename to app/src/main/java/com/hippo/ehviewer/widget/UnikeryDrawable.kt index 4ceed5d38..ed640e0ac 100644 --- a/app/src/main/java/com/hippo/drawable/UnikeryDrawable.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/UnikeryDrawable.kt @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.drawable +package com.hippo.ehviewer.widget import android.graphics.drawable.AnimatedImageDrawable import android.graphics.drawable.Drawable import coil.imageLoader import coil.request.ImageRequest import com.hippo.ehviewer.coil.imageRequest -import com.hippo.widget.ObservedTextView class UnikeryDrawable(private val mTextView: ObservedTextView, url: String) : WrapDrawable(), diff --git a/app/src/main/java/com/hippo/view/ViewTransition.java b/app/src/main/java/com/hippo/ehviewer/widget/ViewTransition.java similarity index 99% rename from app/src/main/java/com/hippo/view/ViewTransition.java rename to app/src/main/java/com/hippo/ehviewer/widget/ViewTransition.java index 660670b6a..08fb4b218 100644 --- a/app/src/main/java/com/hippo/view/ViewTransition.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/ViewTransition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.view; +package com.hippo.ehviewer.widget; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/hippo/drawable/WrapDrawable.java b/app/src/main/java/com/hippo/ehviewer/widget/WrapDrawable.java similarity index 98% rename from app/src/main/java/com/hippo/drawable/WrapDrawable.java rename to app/src/main/java/com/hippo/ehviewer/widget/WrapDrawable.java index cb02f15ae..862614124 100644 --- a/app/src/main/java/com/hippo/drawable/WrapDrawable.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/WrapDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.drawable; +package com.hippo.ehviewer.widget; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/EasyRecyclerView.java similarity index 99% rename from app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java rename to app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/EasyRecyclerView.java index dc083e7d0..8196b1767 100644 --- a/app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/EasyRecyclerView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.easyrecyclerview; +package com.hippo.ehviewer.widget.easyrecyclerview; import android.content.Context; import android.os.Parcel; diff --git a/app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/FastScroller.java similarity index 99% rename from app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java rename to app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/FastScroller.java index edf0fe605..f0d118ddd 100644 --- a/app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/FastScroller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.easyrecyclerview; +package com.hippo.ehviewer.widget.easyrecyclerview; import android.animation.Animator; import android.animation.ObjectAnimator; diff --git a/app/src/main/java/com/hippo/easyrecyclerview/HandlerDrawable.java b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/HandlerDrawable.java similarity index 97% rename from app/src/main/java/com/hippo/easyrecyclerview/HandlerDrawable.java rename to app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/HandlerDrawable.java index eda638440..8a2fdbb5f 100644 --- a/app/src/main/java/com/hippo/easyrecyclerview/HandlerDrawable.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/HandlerDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.easyrecyclerview; +package com.hippo.ehviewer.widget.easyrecyclerview; import android.graphics.Canvas; import android.graphics.Color; diff --git a/app/src/main/java/com/hippo/easyrecyclerview/LayoutManagerUtils.java b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/LayoutManagerUtils.java similarity index 99% rename from app/src/main/java/com/hippo/easyrecyclerview/LayoutManagerUtils.java rename to app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/LayoutManagerUtils.java index dec9169d8..63edc9267 100644 --- a/app/src/main/java/com/hippo/easyrecyclerview/LayoutManagerUtils.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/LayoutManagerUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.easyrecyclerview; +package com.hippo.ehviewer.widget.easyrecyclerview; import android.content.Context; import android.graphics.PointF; diff --git a/app/src/main/java/com/hippo/easyrecyclerview/MarginItemDecoration.java b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/MarginItemDecoration.java similarity index 97% rename from app/src/main/java/com/hippo/easyrecyclerview/MarginItemDecoration.java rename to app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/MarginItemDecoration.java index 9245fadf9..4a1e35b2a 100644 --- a/app/src/main/java/com/hippo/easyrecyclerview/MarginItemDecoration.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/MarginItemDecoration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.easyrecyclerview; +package com.hippo.ehviewer.widget.easyrecyclerview; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/hippo/easyrecyclerview/SimpleHolder.java b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleHolder.java similarity index 94% rename from app/src/main/java/com/hippo/easyrecyclerview/SimpleHolder.java rename to app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleHolder.java index 9593abdcf..4255745bb 100644 --- a/app/src/main/java/com/hippo/easyrecyclerview/SimpleHolder.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.easyrecyclerview; +package com.hippo.ehviewer.widget.easyrecyclerview; import android.view.View; diff --git a/app/src/main/java/com/hippo/easyrecyclerview/SimpleSmoothScroller.java b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleSmoothScroller.java similarity index 96% rename from app/src/main/java/com/hippo/easyrecyclerview/SimpleSmoothScroller.java rename to app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleSmoothScroller.java index a92381a4a..8956f5682 100644 --- a/app/src/main/java/com/hippo/easyrecyclerview/SimpleSmoothScroller.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleSmoothScroller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.easyrecyclerview; +package com.hippo.ehviewer.widget.easyrecyclerview; import android.content.Context; diff --git a/app/src/main/java/com/hippo/preference/DialogPreference.java b/app/src/main/java/com/hippo/ehviewer/widget/preference/DialogPreference.java similarity index 99% rename from app/src/main/java/com/hippo/preference/DialogPreference.java rename to app/src/main/java/com/hippo/ehviewer/widget/preference/DialogPreference.java index e954dd87f..9ed8f51ec 100644 --- a/app/src/main/java/com/hippo/preference/DialogPreference.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/preference/DialogPreference.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.preference; +package com.hippo.ehviewer.widget.preference; import android.app.Dialog; import android.content.Context; @@ -37,7 +37,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.preference.Preference; -import com.hippo.app.BaseDialogBuilder; +import com.hippo.ehviewer.widget.BaseDialogBuilder; import com.hippo.ehviewer.R; /** diff --git a/app/src/main/java/com/hippo/preference/MessagePreference.java b/app/src/main/java/com/hippo/ehviewer/widget/preference/MessagePreference.java similarity index 98% rename from app/src/main/java/com/hippo/preference/MessagePreference.java rename to app/src/main/java/com/hippo/ehviewer/widget/preference/MessagePreference.java index 16175219d..41f1679ae 100644 --- a/app/src/main/java/com/hippo/preference/MessagePreference.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/preference/MessagePreference.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.preference; +package com.hippo.ehviewer.widget.preference; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/hippo/preference/UrlPreference.kt b/app/src/main/java/com/hippo/ehviewer/widget/preference/UrlPreference.kt similarity index 96% rename from app/src/main/java/com/hippo/preference/UrlPreference.kt rename to app/src/main/java/com/hippo/ehviewer/widget/preference/UrlPreference.kt index 5fd2dc9fa..b02347af8 100644 --- a/app/src/main/java/com/hippo/preference/UrlPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/preference/UrlPreference.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.preference +package com.hippo.ehviewer.widget.preference import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefresh.kt b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefresh.kt similarity index 99% rename from app/src/main/java/com/hippo/widget/pullrefresh/PullRefresh.kt rename to app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefresh.kt index ea11872e6..7de5c0ef9 100644 --- a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefresh.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefresh.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget.pullrefresh +package com.hippo.ehviewer.widget.pullrefresh import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset diff --git a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshIndicator.kt b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicator.kt similarity index 99% rename from app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshIndicator.kt rename to app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicator.kt index bb83d138e..c355298a3 100644 --- a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshIndicator.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget.pullrefresh +package com.hippo.ehviewer.widget.pullrefresh import androidx.compose.animation.Crossfade import androidx.compose.animation.core.LinearEasing diff --git a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshIndicatorTransform.kt b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicatorTransform.kt similarity index 98% rename from app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshIndicatorTransform.kt rename to app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicatorTransform.kt index 13c28d5b6..1893cd2d8 100644 --- a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshIndicatorTransform.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicatorTransform.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget.pullrefresh +package com.hippo.ehviewer.widget.pullrefresh import androidx.compose.animation.core.LinearOutSlowInEasing import androidx.compose.ui.Modifier diff --git a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshState.kt b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshState.kt similarity index 99% rename from app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshState.kt rename to app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshState.kt index 0107ba71c..4c63d999d 100644 --- a/app/src/main/java/com/hippo/widget/pullrefresh/PullRefreshState.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget.pullrefresh +package com.hippo.ehviewer.widget.pullrefresh import androidx.compose.animation.core.animate import androidx.compose.foundation.MutatorMutex diff --git a/app/src/main/java/com/hippo/widget/recyclerview/AutoStaggeredGridLayoutManager.kt b/app/src/main/java/com/hippo/ehviewer/widget/recyclerview/AutoStaggeredGridLayoutManager.kt similarity index 98% rename from app/src/main/java/com/hippo/widget/recyclerview/AutoStaggeredGridLayoutManager.kt rename to app/src/main/java/com/hippo/ehviewer/widget/recyclerview/AutoStaggeredGridLayoutManager.kt index 22e10b5ce..f910a7d2d 100644 --- a/app/src/main/java/com/hippo/widget/recyclerview/AutoStaggeredGridLayoutManager.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/recyclerview/AutoStaggeredGridLayoutManager.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hippo.widget.recyclerview +package com.hippo.ehviewer.widget.recyclerview import android.view.View import androidx.compose.runtime.Composable diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 41e8ec722..f4f0bb48f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -60,7 +60,6 @@ import androidx.lifecycle.lifecycleScope import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.slider.Slider import com.google.android.material.transition.MaterialContainerTransform -import com.hippo.app.EditTextDialogBuilder import com.hippo.ehviewer.AppConfig import com.hippo.ehviewer.BuildConfig import com.hippo.ehviewer.EhApplication @@ -71,8 +70,9 @@ import com.hippo.ehviewer.databinding.ReaderActivityBinding import com.hippo.ehviewer.gallery.ArchivePageLoader import com.hippo.ehviewer.gallery.EhPageLoader import com.hippo.ehviewer.gallery.PageLoader2 +import com.hippo.ehviewer.image.Image import com.hippo.ehviewer.ui.EhActivity -import com.hippo.image.Image +import com.hippo.ehviewer.widget.EditTextDialogBuilder import com.hippo.unifile.UniFile import com.hippo.util.ExceptionUtils import com.hippo.util.getParcelableCompat diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt index 38915bc4c..3d02cf827 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt @@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.ui.reader.loader import androidx.annotation.CallSuper import androidx.collection.lruCache -import com.hippo.image.Image +import com.hippo.ehviewer.image.Image import com.hippo.yorozuya.MathUtils import com.hippo.yorozuya.OSUtils import eu.kanade.tachiyomi.source.model.Page diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt index 3fba23c1c..a56b6545e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt @@ -1,6 +1,6 @@ package eu.kanade.tachiyomi.ui.reader.model -import com.hippo.image.Image +import com.hippo.ehviewer.image.Image import eu.kanade.tachiyomi.source.model.Page class ReaderPage(index: Int) : Page(index) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt index 8bb7ef111..03761804b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt @@ -13,7 +13,7 @@ import androidx.core.graphics.red import androidx.core.widget.NestedScrollView import androidx.lifecycle.lifecycleScope import com.hippo.ehviewer.databinding.ReaderColorFilterSettingsBinding -import com.hippo.image.Image +import com.hippo.ehviewer.image.Image import eu.kanade.tachiyomi.core.preference.getAndSet import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.util.preference.asHotFlow diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8ba59c3e5..3db57dcd7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -51,7 +51,7 @@ app:headerLayout="@layout/nav_header_main" app:menu="@menu/nav_drawer_main" /> - - - - diff --git a/app/src/main/res/layout/item_gallery_comment.xml b/app/src/main/res/layout/item_gallery_comment.xml index 0870ff8d6..25faf8fba 100644 --- a/app/src/main/res/layout/item_gallery_comment.xml +++ b/app/src/main/res/layout/item_gallery_comment.xml @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" /> - . --> - - - - - + diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml index dfea66f2c..af756eb50 100644 --- a/app/src/main/res/layout/scene_favorites.xml +++ b/app/src/main/res/layout/scene_favorites.xml @@ -22,13 +22,13 @@ android:paddingTop="16dp" app:layout_behavior="@string/searchbar_scrolling_view_behavior"> - - - + diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml index 0fd820208..776e1868d 100644 --- a/app/src/main/res/layout/scene_gallery_comments.xml +++ b/app/src/main/res/layout/scene_gallery_comments.xml @@ -25,7 +25,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml index 88e8e10f7..9362208d6 100644 --- a/app/src/main/res/layout/scene_gallery_list.xml +++ b/app/src/main/res/layout/scene_gallery_list.xml @@ -22,7 +22,7 @@ android:paddingTop="16dp" app:layout_behavior="@string/searchbar_scrolling_view_behavior"> - - - + diff --git a/app/src/main/res/layout/scene_searchbar.xml b/app/src/main/res/layout/scene_searchbar.xml index 8d0fda26e..53add64a7 100644 --- a/app/src/main/res/layout/scene_searchbar.xml +++ b/app/src/main/res/layout/scene_searchbar.xml @@ -47,7 +47,7 @@ - - + diff --git a/app/src/main/res/layout/search_normal.xml b/app/src/main/res/layout/search_normal.xml index 735b814c6..3ca6c0860 100644 --- a/app/src/main/res/layout/search_normal.xml +++ b/app/src/main/res/layout/search_normal.xml @@ -27,7 +27,7 @@ android:layout_marginBottom="@dimen/search_item_interval" app:chipSpacingHorizontal="24dp" /> - - + - - - - -