[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 10/12: [wallet] Re-add disable back navigation
From: |
gnunet |
Subject: |
[taler-taler-android] 10/12: [wallet] Re-add disable back navigation |
Date: |
Mon, 08 Jan 2024 21:58:43 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 2226c1c2bbf65639fe6630d641c8b338d14515ab
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Thu Jan 4 12:31:27 2024 -0600
[wallet] Re-add disable back navigation
---
.../main/java/net/taler/wallet/peer/OutgoingPullComposable.kt | 10 +++++-----
.../main/java/net/taler/wallet/peer/OutgoingPushComposable.kt | 10 +++++-----
.../main/java/net/taler/wallet/peer/OutgoingPushFragment.kt | 1 +
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,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] 06/12: [wallet] Refactor p2p payments to show tx details when ready, (continued)
- [taler-taler-android] 06/12: [wallet] Refactor p2p payments to show tx details when ready, gnunet, 2024/01/08
- [taler-taler-android] 05/12: [wallet] Layout improvement to manual withdrawal details, gnunet, 2024/01/08
- [taler-taler-android] 08/12: [wallet] Delete unused numCoins field, gnunet, 2024/01/08
- [taler-taler-android] 01/12: [wallet] Initial implementation of DD36., gnunet, 2024/01/08
- [taler-taler-android] 07/12: [wallet] Fix empty/null account list in manual withdrawal, gnunet, 2024/01/08
- [taler-taler-android] 03/12: [wallet] Manual withdrawal: hide fee when zero and relax paddings for smaller screens, gnunet, 2024/01/08
- [taler-taler-android] 02/12: [wallet] Fixed serialization issues, gnunet, 2024/01/08
- [taler-taler-android] 12/12: [wallet] support withdraw-exchange URI, gnunet, 2024/01/08
- [taler-taler-android] 11/12: [wallet] Add UX from now-deleted push/pull result screens into p2p tx details, gnunet, 2024/01/08
- [taler-taler-android] 09/12: [wallet] ScrollableTabRow nitpick, gnunet, 2024/01/08
- [taler-taler-android] 10/12: [wallet] Re-add disable back navigation,
gnunet <=