Skip to content

Commit 9b02226

Browse files
koukarinekoukarine
authored
Move module multipaz-models into multipaz as a package. (#1335)
Test: All Unit tests are passing (bar Longfellow). Test: Manually tested via samples/testapp on Android. Signed-off-by: koukarine <[email protected]>
1 parent 09fc795 commit 9b02226

File tree

113 files changed

+183
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+183
-353
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Changes since Multipaz 0.93.0 include:
1919
- High-level composable for simpler QR mdoc presentment.
2020
- Support for creating AttestKey in Android Keystore Secure Area.
2121
- Native support for W3 Digital Credentials API on Android.
22-
- New `org.multipaz.models.verification` package with utility functions to
22+
- New `org.multipaz.verification` package with utility functions to
2323
make it easier to create W3C DC requests and validate W3C DC Responses.
2424
- Support for EU Age Verification ISO mdoc document type (`eu.europa.ec.av.1`)
2525
with support for this in both the issuer, testapp, and verifier.

‎multipaz-compose/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ kotlin {
7575
api(libs.jetbrains.navigation.runtime)
7676

7777
implementation(project(":multipaz"))
78-
implementation(project(":multipaz-models"))
7978
implementation(libs.kotlinx.datetime)
8079
implementation(libs.kotlinx.serialization.json)
8180
implementation(libs.kotlinx.io.core)

‎multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/digitalcredentials/CredentialManagerPresentmentActivity.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ import org.multipaz.compose.presentment.Presentment
3333
import org.multipaz.compose.prompt.PromptDialogs
3434
import org.multipaz.context.initializeApplication
3535
import org.multipaz.documenttype.DocumentTypeRepository
36-
import org.multipaz.models.digitalcredentials.getAppOrigin
37-
import org.multipaz.models.digitalcredentials.lookupForCredmanId
38-
import org.multipaz.models.presentment.DigitalCredentialsPresentmentMechanism
39-
import org.multipaz.models.presentment.PresentmentModel
40-
import org.multipaz.models.presentment.PresentmentSource
36+
import org.multipaz.digitalcredentials.getAppOrigin
37+
import org.multipaz.digitalcredentials.lookupForCredmanId
38+
import org.multipaz.presentment.model.DigitalCredentialsPresentmentMechanism
39+
import org.multipaz.presentment.model.PresentmentModel
40+
import org.multipaz.presentment.model.PresentmentSource
4141
import org.multipaz.prompt.PromptModel
4242
import org.multipaz.util.Logger
4343
import java.lang.IllegalStateException

‎multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/mdoc/MdocNdefService.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import org.multipaz.mdoc.transport.MdocTransportFactory
2929
import org.multipaz.mdoc.transport.MdocTransportOptions
3030
import org.multipaz.mdoc.transport.advertise
3131
import org.multipaz.mdoc.transport.waitForConnection
32-
import org.multipaz.models.presentment.MdocPresentmentMechanism
33-
import org.multipaz.models.presentment.PresentmentModel
34-
import org.multipaz.models.presentment.PresentmentTimeout
32+
import org.multipaz.presentment.model.MdocPresentmentMechanism
33+
import org.multipaz.presentment.model.PresentmentModel
34+
import org.multipaz.presentment.model.PresentmentTimeout
3535
import org.multipaz.nfc.CommandApdu
3636
import org.multipaz.nfc.ResponseApdu
3737
import org.multipaz.prompt.PromptModel

‎multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/mdoc/MdocNfcPresentmentActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.multipaz.compose.presentment.Presentment
2020
import org.multipaz.compose.prompt.PromptDialogs
2121
import org.multipaz.context.initializeApplication
2222
import org.multipaz.documenttype.DocumentTypeRepository
23-
import org.multipaz.models.presentment.PresentmentSource
23+
import org.multipaz.presentment.model.PresentmentSource
2424
import org.multipaz.prompt.PromptModel
2525

2626
/**

‎multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/presentment/UriSchemePresentmentActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import org.jetbrains.compose.resources.painterResource
1818
import org.multipaz.compose.prompt.PromptDialogs
1919
import org.multipaz.context.initializeApplication
2020
import org.multipaz.documenttype.DocumentTypeRepository
21-
import org.multipaz.models.presentment.PresentmentModel
22-
import org.multipaz.models.presentment.PresentmentSource
23-
import org.multipaz.models.presentment.UriSchemePresentmentMechanism
21+
import org.multipaz.presentment.model.PresentmentModel
22+
import org.multipaz.presentment.model.PresentmentSource
23+
import org.multipaz.presentment.model.UriSchemePresentmentMechanism
2424
import org.multipaz.prompt.PromptModel
2525
import org.multipaz.util.Logger
2626
import java.net.URL

‎multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/presentment/MdocProximityQrPresentment.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ import org.multipaz.documenttype.DocumentTypeRepository
2121
import org.multipaz.mdoc.engagement.buildDeviceEngagement
2222
import org.multipaz.mdoc.role.MdocRole
2323
import org.multipaz.mdoc.transport.MdocTransportFactory
24-
import org.multipaz.mdoc.transport.MdocTransportOptions
2524
import org.multipaz.mdoc.transport.advertise
2625
import org.multipaz.mdoc.transport.waitForConnection
27-
import org.multipaz.models.presentment.MdocPresentmentMechanism
28-
import org.multipaz.models.presentment.PresentmentModel
29-
import org.multipaz.models.presentment.PresentmentSource
26+
import org.multipaz.presentment.model.MdocPresentmentMechanism
27+
import org.multipaz.presentment.model.PresentmentModel
28+
import org.multipaz.presentment.model.PresentmentSource
3029
import org.multipaz.prompt.PromptModel
3130
import org.multipaz.util.Logger
3231
import org.multipaz.util.toBase64Url

‎multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/presentment/Presentment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import androidx.compose.ui.layout.ContentScale
3030
import androidx.compose.ui.text.font.FontWeight
3131
import androidx.compose.ui.unit.dp
3232
import coil3.ImageLoader
33-
import org.multipaz.models.presentment.PresentmentCanceled
34-
import org.multipaz.models.presentment.PresentmentModel
35-
import org.multipaz.models.presentment.PresentmentSource
36-
import org.multipaz.models.presentment.PresentmentTimeout
33+
import org.multipaz.presentment.model.PresentmentCanceled
34+
import org.multipaz.presentment.model.PresentmentModel
35+
import org.multipaz.presentment.model.PresentmentSource
36+
import org.multipaz.presentment.model.PresentmentTimeout
3737
import org.multipaz.documenttype.DocumentTypeRepository
3838
import org.multipaz.prompt.PromptModel
3939
import org.multipaz.multipaz_compose.generated.resources.Res

‎multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/provisioning/Provisioning.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
1919
import kotlinx.coroutines.launch
2020
import org.jetbrains.compose.resources.stringResource
2121
import org.multipaz.compose.PassphraseEntryField
22-
import org.multipaz.models.provisioning.ProvisioningModel
22+
import org.multipaz.provisioning.ProvisioningModel
2323
import org.multipaz.multipaz_compose.generated.resources.Res
2424
import org.multipaz.multipaz_compose.generated.resources.provisioning_authorization_failed
2525
import org.multipaz.multipaz_compose.generated.resources.provisioning_authorized

‎multipaz-models/build.gradle.kts‎

Lines changed: 0 additions & 160 deletions
This file was deleted.

0 commit comments

Comments
 (0)