From 85c344b358e13d5b78647d191d6129dd11f8bdaf Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 3 Sep 2020 11:50:13 -0300 Subject: [wallet] migrate away from kotlin view extensions --- wallet/src/main/java/net/taler/wallet/MainFragment.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/MainFragment.kt') diff --git a/wallet/src/main/java/net/taler/wallet/MainFragment.kt b/wallet/src/main/java/net/taler/wallet/MainFragment.kt index d5bd3fc..1479bc0 100644 --- a/wallet/src/main/java/net/taler/wallet/MainFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/MainFragment.kt @@ -22,14 +22,13 @@ 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 kotlinx.android.synthetic.main.fragment_main.* import net.taler.common.EventObserver import net.taler.wallet.CurrencyMode.MULTI import net.taler.wallet.CurrencyMode.SINGLE import net.taler.wallet.balances.BalanceItem import net.taler.wallet.balances.BalancesFragment +import net.taler.wallet.databinding.FragmentMainBinding import net.taler.wallet.transactions.TransactionsFragment enum class CurrencyMode { SINGLE, MULTI } @@ -39,16 +38,19 @@ class MainFragment : Fragment() { private val model: MainViewModel by activityViewModels() private var currencyMode: CurrencyMode? = null + private lateinit var ui: FragmentMainBinding + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - return inflater.inflate(R.layout.fragment_main, container, false) + ui = FragmentMainBinding.inflate(inflater, container, false) + return ui.root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - model.balances.observe(viewLifecycleOwner, Observer { + model.balances.observe(viewLifecycleOwner, { onBalancesChanged(it) }) model.transactionsEvent.observe(viewLifecycleOwner, EventObserver { currency -> @@ -59,10 +61,10 @@ class MainFragment : Fragment() { } }) - mainFab.setOnClickListener { + ui.mainFab.setOnClickListener { scanQrCode(requireActivity()) } - mainFab.setOnLongClickListener { + ui.mainFab.setOnLongClickListener { findNavController().navigate(R.id.action_nav_main_to_nav_uri_input) true } -- cgit v1.2.3