feat: Move modules

2025-04-04 21:37:37 +03:00 · 2023-05-14 18:40:45 +02:00 · 2023-05-14 18:40:45 +02:00 · a235b21fbf
commit a235b21fbf
parent 158ed26f6f
365 changed files with 25 additions and 11 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -129,11 +129,9 @@ dependencies {
    // Password generator
    implementation 'me.gosimple:nbvcxz:1.5.0'
    
+    // Modules import
    implementation project(path: ':database')
-
-    // Icon pack
-    implementation project(path: ':icon-pack-classic')
-    implementation project(path: ':icon-pack-material')
+    implementation project(path: ':icon-pack')

    // Tests
    androidTestImplementation "androidx.test:runner:$android_test_version"
--- a/database/build.gradle
+++ b/database/build.gradle
@ -38,5 +38,5 @@ dependencies {
    implementation 'commons-io:commons-io:2.8.0'
    implementation 'commons-codec:commons-codec:1.15'

-    implementation project(path: ':crypto')
+    implementation project(path: ':database:crypto')
 }
--- a/database/crypto/.gitignore
+++ b/database/crypto/.gitignore
--- a/database/crypto/build.gradle
+++ b/database/crypto/build.gradle
--- a/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
+++ b/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
--- a/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
+++ b/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
--- a/database/crypto/src/main/AndroidManifest.xml
+++ b/database/crypto/src/main/AndroidManifest.xml
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
--- a/database/crypto/src/main/jni/.gitignore
+++ b/database/crypto/src/main/jni/.gitignore
--- a/database/crypto/src/main/jni/CMakeLists.txt
+++ b/database/crypto/src/main/jni/CMakeLists.txt
--- a/database/crypto/src/main/jni/aes/CMakeLists.txt
+++ b/database/crypto/src/main/jni/aes/CMakeLists.txt
--- a/database/crypto/src/main/jni/aes/aes/aes.h
+++ b/database/crypto/src/main/jni/aes/aes/aes.h
--- a/database/crypto/src/main/jni/aes/aes/aes.txt
+++ b/database/crypto/src/main/jni/aes/aes/aes.txt
--- a/database/crypto/src/main/jni/aes/aes/aes_amd64.asm
+++ b/database/crypto/src/main/jni/aes/aes/aes_amd64.asm
--- a/database/crypto/src/main/jni/aes/aes/aes_modes.c
+++ b/database/crypto/src/main/jni/aes/aes/aes_modes.c
--- a/database/crypto/src/main/jni/aes/aes/aes_via_ace.h
+++ b/database/crypto/src/main/jni/aes/aes/aes_via_ace.h
--- a/database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
+++ b/database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
--- a/database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
+++ b/database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
--- a/database/crypto/src/main/jni/aes/aes/aescpp.h
+++ b/database/crypto/src/main/jni/aes/aes/aescpp.h
--- a/database/crypto/src/main/jni/aes/aes/aescrypt.c
+++ b/database/crypto/src/main/jni/aes/aes/aescrypt.c
--- a/database/crypto/src/main/jni/aes/aes/aeskey.c
+++ b/database/crypto/src/main/jni/aes/aes/aeskey.c
--- a/database/crypto/src/main/jni/aes/aes/aesopt.h
+++ b/database/crypto/src/main/jni/aes/aes/aesopt.h
--- a/database/crypto/src/main/jni/aes/aes/aestab.c
+++ b/database/crypto/src/main/jni/aes/aes/aestab.c
--- a/database/crypto/src/main/jni/aes/aes/aestab.h
+++ b/database/crypto/src/main/jni/aes/aes/aestab.h
--- a/database/crypto/src/main/jni/aes/aes/aesxam.c
+++ b/database/crypto/src/main/jni/aes/aes/aesxam.c
--- a/database/crypto/src/main/jni/aes/aes/brg_endian.h
+++ b/database/crypto/src/main/jni/aes/aes/brg_endian.h
--- a/database/crypto/src/main/jni/aes/aes/brg_types.h
+++ b/database/crypto/src/main/jni/aes/aes/brg_types.h
--- a/database/crypto/src/main/jni/aes/aes/rfc3686.c
+++ b/database/crypto/src/main/jni/aes/aes/rfc3686.c
--- a/database/crypto/src/main/jni/aes/aes/tablegen.c
+++ b/database/crypto/src/main/jni/aes/aes/tablegen.c
--- a/database/crypto/src/main/jni/aes/aes/vb.txt
+++ b/database/crypto/src/main/jni/aes/aes/vb.txt
--- a/database/crypto/src/main/jni/aes/aes/vbaxam.doc
+++ b/database/crypto/src/main/jni/aes/aes/vbaxam.doc
--- a/database/crypto/src/main/jni/aes/aes/via_ace.txt
+++ b/database/crypto/src/main/jni/aes/aes/via_ace.txt
--- a/database/crypto/src/main/jni/aes/aes_jni.c
+++ b/database/crypto/src/main/jni/aes/aes_jni.c
--- a/database/crypto/src/main/jni/aes/sha/Android.mk
+++ b/database/crypto/src/main/jni/aes/sha/Android.mk
--- a/database/crypto/src/main/jni/aes/sha/brg_endian.h
+++ b/database/crypto/src/main/jni/aes/sha/brg_endian.h
--- a/database/crypto/src/main/jni/aes/sha/brg_types.h
+++ b/database/crypto/src/main/jni/aes/sha/brg_types.h
--- a/database/crypto/src/main/jni/aes/sha/hmac.c
+++ b/database/crypto/src/main/jni/aes/sha/hmac.c
--- a/database/crypto/src/main/jni/aes/sha/hmac.h
+++ b/database/crypto/src/main/jni/aes/sha/hmac.h
--- a/database/crypto/src/main/jni/aes/sha/pwd2key.c
+++ b/database/crypto/src/main/jni/aes/sha/pwd2key.c
--- a/database/crypto/src/main/jni/aes/sha/pwd2key.h
+++ b/database/crypto/src/main/jni/aes/sha/pwd2key.h
--- a/database/crypto/src/main/jni/aes/sha/sha1.c
+++ b/database/crypto/src/main/jni/aes/sha/sha1.c
--- a/database/crypto/src/main/jni/aes/sha/sha1.h
+++ b/database/crypto/src/main/jni/aes/sha/sha1.h
--- a/database/crypto/src/main/jni/aes/sha/sha1b.c
+++ b/database/crypto/src/main/jni/aes/sha/sha1b.c
--- a/database/crypto/src/main/jni/aes/sha/sha2.c
+++ b/database/crypto/src/main/jni/aes/sha/sha2.c
--- a/database/crypto/src/main/jni/aes/sha/sha2.h
+++ b/database/crypto/src/main/jni/aes/sha/sha2.h
--- a/database/crypto/src/main/jni/aes/sha/sha2b.c
+++ b/database/crypto/src/main/jni/aes/sha/sha2b.c
--- a/database/crypto/src/main/jni/aes/sha/shasum.c
+++ b/database/crypto/src/main/jni/aes/sha/shasum.c
--- a/database/crypto/src/main/jni/argon2/CMakeLists.txt
+++ b/database/crypto/src/main/jni/argon2/CMakeLists.txt
--- a/database/crypto/src/main/jni/argon2/argon2_jni.c
+++ b/database/crypto/src/main/jni/argon2/argon2_jni.c
--- a/database/crypto/src/main/jni/argon2/include/argon2.h
+++ b/database/crypto/src/main/jni/argon2/include/argon2.h
--- a/database/crypto/src/main/jni/argon2/src/CMakeLists.txt
+++ b/database/crypto/src/main/jni/argon2/src/CMakeLists.txt
--- a/database/crypto/src/main/jni/argon2/src/argon2.c
+++ b/database/crypto/src/main/jni/argon2/src/argon2.c
--- a/database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
--- a/database/crypto/src/main/jni/argon2/src/blake2/blake2.h
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blake2.h
--- a/database/crypto/src/main/jni/argon2/src/blake2/blake2b.c
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blake2b.c
--- a/database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
--- a/database/crypto/src/main/jni/argon2/src/core.c
+++ b/database/crypto/src/main/jni/argon2/src/core.c
--- a/database/crypto/src/main/jni/argon2/src/core.h
+++ b/database/crypto/src/main/jni/argon2/src/core.h
--- a/database/crypto/src/main/jni/argon2/src/encoding.c
+++ b/database/crypto/src/main/jni/argon2/src/encoding.c
--- a/database/crypto/src/main/jni/argon2/src/encoding.h
+++ b/database/crypto/src/main/jni/argon2/src/encoding.h
--- a/database/crypto/src/main/jni/argon2/src/opt.c
+++ b/database/crypto/src/main/jni/argon2/src/opt.c
--- a/database/crypto/src/main/jni/argon2/src/opt.h
+++ b/database/crypto/src/main/jni/argon2/src/opt.h
--- a/database/crypto/src/main/jni/argon2/src/ref.c
+++ b/database/crypto/src/main/jni/argon2/src/ref.c
--- a/database/crypto/src/main/jni/argon2/src/ref.h
+++ b/database/crypto/src/main/jni/argon2/src/ref.h
--- a/database/crypto/src/main/jni/argon2/src/thread.c
+++ b/database/crypto/src/main/jni/argon2/src/thread.c
--- a/database/crypto/src/main/jni/argon2/src/thread.h
+++ b/database/crypto/src/main/jni/argon2/src/thread.h
--- a/icon-pack-classic/src/main/AndroidManifest.xml
+++ b/icon-pack-classic/src/main/AndroidManifest.xml
@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kunzisoft.keepass.icon.classic" />
--- a/icon-pack-material/src/main/AndroidManifest.xml
+++ b/icon-pack-material/src/main/AndroidManifest.xml
@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kunzisoft.keepass.icon.material" />
--- a/icon-pack/build.gradle
+++ b/icon-pack/build.gradle
@ -0,0 +1,16 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 32
+    buildToolsVersion '32.0.0'
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 32
+    }
+}
+
+dependencies {
+    implementation project(path: ':icon-pack:classic')
+    implementation project(path: ':icon-pack:material')
+}
--- a/icon-pack/classic/License.txt
+++ b/icon-pack/classic/License.txt
--- a/icon-pack/classic/build.gradle
+++ b/icon-pack/classic/build.gradle
--- a/icon-pack/classic/src/main/AndroidManifest.xml
+++ b/icon-pack/classic/src/main/AndroidManifest.xml
@ -0,0 +1 @@
+<manifest package="com.kunzisoft.keepass.icon.classic" />
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_00_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_00_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_01_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_01_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_02_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_02_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_03_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_03_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_04_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_04_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_05_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_05_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_06_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_06_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_07_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_07_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_08_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_08_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_09_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_09_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_10_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_10_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_11_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_11_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_12_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_12_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_13_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_13_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_14_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_14_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_15_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_15_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_16_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_16_32dp.png
--- a/icon-pack/classic/src/main/res/drawable-hdpi/classic_17_32dp.png
+++ b/icon-pack/classic/src/main/res/drawable-hdpi/classic_17_32dp.png
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`<manifest package="com.kunzisoft.keepass.icon.classic" />`