Update dependencies, notably MDC to 1.1.0-beta01.

Change-Id: I052fb98b71331a31a85f222d8cd5ca9416b57b0d

Author: nickbutcher

app/build.gradle

@@ -15,16 +15,16 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: "androidx.navigation.safeargs.kotlin"
+apply plugin: 'androidx.navigation.safeargs.kotlin'
 
 android {
     compileSdkVersion 29
     defaultConfig {
-        applicationId "com.materialstudies.owl"
+        applicationId 'com.materialstudies.owl'
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0"
+        versionName '1.0'
         vectorDrawables.useSupportLibrary = true
     }
     dataBinding {
@@ -46,11 +46,11 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-    implementation 'androidx.fragment:fragment:1.2.0-alpha02'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.fragment:fragment:1.2.0-beta02'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation 'com.google.android.material:material:1.1.0-alpha09'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0-beta01'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"

app/src/main/java/com/materialstudies/owl/ui/lessons/LessonsSheetFragment.kt

@@ -104,9 +104,11 @@ class LessonsSheetFragment : Fragment() {
             val sheetEndColor =
                 lessonsSheet.context.getColorStateList(R.color.primary_sheet).defaultColor
             val sheetBackground = MaterialShapeDrawable(
-                ShapeAppearanceModel(
-                    lessonsSheet.context, R.style.ShapeAppearance_Owl_MinimizedSheet, 0
-                )
+                ShapeAppearanceModel.builder(
+                    lessonsSheet.context,
+                    R.style.ShapeAppearance_Owl_MinimizedSheet,
+                    0
+                ).build()
             ).apply {
                 fillColor = ColorStateList.valueOf(sheetStartColor)
             }
@@ -117,7 +119,7 @@ class LessonsSheetFragment : Fragment() {
                 lessonsSheet.translationX = (lessonsSheet.width - peek).toFloat()
 
                 // Alter views based on the sheet expansion
-                behavior.setBottomSheetCallback(object :
+                behavior.addBottomSheetCallback(object :
                     BottomSheetBehavior.BottomSheetCallback() {
                     override fun onStateChanged(bottomSheet: View, newState: Int) {
                         backCallback.isEnabled = newState == STATE_EXPANDED

app/src/main/java/com/materialstudies/owl/util/BindingAdapters.kt

@@ -24,15 +24,14 @@ import android.widget.ImageView
 import androidx.core.view.updateLayoutParams
 import androidx.databinding.BindingAdapter
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestListener
 import com.google.android.material.elevation.ElevationOverlayProvider
 
 @BindingAdapter("srcUrl", "circleCrop", "placeholder", "loadListener", requireAll = false)
 fun ImageView.bindSrcUrl(
     url: String,
     circleCrop: Boolean,
     placeholder: Drawable?,
-    loadListener: RequestListener<Drawable>?
+    loadListener: GlideDrawableLoadListener?
 ) {
     val request = Glide.with(this).load(url)
     if (circleCrop) request.circleCrop()

app/src/main/java/com/materialstudies/owl/util/GlideUtils.kt

@@ -28,30 +28,32 @@ import com.bumptech.glide.request.target.Target
 import com.google.android.material.animation.ArgbEvaluatorCompat
 import kotlin.math.roundToInt
 
+fun loadListener(block: (loaded: Boolean) -> Unit) = GlideDrawableLoadListener(block)
+
 /**
- * a [RequestListener] which executes an action when an image loads or fails to load.
+ * A [RequestListener] which executes an action when a [Drawable] loads or fails to load.
  */
-fun loadListener(block: () -> Unit) : RequestListener<Drawable> {
-    return object : RequestListener<Drawable> {
-        override fun onLoadFailed(
-            e: GlideException?,
-            model: Any?,
-            target: Target<Drawable>?,
-            isFirstResource: Boolean
-        ): Boolean {
-            block()
-            return true
-        }
+class GlideDrawableLoadListener(private val block: (loaded: Boolean) -> Unit) :
+    RequestListener<Drawable> {
+
+    override fun onResourceReady(
+        resource: Drawable?,
+        model: Any?,
+        target: Target<Drawable>?,
+        dataSource: DataSource?,
+        isFirstResource: Boolean
+    ): Boolean {
+        block(true)
+        return false
+    }
 
-        override fun onResourceReady(
-            resource: Drawable?,
-            model: Any?,
-            target: Target<Drawable>?,
-            dataSource: DataSource?,
-            isFirstResource: Boolean
-        ): Boolean {
-            block()
-            return false
-        }
+    override fun onLoadFailed(
+        e: GlideException?,
+        model: Any?,
+        target: Target<Drawable>?,
+        isFirstResource: Boolean
+    ): Boolean {
+        block(false)
+        return true
     }
 }

app/src/main/java/com/materialstudies/owl/util/GraphicsExtensions.kt

@@ -26,7 +26,6 @@ import androidx.core.graphics.toRectF
 import com.google.android.material.shape.RoundedCornerTreatment
 import com.google.android.material.shape.ShapeAppearanceModel
 
-// TODO make inline class once non-experimental
 class CornerRounding(
     val topLeftRadius: Float = 0f,
     val topRightRadius: Float = 0f,
@@ -44,14 +43,13 @@ fun CornerRounding.toFloatArray(): FloatArray {
     )
 }
 
-fun ShapeAppearanceModel?.toCornerRounding(): CornerRounding {
+fun ShapeAppearanceModel?.toCornerRounding(bounds: RectF): CornerRounding {
     if (this == null) return CornerRounding()
-    // TODO handle non rounded corners?
     return CornerRounding(
-        if (topLeftCorner is RoundedCornerTreatment) topLeftCorner.cornerSize else 0f,
-        if (topRightCorner is RoundedCornerTreatment) topRightCorner.cornerSize else 0f,
-        if (bottomRightCorner is RoundedCornerTreatment) bottomRightCorner.cornerSize else 0f,
-        if (bottomLeftCorner is RoundedCornerTreatment) bottomLeftCorner.cornerSize else 0f
+        topLeftCornerSize.getCornerSize(bounds),
+        topRightCornerSize.getCornerSize(bounds),
+        bottomRightCornerSize.getCornerSize(bounds),
+        bottomLeftCornerSize.getCornerSize(bounds)
     )
 }
 

app/src/main/java/com/materialstudies/owl/util/ShapeAppearanceTransformation.kt

@@ -51,7 +51,11 @@ class ShapeAppearanceTransformation(
         outWidth: Int,
         outHeight: Int
     ): Resource<Bitmap> {
-        val model = shapeAppearanceModel ?: ShapeAppearanceModel(context, shapeAppearanceId, 0)
+        val model = shapeAppearanceModel ?: ShapeAppearanceModel.builder(
+            context,
+            shapeAppearanceId,
+            0
+        ).build()
             .also { shapeAppearanceModel = it }
         val bitmap = createBitmap(outWidth, outHeight)
         bitmap.applyCanvas {

app/src/main/java/com/materialstudies/owl/util/transition/MaterialContainerTransition.kt

@@ -94,13 +94,19 @@ class MaterialContainerTransition(
         // TODO handle if drawIn is not at [0, 0] as bounds in screen co-ords
         val drawIn = view.findAncestorById(drawInId)
 
+        val startBounds = startValues.values[PROP_BOUNDS] as RectF
+        val endBounds = endValues.values[PROP_BOUNDS] as RectF
         val dr = MaterialContainerTransitionDrawable(
             startValues.values[PROP_BITMAP] as Bitmap,
-            startValues.values[PROP_BOUNDS] as RectF,
-            (startValues.values[PROP_SHAPE_APPEARANCE] as ShapeAppearanceModel?).toCornerRounding(),
+            startBounds,
+            (startValues.values[PROP_SHAPE_APPEARANCE] as ShapeAppearanceModel?).toCornerRounding(
+                startBounds
+            ),
             endValues.values[PROP_BITMAP] as Bitmap,
-            endValues.values[PROP_BOUNDS] as RectF,
-            (endValues.values[PROP_SHAPE_APPEARANCE] as ShapeAppearanceModel?).toCornerRounding(),
+            endBounds,
+            (endValues.values[PROP_SHAPE_APPEARANCE] as ShapeAppearanceModel?).toCornerRounding(
+                endBounds
+            ),
             view.descendantBackgroundColor()
         )
 
@@ -153,11 +159,12 @@ class MaterialContainerTransition(
                     .use {
                         val shapeAppId = it.getResourceId(0, -1)
                         if (shapeAppId != -1) {
-                            transitionValues.values[PROP_SHAPE_APPEARANCE] = ShapeAppearanceModel(
-                                view.context,
-                                shapeAppId,
-                                0
-                            )
+                            transitionValues.values[PROP_SHAPE_APPEARANCE] = ShapeAppearanceModel
+                                .builder(
+                                    view.context,
+                                    shapeAppId,
+                                    0
+                                ).build()
                         }
                     }
             }

app/src/main/res/layout/fragment_learn.xml

@@ -25,7 +25,7 @@
         type="com.materialstudies.owl.model.Course"/>
     <variable
         name="imageLoadListener"
-        type="com.bumptech.glide.request.RequestListener"/>
+        type="com.materialstudies.owl.util.GlideDrawableLoadListener"/>
   </data>
 
   <FrameLayout
@@ -54,10 +54,10 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintDimensionRatio="4:3"
-            app:srcCompat="@drawable/course_image_placeholder"
-            android:foreground="@drawable/learn_image_scrim"
             android:scaleType="centerCrop"
+            android:foreground="@drawable/learn_image_scrim"
             app:srcUrl="@{course.thumbUrl}"
+            app:placeholder="@{@drawable/course_image_placeholder}"
             app:loadListener="@{imageLoadListener}"/>
 
         <androidx.appcompat.widget.Toolbar

build.gradle

@@ -13,14 +13,14 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
-    ext.nav_version = '2.2.0-alpha01'
+    ext.kotlin_version = '1.3.50'
+    ext.nav_version = '2.2.0-beta01'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-alpha06'
+        classpath 'com.android.tools.build:gradle:3.6.0-beta01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists