From f58b4959e4747205140923799e0ecb4ec8add85d Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 16 Sep 2022 12:39:50 +0800 Subject: [PATCH] Reformat code --- app/src/main/AndroidManifest.xml | 2 +- .../java/com/hippo/ehviewer/ui/EhActivity.kt | 5 ++-- .../hippo/ehviewer/ui/GalleryActivity.java | 26 ++++++++++--------- .../com/hippo/ehviewer/ui/SecurityActivity.kt | 1 - .../com/hippo/ehviewer/ui/SettingsActivity.kt | 3 ++- .../ui/fragment/BasePreferenceFragment.java | 3 ++- .../ehviewer/ui/scene/DownloadsScene.java | 6 ----- .../ehviewer/ui/scene/FavoritesScene.java | 4 --- .../ehviewer/ui/scene/GalleryListScene.java | 2 +- .../hippo/ehviewer/ui/scene/SolidScene.java | 1 - 10 files changed, 23 insertions(+), 30 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 363c66fca..1d90bcafe 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,7 +23,7 @@ android:name="android.hardware.touchscreen" android:required="false" /> - + 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 aaed9d5b7..00c13933e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt @@ -104,7 +104,8 @@ abstract class EhActivity : AppCompatActivity() { val locked_resume_time = System.currentTimeMillis() / 1000 val locked_delay_time = locked_resume_time - locked_last_leave_time if (Settings.getSecurity() && locked_delay_time >= Settings.getSecurityDelay() * 60 - && isAuthenticationSupported(this) && EhApplication.locked ) { + && isAuthenticationSupported(this) && EhApplication.locked + ) { startActivity(Intent(this, SecurityActivity::class.java)) } super.onResume() @@ -125,7 +126,7 @@ abstract class EhActivity : AppCompatActivity() { } @RequiresApi(api = Build.VERSION_CODES.TIRAMISU) - fun checkAndRequestNotificationPermission(){ + fun checkAndRequestNotificationPermission() { if (ContextCompat.checkSelfPermission( this, Manifest.permission.POST_NOTIFICATIONS diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java index 0f5857b46..aac8cea7a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -290,16 +290,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan } outState.putInt(KEY_PAGE, mPage); outState.putInt(KEY_CURRENT_INDEX, mCurrentIndex); - } ActivityResultLauncher requestStoragePermissionLauncher = registerForActivityResult( - new ActivityResultContracts.RequestPermission(), - result -> { - if (result && mSavingPage != -1) { - saveImage(mSavingPage); - } else { - Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show(); - } - mSavingPage = -1; - }); + } @Override protected void attachBaseContext(@NonNull Context newBase) { @@ -312,7 +303,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan break; } super.attachBaseContext(newBase); - } + } ActivityResultLauncher requestStoragePermissionLauncher = registerForActivityResult( + new ActivityResultContracts.RequestPermission(), + result -> { + if (result && mSavingPage != -1) { + saveImage(mSavingPage); + } else { + Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show(); + } + mSavingPage = -1; + }); @Override @SuppressWarnings({"WrongConstant"}) @@ -410,7 +410,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan if (scroll < 0.0f) { if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) { mGalleryView.pageLeft(); - } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT){ + } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) { mGalleryView.pageRight(); } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) { mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll); @@ -1375,4 +1375,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan } + + } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt index 67154c6e6..0a5de95b5 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/SecurityActivity.kt @@ -19,7 +19,6 @@ package com.hippo.ehviewer.ui import android.content.Context -import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.biometric.BiometricManager import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL 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 f35dea775..963d6d79a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt @@ -33,7 +33,8 @@ class SettingsActivity : EhActivity() { setSupportActionBar(findViewById(R.id.toolbar)) val bar = supportActionBar bar?.setDisplayHomeAsUpEnabled(true) - WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0 + WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = + (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0 if (savedInstanceState == null) { supportFragmentManager .beginTransaction() diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java index 335d080ad..0628f4c87 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java @@ -70,7 +70,8 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat .replace(R.id.fragment, classObj) .addToBackStack(null) .commitAllowingStateLoss(); - } catch (ClassNotFoundException | IllegalAccessException | java.lang.InstantiationException ignored) { + } catch (ClassNotFoundException | IllegalAccessException | + java.lang.InstantiationException ignored) { } return true; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java index cc23711f5..0640be3fc 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -72,9 +72,7 @@ import com.hippo.ehviewer.download.DownloadService; import com.hippo.ehviewer.spider.SpiderDen; import com.hippo.ehviewer.ui.GalleryActivity; import com.hippo.ehviewer.widget.SimpleRatingView; -import com.hippo.io.UniFileInputStreamPipe; import com.hippo.scene.Announcer; -import com.hippo.streampipe.InputStreamPipe; import com.hippo.unifile.UniFile; import com.hippo.util.IoThreadPoolExecutor; import com.hippo.view.ViewTransition; @@ -83,14 +81,10 @@ import com.hippo.widget.LoadImageView; import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager; import com.hippo.yorozuya.AssertUtils; import com.hippo.yorozuya.FileUtils; -import com.hippo.yorozuya.IOUtils; import com.hippo.yorozuya.ObjectUtils; import com.hippo.yorozuya.ViewUtils; import com.hippo.yorozuya.collect.LongList; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; 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 20d48961d..bce115a24 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 @@ -21,13 +21,10 @@ import android.app.Activity; import android.content.Context; import android.content.DialogInterface; import android.content.res.Resources; -import android.graphics.Point; -import android.graphics.Rect; import android.os.Bundle; import android.text.InputType; import android.text.TextUtils; import android.util.SparseBooleanArray; -import android.view.Display; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -77,7 +74,6 @@ import com.hippo.widget.ContentLayout; import com.hippo.widget.FabLayout; import com.hippo.widget.SearchBarMover; import com.hippo.yorozuya.AssertUtils; -import com.hippo.yorozuya.LayoutUtils; import com.hippo.yorozuya.ObjectUtils; import com.hippo.yorozuya.SimpleHandler; import com.hippo.yorozuya.ViewUtils; 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 7fb378570..5928f7d1b 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 @@ -215,7 +215,7 @@ public final class GalleryListScene extends BaseScene } }; // Double click back exit - private long mPressBackTime = 0; + private final long mPressBackTime = 0; private boolean mHasFirstRefresh = false; private int mNavCheckedId = 0; private DownloadManager mDownloadManager; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java index 4aa9ed966..dcc731417 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java @@ -20,7 +20,6 @@ import android.os.Bundle; import android.util.Log; import com.hippo.ehviewer.Settings; -import com.hippo.ehviewer.client.EhUtils; import com.hippo.scene.Announcer; /**