Merge branch 'feature/nextgen' of github.com:KotatsuApp/Kotatsu into feature/nextgen

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt

@@ -48,6 +48,8 @@ fun categoryAD(
 		binding.imageViewCover2,
 		ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76))
 	)
+	binding.imageViewCover2.backgroundTintList = ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76))
+	binding.imageViewCover3.backgroundTintList = ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153))
 	val fallback = ColorDrawable(Color.TRANSPARENT)
 	val coverViews = arrayOf(binding.imageViewCover1, binding.imageViewCover2, binding.imageViewCover3)
 	val imageRequests = arrayOfNulls<Disposable?>(coverViews.size)

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

@@ -2,7 +2,6 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -14,8 +13,9 @@
 
 		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:id="@+id/collapsingToolbarLayout"
+			style="?attr/collapsingToolbarLayoutMediumStyle"
 			android:layout_width="match_parent"
-			android:layout_height="@dimen/toolbar_height_expanded"
+			android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed"
 			app:toolbarId="@id/toolbar">
 

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

@@ -16,6 +16,8 @@
 		android:layout_height="64dp"
 		android:layout_marginStart="24dp"
 		android:layout_marginBottom="12dp"
+		android:background="?attr/colorSecondaryContainer"
+		android:backgroundTintMode="src_atop"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintDimensionRatio="W,13:18"
@@ -23,6 +25,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
 		app:tintMode="src_atop"
+		tools:backgroundTint="#99FFFFFF"
 		tools:src="@tools:sample/backgrounds/scenic"
 		tools:tint="#99FFFFFF" />
 
@@ -31,6 +34,8 @@
 		android:layout_width="0dp"
 		android:layout_height="64dp"
 		android:layout_marginStart="12dp"
+		android:background="?attr/colorSecondaryContainer"
+		android:backgroundTintMode="src_atop"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintDimensionRatio="W,13:18"
@@ -38,6 +43,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
 		app:tintMode="src_atop"
+		tools:backgroundTint="#4DFFFFFF"
 		tools:src="@tools:sample/backgrounds/scenic"
 		tools:tint="#4DFFFFFF" />
 
@@ -46,6 +52,8 @@
 		android:layout_width="0dp"
 		android:layout_height="64dp"
 		android:layout_marginTop="12dp"
+		android:background="?attr/colorSecondaryContainer"
+		android:backgroundTintMode="src_atop"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintDimensionRatio="W,13:18"