Migrate to AndroidX (#811)

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'

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

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

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

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<T> : MutableLiveData<T>() {
 
     private val mPending = AtomicBoolean(false)
 
-    override fun observe(owner: LifecycleOwner, observer: Observer<T>) {
-        super.observe(owner, Observer<T> { t ->
-            if (mPending.compareAndSet(true, false)) {
-                observer.onChanged(t)
-            }
-        })
-    }
-
     override fun setValue(t: T?) {
         mPending.set(true)
         super.setValue(t)

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.*

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

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

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

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
 

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
 
 

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

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
 

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 {

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

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

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
 

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.*

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() {

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)

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<RecyclerView.ViewHolder>() {

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
 

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

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

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() {

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