From 283330043461c8429d7e11ebeba84c3438d357d4 Mon Sep 17 00:00:00 2001 From: Rafael Muhamedzyanov Date: Wed, 17 Apr 2019 17:19:59 +0600 Subject: [PATCH] Migrate to AndroidX (#811) --- app/build.gradle | 46 +++++++++---------- .../bankwallet/ExampleInstrumentedTest.kt | 4 +- .../bankwallet/BaseActivity.kt | 2 +- .../bankwallet/LauncherActivity.kt | 2 +- .../bankwallet/SingleLiveEvent.kt | 12 +---- .../bankwallet/core/Interfaces.kt | 2 +- .../core/managers/NumberFormatter.kt | 2 +- .../core/managers/SystemInfoManager.kt | 2 +- .../core/security/EncryptionManager.kt | 6 +-- ...FingerprintAuthenticationDialogFragment.kt | 6 +-- .../FingerprintAuthenticationHandler.kt | 4 +- .../bankwallet/core/storage/AppDatabase.kt | 10 ++-- .../core/storage/CoinTypeConverter.kt | 2 +- .../core/storage/DatabaseConverters.kt | 2 +- .../bankwallet/core/storage/RatesDao.kt | 2 +- .../core/storage/StorableCoinsDao.kt | 2 +- .../bankwallet/entities/Coin.kt | 6 +-- .../bankwallet/entities/Rate.kt | 4 +- .../bankwallet/lib/AlertDialogFragment.kt | 4 +- .../bankwallet/lib/InputTextViewHolder.kt | 2 +- .../bankwallet/lib/WordsAdapter.kt | 2 +- .../bankwallet/lib/WordsInputAdapter.kt | 2 +- .../modules/backup/BackupActivity.kt | 4 +- .../modules/backup/BackupConfirmFragment.kt | 6 +-- .../modules/backup/BackupInfoFragment.kt | 2 +- .../modules/backup/BackupViewModel.kt | 4 +- .../modules/backup/BackupWordsFragment.kt | 8 ++-- .../modules/balance/BalanceFragment.kt | 13 +++--- .../modules/balance/BalanceViewModel.kt | 4 +- .../FullTransactionInfoActivity.kt | 8 ++-- .../FullTransactionInfoErrorFragment.kt | 2 +- .../FullTransactionInfoItemView.kt | 6 +-- .../FullTransactionInfoModule.kt | 4 +- .../FullTransactionInfoViewModel.kt | 4 +- .../DataProviderSettingsActivity.kt | 8 ++-- .../DataProviderSettingsViewModel.kt | 4 +- .../bankwallet/modules/guest/GuestActivity.kt | 4 +- .../modules/guest/GuestViewModel.kt | 4 +- .../bankwallet/modules/main/MainActivity.kt | 4 +- .../modules/main/MainTabsAdapter.kt | 8 ++-- .../managecoins/ManageCoinsActivity.kt | 10 ++-- .../managecoins/ManageCoinsViewModel.kt | 2 +- .../bankwallet/modules/pin/PinActivity.kt | 16 +++---- .../bankwallet/modules/pin/PinModule.kt | 2 +- .../bankwallet/modules/pin/PinViewModel.kt | 6 +-- .../modules/pin/unlock/UnlockPinModule.kt | 2 +- .../modules/pin/unlock/UnlockPinPresenter.kt | 2 +- .../modules/receive/ReceiveFragment.kt | 16 +++---- .../modules/receive/ReceiveModule.kt | 2 +- .../modules/receive/ReceiveViewModel.kt | 4 +- .../modules/restore/RestoreViewModel.kt | 4 +- .../modules/restore/RestoreWalletActivity.kt | 6 +-- .../modules/send/ConfirmationFragment.kt | 10 ++-- .../modules/send/QRScannerActivity.kt | 4 +- .../modules/send/SendBottomSheetFragment.kt | 21 ++++----- .../bankwallet/modules/send/SendModule.kt | 2 +- .../bankwallet/modules/send/SendViewModel.kt | 4 +- .../modules/settings/SettingsItemView.kt | 4 +- .../BaseCurrencySettingsActivity.kt | 8 ++-- .../BaseCurrencySettingsViewModel.kt | 4 +- .../language/LanguageSettingsActivity.kt | 8 ++-- .../language/LanguageSettingsViewModel.kt | 4 +- .../settings/main/MainSettingsFragment.kt | 7 +-- .../settings/main/MainSettingsViewModel.kt | 4 +- .../security/SecuritySettingsActivity.kt | 4 +- .../security/SecuritySettingsViewModel.kt | 4 +- .../transactions/TransactionDiffCallback.kt | 2 +- .../transactions/TransactionItemDataSource.kt | 2 +- .../TransactionRecordDataSource.kt | 2 +- .../TransactionStatusWithTimeView.kt | 2 +- .../transactions/TransactionsFragment.kt | 37 +++++++-------- .../transactions/TransactionsLoader.kt | 2 +- .../transactions/TransactionsModule.kt | 2 +- .../transactions/TransactionsPresenter.kt | 2 +- .../transactions/TransactionsViewModel.kt | 6 +-- .../TransactionInfoItemView.kt | 4 +- .../TransactionInfoStatusView.kt | 4 +- .../TransactionInfoViewModel.kt | 3 +- .../ui/dialogs/BottomConfirmAlert.kt | 12 ++--- .../bankwallet/ui/extensions/AddressView.kt | 4 +- .../extensions/ButtonWithProgressbarView.kt | 4 +- .../bankwallet/ui/extensions/CoinIconView.kt | 4 +- .../ui/extensions/FixAppBarLayoutBehavior.kt | 6 +-- .../ui/extensions/InputAddressView.kt | 4 +- .../ui/extensions/InputAmountView.kt | 4 +- .../bankwallet/ui/extensions/InputTextView.kt | 4 +- .../ui/extensions/NpaLinearLayoutManager.kt | 2 +- .../ui/extensions/NumPadItemsAdapter.kt | 11 +++-- .../extensions/RotatingCircleProgressView.kt | 4 +- .../bankwallet/ui/extensions/SeekbarView.kt | 4 +- .../ui/extensions/ShadowlessToolbarView.kt | 4 +- .../extensions/SmoothLinearLayoutManager.kt | 8 ++-- .../ui/view/ViewHolderProgressbar.kt | 3 +- .../bankwallet/viewHelpers/HudHelper.kt | 2 +- .../bankwallet/viewHelpers/LayoutHelper.kt | 4 +- .../res/layout/activity_about_settings.xml | 12 ++--- .../main/res/layout/activity_add_wallet.xml | 4 +- .../main/res/layout/activity_backup_words.xml | 8 ++-- .../res/layout/activity_currency_switcher.xml | 6 +-- .../main/res/layout/activity_dashboard.xml | 4 +- .../res/layout/activity_explorer_switcher.xml | 16 +++---- .../layout/activity_full_transaction_info.xml | 6 +-- .../res/layout/activity_language_settings.xml | 6 +-- .../main/res/layout/activity_manage_coins.xml | 6 +-- app/src/main/res/layout/activity_pin.xml | 16 +++---- .../main/res/layout/activity_qr_scanner.xml | 6 +-- .../res/layout/activity_restore_wallet.xml | 14 +++--- .../res/layout/activity_settings_security.xml | 8 ++-- app/src/main/res/layout/activity_unlock.xml | 6 +-- .../main/res/layout/custom_tall_toolbar.xml | 8 ++-- app/src/main/res/layout/custom_toast_view.xml | 4 +- .../res/layout/custom_toast_view_no_text.xml | 4 +- .../layout/fingerprint_dialog_container.xml | 4 +- .../main/res/layout/fragment_alert_dialog.xml | 4 +- .../layout/fragment_backup_words_confirm.xml | 4 +- .../res/layout/fragment_backup_words_info.xml | 4 +- .../fragment_backup_words_show_words.xml | 6 +-- .../layout/fragment_bottom_confirmations.xml | 6 +-- .../res/layout/fragment_bottom_sheet_pay.xml | 18 ++++---- .../layout/fragment_bottom_sheet_receive.xml | 4 +- .../main/res/layout/fragment_confirmation.xml | 4 +- .../fragment_full_transaction_info_error.xml | 14 +++--- app/src/main/res/layout/fragment_settings.xml | 12 ++--- .../main/res/layout/fragment_transactions.xml | 18 ++++---- app/src/main/res/layout/fragment_wallet.xml | 16 +++---- .../layout/transaction_info_bottom_sheet.xml | 4 +- app/src/main/res/layout/view_address.xml | 4 +- .../main/res/layout/view_address_input.xml | 4 +- app/src/main/res/layout/view_amount_input.xml | 4 +- .../layout/view_button_with_progressbar.xml | 4 +- app/src/main/res/layout/view_coin_icon.xml | 10 ++-- app/src/main/res/layout/view_holder_coin.xml | 8 ++-- .../res/layout/view_holder_coin_disabled.xml | 4 +- .../res/layout/view_holder_coin_enabled.xml | 4 +- .../res/layout/view_holder_explorer_item.xml | 14 +++--- .../layout/view_holder_full_transaction.xml | 2 +- .../view_holder_item_with_checkmark.xml | 8 ++-- .../view_holder_manage_coins_divider.xml | 4 +- .../layout/view_holder_progressbar_item.xml | 4 +- .../res/layout/view_holder_transaction.xml | 4 +- .../main/res/layout/view_numpad_button.xml | 4 +- app/src/main/res/layout/view_pin_page.xml | 8 ++-- app/src/main/res/layout/view_seekbar.xml | 8 ++-- app/src/main/res/layout/view_setting_item.xml | 4 +- .../res/layout/view_shadowless_toolbar.xml | 4 +- app/src/main/res/layout/view_text_input.xml | 4 +- .../view_transaction_full_info_item.xml | 14 +++--- .../res/layout/view_transaction_info_item.xml | 4 +- .../layout/view_transaction_info_status.xml | 8 ++-- .../res/layout/view_transaction_status.xml | 8 ++-- .../transactions/TransactionsLoaderTest.kt | 2 +- gradle.properties | 2 + 152 files changed, 463 insertions(+), 472 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 16a8aff2bbd..8b09760b319 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { targetSdkVersion 28 versionCode computeVersionCode() versionName "0.4.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "localizations", buildProperties.get("localizations") @@ -72,47 +72,47 @@ android { } dependencies { - def lifecycle_version = "1.1.1" + def lifecycle_version = '2.1.0-alpha04' implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha04' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // ViewModel and LiveData - implementation "android.arch.lifecycle:extensions:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" // alternatively - just ViewModel - implementation "android.arch.lifecycle:viewmodel:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" // use -ktx for Kotlin // alternatively - just LiveData - implementation "android.arch.lifecycle:livedata:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version" // alternatively - Lifecycles only (no ViewModel or LiveData). // Support library depends on this lightweight import - implementation "android.arch.lifecycle:runtime:$lifecycle_version" - kapt "android.arch.lifecycle:compiler:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version" + kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version" // Room - def room_version = "1.1.1" - implementation "android.arch.persistence.room:runtime:$room_version" - implementation "android.arch.persistence.room:rxjava2:$room_version" - kapt "android.arch.persistence.room:compiler:$room_version" + def room_version = '2.1.0-alpha06' + implementation "androidx.room:room-runtime:$room_version" + implementation "androidx.room:room-rxjava2:$room_version" + kapt "androidx.room:room-compiler:$room_version" // alternately - if using Java8, use the following instead of compiler - implementation "android.arch.lifecycle:common-java8:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" // optional - ReactiveStreams support for LiveData - implementation "android.arch.lifecycle:reactivestreams:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version" - implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04' implementation 'com.aurelhubert:ahbottomnavigation:2.2.0' - implementation 'com.android.support:design:28.0.0' + implementation 'com.google.android.material:material:1.1.0-alpha05' implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' // Because RxAndroid releases are few and far between, it is recommended you also // explicitly depend on RxJava's latest version for bug fixes and new features. // (see https://github.com/ReactiveX/RxJava/releases for latest 2.x.x version) - implementation 'io.reactivex.rxjava2:rxjava:2.1.14' + implementation 'io.reactivex.rxjava2:rxjava:2.2.2' implementation 'com.squareup.retrofit2:retrofit:2.4.0' - implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' + implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' + implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' implementation 'com.google.code.gson:gson:2.8.5' api 'com.aurelhubert:ahbottomnavigation:2.2.0' @@ -132,12 +132,12 @@ dependencies { //FeeRate implementation 'com.github.horizontalsystems:blockchain-fee-rate-kit-android:7a94d70' - 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.2.0-alpha03' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha03' // optional - Test helpers for LiveData testImplementation 'junit:junit:4.12' - testImplementation "android.arch.core:core-testing:$lifecycle_version" + testImplementation "androidx.arch.core:core-testing:2.1.0-alpha01" testImplementation 'org.mockito:mockito-core' testImplementation 'com.nhaarman:mockito-kotlin-kt1.1:1.6.0' testImplementation 'org.powermock:powermock-api-mockito2:2.0.0-beta.5' diff --git a/app/src/androidTest/java/io/horizontalsystems/bankwallet/ExampleInstrumentedTest.kt b/app/src/androidTest/java/io/horizontalsystems/bankwallet/ExampleInstrumentedTest.kt index 270c39e90a2..7294351577a 100644 --- a/app/src/androidTest/java/io/horizontalsystems/bankwallet/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/io/horizontalsystems/bankwallet/ExampleInstrumentedTest.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.InstrumentationRegistry +import androidx.test.runner.AndroidJUnit4 import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/BaseActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/BaseActivity.kt index 93067fa71b8..4b95433587f 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/BaseActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/BaseActivity.kt @@ -12,13 +12,13 @@ import android.os.Bundle import android.os.Handler import android.security.keystore.KeyPermanentlyInvalidatedException import android.security.keystore.UserNotAuthenticatedException -import android.support.v7.app.AppCompatActivity import android.view.Gravity import android.view.ViewGroup import android.view.WindowManager import android.view.inputmethod.InputMethodManager import android.widget.FrameLayout import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.security.EncryptionManager import io.horizontalsystems.bankwallet.lib.AlertDialogFragment diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/LauncherActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/LauncherActivity.kt index 9fbdb803158..d6418621d40 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/LauncherActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/LauncherActivity.kt @@ -2,7 +2,7 @@ package io.horizontalsystems.bankwallet import android.os.Bundle import android.security.keystore.KeyPermanentlyInvalidatedException -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.security.EncryptionManager import io.horizontalsystems.bankwallet.modules.backup.BackupModule diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/SingleLiveEvent.kt b/app/src/main/java/io/horizontalsystems/bankwallet/SingleLiveEvent.kt index 58d8ff19a7b..7e9510b2a83 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/SingleLiveEvent.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/SingleLiveEvent.kt @@ -1,22 +1,12 @@ package io.horizontalsystems.bankwallet -import android.arch.lifecycle.LifecycleOwner -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.Observer +import androidx.lifecycle.MutableLiveData import java.util.concurrent.atomic.AtomicBoolean class SingleLiveEvent : MutableLiveData() { private val mPending = AtomicBoolean(false) - override fun observe(owner: LifecycleOwner, observer: Observer) { - super.observe(owner, Observer { t -> - if (mPending.compareAndSet(true, false)) { - observer.onChanged(t) - } - }) - } - override fun setValue(t: T?) { mPending.set(true) super.setValue(t) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt index 838c65fbcb5..afd58bd84ae 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.core -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat import android.text.SpannableString +import androidx.core.hardware.fingerprint.FingerprintManagerCompat import com.google.gson.JsonObject import io.horizontalsystems.bankwallet.core.managers.ServiceExchangeApi import io.horizontalsystems.bankwallet.entities.* diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/NumberFormatter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/NumberFormatter.kt index 9af1c9f8eac..82f136da860 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/NumberFormatter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/NumberFormatter.kt @@ -1,8 +1,8 @@ package io.horizontalsystems.bankwallet.core.managers -import android.support.v4.content.ContextCompat import android.text.SpannableString import android.text.style.ForegroundColorSpan +import androidx.core.content.ContextCompat import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.IAppNumberFormatter diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/SystemInfoManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/SystemInfoManager.kt index 5efd5032126..d08f9c0d335 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/SystemInfoManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/SystemInfoManager.kt @@ -2,7 +2,7 @@ package io.horizontalsystems.bankwallet.core.managers import android.app.KeyguardManager import android.content.Context -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.hardware.fingerprint.FingerprintManagerCompat import io.horizontalsystems.bankwallet.BuildConfig import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.ISystemInfoManager diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/security/EncryptionManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/security/EncryptionManager.kt index f9d95fa5430..1e8da4281ad 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/security/EncryptionManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/security/EncryptionManager.kt @@ -5,9 +5,9 @@ import android.app.KeyguardManager import android.content.Context import android.content.Intent import android.security.keystore.KeyPermanentlyInvalidatedException -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentActivity -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.hardware.fingerprint.FingerprintManagerCompat +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity import io.horizontalsystems.bankwallet.LauncherActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.App diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationDialogFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationDialogFragment.kt index d1f40f109a6..f24823d4f90 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationDialogFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationDialogFragment.kt @@ -25,15 +25,15 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.hardware.fingerprint.FingerprintManager import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat -import android.support.v4.widget.ImageViewCompat import android.view.* import android.view.animation.AnimationUtils import android.widget.Button import android.widget.FrameLayout import android.widget.ImageView import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.core.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.widget.ImageViewCompat import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.viewHelpers.HudHelper diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationHandler.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationHandler.kt index e5dc7bfda74..63a0151dcc7 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationHandler.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/security/FingerprintAuthenticationHandler.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.core.security -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat -import android.support.v4.os.CancellationSignal +import androidx.core.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.os.CancellationSignal import io.horizontalsystems.bankwallet.core.App diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/AppDatabase.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/AppDatabase.kt index 36332265ad5..f41340f1ec4 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/AppDatabase.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/AppDatabase.kt @@ -1,13 +1,13 @@ package io.horizontalsystems.bankwallet.core.storage -import android.arch.persistence.db.SupportSQLiteDatabase -import android.arch.persistence.room.Database -import android.arch.persistence.room.Room -import android.arch.persistence.room.RoomDatabase -import android.arch.persistence.room.migration.Migration import android.content.ContentValues import android.content.Context import android.database.sqlite.SQLiteDatabase +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase import io.horizontalsystems.bankwallet.BuildConfig import io.horizontalsystems.bankwallet.entities.Rate import io.horizontalsystems.bankwallet.entities.StorableCoin diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/CoinTypeConverter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/CoinTypeConverter.kt index d0cbe1d250e..a2d0d78190e 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/CoinTypeConverter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/CoinTypeConverter.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.core.storage -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import io.horizontalsystems.bankwallet.core.Error import io.horizontalsystems.bankwallet.entities.CoinType diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/DatabaseConverters.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/DatabaseConverters.kt index b3d912e0990..d3dc0ba48f3 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/DatabaseConverters.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/DatabaseConverters.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.core.storage -import android.arch.persistence.room.TypeConverter +import androidx.room.TypeConverter import java.math.BigDecimal class DatabaseConverters { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/RatesDao.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/RatesDao.kt index 4852f755588..3ef3b70e425 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/RatesDao.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/RatesDao.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.core.storage -import android.arch.persistence.room.* +import androidx.room.* import io.horizontalsystems.bankwallet.entities.Rate import io.horizontalsystems.bankwallet.modules.transactions.CoinCode import io.reactivex.Flowable diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/StorableCoinsDao.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/StorableCoinsDao.kt index 2ad927a67e8..be017baa710 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/StorableCoinsDao.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/storage/StorableCoinsDao.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.core.storage -import android.arch.persistence.room.* +import androidx.room.* import io.horizontalsystems.bankwallet.entities.Coin import io.horizontalsystems.bankwallet.entities.StorableCoin import io.reactivex.Flowable diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/entities/Coin.kt b/app/src/main/java/io/horizontalsystems/bankwallet/entities/Coin.kt index de4318163ab..1eb4dd25bed 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/entities/Coin.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/entities/Coin.kt @@ -1,8 +1,8 @@ package io.horizontalsystems.bankwallet.entities -import android.arch.persistence.room.Entity -import android.arch.persistence.room.PrimaryKey -import android.arch.persistence.room.TypeConverters +import androidx.room.Entity +import androidx.room.PrimaryKey +import androidx.room.TypeConverters import io.horizontalsystems.bankwallet.core.storage.CoinTypeConverter import java.io.Serializable diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/entities/Rate.kt b/app/src/main/java/io/horizontalsystems/bankwallet/entities/Rate.kt index b1bb44ff975..258f9094230 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/entities/Rate.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/entities/Rate.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.entities -import android.arch.persistence.room.Entity -import android.arch.persistence.room.TypeConverters +import androidx.room.Entity +import androidx.room.TypeConverters import io.horizontalsystems.bankwallet.core.storage.DatabaseConverters import java.math.BigDecimal import java.util.* diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/lib/AlertDialogFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/lib/AlertDialogFragment.kt index 55c8f3364f8..d2c2d49b210 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/lib/AlertDialogFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/lib/AlertDialogFragment.kt @@ -2,11 +2,11 @@ package io.horizontalsystems.bankwallet.lib import android.app.Dialog import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v7.app.AlertDialog import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment import io.horizontalsystems.bankwallet.R class AlertDialogFragment : DialogFragment() { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/lib/InputTextViewHolder.kt b/app/src/main/java/io/horizontalsystems/bankwallet/lib/InputTextViewHolder.kt index c4bf5bc8530..eaa62defcac 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/lib/InputTextViewHolder.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/lib/InputTextViewHolder.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.lib -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.ui.extensions.InputTextView class InputTextViewHolder(private val inputTextView: InputTextView, listener: WordsChangedListener) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsAdapter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsAdapter.kt index a36d1c659a4..ba557c1bcb7 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsAdapter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsAdapter.kt @@ -1,9 +1,9 @@ package io.horizontalsystems.bankwallet.lib -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.R class WordsAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsInputAdapter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsInputAdapter.kt index df021124972..060d6cb4ea9 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsInputAdapter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/lib/WordsInputAdapter.kt @@ -1,8 +1,8 @@ package io.horizontalsystems.bankwallet.lib -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.ui.extensions.InputTextView diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupActivity.kt index 96227e67ba3..c019231e004 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupActivity.kt @@ -1,10 +1,10 @@ package io.horizontalsystems.bankwallet.modules.backup -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.setOnSingleClickListener diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupConfirmFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupConfirmFragment.kt index 4ad987eada6..3f529fce499 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupConfirmFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupConfirmFragment.kt @@ -1,12 +1,12 @@ package io.horizontalsystems.bankwallet.modules.backup -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v4.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.ui.extensions.InputTextView import io.horizontalsystems.bankwallet.viewHelpers.HudHelper diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupInfoFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupInfoFragment.kt index c3b8862e643..0735c463a77 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupInfoFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupInfoFragment.kt @@ -1,10 +1,10 @@ package io.horizontalsystems.bankwallet.modules.backup import android.os.Bundle -import android.support.v4.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.Fragment import io.horizontalsystems.bankwallet.R class BackupInfoFragment : Fragment() { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupViewModel.kt index 427ef9cb17c..e9c8c1140e4 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.backup -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.core.IKeyStoreSafeExecute diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupWordsFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupWordsFragment.kt index 45efcdd1159..ba662d2a313 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupWordsFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/backup/BackupWordsFragment.kt @@ -1,13 +1,13 @@ package io.horizontalsystems.bankwallet.modules.backup -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.lib.WordsAdapter import kotlinx.android.synthetic.main.fragment_backup_words_show_words.* diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceFragment.kt index dcd7b702e9e..e50e40b2ca3 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceFragment.kt @@ -1,14 +1,15 @@ package io.horizontalsystems.bankwallet.modules.balance -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.SimpleItemAnimator import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.SimpleItemAnimator import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.AdapterState import io.horizontalsystems.bankwallet.core.App @@ -26,7 +27,7 @@ import kotlinx.android.synthetic.main.view_holder_add_coin.* import kotlinx.android.synthetic.main.view_holder_coin.* import java.math.BigDecimal -class BalanceFragment : android.support.v4.app.Fragment(), CoinsAdapter.Listener { +class BalanceFragment : Fragment(), CoinsAdapter.Listener { private lateinit var viewModel: BalanceViewModel private var coinsAdapter = CoinsAdapter(this) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt index f8390079ecb..91381d97a30 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.balance -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent class BalanceViewModel : ViewModel(), BalanceModule.IView, BalanceModule.IRouter { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoActivity.kt index 5fe0ea61115..d81f2fe4876 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoActivity.kt @@ -1,18 +1,18 @@ package io.horizontalsystems.bankwallet.modules.fulltransactioninfo -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.text.SpannableString import android.text.style.UnderlineSpan import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.entities.Coin diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoErrorFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoErrorFragment.kt index eee79a667d1..0e937bd865b 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoErrorFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoErrorFragment.kt @@ -2,12 +2,12 @@ package io.horizontalsystems.bankwallet.modules.fulltransactioninfo import android.content.Context import android.os.Bundle -import android.support.v4.app.Fragment import android.text.SpannableString import android.text.style.UnderlineSpan import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.Fragment import io.horizontalsystems.bankwallet.R import kotlinx.android.synthetic.main.fragment_full_transaction_info_error.* diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoItemView.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoItemView.kt index 28edd77eb89..cb2489d82ad 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoItemView.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoItemView.kt @@ -1,10 +1,10 @@ package io.horizontalsystems.bankwallet.modules.fulltransactioninfo import android.content.Context -import android.support.constraint.ConstraintLayout -import android.support.v4.content.ContextCompat import android.util.AttributeSet import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.entities.FullTransactionIcon @@ -13,7 +13,7 @@ import kotlinx.android.synthetic.main.view_transaction_full_info_item.view.* class FullTransactionInfoItemView : ConstraintLayout { init { - ConstraintLayout.inflate(context, R.layout.view_transaction_full_info_item, this) + inflate(context, R.layout.view_transaction_full_info_item, this) } private var attrTitle: String? = null diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoModule.kt index 46acb5f62ab..b4d7ff32931 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoModule.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoModule.kt @@ -1,13 +1,11 @@ package io.horizontalsystems.bankwallet.modules.fulltransactioninfo -import android.support.v4.app.FragmentActivity import com.google.gson.JsonObject import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.entities.Coin import io.horizontalsystems.bankwallet.entities.FullTransactionItem import io.horizontalsystems.bankwallet.entities.FullTransactionRecord import io.horizontalsystems.bankwallet.entities.FullTransactionSection -import io.horizontalsystems.bankwallet.modules.transactions.CoinCode import io.horizontalsystems.bankwallet.viewHelpers.TextHelper import io.reactivex.Flowable @@ -115,7 +113,7 @@ object FullTransactionInfoModule { interactor.delegate = presenter } - fun start(activity: FragmentActivity, transactionHash: String, coin: Coin) { + fun start(activity: androidx.fragment.app.FragmentActivity, transactionHash: String, coin: Coin) { FullTransactionInfoActivity.start(activity, transactionHash, coin) } } diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoViewModel.kt index 491ef96f0cc..eca7db51fd3 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/FullTransactionInfoViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.fulltransactioninfo -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.entities.Coin diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsActivity.kt index 1ed7ec54c95..ade39c9cab8 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsActivity.kt @@ -1,14 +1,14 @@ package io.horizontalsystems.bankwallet.modules.fulltransactioninfo.dataprovider -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Context import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.setOnSingleClickListener diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsViewModel.kt index 2c3102941a1..e5c2db993bf 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/fulltransactioninfo/dataprovider/DataProviderSettingsViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.fulltransactioninfo.dataprovider -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.entities.Coin diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestActivity.kt index 33ec2850e0a..1d795b71b24 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestActivity.kt @@ -1,8 +1,8 @@ package io.horizontalsystems.bankwallet.modules.guest -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.setOnSingleClickListener diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestViewModel.kt index 8264c1686e3..0c40474be9e 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/guest/GuestViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.guest -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.core.IKeyStoreSafeExecute diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainActivity.kt index de07ca33d22..b581496527a 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainActivity.kt @@ -1,8 +1,8 @@ package io.horizontalsystems.bankwallet.modules.main import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v4.view.ViewPager +import androidx.core.content.ContextCompat +import androidx.viewpager.widget.ViewPager import com.aurelhubert.ahbottomnavigation.AHBottomNavigation import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem import io.horizontalsystems.bankwallet.BaseActivity diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainTabsAdapter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainTabsAdapter.kt index ddf2c24c3c9..62af2027888 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainTabsAdapter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainTabsAdapter.kt @@ -1,13 +1,13 @@ package io.horizontalsystems.bankwallet.modules.main -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentPagerAdapter import android.util.SparseArray import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter +import io.horizontalsystems.bankwallet.modules.balance.BalanceFragment import io.horizontalsystems.bankwallet.modules.settings.main.MainSettingsFragment import io.horizontalsystems.bankwallet.modules.transactions.TransactionsFragment -import io.horizontalsystems.bankwallet.modules.balance.BalanceFragment class MainTabsAdapter(fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsActivity.kt index 0044d4cc703..f49a306cfad 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsActivity.kt @@ -1,15 +1,15 @@ package io.horizontalsystems.bankwallet.modules.managecoins -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.helper.ItemTouchHelper import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import android.view.ViewGroup +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.ItemTouchHelper +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.setOnSingleClickListener diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsViewModel.kt index d9bcfa722c2..bbb96e34778 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/managecoins/ManageCoinsViewModel.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.managecoins -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent class ManageCoinsViewModel : ViewModel(), ManageCoinsModule.IView, ManageCoinsModule.IRouter { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinActivity.kt index c7a0d8ec9ff..f7d5baf151e 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinActivity.kt @@ -1,23 +1,23 @@ package io.horizontalsystems.bankwallet.modules.pin -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Handler -import android.support.constraint.ConstraintLayout -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.PagerSnapHelper -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.animation.AnimationUtils import android.widget.ImageView import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.hardware.fingerprint.FingerprintManagerCompat +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.PagerSnapHelper +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.App diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinModule.kt index 9e6572036ed..b62799b3c86 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinModule.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinModule.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.pin import android.content.Context -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.hardware.fingerprint.FingerprintManagerCompat import java.util.* object PinModule { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinViewModel.kt index 68a5ace1842..91773645d3b 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinViewModel.kt @@ -1,8 +1,8 @@ package io.horizontalsystems.bankwallet.modules.pin -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.hardware.fingerprint.FingerprintManagerCompat +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.core.IKeyStoreSafeExecute import io.horizontalsystems.bankwallet.modules.pin.edit.EditPinModule diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinModule.kt index a121acec932..d21cdd453cb 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinModule.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinModule.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.pin.unlock -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.hardware.fingerprint.FingerprintManagerCompat import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.IKeyStoreSafeExecute import io.horizontalsystems.bankwallet.core.factories.LockoutUntilDateFactory diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinPresenter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinPresenter.kt index 2a65e9de809..b73daebf2e6 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinPresenter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/unlock/UnlockPinPresenter.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.pin.unlock -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat +import androidx.core.hardware.fingerprint.FingerprintManagerCompat import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.entities.LockoutState import io.horizontalsystems.bankwallet.modules.pin.PinModule diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveFragment.kt index 220eee21490..7ac0e5ba8b2 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveFragment.kt @@ -1,15 +1,15 @@ package io.horizontalsystems.bankwallet.modules.receive import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.content.DialogInterface import android.os.Bundle -import android.support.design.widget.BottomSheetBehavior -import android.support.design.widget.BottomSheetDialog -import android.support.design.widget.BottomSheetDialogFragment -import android.support.v4.app.FragmentActivity -import android.support.v4.app.ShareCompat +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.bottomsheet.BottomSheetDialog +import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import androidx.fragment.app.FragmentActivity +import androidx.core.app.ShareCompat import android.view.Gravity import android.view.View import android.view.WindowManager @@ -84,7 +84,7 @@ class ReceiveFragment : BottomSheetDialogFragment() { mDialog?.setOnShowListener(object : DialogInterface.OnShowListener { override fun onShow(dialog: DialogInterface?) { - val bottomSheet = mDialog?.findViewById(android.support.design.R.id.design_bottom_sheet) + val bottomSheet = mDialog?.findViewById(R.id.design_bottom_sheet) BottomSheetBehavior.from(bottomSheet).state = BottomSheetBehavior.STATE_EXPANDED BottomSheetBehavior.from(bottomSheet).isFitToContents = true } diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt index 27aab5a5547..9dfddbdbcaa 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.receive -import android.support.v4.app.FragmentActivity +import androidx.fragment.app.FragmentActivity import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.modules.receive.viewitems.AddressItem import io.horizontalsystems.bankwallet.modules.transactions.CoinCode diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveViewModel.kt index 95bc21e5f19..0b11bbc4b9c 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.receive -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.modules.receive.viewitems.AddressItem import io.horizontalsystems.bankwallet.modules.transactions.CoinCode diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreViewModel.kt index 0100ebbf241..0ae96aea92e 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.restore -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.core.IKeyStoreSafeExecute diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreWalletActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreWalletActivity.kt index 07328f2a47d..7afd7f0c194 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreWalletActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/restore/RestoreWalletActivity.kt @@ -1,9 +1,9 @@ package io.horizontalsystems.bankwallet.modules.restore -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.widget.GridLayoutManager +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.GridLayoutManager import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.utils.Utils diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ConfirmationFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ConfirmationFragment.kt index 97e7e22f6bd..0a6915e9a58 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ConfirmationFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ConfirmationFragment.kt @@ -1,14 +1,14 @@ package io.horizontalsystems.bankwallet.modules.send -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v4.app.FragmentActivity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.FragmentActivity +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.ui.extensions.AddressView import io.horizontalsystems.bankwallet.ui.extensions.ButtonWithProgressbarView @@ -24,7 +24,7 @@ class ConfirmationFragment : DialogFragment() { activity?.let { viewModel = ViewModelProviders.of(it).get(SendViewModel::class.java) } - setStyle(DialogFragment.STYLE_NO_TITLE, R.style.AlertDialog) + setStyle(STYLE_NO_TITLE, R.style.AlertDialog) } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/QRScannerActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/QRScannerActivity.kt index 7175af106cc..7120109f2ce 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/QRScannerActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/QRScannerActivity.kt @@ -1,11 +1,11 @@ package io.horizontalsystems.bankwallet.modules.send import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.KeyEvent -import io.horizontalsystems.bankwallet.R +import androidx.appcompat.app.AppCompatActivity import com.journeyapps.barcodescanner.CaptureManager import com.journeyapps.barcodescanner.DecoratedBarcodeView +import io.horizontalsystems.bankwallet.R import kotlinx.android.synthetic.main.activity_qr_scanner.* class QRScannerActivity : AppCompatActivity() { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendBottomSheetFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendBottomSheetFragment.kt index ac971be1ad0..ae08e57cc3a 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendBottomSheetFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendBottomSheetFragment.kt @@ -2,18 +2,9 @@ package io.horizontalsystems.bankwallet.modules.send import android.annotation.SuppressLint import android.app.Dialog -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.DialogInterface import android.content.Intent import android.os.Bundle -import android.support.constraint.ConstraintLayout -import android.support.design.widget.BottomSheetBehavior -import android.support.design.widget.BottomSheetDialog -import android.support.design.widget.BottomSheetDialogFragment -import android.support.v4.app.FragmentActivity -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView import android.text.Editable import android.text.TextUtils import android.text.TextWatcher @@ -25,6 +16,14 @@ import android.view.inputmethod.InputConnection import android.widget.Button import android.widget.EditText import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.bottomsheet.BottomSheetDialog +import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.zxing.integration.android.IntentIntegrator import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.App @@ -74,7 +73,7 @@ class SendBottomSheetFragment : BottomSheetDialogFragment(), NumPadItemsAdapter. mDialog?.setOnShowListener(object : DialogInterface.OnShowListener { override fun onShow(dialog: DialogInterface?) { - val bottomSheet = mDialog.findViewById(android.support.design.R.id.design_bottom_sheet) + val bottomSheet = mDialog.findViewById(R.id.design_bottom_sheet) BottomSheetBehavior.from(bottomSheet).state = BottomSheetBehavior.STATE_EXPANDED BottomSheetBehavior.from(bottomSheet).isFitToContents = true } @@ -337,7 +336,7 @@ class SendBottomSheetFragment : BottomSheetDialogFragment(), NumPadItemsAdapter. } companion object { - fun show(activity: FragmentActivity, coin: String) { + fun show(activity: androidx.fragment.app.FragmentActivity, coin: String) { val fragment = SendBottomSheetFragment() fragment.coin = coin fragment.show(activity.supportFragmentManager, "pay_fragment") diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendModule.kt index bf422efa289..28b7dcae106 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendModule.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendModule.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.send -import android.support.v4.app.FragmentActivity +import androidx.fragment.app.FragmentActivity import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.FeeRatePriority import io.horizontalsystems.bankwallet.entities.Coin diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendViewModel.kt index 29e2b2d9a5f..206ca7217b7 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.send -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.entities.Coin diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/SettingsItemView.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/SettingsItemView.kt index d374e1dd488..6ffa18f468c 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/SettingsItemView.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/SettingsItemView.kt @@ -2,19 +2,19 @@ package io.horizontalsystems.bankwallet.modules.settings import android.content.Context import android.graphics.drawable.Drawable -import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.view.View import android.widget.CompoundButton import android.widget.ImageView import android.widget.Switch import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout import io.horizontalsystems.bankwallet.R class SettingsItemView : ConstraintLayout { init { - ConstraintLayout.inflate(context, R.layout.view_setting_item, this) + inflate(context, R.layout.view_setting_item, this) } private var attrTitle: String? = null diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsActivity.kt index 956026473bc..f59d6167a61 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsActivity.kt @@ -1,13 +1,13 @@ package io.horizontalsystems.bankwallet.modules.settings.basecurrency -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.setOnSingleClickListener diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsViewModel.kt index 6c3a885cb4f..35c17a528ba 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/basecurrency/BaseCurrencySettingsViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.settings.basecurrency -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent class BaseCurrencySettingsViewModel: ViewModel(), BaseCurrencySettingsModule.IBaseCurrencySettingsView { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsActivity.kt index 43012955a74..f8e8fd44bc1 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsActivity.kt @@ -1,13 +1,13 @@ package io.horizontalsystems.bankwallet.modules.settings.language -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.setOnSingleClickListener diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsViewModel.kt index e68e7b1f576..4567d5766ab 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/language/LanguageSettingsViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.settings.language -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent class LanguageSettingsViewModel: ViewModel(), LanguageSettingsModule.ILanguageSettingsView, LanguageSettingsModule.ILanguageSettingsRouter { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsFragment.kt index 67f287bb6c2..4bf4f6e3dd1 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsFragment.kt @@ -1,7 +1,5 @@ package io.horizontalsystems.bankwallet.modules.settings.main -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Intent import android.net.Uri import android.os.Bundle @@ -9,6 +7,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.CompoundButton +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import io.horizontalsystems.bankwallet.BuildConfig import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.modules.main.MainActivity @@ -20,7 +21,7 @@ import io.horizontalsystems.bankwallet.modules.settings.security.SecuritySetting import io.horizontalsystems.bankwallet.viewHelpers.LayoutHelper import kotlinx.android.synthetic.main.fragment_settings.* -class MainSettingsFragment : android.support.v4.app.Fragment() { +class MainSettingsFragment : Fragment() { private lateinit var viewModel: MainSettingsViewModel override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsViewModel.kt index 0fa4b2937cf..6ec416cf805 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.settings.main -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent class MainSettingsViewModel : ViewModel(), MainSettingsModule.IMainSettingsView, MainSettingsModule.IMainSettingsRouter { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsActivity.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsActivity.kt index 67061c0dbf9..5e56730f0cd 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsActivity.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsActivity.kt @@ -1,11 +1,11 @@ package io.horizontalsystems.bankwallet.modules.settings.security -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.content.Intent import android.os.Bundle import android.view.View import android.widget.CompoundButton +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import io.horizontalsystems.bankwallet.BaseActivity import io.horizontalsystems.bankwallet.LauncherActivity import io.horizontalsystems.bankwallet.R diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsViewModel.kt index 105b2e7800a..6709dc3c57f 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/SecuritySettingsViewModel.kt @@ -1,7 +1,7 @@ package io.horizontalsystems.bankwallet.modules.settings.security -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel import io.horizontalsystems.bankwallet.SingleLiveEvent import io.horizontalsystems.bankwallet.entities.BiometryType diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionDiffCallback.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionDiffCallback.kt index ba878789204..ee6a036f395 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionDiffCallback.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionDiffCallback.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.transactions -import android.support.v7.util.DiffUtil +import androidx.recyclerview.widget.DiffUtil import io.horizontalsystems.bankwallet.entities.TransactionItem class TransactionDiffCallback(private val oldTxList: List, private val newTxList: List) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionItemDataSource.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionItemDataSource.kt index 2aa776507a6..6af5e7be807 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionItemDataSource.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionItemDataSource.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.transactions -import android.support.v7.util.DiffUtil +import androidx.recyclerview.widget.DiffUtil import io.horizontalsystems.bankwallet.entities.Coin import io.horizontalsystems.bankwallet.entities.TransactionItem import io.horizontalsystems.bankwallet.entities.TransactionRecord diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionRecordDataSource.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionRecordDataSource.kt index 6f13c92bb9d..b7e3798cbc3 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionRecordDataSource.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionRecordDataSource.kt @@ -1,6 +1,6 @@ package io.horizontalsystems.bankwallet.modules.transactions -import android.support.v7.util.DiffUtil +import androidx.recyclerview.widget.DiffUtil import io.horizontalsystems.bankwallet.entities.Coin import io.horizontalsystems.bankwallet.entities.TransactionItem import io.horizontalsystems.bankwallet.entities.TransactionRecord diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionStatusWithTimeView.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionStatusWithTimeView.kt index 8d55e4d9f5d..e45a18d4208 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionStatusWithTimeView.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionStatusWithTimeView.kt @@ -1,9 +1,9 @@ package io.horizontalsystems.bankwallet.modules.transactions import android.content.Context -import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout import io.horizontalsystems.bankwallet.R import kotlinx.android.synthetic.main.view_transaction_status.view.* diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFragment.kt index c85cacd75c6..7e4d9b45918 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFragment.kt @@ -1,17 +1,18 @@ package io.horizontalsystems.bankwallet.modules.transactions -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.annotation.NonNull -import android.support.design.widget.BottomSheetBehavior -import android.support.design.widget.BottomSheetBehavior.STATE_EXPANDED -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.annotation.NonNull +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView.* +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.setOnSingleClickListener @@ -28,7 +29,7 @@ import kotlinx.android.synthetic.main.transaction_info_bottom_sheet.* import kotlinx.android.synthetic.main.view_holder_filter.* import kotlinx.android.synthetic.main.view_holder_transaction.* -class TransactionsFragment : android.support.v4.app.Fragment(), TransactionsAdapter.Listener, FilterAdapter.Listener { +class TransactionsFragment : Fragment(), TransactionsAdapter.Listener, FilterAdapter.Listener { private lateinit var viewModel: TransactionsViewModel private lateinit var transInfoViewModel: TransactionInfoViewModel @@ -52,7 +53,7 @@ class TransactionsFragment : android.support.v4.app.Fragment(), TransactionsAdap recyclerTransactions.setHasFixedSize(true) recyclerTransactions.adapter = transactionsAdapter recyclerTransactions.layoutManager = NpaLinearLayoutManager(context) - recyclerTransactions.addOnScrollListener(object : RecyclerView.OnScrollListener() { + recyclerTransactions.addOnScrollListener(object : OnScrollListener() { override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { filterAdapter.filterChangeable = newState == SCROLL_STATE_IDLE } @@ -230,7 +231,7 @@ class TransactionsFragment : android.support.v4.app.Fragment(), TransactionsAdap } -class TransactionsAdapter(private var listener: Listener) : RecyclerView.Adapter(), ViewHolderTransaction.ClickListener { +class TransactionsAdapter(private var listener: Listener) : Adapter(), ViewHolderTransaction.ClickListener { interface Listener { fun onItemClick(item: TransactionViewItem) @@ -242,10 +243,10 @@ class TransactionsAdapter(private var listener: Listener) : RecyclerView.Adapter return viewModel.delegate.itemsCount } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolderTransaction(LayoutInflater.from(parent.context).inflate(R.layout.view_holder_transaction, parent, false), this) - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: ViewHolder, position: Int) { if (position > itemCount - 9) { viewModel.delegate.onBottomReached() } @@ -262,7 +263,7 @@ class TransactionsAdapter(private var listener: Listener) : RecyclerView.Adapter } } -class ViewHolderTransaction(override val containerView: View, private val l: ClickListener) : RecyclerView.ViewHolder(containerView), LayoutContainer { +class ViewHolderTransaction(override val containerView: View, private val l: ClickListener) : ViewHolder(containerView), LayoutContainer { interface ClickListener { fun onClick(position: Int) @@ -284,7 +285,7 @@ class ViewHolderTransaction(override val containerView: View, private val l: Cli } } -class FilterAdapter(private var listener: Listener) : RecyclerView.Adapter(), ViewHolderFilter.ClickListener { +class FilterAdapter(private var listener: Listener) : Adapter(), ViewHolderFilter.ClickListener { interface Listener { fun onFilterItemClick(item: Coin?) @@ -303,10 +304,10 @@ class FilterAdapter(private var listener: Listener) : RecyclerView.Adapter holder.bind(filters[position], selectedFilterId == filters[position]) } @@ -321,7 +322,7 @@ class FilterAdapter(private var listener: Listener) : RecyclerView.Adapter() { +class NumPadItemsAdapter(private val listener: Listener, bottomLeftButtonType: NumPadItemType, private val showLetters: Boolean = true) : Adapter() { interface Listener { fun onItemClick(item: NumPadItem) @@ -30,7 +31,7 @@ class NumPadItemsAdapter(private val listener: Listener, bottomLeftButtonType: N NumPadItem(NumPadItemType.DELETE, 0, "Bottom Right") ) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { return NumPadItemViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.view_numpad_button, parent, false)) } @@ -42,7 +43,7 @@ class NumPadItemsAdapter(private val listener: Listener, bottomLeftButtonType: N notifyDataSetChanged() } - override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: ViewHolder, position: Int) { if (holder is NumPadItemViewHolder) { holder.bind(numPadItems[position], showFingerPrintButton, showLetters) { listener.onItemClick(numPadItems[position]) } } @@ -57,7 +58,7 @@ enum class NumPadItemType { NUMBER, DELETE, FINGER, DOT } -class NumPadItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { +class NumPadItemViewHolder(itemView: View) : ViewHolder(itemView) { private var txtNumber: TextView = itemView.findViewById(R.id.txtNumPadNumber) private var txtLetters: TextView = itemView.findViewById(R.id.txtNumPadText) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/RotatingCircleProgressView.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/RotatingCircleProgressView.kt index e8c8d5567e8..6038d251600 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/RotatingCircleProgressView.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/RotatingCircleProgressView.kt @@ -4,11 +4,11 @@ import android.content.Context import android.graphics.Canvas import android.graphics.Paint import android.graphics.RectF -import android.support.annotation.ColorInt -import android.support.v4.content.ContextCompat import android.util.AttributeSet import android.view.View import android.view.animation.DecelerateInterpolator +import androidx.annotation.ColorInt +import androidx.core.content.ContextCompat import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.viewHelpers.LayoutHelper diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SeekbarView.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SeekbarView.kt index 74a20c7e55e..5e2f4faf570 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SeekbarView.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SeekbarView.kt @@ -1,16 +1,16 @@ package io.horizontalsystems.bankwallet.ui.extensions import android.content.Context -import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.widget.SeekBar +import androidx.constraintlayout.widget.ConstraintLayout import io.horizontalsystems.bankwallet.R import kotlinx.android.synthetic.main.view_seekbar.view.* class SeekbarView : ConstraintLayout { init { - ConstraintLayout.inflate(context, R.layout.view_seekbar, this) + inflate(context, R.layout.view_seekbar, this) } constructor(context: Context) : super(context) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/ShadowlessToolbarView.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/ShadowlessToolbarView.kt index 7e4f2487224..574a097eca4 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/ShadowlessToolbarView.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/ShadowlessToolbarView.kt @@ -1,16 +1,16 @@ package io.horizontalsystems.bankwallet.ui.extensions import android.content.Context -import android.support.constraint.ConstraintLayout import android.util.AttributeSet import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout import io.horizontalsystems.bankwallet.R import kotlinx.android.synthetic.main.view_shadowless_toolbar.view.* class ShadowlessToolbarView : ConstraintLayout { init { - ConstraintLayout.inflate(context, R.layout.view_shadowless_toolbar, this) + inflate(context, R.layout.view_shadowless_toolbar, this) } constructor(context: Context) : super(context) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SmoothLinearLayoutManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SmoothLinearLayoutManager.kt index e0acf72da39..778db21316e 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SmoothLinearLayoutManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/ui/extensions/SmoothLinearLayoutManager.kt @@ -2,16 +2,16 @@ package io.horizontalsystems.bankwallet.ui.extensions import android.content.Context import android.graphics.PointF -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.LinearSmoothScroller -import android.support.v7.widget.RecyclerView import android.util.DisplayMetrics +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.LinearSmoothScroller +import androidx.recyclerview.widget.RecyclerView class SmoothLinearLayoutManager : LinearLayoutManager { private val millisecondsPreInch = 45f //default is 25f (bigger = slower) - constructor(context: Context) : super(context, LinearLayoutManager.VERTICAL, false) + constructor(context: Context) : super(context, RecyclerView.VERTICAL, false) constructor(context: Context, orientation: Int, reverseLayout: Boolean) : super(context, orientation, reverseLayout) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/ui/view/ViewHolderProgressbar.kt b/app/src/main/java/io/horizontalsystems/bankwallet/ui/view/ViewHolderProgressbar.kt index 79ee39cde1c..5a49b1c3a7d 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/ui/view/ViewHolderProgressbar.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/ui/view/ViewHolderProgressbar.kt @@ -1,8 +1,7 @@ package io.horizontalsystems.bankwallet.ui.view -import android.support.v7.widget.RecyclerView import android.view.View - +import androidx.recyclerview.widget.RecyclerView import io.horizontalsystems.bankwallet.R diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/HudHelper.kt b/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/HudHelper.kt index 9067cb1e58b..eec03961e05 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/HudHelper.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/HudHelper.kt @@ -1,10 +1,10 @@ package io.horizontalsystems.bankwallet.viewHelpers import android.graphics.PorterDuff -import android.support.v4.content.ContextCompat import android.view.Gravity import android.widget.TextView import android.widget.Toast +import androidx.core.content.ContextCompat import io.horizontalsystems.bankwallet.R import io.horizontalsystems.bankwallet.core.App diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/LayoutHelper.kt b/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/LayoutHelper.kt index aadb2fe81dc..a871377b551 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/LayoutHelper.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/viewHelpers/LayoutHelper.kt @@ -4,10 +4,10 @@ import android.content.Context import android.content.res.Resources import android.graphics.PorterDuff import android.graphics.drawable.Drawable -import android.support.v4.content.ContextCompat -import android.support.v4.graphics.drawable.DrawableCompat import android.util.TypedValue import android.view.Menu +import androidx.core.content.ContextCompat +import androidx.core.graphics.drawable.DrawableCompat import io.horizontalsystems.bankwallet.R object LayoutHelper { diff --git a/app/src/main/res/layout/activity_about_settings.xml b/app/src/main/res/layout/activity_about_settings.xml index fb277a062bc..ac1160f008e 100644 --- a/app/src/main/res/layout/activity_about_settings.xml +++ b/app/src/main/res/layout/activity_about_settings.xml @@ -1,5 +1,5 @@ - - - - + - + - + diff --git a/app/src/main/res/layout/activity_add_wallet.xml b/app/src/main/res/layout/activity_add_wallet.xml index 75ba0d8d55f..1fa767f7c7d 100644 --- a/app/src/main/res/layout/activity_add_wallet.xml +++ b/app/src/main/res/layout/activity_add_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_backup_words.xml b/app/src/main/res/layout/activity_backup_words.xml index e478bdecf60..553d89bc16f 100644 --- a/app/src/main/res/layout/activity_backup_words.xml +++ b/app/src/main/res/layout/activity_backup_words.xml @@ -1,11 +1,11 @@ - - - +