[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-android] branch master updated: fix android warnings
From: |
gnunet |
Subject: |
[taler-wallet-android] branch master updated: fix android warnings |
Date: |
Thu, 19 Dec 2019 23:01:12 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-android.
The following commit(s) were added to refs/heads/master by this push:
new 47b7eab fix android warnings
47b7eab is described below
commit 47b7eab07140dd20710e84b47b43da1de8123fb4
Author: Florian Dold <address@hidden>
AuthorDate: Thu Dec 19 23:01:09 2019 +0100
fix android warnings
---
app/src/main/java/net/taler/wallet/ShowBalance.kt | 17 +++++++++--------
app/src/main/res/layout/fragment_settings.xml | 6 ++++++
app/src/main/res/layout/fragment_show_balance.xml | 5 -----
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/net/taler/wallet/ShowBalance.kt
b/app/src/main/java/net/taler/wallet/ShowBalance.kt
index 5d4c35e..f8faef9 100644
--- a/app/src/main/java/net/taler/wallet/ShowBalance.kt
+++ b/app/src/main/java/net/taler/wallet/ShowBalance.kt
@@ -206,11 +206,6 @@ class ShowBalance : Fragment() {
integrator.initiateScan(listOf("QR_CODE"))
}
- val withdrawTestkudosButton =
view.findViewById<Button>(R.id.button_withdraw_testkudos)
- withdrawTestkudosButton.setOnClickListener {
- model.withdrawTestkudos()
- }
-
this.balancesView = view.findViewById(R.id.list_balances)
this.balancesPlaceholderView =
view.findViewById(R.id.list_balances_placeholder)
@@ -229,12 +224,18 @@ class ShowBalance : Fragment() {
updateBalances(balances)
- model.balances.observe(this, Observer {
+ model.balances.observe(viewLifecycleOwner, Observer {
triggerLoading()
updateBalances(it)
})
- model.testWithdrawalInProgress.observe(this, Observer { loading ->
+
+ val withdrawTestkudosButton =
view.findViewById<Button>(R.id.button_withdraw_testkudos)
+ withdrawTestkudosButton.setOnClickListener {
+ model.withdrawTestkudos()
+ }
+
+ model.testWithdrawalInProgress.observe(viewLifecycleOwner, Observer {
loading ->
Log.v("taler-wallet", "observing balance loading ${loading} in
show balance")
withdrawTestkudosButton.isEnabled = !loading
triggerLoading()
@@ -252,7 +253,7 @@ class ShowBalance : Fragment() {
addItemDecoration(myItemDecoration)
}
- model.pendingOperations.observe(this, Observer {
+ model.pendingOperations.observe(viewLifecycleOwner, Observer {
updatePending(it)
})
diff --git a/app/src/main/res/layout/fragment_settings.xml
b/app/src/main/res/layout/fragment_settings.xml
index 5b85876..ed144e4 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -70,6 +70,12 @@
android:ems="10"
android:inputType="textPersonName"
android:text="Developer Settings (be careful!)" />
+
+ <Button
+ android:text="Withdraw TESTKUDOS"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/button_withdraw_testkudos"/>
<Button
android:text="Reset Wallet (dangerous!)"
diff --git a/app/src/main/res/layout/fragment_show_balance.xml
b/app/src/main/res/layout/fragment_show_balance.xml
index 57f9309..a5fb26f 100644
--- a/app/src/main/res/layout/fragment_show_balance.xml
+++ b/app/src/main/res/layout/fragment_show_balance.xml
@@ -32,11 +32,6 @@
<Space android:layout_width="match_parent"
android:layout_height="20dp"/>
- <Button
- android:text="Withdraw TESTKUDOS"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/button_withdraw_testkudos"/>
<Button
android:text="Scan Taler QR Code"
android:layout_width="wrap_content"
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-android] branch master updated: fix android warnings,
gnunet <=