Update 1.6.6

YangDai2003 · YangDai2003 · commit cc70895c1f8f · 2025-08-14T06:58:11.000+02:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,14 +11,14 @@ plugins {
 
 android {
     namespace = "com.yangdai.opennote"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.yangdai.opennote"
         minSdk = 29
-        targetSdk = 35
-        versionCode = 1650
-        versionName = "1.6.5"
+        targetSdk = 36
+        versionCode = 1660
+        versionName = "1.6.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/java/com/yangdai/opennote/domain/usecase/NoteOrder.kt b/app/src/main/java/com/yangdai/opennote/domain/usecase/NoteOrder.kt
@@ -1,11 +1,11 @@
 package com.yangdai.opennote.domain.usecase
 
 sealed class NoteOrder(val orderType: OrderType) {
-    class Title(orderType: OrderType): NoteOrder(orderType)
-    class Date(orderType: OrderType): NoteOrder(orderType)
+    class Title(orderType: OrderType) : NoteOrder(orderType)
+    class Date(orderType: OrderType) : NoteOrder(orderType)
 
     fun copy(orderType: OrderType): NoteOrder {
-        return when(this) {
+        return when (this) {
             is Title -> Title(orderType)
             is Date -> Date(orderType)
         }
diff --git a/app/src/main/java/com/yangdai/opennote/domain/usecase/OrderType.kt b/app/src/main/java/com/yangdai/opennote/domain/usecase/OrderType.kt
@@ -1,6 +1,6 @@
 package com.yangdai.opennote.domain.usecase
 
 sealed class OrderType {
-    data object Ascending: OrderType()
-    data object Descending: OrderType()
+    data object Ascending : OrderType()
+    data object Descending : OrderType()
 }
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/CurlyCornerShape.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/CurlyCornerShape.kt
@@ -80,7 +80,8 @@ class CurlyCornerShape(
             val angleRadians = Math.toRadians(angleDegrees.toDouble())
 
             // calculate the current point
-            val currentPoint = calculateCurlyCirclePoint(centerX, centerY, baseRadius, curlAmplitude, angleRadians)
+            val currentPoint =
+                calculateCurlyCirclePoint(centerX, centerY, baseRadius, curlAmplitude, angleRadians)
 
             path.lineTo(currentPoint.first.toFloat(), currentPoint.second.toFloat())
         }
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/TextOptionButton.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/TextOptionButton.kt
@@ -29,7 +29,9 @@ fun TextOptionButton(
     buttonText: String,
     onButtonClick: () -> Unit
 ) = TextButton(
-    modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
+    modifier = Modifier
+        .fillMaxWidth()
+        .padding(top = 8.dp),
     shape = MaterialTheme.shapes.medium,
     colors = ButtonDefaults.textButtonColors().copy(
         containerColor = MaterialTheme.colorScheme.surfaceVariant
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/TypingText.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/TypingText.kt
@@ -47,7 +47,10 @@ import androidx.compose.ui.text.TextStyle
 fun TypingText(
     text: String,
     modifier: Modifier = Modifier,
-    animationSpec: AnimationSpec<Int> = tween(durationMillis = text.length * 80, easing = LinearEasing),
+    animationSpec: AnimationSpec<Int> = tween(
+        durationMillis = text.length * 80,
+        easing = LinearEasing
+    ),
     style: TextStyle = LocalTextStyle.current,
     reserveSpace: Boolean = true
 ) {
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/dialog/ListDialog.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/dialog/ListDialog.kt
@@ -50,7 +50,7 @@ fun ListDialog(
     onConfirm: (list: List<String>) -> Unit
 ) {
 
-    val list = remember { mutableStateListOf<String>("") }
+    val list = remember { mutableStateListOf("") }
     var ordered by remember { mutableStateOf(false) }
 
     AlertDialog(
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/dialog/ModifyFolderDialog.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/dialog/ModifyFolderDialog.kt
@@ -93,7 +93,7 @@ fun ModifyFolderDialog(
                     placeholder = { Text(text = stringResource(R.string.name)) },
                 )
                 LazyRow(
-                    modifier = Modifier.padding(vertical = 16.dp),
+                    modifier = Modifier.padding(top = 16.dp),
                     horizontalArrangement = Arrangement.spacedBy(8.dp)
                 ) {
 
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/image/ImageViewModel.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/image/ImageViewModel.kt
@@ -22,8 +22,13 @@ class ImageViewModel : ViewModel() {
             _imageState.value = ImageState.Loading
             try {
                 val isLocalFile = isLocalFile(imageUrl)
-                val imagePath = if (isLocalFile) getLocalFilePath(imageUrl) else downloadAndSaveImage(context, imageUrl)
-                _imageState.value = ImageState.Success(imagePath, !imageUrl.startsWith("content://"), isLocalFile)
+                val imagePath =
+                    if (isLocalFile) getLocalFilePath(imageUrl) else downloadAndSaveImage(
+                        context,
+                        imageUrl
+                    )
+                _imageState.value =
+                    ImageState.Success(imagePath, !imageUrl.startsWith("content://"), isLocalFile)
             } catch (e: Exception) {
                 _imageState.value = ImageState.Error(e.message ?: "Unknown error")
             }
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/note/ReadView.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/note/ReadView.kt
@@ -216,7 +216,7 @@ fun ReadView(
     AndroidView(
         modifier = modifier.clipToBounds(),
         factory = {
-            WebView(it).also { webView = it }.apply {
+            WebView(it).also { wv -> webView = wv }.apply {
                 layoutParams = ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
                     ViewGroup.LayoutParams.MATCH_PARENT
@@ -251,8 +251,8 @@ fun ReadView(
                                 when (mediaType) {
                                     "image" -> {
                                         // Check cache first for images
-                                        MediaCache.getImageUri(mediaName)?.let {
-                                            updateImageInWebView(id, it)
+                                        MediaCache.getImageUri(mediaName)?.let { uri ->
+                                            updateImageInWebView(id, uri)
                                             return@launch
                                         }
 
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/note/TextEditorBase.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/note/TextEditorBase.kt
@@ -123,7 +123,7 @@ fun TextEditorBase(
             newLines.add(0 to layout.getLineTop(0))
 
             // Find all newline characters and map them to layout positions
-            var lineStartIndex = 0
+            var lineStartIndex: Int
             text.forEachIndexed { index, char ->
                 if (char == '\n') {
                     lineStartIndex = index + 1
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/setting/CloudPane.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/setting/CloudPane.kt
@@ -260,7 +260,7 @@ fun CloudPane() {
                 Text(text = "Test connection")
             }
         }
-        
+
         // Display connection results
         if (isLoading) {
             // Show loading indicator
@@ -296,7 +296,7 @@ fun CloudPane() {
                         style = MaterialTheme.typography.titleMedium,
                         color = MaterialTheme.colorScheme.onPrimaryContainer
                     )
-                    
+
                     connectionResult?.fold(
                         onSuccess = { files ->
                             Text(
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/component/setting/TemplatePane.kt b/app/src/main/java/com/yangdai/opennote/presentation/component/setting/TemplatePane.kt
@@ -80,7 +80,7 @@ fun TemplatePane(sharedViewModel: SharedViewModel) {
         runCatching {
             val now = LocalDateTime.now()
             val dateFormatter =
-                DateTimeFormatter.ofPattern(if (currentDateFormatter.isBlank()) "yyyy-MM-DD" else currentDateFormatter)
+                DateTimeFormatter.ofPattern(currentDateFormatter.ifBlank { "yyyy-MM-DD" })
             currentDateFormatted = now.format(dateFormatter)
         }.onFailure {
             isDateInvalid = true
@@ -91,7 +91,7 @@ fun TemplatePane(sharedViewModel: SharedViewModel) {
         runCatching {
             val now = LocalDateTime.now()
             val timeFormatter =
-                DateTimeFormatter.ofPattern(if (currentTimeFormatter.isBlank()) "HH:mm" else currentTimeFormatter)
+                DateTimeFormatter.ofPattern(currentTimeFormatter.ifBlank { "HH:mm" })
             currentTimeFormatted = now.format(timeFormatter)
         }.onFailure {
             isTimeInvalid = true
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/event/ListEvent.kt b/app/src/main/java/com/yangdai/opennote/presentation/event/ListEvent.kt
@@ -16,7 +16,9 @@ sealed interface ListEvent {
         val trash: Boolean = false
     ) : ListEvent
 
-    data class DeleteNotes(val noteEntities: Collection<NoteEntity>, val recycle: Boolean) : ListEvent
+    data class DeleteNotes(val noteEntities: Collection<NoteEntity>, val recycle: Boolean) :
+        ListEvent
+
     data class MoveNotes(val noteEntities: Collection<NoteEntity>, val folderId: Long?) : ListEvent
     data class RestoreNotes(val noteEntities: Collection<NoteEntity>) : ListEvent
 
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/navigation/AnimatedNavHost.kt b/app/src/main/java/com/yangdai/opennote/presentation/navigation/AnimatedNavHost.kt
@@ -96,7 +96,7 @@ fun AnimatedNavHost(
                 Json.decodeFromString<SharedContent>(route.sharedContent)
             else null,
             navigateUp = { navController.navigateBackWithHapticFeedback(hapticFeedback) },
-            navigateToScreen = { navController.navigate(it) }
+            navigateToScreen = { screen -> navController.navigate(screen) }
         )
     }
 
@@ -106,7 +106,7 @@ fun AnimatedNavHost(
             uriStr = uri,
             isLargeScreen = isLargeScreen,
             navigateUp = { navController.navigateBackWithHapticFeedback(hapticFeedback) },
-            navigateToScreen = { navController.navigate(it) }
+            navigateToScreen = { screen -> navController.navigate(screen) }
         )
     }
 
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/screen/BaseScreen.kt b/app/src/main/java/com/yangdai/opennote/presentation/screen/BaseScreen.kt
@@ -17,6 +17,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.blur
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -127,11 +129,16 @@ fun BaseScreen(
                 }
             }
 
+            val semanticsModifier = if (loggedIn) Modifier else Modifier.clearAndSetSemantics {
+                hideFromAccessibility()
+            }
+
             AnimatedNavHost(
                 modifier = Modifier
                     .fillMaxSize()
                     .background(MaterialTheme.colorScheme.surface)
-                    .blur(blur),
+                    .blur(blur)
+                    .then(semanticsModifier),
                 isLargeScreen = isLargeScreen
             )
 
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/screen/FileScreen.kt b/app/src/main/java/com/yangdai/opennote/presentation/screen/FileScreen.kt
@@ -192,8 +192,8 @@ fun FileScreen(
             val uri = uriStr.toUri()
             coroutineScope.launch(Dispatchers.IO) {
                 appCtx.contentResolver.openFileDescriptor(uri, "rwt")?.use {
-                    FileOutputStream(it.fileDescriptor).use {
-                        it.write(content.toByteArray())
+                    FileOutputStream(it.fileDescriptor).use { ops ->
+                        ops.write(content.toByteArray())
                     }
                 }
             }
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/screen/FolderScreen.kt b/app/src/main/java/com/yangdai/opennote/presentation/screen/FolderScreen.kt
@@ -1,7 +1,6 @@
 package com.yangdai.opennote.presentation.screen
 
 import androidx.activity.compose.LocalActivity
-import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.hoverable
@@ -50,6 +49,7 @@ 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.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -74,6 +74,7 @@ import com.yangdai.opennote.presentation.component.dialog.WarningDialog
 import com.yangdai.opennote.presentation.event.FolderEvent
 import com.yangdai.opennote.presentation.viewmodel.SharedViewModel
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -167,46 +168,45 @@ fun LazyGridItemScope.FolderItem(
         mutableStateOf(if (folder.color != null) Color(folder.color) else colorScheme.primary)
     }
 
-    val dismissState = rememberSwipeToDismissBoxState(
-        confirmValueChange = { value ->
-            when (value) {
+    val dismissState = rememberSwipeToDismissBoxState()
+    val scope = rememberCoroutineScope()
+    var showContextMenu by remember { mutableStateOf(false) }
+    val interactionSource = remember { MutableInteractionSource() }
+    val isHovered by interactionSource.collectIsHoveredAsState()
+    LaunchedEffect(isHovered) {
+        delay(100L)
+        showContextMenu = isHovered
+    }
+
+    SwipeToDismissBox(
+        state = dismissState,
+        onDismiss = { dismissDirection ->
+            when (dismissDirection) {
                 SwipeToDismissBoxValue.StartToEnd -> {
                     // Edit action (right swipe)
                     showModifyDialog = true
-                    false
+                    scope.launch { dismissState.reset() }
                 }
 
                 SwipeToDismissBoxValue.EndToStart -> {
                     // Delete action (left swipe)
                     showWarningDialog = true
-                    false
+                    scope.launch { dismissState.reset() }
                 }
 
-                SwipeToDismissBoxValue.Settled -> true
+                SwipeToDismissBoxValue.Settled -> {}
             }
-        }
-    )
-    var showContextMenu by remember { mutableStateOf(false) }
-    val interactionSource = remember { MutableInteractionSource() }
-    val isHovered by interactionSource.collectIsHoveredAsState()
-    LaunchedEffect(isHovered) {
-        delay(100L)
-        showContextMenu = isHovered
-    }
-
-    SwipeToDismissBox(
-        state = dismissState,
+        },
         backgroundContent = {
             val direction = dismissState.targetValue
             val progress = dismissState.progress
             val iconOffset = 30.dp * (progress * 1.5f)
-            val backgroundColor by animateColorAsState(
-                when (direction) {
-                    SwipeToDismissBoxValue.StartToEnd -> folderColor.copy(alpha = 0.1f)
-                    SwipeToDismissBoxValue.EndToStart -> colorScheme.errorContainer
-                    SwipeToDismissBoxValue.Settled -> Color.Unspecified
-                }
-            )
+            val backgroundColor = when (direction) {
+                SwipeToDismissBoxValue.StartToEnd -> folderColor.copy(alpha = 0.1f)
+                SwipeToDismissBoxValue.EndToStart -> colorScheme.errorContainer
+                SwipeToDismissBoxValue.Settled -> Color.Unspecified
+            }
+
             val cornerLeftRadius =
                 if (direction == SwipeToDismissBoxValue.StartToEnd) 16.dp * (progress * 6f) else 0.dp
             val cornerRightRadius =
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/screen/NoteScreen.kt b/app/src/main/java/com/yangdai/opennote/presentation/screen/NoteScreen.kt
@@ -462,7 +462,7 @@ fun NoteScreen(
             ) {
                 if (it) FindAndReplaceField(
                     state = searchState,
-                    onStateUpdate = { searchState = it })
+                    onStateUpdate = { state -> searchState = state })
                 else BasicTextField(
                     modifier = Modifier
                         .fillMaxWidth()
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/util/Constants.kt b/app/src/main/java/com/yangdai/opennote/presentation/util/Constants.kt
diff --git a/app/src/main/java/com/yangdai/opennote/presentation/util/extension/highlight/HighlightExtension.kt b/app/src/main/java/com/yangdai/opennote/presentation/util/extension/highlight/HighlightExtension.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.yangdai.opennote.domain.usecase`
`2`	`2`
`3`	`3`	`sealed class OrderType {`
`4`		`- data object Ascending: OrderType()`
`5`		`- data object Descending: OrderType()`
	`4`	`+ data object Ascending : OrderType()`
	`5`	`+ data object Descending : OrderType()`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ class CurlyCornerShape(`
`80`	`80`	`val angleRadians = Math.toRadians(angleDegrees.toDouble())`
`81`	`81`
`82`	`82`	`// calculate the current point`
`83`		`- val currentPoint = calculateCurlyCirclePoint(centerX, centerY, baseRadius, curlAmplitude, angleRadians)`
	`83`	`+ val currentPoint =`
	`84`	`+ calculateCurlyCirclePoint(centerX, centerY, baseRadius, curlAmplitude, angleRadians)`
`84`	`85`
`85`	`86`	`path.lineTo(currentPoint.first.toFloat(), currentPoint.second.toFloat())`
`86`	`87`	`}`