From b663081104dc38df462c30d7dfc90e435ef3cf6c Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 27 Aug 2021 16:43:46 +0200 Subject: Update libraries and do associated maintenance --- wallet/.gitignore | 2 +- wallet/build.gradle | 8 ++++---- wallet/src/main/java/net/taler/wallet/MainActivity.kt | 6 +++--- .../main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt | 4 ++-- .../main/java/net/taler/wallet/payment/PromptPaymentFragment.kt | 3 +-- .../main/java/net/taler/wallet/transactions/TransactionAdapter.kt | 2 +- .../main/java/net/taler/wallet/withdraw/ManualWithdrawFragment.kt | 2 +- wallet/src/main/res/layout/fragment_prompt_withdraw.xml | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) (limited to 'wallet') diff --git a/wallet/.gitignore b/wallet/.gitignore index fa4dd35..44ca846 100644 --- a/wallet/.gitignore +++ b/wallet/.gitignore @@ -1,3 +1,3 @@ /build /.bundle -/src/main/assets/taler-wallet-android-*.js +/src/main/assets/taler-wallet-*-*.js diff --git a/wallet/build.gradle b/wallet/build.gradle index 08bb009..2fce66e 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -120,7 +120,7 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" // Lists and Selection - implementation "androidx.recyclerview:recyclerview:1.1.0" + implementation "androidx.recyclerview:recyclerview:1.2.1" implementation "androidx.recyclerview:recyclerview-selection:1.1.0" // Navigation Library @@ -133,7 +133,7 @@ dependencies { // QR codes implementation 'com.journeyapps:zxing-android-embedded:4.0.2@aar' // needed to support zxing library in taler-kotlin-android on API < 24 - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' // Nicer ProgressBar implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1' @@ -146,8 +146,8 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation 'org.json:json:20200518' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } def walletLibraryDir = "src/main/assets" diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt b/wallet/src/main/java/net/taler/wallet/MainActivity.kt index 1dafce0..ca53de3 100644 --- a/wallet/src/main/java/net/taler/wallet/MainActivity.kt +++ b/wallet/src/main/java/net/taler/wallet/MainActivity.kt @@ -151,18 +151,18 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener, connectToWifi(this, uri.fragment!!) } when { - url.toLowerCase(ROOT).startsWith("taler://pay/") -> { + url.lowercase(ROOT).startsWith("taler://pay/") -> { Log.v(TAG, "navigating!") nav.navigate(R.id.action_nav_main_to_promptPayment) model.paymentManager.preparePay(url) } - url.toLowerCase(ROOT).startsWith("taler://withdraw/") -> { + url.lowercase(ROOT).startsWith("taler://withdraw/") -> { Log.v(TAG, "navigating!") // there's more than one entry point, so use global action nav.navigate(R.id.action_global_promptWithdraw) model.withdrawManager.getWithdrawalDetails(url) } - url.toLowerCase(ROOT).startsWith("taler://refund/") -> { + url.lowercase(ROOT).startsWith("taler://refund/") -> { model.showProgressBar.value = true model.refundManager.refund(url).observe(this, Observer(::onRefundResponse)) } diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt index c59fffe..1ea32dd 100644 --- a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeFeesFragment.kt @@ -89,7 +89,7 @@ private class CoinFeeAdapter(private val items: List) : Adapter) : Adapter? { list.findChildViewUnder(e.x, e.y)?.let { view -> val holder = list.getChildViewHolder(view) - val position = holder.adapterPosition + val position = holder.bindingAdapterPosition return object : ItemDetails() { override fun getPosition(): Int = position override fun getSelectionKey(): String = adapter.keyProvider.getKey(position) diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/ManualWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/ManualWithdrawFragment.kt index 47c2c6b..3acb29f 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/ManualWithdrawFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/ManualWithdrawFragment.kt @@ -53,7 +53,7 @@ class ManualWithdrawFragment : Fragment() { ui.qrCodeButton.setOnClickListener { scanQrCode(requireActivity()) } ui.currencyView.text = exchangeItem.currency val paymentOptions = exchangeItem.paytoUris.mapNotNull { paytoUri -> - Uri.parse(paytoUri).authority?.toUpperCase(Locale.getDefault()) + Uri.parse(paytoUri).authority?.uppercase(Locale.getDefault()) }.joinToString(separator = "\n", prefix = "• ") ui.paymentOptionsLabel.text = getString(R.string.withdraw_manual_payment_options, exchangeItem.name, paymentOptions) diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml index 421911a..372163b 100644 --- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml @@ -168,12 +168,12 @@ android:backgroundTint="@color/colorPrimary" android:contentDescription="@string/nav_exchange_fees" android:src="@drawable/ic_edit" - android:tint="?attr/colorOnPrimary" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/withdrawExchangeUrl" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/withdrawExchangeUrl" app:layout_constraintTop_toTopOf="@+id/withdrawExchangeUrl" + app:tint="?attr/colorOnPrimary" tools:visibility="visible" />