[wallet] Re-add disable back navigation

3 files changed, 11 insertions, 10 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
index 8efa64c..d58b0b8 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
@@ -28,7 +28,6 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -53,6 +52,7 @@ import net.taler.wallet.R
 import net.taler.wallet.backend.TalerErrorCode
 import net.taler.wallet.backend.TalerErrorInfo
 import net.taler.wallet.cleanExchange
+import net.taler.wallet.compose.TalerSurface
 import net.taler.wallet.exchanges.ExchangeItem
 import net.taler.wallet.transactions.AmountType
 import net.taler.wallet.transactions.TransactionAmountComposable
@@ -225,7 +225,7 @@ fun PeerErrorComposable(state: OutgoingError, onClose: () -> Unit) {
 @Preview
 @Composable
 fun PeerPullComposableCreatingPreview() {
-    Surface {
+    TalerSurface {
         OutgoingPullComposable(
             amount = Amount.fromString("TESTKUDOS", "42.23"),
             state = OutgoingCreating,
@@ -238,7 +238,7 @@ fun PeerPullComposableCreatingPreview() {
 @Preview
 @Composable
 fun PeerPullComposableCheckingPreview() {
-    Surface {
+    TalerSurface {
         OutgoingPullComposable(
             amount = Amount.fromString("TESTKUDOS", "42.23"),
             state = if (Random.nextBoolean()) OutgoingIntro else OutgoingChecking,
@@ -251,7 +251,7 @@ fun PeerPullComposableCheckingPreview() {
 @Preview
 @Composable
 fun PeerPullComposableCheckedPreview() {
-    Surface {
+    TalerSurface {
         val amountRaw = Amount.fromString("TESTKUDOS", "42.42")
         val amountEffective = Amount.fromString("TESTKUDOS", "42.23")
         val exchangeItem = ExchangeItem("https://example.org", "TESTKUDOS", emptyList())
@@ -267,7 +267,7 @@ fun PeerPullComposableCheckedPreview() {
 @Preview
 @Composable
 fun PeerPullComposableErrorPreview() {
-    Surface {
+    TalerSurface {
         val json = mapOf("foo" to JsonPrimitive("bar"))
         val state = OutgoingError(TalerErrorInfo(TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED, "hint", "message", json))
         OutgoingPullComposable(
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt
index 9d972bf..df61634 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushComposable.kt
@@ -24,7 +24,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -48,6 +47,7 @@ import net.taler.common.Amount
 import net.taler.wallet.R
 import net.taler.wallet.backend.TalerErrorCode
 import net.taler.wallet.backend.TalerErrorInfo
+import net.taler.wallet.compose.TalerSurface
 import kotlin.random.Random
 
 @Composable
@@ -167,7 +167,7 @@ fun OutgoingPushIntroComposable(
 @Preview
 @Composable
 fun PeerPushComposableCreatingPreview() {
-    Surface {
+    TalerSurface {
         OutgoingPushComposable(
             amount = Amount.fromString("TESTKUDOS", "42.23"),
             state = OutgoingCreating,
@@ -180,7 +180,7 @@ fun PeerPushComposableCreatingPreview() {
 @Preview
 @Composable
 fun PeerPushComposableCheckingPreview() {
-    Surface {
+    TalerSurface {
         val state = if (Random.nextBoolean()) OutgoingIntro else OutgoingChecking
         OutgoingPushComposable(
             state = state,
@@ -194,7 +194,7 @@ fun PeerPushComposableCheckingPreview() {
 @Preview
 @Composable
 fun PeerPushComposableCheckedPreview() {
-    Surface {
+    TalerSurface {
         val amountEffective = Amount.fromString("TESTKUDOS", "42.42")
         val amountRaw = Amount.fromString("TESTKUDOS", "42.23")
         val state = OutgoingChecked(amountRaw, amountEffective)
@@ -210,7 +210,7 @@ fun PeerPushComposableCheckedPreview() {
 @Preview
 @Composable
 fun PeerPushComposableErrorPreview() {
-    Surface {
+    TalerSurface {
         val json = mapOf("foo" to JsonPrimitive("bar"))
         val state = OutgoingError(TalerErrorInfo(TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED, "hint", "message", json))
         OutgoingPushComposable(
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
index 8cd45b0..e861496 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
@@ -66,6 +66,7 @@ class OutgoingPushFragment : Fragment() {
             setContent {
                 TalerSurface {
                     val state = peerManager.pushState.collectAsStateLifecycleAware().value
+                    backPressedCallback.isEnabled = false
                     OutgoingPushComposable(
                         amount = amount,
                         state = state,