Design tweaks to My Courses and made implementation consistent with Featured.

Change-Id: I1979b726c6a4614437ad4dd9c6a0a75afebc8f69

Author: nickbutcher

app/src/main/java/com/materialstudies/owl/ui/mycourses/MyCoursesAdapter.kt

@@ -16,7 +16,6 @@ package com.materialstudies.owl.ui.mycourses
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
@@ -26,40 +25,38 @@ import com.materialstudies.owl.model.Course
 import com.materialstudies.owl.model.CourseDiff
 import com.materialstudies.owl.util.ShapeAppearanceTransformation
 
-class MyCourseViewHolder(
-    private val binding: CourseItemBinding
-) : RecyclerView.ViewHolder(binding.root) {
-
-    fun bind(course: Course, imageTransform: ShapeAppearanceTransformation) {
-        binding.course = course
-        Glide.with(binding.courseImage)
-            .load("https://source.unsplash.com/random/200x200")
-            .transform(imageTransform)
-            .into(binding.courseImage)
-        Glide.with(binding.courseInstructor)
-            .load("https://i.pravatar.cc/56")
-            .circleCrop()
-            .into(binding.courseInstructor)
-        binding.executePendingBindings()
-    }
-}
-
-class MyCoursesAdapter(private val lifecycle: LifecycleOwner) :
-    ListAdapter<Course, MyCourseViewHolder>(CourseDiff) {
+class MyCoursesAdapter : ListAdapter<Course, MyCourseViewHolder>(CourseDiff) {
 
     private val shapeTransform =
         ShapeAppearanceTransformation(R.style.ShapeAppearance_Owl_SmallComponent)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyCourseViewHolder {
-        val binding =
-            CourseItemBinding.inflate(LayoutInflater.from(parent.context), parent, false).apply {
-                lifecycleOwner = lifecycle
-            }
+        val binding = CourseItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return MyCourseViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: MyCourseViewHolder, position: Int) {
-        holder.bind(getItem(position), shapeTransform)
+        holder.bind(getItem(position), position, shapeTransform)
     }
 
 }
+
+class MyCourseViewHolder(
+    private val binding: CourseItemBinding
+) : RecyclerView.ViewHolder(binding.root) {
+
+    fun bind(course: Course, position: Int, imageTransform: ShapeAppearanceTransformation) {
+        binding.run {
+            this.course = course
+            Glide.with(courseImage)
+                .load("https://source.unsplash.com/collection/369966/?$position")
+                .transform(imageTransform)
+                .into(courseImage)
+            Glide.with(courseInstructor)
+                .load("https://i.pravatar.cc/56?$position")
+                .circleCrop()
+                .into(courseInstructor)
+            executePendingBindings()
+        }
+    }
+}

app/src/main/java/com/materialstudies/owl/ui/mycourses/MyCoursesFragment.kt

@@ -23,20 +23,15 @@ import com.materialstudies.owl.model.courses
 
 class MyCoursesFragment : Fragment() {
 
-    private val adapter = MyCoursesAdapter(this)
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        adapter.submitList(courses)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
         val binding = FragmentMyCoursesBinding.inflate(inflater, container, false).apply {
-            list.adapter = adapter
+            list.adapter = MyCoursesAdapter().apply {
+                submitList(courses)
+            }
         }
         return binding.root
     }

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

@@ -72,7 +72,8 @@
         android:paddingTop="@dimen/grid_2"
         android:text="@{course.name}"
         android:textColor="?attr/colorOnSurface"
-        android:textAppearance="?attr/textAppearanceBody1"/>
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        app:lineHeight="22sp"/>
 
     <ImageView
         android:id="@+id/course_icon"
@@ -96,7 +97,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:paddingStart="@dimen/grid_1"
         android:paddingVertical="@dimen/grid_2"
-        android:textColor="?attr/colorOnSurface"
+        android:textColor="?attr/colorPrimary"
         android:textAppearance="?attr/textAppearanceCaption"
         android:text="@{@string/course_steps(course.step, course.steps)}"/>
 

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

@@ -29,8 +29,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp"
-    >
+        app:liftOnScroll="true"
+        app:liftOnScrollTargetViewId="@id/featured_grid">
 
       <androidx.appcompat.widget.Toolbar
           android:layout_width="match_parent"

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

@@ -27,7 +27,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:elevation="0dp">
+        app:liftOnScroll="true"
+        app:liftOnScrollTargetViewId="@id/list">
 
       <androidx.appcompat.widget.Toolbar
           android:layout_width="match_parent"