diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java index f2b1d4fb8..aa3d8d880 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Color; -import android.os.Build; import android.os.Bundle; import android.view.Window; import android.view.WindowInsets; 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 0eff90751..e4c5fd20d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -221,16 +221,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan private int mLayoutMode; private int mSize; private int mCurrentIndex; - private int mSavingPage = -1; 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 int mSavingPage = -1; private void buildProvider() { if (mGalleryProvider != null) { @@ -259,7 +250,16 @@ 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(); @@ -1304,4 +1304,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan } + + } 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 8ab151204..2f93fe66a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.verify.domain.DomainVerificationManager; import android.content.pm.verify.domain.DomainVerificationUserState; -import android.content.res.Configuration; import android.graphics.Bitmap; import android.net.ConnectivityManager; import android.net.Uri; @@ -33,7 +32,6 @@ import android.text.TextUtils; import android.view.Gravity; import android.view.MenuItem; import android.view.View; -import android.widget.TextView; import android.widget.Toast; import androidx.activity.result.ActivityResultLauncher; @@ -43,7 +41,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.annotation.StringRes; -import androidx.appcompat.app.AppCompatDelegate; import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -85,7 +82,6 @@ import com.hippo.unifile.UniFile; import com.hippo.util.BitmapUtils; import com.hippo.util.ClipboardUtil; import com.hippo.widget.DrawerView; -import com.hippo.widget.LoadImageView; import com.hippo.yorozuya.IOUtils; import com.hippo.yorozuya.SimpleHandler; import com.hippo.yorozuya.ViewUtils; @@ -96,8 +92,6 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Map; -import rikka.material.app.DayNightDelegate; - public final class MainActivity extends StageActivity implements NavigationView.OnNavigationItemSelectedListener { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java index 2cffc0232..02c6052e4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java @@ -21,10 +21,8 @@ import android.os.Bundle; import androidx.annotation.Nullable; import androidx.preference.Preference; -import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.text.Html; -import com.hippo.util.AppHelper; public class AboutFragment extends BasePreferenceFragment { diff --git a/app/src/main/java/com/hippo/widget/BatteryView.java b/app/src/main/java/com/hippo/widget/BatteryView.java index ce2fc5381..aaee1f6f9 100644 --- a/app/src/main/java/com/hippo/widget/BatteryView.java +++ b/app/src/main/java/com/hippo/widget/BatteryView.java @@ -41,7 +41,8 @@ public class BatteryView extends AppCompatTextView { private boolean mCharging = false; private BatteryDrawable mDrawable; - private boolean mAttached = false; private final Runnable mCharger = new Runnable() { + private boolean mAttached = false; + private boolean mIsChargerWorking = false; private final Runnable mCharger = new Runnable() { private int level = 0; @@ -55,13 +56,35 @@ public class BatteryView extends AppCompatTextView { getHandler().postDelayed(mCharger, 200); } }; - private boolean mIsChargerWorking = false; public BatteryView(Context context) { super(context); init(); } + public BatteryView(Context context, AttributeSet attrs) { this(context, attrs, 0); + } + + public BatteryView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + + init(); + + TypedArray typedArray = context.obtainStyledAttributes( + attrs, R.styleable.BatteryView, defStyleAttr, 0); + mColor = typedArray.getColor(R.styleable.BatteryView_color, Color.WHITE); + mWarningColor = typedArray.getColor(R.styleable.BatteryView_warningColor, Color.RED); + typedArray.recycle(); + + mDrawable.setColor(mColor); + mDrawable.setWarningColor(mWarningColor); + } + + private void init() { + mDrawable = new BatteryDrawable(); + int height = (int) getTextSize(); + mDrawable.setBounds(0, 0, (int) (height / 0.618f), height); + setCompoundDrawables(mDrawable, null, null, null); } private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { @Override @@ -93,28 +116,6 @@ public class BatteryView extends AppCompatTextView { } }; - public BatteryView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - - init(); - - TypedArray typedArray = context.obtainStyledAttributes( - attrs, R.styleable.BatteryView, defStyleAttr, 0); - mColor = typedArray.getColor(R.styleable.BatteryView_color, Color.WHITE); - mWarningColor = typedArray.getColor(R.styleable.BatteryView_warningColor, Color.RED); - typedArray.recycle(); - - mDrawable.setColor(mColor); - mDrawable.setWarningColor(mWarningColor); - } - - private void init() { - mDrawable = new BatteryDrawable(); - 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) { @@ -173,4 +174,6 @@ public class BatteryView extends AppCompatTextView { + + } diff --git a/app/src/main/java/com/hippo/widget/TextClock.java b/app/src/main/java/com/hippo/widget/TextClock.java index 641bc0023..eaaa9e879 100644 --- a/app/src/main/java/com/hippo/widget/TextClock.java +++ b/app/src/main/java/com/hippo/widget/TextClock.java @@ -55,7 +55,17 @@ public class TextClock extends AppCompatTextView { private boolean mAttached; private Calendar mTime; - private String mTimeZone; private final Runnable mTicker = new Runnable() { + private String mTimeZone; + private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (mTimeZone == null && Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) { + final String timeZone = intent.getStringExtra("time-zone"); + createTime(timeZone); + } + onTimeChanged(); + } + }; private final Runnable mTicker = new Runnable() { @Override public void run() { onTimeChanged(); @@ -66,16 +76,12 @@ public class TextClock extends AppCompatTextView { getHandler().postAtTime(mTicker, next); } }; - private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (mTimeZone == null && Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) { - final String timeZone = intent.getStringExtra("time-zone"); - createTime(timeZone); - } - onTimeChanged(); - } - }; private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) { + 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(); @@ -88,12 +94,6 @@ public class TextClock extends AppCompatTextView { onTimeChanged(); } }; - public TextClock(Context context) { - this(context, null); - } - public TextClock(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } public TextClock(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); @@ -261,4 +261,6 @@ public class TextClock extends AppCompatTextView { + + } \ No newline at end of file diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml index 038a2416d..51224f1dd 100644 --- a/app/src/main/res/layout/item_gallery_list.xml +++ b/app/src/main/res/layout/item_gallery_list.xml @@ -30,8 +30,8 @@ android:layout_height="wrap_content"> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2b2d0c445..05634d855 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -52,7 +52,8 @@