Migrate to AndroidX (#2424)

* Migrate to AndroidX (automatic conversion by Android Studio)

* AndroidX dependency code updates

* Fix source preference reparenting

* fixes the androidx prefererences icon spacing issue

(cherry picked from commit b76a15d960ec2cdf771be16377db0348b66b3179)

* Fix source preference screen heading size/list padding

Co-authored-by: Carlos <cargo8005@gmail.com>
This commit is contained in:
arkon
2020-01-05 11:29:27 -05:00
committed by GitHub
parent aa57b1bc77
commit 78689e7443
199 changed files with 689 additions and 607 deletions

View File

@@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.widget
import android.content.Context
import android.support.v7.widget.GridLayoutManager
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import android.util.AttributeSet
class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
@@ -42,4 +42,4 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att
}
}
}
}

View File

@@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.widget
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.ViewGroup
import com.nononsenseapps.filepicker.AbstractFilePickerFragment
import com.nononsenseapps.filepicker.FilePickerActivity
@@ -30,4 +30,4 @@ class CustomLayoutFilePickerFragment : FilePickerFragment() {
else -> return super.onCreateViewHolder(parent, viewType)
}
}
}
}

View File

@@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.widget
import android.content.Context
import android.support.annotation.StringRes
import androidx.annotation.StringRes
import android.util.AttributeSet
import android.widget.LinearLayout
import eu.kanade.tachiyomi.R

View File

@@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.widget
import android.support.v4.widget.DrawerLayout
import androidx.drawerlayout.widget.DrawerLayout
import android.view.View
import android.view.ViewGroup
@@ -20,4 +20,4 @@ class DrawerSwipeCloseListener(
drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, drawerView)
}
}
}
}

View File

@@ -4,8 +4,8 @@ import android.animation.ObjectAnimator
import android.animation.StateListAnimator
import android.content.Context
import android.os.Build
import android.support.design.R
import android.support.design.widget.AppBarLayout
import com.google.android.material.R
import com.google.android.material.appbar.AppBarLayout
import android.util.AttributeSet
class ElevationAppBarLayout @JvmOverloads constructor(
@@ -45,4 +45,4 @@ class ElevationAppBarLayout @JvmOverloads constructor(
}
}
}
}

View File

@@ -2,10 +2,10 @@ package eu.kanade.tachiyomi.widget
import android.content.Context
import android.graphics.drawable.Drawable
import android.support.annotation.CallSuper
import android.support.graphics.drawable.VectorDrawableCompat
import android.support.v4.content.ContextCompat
import android.support.v7.widget.RecyclerView
import androidx.annotation.CallSuper
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import android.util.AttributeSet
import android.view.View
import android.view.ViewGroup
@@ -236,4 +236,4 @@ open class ExtendedNavigationView @JvmOverloads constructor(
}
}
}

View File

@@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.widget
import android.support.design.widget.CoordinatorLayout
import android.support.design.widget.FloatingActionButton
import android.support.v4.view.ViewCompat
import androidx.coordinatorlayout.widget.CoordinatorLayout
import com.google.android.material.floatingactionbutton.FloatingActionButton
import androidx.core.view.ViewCompat
import android.view.View
abstract class FABAnimationBase : FloatingActionButton.Behavior() {
@@ -31,4 +31,4 @@ abstract class FABAnimationBase : FloatingActionButton.Behavior() {
abstract fun animateOut(button: FloatingActionButton)
abstract fun animateIn(button: FloatingActionButton)
}
}

View File

@@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.widget
import android.content.Context
import android.support.design.widget.FloatingActionButton
import android.support.v4.view.animation.FastOutSlowInInterpolator
import com.google.android.material.floatingactionbutton.FloatingActionButton
import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import android.util.AttributeSet
import android.view.View
import android.view.animation.Animation
@@ -48,4 +48,4 @@ class FABAnimationUpDown @JvmOverloads constructor(ctx: Context, attrs: Attribut
button.visibility = View.VISIBLE
button.startAnimation(inAnimation)
}
}
}

View File

@@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.widget
import android.content.Context
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
class PreCachingLayoutManager(context: Context) : LinearLayoutManager(context) {

View File

@@ -2,22 +2,22 @@ package eu.kanade.tachiyomi.widget
import android.annotation.SuppressLint
import android.content.Context
import android.support.design.R
import android.support.design.internal.ScrimInsetsFrameLayout
import android.support.design.widget.TextInputLayout
import android.support.v4.view.ViewCompat
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.support.v7.widget.TintTypedArray
import com.google.android.material.R
import com.google.android.material.textfield.TextInputLayout
import androidx.core.view.ViewCompat
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.appcompat.widget.TintTypedArray
import android.util.AttributeSet
import android.view.View
import android.view.ViewGroup
import android.widget.*
import com.google.android.material.internal.ScrimInsetsFrameLayout
import eu.kanade.tachiyomi.util.inflate
import eu.kanade.tachiyomi.R as TR
@Suppress("LeakingThis")
@SuppressLint("PrivateResource")
@SuppressLint("PrivateResource", "RestrictedApi")
open class SimpleNavigationView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
@@ -155,4 +155,4 @@ open class SimpleNavigationView @JvmOverloads constructor(
const val VIEW_TYPE_LIST = 106
}
}
}

View File

@@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.widget
import android.graphics.drawable.Drawable
import android.support.graphics.drawable.VectorDrawableCompat
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import android.view.View
import android.widget.ImageView
import android.widget.ImageView.ScaleType

View File

@@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.widget
import android.support.v4.view.PagerAdapter
import androidx.viewpager.widget.PagerAdapter
import android.view.View
import android.view.ViewGroup

View File

@@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.widget.preference
import android.content.Context
import android.support.v7.preference.ListPreference
import androidx.preference.ListPreference
import android.util.AttributeSet
class IntListPreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
@@ -23,4 +23,4 @@ class IntListPreference @JvmOverloads constructor(context: Context, attrs: Attri
defaultReturnValue
}
}
}
}

View File

@@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.widget.preference
import android.content.Context
import android.graphics.Color
import android.support.v7.preference.CheckBoxPreference
import android.support.v7.preference.PreferenceViewHolder
import androidx.preference.CheckBoxPreference
import androidx.preference.PreferenceViewHolder
import android.util.AttributeSet
import android.view.View
import eu.kanade.tachiyomi.R
@@ -54,4 +54,4 @@ class LoginCheckBoxPreference @JvmOverloads constructor(
super.notifyChanged()
}
}
}

View File

@@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.widget.preference
import android.content.Context
import android.support.v7.preference.Preference
import android.support.v7.preference.PreferenceViewHolder
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
import android.util.AttributeSet
import eu.kanade.tachiyomi.R
import kotlinx.android.synthetic.main.pref_widget_imageview.view.*

View File

@@ -4,9 +4,9 @@ import android.annotation.TargetApi
import android.content.Context
import android.content.res.TypedArray
import android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH
import android.support.v7.preference.PreferenceCategory
import android.support.v7.preference.PreferenceViewHolder
import android.support.v7.widget.SwitchCompat
import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceViewHolder
import androidx.appcompat.widget.SwitchCompat
import android.util.AttributeSet
import android.view.View
import android.widget.Checkable
@@ -122,4 +122,4 @@ CompoundButton.OnCheckedChangeListener {
defaultValue as Boolean)
}
}
}