From 4ef07f5d902548ddd3383200cde67d80b1985a11 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 13 Nov 2018 23:49:01 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 8 ++------ app/src/main/AndroidManifest.xml | 2 +- ...y.kt => PrepareCryptonitOtherApiWithdrawalActivity.kt} | 4 ++-- .../java/com/tangem/presentation/fragment/LoadedWallet.kt | 2 +- .../activity_prepare_cryptonit_other_api_withdrawal.xml | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) rename app/src/main/java/com/tangem/presentation/activity/{PrepareCryptonitOtherAPIWithdrawalActivity.kt => PrepareCryptonitOtherApiWithdrawalActivity.kt} (98%) diff --git a/app/build.gradle b/app/build.gradle index 031bdf275c..3a3efddb83 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,16 +62,12 @@ dependencies { implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' implementation 'com.google.dagger:dagger:2.16' annotationProcessor 'com.google.dagger:dagger-compiler:2.16' -// implementation 'com.google.dagger:dagger-android:2.16' -// implementation 'com.google.dagger:dagger-android-support:2.16' // if you use the support libraries -// annotationProcessor 'com.google.dagger:dagger-android-processor:2.16' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'org.bitcoinj:bitcoinj-parent:0.14.4' - implementation 'org.bitcoinj:bitcoinj-core:0.14.4' + implementation 'org.bitcoinj:bitcoinj-parent:0.14.7' + implementation 'org.bitcoinj:bitcoinj-core:0.14.7' implementation 'me.dm7.barcodescanner:zxing:1.9.8' implementation 'info.hoang8f:android-segmented:1.0.6' implementation 'io.reactivex.rxjava2:rxjava:2.2.0' implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0' - } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 330db2e0da..b2cea5d8f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -135,7 +135,7 @@ android:theme="@style/AppTheme.NoActionBar" /> diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherAPIWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt similarity index 98% rename from app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherAPIWithdrawalActivity.kt rename to app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt index 773d775d61..89d7414913 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherAPIWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -18,10 +18,10 @@ import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_prepare_cryptonit_other_api_withdrawal.* import java.io.IOException -class PrepareCryptonitOtherAPIWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { +class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { companion object { - val TAG: String = PrepareCryptonitOtherAPIWithdrawalActivity::class.java.simpleName + val TAG: String = PrepareCryptonitOtherApiWithdrawalActivity::class.java.simpleName private const val REQUEST_CODE_SCAN_QR_KEY = 1 private const val REQUEST_CODE_SCAN_QR_SECRET = 2 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 10b4780b0c..857b17cb43 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -153,7 +153,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific ShowQRCodeDialog.show(activity, engine!!.shareWalletUri.toString()) } // getString(R.string.via_cryptonit2) -> { -// val intent = Intent(ctx, PrepareCryptonitOtherAPIWithdrawalActivity::class.java) +// val intent = Intent(ctx, PrepareCryptonitOtherApiWithdrawalActivity::class.java) // intent.putExtra("UID", card!!.uid) // intent.putExtra("Card", card!!.asBundle) // startActivityForResult(intent, REQUEST_CODE_RECEIVE_PAYMENT) diff --git a/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml b/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml index cac33ad2c1..7f6ebbfe11 100644 --- a/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml +++ b/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.tangem.presentation.activity.PrepareCryptonitOtherAPIWithdrawalActivity"> + tools:context="com.tangem.presentation.activity.PrepareCryptonitOtherApiWithdrawalActivity">