From cab38d3d3606a1443eaab14b3d0797c11cf279d9 Mon Sep 17 00:00:00 2001 From: Mohd Aquib Date: Sun, 13 Sep 2026 10:08:23 +0530 Subject: [PATCH 1/3] refactor: rename core-crypto to securevault-crypto --- .idea/misc.xml | 10 ---------- app/build.gradle.kts | 2 +- data/build.gradle.kts | 2 +- {core-crypto => securevault-crypto}/.gitignore | 0 {core-crypto => securevault-crypto}/build.gradle.kts | 0 {core-crypto => securevault-crypto}/consumer-rules.pro | 0 {core-crypto => securevault-crypto}/proguard-rules.pro | 0 .../securevault/core/crypto/ExampleInstrumentedTest.kt | 0 .../src/main/AndroidManifest.xml | 0 .../com/securevault/core/crypto/CryptoExceptions.kt | 0 .../com/securevault/core/crypto/KeyStoreManager.kt | 0 .../securevault/core/crypto/SecurePassphraseStore.kt | 0 .../com/securevault/core/crypto/ExampleUnitTest.kt | 0 settings.gradle.kts | 2 +- 14 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 .idea/misc.xml rename {core-crypto => securevault-crypto}/.gitignore (100%) rename {core-crypto => securevault-crypto}/build.gradle.kts (100%) rename {core-crypto => securevault-crypto}/consumer-rules.pro (100%) rename {core-crypto => securevault-crypto}/proguard-rules.pro (100%) rename {core-crypto => securevault-crypto}/src/androidTest/java/com/securevault/core/crypto/ExampleInstrumentedTest.kt (100%) rename {core-crypto => securevault-crypto}/src/main/AndroidManifest.xml (100%) rename {core-crypto => securevault-crypto}/src/main/java/com/securevault/core/crypto/CryptoExceptions.kt (100%) rename {core-crypto => securevault-crypto}/src/main/java/com/securevault/core/crypto/KeyStoreManager.kt (100%) rename {core-crypto => securevault-crypto}/src/main/java/com/securevault/core/crypto/SecurePassphraseStore.kt (100%) rename {core-crypto => securevault-crypto}/src/test/java/com/securevault/core/crypto/ExampleUnitTest.kt (100%) diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 7146cb1..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 86ecf7e..6704a0f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -75,7 +75,7 @@ dependencies { implementation(project(":domain")) implementation(project(":data")) implementation(project(":core-network")) - implementation(project(":core-crypto")) + implementation(project(":securevault-crypto")) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 68b5d80..278a881 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":domain")) - implementation(project(":core-crypto")) + implementation(project(":securevault-crypto")) api(libs.room.runtime) kapt(libs.room.compiler) diff --git a/core-crypto/.gitignore b/securevault-crypto/.gitignore similarity index 100% rename from core-crypto/.gitignore rename to securevault-crypto/.gitignore diff --git a/core-crypto/build.gradle.kts b/securevault-crypto/build.gradle.kts similarity index 100% rename from core-crypto/build.gradle.kts rename to securevault-crypto/build.gradle.kts diff --git a/core-crypto/consumer-rules.pro b/securevault-crypto/consumer-rules.pro similarity index 100% rename from core-crypto/consumer-rules.pro rename to securevault-crypto/consumer-rules.pro diff --git a/core-crypto/proguard-rules.pro b/securevault-crypto/proguard-rules.pro similarity index 100% rename from core-crypto/proguard-rules.pro rename to securevault-crypto/proguard-rules.pro diff --git a/core-crypto/src/androidTest/java/com/securevault/core/crypto/ExampleInstrumentedTest.kt b/securevault-crypto/src/androidTest/java/com/securevault/core/crypto/ExampleInstrumentedTest.kt similarity index 100% rename from core-crypto/src/androidTest/java/com/securevault/core/crypto/ExampleInstrumentedTest.kt rename to securevault-crypto/src/androidTest/java/com/securevault/core/crypto/ExampleInstrumentedTest.kt diff --git a/core-crypto/src/main/AndroidManifest.xml b/securevault-crypto/src/main/AndroidManifest.xml similarity index 100% rename from core-crypto/src/main/AndroidManifest.xml rename to securevault-crypto/src/main/AndroidManifest.xml diff --git a/core-crypto/src/main/java/com/securevault/core/crypto/CryptoExceptions.kt b/securevault-crypto/src/main/java/com/securevault/core/crypto/CryptoExceptions.kt similarity index 100% rename from core-crypto/src/main/java/com/securevault/core/crypto/CryptoExceptions.kt rename to securevault-crypto/src/main/java/com/securevault/core/crypto/CryptoExceptions.kt diff --git a/core-crypto/src/main/java/com/securevault/core/crypto/KeyStoreManager.kt b/securevault-crypto/src/main/java/com/securevault/core/crypto/KeyStoreManager.kt similarity index 100% rename from core-crypto/src/main/java/com/securevault/core/crypto/KeyStoreManager.kt rename to securevault-crypto/src/main/java/com/securevault/core/crypto/KeyStoreManager.kt diff --git a/core-crypto/src/main/java/com/securevault/core/crypto/SecurePassphraseStore.kt b/securevault-crypto/src/main/java/com/securevault/core/crypto/SecurePassphraseStore.kt similarity index 100% rename from core-crypto/src/main/java/com/securevault/core/crypto/SecurePassphraseStore.kt rename to securevault-crypto/src/main/java/com/securevault/core/crypto/SecurePassphraseStore.kt diff --git a/core-crypto/src/test/java/com/securevault/core/crypto/ExampleUnitTest.kt b/securevault-crypto/src/test/java/com/securevault/core/crypto/ExampleUnitTest.kt similarity index 100% rename from core-crypto/src/test/java/com/securevault/core/crypto/ExampleUnitTest.kt rename to securevault-crypto/src/test/java/com/securevault/core/crypto/ExampleUnitTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 5c6ccb2..bd1779d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,4 +24,4 @@ include(":app") include(":data") include(":domain") include(":core-network") -include(":core-crypto") +include(":securevault-crypto") From bd8e7b2002bf5a8576c25c1f3bbbabeb1e203de1 Mon Sep 17 00:00:00 2001 From: Mohd Aquib Date: Sun, 13 Sep 2026 10:23:23 +0530 Subject: [PATCH 2/3] refactor: rename core-network to securevault-network --- app/build.gradle.kts | 2 +- {core-network => securevault-network}/.gitignore | 0 {core-network => securevault-network}/build.gradle.kts | 0 {core-network => securevault-network}/consumer-rules.pro | 0 {core-network => securevault-network}/proguard-rules.pro | 0 .../com/securevault/core/network/ExampleInstrumentedTest.kt | 0 .../src/main/AndroidManifest.xml | 0 .../java/com/securevault/core/network/CertificatePinning.kt | 0 .../src/main/java/com/securevault/core/network/HealthApi.kt | 0 .../src/main/java/com/securevault/core/network/NetworkError.kt | 0 .../java/com/securevault/core/network/NetworkErrorMapper.kt | 0 .../main/java/com/securevault/core/network/NetworkExceptions.kt | 0 .../java/com/securevault/core/network/NetworkModuleMarker.kt | 0 .../src/main/java/com/securevault/core/network/NetworkResult.kt | 0 .../main/java/com/securevault/core/network/OkHttpProvider.kt | 0 .../main/java/com/securevault/core/network/RetrofitProvider.kt | 0 .../main/java/com/securevault/core/network/SafeNetworkCall.kt | 0 .../java/com/securevault/core/network/SecurityHealthChecker.kt | 0 .../java/com/securevault/core/network/UserAgentInterceptor.kt | 0 .../java/com/securevault/core/network/CertificatePinningTest.kt | 0 .../test/java/com/securevault/core/network/TestCertificates.kt | 0 settings.gradle.kts | 2 +- 22 files changed, 2 insertions(+), 2 deletions(-) rename {core-network => securevault-network}/.gitignore (100%) rename {core-network => securevault-network}/build.gradle.kts (100%) rename {core-network => securevault-network}/consumer-rules.pro (100%) rename {core-network => securevault-network}/proguard-rules.pro (100%) rename {core-network => securevault-network}/src/androidTest/java/com/securevault/core/network/ExampleInstrumentedTest.kt (100%) rename {core-network => securevault-network}/src/main/AndroidManifest.xml (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/CertificatePinning.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/HealthApi.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/NetworkError.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/NetworkErrorMapper.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/NetworkExceptions.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/NetworkModuleMarker.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/NetworkResult.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/OkHttpProvider.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/RetrofitProvider.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/SafeNetworkCall.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/SecurityHealthChecker.kt (100%) rename {core-network => securevault-network}/src/main/java/com/securevault/core/network/UserAgentInterceptor.kt (100%) rename {core-network => securevault-network}/src/test/java/com/securevault/core/network/CertificatePinningTest.kt (100%) rename {core-network => securevault-network}/src/test/java/com/securevault/core/network/TestCertificates.kt (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6704a0f..a3bdf0b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -74,7 +74,7 @@ dependencies { implementation(project(":domain")) implementation(project(":data")) - implementation(project(":core-network")) + implementation(project(":securevault-network")) implementation(project(":securevault-crypto")) testImplementation(libs.junit) diff --git a/core-network/.gitignore b/securevault-network/.gitignore similarity index 100% rename from core-network/.gitignore rename to securevault-network/.gitignore diff --git a/core-network/build.gradle.kts b/securevault-network/build.gradle.kts similarity index 100% rename from core-network/build.gradle.kts rename to securevault-network/build.gradle.kts diff --git a/core-network/consumer-rules.pro b/securevault-network/consumer-rules.pro similarity index 100% rename from core-network/consumer-rules.pro rename to securevault-network/consumer-rules.pro diff --git a/core-network/proguard-rules.pro b/securevault-network/proguard-rules.pro similarity index 100% rename from core-network/proguard-rules.pro rename to securevault-network/proguard-rules.pro diff --git a/core-network/src/androidTest/java/com/securevault/core/network/ExampleInstrumentedTest.kt b/securevault-network/src/androidTest/java/com/securevault/core/network/ExampleInstrumentedTest.kt similarity index 100% rename from core-network/src/androidTest/java/com/securevault/core/network/ExampleInstrumentedTest.kt rename to securevault-network/src/androidTest/java/com/securevault/core/network/ExampleInstrumentedTest.kt diff --git a/core-network/src/main/AndroidManifest.xml b/securevault-network/src/main/AndroidManifest.xml similarity index 100% rename from core-network/src/main/AndroidManifest.xml rename to securevault-network/src/main/AndroidManifest.xml diff --git a/core-network/src/main/java/com/securevault/core/network/CertificatePinning.kt b/securevault-network/src/main/java/com/securevault/core/network/CertificatePinning.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/CertificatePinning.kt rename to securevault-network/src/main/java/com/securevault/core/network/CertificatePinning.kt diff --git a/core-network/src/main/java/com/securevault/core/network/HealthApi.kt b/securevault-network/src/main/java/com/securevault/core/network/HealthApi.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/HealthApi.kt rename to securevault-network/src/main/java/com/securevault/core/network/HealthApi.kt diff --git a/core-network/src/main/java/com/securevault/core/network/NetworkError.kt b/securevault-network/src/main/java/com/securevault/core/network/NetworkError.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/NetworkError.kt rename to securevault-network/src/main/java/com/securevault/core/network/NetworkError.kt diff --git a/core-network/src/main/java/com/securevault/core/network/NetworkErrorMapper.kt b/securevault-network/src/main/java/com/securevault/core/network/NetworkErrorMapper.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/NetworkErrorMapper.kt rename to securevault-network/src/main/java/com/securevault/core/network/NetworkErrorMapper.kt diff --git a/core-network/src/main/java/com/securevault/core/network/NetworkExceptions.kt b/securevault-network/src/main/java/com/securevault/core/network/NetworkExceptions.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/NetworkExceptions.kt rename to securevault-network/src/main/java/com/securevault/core/network/NetworkExceptions.kt diff --git a/core-network/src/main/java/com/securevault/core/network/NetworkModuleMarker.kt b/securevault-network/src/main/java/com/securevault/core/network/NetworkModuleMarker.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/NetworkModuleMarker.kt rename to securevault-network/src/main/java/com/securevault/core/network/NetworkModuleMarker.kt diff --git a/core-network/src/main/java/com/securevault/core/network/NetworkResult.kt b/securevault-network/src/main/java/com/securevault/core/network/NetworkResult.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/NetworkResult.kt rename to securevault-network/src/main/java/com/securevault/core/network/NetworkResult.kt diff --git a/core-network/src/main/java/com/securevault/core/network/OkHttpProvider.kt b/securevault-network/src/main/java/com/securevault/core/network/OkHttpProvider.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/OkHttpProvider.kt rename to securevault-network/src/main/java/com/securevault/core/network/OkHttpProvider.kt diff --git a/core-network/src/main/java/com/securevault/core/network/RetrofitProvider.kt b/securevault-network/src/main/java/com/securevault/core/network/RetrofitProvider.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/RetrofitProvider.kt rename to securevault-network/src/main/java/com/securevault/core/network/RetrofitProvider.kt diff --git a/core-network/src/main/java/com/securevault/core/network/SafeNetworkCall.kt b/securevault-network/src/main/java/com/securevault/core/network/SafeNetworkCall.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/SafeNetworkCall.kt rename to securevault-network/src/main/java/com/securevault/core/network/SafeNetworkCall.kt diff --git a/core-network/src/main/java/com/securevault/core/network/SecurityHealthChecker.kt b/securevault-network/src/main/java/com/securevault/core/network/SecurityHealthChecker.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/SecurityHealthChecker.kt rename to securevault-network/src/main/java/com/securevault/core/network/SecurityHealthChecker.kt diff --git a/core-network/src/main/java/com/securevault/core/network/UserAgentInterceptor.kt b/securevault-network/src/main/java/com/securevault/core/network/UserAgentInterceptor.kt similarity index 100% rename from core-network/src/main/java/com/securevault/core/network/UserAgentInterceptor.kt rename to securevault-network/src/main/java/com/securevault/core/network/UserAgentInterceptor.kt diff --git a/core-network/src/test/java/com/securevault/core/network/CertificatePinningTest.kt b/securevault-network/src/test/java/com/securevault/core/network/CertificatePinningTest.kt similarity index 100% rename from core-network/src/test/java/com/securevault/core/network/CertificatePinningTest.kt rename to securevault-network/src/test/java/com/securevault/core/network/CertificatePinningTest.kt diff --git a/core-network/src/test/java/com/securevault/core/network/TestCertificates.kt b/securevault-network/src/test/java/com/securevault/core/network/TestCertificates.kt similarity index 100% rename from core-network/src/test/java/com/securevault/core/network/TestCertificates.kt rename to securevault-network/src/test/java/com/securevault/core/network/TestCertificates.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index bd1779d..a64992b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,5 +23,5 @@ rootProject.name = "SecureVault" include(":app") include(":data") include(":domain") -include(":core-network") +include(":securevault-network") include(":securevault-crypto") From 2e35b14543aa31e18200bad6c718df1127553afa Mon Sep 17 00:00:00 2001 From: Mohd Aquib Date: Sun, 13 Sep 2026 10:32:37 +0530 Subject: [PATCH 3/3] refactor: mark data and domain modules as demo implementation --- app/build.gradle.kts | 4 ++-- .../main/java/com/securevault/di/DatabaseModule.kt | 4 ++-- app/src/main/java/com/securevault/di/NotesModule.kt | 12 ++++++------ app/src/main/java/com/securevault/ui/MainScreen.kt | 2 +- app/src/main/java/com/securevault/ui/MainUiState.kt | 2 +- .../main/java/com/securevault/ui/MainViewModel.kt | 4 ++-- {data => demo-data}/.gitignore | 0 {data => demo-data}/build.gradle.kts | 4 ++-- {data => demo-data}/consumer-rules.pro | 0 {data => demo-data}/proguard-rules.pro | 0 .../demo}/data/SecureDatabaseEncryptionTest.kt | 6 +++--- {data => demo-data}/src/main/AndroidManifest.xml | 0 .../securevault/demo}/data/SecureVaultDataFactory.kt | 8 ++++---- .../demo}/data/local/InstantConverters.kt | 2 +- .../java/com/securevault/demo}/data/local/NoteDao.kt | 2 +- .../com/securevault/demo}/data/local/NoteEntity.kt | 2 +- .../com/securevault/demo}/data/local/NoteMappers.kt | 4 ++-- .../securevault/demo}/data/local/SecureDatabase.kt | 2 +- .../demo}/data/repository/NotesRepositoryImpl.kt | 12 ++++++------ {domain => demo-domain}/.gitignore | 0 {domain => demo-domain}/build.gradle.kts | 0 .../java/com/securevault/demo}/domain/model/Note.kt | 2 +- .../demo}/domain/repository/NotesRepository.kt | 4 ++-- .../demo}/domain/usecase/CreateNoteUseCase.kt | 6 +++--- .../demo}/domain/usecase/DeleteNoteUseCase.kt | 4 ++-- .../demo}/domain/usecase/GetNotesUseCase.kt | 6 +++--- settings.gradle.kts | 4 ++-- 27 files changed, 48 insertions(+), 48 deletions(-) rename {data => demo-data}/.gitignore (100%) rename {data => demo-data}/build.gradle.kts (94%) rename {data => demo-data}/consumer-rules.pro (100%) rename {data => demo-data}/proguard-rules.pro (100%) rename {data/src/androidTest/java/com/securevault => demo-data/src/androidTest/java/com/securevault/demo}/data/SecureDatabaseEncryptionTest.kt (91%) rename {data => demo-data}/src/main/AndroidManifest.xml (100%) rename {data/src/main/java/com/securevault => demo-data/src/main/java/com/securevault/demo}/data/SecureVaultDataFactory.kt (71%) rename {data/src/main/java/com/securevault => demo-data/src/main/java/com/securevault/demo}/data/local/InstantConverters.kt (88%) rename {data/src/main/java/com/securevault => demo-data/src/main/java/com/securevault/demo}/data/local/NoteDao.kt (92%) rename {data/src/main/java/com/securevault => demo-data/src/main/java/com/securevault/demo}/data/local/NoteEntity.kt (87%) rename {data/src/main/java/com/securevault => demo-data/src/main/java/com/securevault/demo}/data/local/NoteMappers.kt (81%) rename {data/src/main/java/com/securevault => demo-data/src/main/java/com/securevault/demo}/data/local/SecureDatabase.kt (96%) rename {data/src/main/java/com/securevault => demo-data/src/main/java/com/securevault/demo}/data/repository/NotesRepositoryImpl.kt (62%) rename {domain => demo-domain}/.gitignore (100%) rename {domain => demo-domain}/build.gradle.kts (100%) rename {domain/src/main/java/com/securevault => demo-domain/src/main/java/com/securevault/demo}/domain/model/Note.kt (84%) rename {domain/src/main/java/com/securevault => demo-domain/src/main/java/com/securevault/demo}/domain/repository/NotesRepository.kt (67%) rename {domain/src/main/java/com/securevault => demo-domain/src/main/java/com/securevault/demo}/domain/usecase/CreateNoteUseCase.kt (72%) rename {domain/src/main/java/com/securevault => demo-domain/src/main/java/com/securevault/demo}/domain/usecase/DeleteNoteUseCase.kt (62%) rename {domain/src/main/java/com/securevault => demo-domain/src/main/java/com/securevault/demo}/domain/usecase/GetNotesUseCase.kt (54%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a3bdf0b..8748b3a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -72,8 +72,8 @@ dependencies { kapt(libs.hilt.compiler) kapt(libs.kotlin.metadata.jvm) - implementation(project(":domain")) - implementation(project(":data")) + implementation(project(":demo-domain")) + implementation(project(":demo-data")) implementation(project(":securevault-network")) implementation(project(":securevault-crypto")) diff --git a/app/src/main/java/com/securevault/di/DatabaseModule.kt b/app/src/main/java/com/securevault/di/DatabaseModule.kt index 0350402..505f7ff 100644 --- a/app/src/main/java/com/securevault/di/DatabaseModule.kt +++ b/app/src/main/java/com/securevault/di/DatabaseModule.kt @@ -2,8 +2,8 @@ package com.securevault.di import android.content.Context import com.securevault.core.crypto.SecurePassphraseStore -import com.securevault.data.local.NoteDao -import com.securevault.data.local.SecureDatabase +import com.securevault.demo.data.local.NoteDao +import com.securevault.demo.data.local.SecureDatabase import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/securevault/di/NotesModule.kt b/app/src/main/java/com/securevault/di/NotesModule.kt index a52d963..087c081 100644 --- a/app/src/main/java/com/securevault/di/NotesModule.kt +++ b/app/src/main/java/com/securevault/di/NotesModule.kt @@ -1,11 +1,11 @@ package com.securevault.di -import com.securevault.data.local.NoteDao -import com.securevault.data.repository.NotesRepositoryImpl -import com.securevault.domain.repository.NotesRepository -import com.securevault.domain.usecase.CreateNoteUseCase -import com.securevault.domain.usecase.DeleteNoteUseCase -import com.securevault.domain.usecase.GetNotesUseCase +import com.securevault.demo.data.local.NoteDao +import com.securevault.demo.data.repository.NotesRepositoryImpl +import com.securevault.demo.domain.repository.NotesRepository +import com.securevault.demo.domain.usecase.CreateNoteUseCase +import com.securevault.demo.domain.usecase.DeleteNoteUseCase +import com.securevault.demo.domain.usecase.GetNotesUseCase import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/securevault/ui/MainScreen.kt b/app/src/main/java/com/securevault/ui/MainScreen.kt index 6077ab8..03b75d6 100644 --- a/app/src/main/java/com/securevault/ui/MainScreen.kt +++ b/app/src/main/java/com/securevault/ui/MainScreen.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.securevault.domain.model.Note +import com.securevault.demo.domain.model.Note import java.time.Instant @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/securevault/ui/MainUiState.kt b/app/src/main/java/com/securevault/ui/MainUiState.kt index d7d43aa..8f33c78 100644 --- a/app/src/main/java/com/securevault/ui/MainUiState.kt +++ b/app/src/main/java/com/securevault/ui/MainUiState.kt @@ -1,6 +1,6 @@ package com.securevault.ui -import com.securevault.domain.model.Note +import com.securevault.demo.domain.model.Note data class MainUiState( val notes: List = emptyList(), diff --git a/app/src/main/java/com/securevault/ui/MainViewModel.kt b/app/src/main/java/com/securevault/ui/MainViewModel.kt index 37738fb..fa008dd 100644 --- a/app/src/main/java/com/securevault/ui/MainViewModel.kt +++ b/app/src/main/java/com/securevault/ui/MainViewModel.kt @@ -4,8 +4,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.securevault.core.network.NetworkResult import com.securevault.core.network.SecurityHealthChecker -import com.securevault.domain.usecase.CreateNoteUseCase -import com.securevault.domain.usecase.GetNotesUseCase +import com.securevault.demo.domain.usecase.CreateNoteUseCase +import com.securevault.demo.domain.usecase.GetNotesUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/data/.gitignore b/demo-data/.gitignore similarity index 100% rename from data/.gitignore rename to demo-data/.gitignore diff --git a/data/build.gradle.kts b/demo-data/build.gradle.kts similarity index 94% rename from data/build.gradle.kts rename to demo-data/build.gradle.kts index 278a881..c4944b9 100644 --- a/data/build.gradle.kts +++ b/demo-data/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "com.securevault.data" + namespace = "com.securevault.demo.data" compileSdk { version = release(36) } @@ -46,7 +46,7 @@ android { } dependencies { - implementation(project(":domain")) + implementation(project(":demo-domain")) implementation(project(":securevault-crypto")) api(libs.room.runtime) diff --git a/data/consumer-rules.pro b/demo-data/consumer-rules.pro similarity index 100% rename from data/consumer-rules.pro rename to demo-data/consumer-rules.pro diff --git a/data/proguard-rules.pro b/demo-data/proguard-rules.pro similarity index 100% rename from data/proguard-rules.pro rename to demo-data/proguard-rules.pro diff --git a/data/src/androidTest/java/com/securevault/data/SecureDatabaseEncryptionTest.kt b/demo-data/src/androidTest/java/com/securevault/demo/data/SecureDatabaseEncryptionTest.kt similarity index 91% rename from data/src/androidTest/java/com/securevault/data/SecureDatabaseEncryptionTest.kt rename to demo-data/src/androidTest/java/com/securevault/demo/data/SecureDatabaseEncryptionTest.kt index de8074f..d59e7fa 100644 --- a/data/src/androidTest/java/com/securevault/data/SecureDatabaseEncryptionTest.kt +++ b/demo-data/src/androidTest/java/com/securevault/demo/data/SecureDatabaseEncryptionTest.kt @@ -1,12 +1,12 @@ -package com.securevault.data +package com.securevault.demo.data import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.securevault.core.crypto.KeyStoreManager import com.securevault.core.crypto.SecurePassphraseStore -import com.securevault.data.local.NoteEntity -import com.securevault.data.local.SecureDatabase +import com.securevault.demo.data.local.NoteEntity +import com.securevault.demo.data.local.SecureDatabase import kotlinx.coroutines.runBlocking import org.junit.Assert.assertFalse import org.junit.Before diff --git a/data/src/main/AndroidManifest.xml b/demo-data/src/main/AndroidManifest.xml similarity index 100% rename from data/src/main/AndroidManifest.xml rename to demo-data/src/main/AndroidManifest.xml diff --git a/data/src/main/java/com/securevault/data/SecureVaultDataFactory.kt b/demo-data/src/main/java/com/securevault/demo/data/SecureVaultDataFactory.kt similarity index 71% rename from data/src/main/java/com/securevault/data/SecureVaultDataFactory.kt rename to demo-data/src/main/java/com/securevault/demo/data/SecureVaultDataFactory.kt index f20df25..79fce87 100644 --- a/data/src/main/java/com/securevault/data/SecureVaultDataFactory.kt +++ b/demo-data/src/main/java/com/securevault/demo/data/SecureVaultDataFactory.kt @@ -1,11 +1,11 @@ -package com.securevault.data +package com.securevault.demo.data import android.content.Context import com.securevault.core.crypto.KeyStoreManager import com.securevault.core.crypto.SecurePassphraseStore -import com.securevault.data.local.SecureDatabase -import com.securevault.data.repository.NotesRepositoryImpl -import com.securevault.domain.repository.NotesRepository +import com.securevault.demo.data.local.SecureDatabase +import com.securevault.demo.data.repository.NotesRepositoryImpl +import com.securevault.demo.domain.repository.NotesRepository object SecureVaultDataFactory { fun createNotesRepository(context: Context): NotesRepository { diff --git a/data/src/main/java/com/securevault/data/local/InstantConverters.kt b/demo-data/src/main/java/com/securevault/demo/data/local/InstantConverters.kt similarity index 88% rename from data/src/main/java/com/securevault/data/local/InstantConverters.kt rename to demo-data/src/main/java/com/securevault/demo/data/local/InstantConverters.kt index 4a81160..2a02d2b 100644 --- a/data/src/main/java/com/securevault/data/local/InstantConverters.kt +++ b/demo-data/src/main/java/com/securevault/demo/data/local/InstantConverters.kt @@ -1,4 +1,4 @@ -package com.securevault.data.local +package com.securevault.demo.data.local import androidx.room.TypeConverter import java.time.Instant diff --git a/data/src/main/java/com/securevault/data/local/NoteDao.kt b/demo-data/src/main/java/com/securevault/demo/data/local/NoteDao.kt similarity index 92% rename from data/src/main/java/com/securevault/data/local/NoteDao.kt rename to demo-data/src/main/java/com/securevault/demo/data/local/NoteDao.kt index 3ae1a13..5dd3a27 100644 --- a/data/src/main/java/com/securevault/data/local/NoteDao.kt +++ b/demo-data/src/main/java/com/securevault/demo/data/local/NoteDao.kt @@ -1,4 +1,4 @@ -package com.securevault.data.local +package com.securevault.demo.data.local import androidx.room.Dao import androidx.room.Delete diff --git a/data/src/main/java/com/securevault/data/local/NoteEntity.kt b/demo-data/src/main/java/com/securevault/demo/data/local/NoteEntity.kt similarity index 87% rename from data/src/main/java/com/securevault/data/local/NoteEntity.kt rename to demo-data/src/main/java/com/securevault/demo/data/local/NoteEntity.kt index c0c0b62..86e25e1 100644 --- a/data/src/main/java/com/securevault/data/local/NoteEntity.kt +++ b/demo-data/src/main/java/com/securevault/demo/data/local/NoteEntity.kt @@ -1,4 +1,4 @@ -package com.securevault.data.local +package com.securevault.demo.data.local import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/data/src/main/java/com/securevault/data/local/NoteMappers.kt b/demo-data/src/main/java/com/securevault/demo/data/local/NoteMappers.kt similarity index 81% rename from data/src/main/java/com/securevault/data/local/NoteMappers.kt rename to demo-data/src/main/java/com/securevault/demo/data/local/NoteMappers.kt index 0eec6d0..b48122e 100644 --- a/data/src/main/java/com/securevault/data/local/NoteMappers.kt +++ b/demo-data/src/main/java/com/securevault/demo/data/local/NoteMappers.kt @@ -1,6 +1,6 @@ -package com.securevault.data.local +package com.securevault.demo.data.local -import com.securevault.domain.model.Note +import com.securevault.demo.domain.model.Note internal fun NoteEntity.toDomain(): Note = Note( diff --git a/data/src/main/java/com/securevault/data/local/SecureDatabase.kt b/demo-data/src/main/java/com/securevault/demo/data/local/SecureDatabase.kt similarity index 96% rename from data/src/main/java/com/securevault/data/local/SecureDatabase.kt rename to demo-data/src/main/java/com/securevault/demo/data/local/SecureDatabase.kt index 9dcdc51..365f485 100644 --- a/data/src/main/java/com/securevault/data/local/SecureDatabase.kt +++ b/demo-data/src/main/java/com/securevault/demo/data/local/SecureDatabase.kt @@ -1,4 +1,4 @@ -package com.securevault.data.local +package com.securevault.demo.data.local import android.content.Context import androidx.room.Database diff --git a/data/src/main/java/com/securevault/data/repository/NotesRepositoryImpl.kt b/demo-data/src/main/java/com/securevault/demo/data/repository/NotesRepositoryImpl.kt similarity index 62% rename from data/src/main/java/com/securevault/data/repository/NotesRepositoryImpl.kt rename to demo-data/src/main/java/com/securevault/demo/data/repository/NotesRepositoryImpl.kt index 1a7d3b7..30303d9 100644 --- a/data/src/main/java/com/securevault/data/repository/NotesRepositoryImpl.kt +++ b/demo-data/src/main/java/com/securevault/demo/data/repository/NotesRepositoryImpl.kt @@ -1,10 +1,10 @@ -package com.securevault.data.repository +package com.securevault.demo.data.repository -import com.securevault.data.local.NoteDao -import com.securevault.data.local.toDomain -import com.securevault.data.local.toEntity -import com.securevault.domain.model.Note -import com.securevault.domain.repository.NotesRepository +import com.securevault.demo.data.local.NoteDao +import com.securevault.demo.data.local.toDomain +import com.securevault.demo.data.local.toEntity +import com.securevault.demo.domain.model.Note +import com.securevault.demo.domain.repository.NotesRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/domain/.gitignore b/demo-domain/.gitignore similarity index 100% rename from domain/.gitignore rename to demo-domain/.gitignore diff --git a/domain/build.gradle.kts b/demo-domain/build.gradle.kts similarity index 100% rename from domain/build.gradle.kts rename to demo-domain/build.gradle.kts diff --git a/domain/src/main/java/com/securevault/domain/model/Note.kt b/demo-domain/src/main/java/com/securevault/demo/domain/model/Note.kt similarity index 84% rename from domain/src/main/java/com/securevault/domain/model/Note.kt rename to demo-domain/src/main/java/com/securevault/demo/domain/model/Note.kt index 2773c03..8514866 100644 --- a/domain/src/main/java/com/securevault/domain/model/Note.kt +++ b/demo-domain/src/main/java/com/securevault/demo/domain/model/Note.kt @@ -1,4 +1,4 @@ -package com.securevault.domain.model +package com.securevault.demo.domain.model import java.time.Instant import java.util.UUID diff --git a/domain/src/main/java/com/securevault/domain/repository/NotesRepository.kt b/demo-domain/src/main/java/com/securevault/demo/domain/repository/NotesRepository.kt similarity index 67% rename from domain/src/main/java/com/securevault/domain/repository/NotesRepository.kt rename to demo-domain/src/main/java/com/securevault/demo/domain/repository/NotesRepository.kt index fc95230..8f58394 100644 --- a/domain/src/main/java/com/securevault/domain/repository/NotesRepository.kt +++ b/demo-domain/src/main/java/com/securevault/demo/domain/repository/NotesRepository.kt @@ -1,6 +1,6 @@ -package com.securevault.domain.repository +package com.securevault.demo.domain.repository -import com.securevault.domain.model.Note +import com.securevault.demo.domain.model.Note import kotlinx.coroutines.flow.Flow interface NotesRepository { diff --git a/domain/src/main/java/com/securevault/domain/usecase/CreateNoteUseCase.kt b/demo-domain/src/main/java/com/securevault/demo/domain/usecase/CreateNoteUseCase.kt similarity index 72% rename from domain/src/main/java/com/securevault/domain/usecase/CreateNoteUseCase.kt rename to demo-domain/src/main/java/com/securevault/demo/domain/usecase/CreateNoteUseCase.kt index 1a542a6..1d62a5b 100644 --- a/domain/src/main/java/com/securevault/domain/usecase/CreateNoteUseCase.kt +++ b/demo-domain/src/main/java/com/securevault/demo/domain/usecase/CreateNoteUseCase.kt @@ -1,7 +1,7 @@ -package com.securevault.domain.usecase +package com.securevault.demo.domain.usecase -import com.securevault.domain.model.Note -import com.securevault.domain.repository.NotesRepository +import com.securevault.demo.domain.model.Note +import com.securevault.demo.domain.repository.NotesRepository import java.time.Instant class CreateNoteUseCase(private val repository: NotesRepository) { diff --git a/domain/src/main/java/com/securevault/domain/usecase/DeleteNoteUseCase.kt b/demo-domain/src/main/java/com/securevault/demo/domain/usecase/DeleteNoteUseCase.kt similarity index 62% rename from domain/src/main/java/com/securevault/domain/usecase/DeleteNoteUseCase.kt rename to demo-domain/src/main/java/com/securevault/demo/domain/usecase/DeleteNoteUseCase.kt index b167ce5..5a4deda 100644 --- a/domain/src/main/java/com/securevault/domain/usecase/DeleteNoteUseCase.kt +++ b/demo-domain/src/main/java/com/securevault/demo/domain/usecase/DeleteNoteUseCase.kt @@ -1,6 +1,6 @@ -package com.securevault.domain.usecase +package com.securevault.demo.domain.usecase -import com.securevault.domain.repository.NotesRepository +import com.securevault.demo.domain.repository.NotesRepository class DeleteNoteUseCase(private val repository: NotesRepository) { suspend operator fun invoke(noteId: String) { diff --git a/domain/src/main/java/com/securevault/domain/usecase/GetNotesUseCase.kt b/demo-domain/src/main/java/com/securevault/demo/domain/usecase/GetNotesUseCase.kt similarity index 54% rename from domain/src/main/java/com/securevault/domain/usecase/GetNotesUseCase.kt rename to demo-domain/src/main/java/com/securevault/demo/domain/usecase/GetNotesUseCase.kt index 6193231..a629e8c 100644 --- a/domain/src/main/java/com/securevault/domain/usecase/GetNotesUseCase.kt +++ b/demo-domain/src/main/java/com/securevault/demo/domain/usecase/GetNotesUseCase.kt @@ -1,7 +1,7 @@ -package com.securevault.domain.usecase +package com.securevault.demo.domain.usecase -import com.securevault.domain.model.Note -import com.securevault.domain.repository.NotesRepository +import com.securevault.demo.domain.model.Note +import com.securevault.demo.domain.repository.NotesRepository import kotlinx.coroutines.flow.Flow class GetNotesUseCase( diff --git a/settings.gradle.kts b/settings.gradle.kts index a64992b..27604f9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,7 +21,7 @@ dependencyResolutionManagement { rootProject.name = "SecureVault" include(":app") -include(":data") -include(":domain") +include(":demo-data") +include(":demo-domain") include(":securevault-network") include(":securevault-crypto")