refactor: un-flatten module structure

android-password-store · Aug 9, 2023 · 959a56d · 959a56d
1 parent efef72b
commit 959a56d
Show file tree

Hide file tree

Showing 64 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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 → crypto/common/build.gradle.kts b/crypto-common/build.gradle.kts → crypto/common/build.gradle.kts
diff --git a/crypto-common/lint-baseline.xml → crypto/common/lint-baseline.xml b/crypto-common/lint-baseline.xml → crypto/common/lint-baseline.xml
diff --git a/...app/passwordstore/crypto/CryptoHandler.kt → ...app/passwordstore/crypto/CryptoHandler.kt b/...app/passwordstore/crypto/CryptoHandler.kt → ...app/passwordstore/crypto/CryptoHandler.kt
diff --git a/...app/passwordstore/crypto/CryptoOptions.kt → ...app/passwordstore/crypto/CryptoOptions.kt b/...app/passwordstore/crypto/CryptoOptions.kt → ...app/passwordstore/crypto/CryptoOptions.kt
diff --git a/...in/app/passwordstore/crypto/KeyManager.kt → ...in/app/passwordstore/crypto/KeyManager.kt b/...in/app/passwordstore/crypto/KeyManager.kt → ...in/app/passwordstore/crypto/KeyManager.kt
diff --git a/...ordstore/crypto/errors/CryptoException.kt → ...ordstore/crypto/errors/CryptoException.kt b/...ordstore/crypto/errors/CryptoException.kt → ...ordstore/crypto/errors/CryptoException.kt
diff --git a/crypto-pgpainless/build.gradle.kts → crypto/pgpainless/build.gradle.kts b/crypto-pgpainless/build.gradle.kts → 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 → crypto/pgpainless/lint-baseline.xml b/crypto-pgpainless/lint-baseline.xml → crypto/pgpainless/lint-baseline.xml
diff --git a/...tlin/app/passwordstore/crypto/KeyUtils.kt → ...tlin/app/passwordstore/crypto/KeyUtils.kt b/...tlin/app/passwordstore/crypto/KeyUtils.kt → ...tlin/app/passwordstore/crypto/KeyUtils.kt
diff --git a/...passwordstore/crypto/PGPDecryptOptions.kt → ...passwordstore/crypto/PGPDecryptOptions.kt b/...passwordstore/crypto/PGPDecryptOptions.kt → ...passwordstore/crypto/PGPDecryptOptions.kt
diff --git a/...passwordstore/crypto/PGPEncryptOptions.kt → ...passwordstore/crypto/PGPEncryptOptions.kt b/...passwordstore/crypto/PGPEncryptOptions.kt → ...passwordstore/crypto/PGPEncryptOptions.kt
diff --git a/...app/passwordstore/crypto/PGPIdentifier.kt → ...app/passwordstore/crypto/PGPIdentifier.kt b/...app/passwordstore/crypto/PGPIdentifier.kt → ...app/passwordstore/crypto/PGPIdentifier.kt
diff --git a/...kotlin/app/passwordstore/crypto/PGPKey.kt → ...kotlin/app/passwordstore/crypto/PGPKey.kt b/...kotlin/app/passwordstore/crypto/PGPKey.kt → ...kotlin/app/passwordstore/crypto/PGPKey.kt
diff --git a/...app/passwordstore/crypto/PGPKeyManager.kt → ...app/passwordstore/crypto/PGPKeyManager.kt b/...app/passwordstore/crypto/PGPKeyManager.kt → ...app/passwordstore/crypto/PGPKeyManager.kt
diff --git a/...rdstore/crypto/PGPainlessCryptoHandler.kt → ...rdstore/crypto/PGPainlessCryptoHandler.kt b/...rdstore/crypto/PGPainlessCryptoHandler.kt → ...rdstore/crypto/PGPainlessCryptoHandler.kt
diff --git a/...p/passwordstore/crypto/CryptoConstants.kt → ...p/passwordstore/crypto/CryptoConstants.kt b/...p/passwordstore/crypto/CryptoConstants.kt → ...p/passwordstore/crypto/CryptoConstants.kt
diff --git a/.../app/passwordstore/crypto/KeyUtilsTest.kt → .../app/passwordstore/crypto/KeyUtilsTest.kt b/.../app/passwordstore/crypto/KeyUtilsTest.kt → .../app/passwordstore/crypto/KeyUtilsTest.kt
diff --git a/...passwordstore/crypto/PGPIdentifierTest.kt → ...passwordstore/crypto/PGPIdentifierTest.kt b/...passwordstore/crypto/PGPIdentifierTest.kt → ...passwordstore/crypto/PGPIdentifierTest.kt
diff --git a/...passwordstore/crypto/PGPKeyManagerTest.kt → ...passwordstore/crypto/PGPKeyManagerTest.kt b/...passwordstore/crypto/PGPKeyManagerTest.kt → ...passwordstore/crypto/PGPKeyManagerTest.kt
diff --git a/...ore/crypto/PGPainlessCryptoHandlerTest.kt → ...ore/crypto/PGPainlessCryptoHandlerTest.kt b/...ore/crypto/PGPainlessCryptoHandlerTest.kt → ...ore/crypto/PGPainlessCryptoHandlerTest.kt
diff --git a/...lin/app/passwordstore/crypto/TestUtils.kt → ...lin/app/passwordstore/crypto/TestUtils.kt b/...lin/app/passwordstore/crypto/TestUtils.kt → ...lin/app/passwordstore/crypto/TestUtils.kt
diff --git a/...to-pgpainless/src/test/resources/aead_pub → ...to/pgpainless/src/test/resources/aead_pub b/...to-pgpainless/src/test/resources/aead_pub → ...to/pgpainless/src/test/resources/aead_pub
diff --git a/...to-pgpainless/src/test/resources/aead_sec → ...to/pgpainless/src/test/resources/aead_sec b/...to-pgpainless/src/test/resources/aead_sec → ...to/pgpainless/src/test/resources/aead_sec
diff --git a/...rc/test/resources/alice_owner@example_com → ...rc/test/resources/alice_owner@example_com b/...rc/test/resources/alice_owner@example_com → ...rc/test/resources/alice_owner@example_com
diff --git a/...rc/test/resources/bobby_owner@example_com → ...rc/test/resources/bobby_owner@example_com b/...rc/test/resources/bobby_owner@example_com → ...rc/test/resources/bobby_owner@example_com
diff --git a/...-pgpainless/src/test/resources/public_key → .../pgpainless/src/test/resources/public_key b/...-pgpainless/src/test/resources/public_key → .../pgpainless/src/test/resources/public_key
diff --git a/.../resources/public_key_multiple_identities → .../resources/public_key_multiple_identities b/.../resources/public_key_multiple_identities → .../resources/public_key_multiple_identities
diff --git a/...-pgpainless/src/test/resources/secret_key → .../pgpainless/src/test/resources/secret_key b/...-pgpainless/src/test/resources/secret_key → .../pgpainless/src/test/resources/secret_key
diff --git a/.../resources/secret_key_multiple_identities → .../resources/secret_key_multiple_identities b/.../resources/secret_key_multiple_identities → .../resources/secret_key_multiple_identities
diff --git a/format-common/build.gradle.kts → format/common/build.gradle.kts b/format-common/build.gradle.kts → format/common/build.gradle.kts
diff --git a/format-common/lint-baseline.xml → format/common/lint-baseline.xml b/format-common/lint-baseline.xml → format/common/lint-baseline.xml
diff --git a/...swordstore/data/passfile/PasswordEntry.kt → ...swordstore/data/passfile/PasswordEntry.kt b/...swordstore/data/passfile/PasswordEntry.kt → ...swordstore/data/passfile/PasswordEntry.kt
diff --git a/...n/app/passwordstore/data/passfile/Totp.kt → ...n/app/passwordstore/data/passfile/Totp.kt b/...n/app/passwordstore/data/passfile/Totp.kt → ...n/app/passwordstore/data/passfile/Totp.kt
diff --git a/.../app/passwordstore/util/time/UserClock.kt → .../app/passwordstore/util/time/UserClock.kt b/.../app/passwordstore/util/time/UserClock.kt → .../app/passwordstore/util/time/UserClock.kt
diff --git a/...kotlin/app/passwordstore/util/totp/Otp.kt → ...kotlin/app/passwordstore/util/totp/Otp.kt b/...kotlin/app/passwordstore/util/totp/Otp.kt → ...kotlin/app/passwordstore/util/totp/Otp.kt
diff --git a/...app/passwordstore/util/totp/TotpFinder.kt → ...app/passwordstore/util/totp/TotpFinder.kt b/...app/passwordstore/util/totp/TotpFinder.kt → ...app/passwordstore/util/totp/TotpFinder.kt
diff --git a/.../passwordstore/util/totp/UriTotpFinder.kt → .../passwordstore/util/totp/UriTotpFinder.kt b/.../passwordstore/util/totp/UriTotpFinder.kt → .../passwordstore/util/totp/UriTotpFinder.kt
diff --git a/...dstore/data/passfile/PasswordEntryTest.kt → ...dstore/data/passfile/PasswordEntryTest.kt b/...dstore/data/passfile/PasswordEntryTest.kt → ...dstore/data/passfile/PasswordEntryTest.kt
diff --git a/.../passwordstore/util/time/TestUserClock.kt → .../passwordstore/util/time/TestUserClock.kt b/.../passwordstore/util/time/TestUserClock.kt → .../passwordstore/util/time/TestUserClock.kt
diff --git a/...in/app/passwordstore/util/totp/OtpTest.kt → ...in/app/passwordstore/util/totp/OtpTest.kt b/...in/app/passwordstore/util/totp/OtpTest.kt → ...in/app/passwordstore/util/totp/OtpTest.kt
diff --git a/...swordstore/util/totp/UriTotpFinderTest.kt → ...swordstore/util/totp/UriTotpFinderTest.kt b/...swordstore/util/totp/UriTotpFinderTest.kt → ...swordstore/util/totp/UriTotpFinderTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -180,18 +180,18 @@ 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")
 
 include("passgen:random")
 
 include("sentry-stub")
 
-include("ui-compose")
+include("ui:compose")
 
 include("ssh")
diff --git a/ui-compose/build.gradle.kts → ui/compose/build.gradle.kts b/ui-compose/build.gradle.kts → ui/compose/build.gradle.kts
diff --git a/ui-compose/lint-baseline.xml → ui/compose/lint-baseline.xml b/ui-compose/lint-baseline.xml → ui/compose/lint-baseline.xml
diff --git a/ui-compose/src/main/AndroidManifest.xml → ui/compose/src/main/AndroidManifest.xml b/ui-compose/src/main/AndroidManifest.xml → ui/compose/src/main/AndroidManifest.xml
diff --git a/.../kotlin/app/passwordstore/ui/APSAppBar.kt → .../kotlin/app/passwordstore/ui/APSAppBar.kt b/.../kotlin/app/passwordstore/ui/APSAppBar.kt → .../kotlin/app/passwordstore/ui/APSAppBar.kt
diff --git a/...passwordstore/ui/compose/PasswordField.kt → ...passwordstore/ui/compose/PasswordField.kt b/...passwordstore/ui/compose/PasswordField.kt → ...passwordstore/ui/compose/PasswordField.kt
diff --git a/...p/passwordstore/ui/compose/theme/Color.kt → ...p/passwordstore/ui/compose/theme/Color.kt b/...p/passwordstore/ui/compose/theme/Color.kt → ...p/passwordstore/ui/compose/theme/Color.kt
diff --git a/...p/passwordstore/ui/compose/theme/Theme.kt → ...p/passwordstore/ui/compose/theme/Theme.kt b/...p/passwordstore/ui/compose/theme/Theme.kt → ...p/passwordstore/ui/compose/theme/Theme.kt
diff --git a/...pp/passwordstore/ui/compose/theme/Type.kt → ...pp/passwordstore/ui/compose/theme/Type.kt b/...pp/passwordstore/ui/compose/theme/Type.kt → ...pp/passwordstore/ui/compose/theme/Type.kt
diff --git a/...p/passwordstore/ui/compose/theme/utils.kt → ...p/passwordstore/ui/compose/theme/utils.kt b/...p/passwordstore/ui/compose/theme/utils.kt → ...p/passwordstore/ui/compose/theme/utils.kt
diff --git a/...n/res/drawable/baseline_visibility_24.xml → ...n/res/drawable/baseline_visibility_24.xml b/...n/res/drawable/baseline_visibility_24.xml → ...n/res/drawable/baseline_visibility_24.xml
diff --git a/...s/drawable/baseline_visibility_off_24.xml → ...s/drawable/baseline_visibility_off_24.xml b/...s/drawable/baseline_visibility_off_24.xml → ...s/drawable/baseline_visibility_off_24.xml
diff --git a/...src/main/res/drawable/ic_content_copy.xml → ...src/main/res/drawable/ic_content_copy.xml b/...src/main/res/drawable/ic_content_copy.xml → ...src/main/res/drawable/ic_content_copy.xml
diff --git a/ui-compose/src/main/res/font/manrope.xml → ui/compose/src/main/res/font/manrope.xml b/ui-compose/src/main/res/font/manrope.xml → ui/compose/src/main/res/font/manrope.xml
diff --git a/...ompose/src/main/res/font/manrope_bold.ttf → ...ompose/src/main/res/font/manrope_bold.ttf b/...ompose/src/main/res/font/manrope_bold.ttf → ...ompose/src/main/res/font/manrope_bold.ttf
diff --git a/...e/src/main/res/font/manrope_extrabold.ttf → ...e/src/main/res/font/manrope_extrabold.ttf b/...e/src/main/res/font/manrope_extrabold.ttf → ...e/src/main/res/font/manrope_extrabold.ttf
diff --git a/.../src/main/res/font/manrope_extralight.ttf → .../src/main/res/font/manrope_extralight.ttf b/.../src/main/res/font/manrope_extralight.ttf → .../src/main/res/font/manrope_extralight.ttf
diff --git a/...mpose/src/main/res/font/manrope_light.ttf → ...mpose/src/main/res/font/manrope_light.ttf b/...mpose/src/main/res/font/manrope_light.ttf → ...mpose/src/main/res/font/manrope_light.ttf
diff --git a/...pose/src/main/res/font/manrope_medium.ttf → ...pose/src/main/res/font/manrope_medium.ttf b/...pose/src/main/res/font/manrope_medium.ttf → ...pose/src/main/res/font/manrope_medium.ttf
diff --git a/...ose/src/main/res/font/manrope_regular.ttf → ...ose/src/main/res/font/manrope_regular.ttf b/...ose/src/main/res/font/manrope_regular.ttf → ...ose/src/main/res/font/manrope_regular.ttf
diff --git a/...se/src/main/res/font/manrope_semibold.ttf → ...se/src/main/res/font/manrope_semibold.ttf b/...se/src/main/res/font/manrope_semibold.ttf → ...se/src/main/res/font/manrope_semibold.ttf