Refactor import statements across multiple files to align with the updated domain model structure, enhancing code clarity and consistency. Remove obsolete imports and adjust Gradle settings to improve project organization.

Author: efraespada

frontend/composeApp/build.gradle.kts

@@ -9,7 +9,6 @@
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)

frontend/composeApp/src/desktopMain/kotlin/com/vaultstadio/app/Main.kt

@@ -15,34 +15,34 @@ import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.vaultstadio.app.data.activity.di.activityModule
 import com.vaultstadio.app.data.admin.di.adminModule
+import com.vaultstadio.app.data.ai.di.aiModule
 import com.vaultstadio.app.data.auth.di.authModule
-import com.vaultstadio.app.feature.auth.di.featureAuthModule
+import com.vaultstadio.app.data.collaboration.di.collaborationModule
+import com.vaultstadio.app.data.config.di.configModule
+import com.vaultstadio.app.data.federation.di.federationModule
+import com.vaultstadio.app.data.metadata.di.metadataModule
+import com.vaultstadio.app.data.plugin.di.pluginModule
+import com.vaultstadio.app.data.share.di.shareModule
+import com.vaultstadio.app.data.storage.di.storageModule
+import com.vaultstadio.app.data.sync.di.syncModule
+import com.vaultstadio.app.data.version.di.versionModule
+import com.vaultstadio.app.di.runtimeModules
 import com.vaultstadio.app.feature.activity.di.featureActivityModule
 import com.vaultstadio.app.feature.admin.di.featureAdminModule
+import com.vaultstadio.app.feature.ai.di.featureAIModule
+import com.vaultstadio.app.feature.auth.di.featureAuthModule
 import com.vaultstadio.app.feature.changepassword.di.featureChangePasswordModule
+import com.vaultstadio.app.feature.collaboration.di.featureCollaborationModule
+import com.vaultstadio.app.feature.federation.di.featureFederationModule
+import com.vaultstadio.app.feature.files.di.featureFilesModule
+import com.vaultstadio.app.feature.plugins.di.featurePluginsModule
 import com.vaultstadio.app.feature.profile.di.featureProfileModule
 import com.vaultstadio.app.feature.security.di.featureSecurityModule
 import com.vaultstadio.app.feature.settings.di.featureSettingsModule
 import com.vaultstadio.app.feature.sharedwithme.di.featureSharedWithMeModule
 import com.vaultstadio.app.feature.shares.di.featureSharesModule
-import com.vaultstadio.app.feature.versionhistory.di.featureVersionHistoryModule
-import com.vaultstadio.app.feature.collaboration.di.featureCollaborationModule
-import com.vaultstadio.app.feature.federation.di.featureFederationModule
-import com.vaultstadio.app.feature.ai.di.featureAIModule
-import com.vaultstadio.app.feature.files.di.featureFilesModule
 import com.vaultstadio.app.feature.sync.di.featureSyncModule
-import com.vaultstadio.app.feature.plugins.di.featurePluginsModule
-import com.vaultstadio.app.data.config.di.configModule
-import com.vaultstadio.app.data.share.di.shareModule
-import com.vaultstadio.app.data.plugin.di.pluginModule
-import com.vaultstadio.app.data.storage.di.storageModule
-import com.vaultstadio.app.data.federation.di.federationModule
-import com.vaultstadio.app.data.ai.di.aiModule
-import com.vaultstadio.app.data.collaboration.di.collaborationModule
-import com.vaultstadio.app.data.metadata.di.metadataModule
-import com.vaultstadio.app.data.sync.di.syncModule
-import com.vaultstadio.app.data.version.di.versionModule
-import com.vaultstadio.app.di.runtimeModules
+import com.vaultstadio.app.feature.versionhistory.di.featureVersionHistoryModule
 import org.koin.core.context.startKoin
 
 fun main() {
@@ -52,7 +52,11 @@ fun main() {
                 activityModule + adminModule + authModule +
                 featureAuthModule + featureActivityModule + featureAdminModule + featureSettingsModule +
                 featureProfileModule + featureSecurityModule + featureChangePasswordModule + featureSyncModule +
-                featurePluginsModule + featureSharesModule + featureSharedWithMeModule + featureVersionHistoryModule + featureCollaborationModule + featureFederationModule + featureAIModule + featureFilesModule +
+                featurePluginsModule + featureSharesModule + featureSharedWithMeModule + featureVersionHistoryModule +
+                featureCollaborationModule +
+                featureFederationModule +
+                featureAIModule +
+                featureFilesModule +
                 aiModule + collaborationModule + configModule + shareModule + pluginModule +
                 storageModule + metadataModule + syncModule + federationModule + versionModule,
         )

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/VaultStadioRoot.kt

@@ -19,17 +19,17 @@ import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.DefaultComponentContext
 import com.arkivanov.essenty.lifecycle.LifecycleRegistry
 import com.vaultstadio.app.config.LocalApiBaseUrl
-import com.vaultstadio.app.domain.upload.UploadQueueEntry
-import com.vaultstadio.app.feature.upload.UploadManager
 import com.vaultstadio.app.core.resources.LocalStrings
 import com.vaultstadio.app.core.resources.Strings
+import com.vaultstadio.app.domain.upload.UploadQueueEntry
+import com.vaultstadio.app.feature.upload.UploadManager
 import com.vaultstadio.app.navigation.DefaultRootComponent
-import com.vaultstadio.app.platform.PlatformStorage
-import com.vaultstadio.app.platform.StorageKeys
 import com.vaultstadio.app.navigation.RootComponent
 import com.vaultstadio.app.navigation.RootContent
 import com.vaultstadio.app.platform.DragDropEvent
 import com.vaultstadio.app.platform.DragDropState
+import com.vaultstadio.app.platform.PlatformStorage
+import com.vaultstadio.app.platform.StorageKeys
 import com.vaultstadio.app.platform.getInitialPath
 import com.vaultstadio.app.platform.initializeDragDrop
 import com.vaultstadio.app.ui.components.layout.DragOverlay

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/di/AppModuleDsl.kt

@@ -14,11 +14,9 @@
 
 package com.vaultstadio.app.di
 
-import com.vaultstadio.app.data.network.ApiClientConfig
 import com.vaultstadio.app.feature.files.FilesViewPreferences
 import com.vaultstadio.app.feature.files.PlatformFilesViewPreferences
 import com.vaultstadio.app.feature.upload.UploadManager
-import io.ktor.client.HttpClient
 import org.koin.dsl.module
 
 val appModule = module {

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/di/InMemoryTokenStorage.kt

@@ -13,9 +13,13 @@ class InMemoryTokenStorage : TokenStorage {
     private var refreshToken: String? = null
 
     override fun getAccessToken(): String? = accessToken
-    override fun setAccessToken(token: String?) { accessToken = token }
+    override fun setAccessToken(token: String?) {
+        accessToken = token
+    }
     override fun getRefreshToken(): String? = refreshToken
-    override fun setRefreshToken(token: String?) { refreshToken = token }
+    override fun setRefreshToken(token: String?) {
+        refreshToken = token
+    }
     override fun clear() {
         accessToken = null
         refreshToken = null

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/feature/files/FilesContent.kt

@@ -24,12 +24,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.unit.dp
-import com.vaultstadio.app.domain.storage.model.ViewMode
-import com.vaultstadio.app.domain.storage.model.StorageItem
-import com.vaultstadio.app.domain.upload.FolderUploadEntry
-import com.vaultstadio.app.domain.upload.UploadQueueEntry
-import com.vaultstadio.app.feature.files.FilesMode
-import com.vaultstadio.app.feature.upload.LocalUploadManager
 import com.vaultstadio.app.core.resources.LocalStrings
 import com.vaultstadio.app.core.resources.files
 import com.vaultstadio.app.core.resources.newFolder
@@ -40,6 +34,12 @@ import com.vaultstadio.app.core.resources.recent
 import com.vaultstadio.app.core.resources.starred
 import com.vaultstadio.app.core.resources.trash
 import com.vaultstadio.app.core.resources.trashEmpty
+import com.vaultstadio.app.domain.storage.model.StorageItem
+import com.vaultstadio.app.domain.storage.model.ViewMode
+import com.vaultstadio.app.domain.upload.FolderUploadEntry
+import com.vaultstadio.app.domain.upload.UploadQueueEntry
+import com.vaultstadio.app.feature.files.FilesMode
+import com.vaultstadio.app.feature.upload.LocalUploadManager
 import com.vaultstadio.app.navigation.MainDestination
 import com.vaultstadio.app.navigation.RoutePaths
 import com.vaultstadio.app.platform.openFilePicker

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/feature/files/FilesContextMenu.kt

@@ -17,7 +17,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import com.vaultstadio.app.domain.storage.model.ItemType
 import com.vaultstadio.app.domain.storage.model.StorageItem
-import com.vaultstadio.app.feature.main.MainComponent
 
 @Composable
 internal fun FileContextMenuItems(

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/feature/files/FilesDialogs.kt

@@ -19,8 +19,8 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.vaultstadio.app.feature.files.FilesMode
 import com.vaultstadio.app.core.resources.StringResources
+import com.vaultstadio.app.feature.files.FilesMode
 
 /**
  * Dialog for creating a new folder.

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/feature/files/FilesListContent.kt

@@ -24,7 +24,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.vaultstadio.app.domain.storage.model.ItemType
 import com.vaultstadio.app.domain.storage.model.StorageItem
-import com.vaultstadio.app.feature.main.MainComponent
 import com.vaultstadio.app.ui.components.files.EmptyState
 import com.vaultstadio.app.ui.components.files.SelectableFileListItem
 

frontend/composeApp/src/main/kotlin/com/vaultstadio/app/feature/files/FilesTopBar.kt

@@ -34,15 +34,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.vaultstadio.app.domain.storage.model.ViewMode
-import com.vaultstadio.app.domain.storage.model.SortField
-import com.vaultstadio.app.domain.storage.model.SortOrder
 import com.vaultstadio.app.core.resources.StringResources
 import com.vaultstadio.app.core.resources.clear
 import com.vaultstadio.app.core.resources.emptyTrash
 import com.vaultstadio.app.core.resources.refresh
 import com.vaultstadio.app.core.resources.selectAll
 import com.vaultstadio.app.core.resources.toggleView
+import com.vaultstadio.app.domain.storage.model.SortField
+import com.vaultstadio.app.domain.storage.model.SortOrder
+import com.vaultstadio.app.domain.storage.model.ViewMode
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable