From e684c842aade7bcad590386a7dfe29b15b9ad3f8 Mon Sep 17 00:00:00 2001
From: alexzatsepin <az@mapswithme.com>
Date: Wed, 9 Sep 2020 18:19:44 +0300
Subject: [PATCH] [android] Fixed look of card backgrounds on discovery screen
 for night theme. It was broken after material components theme integration

---
 android/res/layout/catalog_promo_item_card.xml       | 3 ++-
 android/res/layout/item_discovery_expert.xml         | 4 +++-
 android/res/layout/item_discovery_expert_error.xml   | 4 +++-
 android/res/layout/item_discovery_expert_loading.xml | 4 +++-
 android/res/layout/item_discovery_hotel_product.xml  | 4 +++-
 android/res/layout/item_discovery_search.xml         | 3 ++-
 android/res/layout/item_discovery_simple_error.xml   | 4 +++-
 android/res/layout/item_discovery_simple_loading.xml | 4 +++-
 8 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/android/res/layout/catalog_promo_item_card.xml b/android/res/layout/catalog_promo_item_card.xml
index f4d16b300e..d6a6389172 100644
--- a/android/res/layout/catalog_promo_item_card.xml
+++ b/android/res/layout/catalog_promo_item_card.xml
@@ -9,7 +9,8 @@
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:foreground="?clickableBackground"
       android:orientation="vertical"
diff --git a/android/res/layout/item_discovery_expert.xml b/android/res/layout/item_discovery_expert.xml
index 4231d9541a..3f00d14e52 100644
--- a/android/res/layout/item_discovery_expert.xml
+++ b/android/res/layout/item_discovery_expert.xml
@@ -4,11 +4,13 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_height="wrap_content"
   android:layout_width="wrap_content"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:padding="@dimen/margin_quarter"
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:foreground="?clickableBackground"
       android:orientation="vertical"
diff --git a/android/res/layout/item_discovery_expert_error.xml b/android/res/layout/item_discovery_expert_error.xml
index e1cba0432d..21eef1f258 100644
--- a/android/res/layout/item_discovery_expert_error.xml
+++ b/android/res/layout/item_discovery_expert_error.xml
@@ -3,11 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:padding="@dimen/margin_quarter"
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/res/layout/item_discovery_expert_loading.xml b/android/res/layout/item_discovery_expert_loading.xml
index 55598fdb3a..5682703c39 100644
--- a/android/res/layout/item_discovery_expert_loading.xml
+++ b/android/res/layout/item_discovery_expert_loading.xml
@@ -3,11 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:padding="@dimen/margin_quarter"
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/res/layout/item_discovery_hotel_product.xml b/android/res/layout/item_discovery_hotel_product.xml
index f4f4778bd6..774fdfc164 100644
--- a/android/res/layout/item_discovery_hotel_product.xml
+++ b/android/res/layout/item_discovery_hotel_product.xml
@@ -4,11 +4,13 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_height="wrap_content"
   android:layout_width="wrap_content"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:padding="@dimen/margin_quarter"
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:layout_width="@dimen/gallery_product_width"
       android:layout_height="match_parent"
diff --git a/android/res/layout/item_discovery_search.xml b/android/res/layout/item_discovery_search.xml
index 83f0001121..b6388da742 100644
--- a/android/res/layout/item_discovery_search.xml
+++ b/android/res/layout/item_discovery_search.xml
@@ -9,7 +9,8 @@
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:layout_width="@dimen/gallery_product_width"
       android:layout_height="match_parent"
diff --git a/android/res/layout/item_discovery_simple_error.xml b/android/res/layout/item_discovery_simple_error.xml
index 208c9d876b..c6f012bdf1 100644
--- a/android/res/layout/item_discovery_simple_error.xml
+++ b/android/res/layout/item_discovery_simple_error.xml
@@ -3,11 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:padding="@dimen/margin_quarter"
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/android/res/layout/item_discovery_simple_loading.xml b/android/res/layout/item_discovery_simple_loading.xml
index 65d640ef62..aea7401dcd 100644
--- a/android/res/layout/item_discovery_simple_loading.xml
+++ b/android/res/layout/item_discovery_simple_loading.xml
@@ -3,11 +3,13 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:padding="@dimen/margin_quarter"
   android:clipToPadding="false">
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardBackground">
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"