Reformat code

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<Void> 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<Void> 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

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

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) {

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;

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)
     }

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() {

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)

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

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
         }

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;

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;

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;
 

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);

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<ArchiveParser.Result> {
 
@@ -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);
-            }
-        }
-    }
 }

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);
             }

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;

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;

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 {
 

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

app/src/main/java/com/hippo/scene/StageActivity.java

@@ -55,10 +55,9 @@ public abstract class StageActivity extends EhActivity {
     private final ArrayList<String> 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 &&

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;