aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-08-10 03:21:47 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2023-08-10 03:31:08 +0530
commit959a56d7ffbc20db60721d7a09f399c8bdefe07e (patch)
tree0d9b14e0bb770fd6da2e04295f2c22c087142439
parentefef72b6327c8e683c8844146e23d12104f12dd1 (diff)
refactor: un-flatten module structure
-rw-r--r--CONTRIBUTING.md8
-rw-r--r--app/build.gradle.kts6
-rw-r--r--crypto/common/build.gradle.kts (renamed from crypto-common/build.gradle.kts)0
-rw-r--r--crypto/common/lint-baseline.xml (renamed from crypto-common/lint-baseline.xml)0
-rw-r--r--crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt (renamed from crypto-common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt)0
-rw-r--r--crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoOptions.kt (renamed from crypto-common/src/main/kotlin/app/passwordstore/crypto/CryptoOptions.kt)0
-rw-r--r--crypto/common/src/main/kotlin/app/passwordstore/crypto/KeyManager.kt (renamed from crypto-common/src/main/kotlin/app/passwordstore/crypto/KeyManager.kt)0
-rw-r--r--crypto/common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt (renamed from crypto-common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt)0
-rw-r--r--crypto/pgpainless/build.gradle.kts (renamed from crypto-pgpainless/build.gradle.kts)2
-rw-r--r--crypto/pgpainless/lint-baseline.xml (renamed from crypto-pgpainless/lint-baseline.xml)0
-rw-r--r--crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt (renamed from crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt)0
-rw-r--r--crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPDecryptOptions.kt (renamed from crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPDecryptOptions.kt)0
-rw-r--r--crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPEncryptOptions.kt (renamed from crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPEncryptOptions.kt)0
-rw-r--r--crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPIdentifier.kt (renamed from crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPIdentifier.kt)0
-rw-r--r--crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt (renamed from crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt)0
-rw-r--r--crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt (renamed from crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt)0
-rw-r--r--crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt (renamed from crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt)0
-rw-r--r--crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt (renamed from crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt)0
-rw-r--r--crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt (renamed from crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt)0
-rw-r--r--crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPIdentifierTest.kt (renamed from crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPIdentifierTest.kt)0
-rw-r--r--crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt (renamed from crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt)0
-rw-r--r--crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt (renamed from crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt)0
-rw-r--r--crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt (renamed from crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt)0
-rw-r--r--crypto/pgpainless/src/test/resources/aead_pub (renamed from crypto-pgpainless/src/test/resources/aead_pub)0
-rw-r--r--crypto/pgpainless/src/test/resources/aead_sec (renamed from crypto-pgpainless/src/test/resources/aead_sec)0
-rw-r--r--crypto/pgpainless/src/test/resources/alice_owner@example_com (renamed from crypto-pgpainless/src/test/resources/alice_owner@example_com)0
-rw-r--r--crypto/pgpainless/src/test/resources/bobby_owner@example_com (renamed from crypto-pgpainless/src/test/resources/bobby_owner@example_com)0
-rw-r--r--crypto/pgpainless/src/test/resources/public_key (renamed from crypto-pgpainless/src/test/resources/public_key)0
-rw-r--r--crypto/pgpainless/src/test/resources/public_key_multiple_identities (renamed from crypto-pgpainless/src/test/resources/public_key_multiple_identities)0
-rw-r--r--crypto/pgpainless/src/test/resources/secret_key (renamed from crypto-pgpainless/src/test/resources/secret_key)0
-rw-r--r--crypto/pgpainless/src/test/resources/secret_key_multiple_identities (renamed from crypto-pgpainless/src/test/resources/secret_key_multiple_identities)0
-rw-r--r--format/common/build.gradle.kts (renamed from format-common/build.gradle.kts)0
-rw-r--r--format/common/lint-baseline.xml (renamed from format-common/lint-baseline.xml)0
-rw-r--r--format/common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt (renamed from format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt)0
-rw-r--r--format/common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt (renamed from format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt)0
-rw-r--r--format/common/src/main/kotlin/app/passwordstore/util/time/UserClock.kt (renamed from format-common/src/main/kotlin/app/passwordstore/util/time/UserClock.kt)0
-rw-r--r--format/common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt (renamed from format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt)0
-rw-r--r--format/common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt (renamed from format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt)0
-rw-r--r--format/common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt (renamed from format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt)0
-rw-r--r--format/common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt (renamed from format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt)0
-rw-r--r--format/common/src/test/kotlin/app/passwordstore/util/time/TestUserClock.kt (renamed from format-common/src/test/kotlin/app/passwordstore/util/time/TestUserClock.kt)0
-rw-r--r--format/common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt (renamed from format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt)0
-rw-r--r--format/common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt (renamed from format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt)0
-rw-r--r--settings.gradle.kts8
-rw-r--r--ui/compose/build.gradle.kts (renamed from ui-compose/build.gradle.kts)0
-rw-r--r--ui/compose/lint-baseline.xml (renamed from ui-compose/lint-baseline.xml)0
-rw-r--r--ui/compose/src/main/AndroidManifest.xml (renamed from ui-compose/src/main/AndroidManifest.xml)0
-rw-r--r--ui/compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt (renamed from ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt)0
-rw-r--r--ui/compose/src/main/kotlin/app/passwordstore/ui/compose/PasswordField.kt (renamed from ui-compose/src/main/kotlin/app/passwordstore/ui/compose/PasswordField.kt)0
-rw-r--r--ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt (renamed from ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt)0
-rw-r--r--ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt (renamed from ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt)0
-rw-r--r--ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt (renamed from ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt)0
-rw-r--r--ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/utils.kt (renamed from ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/utils.kt)0
-rw-r--r--ui/compose/src/main/res/drawable/baseline_visibility_24.xml (renamed from ui-compose/src/main/res/drawable/baseline_visibility_24.xml)0
-rw-r--r--ui/compose/src/main/res/drawable/baseline_visibility_off_24.xml (renamed from ui-compose/src/main/res/drawable/baseline_visibility_off_24.xml)0
-rw-r--r--ui/compose/src/main/res/drawable/ic_content_copy.xml (renamed from ui-compose/src/main/res/drawable/ic_content_copy.xml)0
-rw-r--r--ui/compose/src/main/res/font/manrope.xml (renamed from ui-compose/src/main/res/font/manrope.xml)0
-rw-r--r--ui/compose/src/main/res/font/manrope_bold.ttf (renamed from ui-compose/src/main/res/font/manrope_bold.ttf)bin92228 -> 92228 bytes
-rw-r--r--ui/compose/src/main/res/font/manrope_extrabold.ttf (renamed from ui-compose/src/main/res/font/manrope_extrabold.ttf)bin93144 -> 93144 bytes
-rw-r--r--ui/compose/src/main/res/font/manrope_extralight.ttf (renamed from ui-compose/src/main/res/font/manrope_extralight.ttf)bin92272 -> 92272 bytes
-rw-r--r--ui/compose/src/main/res/font/manrope_light.ttf (renamed from ui-compose/src/main/res/font/manrope_light.ttf)bin92400 -> 92400 bytes
-rw-r--r--ui/compose/src/main/res/font/manrope_medium.ttf (renamed from ui-compose/src/main/res/font/manrope_medium.ttf)bin92464 -> 92464 bytes
-rw-r--r--ui/compose/src/main/res/font/manrope_regular.ttf (renamed from ui-compose/src/main/res/font/manrope_regular.ttf)bin92376 -> 92376 bytes
-rw-r--r--ui/compose/src/main/res/font/manrope_semibold.ttf (renamed from ui-compose/src/main/res/font/manrope_semibold.ttf)bin92380 -> 92380 bytes
64 files changed, 12 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8feab911..9674dbfa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,15 +23,15 @@ The source code is split across 12 modules and 1 subproject.
- `build-logic` and its modules host the Gradle build logic for the project.
- `autofill-parser` is the aptly named parser for Android's Autofill structures that also deals with trust and feature detection for browsers.
- `coroutine-utils` is a helper libraries that allow for effective usage and testing of [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html).
-- `crypto-common` is the foundation of our new, extensible cryptography APIs that adds the ability to introduce new cryptographic backends to APS with minimal effort.
-- `crypto-pgpainless` is the first of our new backends that implements the APIs defined in `crypto-common` to offer PGP cryptography through the [PGPainless](https://gh.pgpainless.org/) library.
-- `format-common` handles parsing the `pass` file format.
+- `crypto/common` is the foundation of our new, extensible cryptography APIs that adds the ability to introduce new cryptographic backends to APS with minimal effort.
+- `crypto/pgpainless` is the first of our new backends that implements the APIs defined in `crypto-common` to offer PGP cryptography through the [PGPainless](https://gh.pgpainless.org/) library.
+- `format/common` handles parsing the `pass` file format.
- `openpgp-ktx` contains the now defunct glue code that was used by APS to interact with OpenKeychain.
- `passgen/diceware` is our new password generator that implements the [Diceware](https://theworld.com/~reinhold/diceware.html) algorithm.
- `passgen/random` contains the default password generator.
- `sentry-stub` contains no-op variants of [Sentry](https://sentry.io/) APIs that we use to ensure the FOSS-only, telemetry-free variant of APS continues to compile in absence of Sentry dependencies.
- `ssh` has exactly what you think it does.
-- `ui-compose` has the theming code for building UI components in [Jetpack Compose](https://developer.android.com/jetpack/compose).
+- `ui/compose` has the theming code for building UI components in [Jetpack Compose](https://developer.android.com/jetpack/compose).
- `app` is everything else that constitutes APS.
In most scenarios, the `app` directory is where you'd be contributing changes to. While most of the code has been rewritten and documented, there are still gnarly "legacy" parts that might be challenging to understand at a glance. Please get in touch via the [Discussions](https://github.com/android-password-store/Android-Password-Store/discussions) page with any questions you have, and we'd love to explain and improve things.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b7e93c57..4f825aad 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -43,12 +43,12 @@ dependencies {
coreLibraryDesugaring(libs.android.desugarJdkLibs)
implementation(projects.autofillParser)
implementation(projects.coroutineUtils)
- implementation(projects.cryptoPgpainless)
- implementation(projects.formatCommon)
+ implementation(projects.crypto.pgpainless)
+ implementation(projects.format.common)
implementation(projects.passgen.diceware)
implementation(projects.passgen.random)
implementation(projects.ssh)
- implementation(projects.uiCompose)
+ implementation(projects.ui.compose)
implementation(libs.androidx.activity.ktx)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.appcompat)
diff --git a/crypto-common/build.gradle.kts b/crypto/common/build.gradle.kts
index 110664bd..110664bd 100644
--- a/crypto-common/build.gradle.kts
+++ b/crypto/common/build.gradle.kts
diff --git a/crypto-common/lint-baseline.xml b/crypto/common/lint-baseline.xml
index 2ed8a3bb..2ed8a3bb 100644
--- a/crypto-common/lint-baseline.xml
+++ b/crypto/common/lint-baseline.xml
diff --git a/crypto-common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt b/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt
index 898cf058..898cf058 100644
--- a/crypto-common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt
+++ b/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoHandler.kt
diff --git a/crypto-common/src/main/kotlin/app/passwordstore/crypto/CryptoOptions.kt b/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoOptions.kt
index 1e60cdba..1e60cdba 100644
--- a/crypto-common/src/main/kotlin/app/passwordstore/crypto/CryptoOptions.kt
+++ b/crypto/common/src/main/kotlin/app/passwordstore/crypto/CryptoOptions.kt
diff --git a/crypto-common/src/main/kotlin/app/passwordstore/crypto/KeyManager.kt b/crypto/common/src/main/kotlin/app/passwordstore/crypto/KeyManager.kt
index c9db3734..c9db3734 100644
--- a/crypto-common/src/main/kotlin/app/passwordstore/crypto/KeyManager.kt
+++ b/crypto/common/src/main/kotlin/app/passwordstore/crypto/KeyManager.kt
diff --git a/crypto-common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt b/crypto/common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt
index eb64541e..eb64541e 100644
--- a/crypto-common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt
+++ b/crypto/common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt
diff --git a/crypto-pgpainless/build.gradle.kts b/crypto/pgpainless/build.gradle.kts
index 22363f23..29f5bb1f 100644
--- a/crypto-pgpainless/build.gradle.kts
+++ b/crypto/pgpainless/build.gradle.kts
@@ -5,7 +5,7 @@
plugins { id("com.github.android-password-store.kotlin-jvm-library") }
dependencies {
- api(projects.cryptoCommon)
+ api(projects.crypto.common)
implementation(projects.coroutineUtils)
implementation(libs.androidx.annotation)
implementation(libs.dagger.hilt.core)
diff --git a/crypto-pgpainless/lint-baseline.xml b/crypto/pgpainless/lint-baseline.xml
index 2ed8a3bb..2ed8a3bb 100644
--- a/crypto-pgpainless/lint-baseline.xml
+++ b/crypto/pgpainless/lint-baseline.xml
diff --git a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt
index 5b23dc18..5b23dc18 100644
--- a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt
diff --git a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPDecryptOptions.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPDecryptOptions.kt
index 15ce92f0..15ce92f0 100644
--- a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPDecryptOptions.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPDecryptOptions.kt
diff --git a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPEncryptOptions.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPEncryptOptions.kt
index 90de6b51..90de6b51 100644
--- a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPEncryptOptions.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPEncryptOptions.kt
diff --git a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPIdentifier.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPIdentifier.kt
index 98a1de2e..98a1de2e 100644
--- a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPIdentifier.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPIdentifier.kt
diff --git a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt
index a33655d4..a33655d4 100644
--- a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt
diff --git a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt
index aed1acf2..aed1acf2 100644
--- a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt
diff --git a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
index a7087acf..a7087acf 100644
--- a/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
+++ b/crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
diff --git a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt
index d827e169..d827e169 100644
--- a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt
+++ b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt
diff --git a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt
index a0f84402..a0f84402 100644
--- a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt
+++ b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt
diff --git a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPIdentifierTest.kt b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPIdentifierTest.kt
index efc6e0ba..efc6e0ba 100644
--- a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPIdentifierTest.kt
+++ b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPIdentifierTest.kt
diff --git a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt
index 85cf8e1b..85cf8e1b 100644
--- a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt
+++ b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt
diff --git a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt
index 8bf6ba1e..8bf6ba1e 100644
--- a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt
+++ b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt
diff --git a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt
index 90b98ac9..90b98ac9 100644
--- a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt
+++ b/crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt
diff --git a/crypto-pgpainless/src/test/resources/aead_pub b/crypto/pgpainless/src/test/resources/aead_pub
index f6ae1e82..f6ae1e82 100644
--- a/crypto-pgpainless/src/test/resources/aead_pub
+++ b/crypto/pgpainless/src/test/resources/aead_pub
diff --git a/crypto-pgpainless/src/test/resources/aead_sec b/crypto/pgpainless/src/test/resources/aead_sec
index 8e13ac0e..8e13ac0e 100644
--- a/crypto-pgpainless/src/test/resources/aead_sec
+++ b/crypto/pgpainless/src/test/resources/aead_sec
diff --git a/crypto-pgpainless/src/test/resources/alice_owner@example_com b/crypto/pgpainless/src/test/resources/alice_owner@example_com
index d2612b0d..d2612b0d 100644
--- a/crypto-pgpainless/src/test/resources/alice_owner@example_com
+++ b/crypto/pgpainless/src/test/resources/alice_owner@example_com
diff --git a/crypto-pgpainless/src/test/resources/bobby_owner@example_com b/crypto/pgpainless/src/test/resources/bobby_owner@example_com
index 6bd548e7..6bd548e7 100644
--- a/crypto-pgpainless/src/test/resources/bobby_owner@example_com
+++ b/crypto/pgpainless/src/test/resources/bobby_owner@example_com
diff --git a/crypto-pgpainless/src/test/resources/public_key b/crypto/pgpainless/src/test/resources/public_key
index 987bac6f..987bac6f 100644
--- a/crypto-pgpainless/src/test/resources/public_key
+++ b/crypto/pgpainless/src/test/resources/public_key
diff --git a/crypto-pgpainless/src/test/resources/public_key_multiple_identities b/crypto/pgpainless/src/test/resources/public_key_multiple_identities
index 2cc896c2..2cc896c2 100644
--- a/crypto-pgpainless/src/test/resources/public_key_multiple_identities
+++ b/crypto/pgpainless/src/test/resources/public_key_multiple_identities
diff --git a/crypto-pgpainless/src/test/resources/secret_key b/crypto/pgpainless/src/test/resources/secret_key
index 61334b01..61334b01 100644
--- a/crypto-pgpainless/src/test/resources/secret_key
+++ b/crypto/pgpainless/src/test/resources/secret_key
diff --git a/crypto-pgpainless/src/test/resources/secret_key_multiple_identities b/crypto/pgpainless/src/test/resources/secret_key_multiple_identities
index 5da8ac81..5da8ac81 100644
--- a/crypto-pgpainless/src/test/resources/secret_key_multiple_identities
+++ b/crypto/pgpainless/src/test/resources/secret_key_multiple_identities
diff --git a/format-common/build.gradle.kts b/format/common/build.gradle.kts
index b4ac58b6..b4ac58b6 100644
--- a/format-common/build.gradle.kts
+++ b/format/common/build.gradle.kts
diff --git a/format-common/lint-baseline.xml b/format/common/lint-baseline.xml
index 2ed8a3bb..2ed8a3bb 100644
--- a/format-common/lint-baseline.xml
+++ b/format/common/lint-baseline.xml
diff --git a/format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt b/format/common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt
index 1618374f..1618374f 100644
--- a/format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt
+++ b/format/common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt
diff --git a/format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt b/format/common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt
index c279360f..c279360f 100644
--- a/format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt
+++ b/format/common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt
diff --git a/format-common/src/main/kotlin/app/passwordstore/util/time/UserClock.kt b/format/common/src/main/kotlin/app/passwordstore/util/time/UserClock.kt
index 4ffeb6a6..4ffeb6a6 100644
--- a/format-common/src/main/kotlin/app/passwordstore/util/time/UserClock.kt
+++ b/format/common/src/main/kotlin/app/passwordstore/util/time/UserClock.kt
diff --git a/format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt b/format/common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt
index 10e771fe..10e771fe 100644
--- a/format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt
+++ b/format/common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt
diff --git a/format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt b/format/common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt
index d53d76dc..d53d76dc 100644
--- a/format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt
+++ b/format/common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt
diff --git a/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt b/format/common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt
index bb97c90c..bb97c90c 100644
--- a/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt
+++ b/format/common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt
diff --git a/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt b/format/common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
index 865a13c1..865a13c1 100644
--- a/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
+++ b/format/common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
diff --git a/format-common/src/test/kotlin/app/passwordstore/util/time/TestUserClock.kt b/format/common/src/test/kotlin/app/passwordstore/util/time/TestUserClock.kt
index 8a860a39..8a860a39 100644
--- a/format-common/src/test/kotlin/app/passwordstore/util/time/TestUserClock.kt
+++ b/format/common/src/test/kotlin/app/passwordstore/util/time/TestUserClock.kt
diff --git a/format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt b/format/common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt
index 54ac492d..54ac492d 100644
--- a/format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt
+++ b/format/common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt
diff --git a/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt b/format/common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt
index e462c490..e462c490 100644
--- a/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt
+++ b/format/common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b8b830b7..18984e5a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -180,11 +180,11 @@ include("autofill-parser")
include("coroutine-utils")
-include("crypto-common")
+include("crypto:common")
-include("crypto-pgpainless")
+include("crypto:pgpainless")
-include("format-common")
+include("format:common")
include("passgen:diceware")
@@ -192,6 +192,6 @@ include("passgen:random")
include("sentry-stub")
-include("ui-compose")
+include("ui:compose")
include("ssh")
diff --git a/ui-compose/build.gradle.kts b/ui/compose/build.gradle.kts
index 21f1e469..21f1e469 100644
--- a/ui-compose/build.gradle.kts
+++ b/ui/compose/build.gradle.kts
diff --git a/ui-compose/lint-baseline.xml b/ui/compose/lint-baseline.xml
index 2ed8a3bb..2ed8a3bb 100644
--- a/ui-compose/lint-baseline.xml
+++ b/ui/compose/lint-baseline.xml
diff --git a/ui-compose/src/main/AndroidManifest.xml b/ui/compose/src/main/AndroidManifest.xml
index e3cc34c8..e3cc34c8 100644
--- a/ui-compose/src/main/AndroidManifest.xml
+++ b/ui/compose/src/main/AndroidManifest.xml
diff --git a/ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt b/ui/compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt
index 94b646b7..94b646b7 100644
--- a/ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt
+++ b/ui/compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt
diff --git a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/PasswordField.kt b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/PasswordField.kt
index d2a04777..d2a04777 100644
--- a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/PasswordField.kt
+++ b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/PasswordField.kt
diff --git a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt
index 7709d136..7709d136 100644
--- a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt
+++ b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt
diff --git a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt
index b11aa7c1..b11aa7c1 100644
--- a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt
+++ b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt
diff --git a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt
index b9a07d5d..b9a07d5d 100644
--- a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt
+++ b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt
diff --git a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/utils.kt b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/utils.kt
index 096862dc..096862dc 100644
--- a/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/utils.kt
+++ b/ui/compose/src/main/kotlin/app/passwordstore/ui/compose/theme/utils.kt
diff --git a/ui-compose/src/main/res/drawable/baseline_visibility_24.xml b/ui/compose/src/main/res/drawable/baseline_visibility_24.xml
index e732f005..e732f005 100644
--- a/ui-compose/src/main/res/drawable/baseline_visibility_24.xml
+++ b/ui/compose/src/main/res/drawable/baseline_visibility_24.xml
diff --git a/ui-compose/src/main/res/drawable/baseline_visibility_off_24.xml b/ui/compose/src/main/res/drawable/baseline_visibility_off_24.xml
index a5cad715..a5cad715 100644
--- a/ui-compose/src/main/res/drawable/baseline_visibility_off_24.xml
+++ b/ui/compose/src/main/res/drawable/baseline_visibility_off_24.xml
diff --git a/ui-compose/src/main/res/drawable/ic_content_copy.xml b/ui/compose/src/main/res/drawable/ic_content_copy.xml
index 8afc9846..8afc9846 100644
--- a/ui-compose/src/main/res/drawable/ic_content_copy.xml
+++ b/ui/compose/src/main/res/drawable/ic_content_copy.xml
diff --git a/ui-compose/src/main/res/font/manrope.xml b/ui/compose/src/main/res/font/manrope.xml
index c1ecac5c..c1ecac5c 100644
--- a/ui-compose/src/main/res/font/manrope.xml
+++ b/ui/compose/src/main/res/font/manrope.xml
diff --git a/ui-compose/src/main/res/font/manrope_bold.ttf b/ui/compose/src/main/res/font/manrope_bold.ttf
index 8bbf0bd1..8bbf0bd1 100644
--- a/ui-compose/src/main/res/font/manrope_bold.ttf
+++ b/ui/compose/src/main/res/font/manrope_bold.ttf
Binary files differ
diff --git a/ui-compose/src/main/res/font/manrope_extrabold.ttf b/ui/compose/src/main/res/font/manrope_extrabold.ttf
index 3f68dffc..3f68dffc 100644
--- a/ui-compose/src/main/res/font/manrope_extrabold.ttf
+++ b/ui/compose/src/main/res/font/manrope_extrabold.ttf
Binary files differ
diff --git a/ui-compose/src/main/res/font/manrope_extralight.ttf b/ui/compose/src/main/res/font/manrope_extralight.ttf
index 9d21d775..9d21d775 100644
--- a/ui-compose/src/main/res/font/manrope_extralight.ttf
+++ b/ui/compose/src/main/res/font/manrope_extralight.ttf
Binary files differ
diff --git a/ui-compose/src/main/res/font/manrope_light.ttf b/ui/compose/src/main/res/font/manrope_light.ttf
index f255257a..f255257a 100644
--- a/ui-compose/src/main/res/font/manrope_light.ttf
+++ b/ui/compose/src/main/res/font/manrope_light.ttf
Binary files differ
diff --git a/ui-compose/src/main/res/font/manrope_medium.ttf b/ui/compose/src/main/res/font/manrope_medium.ttf
index c73d7741..c73d7741 100644
--- a/ui-compose/src/main/res/font/manrope_medium.ttf
+++ b/ui/compose/src/main/res/font/manrope_medium.ttf
Binary files differ
diff --git a/ui-compose/src/main/res/font/manrope_regular.ttf b/ui/compose/src/main/res/font/manrope_regular.ttf
index c02b01be..c02b01be 100644
--- a/ui-compose/src/main/res/font/manrope_regular.ttf
+++ b/ui/compose/src/main/res/font/manrope_regular.ttf
Binary files differ
diff --git a/ui-compose/src/main/res/font/manrope_semibold.ttf b/ui/compose/src/main/res/font/manrope_semibold.ttf
index 30ee0310..30ee0310 100644
--- a/ui-compose/src/main/res/font/manrope_semibold.ttf
+++ b/ui/compose/src/main/res/font/manrope_semibold.ttf
Binary files differ