From 3cb024b7f5231aa581a92ed174481ece8154681f Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 25 May 2022 15:25:57 +0800 Subject: [PATCH] Do code reformat --- .../ehviewer/download/DownloadService.java | 1 - .../hippo/ehviewer/ui/GalleryActivity.java | 21 +++++---- .../com/hippo/ehviewer/ui/MainActivity.java | 1 - .../ehviewer/ui/fragment/PrivacyFragment.java | 3 -- .../hippo/ehviewer/ui/scene/SecurityScene.kt | 3 +- .../java/com/hippo/widget/BatteryView.java | 45 ++++++++++--------- .../main/java/com/hippo/widget/TextClock.java | 33 +++++++------- .../main/res/layout/gallery_detail_header.xml | 2 +- app/src/main/res/layout/item_gallery_list.xml | 2 +- 9 files changed, 54 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java index f34d0881e..ad5c091fc 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java @@ -29,7 +29,6 @@ import androidx.annotation.Nullable; import androidx.core.app.NotificationChannelCompat; import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; -import androidx.core.content.ContextCompat; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; 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 044696e7a..111ea416d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -49,7 +49,6 @@ import android.webkit.MimeTypeMap; import android.widget.FrameLayout; import android.widget.SeekBar; import android.widget.Spinner; -import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; @@ -261,6 +260,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan mGalleryInfo = intent.getParcelableExtra(KEY_GALLERY_INFO); mPage = intent.getIntExtra(KEY_PAGE, -1); buildProvider(); + } + + private void onRestore(@NonNull Bundle savedInstanceState) { + mAction = savedInstanceState.getString(KEY_ACTION); + mFilename = savedInstanceState.getString(KEY_FILENAME); + mUri = savedInstanceState.getParcelable(KEY_URI); + mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO); + mPage = savedInstanceState.getInt(KEY_PAGE, -1); + mCurrentIndex = savedInstanceState.getInt(KEY_CURRENT_INDEX); + buildProvider(); } ActivityResultLauncher requestStoragePermissionLauncher = registerForActivityResult( new ActivityResultContracts.RequestPermission(), result -> { @@ -272,16 +281,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan mSavingPage = -1; }); - private void onRestore(@NonNull Bundle savedInstanceState) { - mAction = savedInstanceState.getString(KEY_ACTION); - mFilename = savedInstanceState.getString(KEY_FILENAME); - mUri = savedInstanceState.getParcelable(KEY_URI); - mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO); - mPage = savedInstanceState.getInt(KEY_PAGE, -1); - mCurrentIndex = savedInstanceState.getInt(KEY_CURRENT_INDEX); - buildProvider(); - } - @Override protected void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java index 70964ef84..7f48591c5 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -28,7 +28,6 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; -import android.text.TextUtils; import android.view.Gravity; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.java index 0055ad3e2..c7da50119 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.java @@ -1,13 +1,10 @@ package com.hippo.ehviewer.ui.fragment; import android.os.Bundle; -import android.text.TextUtils; import androidx.annotation.Nullable; -import androidx.preference.Preference; import com.hippo.ehviewer.R; -import com.hippo.ehviewer.Settings; /** * Created by Mo10 on 2018/2/10. diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt index 1448eb59a..19b796144 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt @@ -40,7 +40,8 @@ class SecurityScene : SolidScene() { private fun isAuthenticationSupported(): Boolean { val authenticators = BiometricManager.Authenticators.BIOMETRIC_WEAK or DEVICE_CREDENTIAL - return BiometricManager.from(requireContext()).canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS + return BiometricManager.from(requireContext()) + .canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS } private fun startAuthentication( diff --git a/app/src/main/java/com/hippo/widget/BatteryView.java b/app/src/main/java/com/hippo/widget/BatteryView.java index e3c45e16a..7e5fbc555 100644 --- a/app/src/main/java/com/hippo/widget/BatteryView.java +++ b/app/src/main/java/com/hippo/widget/BatteryView.java @@ -43,9 +43,14 @@ public class BatteryView extends AppCompatTextView { private BatteryDrawable mDrawable; private boolean mAttached = false; private boolean mIsChargerWorking = false; + public BatteryView(Context context) { super(context); init(); + } + + public BatteryView(Context context, AttributeSet attrs) { + this(context, attrs, 0); } private final Runnable mCharger = new Runnable() { private int level = 0; @@ -61,10 +66,6 @@ public class BatteryView extends AppCompatTextView { } }; - public BatteryView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - public BatteryView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); @@ -101,6 +102,24 @@ public class BatteryView extends AppCompatTextView { getHandler().post(mCharger); mIsChargerWorking = true; } + } + + private void stopCharger() { + if (mIsChargerWorking) { + getHandler().removeCallbacks(mCharger); + mIsChargerWorking = false; + } + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + + if (!mAttached) { + mAttached = true; + + registerReceiver(); + } } private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { @Override @@ -132,24 +151,6 @@ public class BatteryView extends AppCompatTextView { } }; - private void stopCharger() { - if (mIsChargerWorking) { - getHandler().removeCallbacks(mCharger); - mIsChargerWorking = false; - } - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - - if (!mAttached) { - mAttached = true; - - registerReceiver(); - } - } - @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); diff --git a/app/src/main/java/com/hippo/widget/TextClock.java b/app/src/main/java/com/hippo/widget/TextClock.java index 006ad109b..762435b68 100644 --- a/app/src/main/java/com/hippo/widget/TextClock.java +++ b/app/src/main/java/com/hippo/widget/TextClock.java @@ -66,8 +66,13 @@ public class TextClock extends AppCompatTextView { onTimeChanged(); } }; + public TextClock(Context context) { this(context, null); + } + + public TextClock(Context context, AttributeSet attrs) { + this(context, attrs, 0); } private final Runnable mTicker = new Runnable() { @Override public void run() { @@ -80,10 +85,6 @@ public class TextClock extends AppCompatTextView { } }; - public TextClock(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - public TextClock(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); @@ -98,6 +99,18 @@ public class TextClock extends AppCompatTextView { createTime(mTimeZone); // Wait until onAttachedToWindow() to handle the ticker chooseFormat(false); + } + + private void createTime(String timeZone) { + if (timeZone != null) { + mTime = Calendar.getInstance(TimeZone.getTimeZone(timeZone)); + } else { + mTime = Calendar.getInstance(); + } + } + + public CharSequence getFormat12Hour() { + return mFormat12; } private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) { @Override public void onChange(boolean selfChange) { @@ -112,18 +125,6 @@ public class TextClock extends AppCompatTextView { } }; - private void createTime(String timeZone) { - if (timeZone != null) { - mTime = Calendar.getInstance(TimeZone.getTimeZone(timeZone)); - } else { - mTime = Calendar.getInstance(); - } - } - - public CharSequence getFormat12Hour() { - return mFormat12; - } - public void setFormat12Hour(CharSequence format) { mFormat12 = format; diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml index 0dac33bfd..ff20cfc71 100644 --- a/app/src/main/res/layout/gallery_detail_header.xml +++ b/app/src/main/res/layout/gallery_detail_header.xml @@ -105,7 +105,7 @@ android:paddingTop="16dp" android:paddingRight="12dp" android:paddingBottom="16dp" - app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24"/> + app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24" /> diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml index c49e74671..3b295a70c 100644 --- a/app/src/main/res/layout/item_gallery_list.xml +++ b/app/src/main/res/layout/item_gallery_list.xml @@ -60,8 +60,8 @@ style="@style/CardMessage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignStart="@id/title" android:layout_above="@id/rating" + android:layout_alignStart="@id/title" android:layout_marginTop="2dp" />