diff --git a/app/build.gradle b/app/build.gradle index 0ce6715df5..31a27c4e74 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,6 @@ android { debuggable true minifyEnabled false applicationIdSuffix ".debug" - versionNameSuffix '-DEBUG' signingConfig signingConfigs.debug } } 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 35755666d3..1c756225c2 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -7,11 +7,13 @@ import android.nfc.Tag import android.nfc.tech.IsoDep import androidx.lifecycle.ViewModelProviders import android.os.Bundle +import android.util.Log import android.view.* import android.widget.PopupMenu import androidx.fragment.app.Fragment import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.Observer import com.tangem.App import com.tangem.Constant import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation @@ -46,22 +48,14 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } private lateinit var viewModel: MainViewModel - private lateinit var nfcDeviceAntenna: NfcDeviceAntennaLocation - - private var unsuccessReadCount = 0 - private lateinit var nfcManager: NfcManager - private var task: CustomReadCardTask? = null - - private var lastTag: Tag? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - nfcManager = NfcManager(activity!!, this) lifecycle.addObserver(NfcLifecycleObserver(nfcManager)) } @@ -71,14 +65,8 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific return inflater.inflate(R.layout.main_fragment, container, false) } - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) - viewModel = ViewModelProviders.of(this).get(MainViewModel::class.java) - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - rippleBackgroundNfc.startRippleAnimation() // init NFC Antenna @@ -112,6 +100,17 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific fab.setOnClickListener { showMenu(it) } } + override fun onActivityCreated(savedInstanceState: Bundle?) { + 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) +// }) + } + override fun onResume() { super.onResume() nfcDeviceAntenna.animate() @@ -127,8 +126,6 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific super.onStop() } - - override fun onTagDiscovered(tag: Tag) { try { // get IsoDep handle and run cardReader thread 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 4af7018a2a..de2cfe937f 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainViewModel.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainViewModel.kt @@ -1,7 +1,14 @@ package com.tangem.ui.fragment +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel class MainViewModel : ViewModel() { - // TODO: Implement the ViewModel + private val responseVersionName = MutableLiveData() + + fun getVersionName(): LiveData { + + return responseVersionName + } } \ No newline at end of file