p20+

Author: aquamarine5

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/MainActivity.kt

@@ -46,7 +46,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -78,7 +77,6 @@ import io.sentry.android.core.SentryAndroid
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import org.aquamarine5.brainspark.chaoxingsignfaker.api.ChaoxingHttpClient
@@ -164,20 +162,6 @@ class MainActivity : ComponentActivity() {
             }
             var destination by remember { mutableStateOf<Any?>(null) }
             val snackbarHostState = remember { SnackbarHostState() }
-            val coroutineScope = rememberCoroutineScope()
-            val showSnackbar =
-                { message: String, actionLabel: String?, withDismissButton: Boolean, duration: SnackbarDuration? ->
-                    coroutineScope.launch {
-                        snackbarHostState.currentSnackbarData?.dismiss()
-                        snackbarHostState.showSnackbar(
-                            message,
-                            actionLabel,
-                            withDismissButton,
-                            duration
-                                ?: if (actionLabel == null) SnackbarDuration.Short else SnackbarDuration.Indefinite
-                        )
-                    }
-                }
             val imageLoader = remember {
                 ImageLoader.Builder(applicationContext).components {
                     add(
@@ -488,7 +472,7 @@ class MainActivity : ComponentActivity() {
                                     }
 
                                     composable<LoginDestination> {
-                                        LoginPage(showSnackbar) {
+                                        LoginPage() {
                                             navController.navigate(CourseListDestination) {
                                                 popUpTo<LoginDestination> { inclusive = true }
                                             }

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/components/CameraComponent.kt

@@ -85,11 +85,11 @@ import org.aquamarine5.brainspark.chaoxingsignfaker.snackbarReport
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun CameraComponent(
+inline fun CameraComponent(
     pictureCount: Int = 1,
-    content: @Composable (() -> Unit)? = null,
-    onNextPhoto: (() -> Unit)? = null,
-    onPictureResult: (List<Bitmap>) -> Unit
+    noinline content: @Composable (() -> Unit)? = null,
+    noinline onNextPhoto: (() -> Unit)? = null,
+    crossinline onPictureResult: (List<Bitmap>) -> Unit
 ) {
     val cameraPermission = rememberPermissionState(android.Manifest.permission.CAMERA)
     val hapticFeedback = LocalHapticFeedback.current

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/components/OtherUserSelectorComponent.kt

@@ -57,15 +57,15 @@ import org.aquamarine5.brainspark.chaoxingsignfaker.displaySnackbar
 import org.aquamarine5.brainspark.chaoxingsignfaker.entity.ChaoxingSignStatus
 
 @Composable
-fun OtherUserSelectorComponent(
-    navToOtherUser: () -> Unit,
+inline fun OtherUserSelectorComponent(
+    crossinline navToOtherUser: () -> Unit,
     signStatus: MutableList<ChaoxingSignStatus>,
     isCurrentAlreadySigned: Boolean,
     userSelections: SnapshotStateList<Boolean>,
     isSigning: Boolean = false,
-    userContent: @Composable ((index: Int) -> Unit)? = null,
+    noinline userContent: @Composable ((index: Int) -> Unit)? = null,
     prefixTipsContent: @Composable (() -> Unit),
-    onSignAction: (isSelf: Boolean, otherUserSessionList: List<ChaoxingOtherUserSession?>, indexList: List<Int>) -> Unit
+    crossinline onSignAction: (isSelf: Boolean, otherUserSessionList: List<ChaoxingOtherUserSession?>, indexList: List<Int>) -> Unit
 ) {
     LocalContext.current.let { context ->
         val signUserList = remember { mutableStateListOf<ChaoxingOtherUserSession>() }

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/screen/LoginScreen.kt

@@ -42,7 +42,6 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import org.aquamarine5.brainspark.chaoxingsignfaker.LocalSnackbarHostState
 import org.aquamarine5.brainspark.chaoxingsignfaker.R
-import org.aquamarine5.brainspark.chaoxingsignfaker.SnackbarFunction
 import org.aquamarine5.brainspark.chaoxingsignfaker.UMengHelper
 import org.aquamarine5.brainspark.chaoxingsignfaker.api.ChaoxingHttpClient
 import org.aquamarine5.brainspark.chaoxingsignfaker.displaySnackbar
@@ -53,7 +52,6 @@ object LoginDestination
 
 @Composable
 fun LoginPage(
-    showSnackbar: SnackbarFunction,
     navToCourseListDestination: () -> Unit
 ) {
     var phoneNumber by remember { mutableStateOf("") }

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/screen/WelcomeScreen.kt

@@ -74,12 +74,12 @@ fun WelcomeScreen(
             Text(
                 buildAnnotatedString {
                     append(
-                        """随地大小签（ChaoxingSignFaker） 是一个用于超星学习通的辅助应用，使用本应用前请您仔细阅读以下内容：
+                        """随地大小签（ChaoxingSignFaker）是一个用于超星学习通的辅助应用，使用本应用前请您仔细阅读以下内容：
 
 """
                     )
                     withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-                        append("随地大小签（ChaoxingSignFaker） 仅作为交流学习使用，通过本项目加深前端设计、接口调用、数据库使用、网络通信安全等方面知识的理解，请勿将此项目用作商业用途，任何使用项目中功能或代码进行的任何违法违规行为与本人无关，作者不承担任何因使用本应用而导致的任何责任。")
+                        append("随地大小签（ChaoxingSignFaker）仅作为交流学习使用，通过本项目加深前端设计、接口调用、数据库使用、网络通信安全等方面知识的理解，请勿将此项目用作商业用途，任何使用项目中功能或代码进行的任何违法违规行为与本人无关，作者不承担任何因使用本应用而导致的任何责任。")
                     }
                     append(
                         """

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/signer/ChaoxingPhotoSigner.kt

@@ -31,7 +31,6 @@ import org.aquamarine5.brainspark.chaoxingsignfaker.api.ChaoxingHttpClient
 import org.aquamarine5.brainspark.chaoxingsignfaker.checkResponse
 import org.aquamarine5.brainspark.chaoxingsignfaker.entity.ChaoxingSignOutEntity
 import org.aquamarine5.brainspark.chaoxingsignfaker.screen.PhotoSignDestination
-import org.aquamarine5.brainspark.chaoxingsignfaker.signer.ChaoxingLocationSigner.Companion.CLASSTAG
 import java.io.ByteArrayOutputStream
 import java.util.UUID
 
@@ -54,6 +53,7 @@ class ChaoxingPhotoSigner(
         ChaoxingPredictableException("签到类型不匹配，应是图片签到")
 
     companion object {
+        const val CLASSTAG = "ChaoxingPhotoSigner"
         const val URL_CLOUD_TOKEN = "https://pan-yz.chaoxing.com/api/token/uservalid"
         const val URL_CLOUD_UPLOAD = "https://pan-yz.chaoxing.com/upload?_from=mobilelearn&_token="
     }

build.gradle

@@ -10,5 +10,5 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
     id("com.google.devtools.ksp") version "2.1.0-1.0.29" apply false
-    id("androidx.room") version "2.7.2" apply false
+    id("androidx.room") version "2.8.0" apply false
 }