From cfdb23d6dc6501f212411922938d510c8820adb0 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 23 May 2022 19:59:40 +0800 Subject: [PATCH] app: Reformat code --- app/build.gradle | 12 ++-- .../gallery/ArchiveGalleryProvider.java | 2 +- .../ehviewer/preference/VersionPreference.kt | 4 +- .../hippo/ehviewer/ui/GalleryActivity.java | 22 ++++---- .../ehviewer/ui/scene/GalleryListScene.java | 1 - .../ehviewer/widget/ImageSearchLayout.java | 4 +- .../java/com/hippo/widget/BatteryView.java | 42 +++++++------- .../main/java/com/hippo/widget/TextClock.java | 37 ++++++------ .../main/res/layout/gallery_detail_header.xml | 56 +++++++++---------- app/src/main/res/layout/search_normal.xml | 2 +- .../main/res/layout/widget_image_search.xml | 2 +- app/src/main/res/menu/drawer_download.xml | 8 +-- app/src/main/res/menu/drawer_gallery_list.xml | 8 +-- 13 files changed, 100 insertions(+), 100 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 62cd64000..ee24f7675 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,12 +22,12 @@ android { } signingConfigs { - sign { - storeFile file(signStoreFile) - storePassword signStorePassword - keyAlias signkeyAlias - keyPassword signkeyPassword - } + sign { + storeFile file(signStoreFile) + storePassword signStorePassword + keyAlias signkeyAlias + keyPassword signkeyPassword + } } buildFeatures { diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java b/app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java index 5fd9bc3a8..481a04ae9 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java @@ -52,7 +52,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 { private volatile int size = STATE_WAIT; private String error; - public ArchiveGalleryProvider(Context context, Uri uri){ + public ArchiveGalleryProvider(Context context, Uri uri) { UriArchiveAccessor archiveAccessor1; try { archiveAccessor1 = new UriArchiveAccessor(context, uri); diff --git a/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt index 8860441d8..20264a954 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt @@ -16,12 +16,12 @@ package com.hippo.ehviewer.preference import android.content.Context -import com.hippo.preference.MessagePreference -import com.hippo.ehviewer.R import android.content.pm.PackageManager import android.util.AttributeSet import androidx.appcompat.app.AlertDialog import com.hippo.Native +import com.hippo.ehviewer.R +import com.hippo.preference.MessagePreference class VersionPreference @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null 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 f47a91ce5..1f56d117e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -246,16 +246,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan mGalleryProvider = new ArchiveGalleryProvider(this, mUri); } } - } 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; - }); + } private void onInit() { Intent intent = getIntent(); @@ -269,7 +260,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan mGalleryInfo = intent.getParcelableExtra(KEY_GALLERY_INFO); mPage = intent.getIntExtra(KEY_PAGE, -1); buildProvider(); - } + } 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; + }); private void onRestore(@NonNull Bundle savedInstanceState) { mAction = savedInstanceState.getString(KEY_ACTION); 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 4b2d80fc9..d948600b0 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 @@ -69,7 +69,6 @@ import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter; import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange; import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager; import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableItemViewHolder; -import com.hippo.app.CheckBoxDialogBuilder; import com.hippo.app.EditTextDialogBuilder; import com.hippo.drawable.AddDeleteDrawable; import com.hippo.drawable.DrawerArrowDrawable; diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java index b8d3d88ed..0d2da3c00 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java @@ -141,7 +141,7 @@ public final class ImageSearchLayout extends LinearLayout implements View.OnClic bitmap.compress(Bitmap.CompressFormat.JPEG, 90, os); mImagePath = temp.getPath(); mPreview.setImageBitmap(bitmap); - ((View)mPreview.getParent()).setVisibility(VISIBLE); + ((View) mPreview.getParent()).setVisibility(VISIBLE); } catch (FileNotFoundException e) { e.printStackTrace(); } finally { @@ -166,7 +166,7 @@ public final class ImageSearchLayout extends LinearLayout implements View.OnClic } mImagePath = imagePath; mPreview.setImageBitmap(bitmap); - ((View)mPreview.getParent()).setVisibility(VISIBLE); + ((View) mPreview.getParent()).setVisibility(VISIBLE); } catch (FileNotFoundException e) { // Ignore } finally { diff --git a/app/src/main/java/com/hippo/widget/BatteryView.java b/app/src/main/java/com/hippo/widget/BatteryView.java index aaee1f6f9..e3c45e16a 100644 --- a/app/src/main/java/com/hippo/widget/BatteryView.java +++ b/app/src/main/java/com/hippo/widget/BatteryView.java @@ -42,7 +42,11 @@ public class BatteryView extends AppCompatTextView { private BatteryDrawable mDrawable; private boolean mAttached = false; - private boolean mIsChargerWorking = false; private final Runnable mCharger = new Runnable() { + private boolean mIsChargerWorking = false; + public BatteryView(Context context) { + super(context); + init(); + } private final Runnable mCharger = new Runnable() { private int level = 0; @@ -56,10 +60,6 @@ public class BatteryView extends AppCompatTextView { getHandler().postDelayed(mCharger, 200); } }; - public BatteryView(Context context) { - super(context); - init(); - } public BatteryView(Context context, AttributeSet attrs) { this(context, attrs, 0); @@ -85,6 +85,22 @@ public class BatteryView extends AppCompatTextView { int height = (int) getTextSize(); mDrawable.setBounds(0, 0, (int) (height / 0.618f), height); setCompoundDrawables(mDrawable, null, null, null); + } + + @Override + public void setTextColor(int color) { + if (mCurrentColor == color) { + return; + } + mCurrentColor = color; + super.setTextColor(color); + } + + private void startCharger() { + if (!mIsChargerWorking) { + getHandler().post(mCharger); + mIsChargerWorking = true; + } } private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { @Override @@ -116,22 +132,6 @@ public class BatteryView extends AppCompatTextView { } }; - @Override - public void setTextColor(int color) { - if (mCurrentColor == color) { - return; - } - mCurrentColor = color; - super.setTextColor(color); - } - - private void startCharger() { - if (!mIsChargerWorking) { - getHandler().post(mCharger); - mIsChargerWorking = true; - } - } - private void stopCharger() { if (mIsChargerWorking) { getHandler().removeCallbacks(mCharger); diff --git a/app/src/main/java/com/hippo/widget/TextClock.java b/app/src/main/java/com/hippo/widget/TextClock.java index eaaa9e879..006ad109b 100644 --- a/app/src/main/java/com/hippo/widget/TextClock.java +++ b/app/src/main/java/com/hippo/widget/TextClock.java @@ -65,7 +65,10 @@ public class TextClock extends AppCompatTextView { } onTimeChanged(); } - }; private final Runnable mTicker = new Runnable() { + }; + public TextClock(Context context) { + this(context, null); + } private final Runnable mTicker = new Runnable() { @Override public void run() { onTimeChanged(); @@ -76,24 +79,10 @@ public class TextClock extends AppCompatTextView { getHandler().postAtTime(mTicker, next); } }; - public TextClock(Context context) { - this(context, null); - } + public TextClock(Context context, AttributeSet attrs) { this(context, attrs, 0); - } private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) { - @Override - public void onChange(boolean selfChange) { - chooseFormat(); - onTimeChanged(); - } - - @Override - public void onChange(boolean selfChange, Uri uri) { - chooseFormat(); - onTimeChanged(); - } - }; + } public TextClock(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); @@ -109,7 +98,19 @@ public class TextClock extends AppCompatTextView { createTime(mTimeZone); // Wait until onAttachedToWindow() to handle the ticker chooseFormat(false); - } + } private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) { + @Override + public void onChange(boolean selfChange) { + chooseFormat(); + onTimeChanged(); + } + + @Override + public void onChange(boolean selfChange, Uri uri) { + chooseFormat(); + onTimeChanged(); + } + }; private void createTime(String timeZone) { if (timeZone != null) { diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml index 4271299fc..ca2ec8c01 100644 --- a/app/src/main/res/layout/gallery_detail_header.xml +++ b/app/src/main/res/layout/gallery_detail_header.xml @@ -110,37 +110,37 @@ - + +