Domain

app/src/main/java/com/github/nullptroma/wallenc/app/MainActivity.kt

@@ -7,6 +7,7 @@ import androidx.activity.enableEdgeToEdge
 import com.github.nullptroma.wallenc.presentation.WallencUi
 import dagger.hilt.android.AndroidEntryPoint
 
+class Container<T>(val value: T)
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
@@ -18,7 +19,8 @@ class MainActivity : ComponentActivity() {
 //        val launcher =
 //            registerForActivityResult(sdk.contract) { result -> handleResult(result) }
 //        val loginOptions = YandexAuthLoginOptions(LoginType.CHROME_TAB)
-
+        val cont1 = Container(true)
+        var cont2 = Container<Boolean>(true)
         setContent {
             WallencUi()
         }

data/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.dagger.hilt)
     alias(libs.plugins.ksp)
 }
 
@@ -35,10 +34,6 @@ android {
 }
 
 dependencies {
-    // Hilt
-    implementation(libs.dagger.hilt)
-    ksp(libs.dagger.hilt.compiler)
-
     // Room
     implementation(libs.room.ktx)
     implementation(libs.room.runtime)

data/src/main/java/com/github/nullptroma/wallenc/data/TestImpl.kt

@@ -1,20 +0,0 @@
-package com.github.nullptroma.wallenc.data
-
-import com.github.nullptroma.wallenc.domain.models.IMetaInfo
-import java.net.URI
-import java.time.LocalDateTime
-
-class TestImpl : IMetaInfo {
-    override val name: String
-        get() = "Hello225"
-    override val size: Int
-        get() = 10
-    override val isDeleted: Boolean
-        get() = true
-    override val isHidden: Boolean
-        get() = true
-    override val lastModified: LocalDateTime
-        get() = TODO("Not yet implemented")
-    override val path: URI
-        get() = URI("/Hello/path")
-}

data/src/main/java/com/github/nullptroma/wallenc/data/di/SingletonModule.kt

@@ -1,18 +0,0 @@
-package com.github.nullptroma.wallenc.data.di
-
-import com.github.nullptroma.wallenc.data.TestImpl
-import com.github.nullptroma.wallenc.domain.models.IMetaInfo
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-
-@Module
-@InstallIn(SingletonComponent::class)
-class SingletonModule {
-
-    @Provides
-    fun provideIMeta() : IMetaInfo {
-        return TestImpl()
-    }
-}

data/src/main/java/com/github/nullptroma/wallenc/data/vaults/LocalVault.kt

@@ -0,0 +1,53 @@
+package com.github.nullptroma.wallenc.data.vaults
+
+import android.content.Context
+import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
+import com.github.nullptroma.wallenc.domain.enums.VaultType
+import com.github.nullptroma.wallenc.domain.models.IStorage
+import com.github.nullptroma.wallenc.domain.models.IVault
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.UUID
+
+class LocalVault(private val ioDispatcher: CoroutineDispatcher, context: Context) : IVault {
+    init {
+        CoroutineScope(ioDispatcher).launch {
+
+        }
+    }
+
+    override suspend fun createStorage(name: String): IStorage = withContext(ioDispatcher) {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun createStorage(
+        name: String,
+        key: EncryptKey
+    ): IStorage = withContext(ioDispatcher) {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun createStorage(
+        name: String,
+        key: EncryptKey,
+        uuid: UUID
+    ): IStorage = withContext(ioDispatcher) {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun remove(storage: IStorage) = withContext(ioDispatcher) {
+        TODO("Not yet implemented")
+    }
+
+    override val type: VaultType = VaultType.LOCAL
+    override val uuid: UUID
+        get() = TODO("Not yet implemented")
+    override val storages: StateFlow<List<IStorage>>
+        get() = TODO("Not yet implemented")
+    override val isAvailable: StateFlow<Boolean>
+        get() = TODO("Not yet implemented")
+
+}

data/src/main/java/com/github/nullptroma/wallenc/data/vaults/VaultsManager.kt

@@ -0,0 +1,5 @@
+package com.github.nullptroma.wallenc.data.vaults
+
+class VaultsManager {
+
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/datatypes/DataPackage.kt

@@ -1,8 +1,7 @@
-package com.github.nullptroma.wallenc.domain.utils
+package com.github.nullptroma.wallenc.domain.datatypes
 
 open class DataPackage<T>(
     val data: T,
-    val hasNext: Boolean? = false,
     val isLoading: Boolean? = false,
     val isError: Boolean? = false
 )

domain/src/main/java/com/github/nullptroma/wallenc/domain/datatypes/DataPage.kt

@@ -1,7 +1,8 @@
-package com.github.nullptroma.wallenc.domain.utils
+package com.github.nullptroma.wallenc.domain.datatypes
 
 class DataPage<T>(
     list: List<T>,
+    val hasNext: Boolean? = false,
     val pageLength: Int,
     val pageNumber: Int
 ) : DataPackage<List<T>>(list)

domain/src/main/java/com/github/nullptroma/wallenc/domain/datatypes/EncryptKey.kt

@@ -0,0 +1,9 @@
+package com.github.nullptroma.wallenc.domain.datatypes
+
+class EncryptKey {
+    val key: String
+
+    constructor(key: String) {
+        this@EncryptKey.key = key
+    }
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/enums/VaultType.kt

@@ -0,0 +1,6 @@
+package com.github.nullptroma.wallenc.domain.enums
+
+enum class VaultType {
+    LOCAL,
+    YANDEX
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IStorage.kt

@@ -1,11 +1,12 @@
-package com.github.nullptroma.wallenc.domain.storage
+package com.github.nullptroma.wallenc.domain.models
 
 import kotlinx.coroutines.flow.StateFlow
+import java.util.UUID
 
 interface IStorage {
-    val size: StateFlow<Int>
+    val size: StateFlow<Int?>
-    val numberOfFiles: StateFlow<Int>
+    val numberOfFiles: StateFlow<Int?>
-    val uuid: String
+    val uuid: UUID
     val name: StateFlow<String>
     val totalSpace: StateFlow<Int?>
     val availableSpace: StateFlow<Int?>

domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IStorageAccessor.kt

@@ -0,0 +1,42 @@
+package com.github.nullptroma.wallenc.domain.models
+
+import com.github.nullptroma.wallenc.domain.datatypes.DataPackage
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import java.io.InputStream
+import java.io.OutputStream
+import java.net.URI
+
+interface IStorageAccessor {
+    val isAvailable: StateFlow<Boolean>
+    val filesUpdates: SharedFlow<DataPackage<IFile>>
+    val dirsUpdates: SharedFlow<DataPackage<IDirectory>>
+
+    suspend fun getAllFiles(): List<IFile>
+    suspend fun getFiles(path: URI): List<IFile>
+    /**
+     * Получение списка файлов в директории
+     * @param path Путь к директории
+     * @return Поток файлов
+     */
+    fun getFilesFlow(path: URI): Flow<DataPackage<IFile>>
+
+    suspend fun getAllDirs(): List<IDirectory>
+    suspend fun getDirs(path: URI): List<IDirectory>
+    /**
+     * Получение списка директорий в директории
+     * @param path Путь к директории
+     * @return Поток директорий
+     */
+    fun getDirsFlow(path: URI): Flow<DataPackage<IDirectory>>
+
+    suspend fun touchFile(path: URI)
+    suspend fun touchDir(path: URI)
+    suspend fun delete(path: URI)
+    suspend fun getFileInfo(path: URI)
+    suspend fun getDirInfo(path: URI)
+    suspend fun openWrite(path: URI): InputStream
+    suspend fun openRead(path: URI): OutputStream
+    suspend fun moveToTrash(path: URI)
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IStorageExplorer.kt

@@ -0,0 +1,11 @@
+package com.github.nullptroma.wallenc.domain.models
+
+import kotlinx.coroutines.flow.StateFlow
+import java.net.URL
+
+interface IStorageExplorer {
+    val currentPath: StateFlow<URL>
+
+    // TODO
+    // пока бесполезный интерфейс
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IVault.kt

@@ -0,0 +1,11 @@
+package com.github.nullptroma.wallenc.domain.models
+
+import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
+import java.util.UUID
+
+interface IVault : IVaultInfo {
+    suspend fun createStorage(name: String): IStorage
+    suspend fun createStorage(name: String, key: EncryptKey): IStorage
+    suspend fun createStorage(name: String, key: EncryptKey, uuid: UUID): IStorage
+    suspend fun remove(storage: IStorage)
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IVaultInfo.kt

@@ -0,0 +1,12 @@
+package com.github.nullptroma.wallenc.domain.models
+
+import com.github.nullptroma.wallenc.domain.enums.VaultType
+import kotlinx.coroutines.flow.StateFlow
+import java.util.UUID
+
+interface IVaultInfo {
+    val type: VaultType
+    val uuid: UUID
+    val storages: StateFlow<List<IStorage>>
+    val isAvailable: StateFlow<Boolean>
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IVaultsManager.kt

@@ -0,0 +1,10 @@
+package com.github.nullptroma.wallenc.domain.models
+
+import kotlinx.coroutines.flow.StateFlow
+
+interface IVaultsManager {
+    val localVault: StateFlow<IVault>
+    val remoteVaults: StateFlow<List<IVault>>
+
+    fun addYandexVault(email: String, token: String)
+}

domain/src/main/java/com/github/nullptroma/wallenc/domain/storage/IStorageAccessor.kt

@@ -1,32 +0,0 @@
-package com.github.nullptroma.wallenc.domain.storage
-
-import com.github.nullptroma.wallenc.domain.models.IDirectory
-import com.github.nullptroma.wallenc.domain.models.IFile
-import com.github.nullptroma.wallenc.domain.utils.DataPackage
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.StateFlow
-import java.net.URI
-
-interface IStorageAccessor {
-    val isAvailable: StateFlow<Boolean>
-    val filesUpdates: SharedFlow<IFile>
-    val dirsUpdates: SharedFlow<IDirectory>
-
-    suspend fun getAllFiles(): List<IFile>
-    suspend fun getFiles(path: URI): List<IFile>
-    fun getFilesStream(path: URI): Flow<DataPackage<IFile>>
-
-    suspend fun getAllDirs(): List<IDirectory>
-    suspend fun getDirs(path: URI): List<IDirectory>
-    fun getDirsStream(path: URI): Flow<DataPackage<IDirectory>>
-
-    suspend fun touchFile(path: URI)
-    suspend fun touchDir(path: URI)
-    suspend fun delete(path: URI)
-    suspend fun getFileInfo(path: URI)
-    suspend fun getDirInfo(path: URI)
-    suspend fun openWrite(path: URI)
-    suspend fun openRead(path: URI)
-    suspend fun moveToTrash(path: URI)
-}

domain/src/main/java/com/github/nullptroma/wallenc/domain/usecases/GetAllRawStoragesUseCase.kt

@@ -0,0 +1,14 @@
+package com.github.nullptroma.wallenc.domain.usecases
+
+import com.github.nullptroma.wallenc.domain.models.IVault
+import com.github.nullptroma.wallenc.domain.models.IVaultsManager
+import kotlinx.coroutines.flow.combine
+
+class GetAllRawStoragesUseCase(val manager: IVaultsManager) {
+    fun getStoragesFlow() = manager.remoteVaults.combine(manager.localVault) { remote, local ->
+        mutableListOf<IVault>().apply {
+            addAll(remote)
+            add(local)
+        }
+    }
+}