Bumped androidx core and Google Material versions

tunjid · May 29, 2020 · 878b7c8 · 878b7c8
1 parent bf0d7b4
commit 878b7c8
Show file tree

Hide file tree

Showing 79 changed files with 544 additions and 507 deletions.
diff --git a/app/debugKeystore.properties b/app/debugKeystore.properties
@@ -21,7 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-
 keystore=debug.jks
 keystore.password=android
 keyAlias=androiddebugkey

diff --git a/app/src/main/java/com/tunjid/androidx/MutedColors.kt b/app/src/main/java/com/tunjid/androidx/MutedColors.kt
@@ -24,9 +24,9 @@ object MutedColors {
     fun random(isDark: Boolean): Int = palette(isDark).random()
 
     private fun palette(isDark: Boolean): IntArray = when (isDark) {
-            true -> darkerMutedColors
-            else -> mutedColors
-        }
+        true -> darkerMutedColors
+        else -> mutedColors
+    }
 }
 
 private fun IntArray.circular(index: Int) = this[index % size]

diff --git a/app/src/main/java/com/tunjid/androidx/Utilities.kt b/app/src/main/java/com/tunjid/androidx/Utilities.kt
@@ -35,6 +35,6 @@ val Context.isDarkTheme
         else -> true
     }
 
-fun Context.divider(orientation: Int)= DividerItemDecoration(this, orientation).apply {
+fun Context.divider(orientation: Int) = DividerItemDecoration(this, orientation).apply {
     setDrawable(drawableAt(R.drawable.bg_divider)?.withTint(themeColorAt(R.attr.colorSurface))!!)
 }
diff --git a/app/src/main/java/com/tunjid/androidx/fragments/AdoptDoggoFragment.kt b/app/src/main/java/com/tunjid/androidx/fragments/AdoptDoggoFragment.kt
@@ -4,7 +4,6 @@ import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.graphics.Color
 import android.os.Bundle
-import android.transition.Fade
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -13,6 +12,7 @@ import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.transition.Fade
 import com.tunjid.androidx.R
 import com.tunjid.androidx.core.components.args
 import com.tunjid.androidx.core.content.themeColorAt

diff --git a/app/src/main/java/com/tunjid/androidx/fragments/BleScanFragment.kt b/app/src/main/java/com/tunjid/androidx/fragments/BleScanFragment.kt
@@ -156,7 +156,7 @@ class BleScanFragment : Fragment(R.layout.fragment_ble_scan) {
     private fun onMenuItemSelected(item: MenuItem) = when (item.itemId) {
         R.id.menu_scan -> scanDevices(true)
         R.id.menu_stop -> scanDevices(false)
-        else -> super.onOptionsItemSelected(item).let {  }
+        else -> super.onOptionsItemSelected(item).let { }
     }
 
     private fun onBluetoothDeviceClicked(bluetoothDevice: BluetoothDevice) {

diff --git a/app/src/main/java/com/tunjid/androidx/fragments/DoggoListFragment.kt b/app/src/main/java/com/tunjid/androidx/fragments/DoggoListFragment.kt
@@ -2,8 +2,6 @@ package com.tunjid.androidx.fragments
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.transition.Fade
-import android.transition.TransitionSet
 import android.view.View
 import android.view.View.OnLayoutChangeListener
 import android.widget.ImageView
@@ -15,6 +13,8 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
+import androidx.transition.Fade
+import androidx.transition.TransitionSet
 import com.tunjid.androidx.R
 import com.tunjid.androidx.core.content.themeColorAt
 import com.tunjid.androidx.databinding.FragmentDoggoListBinding

diff --git a/app/src/main/java/com/tunjid/androidx/fragments/DoggoRankFragment.kt b/app/src/main/java/com/tunjid/androidx/fragments/DoggoRankFragment.kt
@@ -2,11 +2,6 @@ package com.tunjid.androidx.fragments
 
 import android.os.Bundle
 import android.text.TextUtils
-import android.transition.ChangeBounds
-import android.transition.ChangeImageTransform
-import android.transition.ChangeTransform
-import android.transition.TransitionManager
-import android.transition.TransitionSet
 import android.util.Pair
 import android.view.View
 import android.view.ViewGroup
@@ -22,6 +17,11 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.observe
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
+import androidx.transition.ChangeBounds
+import androidx.transition.ChangeImageTransform
+import androidx.transition.ChangeTransform
+import androidx.transition.TransitionManager
+import androidx.transition.TransitionSet
 import com.tunjid.androidx.R
 import com.tunjid.androidx.core.components.args
 import com.tunjid.androidx.core.content.themeColorAt
@@ -194,7 +194,8 @@ class DoggoRankFragment : Fragment(R.layout.fragment_doggo_list),
 var BindingViewHolder<ViewholderDoggoRankBinding>.doggoBinder by BindingViewHolder.Prop<DoggoBinder?>()
 
 private fun BindingViewHolder<ViewholderDoggoRankBinding>.bind(isRanking: Boolean, doggo: Doggo) {
-    val layoutParams = binding.innerConstraintLayout.doggoImage.layoutParams as? ConstraintLayout.LayoutParams ?: return
+    val layoutParams = binding.innerConstraintLayout.doggoImage.layoutParams as? ConstraintLayout.LayoutParams
+            ?: return
     val currentlyInRanking = layoutParams.matchConstraintPercentWidth != 1f
     val context = binding.root.context
 

diff --git a/app/src/main/java/com/tunjid/androidx/fragments/MultipleStacksFragment.kt b/app/src/main/java/com/tunjid/androidx/fragments/MultipleStacksFragment.kt
@@ -4,7 +4,6 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
-import android.transition.Transition
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -15,6 +14,7 @@ import androidx.core.view.children
 import androidx.core.view.doOnDetach
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
+import androidx.transition.Transition
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.transition.MaterialFadeThrough
@@ -87,7 +87,7 @@ class MultipleStacksFragment : Fragment(R.layout.fragment_multiple_stack) {
                     intArrayOf(Color.LTGRAY, Color.WHITE)
             ))
         }
-        binding.tabs.doOnDetach {  innerNavigator.stackSelectedListener = null }
+        binding.tabs.doOnDetach { innerNavigator.stackSelectedListener = null }
         binding.options.setOnCheckedChangeListener { _, checkedId ->
             transitionOption = checkedId
         }
@@ -137,10 +137,10 @@ class MultipleStacksFragment : Fragment(R.layout.fragment_multiple_stack) {
 
         // Casting is necessary for over enthusiastic Kotlin compiler CHECKCAST generation
         val (enterFrom, exitFrom, enterTo, exitTo) = arrayOf(
-                if (isSliding) MaterialSharedAxis.create(X, !isForward) else null,
-                if (isSliding) MaterialSharedAxis.create(X, isForward) else MaterialFadeThrough.create() as Transition,
-                if (isSliding) MaterialSharedAxis.create(X, isForward) else MaterialFadeThrough.create() as Transition,
-                if (isSliding) MaterialSharedAxis.create(X, !isForward) else null
+                if (isSliding) MaterialSharedAxis(X, !isForward) else null,
+                if (isSliding) MaterialSharedAxis(X, isForward) else MaterialFadeThrough() as Transition,
+                if (isSliding) MaterialSharedAxis(X, isForward) else MaterialFadeThrough() as Transition,
+                if (isSliding) MaterialSharedAxis(X, !isForward) else null
         )
 
         from.apply { enterTransition = enterFrom; exitTransition = exitFrom }

diff --git a/app/src/main/java/com/tunjid/androidx/fragments/RouteFragment.kt b/app/src/main/java/com/tunjid/androidx/fragments/RouteFragment.kt
@@ -42,7 +42,7 @@ import me.everything.android.ui.overscroll.OverScrollDecoratorHelper
 class RouteFragment : Fragment(R.layout.fragment_route) {
 
     private var uiState by activityGlobalUiController()
-    private val viewModel  by viewModels<RouteViewModel>()
+    private val viewModel by viewModels<RouteViewModel>()
     private val navigator by activityNavigatorController<MultiStackNavigator>()
 
     private var tabIndex: Int by args()
@@ -90,7 +90,7 @@ class RouteFragment : Fragment(R.layout.fragment_route) {
                 if (requireContext().isDarkTheme) MODE_NIGHT_NO
                 else MODE_NIGHT_YES
         )
-        else -> requireActivity().onOptionsItemSelected(item).let {  }
+        else -> requireActivity().onOptionsItemSelected(item).let { }
     }
 
     private fun onRouteClicked(destination: RouteItem.Destination) {

diff --git a/app/src/main/java/com/tunjid/androidx/fragments/SpringAnimationFragment.kt b/app/src/main/java/com/tunjid/androidx/fragments/SpringAnimationFragment.kt
@@ -45,6 +45,7 @@ class SpringAnimationFragment : Fragment(R.layout.fragment_spring_animation) {
 
         val binding = FragmentSpringAnimationBinding.bind(view)
         val viewHiders = binding.viewHiders
+
         @Suppress("MoveSuspiciousCallableReferenceIntoParentheses")
         val springModifiers: List<SpringModifierConsumer> =
                 viewHiders.map { it::configure }
@@ -94,10 +95,10 @@ class SpringAnimationFragment : Fragment(R.layout.fragment_spring_animation) {
         binding.cage.children.forEach { it.setOnClickListener(viewHiders::onButtonClicked) }
 
         binding.shrinkMargin.run {
-            view.spring(MarginProperty.LEFT).addEndListener { _, _, value, _ ->  isChecked = value != 0f}
+            view.spring(MarginProperty.LEFT).addEndListener { _, _, value, _ -> isChecked = value != 0f }
         }
         binding.shrinkPadding.run {
-            binding.cage.spring(PaddingProperty.LEFT).addEndListener { _, _, value, _ ->  isChecked = value != 0f}
+            binding.cage.spring(PaddingProperty.LEFT).addEndListener { _, _, value, _ -> isChecked = value != 0f }
         }
     }
 

diff --git a/app/src/main/java/com/tunjid/androidx/model/Doggo.kt b/app/src/main/java/com/tunjid/androidx/model/Doggo.kt
@@ -52,7 +52,7 @@ class Doggo : Parcelable {
 
     companion object {
 
-         var transitionDoggo: Doggo? = null
+        var transitionDoggo: Doggo? = null
 
         private val DOGGO_NOUNS = listOf(
                 "F R E N",

diff --git a/app/src/main/java/com/tunjid/androidx/model/Tile.kt b/app/src/main/java/com/tunjid/androidx/model/Tile.kt
@@ -1,9 +1,8 @@
 package com.tunjid.androidx.model
 
-import com.tunjid.androidx.recyclerview.diff.Differentiable
-
 import androidx.annotation.ColorInt
 import com.tunjid.androidx.MutedColors
+import com.tunjid.androidx.recyclerview.diff.Differentiable
 
 class Tile private constructor(
         val number: Int,

diff --git a/app/src/main/java/com/tunjid/androidx/uidrivers/FragmentTransactionAnimations.kt b/app/src/main/java/com/tunjid/androidx/uidrivers/FragmentTransactionAnimations.kt
@@ -1,11 +1,11 @@
 package com.tunjid.androidx.uidrivers
 
-import android.transition.ChangeImageTransform
-import android.transition.ChangeTransform
-import android.transition.Transition
-import android.transition.TransitionSet
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
+import androidx.transition.ChangeImageTransform
+import androidx.transition.ChangeTransform
+import androidx.transition.Transition
+import androidx.transition.TransitionSet
 import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 import com.tunjid.androidx.navigation.MultiStackNavigator
@@ -25,11 +25,11 @@ fun MultiStackNavigator.materialFadeThroughTransition(): FragmentTransaction.(In
 
     rootFragmentManager.findFragmentByTag(activeIndex.toString())?.apply {
         enterTransition = null
-        if (exitTransition !is MaterialFadeThrough) exitTransition = MaterialFadeThrough.create().setDuration(300)
+        if (exitTransition !is MaterialFadeThrough) exitTransition = MaterialFadeThrough().setDuration(300)
     }
     rootFragmentManager.findFragmentByTag(index.toString())?.apply {
         exitTransition = null
-        if (enterTransition !is MaterialFadeThrough) enterTransition = MaterialFadeThrough.create().setDuration(300)
+        if (enterTransition !is MaterialFadeThrough) enterTransition = MaterialFadeThrough().setDuration(300)
     }
 }
 
@@ -38,12 +38,12 @@ fun MultiStackNavigator.materialDepthAxisTransition(): FragmentTransaction.(Frag
     if (current is Navigator.TransactionModifier) current.augmentTransaction(this, incomingFragment)
     else {
         current.apply {
-            enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.Z, false)
-            exitTransition = MaterialSharedAxis.create(MaterialSharedAxis.Z, true)
+            enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
+            exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
         }
         incomingFragment.apply {
-            enterTransition = MaterialSharedAxis.create(MaterialSharedAxis.Z, true)
-            exitTransition = MaterialSharedAxis.create(MaterialSharedAxis.Z, false)
+            enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
+            exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
         }
     }
 }

diff --git a/app/src/main/java/com/tunjid/androidx/uidrivers/SpringItemAnimator.kt b/app/src/main/java/com/tunjid/androidx/uidrivers/SpringItemAnimator.kt
@@ -6,7 +6,9 @@ import android.view.View
 import androidx.dynamicanimation.animation.DynamicAnimation
 import androidx.dynamicanimation.animation.FloatPropertyCompat
 import androidx.dynamicanimation.animation.SpringAnimation
-import androidx.dynamicanimation.animation.SpringAnimation.*
+import androidx.dynamicanimation.animation.SpringAnimation.ALPHA
+import androidx.dynamicanimation.animation.SpringAnimation.TRANSLATION_X
+import androidx.dynamicanimation.animation.SpringAnimation.TRANSLATION_Y
 import androidx.dynamicanimation.animation.SpringForce
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.RecyclerView

diff --git a/app/src/main/java/com/tunjid/androidx/uidrivers/UiState.kt b/app/src/main/java/com/tunjid/androidx/uidrivers/UiState.kt
@@ -1,4 +1,5 @@
 package com.tunjid.androidx.uidrivers
+
 import android.graphics.Color
 import android.os.Parcel
 import android.os.Parcelable
@@ -132,4 +133,4 @@ data class UiState(
     }
 }
 
-private fun <T> emptyCallback() : (T) -> Unit = {}
+private fun <T> emptyCallback(): (T) -> Unit = {}
diff --git a/app/src/main/java/com/tunjid/androidx/uidrivers/UiStateAwareChangeBounds.kt b/app/src/main/java/com/tunjid/androidx/uidrivers/UiStateAwareChangeBounds.kt
@@ -1,19 +1,18 @@
 package com.tunjid.androidx.uidrivers
 
 import android.graphics.Rect
-import android.transition.ChangeBounds
-import android.transition.TransitionValues
+import androidx.transition.ChangeBounds
+import androidx.transition.TransitionValues
 import com.tunjid.androidx.core.content.unwrapActivity
 import com.tunjid.androidx.view.util.InsetFlags
 
 class UiStateAwareChangeBounds(
         private val initial: UiState?
 ) : ChangeBounds() {
 
-    override fun captureEndValues(transitionValues: TransitionValues?) {
+    override fun captureEndValues(transitionValues: TransitionValues) {
         super.captureEndValues(transitionValues)
 
-        transitionValues ?: return
         val rect = transitionValues.values[BOUNDS_PROPERTY] as? Rect ?: return
 
         val current = transitionValues.uiState

diff --git a/app/src/main/java/com/tunjid/androidx/viewmodels/EndlessTileViewModel.kt b/app/src/main/java/com/tunjid/androidx/viewmodels/EndlessTileViewModel.kt
@@ -30,7 +30,7 @@ class EndlessTileViewModel(application: Application) : AndroidViewModel(applicat
 
     fun fetchMore() {
         disposables.add(Single.fromCallable {
-            Diff.calculate(tiles, generateTiles()) { oldTiles, addedTiles -> oldTiles + addedTiles}
+            Diff.calculate(tiles, generateTiles()) { oldTiles, addedTiles -> oldTiles + addedTiles }
         }
                 .subscribeOn(io())
                 .observeOn(mainThread())

diff --git a/app/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_down_black_24dp.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <group
         android:name="rotationGroup"
         android:pivotX="12.0"

diff --git a/app/src/main/res/drawable/ic_arrow_right_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_right_black_24dp.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <group
         android:name="rotationGroup"
         android:pivotX="12.0"

diff --git a/app/src/main/res/drawable/ic_arrow_up_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_up_black_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M7,14l5,-5 5,5z"/>
+        android:pathData="M7,14l5,-5 5,5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bluetooth_24dp.xml b/app/src/main/res/drawable/ic_bluetooth_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
+        android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z" />
 </vector>