diff options
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/withdraw')
4 files changed, 9 insertions, 11 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt index eb1f133..148b8c0 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt @@ -49,6 +49,11 @@ class ManualWithdrawFragment : Fragment() { } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + arguments?.getString("amount")?.let { + val amount = Amount.fromJSONString(it) + ui.amountView.setText(amount.amountStr) + } + ui.qrCodeButton.setOnClickListener { model.scanCode() } diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt index e40036d..f019a5b 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt @@ -16,9 +16,6 @@ package net.taler.wallet.withdraw.manual -import android.content.ClipData -import android.content.ClipboardManager -import android.content.Context import android.content.Intent import android.os.Bundle import android.view.LayoutInflater @@ -26,7 +23,6 @@ import android.view.View import android.view.ViewGroup import androidx.compose.material.Surface import androidx.compose.ui.platform.ComposeView -import androidx.core.content.getSystemService import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController @@ -82,9 +78,3 @@ class ManualWithdrawSuccessFragment : Fragment() { activity?.setTitle(R.string.withdraw_title) } } - -fun copyToClipBoard(context: Context, label: String, str: String) { - val clipboard = context.getSystemService<ClipboardManager>() - val clip = ClipData.newPlainText(label, str) - clipboard?.setPrimaryClip(clip) -} diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt index 9ae2418..cc271eb 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenBitcoin.kt @@ -37,6 +37,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment +import androidx.compose.ui.Alignment.Companion.CenterVertically import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.colorResource @@ -47,6 +48,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em import net.taler.common.Amount import net.taler.wallet.R +import net.taler.wallet.compose.copyToClipBoard import net.taler.wallet.withdraw.WithdrawStatus @Composable @@ -189,7 +191,7 @@ $sr IconButton( onClick = { copyToClipBoard(context, "Bitcoin", copyText) }, ) { - Row { + Row(verticalAlignment = CenterVertically) { Icon(Icons.Default.ContentCopy, stringResource(R.string.copy)) Text( modifier = Modifier.padding(start = 8.dp), diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt index 9dc5d5e..4cf7941 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenIBAN.kt @@ -47,6 +47,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import net.taler.common.Amount import net.taler.wallet.R +import net.taler.wallet.compose.copyToClipBoard import net.taler.wallet.withdraw.WithdrawStatus @Composable |