From 35adc604f83dcb75fd721e43ae6ae9b03d38db82 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 13 Nov 2018 23:00:24 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/App.java | 13 +++++++++++ .../main/java/com/tangem/di/Navigator.java | 13 +++++++++++ .../com/tangem/di/NavigatorComponent.java | 15 +++++++++++++ .../java/com/tangem/di/NavigatorModule.java | 17 ++++++++++++++ .../presentation/activity/LogoActivity.kt | 15 ++++++++----- .../presentation/activity/PurgeActivity.kt | 22 ++++++++----------- .../presentation/fragment/LoadedWallet.kt | 7 ------ build.gradle | 2 +- 8 files changed, 77 insertions(+), 27 deletions(-) create mode 100644 app/src/main/java/com/tangem/di/Navigator.java create mode 100644 app/src/main/java/com/tangem/di/NavigatorComponent.java create mode 100644 app/src/main/java/com/tangem/di/NavigatorModule.java diff --git a/app/src/main/java/com/tangem/App.java b/app/src/main/java/com/tangem/App.java index d043098cd9..b63bdafa7e 100644 --- a/app/src/main/java/com/tangem/App.java +++ b/app/src/main/java/com/tangem/App.java @@ -3,7 +3,9 @@ package com.tangem; import android.app.Application; import android.support.v7.app.AppCompatDelegate; +import com.tangem.di.DaggerNavigatorComponent; import com.tangem.di.DaggerNetworkComponent; +import com.tangem.di.NavigatorComponent; import com.tangem.di.NetworkComponent; public class App extends Application { @@ -22,6 +24,11 @@ public class App extends Application { } private static NetworkComponent networkComponent; + private static NavigatorComponent navigatorComponent; + + public static NavigatorComponent getNavigatorComponent() { + return navigatorComponent; + } @Override public void onCreate() { @@ -30,6 +37,7 @@ public class App extends Application { sInstance = this; networkComponent = DaggerNetworkComponent.create(); + navigatorComponent = buildNavigatorComponent(); } /** @@ -43,4 +51,9 @@ public class App extends Application { return networkComponent; } + protected NavigatorComponent buildNavigatorComponent() { + return DaggerNavigatorComponent.builder() + .build(); + } + } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/di/Navigator.java b/app/src/main/java/com/tangem/di/Navigator.java new file mode 100644 index 0000000000..6b9ca4da7d --- /dev/null +++ b/app/src/main/java/com/tangem/di/Navigator.java @@ -0,0 +1,13 @@ +package com.tangem.di; + +import android.content.Context; + +import com.tangem.presentation.activity.MainActivity; + +public class Navigator { + + public void showMain(Context context) { + context.startActivity(MainActivity.Companion.callingIntent(context)); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/di/NavigatorComponent.java b/app/src/main/java/com/tangem/di/NavigatorComponent.java new file mode 100644 index 0000000000..b48e6654e1 --- /dev/null +++ b/app/src/main/java/com/tangem/di/NavigatorComponent.java @@ -0,0 +1,15 @@ +package com.tangem.di; + +import com.tangem.presentation.activity.LogoActivity; + +import javax.inject.Singleton; + +import dagger.Component; + +@Singleton +@Component(modules = {NavigatorModule.class}) +public interface NavigatorComponent { + + void inject(LogoActivity activity); + +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/di/NavigatorModule.java b/app/src/main/java/com/tangem/di/NavigatorModule.java new file mode 100644 index 0000000000..94a8dda3d5 --- /dev/null +++ b/app/src/main/java/com/tangem/di/NavigatorModule.java @@ -0,0 +1,17 @@ +package com.tangem.di; + +import javax.inject.Singleton; + +import dagger.Module; +import dagger.Provides; + +@Module +class NavigatorModule { + + @Singleton + @Provides + Navigator provideNavigator() { + return new Navigator(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt index 0f814afbf5..6203e8962a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt @@ -1,13 +1,14 @@ package com.tangem.presentation.activity import android.annotation.SuppressLint -import android.content.Intent import android.os.Bundle import android.support.v7.app.AppCompatActivity -import com.tangem.data.network.ServerApiElectrum +import com.tangem.App +import com.tangem.di.Navigator import com.tangem.wallet.BuildConfig import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_logo.* +import javax.inject.Inject class LogoActivity : AppCompatActivity() { @@ -18,14 +19,17 @@ class LogoActivity : AppCompatActivity() { const val MILLIS_AUTO_HIDE = 1000 } - private var serverApiElectrum: ServerApiElectrum = ServerApiElectrum() - private val hideRunnable = Runnable { this.hide() } + @Inject + internal lateinit var navigator: Navigator + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_logo) + App.getNavigatorComponent().inject(this) + ivLogo.setOnClickListener { hide() } } @@ -43,8 +47,7 @@ class LogoActivity : AppCompatActivity() { } private fun hide() { - val intent = Intent(baseContext, MainActivity::class.java) - startActivity(intent) + navigator.showMain(this) finish() } diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt index 63493ba6b9..cfaa151421 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -53,23 +53,19 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc public override fun onResume() { super.onResume() - nfcManager!!.onResume() + nfcManager?.onResume() } public override fun onPause() { - nfcManager!!.onPause() - if (purgeTask != null) { - purgeTask!!.cancel(true) - } + nfcManager?.onPause() + purgeTask?.cancel(true) super.onPause() } public override fun onStop() { // dismiss enable NFC dialog - nfcManager!!.onStop() - if (purgeTask != null) { - purgeTask!!.cancel(true) - } + nfcManager?.onStop() + purgeTask?.cancel(true) super.onStop() } @@ -88,7 +84,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc purgeTask!!.start() } else { // this Log.d(TAG, "Mismatch card UID (" + sUID + " instead of " + card.getUID() + ")"); - nfcManager!!.ignoreTag(isoDep.tag) + nfcManager?.ignoreTag(isoDep.tag) } } catch (e: Exception) { @@ -109,9 +105,9 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc } override fun onReadStart(cardProtocol: CardProtocol) { - progressBar!!.post { - progressBar!!.visibility = View.VISIBLE - progressBar!!.progress = 5 + progressBar.post { + progressBar.visibility = View.VISIBLE + progressBar.progress = 5 } } diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt index ec87d4b7e2..10b4780b0c 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -70,8 +70,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific private var serverApiElectrum: ServerApiElectrum = ServerApiElectrum() private var singleToast: Toast? = null - //private var card: TangemCard? = null - //private var engine: CoinEngine? = null private lateinit var ctx: TangemContext private var lastTag: Tag? = null @@ -94,11 +92,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific ctx = TangemContext.loadFromBundle(activity, activity.intent.extras) -// card = TangemCard(activity.intent.getStringExtra(TangemCard.EXTRA_UID)) -// card!!.loadFromBundle(activity.intent.extras.getBundle(TangemCard.EXTRA_CARD)) -// -// engine = CoinEngineFactory.create(activity, card!!, activity.intent.extras.getBundle(CoinEngine.EXTRA_ENGINE)) - lastTag = activity.intent.getParcelableExtra(MainActivity.EXTRA_LAST_DISCOVERED_TAG) localStorage = LocalStorage(activity) diff --git a/build.gradle b/build.gradle index f32c4373c1..a5d064f81b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.0' + ext.kotlin_version = '1.3.10' repositories { google() jcenter()