Merge remote-tracking branch 'origin/cosmote' into cosmote

@@ -2,10 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#ffffffff"/>
 
-    <stroke
-        android:width="1.5dp"
-        android:color="#3C464F" />
-
     <padding
         android:left="1dp"
         android:top="1dp"

+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1.5dp"
+        android:color="@android:color/transparent" />
+
+    <corners
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"
+        android:bottomLeftRadius="20dp"
+        android:bottomRightRadius="20dp"/>
+    <solid android:color="@android:color/transparent" />
+</shape>
\ No newline at end of file

@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="#F3F3F3">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_loyalty_wallet_header"
@@ -36,7 +36,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/cl_loyalty_wallet_header">
+        android:layout_below="@+id/cl_loyalty_wallet_header"
+        android:background="#F3F3F3">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"

@@ -5,6 +5,7 @@
     android:layout_width="@dimen/width_full"
     android:layout_height="@dimen/height_carousel"
     android:layout_marginLeft="10dp"
+    android:elevation="2dp"
     android:background="@drawable/bottom_border">
 
     <LinearLayout

@@ -8,8 +8,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="24dp">
+        android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/rl_header"
@@ -121,8 +120,7 @@
                 android:id="@+id/rl_home_coupons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/rl_home_campaigns"
-                android:background="@drawable/shape_cos_gradient_coupons_bg">
+                android:layout_below="@id/rl_home_campaigns">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_home_coupons"
@@ -160,7 +158,7 @@
                 android:layout_height="110dp"
                 android:layout_below="@id/hsv_title"
                 android:background="@android:color/white"
-                android:paddingBottom="10dp"
+                android:paddingBottom="15dp"
                 android:scrollbars="none">
 
                 <LinearLayout

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="360dp"
+    android:layout_width="@dimen/width_full"
     android:layout_height="240dp"
+    app:cardCornerRadius="20dp"
+    android:layout_marginBottom="2dp"
     android:layout_marginStart="10dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -27,9 +29,8 @@
             android:id="@+id/iv_gift_item_logo"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/shape_cos_transparent_rounded"
             android:clipToOutline="true"
-            android:scaleType="centerCrop"
+            android:scaleType="fitXY"
             android:src="@drawable/ic_banner_gift"
             app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_75_guideline"
             app:layout_constraintEnd_toEndOf="parent"
@@ -99,4 +100,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</RelativeLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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="360dp"
+    android:layout_width="@dimen/width_full"
     android:layout_height="150dp"
     android:layout_marginStart="10dp"
     android:background="@drawable/selector_cos_campaign">

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="360dp"
+    android:layout_width="@dimen/width_full"
     android:layout_height="240dp"
+    app:cardCornerRadius="20dp"
+    android:layout_marginBottom="2dp"
     android:layout_marginStart="10dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -85,4 +87,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</RelativeLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file