optimize code

.github/workflows/create_release.yml

@@ -7,17 +7,30 @@ on:
       - "**/workflows-trigger.properties"
 
 env:
-  PACKAGE_VERSION: 1.0.0
-  V_PACKAGE_VERSION: v1.0.0
+  PACKAGE_VERSION: 1.0.1
+  V_PACKAGE_VERSION: v1.0.1
 
 jobs:
 
+  current-time:
+    runs-on: ubuntu-latest
+    name: get current time
+    outputs:
+      currentTime: ${{steps.currentTime.outputs.formattedTime}}
+    steps:
+      - id: currentTime
+        uses: josStorer/get-current-time@v2
+        with:
+          format: YYYY.MM.DD
+          utcOffset: "+08:00"
+
   create-release-distribution:
     strategy:
       matrix:
         os: [ windows-latest , ubuntu-latest , macos-13 , macos-14 ]
     runs-on: ${{ matrix.os }}
     name: create release distribution
+    needs: current-time
 
     steps:
       - if: matrix.os != 'macos-14'
@@ -74,13 +87,6 @@ jobs:
         run: |
           mv /Users/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/dmg/compose-multiplatform-xlog-decode-${{env.PACKAGE_VERSION}}.dmg /Users/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/dmg/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-macos-arm64.dmg
 
-      - name: get current time
-        id: currentTime
-        uses: josStorer/get-current-time@v2
-        with:
-          format: YYYY-MM-DD
-          utcOffset: "+08:00"
-
       - name: draft a new release
         uses: ncipollo/release-action@v1
         with:
@@ -89,6 +95,6 @@ jobs:
           artifactErrorsFailBuild: false
           generateReleaseNotes: true
           artifacts: "**/exe/*.exe,**/app/compose-multiplatform-xlog-decode/*.zip,**/deb/*.deb,**/rpm/*.rpm,**/dmg/*.dmg"
-          body: "## ${{env.V_PACKAGE_VERSION}} / ${{steps.currentTime.outputs.formattedTime}}"
+          body: "## ${{env.V_PACKAGE_VERSION}} / ${{needs.current-time.outputs.currentTime}}"
           tag: "${{env.V_PACKAGE_VERSION}}"
           name: "${{env.V_PACKAGE_VERSION}}"

build.gradle.kts

@@ -83,7 +83,7 @@ compose.desktop {
                 }
             }
             packageName = mPackageName
-            packageVersion = "1.0.0"
+            packageVersion = "1.0.1"
             description = "compose multiplatform xlog decode"
             copyright = "© 2024 leavesCZY. All rights reserved."
             vendor = "leavesCZY"

core/src/main/kotlin/github/leavesczy/xlog/decode/core/DecryptUtils.kt

@@ -82,10 +82,7 @@ object DecryptUtils {
     }
 
     private fun bytesToInt(b: ByteArray, offset: Int): Int {
-        return b[offset].toInt() and 0xFF or (
-                (b[offset + 1].toInt() and 0xFF) shl 8) or (
-                (b[offset + 2].toInt() and 0xFF) shl 16) or (
-                (b[offset + 3].toInt() and 0xFF) shl 24)
+        return b[offset].toInt() and 0xFF or ((b[offset + 1].toInt() and 0xFF) shl 8) or ((b[offset + 2].toInt() and 0xFF) shl 16) or ((b[offset + 3].toInt() and 0xFF) shl 24)
     }
 
     private fun teaDecipher(byteArray: ByteArray, k: ByteArray): ByteArray {

src/main/kotlin/github/leavesczy/xlog/decode/DataStoreManager.kt

@@ -20,7 +20,7 @@ object DataStoreManager {
 
     private val THEME = intPreferencesKey("theme")
 
-    private val AUT_OPEN_FILE_WHEN_PARSING_IS_SUCCESSFUL = booleanPreferencesKey("autOpenFileWhenParsingIsSuccessful")
+    private val AUTO_OPEN_FILE_WHEN_PARSING_IS_SUCCESSFUL = booleanPreferencesKey("autoOpenFileWhenParsingIsSuccessful")
 
     fun privateKeyFlow(): Flow<String> {
         return dataStores.data.map { preferences ->
@@ -34,9 +34,9 @@ object DataStoreManager {
         }
     }
 
-    fun autOpenFileWhenParsingIsSuccessful(): Flow<Boolean> {
+    fun autoOpenFileWhenParsingIsSuccessful(): Flow<Boolean> {
         return dataStores.data.map { preferences ->
-            preferences[AUT_OPEN_FILE_WHEN_PARSING_IS_SUCCESSFUL] ?: true
+            preferences[AUTO_OPEN_FILE_WHEN_PARSING_IS_SUCCESSFUL] ?: true
         }
     }
 
@@ -52,9 +52,9 @@ object DataStoreManager {
         }
     }
 
-    suspend fun autOpenFileWhenParsingIsSuccessful(autoOpen: Boolean) {
+    suspend fun autoOpenFileWhenParsingIsSuccessful(autoOpen: Boolean) {
         dataStores.edit { settings ->
-            settings[AUT_OPEN_FILE_WHEN_PARSING_IS_SUCCESSFUL] = autoOpen
+            settings[AUTO_OPEN_FILE_WHEN_PARSING_IS_SUCCESSFUL] = autoOpen
         }
     }
 

src/main/kotlin/github/leavesczy/xlog/decode/LogDecodeViewModel.kt

@@ -56,9 +56,9 @@ class LogDecodeViewModel : ViewModel(viewModelScope = CoroutineScope(SupervisorJ
     var settingsPageViewState by mutableStateOf(
         value = SettingsPageViewState(
             theme = Theme.Light,
-            autOpenFileWhenParsingIsSuccessful = false,
             switchTheme = ::switchTheme,
-            updateAutOpenFileWhenParsingIsSuccessful = ::updateAutOpenFileWhenParsingIsSuccessful
+            autoOpenFileWhenParsingIsSuccessful = false,
+            updateAutoOpenFileWhenParsingIsSuccessful = ::updateAutoOpenFileWhenParsingIsSuccessful
         )
     )
         private set
@@ -83,14 +83,14 @@ class LogDecodeViewModel : ViewModel(viewModelScope = CoroutineScope(SupervisorJ
         val privateKey = DataStoreManager.privateKeyFlow().first()
         val themeType = DataStoreManager.themeFlow().first()
         val theme = Theme.entries.find { it.type == themeType } ?: settingsPageViewState.theme
-        val autOpenFileWhenParsingIsSuccessful = DataStoreManager.autOpenFileWhenParsingIsSuccessful().first()
+        val autOpenFileWhenParsingIsSuccessful = DataStoreManager.autoOpenFileWhenParsingIsSuccessful().first()
         if (mainPageViewState.privateKey != privateKey) {
             mainPageViewState = mainPageViewState.copy(privateKey = privateKey)
         }
-        if (settingsPageViewState.theme != theme || settingsPageViewState.autOpenFileWhenParsingIsSuccessful != autOpenFileWhenParsingIsSuccessful) {
+        if (settingsPageViewState.theme != theme || settingsPageViewState.autoOpenFileWhenParsingIsSuccessful != autOpenFileWhenParsingIsSuccessful) {
             settingsPageViewState = settingsPageViewState.copy(
                 theme = theme,
-                autOpenFileWhenParsingIsSuccessful = autOpenFileWhenParsingIsSuccessful
+                autoOpenFileWhenParsingIsSuccessful = autOpenFileWhenParsingIsSuccessful
             )
         }
     }
@@ -163,18 +163,20 @@ class LogDecodeViewModel : ViewModel(viewModelScope = CoroutineScope(SupervisorJ
     }
 
     private suspend fun autoOpenFileIfNeed(file: File) {
-        if (settingsPageViewState.autOpenFileWhenParsingIsSuccessful) {
+        if (settingsPageViewState.autoOpenFileWhenParsingIsSuccessful) {
             openFile(file = file)
         }
     }
 
     private fun generateKeyPair() {
         viewModelScope.launch {
-            val keyPair = DecryptUtils.generateKeyPair()
-            cryptKeyPageViewState = cryptKeyPageViewState.copy(
-                privateKey = keyPair.privateKey,
-                publicKey = keyPair.publicKey
-            )
+            withContext(context = Dispatchers.Default) {
+                val keyPair = DecryptUtils.generateKeyPair()
+                cryptKeyPageViewState = cryptKeyPageViewState.copy(
+                    privateKey = keyPair.privateKey,
+                    publicKey = keyPair.publicKey
+                )
+            }
         }
     }
 
@@ -183,16 +185,16 @@ class LogDecodeViewModel : ViewModel(viewModelScope = CoroutineScope(SupervisorJ
     }
 
     private fun switchTheme(theme: Theme) {
-        settingsPageViewState = settingsPageViewState.copy(theme = theme)
         viewModelScope.launch {
+            settingsPageViewState = settingsPageViewState.copy(theme = theme)
             DataStoreManager.updateTheme(theme = theme.type)
         }
     }
 
-    private fun updateAutOpenFileWhenParsingIsSuccessful(autoOpen: Boolean) {
-        settingsPageViewState = settingsPageViewState.copy(autOpenFileWhenParsingIsSuccessful = autoOpen)
+    private fun updateAutoOpenFileWhenParsingIsSuccessful(autoOpen: Boolean) {
         viewModelScope.launch {
-            DataStoreManager.autOpenFileWhenParsingIsSuccessful(autoOpen = autoOpen)
+            settingsPageViewState = settingsPageViewState.copy(autoOpenFileWhenParsingIsSuccessful = autoOpen)
+            DataStoreManager.autoOpenFileWhenParsingIsSuccessful(autoOpen = autoOpen)
         }
     }
 

src/main/kotlin/github/leavesczy/xlog/decode/ui/FileLoadDialog.kt

@@ -14,8 +14,8 @@ import java.nio.file.Path
 @Composable
 fun FrameWindowScope.FileLoadDialog(
     title: String = "Choose a file",
-    fileExtension: String? = null,
-    isMultipleMode: Boolean = false,
+    isMultipleMode: Boolean,
+    fileExtension: String?,
     onResult: (result: Path?) -> Unit
 ) = AwtWindow(
     create = {

src/main/kotlin/github/leavesczy/xlog/decode/ui/MainPage.kt

@@ -30,7 +30,7 @@ import kotlin.io.path.toPath
  * @Date: 2024/6/4 14:15
  * @Desc:
  */
-internal const val xLogFileExtension = "xlog"
+private const val xLogFileExtension = "xlog"
 
 @Composable
 fun FrameWindowScope.MainPage(
@@ -127,9 +127,9 @@ fun FrameWindowScope.MainPage(
             fileExtension = xLogFileExtension,
             onResult = {
                 if (it != null) {
-                    confirmLogFilePath(paths = listOf(it))
+                    confirmLogFilePath(paths = listOf(element = it))
                 }
-                pageViewState.openDialog.onResult(it)
+                pageViewState.openDialog.onResult(result = it)
             }
         )
     }

src/main/kotlin/github/leavesczy/xlog/decode/ui/Models.kt

@@ -53,7 +53,7 @@ data class CryptKeyPageViewState(
 @Stable
 data class SettingsPageViewState(
     val theme: Theme,
-    val autOpenFileWhenParsingIsSuccessful: Boolean,
     val switchTheme: (Theme) -> Unit,
-    val updateAutOpenFileWhenParsingIsSuccessful: (Boolean) -> Unit
+    val autoOpenFileWhenParsingIsSuccessful: Boolean,
+    val updateAutoOpenFileWhenParsingIsSuccessful: (Boolean) -> Unit
 )

src/main/kotlin/github/leavesczy/xlog/decode/ui/SettingsPage.kt

@@ -75,10 +75,10 @@ fun SettingsPage(pageViewState: SettingsPageViewState) {
                 modifier = Modifier,
                 text = "解析成功后自动打开文件"
             )
-            val checked = pageViewState.autOpenFileWhenParsingIsSuccessful
+            val checked = pageViewState.autoOpenFileWhenParsingIsSuccessful
             Switch(
                 checked = checked,
-                onCheckedChange = pageViewState.updateAutOpenFileWhenParsingIsSuccessful
+                onCheckedChange = pageViewState.updateAutoOpenFileWhenParsingIsSuccessful
             )
         }
     }

workflows-trigger.properties

@@ -1 +1 @@
-trigger=3
+trigger=4