From ee33893c0e66570ff070d28301eac0320f25984a Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 27 Jul 2023 10:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/utils/ActivityExtensions.kt | 1 + .../io/legado/app/utils/AlphanumComparator.kt | 5 ++++ .../java/io/legado/app/utils/ArchiveUtils.kt | 3 ++- .../java/io/legado/app/utils/ColorUtils.kt | 14 +++++++---- .../app/utils/CookieManagerExtensions.kt | 2 ++ .../java/io/legado/app/utils/FileUtils.kt | 1 - .../java/io/legado/app/utils/HtmlFormatter.kt | 3 --- .../java/io/legado/app/utils/QRCodeUtils.kt | 23 +++++++++++++++---- .../java/io/legado/app/utils/RealPathUtil.kt | 1 - .../java/io/legado/app/utils/SystemUtils.kt | 1 + .../io/legado/app/utils/ToolBarExtensions.kt | 2 ++ .../FragmentViewBindings.kt | 2 +- 12 files changed, 41 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt b/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt index 32b63e887..e46257f09 100644 --- a/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt @@ -88,6 +88,7 @@ fun Activity.setStatusBarColorAuto( setLightStatusBar(isLightBar) } +@SuppressLint("ObsoleteSdkInt") fun Activity.setLightStatusBar(isLightBar: Boolean) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { window.insetsController?.let { diff --git a/app/src/main/java/io/legado/app/utils/AlphanumComparator.kt b/app/src/main/java/io/legado/app/utils/AlphanumComparator.kt index 791acfd4a..9f92be3f7 100644 --- a/app/src/main/java/io/legado/app/utils/AlphanumComparator.kt +++ b/app/src/main/java/io/legado/app/utils/AlphanumComparator.kt @@ -1,7 +1,12 @@ package io.legado.app.utils + +/** + * 排序比较 + */ object AlphanumComparator : Comparator { + override fun compare(s1: String, s2: String): Int { var thisMarker = 0 var thatMarker = 0 diff --git a/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt b/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt index c70dd5652..2851122d0 100644 --- a/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt @@ -97,8 +97,9 @@ object ArchiveUtils { } fun isArchive(name: String): Boolean { - return if (archiveFileRegex.matches(name)) true else false + return archiveFileRegex.matches(name) } + private fun checkAchieve(name: String) { if (!isArchive(name)) throw IllegalArgumentException("Unexpected file suffix: Only 7z rar zip Accepted") diff --git a/app/src/main/java/io/legado/app/utils/ColorUtils.kt b/app/src/main/java/io/legado/app/utils/ColorUtils.kt index 12fc9a709..02d6ba8e4 100644 --- a/app/src/main/java/io/legado/app/utils/ColorUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ColorUtils.kt @@ -4,7 +4,11 @@ import android.graphics.Color import androidx.annotation.ColorInt import androidx.annotation.FloatRange import androidx.core.graphics.ColorUtils -import kotlin.math.* +import kotlin.math.max +import kotlin.math.min +import kotlin.math.pow +import kotlin.math.roundToInt +import kotlin.math.sqrt @Suppress("unused", "MemberVisibilityCanBePrivate") object ColorUtils { @@ -77,13 +81,13 @@ object ColorUtils { return Color.argb(a.toInt(), r.toInt(), g.toInt(), b.toInt()) } - fun argb(R: Int, G: Int, B: Int): Int { - return argb(Byte.MAX_VALUE.toInt(), R, G, B) + fun argb(r: Int, g: Int, b: Int): Int { + return argb(Byte.MAX_VALUE.toInt(), r, g, b) } - fun argb(A: Int, R: Int, G: Int, B: Int): Int { + fun argb(alpha: Int, r: Int, g: Int, b: Int): Int { val colorByteArr = - byteArrayOf(A.toByte(), R.toByte(), G.toByte(), B.toByte()) + byteArrayOf(alpha.toByte(), r.toByte(), g.toByte(), b.toByte()) return byteArrToInt(colorByteArr) } diff --git a/app/src/main/java/io/legado/app/utils/CookieManagerExtensions.kt b/app/src/main/java/io/legado/app/utils/CookieManagerExtensions.kt index f93e299b8..c1282f84d 100644 --- a/app/src/main/java/io/legado/app/utils/CookieManagerExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/CookieManagerExtensions.kt @@ -1,3 +1,5 @@ +@file:Suppress("UnusedReceiverParameter") + package io.legado.app.utils import android.webkit.CookieManager diff --git a/app/src/main/java/io/legado/app/utils/FileUtils.kt b/app/src/main/java/io/legado/app/utils/FileUtils.kt index 4f6037d19..ddbe8c004 100644 --- a/app/src/main/java/io/legado/app/utils/FileUtils.kt +++ b/app/src/main/java/io/legado/app/utils/FileUtils.kt @@ -94,7 +94,6 @@ object FileUtils { } fun getSdCardPath(): String { - @Suppress("DEPRECATION") var sdCardDirectory = Environment.getExternalStorageDirectory().absolutePath try { sdCardDirectory = File(sdCardDirectory).canonicalPath diff --git a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt index 7bf485c02..4494f6267 100644 --- a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt +++ b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt @@ -1,9 +1,6 @@ package io.legado.app.utils -import io.legado.app.constant.AppLog import io.legado.app.model.analyzeRule.AnalyzeUrl -import org.apache.commons.text.StringEscapeUtils -import org.jsoup.nodes.Entities import java.net.URL import java.util.regex.Pattern diff --git a/app/src/main/java/io/legado/app/utils/QRCodeUtils.kt b/app/src/main/java/io/legado/app/utils/QRCodeUtils.kt index 432afa180..7bae9ac10 100644 --- a/app/src/main/java/io/legado/app/utils/QRCodeUtils.kt +++ b/app/src/main/java/io/legado/app/utils/QRCodeUtils.kt @@ -1,18 +1,31 @@ package io.legado.app.utils -import android.graphics.* +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint import android.text.TextPaint import android.text.TextUtils import androidx.annotation.ColorInt import androidx.annotation.FloatRange -import com.google.zxing.* +import com.google.zxing.BarcodeFormat +import com.google.zxing.BinaryBitmap +import com.google.zxing.DecodeHintType +import com.google.zxing.EncodeHintType +import com.google.zxing.LuminanceSource +import com.google.zxing.MultiFormatReader +import com.google.zxing.MultiFormatWriter +import com.google.zxing.RGBLuminanceSource +import com.google.zxing.Result +import com.google.zxing.WriterException import com.google.zxing.common.GlobalHistogramBinarizer import com.google.zxing.common.HybridBinarizer import com.google.zxing.qrcode.QRCodeWriter import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel import com.king.zxing.DecodeFormatManager import com.king.zxing.util.LogUtils -import java.util.* +import java.util.EnumMap import kotlin.math.max @@ -295,13 +308,13 @@ object QRCodeUtils { try { //采用HybridBinarizer解析 result = reader.decodeWithState(BinaryBitmap(HybridBinarizer(source))) - } catch (e: Exception) { + } catch (_: Exception) { } if (result == null) { //如果没有解析成功，再采用GlobalHistogramBinarizer解析一次 result = reader.decodeWithState(BinaryBitmap(GlobalHistogramBinarizer(source))) } - } catch (e: Exception) { + } catch (_: Exception) { } return result } diff --git a/app/src/main/java/io/legado/app/utils/RealPathUtil.kt b/app/src/main/java/io/legado/app/utils/RealPathUtil.kt index fbcab7aef..62160d52b 100644 --- a/app/src/main/java/io/legado/app/utils/RealPathUtil.kt +++ b/app/src/main/java/io/legado/app/utils/RealPathUtil.kt @@ -23,7 +23,6 @@ object RealPathUtil { */ private var filePathUri: Uri? = null - @Suppress("DEPRECATION") fun getPath(context: Context, uri: Uri): String? { //check here to KITKAT or new version @SuppressLint("ObsoleteSdkInt") diff --git a/app/src/main/java/io/legado/app/utils/SystemUtils.kt b/app/src/main/java/io/legado/app/utils/SystemUtils.kt index dec3485ff..f397eb375 100644 --- a/app/src/main/java/io/legado/app/utils/SystemUtils.kt +++ b/app/src/main/java/io/legado/app/utils/SystemUtils.kt @@ -14,6 +14,7 @@ import splitties.systemservices.powerManager @Suppress("unused") object SystemUtils { + @SuppressLint("ObsoleteSdkInt") fun ignoreBatteryOptimization(activity: Activity) { if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.M) return diff --git a/app/src/main/java/io/legado/app/utils/ToolBarExtensions.kt b/app/src/main/java/io/legado/app/utils/ToolBarExtensions.kt index 3b7629671..7f78f73a1 100644 --- a/app/src/main/java/io/legado/app/utils/ToolBarExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ToolBarExtensions.kt @@ -2,6 +2,7 @@ package io.legado.app.utils +import android.annotation.SuppressLint import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter import android.os.Build @@ -12,6 +13,7 @@ import io.legado.app.R /** * 设置toolBar更多图标颜色 */ +@SuppressLint("ObsoleteSdkInt") fun Toolbar.setMoreIconColor(color: Int) { val moreIcon = ContextCompat.getDrawable(context, R.drawable.ic_more) if (moreIcon != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { diff --git a/app/src/main/java/io/legado/app/utils/viewbindingdelegate/FragmentViewBindings.kt b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/FragmentViewBindings.kt index cae870edb..fb713cd66 100644 --- a/app/src/main/java/io/legado/app/utils/viewbindingdelegate/FragmentViewBindings.kt +++ b/app/src/main/java/io/legado/app/utils/viewbindingdelegate/FragmentViewBindings.kt @@ -1,4 +1,4 @@ -@file:Suppress("RedundantVisibilityModifier", "unused") +@file:Suppress("RedundantVisibilityModifier", "unused", "UnusedReceiverParameter") @file:JvmName("ReflectionFragmentViewBindings") package io.legado.app.utils.viewbindingdelegate