chore: IDK/SDK 0.13

Author: nklomp

example/holder/ui/elicense/impl/src/commonMain/kotlin/com/sphereon/kiwa/sample/ui/elicense/engagement/qr/MdocEngagementPresenterImpl.kt

@@ -157,7 +157,7 @@ class MdocEngagementPresenterImpl(
                         presenterScope.launch {
                             val engagementResult = engagementManager.createEngagement {
                                 engagement { qr {} }
-                                retrieval { ble { centralClientMode = false; peripheralServerMode = true } }
+                                retrieval { ble { centralClientMode = true; peripheralServerMode = true } }
                             }
                             engagementResult.onSuccess { engagement ->
                                 engagement.start()
@@ -343,19 +343,23 @@ class MdocEngagementPresenterImpl(
         // this is stale state from a previous session - treat as INITIAL with toggle UI
         val model = when {
             sessionState.phase == UiPhase.TERMINAL && activeEngagement == null && !hasHadEngagement.value -> {
-                log.debug(">>> Stale TERMINAL state detected (never had engagement in this session) - returning Initial with toggle")
-                MdocEngagementPresenter.Model.Initial(
+                log.debug(">>> Stale TERMINAL state detected (never had engagement in this session) - returning Engagement with toggle")
+                MdocEngagementPresenter.Model.Engagement(
+                    qrImage = null,
+                    engagementEvent = null,
                     showQr = false,
                     showQrScanner = showQrScanner,
                     onQrScanned = onQrScanned,
                     onStateEvent = onEvent
                 )
             }
 
-            // If phase is ENGAGEMENT but there's no active engagement, it's stale state - treat as INITIAL
+            // If phase is ENGAGEMENT but there's no active engagement, it's stale state - treat as ready for engagement
             sessionState.phase == UiPhase.ENGAGEMENT && activeEngagement == null -> {
-                log.debug(">>> Stale ENGAGEMENT state detected (no active engagement) - returning Initial with toggle")
-                MdocEngagementPresenter.Model.Initial(
+                log.debug(">>> Stale ENGAGEMENT state detected (no active engagement) - returning Engagement with toggle")
+                MdocEngagementPresenter.Model.Engagement(
+                    qrImage = null,
+                    engagementEvent = null,
                     showQr = false,
                     showQrScanner = showQrScanner,
                     onQrScanned = onQrScanned,
@@ -364,28 +368,17 @@ class MdocEngagementPresenterImpl(
             }
 
             sessionState.phase == UiPhase.ENGAGEMENT -> {
-                // If user wants to scan QR (showQrScanner=true), treat as INITIAL state to show scanner UI
-                // This allows switching from Display QR to Scan QR without waiting for engagement to close
-                if (showQrScanner) {
-                    log.debug(">>> Returning Model: INITIAL (in ENGAGEMENT but showQrScanner=true)")
-                    MdocEngagementPresenter.Model.Initial(
-                        showQr = false,
-                        showQrScanner = true,
-                        onQrScanned = onQrScanned,
-                        onStateEvent = onEvent
-                    )
-                } else {
-                    log.debug(">>> Returning Model: ENGAGEMENT (showQr=${sessionState.qrMode == QrMode.DISPLAY}, showQrScanner=$showQrScanner)")
-                    // Show QR or NFC prompt based on SessionUiState
-                    MdocEngagementPresenter.Model.Engagement(
-                        qrImage = if (sessionState.qrMode == QrMode.DISPLAY) qrImage else null,
-                        engagementEvent = null,
-                        showQr = sessionState.qrMode == QrMode.DISPLAY,
-                        showQrScanner = showQrScanner,
-                        onQrScanned = onQrScanned,
-                        onStateEvent = onEvent
-                    )
-                }
+                log.debug(">>> Returning Model: ENGAGEMENT (showQr=${sessionState.qrMode == QrMode.DISPLAY && !showQrScanner}, showQrScanner=$showQrScanner)")
+                // Always return Engagement model to avoid slide animations
+                // When showQrScanner=true, prioritize scanner UI over Display QR
+                MdocEngagementPresenter.Model.Engagement(
+                    qrImage = if (sessionState.qrMode == QrMode.DISPLAY && !showQrScanner) qrImage else null,
+                    engagementEvent = null,
+                    showQr = sessionState.qrMode == QrMode.DISPLAY && !showQrScanner,
+                    showQrScanner = showQrScanner,
+                    onQrScanned = onQrScanned,
+                    onStateEvent = onEvent
+                )
             }
 
             sessionState.phase == UiPhase.TRANSFER -> {
@@ -449,8 +442,10 @@ class MdocEngagementPresenterImpl(
                     }
 
                     null -> {
-                        log.debug(">>> Returning Model: INITIAL (phase=TERMINAL, terminalOutcome=null)")
-                        MdocEngagementPresenter.Model.Initial(
+                        log.debug(">>> Returning Model: ENGAGEMENT (phase=TERMINAL, terminalOutcome=null)")
+                        MdocEngagementPresenter.Model.Engagement(
+                            qrImage = null,
+                            engagementEvent = null,
                             showQr = false,
                             showQrScanner = showQrScanner,
                             onQrScanned = onQrScanned,
@@ -461,8 +456,10 @@ class MdocEngagementPresenterImpl(
             }
 
             else -> {
-                log.debug(">>> Returning Model: INITIAL (phase=${sessionState.phase})")
-                MdocEngagementPresenter.Model.Initial(
+                log.debug(">>> Returning Model: ENGAGEMENT (phase=${sessionState.phase})")
+                MdocEngagementPresenter.Model.Engagement(
+                    qrImage = null,
+                    engagementEvent = null,
                     showQr = false,
                     showQrScanner = showQrScanner,
                     onQrScanned = onQrScanned,

gradle/libs.versions.toml

@@ -1,11 +1,10 @@
 [versions]
 kotlin-inject = "0.8.1-SNAPSHOT"
 anvil = "0.1.6"
-sphereon-plugin = "0.4.0-SNAPSHOT"
 app-platform = "0.0.9-SNAPSHOT"
 kotlin = "2.2.10"
 sphereon-idk = "0.13.0-SNAPSHOT"
-kiwa-holder-sdk = "0.10.0-SNAPSHOT"
+kiwa-holder-sdk = "0.13.0-SNAPSHOT"
 detekt = "1.23.8"
 kottage = "1.8.0"
 multiplatform-settings = "1.3.0"

settings.gradle.kts

@@ -77,10 +77,10 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("sphereonplug") {
-            from("com.sphereon.gradle:gradle-plugin-bom:0.4.0-SNAPSHOT@toml")
+            from("com.sphereon.gradle:gradle-plugin-bom:0.5.0-SNAPSHOT@toml")
         }
         create("sphereonlib") {
-            from("com.sphereon.gradle:library-bom:0.4.0-SNAPSHOT@toml")
+            from("com.sphereon.gradle:library-bom:0.5.0-SNAPSHOT@toml")
         }
 
     }