#15: Migrate to AndroidX (haven't run any unittests)

Entreco · Nov 24, 2018 · 5f7e103 · 5f7e103
1 parent c770a56
commit 5f7e103
Show file tree

Hide file tree

Showing 185 changed files with 470 additions and 470 deletions.
diff --git a/android/DartsScorecard/app/build.gradle b/android/DartsScorecard/app/build.gradle
@@ -45,21 +45,20 @@ dependencies {
 
     // Annotation Processing
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
-    kapt "android.arch.persistence.room:compiler:$room"
+    kapt 'androidx.room:room-compiler:2.1.0-alpha02'
 
     // Implementation
     implementation "com.google.dagger:dagger:$daggerVersion"
-    implementation "com.android.support:design:$support"
-    implementation "com.android.support:appcompat-v7:$support"
-    implementation "com.android.support:leanback-v17:$support"
-    implementation "com.android.support.constraint:constraint-layout:$constraint"
+    implementation "com.google.android.material:material:$material"
+    implementation "androidx.appcompat:appcompat:$xSupport"
+    implementation "androidx.constraintlayout:constraintlayout:$xConstraint"
     implementation "com.google.firebase:firebase-ads:$fbAds"
     implementation "com.google.firebase:firebase-core:$fbCore"
     implementation "com.google.firebase:firebase-firestore:$fbStore"
     implementation "com.google.firebase:firebase-config:$fbConfig"
     implementation "com.google.firebase:firebase-database:$fbDatabase"
-    implementation "android.arch.persistence.room:runtime:$room"
-    implementation "android.arch.lifecycle:extensions:$architecture"
+    implementation "androidx.room:room-runtime:$room"
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
     implementation "com.google.code.gson:gson:$gson"
     implementation "com.github.bumptech.glide:glide:$glide"
     implementation "com.github.yalantis:jellytoolbar:$jelly"
@@ -79,8 +78,8 @@ dependencies {
     testImplementation "com.nhaarman:mockito-kotlin-kt1.1:$mockitoKotlin"
 
     // AndroidTest
-    androidTestImplementation "com.android.support.test:runner:$espressoRunner"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCore"
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/...d/DartsScorecard/app/src/androidTest/java/nl/entreco/dartsscorecard/Play01ActivityTest.kt b/...d/DartsScorecard/app/src/androidTest/java/nl/entreco/dartsscorecard/Play01ActivityTest.kt
@@ -1,7 +1,7 @@
 package nl.entreco.dartsscorecard
 
-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/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/ContextExt.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/ContextExt.kt
@@ -5,8 +5,8 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.provider.Settings
-import android.support.annotation.ColorRes
-import android.support.v4.content.ContextCompat
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 
 fun Context.getColorCompat(@ColorRes color: Int) = ContextCompat.getColor(this, color)
 

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/ad/AdBindings.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/ad/AdBindings.kt
@@ -1,6 +1,6 @@
 package nl.entreco.dartsscorecard.ad
 
-import android.databinding.BindingAdapter
+import androidx.databinding.BindingAdapter
 import android.os.Handler
 import android.view.View
 import com.google.android.gms.ads.AdView

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/ad/AdViewModel.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/ad/AdViewModel.kt
@@ -1,9 +1,9 @@
 package nl.entreco.dartsscorecard.ad
 
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleObserver
-import android.arch.lifecycle.OnLifecycleEvent
-import android.databinding.ObservableBoolean
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.databinding.ObservableBoolean
 import com.google.android.gms.ads.AdView
 import nl.entreco.dartsscorecard.BuildConfig
 import nl.entreco.dartsscorecard.base.BaseViewModel

diff --git a/...d/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/archive/ArchiveJobService.kt b/...d/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/archive/ArchiveJobService.kt
@@ -8,7 +8,7 @@ import android.app.job.JobService
 import android.content.Context
 import android.graphics.Color
 import android.os.Build
-import android.support.v4.app.NotificationCompat
+import androidx.core.app.NotificationCompat
 import nl.entreco.dartsscorecard.App
 import nl.entreco.dartsscorecard.R
 import nl.entreco.dartsscorecard.archive.ArchiveServiceLauncher.Companion.EXTRA_GAME_ID

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/BaseFragment.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/BaseFragment.kt
@@ -1,17 +1,17 @@
 package nl.entreco.dartsscorecard.base
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
-import android.support.annotation.StringRes
-import android.support.design.widget.BaseTransientBottomBar
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.BaseTransientBottomBar
+import com.google.android.material.snackbar.Snackbar
+import androidx.fragment.app.Fragment
 import nl.entreco.dartsscorecard.App
 import nl.entreco.dartsscorecard.di.viewmodel.ViewModelComponent
 import nl.entreco.dartsscorecard.di.viewmodel.ViewModelModule
 
-abstract class BaseFragment : Fragment() {
+abstract class BaseFragment : androidx.fragment.app.Fragment() {
 
     inline fun <reified VM> componentProvider(
             mode: LazyThreadSafetyMode = LazyThreadSafetyMode.NONE,

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/BaseViewModel.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/BaseViewModel.kt
@@ -1,6 +1,6 @@
 package nl.entreco.dartsscorecard.base
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 
 /**
  * Created by Entreco on 16/11/2017.

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/DialogHelper.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/DialogHelper.kt
@@ -4,7 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import nl.entreco.dartsscorecard.R
 import nl.entreco.dartsscorecard.di.viewmodel.ActivityScope
 import nl.entreco.domain.model.players.Team

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/Styler.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/Styler.kt
@@ -2,7 +2,7 @@ package nl.entreco.dartsscorecard.base
 
 import android.app.Activity
 import android.content.SharedPreferences
-import android.support.annotation.StyleRes
+import androidx.annotation.StyleRes
 import nl.entreco.dartsscorecard.R
 import javax.inject.Inject
 

diff --git a/.../DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/SwipeToDeleteCallback.kt b/.../DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/SwipeToDeleteCallback.kt
@@ -4,9 +4,9 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.helper.ItemTouchHelper
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.ItemTouchHelper
 import nl.entreco.dartsscorecard.R
 import kotlin.math.abs
 import kotlin.math.min
@@ -22,7 +22,7 @@ abstract class SwipeToDeleteCallback(context: Context) : ItemTouchHelper.SimpleC
     private val background = ColorDrawable()
     private val backgroundColor = Color.parseColor("#D9534F")   // Pale red
 
-    override fun onChildDraw(canvas: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
+    override fun onChildDraw(canvas: Canvas, recyclerView: androidx.recyclerview.widget.RecyclerView, viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
         val itemView = viewHolder.itemView
         val itemHeight = itemView.bottom - itemView.top
         background.color = backgroundColor

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/TestableAdapter.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/TestableAdapter.kt
@@ -1,13 +1,13 @@
 package nl.entreco.dartsscorecard.base
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 
 /**
  * Created by Entreco on 31/12/2017.
  */
-abstract class TestableAdapter<T : RecyclerView.ViewHolder?> : RecyclerView.Adapter<T>() {
+abstract class TestableAdapter<T : androidx.recyclerview.widget.RecyclerView.ViewHolder?> : androidx.recyclerview.widget.RecyclerView.Adapter<T>() {
 
     protected class LazyInflater(context: Context) {
         val inflater: LayoutInflater by lazy { LayoutInflater.from(context) }

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/ViewModelActivity.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/ViewModelActivity.kt
@@ -1,14 +1,14 @@
 package nl.entreco.dartsscorecard.base
 
 import android.app.Activity
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.annotation.StringRes
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
 import android.view.MenuItem
 import nl.entreco.dartsscorecard.App
 import nl.entreco.dartsscorecard.R

diff --git a/...sScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/widget/BaseCounterTextView.kt b/...sScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/widget/BaseCounterTextView.kt
@@ -1,7 +1,7 @@
 package nl.entreco.dartsscorecard.base.widget
 
 import android.content.Context
-import android.support.v7.widget.AppCompatTextView
+import androidx.appcompat.widget.AppCompatTextView
 import android.util.AttributeSet
 import kotlin.math.round
 

diff --git a/...corecard/app/src/main/java/nl/entreco/dartsscorecard/base/widget/MaxHeightRecyclerView.kt b/...corecard/app/src/main/java/nl/entreco/dartsscorecard/base/widget/MaxHeightRecyclerView.kt
@@ -1,15 +1,15 @@
 package nl.entreco.dartsscorecard.base.widget
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.util.AttributeSet
 
 /**
  * Created by entreco on 14/01/2018.
  */
 class MaxHeightRecyclerView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : RecyclerView(context, attrs, defStyleAttr) {
+) : androidx.recyclerview.widget.RecyclerView(context, attrs, defStyleAttr) {
 
     var maxHeight: Int = 400
 

diff --git a/...Scorecard/app/src/main/java/nl/entreco/dartsscorecard/base/widget/WrapContentViewPager.kt b/...Scorecard/app/src/main/java/nl/entreco/dartsscorecard/base/widget/WrapContentViewPager.kt
@@ -1,14 +1,14 @@
 package nl.entreco.dartsscorecard.base.widget
 
 import android.content.Context
-import android.databinding.Bindable
-import android.support.v4.view.ViewPager
+import androidx.databinding.Bindable
+import androidx.viewpager.widget.ViewPager
 import android.util.AttributeSet
 
 /**
  * Created by entreco on 24/03/2018.
  */
-class WrapContentViewPager(context: Context, attrs: AttributeSet?) : ViewPager(context, attrs) {
+class WrapContentViewPager(context: Context, attrs: AttributeSet?) : androidx.viewpager.widget.ViewPager(context, attrs) {
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         val hms = getChildAt(0)?.let {child ->
             child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaActivity.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaActivity.kt
@@ -1,16 +1,16 @@
 package nl.entreco.dartsscorecard.beta
 
 import android.app.Activity
-import android.arch.lifecycle.Lifecycle
+import androidx.lifecycle.Lifecycle
 import android.content.Context
 import android.content.Intent
 import android.content.IntentSender
-import android.databinding.DataBindingUtil
+import androidx.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.Toolbar
+import com.google.android.material.snackbar.Snackbar
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.appcompat.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
 import nl.entreco.dartsscorecard.R
@@ -104,8 +104,9 @@ class BetaActivity : ViewModelActivity(), DonateCallback, BetaAnimator.Swapper {
         val recyclerView = binding.betaRecyclerView
         recyclerView.setHasFixedSize(true)
         recyclerView.setItemViewCacheSize(20)
-        recyclerView.layoutManager = GridLayoutManager(binding.root.context, 2)
-        recyclerView.itemAnimator = DefaultItemAnimator()
+        recyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(
+                binding.root.context, 2)
+        recyclerView.itemAnimator = androidx.recyclerview.widget.DefaultItemAnimator()
         recyclerView.adapter = adapter
     }
 

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaAdapter.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaAdapter.kt
@@ -1,8 +1,8 @@
 package nl.entreco.dartsscorecard.beta
 
-import android.arch.lifecycle.Observer
-import android.databinding.DataBindingUtil
-import android.support.v7.util.DiffUtil
+import androidx.lifecycle.Observer
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.DiffUtil
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import nl.entreco.dartsscorecard.R

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaAnimator.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaAnimator.kt
@@ -1,7 +1,7 @@
 package nl.entreco.dartsscorecard.beta
 
-import android.support.design.widget.AppBarLayout
-import android.support.design.widget.BottomSheetBehavior
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import android.view.View
 import kotlinx.android.synthetic.main.include_beta_detail.view.*
 import nl.entreco.dartsscorecard.databinding.ActivityBetaBinding
@@ -28,7 +28,8 @@ class BetaAnimator(binding: ActivityBetaBinding) {
     }
 
     init {
-        appBar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, slideOffset -> animator.onOffsetChanged(appBarLayout, slideOffset) })
+        appBar.addOnOffsetChangedListener(
+                AppBarLayout.OnOffsetChangedListener { appBarLayout, slideOffset -> animator.onOffsetChanged(appBarLayout, slideOffset) })
         behaviour.setBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
             override fun onSlide(bottomSheet: View, slideOffset: Float) {
                 animator.onSlide(slideOffset)

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaBindings.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaBindings.kt
@@ -1,6 +1,6 @@
 package nl.entreco.dartsscorecard.beta
 
-import android.databinding.BindingAdapter
+import androidx.databinding.BindingAdapter
 import android.net.Uri
 import android.text.Html
 import android.view.View

diff --git a/...oid/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaDiffCalculator.kt b/...oid/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaDiffCalculator.kt
@@ -1,6 +1,6 @@
 package nl.entreco.dartsscorecard.beta
 
-import android.support.v7.util.DiffUtil
+import androidx.recyclerview.widget.DiffUtil
 import nl.entreco.domain.beta.Feature
 
 class BetaDiffCalculator(private val old: List<Feature>, private val new: List<Feature>) : DiffUtil.Callback() {

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaModel.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaModel.kt
@@ -1,8 +1,8 @@
 package nl.entreco.dartsscorecard.beta
 
-import android.databinding.ObservableBoolean
-import android.databinding.ObservableField
-import android.databinding.ObservableFloat
+import androidx.databinding.ObservableBoolean
+import androidx.databinding.ObservableField
+import androidx.databinding.ObservableFloat
 import nl.entreco.domain.beta.Feature
 
 /**

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaView.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaView.kt
@@ -1,13 +1,13 @@
 package nl.entreco.dartsscorecard.beta
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import nl.entreco.dartsscorecard.databinding.BetaViewBinding
 import nl.entreco.domain.beta.Feature
 
 /**
  * Created by entreco on 03/02/2018.
  */
-class BetaView(private val binding: BetaViewBinding) : RecyclerView.ViewHolder(binding.root) {
+class BetaView(private val binding: BetaViewBinding) : androidx.recyclerview.widget.RecyclerView.ViewHolder(binding.root) {
     fun bind(feature: Feature, animator: BetaAnimator?) {
         binding.feature = BetaModel(feature)
         binding.animator = animator

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaViewModel.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaViewModel.kt
@@ -1,8 +1,8 @@
 package nl.entreco.dartsscorecard.beta
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import nl.entreco.dartsscorecard.base.BaseViewModel
 import nl.entreco.domain.beta.Feature
 import nl.entreco.domain.purchases.connect.SubscribeToFeaturesUsecase

diff --git a/.../DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/donate/DonateBindings.kt b/.../DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/donate/DonateBindings.kt
@@ -1,7 +1,7 @@
 package nl.entreco.dartsscorecard.beta.donate
 
-import android.databinding.BindingAdapter
-import android.databinding.DataBindingUtil
+import androidx.databinding.BindingAdapter
+import androidx.databinding.DataBindingUtil
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import nl.entreco.dartsscorecard.R

diff --git a/.../DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/donate/DonateCallback.kt b/.../DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/donate/DonateCallback.kt
@@ -1,6 +1,6 @@
 package nl.entreco.dartsscorecard.beta.donate
 
-import android.arch.lifecycle.Lifecycle
+import androidx.lifecycle.Lifecycle
 import nl.entreco.domain.beta.Donation
 import nl.entreco.domain.beta.donations.MakeDonationResponse