Merge pull request #253 from dmzz-yyhyy/code_clean

代码清理

Author: dmzz-yyhyy

app/build.gradle.kts

@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.android.application)
@@ -19,7 +20,7 @@ android {
         minSdk = 24
         targetSdk = 36
         // 版本号为x.y.z则versionCode为x*1000000+y*10000+z*1000+debug版本号(开发需要时迭代, 三位数)
-        versionCode = 1_01_01_008
+        versionCode = 1_01_01_009
         versionName = "1.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -47,11 +48,8 @@ android {
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildFeatures {
         compose = true
@@ -67,11 +65,13 @@ android {
     }
     composeCompiler {
         includeSourceInformation = true
+    }
+}
 
-        featureFlags = setOf(
-            ComposeFeatureFlag.StrongSkipping.disabled(),
-            ComposeFeatureFlag.OptimizeNonSkippingGroups
-        )
+tasks.withType<KotlinJvmCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
 }
 

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/download/DownloadType.kt

@@ -4,7 +4,7 @@ import androidx.annotation.DrawableRes
 import indi.dmzz_yyhyy.lightnovelreader.R
 
 enum class DownloadType(
-    @DrawableRes val icon: Int,
+    @field:DrawableRes val icon: Int,
     val typeName: String
 ) {
     EPUB_EXPORT(R.drawable.output_24px, "导出为EPUB"),

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/format/FormatRepository.kt

@@ -9,7 +9,6 @@ import indi.dmzz_yyhyy.lightnovelreader.data.exploration.ExplorationDisplayBook
 import indi.dmzz_yyhyy.lightnovelreader.data.local.room.dao.FormattingRuleDao
 import indi.dmzz_yyhyy.lightnovelreader.data.local.room.entity.FormattingRuleEntity
 import indi.dmzz_yyhyy.lightnovelreader.data.text.TextProcessor
-import indi.dmzz_yyhyy.lightnovelreader.utils.debugPrint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -25,11 +24,8 @@ class FormatRepository @Inject constructor(
     private val processorMap = mutableMapOf<Int, SnapshotStateList<FormattingRule>>()
 
     init {
-        println("fuck u！！！！")
         CoroutineScope(Dispatchers.IO).launch {
             formattingRuleDao.getAllBookRuleEntityFlow().collect { formattingRuleEntities ->
-                println("wdasdasad")
-                println(formattingRuleEntities)
                 processorMap.values.forEach { it.clear() }
                 for (formattingRule in formattingRuleEntities) {
                     if (!processorMap.contains(formattingRule.bookId))
@@ -45,7 +41,6 @@ class FormatRepository @Inject constructor(
                         )
                     )
                 }
-                println(processorMap)
             }
         }
     }
@@ -157,7 +152,7 @@ class FormatRepository @Inject constructor(
     fun getStateBookFormattingRules(bookId: Int): List<FormattingRule> {
         if (!processorMap.contains(bookId))
             processorMap[bookId] = mutableStateListOf()
-        return processorMap[bookId]!!.debugPrint()
+        return processorMap[bookId]!!
     }
 
     override fun processText(text: String): String = text

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/logging/LoggerRepository.kt

@@ -24,7 +24,7 @@ import kotlin.coroutines.cancellation.CancellationException
 
 @Singleton
 class LoggerRepository @Inject constructor(
-    @ApplicationContext private val context: Context,
+    @param:ApplicationContext @field:ApplicationContext private val context: Context,
 ) {
     private val coroutineScope = CoroutineScope(Dispatchers.IO)
     private val logsDir = File(context.cacheDir, "logs")

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/update/UpdateCheckRepository.kt

@@ -27,7 +27,7 @@ import javax.inject.Singleton
 
 @Singleton
 class UpdateCheckRepository @Inject constructor(
-    @ApplicationContext private val context: Context,
+    @param:ApplicationContext @field:ApplicationContext private val context: Context,
     private val userDataRepository: UserDataRepository,
     private val ketch: Ketch
 ) {

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/web/exploration/filter/SliderFilter.kt

@@ -7,7 +7,7 @@ abstract class SliderFilter(
     val description: String,
     defaultValue: Float,
     val valueRange: ClosedFloatingPointRange<Float>,
-    @IntRange(from = 0) val steps: Int = 0,
+    @field:IntRange(from = 0) val steps: Int = 0,
     private val onChange: () -> Unit
 ) : Filter() {
     abstract var enabled: Boolean

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/theme/LightNovelReaderTheme.kt

@@ -92,7 +92,7 @@ fun LightNovelReaderTheme(
     }
 
     val (language, variant) = appLocale.split("-")
-    LocaleUtil.set(context, language = language, variant = variant)
+    LocaleUtil.set(language = language, variant = variant)
 
     CompositionLocalProvider(LocalAppTheme provides appTheme) {
         MaterialTheme(

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/book/detail/BookInfoBottomSheet.kt

@@ -1,5 +1,6 @@
 package indi.dmzz_yyhyy.lightnovelreader.ui.book.detail
 
+import android.content.ClipData
 import android.widget.Toast
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -17,9 +18,12 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.SheetState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.ClipEntry
+import androidx.compose.ui.platform.LocalClipboard
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -32,6 +36,7 @@ import indi.dmzz_yyhyy.lightnovelreader.R
 import indi.dmzz_yyhyy.lightnovelreader.data.book.BookInformation
 import indi.dmzz_yyhyy.lightnovelreader.data.book.BookVolumes
 import indi.dmzz_yyhyy.lightnovelreader.theme.AppTypography
+import kotlinx.coroutines.launch
 import java.text.NumberFormat
 import java.time.format.DateTimeFormatter
 
@@ -44,6 +49,8 @@ fun BookInfoBottomSheet(
     isVisible: Boolean,
     onDismissRequest: () -> Unit,
 ) {
+    val coroutineScope = rememberCoroutineScope()
+
     @Composable
     fun InfoItem(
         title: String? = "",
@@ -81,7 +88,7 @@ fun BookInfoBottomSheet(
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 val context = LocalContext.current
-                val clipboardManager = LocalClipboardManager.current
+                val clipboard = LocalClipboard.current
 
                 Text(
                     text = content,
@@ -91,9 +98,13 @@ fun BookInfoBottomSheet(
                         .combinedClickable(
                             onClick = {},
                             onLongClick = {
-                                clipboardManager.setText(AnnotatedString(content))
-                                Toast.makeText(context, "内容已复制", Toast.LENGTH_SHORT)
-                                    .show()
+                                coroutineScope.launch {
+                                    val clipData = ClipData.newPlainText("content", content)
+                                    val clipEntry = ClipEntry(clipData = clipData)
+                                    clipboard.setClipEntry(clipEntry = clipEntry)
+                                    Toast.makeText(context, "内容已复制", Toast.LENGTH_SHORT)
+                                        .show()
+                                }
                             },
                         )
                 )

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/dialog/SliderValueDialogViewModel.kt

@@ -19,8 +19,7 @@ class SliderValueDialogViewModel @Inject constructor(
 
     fun init(floatUserDataPath: String): Flow<Float> {
         floatUserData = userDataRepository.floatUserData(floatUserDataPath)
-        println(floatUserDataPath)
-        val value = floatUserData!!.getFlowWithDefault(Float.NaN).onEach { println("value got $it") }
+        val value = floatUserData!!.getFlowWithDefault(Float.NaN)
         return value
     }
 
@@ -29,7 +28,6 @@ class SliderValueDialogViewModel @Inject constructor(
             return
         }
         CoroutineScope(Dispatchers.IO).launch {
-            println("SET VALUE $value")
             floatUserData?.asynchronousSet(value)
         }
     }

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/utils/ImageDownloader.kt

@@ -64,7 +64,6 @@ class ImageDownloader(
             return btData
         } catch (e: Exception) {
             e.printStackTrace()
-            println(strUrl)
         }
         return null
     }