From 3b3b251c21dd7abc1e380df9f8884bb3743848db Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 4 Jan 2023 17:04:12 +0800 Subject: [PATCH] Reformat code --- .../com/hippo/beerbelly/DiskLruCache.java | 32 ++++----- .../java/com/hippo/ehviewer/EhApplication.kt | 2 - .../com/hippo/ehviewer/spider/SpiderDen.java | 5 +- .../hippo/ehviewer/ui/CommonOperations.java | 2 - .../java/com/hippo/ehviewer/ui/EhActivity.kt | 9 ++- .../ehviewer/ui/GalleryInfoBottomSheet.kt | 1 - .../com/hippo/ehviewer/ui/MainActivity.kt | 15 +++- .../com/hippo/ehviewer/ui/SettingsActivity.kt | 2 - .../ehviewer/ui/fragment/FilterFragment.kt | 4 +- .../hippo/ehviewer/ui/scene/BaseScene.java | 2 - .../ehviewer/ui/scene/CookieSignInScene.java | 1 - .../ehviewer/ui/scene/FavoritesScene.java | 1 - .../ui/scene/GalleryCommentsScene.java | 4 +- .../ehviewer/ui/scene/GalleryDetailScene.java | 69 +++++++++---------- .../ehviewer/ui/scene/GalleryListScene.java | 7 +- .../ui/scene/GalleryPreviewsScene.java | 1 - .../ehviewer/ui/scene/ProgressScene.java | 1 - .../hippo/ehviewer/ui/scene/SignInScene.java | 3 - app/src/main/java/com/hippo/image/Image.kt | 9 ++- .../java/com/hippo/scene/StageActivity.java | 3 +- .../java/com/hippo/widget/ContentLayout.java | 4 +- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 31 files changed, 87 insertions(+), 100 deletions(-) diff --git a/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java b/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java index c3a92b434..9ab055a83 100644 --- a/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java +++ b/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java @@ -329,21 +329,7 @@ public final class DiskLruCache implements Closeable { } else { throw new IOException("unexpected journal line: " + line); } - } private final Callable cleanupCallable = new Callable<>() { - public Void call() throws Exception { - synchronized (DiskLruCache.this) { - if (journalWriter == null) { - return null; // Closed. - } - trimToSize(); - if (journalRebuildRequired()) { - rebuildJournal(); - redundantOpCount = 0; - } - } - return null; - } - }; + } /** * Computes the initial size and collects garbage as a part of opening the @@ -366,7 +352,21 @@ public final class DiskLruCache implements Closeable { i.remove(); } } - } + } private final Callable cleanupCallable = new Callable<>() { + public Void call() throws Exception { + synchronized (DiskLruCache.this) { + if (journalWriter == null) { + return null; // Closed. + } + trimToSize(); + if (journalRebuildRequired()) { + rebuildJournal(); + redundantOpCount = 0; + } + } + return null; + } + }; /** * Creates a new journal that omits redundant information. This replaces the diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index b536008e2..c0473d61d 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -35,10 +35,8 @@ import coil.ImageLoaderFactory import coil.disk.DiskCache import com.hippo.Native import com.hippo.app.BaseDialogBuilder -import com.hippo.ehviewer.client.EhClient import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhDns -import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.EhRequestBuilder import com.hippo.ehviewer.client.EhSSLSocketFactory import com.hippo.ehviewer.client.EhTagDatabase diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java index 18c826a9e..d869d54be 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java @@ -33,7 +33,6 @@ import com.hippo.io.UniFileInputStreamPipe; import com.hippo.io.UniFileOutputStreamPipe; import com.hippo.streampipe.InputStreamPipe; import com.hippo.streampipe.OutputStreamPipe; -import com.hippo.unifile.FilenameFilter; import com.hippo.unifile.UniFile; import com.hippo.yorozuya.FileUtils; import com.hippo.yorozuya.IOUtils; @@ -49,10 +48,10 @@ public final class SpiderDen { @Nullable private static SimpleDiskCache sCache; - @Nullable - private UniFile mDownloadDir; private final GalleryInfo mGalleryInfo; private final long mGid; + @Nullable + private UniFile mDownloadDir; private volatile int mMode = SpiderQueen.MODE_READ; public SpiderDen(GalleryInfo galleryInfo) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java index 9130eed34..fe3124ffd 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java @@ -21,8 +21,6 @@ import android.content.Intent; import android.os.Build; import androidx.core.content.ContextCompat; -import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.LifecycleKt; import com.hippo.app.ListCheckBoxDialogBuilder; import com.hippo.ehviewer.EhApplication; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt index 0d41f0f2e..4e17b2864 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt @@ -51,7 +51,8 @@ abstract class EhActivity : AppCompatActivity() { } override fun onCreate(savedInstanceState: Bundle?) { - layoutInflater.factory2 = LayoutInflaterFactory(delegate).addOnViewCreatedListener(WindowInsetsHelper.LISTENER) + layoutInflater.factory2 = + LayoutInflaterFactory(delegate).addOnViewCreatedListener(WindowInsetsHelper.LISTENER) super.onCreate(savedInstanceState) (application as EhApplication).registerActivity(this) } @@ -78,7 +79,11 @@ abstract class EhActivity : AppCompatActivity() { @RequiresApi(Build.VERSION_CODES.TIRAMISU) fun checkAndRequestNotificationPermission() { - if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) return + if (ContextCompat.checkSelfPermission( + this, + Manifest.permission.POST_NOTIFICATIONS + ) == PackageManager.PERMISSION_GRANTED + ) return if (Settings.getNotificationRequired()) return requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS) } 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 928a1171c..889522e05 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt @@ -29,7 +29,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.util.addTextToClipboard import com.hippo.util.tellClipboard class GalleryInfoBottomSheet(detail: GalleryDetail) : BottomSheetDialogFragment() { 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 5e0290d14..8ef348212 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt @@ -604,8 +604,14 @@ class MainActivity : StageActivity(), NavigationView.OnNavigationItemSelectedLis private val mDrawerOnBackPressedCallback = object : OnBackPressedCallback(false), DrawerListener { val slideThreshold = 0.05 - override fun handleOnBackPressed() { mDrawerLayout?.closeDrawers() } - override fun onDrawerSlide(drawerView: View, slideOffset: Float) { isEnabled = slideOffset > slideThreshold } + override fun handleOnBackPressed() { + mDrawerLayout?.closeDrawers() + } + + override fun onDrawerSlide(drawerView: View, slideOffset: Float) { + isEnabled = slideOffset > slideThreshold + } + override fun onDrawerOpened(drawerView: View) {} override fun onDrawerClosed(drawerView: View) {} override fun onDrawerStateChanged(newState: Int) {} @@ -616,7 +622,10 @@ class MainActivity : StageActivity(), NavigationView.OnNavigationItemSelectedLis init { registerLaunchMode(SignInScene::class.java, SceneFragment.LAUNCH_MODE_SINGLE_TASK) - registerLaunchMode(WebViewSignInScene::class.java, SceneFragment.LAUNCH_MODE_SINGLE_TASK) + registerLaunchMode( + WebViewSignInScene::class.java, + SceneFragment.LAUNCH_MODE_SINGLE_TASK + ) registerLaunchMode(CookieSignInScene::class.java, SceneFragment.LAUNCH_MODE_SINGLE_TASK) registerLaunchMode(SelectSiteScene::class.java, SceneFragment.LAUNCH_MODE_SINGLE_TASK) registerLaunchMode(GalleryListScene::class.java, SceneFragment.LAUNCH_MODE_SINGLE_TOP) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt index b232f1f42..0fe36934b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt @@ -15,12 +15,10 @@ */ package com.hippo.ehviewer.ui -import android.content.res.Configuration import android.os.Bundle import android.view.MenuItem import android.widget.TextView import androidx.annotation.StringRes -import androidx.core.view.WindowCompat import androidx.fragment.app.FragmentTransaction import com.google.android.material.appbar.AppBarLayout import com.google.android.material.floatingactionbutton.FloatingActionButton 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 fdc7f5cca..f80e9e540 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 @@ -282,9 +282,9 @@ class FilterFragment : BaseFragment() { count += if (0 == size) 0 else size + 1 size = mTagNamespaceFilterList.size count += if (0 == size) 0 else size + 1 - size = mCommenterFilterList.size; + size = mCommenterFilterList.size count += if (0 == size) 0 else size + 1 - size = mCommentFilterList.size; + size = mCommentFilterList.size count += if (0 == size) 0 else size + 1 return count } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java index bd64898fe..961d26eb9 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java @@ -18,12 +18,10 @@ package com.hippo.ehviewer.ui.scene; import android.annotation.SuppressLint; import android.content.Context; -import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.os.Parcelable; import android.util.SparseArray; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java index 606935d39..b92608d04 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java @@ -30,7 +30,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.lifecycle.LifecycleKt; import com.google.android.material.textfield.TextInputLayout; import com.hippo.app.BaseDialogBuilder; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index ee2e005cc..fb5616367 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -36,7 +36,6 @@ import androidx.core.view.GravityCompat; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsAnimationCompat; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.lifecycle.LifecycleKt; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index 594a1b5a0..d16049b33 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -50,7 +50,6 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsAnimationCompat; -import androidx.lifecycle.LifecycleKt; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -109,6 +108,7 @@ public final class GalleryCommentsScene extends BaseToolbarScene private static final int TYPE_COMMENT = 0; private static final int TYPE_MORE = 1; private static final int TYPE_PROGRESS = 2; + private final EditPanelOnBackPressedCallback mCallback = new EditPanelOnBackPressedCallback(); private GalleryDetail mGalleryDetail; @Nullable private EasyRecyclerView mRecyclerView; @@ -134,8 +134,6 @@ public final class GalleryCommentsScene extends BaseToolbarScene private boolean mShowAllComments = false; private boolean mRefreshingComments = false; - private final EditPanelOnBackPressedCallback mCallback = new EditPanelOnBackPressedCallback(); - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); 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 98a83fb0d..90553baf3 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 @@ -57,7 +57,6 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.core.widget.NestedScrollView; -import androidx.lifecycle.LifecycleKt; import com.google.android.material.progressindicator.CircularProgressIndicator; import com.google.android.material.snackbar.Snackbar; @@ -1764,6 +1763,40 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O } } + private static class DeleteDialogHelper implements DialogInterface.OnClickListener { + private final com.hippo.ehviewer.download.DownloadManager mDownloadManager; + private final GalleryInfo mGalleryInfo; + private final CheckBoxDialogBuilder mBuilder; + + public DeleteDialogHelper(com.hippo.ehviewer.download.DownloadManager downloadManager, + GalleryInfo galleryInfo, CheckBoxDialogBuilder builder) { + mDownloadManager = downloadManager; + mGalleryInfo = galleryInfo; + mBuilder = builder; + } + + @Override + public void onClick(DialogInterface dialog, int which) { + if (which != DialogInterface.BUTTON_POSITIVE) { + return; + } + + // Delete + if (null != mDownloadManager) { + mDownloadManager.deleteDownload(mGalleryInfo.gid); + } + + // Delete image files + boolean checked = mBuilder.isChecked(); + Settings.putRemoveImageFiles(checked); + if (checked) { + UniFile file = SpiderDen.getGalleryDownloadDir(mGalleryInfo.gid); + EhDB.removeDownloadDirname(mGalleryInfo.gid); + deleteFileAsync(file); + } + } + } + private class ArchiveListDialogHelper implements AdapterView.OnItemClickListener, DialogInterface.OnDismissListener, EhClient.Callback { @@ -2044,38 +2077,4 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O request.enqueue(GalleryDetailScene.this); } } - - private static class DeleteDialogHelper implements DialogInterface.OnClickListener { - private final com.hippo.ehviewer.download.DownloadManager mDownloadManager; - private final GalleryInfo mGalleryInfo; - private final CheckBoxDialogBuilder mBuilder; - - public DeleteDialogHelper(com.hippo.ehviewer.download.DownloadManager downloadManager, - GalleryInfo galleryInfo, CheckBoxDialogBuilder builder) { - mDownloadManager = downloadManager; - mGalleryInfo = galleryInfo; - mBuilder = builder; - } - - @Override - public void onClick(DialogInterface dialog, int which) { - if (which != DialogInterface.BUTTON_POSITIVE) { - return; - } - - // Delete - if (null != mDownloadManager) { - mDownloadManager.deleteDownload(mGalleryInfo.gid); - } - - // Delete image files - boolean checked = mBuilder.isChecked(); - Settings.putRemoveImageFiles(checked); - if (checked) { - UniFile file = SpiderDen.getGalleryDownloadDir(mGalleryInfo.gid); - EhDB.removeDownloadDirname(mGalleryInfo.gid); - deleteFileAsync(file); - } - } - } } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 3fd57ba68..9aff19ab0 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -52,7 +52,6 @@ import androidx.core.view.GravityCompat; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsAnimationCompat; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.lifecycle.LifecycleKt; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -140,6 +139,7 @@ public final class GalleryListScene extends SearchBarScene private final static int STATE_SEARCH = 2; private final static int STATE_SEARCH_SHOW_LIST = 3; private static final long ANIMATE_TIME = 300L; + private final SearchStateOnBackPressedCallback mCallback = new SearchStateOnBackPressedCallback(); /*--------------- Whole life cycle ---------------*/ @@ -215,8 +215,6 @@ public final class GalleryListScene extends SearchBarScene private FavouriteStatusRouter.Listener mFavouriteStatusRouterListener; private boolean mIsTopList = false; - private final SearchStateOnBackPressedCallback mCallback = new SearchStateOnBackPressedCallback(); - @Nullable private static String getSuitableTitleForUrlBuilder( Resources resources, ListUrlBuilder urlBuilder, boolean appName) { @@ -1697,7 +1695,8 @@ public final class GalleryListScene extends SearchBarScene @Override public void handleOnBackPressed() { switch (mState) { - case STATE_NORMAL -> throw new IllegalStateException("SearchStateOnBackPressedCallback should not be enabled on STATE_NORMAL"); + case STATE_NORMAL -> + throw new IllegalStateException("SearchStateOnBackPressedCallback should not be enabled on STATE_NORMAL"); case STATE_SIMPLE_SEARCH, STATE_SEARCH -> setState(STATE_NORMAL); case STATE_SEARCH_SHOW_LIST -> setState(STATE_SEARCH); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java index b9b210d0d..722053072 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java @@ -32,7 +32,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; -import androidx.lifecycle.LifecycleKt; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.slider.Slider; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java index 63057a197..0793f32b7 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java @@ -27,7 +27,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.lifecycle.LifecycleKt; import com.hippo.ehviewer.R; import com.hippo.ehviewer.client.EhClient; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java index 275dd56e0..c9ccfd659 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java @@ -29,7 +29,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.lifecycle.LifecycleKt; import com.google.android.material.textfield.TextInputLayout; import com.hippo.app.BaseDialogBuilder; @@ -50,8 +49,6 @@ import com.hippo.yorozuya.AssertUtils; import com.hippo.yorozuya.IntIdGenerator; import com.hippo.yorozuya.ViewUtils; -import kotlinx.coroutines.GlobalScope; - public final class SignInScene extends SolidScene implements EditText.OnEditorActionListener, View.OnClickListener { diff --git a/app/src/main/java/com/hippo/image/Image.kt b/app/src/main/java/com/hippo/image/Image.kt index e787d022f..42247dd79 100644 --- a/app/src/main/java/com/hippo/image/Image.kt +++ b/app/src/main/java/com/hippo/image/Image.kt @@ -69,8 +69,13 @@ class Image private constructor(source: Source, private val byteBuffer: ByteBuff companion object { val screenWidth = EhApplication.application.resources.displayMetrics.widthPixels val screenHeight = EhApplication.application.resources.displayMetrics.heightPixels - val isWideColorGamut = EhApplication.application.resources.configuration.isScreenWideColorGamut - var colorSpace = ColorSpace.get(if (isWideColorGamut && EhApplication.readerPreferences.wideColorGamut().get()) ColorSpace.Named.DISPLAY_P3 else ColorSpace.Named.SRGB) + val isWideColorGamut = + EhApplication.application.resources.configuration.isScreenWideColorGamut + var colorSpace = ColorSpace.get( + if (isWideColorGamut && EhApplication.readerPreferences.wideColorGamut() + .get() + ) ColorSpace.Named.DISPLAY_P3 else ColorSpace.Named.SRGB + ) @Throws(DecodeException::class) @JvmStatic diff --git a/app/src/main/java/com/hippo/scene/StageActivity.java b/app/src/main/java/com/hippo/scene/StageActivity.java index 4154b95d2..71d6e63cd 100644 --- a/app/src/main/java/com/hippo/scene/StageActivity.java +++ b/app/src/main/java/com/hippo/scene/StageActivity.java @@ -55,10 +55,9 @@ public abstract class StageActivity extends EhActivity { private final ArrayList mDelaySceneTagList = new ArrayList<>(); private final AtomicInteger mIdGenerator = new AtomicInteger(); private final SceneViewComparator mSceneViewComparator = new SceneViewComparator(); + private final OnBackPressedCallback callback = new BackPressCallBack(); private int mStageId = IntIdGenerator.INVALID_ID; - private OnBackPressedCallback callback = new BackPressCallBack(); - public static void registerLaunchMode(Class clazz, @SceneFragment.LaunchMode int launchMode) { if (launchMode != SceneFragment.LAUNCH_MODE_STANDARD && launchMode != SceneFragment.LAUNCH_MODE_SINGLE_TOP && diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java index 30d9e2632..722d232f6 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -197,6 +197,8 @@ public class ContentLayout extends FrameLayout { */ private final IntIdGenerator mIdGenerator = new IntIdGenerator(); private final LayoutManagerUtils.OnScrollToPositionListener mOnScrollToPositionListener = ContentHelper.this::onScrollToPosition; + protected String mPrev; + protected String mNext; private TextView mTipView; private SwipeRefreshLayout mRefreshLayout; private LinearProgressIndicator mBottomProgress; @@ -227,8 +229,6 @@ public class ContentLayout extends FrameLayout { */ private int mPages; private int mNextPage; - protected String mPrev; - protected String mNext; private int mCurrentTaskId; private int mCurrentTaskType; private int mCurrentTaskPage; diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 71ce555d3..5438af269 100755 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -339,7 +339,6 @@ Gerade Gestern Vor %d Tagen - H@H Downloader Keine Archivdatei Archivdatei wird heruntergeladen Fehler beim Herunterladen der Archivdatei diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index fd0a9e6e8..0db27419a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -440,7 +440,6 @@ Descarga en pausa La contraseña no puede estar vacía Ocurrió algo malo - H@H Downloader Privacidad Bloqueo de galerías Título diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d4339f5d6..0ca20864a 100755 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -468,7 +468,6 @@ %d an ans - H@H Downloader Aucun fiche archives Téléchargement du fiche archives a commencé Téléchargement du fiche archives a échoué diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2ee4cd5d0..24a42858c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -458,7 +458,6 @@ 年 - H@Hからダウンロード 圧縮パッケージなし 圧縮パッケージのダウンロードを開始しました 圧縮パッケージをダウンロードできませんでした diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 8a2f6d8ce..a41af4b14 100755 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -448,7 +448,6 @@ 년 - H@H 다운로더 아카이브 없음 아카이브 다운로드가 시작되었습니다. 아카이브 다운로드에 실패했습니다. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index de7ca9762..e4587272c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -463,7 +463,6 @@ ปี - H@H Downloader ยังไม่มีไฟล์บีบอัด เริ่มการดาวน์โหลดบีบอัด การดาวน์โหลดไฟล์บีบอัดล้มเหลว diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4c5b55bc7..e0393a750 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -526,7 +526,6 @@ 年 - 通过 H@H 下载 没有压缩包 开始下载压缩包 无法下载压缩包 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index bc39b2e9a..d69f4c1b0 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -505,7 +505,6 @@ 年 - 通過 H@H 下載 沒有壓縮包 開始下載壓縮包 無法下載壓縮包 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 10ca023fc..01a34e847 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -514,7 +514,6 @@ 年 - 透過 H@H 下載 沒有壓縮檔 開始下載壓縮檔 下載失敗 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cda6be33b..e696dcd43 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -593,7 +593,6 @@ year years - H@H Downloader No Archives Archive download started Failed to download archive