diff options
Diffstat (limited to 'wallet/src')
6 files changed, 23 insertions, 16 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt index d5c3eaf..7ed1bab 100644 --- a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt @@ -82,6 +82,7 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener { private fun onPaymentStatusChanged(payStatus: PayStatus?) { when (payStatus) { + null -> {} is PayStatus.Prepared -> { showLoading(false) val fees = payStatus.amountEffective - payStatus.amountRaw diff --git a/wallet/src/main/java/net/taler/wallet/pending/PendingOperationsFragment.kt b/wallet/src/main/java/net/taler/wallet/pending/PendingOperationsFragment.kt index e3b5dc2..6bfcf90 100644 --- a/wallet/src/main/java/net/taler/wallet/pending/PendingOperationsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/pending/PendingOperationsFragment.kt @@ -62,7 +62,7 @@ class PendingOperationsFragment : Fragment(), PendingOperationClickListener { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { ui = FragmentPendingOperationsBinding.inflate(inflater, container, false) return ui.root } @@ -79,9 +79,9 @@ class PendingOperationsFragment : Fragment(), PendingOperationClickListener { addItemDecoration(myItemDecoration) } - pendingOperationsManager.pendingOperations.observe(viewLifecycleOwner, { + pendingOperationsManager.pendingOperations.observe(viewLifecycleOwner) { updatePending(it) - }) + } } override fun onStart() { @@ -89,6 +89,7 @@ class PendingOperationsFragment : Fragment(), PendingOperationClickListener { pendingOperationsManager.getPending() } + @Deprecated("Deprecated in Java") override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { R.id.retry_pending -> { @@ -99,6 +100,7 @@ class PendingOperationsFragment : Fragment(), PendingOperationClickListener { } } + @Deprecated("Deprecated in Java") override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.pending_operations, menu) super.onCreateOptionsMenu(menu, inflater) diff --git a/wallet/src/main/java/net/taler/wallet/tip/PromptTipFragment.kt b/wallet/src/main/java/net/taler/wallet/tip/PromptTipFragment.kt index a5c504c..6a96d1d 100644 --- a/wallet/src/main/java/net/taler/wallet/tip/PromptTipFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/tip/PromptTipFragment.kt @@ -16,28 +16,22 @@ package net.taler.wallet.tip -import android.graphics.Bitmap import android.os.Bundle import android.view.LayoutInflater import android.view.View -import android.view.View.GONE import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController -import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar.LENGTH_LONG import net.taler.common.Amount -import net.taler.common.ContractTerms import net.taler.common.fadeIn import net.taler.common.fadeOut import net.taler.wallet.MainViewModel import net.taler.wallet.R import net.taler.wallet.cleanExchange -import net.taler.wallet.databinding.FragmentPromptPaymentBinding import net.taler.wallet.databinding.FragmentPromptTipBinding -import net.taler.wallet.withdraw.ExchangeSelection /** * Show a tip and ask the user to accept/decline. @@ -81,9 +75,15 @@ class PromptTipFragment : Fragment() { private fun onPaymentStatusChanged(payStatus: TipStatus?) { when (payStatus) { + null -> {} is TipStatus.Prepared -> { showLoading(false) - showContent(payStatus.tipAmountRaw, payStatus.tipAmountEffective, payStatus.exchangeBaseUrl, payStatus.merchantBaseUrl) + showContent( + amountRaw = payStatus.tipAmountRaw, + amountEffective = payStatus.tipAmountEffective, + exchange = payStatus.exchangeBaseUrl, + merchant = payStatus.merchantBaseUrl + ) //showOrder(payStatus.contractTerms, payStatus.amountRaw, fees) ui.confirmWithdrawButton.isEnabled = true ui.confirmWithdrawButton.setOnClickListener { diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt index f21818f..07b95af 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt @@ -44,6 +44,7 @@ abstract class TransactionDetailFragment : Fragment() { setHasOptionsMenu(model.devMode.value == true) } + @Deprecated("Deprecated in Java") override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) requireActivity().apply { @@ -53,10 +54,12 @@ abstract class TransactionDetailFragment : Fragment() { } } + @Deprecated("Deprecated in Java") override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.transactions_detail, menu) } + @Deprecated("Deprecated in Java") override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { else -> super.onOptionsItemSelected(item) diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt index da8508a..dd0af84 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt @@ -130,6 +130,7 @@ class TransactionsFragment : Fragment(), OnTransactionClickListener, ActionMode. tracker?.onSaveInstanceState(outState) } + @Deprecated("Deprecated in Java") override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.transactions, menu) setupSearch(menu.findItem(R.id.action_search)) diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt index e3c5da6..7bf2e29 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/ReviewExchangeTosFragment.kt @@ -22,7 +22,6 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import androidx.lifecycle.Observer import androidx.navigation.fragment.findNavController import io.noties.markwon.Markwon import net.taler.common.fadeIn @@ -44,8 +43,8 @@ class ReviewExchangeTosFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { + savedInstanceState: Bundle?, + ): View { ui = FragmentReviewExchangeTosBinding.inflate(inflater, container, false) return ui.root } @@ -56,7 +55,7 @@ class ReviewExchangeTosFragment : Fragment() { ui.acceptTosCheckBox.setOnCheckedChangeListener { _, _ -> withdrawManager.acceptCurrentTermsOfService() } - withdrawManager.withdrawStatus.observe(viewLifecycleOwner, Observer { + withdrawManager.withdrawStatus.observe(viewLifecycleOwner) { when (it) { is WithdrawStatus.TosReviewRequired -> { val sections = try { @@ -65,7 +64,7 @@ class ReviewExchangeTosFragment : Fragment() { parseTos(markwon, text) } catch (e: ParseException) { onTosError(e.message ?: "Unknown Error") - return@Observer + return@observe } adapter.setSections(sections) ui.tosList.adapter = adapter @@ -80,8 +79,9 @@ class ReviewExchangeTosFragment : Fragment() { is WithdrawStatus.ReceivedDetails -> { findNavController().navigate(R.id.action_reviewExchangeTOS_to_promptWithdraw) } + else -> {} } - }) + } } private fun onTosError(msg: String) { |