From 6b245fd0d657a5576258adf7bcfd5259c79abefe Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 26 Jan 2019 15:15:44 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 10 +++---- app/src/main/java/com/tangem/App.java | 3 +- .../tangem/data/network/ServerApiCommon.java | 2 +- .../tangem/data/network/ServerApiInfura.java | 2 +- .../tangem/data/network/ServerApiInsight.java | 2 +- .../data/network/ServerApiRootstock.java | 2 +- .../activity/ConfirmTransactionActivity.kt | 2 +- .../activity/CreateNewWalletActivity.kt | 2 +- .../activity/EmptyWalletActivity.kt | 2 +- .../activity/LoadedWalletActivity.kt | 2 +- .../presentation/activity/LogoActivity.kt | 2 +- .../presentation/activity/MainActivity.kt | 8 ++--- .../activity/PinRequestActivity.kt | 4 +-- .../presentation/activity/PinSaveActivity.kt | 4 +-- .../presentation/activity/PinSwapActivity.kt | 2 +- ...pareCryptonitOtherApiWithdrawalActivity.kt | 2 +- .../PrepareCryptonitWithdrawalActivity.kt | 2 +- .../PrepareKrakenWithdrawalActivity.kt | 2 +- .../activity/PrepareTransactionActivity.kt | 2 +- .../presentation/activity/PurgeActivity.kt | 2 +- .../presentation/activity/QrScanActivity.kt | 4 +-- .../activity/SendTransactionActivity.kt | 2 +- .../activity/SignTransactionActivity.kt | 2 +- .../activity/VerifyCardActivity.kt | 2 +- .../dialog/NoExtendedLengthSupportDialog.kt | 2 +- .../dialog/PINSwapWarningDialog.java | 2 +- .../presentation/dialog/RootFoundDialog.kt | 2 +- .../presentation/dialog/ShowQRCodeDialog.java | 8 +++-- .../dialog/WaitSecurityDelayDialog.java | 13 ++++---- .../dialog/WaitSecurityDelayDialogNew.kt | 9 ++++-- .../presentation/fragment/LoadedWallet.kt | 17 ++++++----- .../presentation/fragment/VerifyCard.kt | 8 ++--- .../presentation/viewmodel/BaseViewModel.kt | 4 +-- .../viewmodel/LoadedWalletViewModel.kt | 2 +- .../main/java/com/tangem/util/DeviceName.java | 2 +- .../layout/activity_confirm_transaction.xml | 28 ++++++++--------- .../main/res/layout/activity_empty_wallet.xml | 6 ++-- .../res/layout/activity_loaded_wallet.xml | 4 +-- app/src/main/res/layout/activity_main.xml | 6 ++-- .../main/res/layout/activity_pin_request.xml | 2 +- ...prepare_cryptonit_other_api_withdrawal.xml | 14 ++++----- .../activity_prepare_cryptonit_withdrawal.xml | 14 ++++----- .../activity_prepare_kraken_withdrawal.xml | 14 ++++----- .../layout/activity_prepare_transaction.xml | 14 ++++----- .../res/layout/activity_send_transaction.xml | 4 +-- .../main/res/layout/activity_verify_card.xml | 4 +-- app/src/main/res/layout/dialog_show_qr.xml | 1 - app/src/main/res/layout/dialog_wait_pin2.xml | 4 +-- app/src/main/res/layout/fr_loaded_wallet.xml | 30 +++++++++---------- app/src/main/res/layout/fr_verify_card.xml | 14 ++++----- app/src/main/res/layout/toolbar.xml | 4 +-- gradle.properties | 4 ++- tangemcard-android/build.gradle | 8 ++--- .../android/ExampleInstrumentedTest.java | 4 +-- .../presentation/dialog/NfcEnableDialog.kt | 6 ++-- .../tangemcard/android/reader/NfcManager.java | 4 +-- .../out/android/arch/core/R.java | 2 +- .../out/android/arch/lifecycle/R.java | 2 +- .../android/arch/lifecycle/livedata/R.java | 2 +- .../arch/lifecycle/livedata/core/R.java | 2 +- .../android/arch/lifecycle/viewmodel/R.java | 2 +- .../android/support/graphics/drawable/R.java | 2 +- .../out/android/support/v7/appcompat/R.java | 2 +- .../out/android/support/v7/viewpager/R.java | 2 +- tangemserver-android/build.gradle | 8 ++--- .../tangemserver/ExampleInstrumentedTest.java | 4 +-- .../tangemserver/android/ServerApiTangem.java | 2 +- 67 files changed, 183 insertions(+), 174 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 10b187ccff..0419d814a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ android { targetSdkVersion 28 versionCode 103 versionName "0.811.1." + generateVersionName() - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } androidExtensions { experimental = true @@ -47,10 +47,10 @@ dependencies { implementation project(':tangemcard-common') implementation project(':tangemcard-android') implementation project(':tangemserver-android') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.1.0-alpha02' implementation 'com.google.dagger:dagger:2.16' implementation 'com.google.zxing:core:3.3.3' implementation 'com.google.code.gson:gson:2.8.5' diff --git a/app/src/main/java/com/tangem/App.java b/app/src/main/java/com/tangem/App.java index dde0b711a0..14b3775f08 100644 --- a/app/src/main/java/com/tangem/App.java +++ b/app/src/main/java/com/tangem/App.java @@ -1,7 +1,7 @@ package com.tangem; import android.app.Application; -import android.support.v7.app.AppCompatDelegate; +import androidx.appcompat.app.AppCompatDelegate; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -22,7 +22,6 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.util.List; - public class App extends Application { /** diff --git a/app/src/main/java/com/tangem/data/network/ServerApiCommon.java b/app/src/main/java/com/tangem/data/network/ServerApiCommon.java index c10d274cbc..df196fc762 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiCommon.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiCommon.java @@ -1,7 +1,7 @@ package com.tangem.data.network; import android.annotation.SuppressLint; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.tangem.App; diff --git a/app/src/main/java/com/tangem/data/network/ServerApiInfura.java b/app/src/main/java/com/tangem/data/network/ServerApiInfura.java index 977518fd29..82b4b3d8e8 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiInfura.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiInfura.java @@ -1,6 +1,6 @@ package com.tangem.data.network; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.tangem.App; diff --git a/app/src/main/java/com/tangem/data/network/ServerApiInsight.java b/app/src/main/java/com/tangem/data/network/ServerApiInsight.java index ac24f5b532..3dac73c841 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiInsight.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiInsight.java @@ -1,6 +1,6 @@ package com.tangem.data.network; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.tangem.data.network.model.InsightBody; diff --git a/app/src/main/java/com/tangem/data/network/ServerApiRootstock.java b/app/src/main/java/com/tangem/data/network/ServerApiRootstock.java index 5d19e3225c..2629c31cc1 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiRootstock.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiRootstock.java @@ -1,6 +1,6 @@ package com.tangem.data.network; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.tangem.App; diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt index 8c66aee396..8c9f086780 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmTransactionActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.text.Editable import android.text.Html import android.text.TextWatcher diff --git a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt index cfdd251dad..129b5fb0cd 100644 --- a/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/CreateNewWalletActivity.kt @@ -9,7 +9,7 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.View import android.widget.ProgressBar import android.widget.Toast diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt index cc7646b7db..1f466e6d82 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -9,7 +9,7 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.text.Html import android.view.View import android.widget.Toast diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt index f7a24d8c28..9231929c75 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator 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 76e05876d3..c7b2d40220 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/LogoActivity.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt index 79d8594bfd..92623feee9 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt @@ -10,10 +10,10 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.support.v4.app.ActivityCompat -import android.support.v4.content.ContextCompat -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.PopupMenu +import androidx.core.app.ActivityCompat +import androidx.core.content.ContextCompat +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.PopupMenu import android.util.Log import android.view.Menu import android.view.MenuItem diff --git a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt index e8128a0825..ec5851e00c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinRequestActivity.kt @@ -13,8 +13,8 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Build import android.os.Bundle -import android.support.v4.app.ActivityCompat -import android.support.v7.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import androidx.appcompat.app.AppCompatActivity import android.text.TextUtils import android.util.Log import android.view.View diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt index b67ad84f01..a7ef5dacb9 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSaveActivity.kt @@ -14,8 +14,8 @@ import android.os.Bundle import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyPermanentlyInvalidatedException import android.security.keystore.KeyProperties -import android.support.v4.app.ActivityCompat -import android.support.v7.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import androidx.appcompat.app.AppCompatActivity import android.text.TextUtils import android.view.View import android.widget.Button diff --git a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt index 38584e3d12..95272c5346 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PinSwapActivity.kt @@ -9,7 +9,7 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.View import android.widget.ProgressBar import android.widget.Toast diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt index 88c5e358c0..9d13b3c9e4 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -7,7 +7,7 @@ import android.graphics.Color import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.View import com.tangem.App import com.tangem.Constant diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt index a3ae2fc75d..18737def81 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareCryptonitWithdrawalActivity.kt @@ -6,7 +6,7 @@ import android.graphics.Color import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.text.InputFilter import android.view.View import android.view.inputmethod.EditorInfo diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt index 542362a3db..b99dfa531c 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareKrakenWithdrawalActivity.kt @@ -10,7 +10,7 @@ import android.graphics.Color import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.View import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager diff --git a/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt index aa73d48659..ee681b096d 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PrepareTransactionActivity.kt @@ -7,7 +7,7 @@ import android.content.Intent import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.text.Html import android.view.View import android.view.inputmethod.EditorInfo 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 2d0d7c81d4..f4fc6ffdce 100644 --- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.kt @@ -10,7 +10,7 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.View import android.widget.Toast import com.tangem.App diff --git a/app/src/main/java/com/tangem/presentation/activity/QrScanActivity.kt b/app/src/main/java/com/tangem/presentation/activity/QrScanActivity.kt index 1dcf4b0edb..b765cd6c42 100644 --- a/app/src/main/java/com/tangem/presentation/activity/QrScanActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/QrScanActivity.kt @@ -6,8 +6,8 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle -import android.support.v4.app.ActivityCompat -import android.support.v7.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import androidx.appcompat.app.AppCompatActivity import com.google.zxing.Result import com.tangem.Constant import me.dm7.barcodescanner.zxing.ZXingScannerView diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt index f2de42ee6b..dc568af6ae 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt @@ -4,7 +4,7 @@ import android.content.Intent import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.KeyEvent import android.widget.Toast import com.tangem.Constant diff --git a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt index 9591aa7857..cc8db08cc7 100644 --- a/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/SignTransactionActivity.kt @@ -8,7 +8,7 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.KeyEvent import android.view.View import android.widget.ProgressBar diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt index 408a7e36ca..1089d8ea68 100644 --- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt @@ -3,7 +3,7 @@ package com.tangem.presentation.activity import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator diff --git a/app/src/main/java/com/tangem/presentation/dialog/NoExtendedLengthSupportDialog.kt b/app/src/main/java/com/tangem/presentation/dialog/NoExtendedLengthSupportDialog.kt index 1fe40d3900..102aa06044 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/NoExtendedLengthSupportDialog.kt +++ b/app/src/main/java/com/tangem/presentation/dialog/NoExtendedLengthSupportDialog.kt @@ -3,7 +3,7 @@ package com.tangem.presentation.dialog import android.app.AlertDialog import android.app.Dialog import android.os.Bundle -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java b/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java index b454dfcee5..264e04a5a2 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java +++ b/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java @@ -4,7 +4,7 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import com.tangem.wallet.R; diff --git a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt b/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt index f6aed9beb5..7560cfbf43 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt +++ b/app/src/main/java/com/tangem/presentation/dialog/RootFoundDialog.kt @@ -3,7 +3,7 @@ package com.tangem.presentation.dialog import android.app.AlertDialog import android.app.Dialog import android.os.Bundle -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/presentation/dialog/ShowQRCodeDialog.java b/app/src/main/java/com/tangem/presentation/dialog/ShowQRCodeDialog.java index eb92fe303e..a3b588f885 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/ShowQRCodeDialog.java +++ b/app/src/main/java/com/tangem/presentation/dialog/ShowQRCodeDialog.java @@ -3,7 +3,6 @@ package com.tangem.presentation.dialog; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.content.DialogInterface; import android.graphics.Bitmap; import android.os.Bundle; @@ -16,6 +15,9 @@ import android.widget.TextView; import com.tangem.util.UtilHelper; import com.tangem.wallet.R; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.DialogFragment; + /** * Created by dvol on 06.03.2018. */ @@ -66,11 +68,11 @@ public class ShowQRCodeDialog extends DialogFragment { } } - public static void show(final Activity activity, final String content) { + public static void show(final AppCompatActivity activity, final String content) { activity.runOnUiThread(() -> { ShowQRCodeDialog instance = new ShowQRCodeDialog(); instance.setup(content); - instance.show(activity.getFragmentManager(), "ShowQRCodeDialog"); + instance.show(activity.getSupportFragmentManager(), "ShowQRCodeDialog"); }); } diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java index d23cf18cbc..a77a4dd30b 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java +++ b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialog.java @@ -3,7 +3,7 @@ package com.tangem.presentation.dialog; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; + import android.content.DialogInterface; import android.os.Bundle; import android.view.LayoutInflater; @@ -15,6 +15,9 @@ import com.tangem.wallet.R; import java.util.Timer; import java.util.TimerTask; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.DialogFragment; + /** * Created by dvol on 06.03.2018. */ @@ -104,7 +107,7 @@ public class WaitSecurityDelayDialog extends DialogFragment { private final static int MinRemainingDelayToShowDialog=1000; private final static int DelayBeforeShowDialog=5000; - public static void onReadBeforeRequest(final Activity activity, final int timeout) { + public static void onReadBeforeRequest(final AppCompatActivity activity, final int timeout) { activity.runOnUiThread(new Runnable() { @Override public void run() { @@ -117,7 +120,7 @@ public class WaitSecurityDelayDialog extends DialogFragment { instance = new WaitSecurityDelayDialog(); instance.setup(timeout, DelayBeforeShowDialog); instance.setCancelable(false); - instance.show(activity.getFragmentManager(), "WaitSecurityDelayDialog"); + instance.show(activity.getSupportFragmentManager(), "WaitSecurityDelayDialog"); } }, DelayBeforeShowDialog); } @@ -135,7 +138,7 @@ public class WaitSecurityDelayDialog extends DialogFragment { }); } - public static void onReadWait(final Activity activity, final int msec) { + public static void onReadWait(final AppCompatActivity activity, final int msec) { activity.runOnUiThread(new Runnable() { @Override public void run() { @@ -157,7 +160,7 @@ public class WaitSecurityDelayDialog extends DialogFragment { // 1000ms - card delay notification interval instance.setup(msec + 1000, 1000); instance.setCancelable(false); - instance.show(activity.getFragmentManager(), "WaitSecurityDelayDialog"); + instance.show(activity.getSupportFragmentManager(), "WaitSecurityDelayDialog"); } } else { instance.setRemainingTimeout(msec); diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt index b9429449fb..1ea50cdecc 100644 --- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt +++ b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.app.AlertDialog import android.app.Dialog import android.os.Bundle -import android.support.v7.app.AppCompatDialogFragment +import androidx.appcompat.app.AppCompatDialogFragment import android.widget.ProgressBar import com.tangem.presentation.event.ReadAfterRequest import com.tangem.presentation.event.ReadBeforeRequest @@ -82,8 +82,11 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() { override fun run() { setup(readBeforeRequest.timeout!!, DELAY_BEFORE_SHOW_DIALOG) isCancelable = false - if (!isAdded) - show(activity?.supportFragmentManager, TAG) + + + +// if (!isAdded) +// show(activity?.supportFragmentManager, TAG) } }, DELAY_BEFORE_SHOW_DIALOG.toLong()) } 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 a11fcf6d77..5409363f5d 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -10,14 +10,15 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.content.ContextCompat +import androidx.fragment.app.Fragment +import androidx.core.content.ContextCompat import android.text.Html import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.data.Blockchain @@ -57,7 +58,7 @@ import java.io.InputStream import java.util.* import kotlin.concurrent.timerTask -class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, SharedPreferences.OnSharedPreferenceChangeListener { +class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, SharedPreferences.OnSharedPreferenceChangeListener { companion object { val TAG: String = LoadedWallet::class.java.simpleName } @@ -151,7 +152,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific getString(R.string.load_via_qr) -> { val engine = CoinEngineFactory.create(ctx) - ShowQRCodeDialog.show(activity, engine!!.shareWalletUri.toString()) + ShowQRCodeDialog.show(activity as AppCompatActivity?, engine!!.shareWalletUri.toString()) } getString(R.string.via_cryptonit) -> { @@ -354,7 +355,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific else bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_use_default)) pinSwapWarningDialog.arguments = bundle - pinSwapWarningDialog.show(activity?.supportFragmentManager, PINSwapWarningDialog.TAG) + activity?.supportFragmentManager?.let { pinSwapWarningDialog.show(it, PINSwapWarningDialog.TAG) } } Constant.REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { @@ -473,7 +474,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific lastReadSuccess = false if (cardProtocol.error is CardProtocol.TangemException_ExtendedLengthNotSupported) if (!NoExtendedLengthSupportDialog.allReadyShowed) - NoExtendedLengthSupportDialog().show(activity?.supportFragmentManager, NoExtendedLengthSupportDialog.TAG) + activity?.supportFragmentManager?.let { NoExtendedLengthSupportDialog().show(it, NoExtendedLengthSupportDialog.TAG) } else Toast.makeText(activity, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show() } @@ -501,11 +502,11 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } override fun onReadWait(msec: Int) { - WaitSecurityDelayDialog.onReadWait(activity, msec) + WaitSecurityDelayDialog.onReadWait(activity as AppCompatActivity?, msec) } override fun onReadBeforeRequest(timeout: Int) { - WaitSecurityDelayDialog.onReadBeforeRequest(activity, timeout) + WaitSecurityDelayDialog.onReadBeforeRequest(activity as AppCompatActivity?, timeout) } override fun onReadAfterRequest() { diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt index f7d1e3a430..59f73e119e 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -5,8 +5,8 @@ import android.content.Intent import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.content.ContextCompat +import androidx.fragment.app.Fragment +import androidx.core.content.ContextCompat import android.text.Html import android.text.format.DateUtils import android.view.LayoutInflater @@ -33,7 +33,7 @@ import kotlinx.android.synthetic.main.fr_verify_card.* import java.io.IOException import java.util.* -class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { +class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { companion object { val TAG: String = VerifyCard::class.java.simpleName } @@ -124,7 +124,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { else bundle.putString(PINSwapWarningDialog.EXTRA_MESSAGE, getString(R.string.if_you_use_default)) pinSwapWarningDialog.arguments = bundle - pinSwapWarningDialog.show(activity?.supportFragmentManager, PINSwapWarningDialog.TAG) + activity?.supportFragmentManager?.let { pinSwapWarningDialog.show(it, PINSwapWarningDialog.TAG) } } Constant.REQUEST_CODE_SWAP_PIN -> if (resultCode == Activity.RESULT_OK) { diff --git a/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt b/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt index ea21989952..9ea24cec16 100644 --- a/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt +++ b/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt @@ -15,8 +15,8 @@ */ package com.tangem.presentation.viewmodel -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import com.tangem.data.network.exception.Failure /** diff --git a/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt b/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt index 6442aa5778..c96f4c6d64 100644 --- a/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt +++ b/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt @@ -1,6 +1,6 @@ package com.tangem.presentation.viewmodel -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.MutableLiveData import com.tangem.data.network.exception.Failure class LoadedWalletViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/tangem/util/DeviceName.java b/app/src/main/java/com/tangem/util/DeviceName.java index 0879e7f674..f577dd16bb 100644 --- a/app/src/main/java/com/tangem/util/DeviceName.java +++ b/app/src/main/java/com/tangem/util/DeviceName.java @@ -28,7 +28,7 @@ package com.tangem.util; import android.os.Build; import android.os.Handler; import android.os.Looper; - import android.support.annotation.WorkerThread; + import androidx.annotation.WorkerThread; import android.text.TextUtils; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/res/layout/activity_confirm_transaction.xml b/app/src/main/res/layout/activity_confirm_transaction.xml index 0004113e61..50a52dd393 100644 --- a/app/src/main/res/layout/activity_confirm_transaction.xml +++ b/app/src/main/res/layout/activity_confirm_transaction.xml @@ -1,11 +1,11 @@ - + tools:context="com.tangem.presentation.activity.ConfirmTransactionActivity" + tools:ignore="Autofill"> - - + - @@ -144,9 +144,9 @@ app:layout_constraintLeft_toRightOf="@+id/textView3" tools:text="(including fee)" /> - + - @@ -165,7 +165,7 @@ android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" /> - + @@ -257,7 +257,7 @@ - @@ -276,7 +276,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_min="150dp"/> + app:layout_constraintWidth_min="150dp" /> - + @@ -335,4 +335,4 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/llFee" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_empty_wallet.xml b/app/src/main/res/layout/activity_empty_wallet.xml index 3336dc889d..5ebe26e93a 100644 --- a/app/src/main/res/layout/activity_empty_wallet.xml +++ b/app/src/main/res/layout/activity_empty_wallet.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_loaded_wallet.xml b/app/src/main/res/layout/activity_loaded_wallet.xml index 896f1e7ddb..69cedaaea4 100644 --- a/app/src/main/res/layout/activity_loaded_wallet.xml +++ b/app/src/main/res/layout/activity_loaded_wallet.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6770fd79ba..08ade95532 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_pin_request.xml b/app/src/main/res/layout/activity_pin_request.xml index 19bd30c52d..ca90a6eadd 100644 --- a/app/src/main/res/layout/activity_pin_request.xml +++ b/app/src/main/res/layout/activity_pin_request.xml @@ -45,7 +45,7 @@ - - - @@ -322,9 +322,9 @@ android:textSize="@dimen/text_size_1_small" app:layout_constraintBottom_toBottomOf="@+id/textView3" app:layout_constraintLeft_toRightOf="@+id/textView3" /> - + - @@ -359,7 +359,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/etAmount" /> - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml b/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml index 878b4701ea..e1384ce7e5 100644 --- a/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml +++ b/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml @@ -1,5 +1,5 @@ - - @@ -304,9 +304,9 @@ app:layout_constraintTop_toTopOf="parent" /> - + - @@ -342,7 +342,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/etAmount" /> - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml b/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml index e557b5abb3..14ac2d9312 100644 --- a/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml +++ b/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml @@ -1,5 +1,5 @@ - - @@ -269,9 +269,9 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - @@ -307,7 +307,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/etAmount" /> - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_prepare_transaction.xml b/app/src/main/res/layout/activity_prepare_transaction.xml index f559abc98c..b5059e66f2 100644 --- a/app/src/main/res/layout/activity_prepare_transaction.xml +++ b/app/src/main/res/layout/activity_prepare_transaction.xml @@ -1,5 +1,5 @@ - - @@ -171,9 +171,9 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"/> - + - @@ -209,7 +209,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/etAmount" /> - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_send_transaction.xml b/app/src/main/res/layout/activity_send_transaction.xml index 071e96ea9b..2091c384a3 100644 --- a/app/src/main/res/layout/activity_send_transaction.xml +++ b/app/src/main/res/layout/activity_send_transaction.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_verify_card.xml b/app/src/main/res/layout/activity_verify_card.xml index b8242c7c8c..68c574f5d3 100644 --- a/app/src/main/res/layout/activity_verify_card.xml +++ b/app/src/main/res/layout/activity_verify_card.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/dialog_show_qr.xml b/app/src/main/res/layout/dialog_show_qr.xml index 140dad0f5b..234e55bd40 100644 --- a/app/src/main/res/layout/dialog_show_qr.xml +++ b/app/src/main/res/layout/dialog_show_qr.xml @@ -18,7 +18,6 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="@font/maax" - android:text="TextView" android:textAlignment="center" android:textSize="@dimen/text_size_2_small" /> diff --git a/app/src/main/res/layout/dialog_wait_pin2.xml b/app/src/main/res/layout/dialog_wait_pin2.xml index ad5c029e5f..88c50d8038 100644 --- a/app/src/main/res/layout/dialog_wait_pin2.xml +++ b/app/src/main/res/layout/dialog_wait_pin2.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 5ef4e5b85d..72018a0a82 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -1,5 +1,5 @@ - - - - - - - - + - + - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index f424673396..3be7ee3eb0 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -1,5 +1,5 @@ - - - @@ -136,7 +136,7 @@ android:src="@drawable/tangem_logo_small_new" app:layout_constraintEnd_toEndOf="parent" /> - + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml index bf40dccd4a..c60dba3580 100644 --- a/app/src/main/res/layout/toolbar.xml +++ b/app/src/main/res/layout/toolbar.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8a2756b4f4..8f60b3bd0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects org.gradle.parallel=true -org.gradle.daemon=true \ No newline at end of file +org.gradle.daemon=true +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/tangemcard-android/build.gradle b/tangemcard-android/build.gradle index 5e9f1807d8..9157f11e31 100644 --- a/tangemcard-android/build.gradle +++ b/tangemcard-android/build.gradle @@ -9,7 +9,7 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -25,12 +25,12 @@ android { dependencies { implementation project(':tangemcard-common') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.scottyab:rootbeer-lib:0.0.7' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android/ExampleInstrumentedTest.java b/tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android/ExampleInstrumentedTest.java index b278ba0d2e..ef4e450009 100644 --- a/tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android/ExampleInstrumentedTest.java +++ b/tangemcard-android/src/androidTest/java/com/tangem/tangemcard/android/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.tangem.tangemcard.android; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt index 24f0cabe39..5e02553731 100644 --- a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt +++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt @@ -4,13 +4,13 @@ import android.app.Dialog import android.content.Intent import android.os.Bundle import android.provider.Settings -import android.support.v4.app.DialogFragment +import androidx.fragment.app.DialogFragment -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import com.tangem.tangemcard.R -class NfcEnableDialog : DialogFragment() { +class NfcEnableDialog : androidx.fragment.app.DialogFragment() { companion object { val TAG: String = NfcEnableDialog::class.java.simpleName diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java index 0581c7f107..ca6a441dad 100644 --- a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java +++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java @@ -13,8 +13,8 @@ import android.nfc.Tag; import android.nfc.tech.IsoDep; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.FragmentActivity; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.FragmentActivity; import com.tangem.tangemcard.android.presentation.dialog.NfcEnableDialog; diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/core/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/core/R.java index 872d786c26..293d3b5d44 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/core/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/core/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.arch.core; +package androidx.arch.core; public final class R { private R() {} diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/R.java index b0c852ec52..bc12ff35c6 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.arch.lifecycle; +package androidx.lifecycle; public final class R { private R() {} diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/R.java index 12c2646438..a6a177e01a 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.arch.lifecycle.livedata; +package androidx.lifecycle.livedata; public final class R { private R() {} diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/core/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/core/R.java index 2c19ff7cd7..3ff0643891 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/core/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/livedata/core/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.arch.lifecycle.livedata.core; +package androidx.lifecycle.livedata.core; public final class R { private R() {} diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/viewmodel/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/viewmodel/R.java index a66555ad86..116fcf3381 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/viewmodel/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/arch/lifecycle/viewmodel/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.arch.lifecycle.viewmodel; +package androidx.lifecycle.viewmodel; public final class R { private R() {} diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/graphics/drawable/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/graphics/drawable/R.java index 18d26de9e5..562c60554b 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/graphics/drawable/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/graphics/drawable/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.support.graphics.drawable; +package androidx.vectordrawable.graphics.drawable; public final class R { private R() {} diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/appcompat/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/appcompat/R.java index b75c06438e..055c33175a 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/appcompat/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/appcompat/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.support.v7.appcompat; +package androidx.appcompat.appcompat; public final class R { private R() {} diff --git a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/viewpager/R.java b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/viewpager/R.java index 83b8f0b5f7..b3f7cc50e7 100644 --- a/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/viewpager/R.java +++ b/tangemcard/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out/android/support/v7/viewpager/R.java @@ -4,7 +4,7 @@ * gradle plugin from the resource data it found. It * should not be modified by hand. */ -package android.support.v7.viewpager; +package androidx.appcompat.viewpager; public final class R { private R() {} diff --git a/tangemserver-android/build.gradle b/tangemserver-android/build.gradle index 39481d8d4e..9b9530c7d1 100644 --- a/tangemserver-android/build.gradle +++ b/tangemserver-android/build.gradle @@ -9,7 +9,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -26,14 +26,14 @@ dependencies { implementation project(':tangemcard-common') implementation project(':tangemcard-android') implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.squareup.retrofit2:converter-gson:2.5.0' implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { diff --git a/tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java b/tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java index a165ce8bf1..d6e313ca5d 100644 --- a/tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java +++ b/tangemserver-android/src/androidTest/java/com/tangem/tangemserver/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.tangem.tangemserver; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerApiTangem.java b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerApiTangem.java index 549791aa9f..3550c10b78 100644 --- a/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerApiTangem.java +++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/ServerApiTangem.java @@ -1,6 +1,6 @@ package com.tangem.tangemserver.android; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.tangem.tangemcard.data.TangemCard;