fix android warnings

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
@@ -33,11 +33,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"
                 android:layout_height="wrap_content"