From 78ef89d2cff6000da1cdf8943cfd3fb5a6db04cf Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 23 Apr 2019 13:20:23 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/ui/fragment/MainFragment.kt | 28 ++++--------------- .../com/tangem/ui/fragment/MainViewModel.kt | 27 ++++++++++++++++-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt index 131fa2509b..7f331b7aad 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -11,6 +11,7 @@ import android.widget.PopupMenu import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.tangem.App import com.tangem.Constant @@ -84,23 +85,6 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific else tvNFCHint.text = String.format(getString(R.string.scan_banknote), getString(R.string.phone)) - val apiHelper = ServerApiCommon() - apiHelper.setLastVersionListener { response -> - try { - if (response.isNullOrEmpty()) - return@setLastVersionListener - val responseVersionName = response.trim(' ', '\n', '\r', '\t') - val responseBuildVersion = responseVersionName.split('.').last() - val appBuildVersion = BuildConfig.VERSION_NAME.split('.').last() - if (responseBuildVersion.toInt() > appBuildVersion.toInt()) - if (BuildConfig.FLAVOR.equals(Constant.FLAVOR_TANGEM_ACCESS)) - (activity as MainActivity).toastHelper.showSnackbarUpdateVersion(context!!, cl, responseVersionName) - } catch (E: Exception) { - E.printStackTrace() - } - } - apiHelper.requestLastVersion() - // set listeners fab.setOnClickListener { showMenu(it) } } @@ -109,11 +93,10 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific super.onActivityCreated(savedInstanceState) viewModel = ViewModelProviders.of(this).get(MainViewModel::class.java) -// viewModel.getVersionName().observe(this, Observer { text -> -// Log.d("", text) -// if (BuildConfig.FLAVOR.equals(Constant.FLAVOR_TANGEM_ACCESS)) -// (activity as MainActivity).toastHelper.showSnackbarUpdateVersion(context!!, cl, text) -// }) + // show snackbar about new version app + viewModel.getVersionName().observe(this, Observer { text -> + (activity as MainActivity).toastHelper.showSnackbarUpdateVersion(context!!, cl, text) + }) } override fun onResume() { @@ -185,7 +168,6 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific if (engineCoin != null) { engineCoin.defineWallet() - // val bundle = Bundle() // bundle.putParcelable(Constant.EXTRA_LAST_DISCOVERED_TAG, lastTag) // ctx.saveToBundle(bundle) diff --git a/app/src/main/java/com/tangem/ui/fragment/MainViewModel.kt b/app/src/main/java/com/tangem/ui/fragment/MainViewModel.kt index de2cfe937f..c5131432a9 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainViewModel.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainViewModel.kt @@ -3,12 +3,35 @@ package com.tangem.ui.fragment import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel +import com.tangem.Constant +import com.tangem.data.network.ServerApiCommon +import com.tangem.wallet.BuildConfig class MainViewModel : ViewModel() { - private val responseVersionName = MutableLiveData() + private var versionName = MutableLiveData() fun getVersionName(): LiveData { + versionName = MutableLiveData() + requestVersionName() + return versionName + } - return responseVersionName + private fun requestVersionName() { + val apiHelper = ServerApiCommon() + apiHelper.setLastVersionListener { response -> + try { + if (response.isNullOrEmpty()) + return@setLastVersionListener + val responseVersionName = response.trim(' ', '\n', '\r', '\t') + val responseBuildVersion = responseVersionName.split('.').last() + val appBuildVersion = BuildConfig.VERSION_NAME.split('.').last() + if (responseBuildVersion.toInt() > appBuildVersion.toInt()) + if (BuildConfig.FLAVOR.equals(Constant.FLAVOR_TANGEM_ACCESS)) + versionName.value = responseVersionName + } catch (E: Exception) { + E.printStackTrace() + } + } + apiHelper.requestLastVersion() } } \ No newline at end of file