From c9abffa821fd3ecbb8038753726fdbd07fcae914 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 16 Mar 2020 10:45:38 -0300 Subject: Hide reload balance/history menu items when not in dev mode --- app/src/main/java/net/taler/wallet/BalanceFragment.kt | 5 +++++ .../main/java/net/taler/wallet/history/WalletHistoryFragment.kt | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/app/src/main/java/net/taler/wallet/BalanceFragment.kt b/app/src/main/java/net/taler/wallet/BalanceFragment.kt index b9f5818..84a1b3c 100644 --- a/app/src/main/java/net/taler/wallet/BalanceFragment.kt +++ b/app/src/main/java/net/taler/wallet/BalanceFragment.kt @@ -46,6 +46,7 @@ class BalanceFragment : Fragment() { private val model: WalletViewModel by activityViewModels() private val withdrawManager by lazy { model.withdrawManager } + private var reloadBalanceMenuItem: MenuItem? = null private val balancesAdapter = BalanceAdapter() override fun onCreate(savedInstanceState: Bundle?) { @@ -75,6 +76,7 @@ class BalanceFragment : Fragment() { model.devMode.observe(viewLifecycleOwner, Observer { enabled -> delayedTransition() testWithdrawButton.visibility = if (enabled) VISIBLE else GONE + reloadBalanceMenuItem?.isVisible = enabled }) testWithdrawButton.setOnClickListener { withdrawManager.withdrawTestkudos() @@ -117,6 +119,9 @@ class BalanceFragment : Fragment() { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.balance, menu) menu.findItem(R.id.developer_mode).isChecked = model.devMode.value!! + reloadBalanceMenuItem = menu.findItem(R.id.reload_balance).apply { + isVisible = model.devMode.value!! + } super.onCreateOptionsMenu(menu, inflater) } diff --git a/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt b/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt index 75b7d02..4f8ab82 100644 --- a/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt +++ b/app/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt @@ -31,6 +31,7 @@ import androidx.lifecycle.Observer import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager.VERTICAL +import kotlinx.android.synthetic.main.fragment_show_balance.* import kotlinx.android.synthetic.main.fragment_show_history.* import net.taler.wallet.R import net.taler.wallet.WalletViewModel @@ -44,6 +45,7 @@ class WalletHistoryFragment : Fragment(), OnEventClickListener { private val model: WalletViewModel by activityViewModels() private val historyManager by lazy { model.historyManager } private lateinit var showAllItem: MenuItem + private var reloadHistoryItem: MenuItem? = null private val historyAdapter = WalletHistoryAdapter(this) override fun onCreate(savedInstanceState: Bundle?) { @@ -65,6 +67,9 @@ class WalletHistoryFragment : Fragment(), OnEventClickListener { addItemDecoration(DividerItemDecoration(context, VERTICAL)) } + model.devMode.observe(viewLifecycleOwner, Observer { enabled -> + reloadHistoryItem?.isVisible = enabled + }) historyManager.progress.observe(viewLifecycleOwner, Observer { show -> historyProgressBar.visibility = if (show) VISIBLE else INVISIBLE }) @@ -81,6 +86,9 @@ class WalletHistoryFragment : Fragment(), OnEventClickListener { inflater.inflate(R.menu.history, menu) showAllItem = menu.findItem(R.id.show_all_history) showAllItem.isChecked = historyManager.showAll.value == true + reloadHistoryItem = menu.findItem(R.id.reload_history).apply { + isVisible = model.devMode.value!! + } } override fun onOptionsItemSelected(item: MenuItem): Boolean { -- cgit v1.2.3