🔨 Move the code package where the file is located to make it more reasonable

composeApp/src/commonMain/kotlin/com/clipevery/app/AppFileType.kt

@@ -0,0 +1,8 @@
+package com.clipevery.app
+
+enum class AppFileType {
+    USER,
+    LOG,
+    ENCRYPT,
+    DATA,
+}

composeApp/src/commonMain/kotlin/com/clipevery/model/AppInfo.kt → composeApp/src/commonMain/kotlin/com/clipevery/app/AppInfo.kt

@@ -1,4 +1,4 @@
-package com.clipevery.model
+package com.clipevery.app
 
 import kotlinx.serialization.Serializable
 

composeApp/src/commonMain/kotlin/com/clipevery/AppInfoFactory.kt → composeApp/src/commonMain/kotlin/com/clipevery/app/AppInfoFactory.kt

@@ -1,6 +1,4 @@
-package com.clipevery
-
-import com.clipevery.model.AppInfo
+package com.clipevery.app
 
 interface AppInfoFactory {
     fun createAppInfo(): AppInfo

composeApp/src/commonMain/kotlin/com/clipevery/model/AppUI.kt → composeApp/src/commonMain/kotlin/com/clipevery/app/AppUI.kt

@@ -1,4 +1,4 @@
-package com.clipevery.model
+package com.clipevery.app
 
 import androidx.compose.ui.unit.Dp
 

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/ClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.awt.datatransfer.Transferable
 
 interface ClipItem {

composeApp/src/commonMain/kotlin/com/clipevery/clip/ClipItemType.kt → composeApp/src/commonMain/kotlin/com/clipevery/clip/item/ClipItemType.kt

@@ -1,4 +1,4 @@
-package com.clipevery.clip
+package com.clipevery.clip.item
 
 enum class ClipItemType {
     Text,

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/FileClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.Transferable
 import java.io.File

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/FilesClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.Transferable
 import java.io.File

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/HtmlTextClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.Transferable
 

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/ImageClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.awt.Image
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.Transferable

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/ImageFileClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.awt.Image
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.Transferable

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/TextClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.Transferable
 

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/UrlClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.net.URL
 
 class UrlClipItem(override val url: URL): TextClipItem(url.toString()), ClipUrl {

composeApp/src/commonMain/kotlin/com/clipevery/clip/item/VideoFileClipItem.kt

@@ -1,6 +1,5 @@
 package com.clipevery.clip.item
 
-import com.clipevery.clip.ClipItemType
 import java.io.File
 
 val SUPPORT_VIDEO_EXTENSIONS = setOf("mp4", "avi", "mov", "mkv", "flv", "wmv")

composeApp/src/commonMain/kotlin/com/clipevery/model/AppConfig.kt → composeApp/src/commonMain/kotlin/com/clipevery/config/AppConfig.kt

@@ -1,4 +1,4 @@
-package com.clipevery.model
+package com.clipevery.config
 
 import kotlinx.serialization.Serializable
 import java.util.Locale

composeApp/src/commonMain/kotlin/com/clipevery/config/ConfigManager.kt

@@ -1,6 +1,5 @@
 package com.clipevery.config
 
-import com.clipevery.model.AppConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 

composeApp/src/commonMain/kotlin/com/clipevery/endpoint/EndpointInfo.kt

@@ -0,0 +1,19 @@
+package com.clipevery.endpoint
+
+import com.clipevery.net.HostInfo
+import com.clipevery.platform.Platform
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EndpointInfo(val deviceId: String,
+                        val deviceName: String,
+                        val platform: Platform,
+                        val hostInfoList: List<HostInfo>,
+                        val port: Int)
+
+data class ExplicitEndpointInfo(val deviceId: String,
+                                val deviceName: String,
+                                val platform: Platform,
+                                val hostInfo: HostInfo,
+                                val port: Int)
+

composeApp/src/commonMain/kotlin/com/clipevery/endpoint/EndpointInfoFactory.kt

@@ -0,0 +1,6 @@
+package com.clipevery.endpoint
+
+interface EndpointInfoFactory {
+
+    fun createEndpointInfo(): EndpointInfo
+}

composeApp/src/commonMain/kotlin/com/clipevery/model/sync/RequestSyncInfo.kt

@@ -1,12 +1,12 @@
 package com.clipevery.model.sync
 
-import com.clipevery.model.AppInfo
-import com.clipevery.model.RequestEndpointInfo
+import com.clipevery.app.AppInfo
+import com.clipevery.endpoint.EndpointInfo
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class RequestSyncInfo(val appInfo: AppInfo,
-                           val requestEndpointInfo: RequestEndpointInfo,
+                           val endpointInfo: EndpointInfo,
                            val preKeyBundle: ByteArray,
                            val token: Int) {
     override fun equals(other: Any?): Boolean {
@@ -16,7 +16,7 @@ data class RequestSyncInfo(val appInfo: AppInfo,
         other as RequestSyncInfo
 
         if (appInfo != other.appInfo) return false
-        if (requestEndpointInfo != other.requestEndpointInfo) return false
+        if (endpointInfo != other.endpointInfo) return false
         if (!preKeyBundle.contentEquals(other.preKeyBundle)) return false
         if (token != other.token) return false
 
@@ -25,7 +25,7 @@ data class RequestSyncInfo(val appInfo: AppInfo,
 
     override fun hashCode(): Int {
         var result = appInfo.hashCode()
-        result = 31 * result + requestEndpointInfo.hashCode()
+        result = 31 * result + endpointInfo.hashCode()
         result = 31 * result + preKeyBundle.contentHashCode()
         result = 31 * result + token
         return result

composeApp/src/commonMain/kotlin/com/clipevery/model/sync/ResponseSyncInfo.kt

@@ -1,8 +1,8 @@
 package com.clipevery.model.sync
 
-import com.clipevery.model.AppInfo
-import com.clipevery.model.RequestEndpointInfo
+import com.clipevery.app.AppInfo
+import com.clipevery.endpoint.EndpointInfo
 
 data class ResponseSyncInfo(val appInfo: AppInfo,
-                            val requestEndpointInfo: RequestEndpointInfo
+                            val endpointInfo: EndpointInfo
 )

composeApp/src/commonMain/kotlin/com/clipevery/model/sync/SyncInfo.kt

@@ -0,0 +1,10 @@
+package com.clipevery.model.sync
+
+import com.clipevery.app.AppInfo
+import com.clipevery.endpoint.ExplicitEndpointInfo
+
+data class SyncInfo(
+    val appInfo: AppInfo,
+    val endpointInfo: ExplicitEndpointInfo,
+    val state: SyncState
+)

composeApp/src/commonMain/kotlin/com/clipevery/model/SyncState.kt → composeApp/src/commonMain/kotlin/com/clipevery/model/sync/SyncState.kt

@@ -1,4 +1,4 @@
-package com.clipevery.model
+package com.clipevery.model.sync
 
 enum class SyncState {
     ONLINE,

composeApp/src/commonMain/kotlin/com/clipevery/model/HostInfo.kt → composeApp/src/commonMain/kotlin/com/clipevery/net/HostInfo.kt

@@ -1,4 +1,4 @@
-package com.clipevery.model
+package com.clipevery.net
 
 import kotlinx.serialization.Serializable
 

composeApp/src/commonMain/kotlin/com/clipevery/net/SyncValidator.kt

@@ -1,7 +1,7 @@
 package com.clipevery.net
 
 import com.clipevery.exception.ClipException
-import com.clipevery.model.SyncInfo
+import com.clipevery.model.sync.SyncInfo
 import com.clipevery.model.sync.RequestSyncInfo
 import org.signal.libsignal.protocol.state.PreKeyBundle
 

composeApp/src/commonMain/kotlin/com/clipevery/path/PathProvider.kt

@@ -1,15 +1,15 @@
 package com.clipevery.path
 
-import com.clipevery.config.FileType
+import com.clipevery.app.AppFileType
 import java.nio.file.Path
 
 interface PathProvider {
-    fun resolve(fileName: String?, fileType: FileType): Path {
-        val path = when (fileType) {
-            FileType.USER -> clipUserPath
-            FileType.LOG -> clipLogPath.resolve("logs")
-            FileType.ENCRYPT -> clipEncryptPath.resolve("encrypt")
-            FileType.DATA -> clipDataPath.resolve("data")
+    fun resolve(fileName: String?, appFileType: AppFileType): Path {
+        val path = when (appFileType) {
+            AppFileType.USER -> clipUserPath
+            AppFileType.LOG -> clipLogPath.resolve("logs")
+            AppFileType.ENCRYPT -> clipEncryptPath.resolve("encrypt")
+            AppFileType.DATA -> clipDataPath.resolve("data")
         }
 
         if (!path.toFile().exists()) {

composeApp/src/commonMain/kotlin/com/clipevery/presist/FilePersist.kt

@@ -1,15 +1,15 @@
 package com.clipevery.presist
 
-import com.clipevery.config.FileType
+import com.clipevery.app.AppFileType
 import com.clipevery.path.PathProvider
 import java.nio.file.Path
 
 interface FilePersist {
 
     val pathProvider: PathProvider
 
-    fun getPersist(configName: String, fileType: FileType): OneFilePersist {
-        return createOneFilePersist(pathProvider.resolve(configName, fileType))
+    fun getPersist(configName: String, appFileType: AppFileType): OneFilePersist {
+        return createOneFilePersist(pathProvider.resolve(configName, appFileType))
     }
 
     fun createOneFilePersist(path: Path): OneFilePersist

composeApp/src/commonMain/kotlin/com/clipevery/dao/store/IdentityKeyStoreFactory.kt → composeApp/src/commonMain/kotlin/com/clipevery/signal/IdentityKeyStoreFactory.kt

@@ -1,4 +1,4 @@
-package com.clipevery.dao.store
+package com.clipevery.signal
 
 import org.signal.libsignal.protocol.state.IdentityKeyStore
 

composeApp/src/commonMain/kotlin/com/clipevery/ui/SyncItemUI.kt

@@ -40,8 +40,8 @@ import androidx.compose.ui.unit.sp
 import com.clipevery.LocalKoinApplication
 import com.clipevery.i18n.Copywriter
 import com.clipevery.i18n.GlobalCopywriter
-import com.clipevery.model.SyncInfo
-import com.clipevery.model.SyncState
+import com.clipevery.model.sync.SyncInfo
+import com.clipevery.model.sync.SyncState
 import compose.icons.TablerIcons
 import compose.icons.tablericons.Ghost