my rewards box tile part2

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 
 ext {
 ext {
     PUBLISH_GROUP_ID = 'ly.warp'
     PUBLISH_GROUP_ID = 'ly.warp'
-    PUBLISH_VERSION = '4.5.5.4r23'
+    PUBLISH_VERSION = '4.5.5.4r24'
     PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
     PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
 }
 }
 
 

@@ -2,6 +2,7 @@ package ly.warp.sdk.fragments;
 
 
 import static android.app.Activity.RESULT_OK;
 import static android.app.Activity.RESULT_OK;
 
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
@@ -10,6 +11,8 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
@@ -24,6 +27,10 @@ import androidx.fragment.app.Fragment;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
 
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
 import ly.warp.sdk.R;
 import ly.warp.sdk.R;
 import ly.warp.sdk.activities.ActiveCouponsActivity;
 import ly.warp.sdk.activities.ActiveCouponsActivity;
 import ly.warp.sdk.activities.ActiveUnifiedCouponsActivity;
 import ly.warp.sdk.activities.ActiveUnifiedCouponsActivity;
@@ -36,6 +43,7 @@ import ly.warp.sdk.io.models.ActiveDFYCouponEventModel;
 import ly.warp.sdk.io.models.Coupon;
 import ly.warp.sdk.io.models.Coupon;
 import ly.warp.sdk.io.models.Couponset;
 import ly.warp.sdk.io.models.Couponset;
 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
+import ly.warp.sdk.io.models.SortTileModel;
 import ly.warp.sdk.io.models.VouchersActivityEventModel;
 import ly.warp.sdk.io.models.VouchersActivityEventModel;
 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
 import ly.warp.sdk.utils.WarpUtils;
 import ly.warp.sdk.utils.WarpUtils;
@@ -59,7 +67,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
             mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle;
             mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle;
     private ConstraintLayout mLlQuestionnaireCentered,
     private ConstraintLayout mLlQuestionnaireCentered,
             mLlQuestionnaire, mLlUserBadge, mLlUserBadgeCentered;
             mLlQuestionnaire, mLlUserBadge, mLlUserBadgeCentered;
-    private LinearLayout mLlEmptyWallet,
+    private LinearLayout mLlEmptyWallet, mLlTilesParent,
             mLlBannerInfo, mLlVouchers, mLlVouchersSpinner,
             mLlBannerInfo, mLlVouchers, mLlVouchersSpinner,
             mLlVouchersDisabled;
             mLlVouchersDisabled;
     private ImageView mIvHistory;
     private ImageView mIvHistory;
@@ -73,6 +81,9 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
             mGiftsCountPressed = false, mBoxCountPressed = false;
             mGiftsCountPressed = false, mBoxCountPressed = false;
     private RelativeLayout mRlDeals, mRlUnified, mRlGifts, mRlBox;
     private RelativeLayout mRlDeals, mRlUnified, mRlGifts, mRlBox;
     private boolean mIsDealsEmpty = false, mIsMarketsEmpty = false, mIsCouponsEmpty = false;
     private boolean mIsDealsEmpty = false, mIsMarketsEmpty = false, mIsCouponsEmpty = false;
+    private HorizontalScrollView mTilesScroll;
+    private View mFirstStart, mFirstEnd, mSecondStart, mSecondEnd;
+    private ArrayList<SortTileModel> mSortTileList = new ArrayList<>();
 
 
     // ===========================================================
     // ===========================================================
     // Methods for/from SuperClass/Interfaces
     // Methods for/from SuperClass/Interfaces
@@ -101,15 +112,15 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
         mTvUserBadgeCentered = view.findViewById(R.id.tv_type_centered);
         mTvUserBadgeCentered = view.findViewById(R.id.tv_type_centered);
         mLlEmptyWallet = view.findViewById(R.id.ll_empty_wallet);
         mLlEmptyWallet = view.findViewById(R.id.ll_empty_wallet);
         mIvHistory = view.findViewById(R.id.iv_loyalty_history);
         mIvHistory = view.findViewById(R.id.iv_loyalty_history);
-        mTvDealsCountBadge = view.findViewById(R.id.tv_deals_count);
-        mTvUnifiedCountBadge = view.findViewById(R.id.tv_sm_count);
-        mTvGiftsCountBadge = view.findViewById(R.id.tv_gifts_count);
-        mTvBoxCountBadge = view.findViewById(R.id.tv_box_count);
+//        mTvDealsCountBadge = view.findViewById(R.id.tv_deals_count);
+//        mTvUnifiedCountBadge = view.findViewById(R.id.tv_sm_count);
+//        mTvGiftsCountBadge = view.findViewById(R.id.tv_gifts_count);
+//        mTvBoxCountBadge = view.findViewById(R.id.tv_box_count);
         mLlBannerInfo = view.findViewById(R.id.ll_banner_info_new);
         mLlBannerInfo = view.findViewById(R.id.ll_banner_info_new);
-        mRlDeals = view.findViewById(R.id.rv_deals_count);
-        mRlUnified = view.findViewById(R.id.rv_sm_count);
-        mRlGifts = view.findViewById(R.id.rv_gifts_count);
-        mRlBox = view.findViewById(R.id.rv_box_count);
+//        mRlDeals = view.findViewById(R.id.rv_deals_count);
+//        mRlUnified = view.findViewById(R.id.rv_sm_count);
+//        mRlGifts = view.findViewById(R.id.rv_gifts_count);
+//        mRlBox = view.findViewById(R.id.rv_box_count);
         mCvVouchers = view.findViewById(R.id.cv_vouchers);
         mCvVouchers = view.findViewById(R.id.cv_vouchers);
         mCvVouchersDisabled = view.findViewById(R.id.cv_vouchers_disabled);
         mCvVouchersDisabled = view.findViewById(R.id.cv_vouchers_disabled);
         mLlVouchers = view.findViewById(R.id.ll_vouchers);
         mLlVouchers = view.findViewById(R.id.ll_vouchers);
@@ -119,6 +130,43 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
         mTvVouchersDisabledSubtitle = view.findViewById(R.id.tv_vouchers_info_title_disabled);
         mTvVouchersDisabledSubtitle = view.findViewById(R.id.tv_vouchers_info_title_disabled);
         mTvVouchersTitle = view.findViewById(R.id.tv_vouchers_title);
         mTvVouchersTitle = view.findViewById(R.id.tv_vouchers_title);
         mTvVouchersSubtitle = view.findViewById(R.id.tv_vouchers_info_title);
         mTvVouchersSubtitle = view.findViewById(R.id.tv_vouchers_info_title);
+        mTilesScroll = view.findViewById(R.id.scr_tiles);
+        mLlTilesParent = view.findViewById(R.id.ll_tiles_parent);
+        mFirstStart = view.findViewById(R.id.v_first_start);
+        mFirstEnd = view.findViewById(R.id.v_first_end);
+        mSecondStart = view.findViewById(R.id.v_second_start);
+        mSecondEnd = view.findViewById(R.id.v_second_end);
+
+        defineAndSortTiles();
+        createTiles();
+
+        // Smooth scroll to the start initially
+        // Comment out if needed
+//        mTilesScroll.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                mTilesScroll.fullScroll(HorizontalScrollView.FOCUS_LEFT);
+//            }
+//        });
+
+        mTilesScroll.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+            // Check scroll position
+            int maxScrollX = mTilesScroll.getChildAt(0).getWidth() - mTilesScroll.getWidth();
+
+            if (scrollX == 0) {
+                // Scrolled to the start
+                mFirstStart.setVisibility(View.VISIBLE);
+                mFirstEnd.setVisibility(View.GONE);
+                mSecondStart.setVisibility(View.GONE);
+                mSecondEnd.setVisibility(View.VISIBLE);
+            } else if (scrollX == maxScrollX) {
+                // Scrolled to the end
+                mFirstStart.setVisibility(View.GONE);
+                mFirstEnd.setVisibility(View.VISIBLE);
+                mSecondStart.setVisibility(View.VISIBLE);
+                mSecondEnd.setVisibility(View.GONE);
+            }
+        });
     }
     }
 
 
     @Override
     @Override
@@ -221,41 +269,41 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
             return;
             return;
         }
         }
         /** Active Unified Banner */
         /** Active Unified Banner */
-        if (view.getId() == R.id.rv_sm_count) {
-            if (!mUnifiedCountPressed) {
-                mUnifiedCountPressed = true;
-                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
-                        .concat(":")
-                        .concat("ActiveMarketBanner"));
-
-                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
-                analyticsEvent.setEventName("did_tap_market_active_badge");
-                analyticsEvent.setParameter("screen", "Loyalty Wallet");
-                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
-
-                Intent intent = new Intent(getContext(), ActiveUnifiedCouponsActivity.class);
-                startActivity(intent);
-            }
-            return;
-        }
+//        if (view.getId() == R.id.rv_sm_count) {
+//            if (!mUnifiedCountPressed) {
+//                mUnifiedCountPressed = true;
+//                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+//                        .concat(":")
+//                        .concat("ActiveMarketBanner"));
+//
+//                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+//                analyticsEvent.setEventName("did_tap_market_active_badge");
+//                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+//                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+//
+//                Intent intent = new Intent(getContext(), ActiveUnifiedCouponsActivity.class);
+//                startActivity(intent);
+//            }
+//            return;
+//        }
         /** Active Coupons Banner */
         /** Active Coupons Banner */
-        if (view.getId() == R.id.rv_gifts_count) {
-            if (!mGiftsCountPressed) {
-                mGiftsCountPressed = true;
-                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
-                        .concat(":")
-                        .concat("ActiveLoyaltyBanner"));
-
-                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
-                analyticsEvent.setEventName("did_tap_gifts_for_you_active_badge");
-                analyticsEvent.setParameter("screen", "Loyalty Wallet");
-                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
-
-                Intent intent = new Intent(getContext(), ActiveCouponsActivity.class);
-                startActivity(intent);
-            }
-            return;
-        }
+//        if (view.getId() == R.id.rv_gifts_count) {
+//            if (!mGiftsCountPressed) {
+//                mGiftsCountPressed = true;
+//                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+//                        .concat(":")
+//                        .concat("ActiveLoyaltyBanner"));
+//
+//                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+//                analyticsEvent.setEventName("did_tap_gifts_for_you_active_badge");
+//                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+//                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+//
+//                Intent intent = new Intent(getContext(), ActiveCouponsActivity.class);
+//                startActivity(intent);
+//            }
+//            return;
+//        }
         /** Coupons History */
         /** Coupons History */
         if (view.getId() == R.id.cl_deals_win_inner) {
         if (view.getId() == R.id.cl_deals_win_inner) {
             if (!mHistoryPressed) {
             if (!mHistoryPressed) {
@@ -275,24 +323,24 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
             return;
             return;
         }
         }
         /** Active Box Banner */
         /** Active Box Banner */
-        if (view.getId() == R.id.rv_box_count) {
-            if (!mBoxCountPressed) {
-                mBoxCountPressed = true;
-                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
-                        .concat(":")
-                        .concat("ActiveBoxBanner"));
-
-                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
-                analyticsEvent.setEventName("did_tap_box_active_badge");
-                analyticsEvent.setParameter("screen", "Loyalty Wallet");
-                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
-
-                ActiveBoxCouponEventModel activeBoxEventModel = new ActiveBoxCouponEventModel();
-                activeBoxEventModel.setPressed(true);
-                EventBus.getDefault().post(new WarplyEventBusManager(activeBoxEventModel));
-            }
-            return;
-        }
+//        if (view.getId() == R.id.rv_box_count) {
+//            if (!mBoxCountPressed) {
+//                mBoxCountPressed = true;
+//                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+//                        .concat(":")
+//                        .concat("ActiveBoxBanner"));
+//
+//                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+//                analyticsEvent.setEventName("did_tap_box_active_badge");
+//                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+//                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+//
+//                ActiveBoxCouponEventModel activeBoxEventModel = new ActiveBoxCouponEventModel();
+//                activeBoxEventModel.setPressed(true);
+//                EventBus.getDefault().post(new WarplyEventBusManager(activeBoxEventModel));
+//            }
+//            return;
+//        }
         /** Unified History */
         /** Unified History */
         if (view.getId() == R.id.cl_market_inner) {
         if (view.getId() == R.id.cl_market_inner) {
             if (!mHistoryMarketPressed) {
             if (!mHistoryMarketPressed) {
@@ -344,23 +392,23 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
             return;
             return;
         }
         }
         /** Active Deals Banner */
         /** Active Deals Banner */
-        if (view.getId() == R.id.cl_mygifts || view.getId() == R.id.rv_deals_count) {
-            if (!mDfyPressed) {
-                mDfyPressed = true;
-                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
-                        .concat(":")
-                        .concat("ActiveDealsBanner"));
-
-                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
-                analyticsEvent.setEventName("did_tap_deals_for_you_active_badge");
-                analyticsEvent.setParameter("screen", "Loyalty Wallet");
-                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
-
-                ActiveDFYCouponEventModel activeCouponEventModel = new ActiveDFYCouponEventModel();
-                activeCouponEventModel.setPressed(true);
-                EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel));
-            }
-        }
+//        if (view.getId() == R.id.rv_deals_count) {
+//            if (!mDfyPressed) {
+//                mDfyPressed = true;
+//                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+//                        .concat(":")
+//                        .concat("ActiveDealsBanner"));
+//
+//                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+//                analyticsEvent.setEventName("did_tap_deals_for_you_active_badge");
+//                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+//                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+//
+//                ActiveDFYCouponEventModel activeCouponEventModel = new ActiveDFYCouponEventModel();
+//                activeCouponEventModel.setPressed(true);
+//                EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel));
+//            }
+//        }
     }
     }
 
 
     @Override
     @Override
@@ -442,11 +490,170 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
     // Methods
     // Methods
     // ===========================================================
     // ===========================================================
 
 
+    private void defineAndSortTiles() {
+        SortTileModel tileDeals = new SortTileModel();
+        if (WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() > 0) {
+            tileDeals.setCount(WarplyManagerHelper.getActiveDFYCoupons().size());
+            tileDeals.setWeight(3);
+        } else {
+            tileDeals.setCount(0);
+            tileDeals.setWeight(3);
+        }
+        mSortTileList.add(tileDeals);
+
+        SortTileModel tileUnified = new SortTileModel();
+        if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) {
+            tileUnified.setCount(WarplyManagerHelper.getMarketCouponsList().size());
+            tileUnified.setWeight(2);
+        } else {
+            tileUnified.setCount(0);
+            tileUnified.setWeight(2);
+        }
+        mSortTileList.add(tileUnified);
+
+        SortTileModel tileCoupons = new SortTileModel();
+        if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0) {
+            tileCoupons.setCount(WarplyManagerHelper.getCouponList().size());
+            tileCoupons.setWeight(1);
+        } else {
+            tileCoupons.setCount(0);
+            tileCoupons.setWeight(1);
+        }
+        mSortTileList.add(tileCoupons);
+
+        SortTileModel tileBoxCoupons = new SortTileModel();
+        if (WarplyManagerHelper.getActiveBoxCoupons() != null && WarplyManagerHelper.getActiveBoxCoupons().size() > 0) {
+            tileBoxCoupons.setCount(WarplyManagerHelper.getActiveBoxCoupons().size());
+            tileBoxCoupons.setWeight(0);
+        } else {
+            tileBoxCoupons.setCount(0);
+            tileBoxCoupons.setWeight(0);
+        }
+        mSortTileList.add(tileBoxCoupons);
+
+        Collections.sort(mSortTileList, (o1, o2) -> {
+            // First, compare by count in descending order
+            int countComparison = Integer.compare(o2.getCount(), o1.getCount());
+            if (countComparison != 0) {
+                return countComparison;
+            } else {
+                // If count is the same, compare by weight in descending order
+                return Integer.compare(o2.getWeight(), o1.getWeight());
+            }
+        });
+    }
+
+    private void createTiles() {
+        if (getContext() != null || (getActivity() != null && !getActivity().isFinishing())) {
+            if (mSortTileList != null && mSortTileList.size() > 0) {
+                for (SortTileModel sortModel : mSortTileList) {
+                    /** Deals Badge */
+                    if (sortModel.getWeight() == 3) {
+                        View view = LayoutInflater.from(getContext()).inflate(R.layout.tile_active_dfy, mLlTilesParent, false);
+                        view.setOnClickListener(v -> {
+                            if (!mDfyPressed) {
+                                mDfyPressed = true;
+                                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+                                        .concat(":")
+                                        .concat("ActiveDealsBanner"));
+
+                                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+                                analyticsEvent.setEventName("did_tap_deals_for_you_active_badge");
+                                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+                                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+
+                                ActiveDFYCouponEventModel activeCouponEventModel = new ActiveDFYCouponEventModel();
+                                activeCouponEventModel.setPressed(true);
+                                EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel));
+                            }
+                        });
+                        mTvDealsCountBadge = (TextView) view.findViewById(R.id.tv_deals_count);
+                        mLlTilesParent.addView(view);
+                    }
+                    /** Unified Coupons List */
+                    else if (sortModel.getWeight() == 2) {
+                        View view = LayoutInflater.from(getContext()).inflate(R.layout.tile_active_unified, mLlTilesParent, false);
+                        view.setOnClickListener(v -> {
+                            if (!mUnifiedCountPressed) {
+                                mUnifiedCountPressed = true;
+                                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+                                        .concat(":")
+                                        .concat("ActiveMarketBanner"));
+
+                                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+                                analyticsEvent.setEventName("did_tap_market_active_badge");
+                                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+                                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+
+                                Intent intent = new Intent(getContext(), ActiveUnifiedCouponsActivity.class);
+                                startActivity(intent);
+                            }
+                        });
+                        mTvUnifiedCountBadge = (TextView) view.findViewById(R.id.tv_sm_count);
+                        mLlTilesParent.addView(view);
+                    }
+                    /** Coupon List */
+                    else if (sortModel.getWeight() == 1) {
+                        View view = LayoutInflater.from(getContext()).inflate(R.layout.tile_active_coupons, mLlTilesParent, false);
+                        view.setOnClickListener(v -> {
+                            if (!mGiftsCountPressed) {
+                                mGiftsCountPressed = true;
+                                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+                                        .concat(":")
+                                        .concat("ActiveLoyaltyBanner"));
+
+                                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+                                analyticsEvent.setEventName("did_tap_gifts_for_you_active_badge");
+                                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+                                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+
+                                Intent intent = new Intent(getContext(), ActiveCouponsActivity.class);
+                                startActivity(intent);
+                            }
+                        });
+                        mTvGiftsCountBadge = (TextView) view.findViewById(R.id.tv_gifts_count);
+                        mLlTilesParent.addView(view);
+                    }
+                    /** Box Badge */
+                    else if (sortModel.getWeight() == 0) {
+                        View view = LayoutInflater.from(getContext()).inflate(R.layout.tile_active_box, mLlTilesParent, false);
+                        view.setOnClickListener(v -> {
+                            if (!mBoxCountPressed) {
+                                mBoxCountPressed = true;
+                                WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
+                                        .concat(":")
+                                        .concat("ActiveBoxBanner"));
+
+                                LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
+                                analyticsEvent.setEventName("did_tap_box_active_badge");
+                                analyticsEvent.setParameter("screen", "Loyalty Wallet");
+                                EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
+
+                                ActiveBoxCouponEventModel activeBoxEventModel = new ActiveBoxCouponEventModel();
+                                activeBoxEventModel.setPressed(true);
+                                EventBus.getDefault().post(new WarplyEventBusManager(activeBoxEventModel));
+                            }
+                        });
+                        mTvBoxCountBadge = (TextView) view.findViewById(R.id.tv_box_count);
+                        mLlTilesParent.addView(view);
+                    }
+                }
+            }
+        }
+    }
+
     private void initViews() {
     private void initViews() {
         if (WarpUtils.getUserNonTelco(getContext())) {
         if (WarpUtils.getUserNonTelco(getContext())) {
             nonTelcoDialog();
             nonTelcoDialog();
         }
         }
 
 
+        /** Deals Badge */
+        if (WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() > 0)
+            mTvDealsCountBadge.setText(String.valueOf(WarplyManagerHelper.getActiveDFYCoupons().size()));
+        else
+            mTvDealsCountBadge.setText("0");
+        /** Deals Badge */
+
         /** Unified Coupons List */
         /** Unified Coupons List */
         if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
         if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
             mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size()));
             mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size()));
@@ -461,35 +668,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
             mTvGiftsCountBadge.setText("0");
             mTvGiftsCountBadge.setText("0");
         /** Coupon List */
         /** Coupon List */
 
 
-        /** Deals Badge */
-        if (WarplyManagerHelper.getActiveDFYCoupons() != null)
-            mTvDealsCountBadge.setText(String.valueOf(WarplyManagerHelper.getActiveDFYCoupons().size()));
-        else
-            mTvDealsCountBadge.setText("0");
-        /** Deals Badge */
-
         /** Box Badge */
         /** Box Badge */
-        if (WarplyManagerHelper.getActiveBoxCoupons() != null)
+        if (WarplyManagerHelper.getActiveBoxCoupons() != null && WarplyManagerHelper.getActiveBoxCoupons().size() > 0)
             mTvBoxCountBadge.setText(String.valueOf(WarplyManagerHelper.getActiveBoxCoupons().size()));
             mTvBoxCountBadge.setText(String.valueOf(WarplyManagerHelper.getActiveBoxCoupons().size()));
         else
         else
             mTvBoxCountBadge.setText("0");
             mTvBoxCountBadge.setText("0");
         /** Deals Badge */
         /** Deals Badge */
 
 
-//        if (WarplyManagerHelper.getConsumer() != null) {
-//            if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
-//                mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
-//                mLlQuestionnaire.setVisibility(View.GONE);
-//                mLlUserBadge.setVisibility(View.VISIBLE);
-//            } else {
-//                mLlUserBadge.setVisibility(View.GONE);
-//                mLlQuestionnaire.setVisibility(View.VISIBLE);
-//            }
-//        }
-
-        /** History View */
-//        checkHistoryEmpty();
-        /** History View */
-
         /** Empty View */
         /** Empty View */
         checkForEmpty();
         checkForEmpty();
         /** Empty View */
         /** Empty View */
@@ -531,10 +716,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
         mLlUserBadge.setOnClickListener(this);
         mLlUserBadge.setOnClickListener(this);
         mLlUserBadgeCentered.setOnClickListener(this);
         mLlUserBadgeCentered.setOnClickListener(this);
         mIvHistory.setOnClickListener(this);
         mIvHistory.setOnClickListener(this);
-        mRlDeals.setOnClickListener(this);
-        mRlUnified.setOnClickListener(this);
-        mRlGifts.setOnClickListener(this);
-        mRlBox.setOnClickListener(this);
+//        mRlDeals.setOnClickListener(this);
+//        mRlUnified.setOnClickListener(this);
+//        mRlGifts.setOnClickListener(this);
+//        mRlBox.setOnClickListener(this);
         mCvVouchers.setOnClickListener(this);
         mCvVouchers.setOnClickListener(this);
         mCvVouchersDisabled.setOnClickListener(this);
         mCvVouchersDisabled.setOnClickListener(this);
     }
     }

+/*
+ * Copyright 2010-2013 Warply Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE WARPLY LTD ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL WARPLY LTD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package ly.warp.sdk.io.models;
+
+
+/**
+ * Created by Panagiotis Triantafyllou on 01-May-24.
+ */
+
+public class SortTileModel {
+    private int count;
+    private int weight;
+
+    public SortTileModel() {
+        this.count = 0;
+        this.weight = 0;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+}

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <size android:width="4dp"/>
+    <solid android:color="#ffffff"/>
+</shape>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/cos_light_blue"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
\ No newline at end of file

@@ -49,364 +49,401 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
                     app:layout_constraintTop_toTopOf="parent" />
             </LinearLayout>
             </LinearLayout>
+        </LinearLayout>
+
+        <HorizontalScrollView
+            android:id="@+id/scr_tiles"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:fillViewport="true"
+            android:scrollbars="none">
 
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <LinearLayout
+                android:id="@+id/ll_tiles_parent"
                 android:layout_width="match_parent"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="18dp">
-
-                <RelativeLayout
-                    android:id="@+id/rv_deals_count"
-                    android:layout_width="0dp"
-                    android:layout_height="104dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/rv_sm_count"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/cv_deals_count"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginHorizontal="2dp"
-                        android:layout_marginVertical="4dp"
-                        app:cardCornerRadius="16dp"
-                        app:cardElevation="2dp">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/white">
-
-                            <ImageView
-                                android:id="@+id/iv_deals_logo_count"
-                                android:layout_width="52dp"
-                                android:layout_height="32dp"
-                                android:src="@drawable/sv_deals_logo_redesign"
-                                app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <View
-                                android:id="@+id/v_separator_deals_count"
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_marginHorizontal="8dp"
-                                android:background="@color/cos_grey2"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tv_deals_count_title"
-                                fontPath="fonts/PeridotPE-SemiBold.ttf"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginHorizontal="8dp"
-                                android:gravity="center"
-                                android:includeFontPadding="false"
-                                android:text="@string/cos_deals_title2"
-                                android:textColor="@color/cos_light_black"
-                                android:textSize="10sp"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.cardview.widget.CardView>
-
-                    <LinearLayout
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="1dp"
-                        android:background="@drawable/shape_cos_counter_orange"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:translationZ="2dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_deals_count"
-                            fontPath="fonts/PeridotPE-SemiBold.ttf"
-                            android:layout_width="wrap_content"
-                            android:layout_height="16dp"
-                            android:includeFontPadding="false"
-                            android:maxLines="1"
-                            android:textColor="@color/cos_light_black"
-                            android:textSize="12sp"
-                            tools:text="6" />
-                    </LinearLayout>
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/rv_sm_count"
-                    android:layout_width="0dp"
-                    android:layout_height="104dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/rv_gifts_count"
-                    app:layout_constraintStart_toEndOf="@+id/rv_deals_count"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/cv_sm_count"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginHorizontal="2dp"
-                        android:layout_marginVertical="4dp"
-                        app:cardCornerRadius="16dp"
-                        app:cardElevation="2dp">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/white">
-
-                            <ImageView
-                                android:id="@+id/iv_sm_logo_count"
-                                android:layout_width="32dp"
-                                android:layout_height="32dp"
-                                android:src="@drawable/sv_unified_redesign"
-                                app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <View
-                                android:id="@+id/v_separator_sm_count"
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_marginHorizontal="8dp"
-                                android:background="@color/cos_grey2"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tv_sm_count_title"
-                                fontPath="fonts/PeridotPE-SemiBold.ttf"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginHorizontal="8dp"
-                                android:gravity="center"
-                                android:includeFontPadding="false"
-                                android:text="@string/cos_market_title"
-                                android:textColor="@color/cos_light_black"
-                                android:textSize="10sp"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.cardview.widget.CardView>
-
-                    <LinearLayout
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="1dp"
-                        android:background="@drawable/shape_cos_counter_orange"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:translationZ="2dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_sm_count"
-                            fontPath="fonts/PeridotPE-SemiBold.ttf"
-                            android:layout_width="wrap_content"
-                            android:layout_height="16dp"
-                            android:includeFontPadding="false"
-                            android:maxLines="1"
-                            android:textColor="@color/cos_light_black"
-                            android:textSize="12sp"
-                            tools:text="6" />
-                    </LinearLayout>
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/rv_gifts_count"
-                    android:layout_width="0dp"
-                    android:layout_height="104dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/rv_box_count"
-                    app:layout_constraintStart_toEndOf="@+id/rv_sm_count"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/cv_gifts_count"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginHorizontal="2dp"
-                        android:layout_marginVertical="4dp"
-                        app:cardCornerRadius="16dp"
-                        app:cardElevation="2dp">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/white">
-
-                            <ImageView
-                                android:id="@+id/iv_gifts_logo_count"
-                                android:layout_width="34dp"
-                                android:layout_height="34dp"
-                                android:src="@drawable/sv_gifts_redesign"
-                                app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <View
-                                android:id="@+id/v_separator_gifts_count"
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_marginHorizontal="8dp"
-                                android:background="@color/cos_grey2"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tv_gifts_count_title"
-                                fontPath="fonts/PeridotPE-SemiBold.ttf"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginHorizontal="8dp"
-                                android:gravity="center"
-                                android:includeFontPadding="false"
-                                android:text="@string/cos_free_coupons"
-                                android:textColor="@color/cos_light_black"
-                                android:textSize="10sp"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.cardview.widget.CardView>
-
-                    <LinearLayout
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="1dp"
-                        android:background="@drawable/shape_cos_counter_orange"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:translationZ="2dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_gifts_count"
-                            fontPath="fonts/PeridotPE-SemiBold.ttf"
-                            android:layout_width="wrap_content"
-                            android:layout_height="16dp"
-                            android:includeFontPadding="false"
-                            android:maxLines="1"
-                            android:textColor="@color/cos_light_black"
-                            android:textSize="12sp"
-                            tools:text="6" />
-                    </LinearLayout>
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/rv_box_count"
-                    android:layout_width="0dp"
-                    android:layout_height="104dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/rv_gifts_count"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/cv_box_count"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginHorizontal="2dp"
-                        android:layout_marginVertical="4dp"
-                        app:cardCornerRadius="16dp"
-                        app:cardElevation="2dp">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="@color/white">
-
-                            <ImageView
-                                android:id="@+id/iv_box_logo_count"
-                                android:layout_width="34dp"
-                                android:layout_height="34dp"
-                                android:src="@drawable/sv_box_logo"
-                                app:layout_constraintBottom_toTopOf="@+id/v_separator_box_count"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <View
-                                android:id="@+id/v_separator_box_count"
-                                android:layout_width="match_parent"
-                                android:layout_height="1dp"
-                                android:layout_marginHorizontal="8dp"
-                                android:background="@color/cos_grey2"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tv_box_count_title"
-                                fontPath="fonts/PeridotPE-SemiBold.ttf"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginHorizontal="8dp"
-                                android:gravity="center"
-                                android:includeFontPadding="false"
-                                android:text="@string/cos_box"
-                                android:textColor="@color/cos_light_black"
-                                android:textSize="10sp"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/v_separator_box_count" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.cardview.widget.CardView>
-
-                    <LinearLayout
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="1dp"
-                        android:background="@drawable/shape_cos_counter_orange"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:translationZ="2dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
+                android:clipToPadding="false"
+                android:divider="@drawable/divider_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="14dp"
+                android:showDividers="middle">
+
+<!--                <RelativeLayout-->
+<!--                    android:id="@+id/rv_deals_count"-->
+<!--                    android:layout_width="104dp"-->
+<!--                    android:layout_height="104dp">-->
+
+<!--                    <androidx.cardview.widget.CardView-->
+<!--                        android:id="@+id/cv_deals_count"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:layout_marginHorizontal="2dp"-->
+<!--                        android:layout_marginVertical="4dp"-->
+<!--                        app:cardCornerRadius="16dp"-->
+<!--                        app:cardElevation="2dp">-->
+
+<!--                        <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:background="@color/white">-->
+
+<!--                            <ImageView-->
+<!--                                android:id="@+id/iv_deals_logo_count"-->
+<!--                                android:layout_width="52dp"-->
+<!--                                android:layout_height="32dp"-->
+<!--                                android:src="@drawable/sv_deals_logo_redesign"-->
+<!--                                app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <View-->
+<!--                                android:id="@+id/v_separator_deals_count"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="1dp"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:background="@color/cos_grey2"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <TextView-->
+<!--                                android:id="@+id/tv_deals_count_title"-->
+<!--                                fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                                android:layout_width="0dp"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:gravity="center"-->
+<!--                                android:includeFontPadding="false"-->
+<!--                                android:text="@string/cos_deals_tile"-->
+<!--                                android:textColor="@color/cos_light_black"-->
+<!--                                android:textSize="10sp"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />-->
+<!--                        </androidx.constraintlayout.widget.ConstraintLayout>-->
+<!--                    </androidx.cardview.widget.CardView>-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="16dp"-->
+<!--                        android:layout_height="16dp"-->
+<!--                        android:layout_alignParentEnd="true"-->
+<!--                        android:layout_marginTop="4dp"-->
+<!--                        android:layout_marginEnd="1dp"-->
+<!--                        android:background="@drawable/shape_cos_counter_orange"-->
+<!--                        android:gravity="center"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:translationZ="2dp"-->
+<!--                        app:layout_constraintEnd_toEndOf="parent"-->
+<!--                        app:layout_constraintTop_toTopOf="parent">-->
+
+<!--                        <TextView-->
+<!--                            android:id="@+id/tv_deals_count"-->
+<!--                            fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="16dp"-->
+<!--                            android:includeFontPadding="false"-->
+<!--                            android:maxLines="1"-->
+<!--                            android:textColor="@color/cos_light_black"-->
+<!--                            android:textSize="12sp"-->
+<!--                            tools:text="6" />-->
+<!--                    </LinearLayout>-->
+<!--                </RelativeLayout>-->
+
+<!--                <RelativeLayout-->
+<!--                    android:id="@+id/rv_sm_count"-->
+<!--                    android:layout_width="104dp"-->
+<!--                    android:layout_height="104dp">-->
+
+<!--                    <androidx.cardview.widget.CardView-->
+<!--                        android:id="@+id/cv_sm_count"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:layout_marginHorizontal="2dp"-->
+<!--                        android:layout_marginVertical="4dp"-->
+<!--                        app:cardCornerRadius="16dp"-->
+<!--                        app:cardElevation="2dp">-->
+
+<!--                        <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:background="@color/white">-->
+
+<!--                            <ImageView-->
+<!--                                android:id="@+id/iv_sm_logo_count"-->
+<!--                                android:layout_width="32dp"-->
+<!--                                android:layout_height="32dp"-->
+<!--                                android:src="@drawable/sv_unified_redesign"-->
+<!--                                app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <View-->
+<!--                                android:id="@+id/v_separator_sm_count"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="1dp"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:background="@color/cos_grey2"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <TextView-->
+<!--                                android:id="@+id/tv_sm_count_title"-->
+<!--                                fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                                android:layout_width="0dp"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:gravity="center"-->
+<!--                                android:includeFontPadding="false"-->
+<!--                                android:text="@string/cos_market_title"-->
+<!--                                android:textColor="@color/cos_light_black"-->
+<!--                                android:textSize="10sp"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />-->
+<!--                        </androidx.constraintlayout.widget.ConstraintLayout>-->
+<!--                    </androidx.cardview.widget.CardView>-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="16dp"-->
+<!--                        android:layout_height="16dp"-->
+<!--                        android:layout_alignParentEnd="true"-->
+<!--                        android:layout_marginTop="4dp"-->
+<!--                        android:layout_marginEnd="1dp"-->
+<!--                        android:background="@drawable/shape_cos_counter_orange"-->
+<!--                        android:gravity="center"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:translationZ="2dp"-->
+<!--                        app:layout_constraintEnd_toEndOf="parent"-->
+<!--                        app:layout_constraintTop_toTopOf="parent">-->
+
+<!--                        <TextView-->
+<!--                            android:id="@+id/tv_sm_count"-->
+<!--                            fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="16dp"-->
+<!--                            android:includeFontPadding="false"-->
+<!--                            android:maxLines="1"-->
+<!--                            android:textColor="@color/cos_light_black"-->
+<!--                            android:textSize="12sp"-->
+<!--                            tools:text="6" />-->
+<!--                    </LinearLayout>-->
+<!--                </RelativeLayout>-->
+
+<!--                <RelativeLayout-->
+<!--                    android:id="@+id/rv_gifts_count"-->
+<!--                    android:layout_width="104dp"-->
+<!--                    android:layout_height="104dp">-->
+
+<!--                    <androidx.cardview.widget.CardView-->
+<!--                        android:id="@+id/cv_gifts_count"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:layout_marginHorizontal="2dp"-->
+<!--                        android:layout_marginVertical="4dp"-->
+<!--                        app:cardCornerRadius="16dp"-->
+<!--                        app:cardElevation="2dp">-->
+
+<!--                        <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:background="@color/white">-->
+
+<!--                            <ImageView-->
+<!--                                android:id="@+id/iv_gifts_logo_count"-->
+<!--                                android:layout_width="34dp"-->
+<!--                                android:layout_height="34dp"-->
+<!--                                android:src="@drawable/sv_gifts_redesign"-->
+<!--                                app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <View-->
+<!--                                android:id="@+id/v_separator_gifts_count"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="1dp"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:background="@color/cos_grey2"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <TextView-->
+<!--                                android:id="@+id/tv_gifts_count_title"-->
+<!--                                fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                                android:layout_width="0dp"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:gravity="center"-->
+<!--                                android:includeFontPadding="false"-->
+<!--                                android:text="@string/cos_free_coupons_tile"-->
+<!--                                android:textColor="@color/cos_light_black"-->
+<!--                                android:textSize="10sp"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />-->
+<!--                        </androidx.constraintlayout.widget.ConstraintLayout>-->
+<!--                    </androidx.cardview.widget.CardView>-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="16dp"-->
+<!--                        android:layout_height="16dp"-->
+<!--                        android:layout_alignParentEnd="true"-->
+<!--                        android:layout_marginTop="4dp"-->
+<!--                        android:layout_marginEnd="1dp"-->
+<!--                        android:background="@drawable/shape_cos_counter_orange"-->
+<!--                        android:gravity="center"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:translationZ="2dp"-->
+<!--                        app:layout_constraintEnd_toEndOf="parent"-->
+<!--                        app:layout_constraintTop_toTopOf="parent">-->
+
+<!--                        <TextView-->
+<!--                            android:id="@+id/tv_gifts_count"-->
+<!--                            fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="16dp"-->
+<!--                            android:includeFontPadding="false"-->
+<!--                            android:maxLines="1"-->
+<!--                            android:textColor="@color/cos_light_black"-->
+<!--                            android:textSize="12sp"-->
+<!--                            tools:text="6" />-->
+<!--                    </LinearLayout>-->
+<!--                </RelativeLayout>-->
+
+<!--                <RelativeLayout-->
+<!--                    android:id="@+id/rv_box_count"-->
+<!--                    android:layout_width="104dp"-->
+<!--                    android:layout_height="104dp">-->
+
+<!--                    <androidx.cardview.widget.CardView-->
+<!--                        android:id="@+id/cv_box_count"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:layout_marginHorizontal="2dp"-->
+<!--                        android:layout_marginVertical="4dp"-->
+<!--                        app:cardCornerRadius="16dp"-->
+<!--                        app:cardElevation="2dp">-->
+
+<!--                        <androidx.constraintlayout.widget.ConstraintLayout-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:background="@color/white">-->
+
+<!--                            <ImageView-->
+<!--                                android:id="@+id/iv_box_logo_count"-->
+<!--                                android:layout_width="34dp"-->
+<!--                                android:layout_height="34dp"-->
+<!--                                android:src="@drawable/sv_box_logo"-->
+<!--                                app:layout_constraintBottom_toTopOf="@+id/v_separator_box_count"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <View-->
+<!--                                android:id="@+id/v_separator_box_count"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="1dp"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:background="@color/cos_grey2"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toTopOf="parent" />-->
+
+<!--                            <TextView-->
+<!--                                android:id="@+id/tv_box_count_title"-->
+<!--                                fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                                android:layout_width="0dp"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:layout_marginHorizontal="8dp"-->
+<!--                                android:gravity="center"-->
+<!--                                android:includeFontPadding="false"-->
+<!--                                android:text="@string/cos_box_tile"-->
+<!--                                android:textColor="@color/cos_light_black"-->
+<!--                                android:textSize="10sp"-->
+<!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                                app:layout_constraintStart_toStartOf="parent"-->
+<!--                                app:layout_constraintTop_toBottomOf="@+id/v_separator_box_count" />-->
+<!--                        </androidx.constraintlayout.widget.ConstraintLayout>-->
+<!--                    </androidx.cardview.widget.CardView>-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="16dp"-->
+<!--                        android:layout_height="16dp"-->
+<!--                        android:layout_alignParentEnd="true"-->
+<!--                        android:layout_marginTop="4dp"-->
+<!--                        android:layout_marginEnd="1dp"-->
+<!--                        android:background="@drawable/shape_cos_counter_orange"-->
+<!--                        android:gravity="center"-->
+<!--                        android:orientation="vertical"-->
+<!--                        android:translationZ="2dp"-->
+<!--                        app:layout_constraintEnd_toEndOf="parent"-->
+<!--                        app:layout_constraintTop_toTopOf="parent">-->
+
+<!--                        <TextView-->
+<!--                            android:id="@+id/tv_box_count"-->
+<!--                            fontPath="fonts/PeridotPE-SemiBold.ttf"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="16dp"-->
+<!--                            android:includeFontPadding="false"-->
+<!--                            android:maxLines="1"-->
+<!--                            android:textColor="@color/cos_light_black"-->
+<!--                            android:textSize="12sp"-->
+<!--                            tools:text="6" />-->
+<!--                    </LinearLayout>-->
+<!--                </RelativeLayout>-->
+            </LinearLayout>
+        </HorizontalScrollView>
 
 
-                        <TextView
-                            android:id="@+id/tv_box_count"
-                            fontPath="fonts/PeridotPE-SemiBold.ttf"
-                            android:layout_width="wrap_content"
-                            android:layout_height="16dp"
-                            android:includeFontPadding="false"
-                            android:maxLines="1"
-                            android:textColor="@color/cos_light_black"
-                            android:textSize="12sp"
-                            tools:text="6" />
-                    </LinearLayout>
-                </RelativeLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <View
+                android:id="@+id/v_first_start"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:background="@drawable/shape_indicator"/>
+
+            <View
+                android:id="@+id/v_first_end"
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:visibility="gone"
+                android:background="@drawable/shape_indicator"/>
+
+            <View
+                android:layout_width="6dp"
+                android:layout_height="12dp"
+                android:background="@drawable/divider_vertical"/>
+
+            <View
+                android:id="@+id/v_second_start"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:visibility="gone"
+                android:background="@drawable/shape_indicator"/>
+
+            <View
+                android:id="@+id/v_second_end"
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:background="@drawable/shape_indicator"/>
         </LinearLayout>
         </LinearLayout>
 
 
         <LinearLayout
         <LinearLayout

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:id="@+id/rv_box_count"
+    android:layout_width="104dp"
+    android:layout_height="104dp">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_box_count"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginHorizontal="2dp"
+        android:layout_marginVertical="4dp"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="2dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white">
+
+            <ImageView
+                android:id="@+id/iv_box_logo_count"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:src="@drawable/sv_box_logo"
+                app:layout_constraintBottom_toTopOf="@+id/v_separator_box_count"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <View
+                android:id="@+id/v_separator_box_count"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="8dp"
+                android:background="@color/cos_grey2"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_box_count_title"
+                fontPath="fonts/PeridotPE-SemiBold.ttf"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="@string/cos_box_tile"
+                android:textColor="@color/cos_light_black"
+                android:textSize="10sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/v_separator_box_count" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+    <LinearLayout
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="1dp"
+        android:background="@drawable/shape_cos_counter_orange"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:translationZ="2dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_box_count"
+            fontPath="fonts/PeridotPE-SemiBold.ttf"
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:textColor="@color/cos_light_black"
+            android:textSize="12sp"
+            tools:text="6" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:id="@+id/rv_gifts_count"
+    android:layout_width="104dp"
+    android:layout_height="104dp">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_gifts_count"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginHorizontal="2dp"
+        android:layout_marginVertical="4dp"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="2dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white">
+
+            <ImageView
+                android:id="@+id/iv_gifts_logo_count"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:src="@drawable/sv_gifts_redesign"
+                app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <View
+                android:id="@+id/v_separator_gifts_count"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="8dp"
+                android:background="@color/cos_grey2"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_gifts_count_title"
+                fontPath="fonts/PeridotPE-SemiBold.ttf"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="@string/cos_free_coupons_tile"
+                android:textColor="@color/cos_light_black"
+                android:textSize="10sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+    <LinearLayout
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="1dp"
+        android:background="@drawable/shape_cos_counter_orange"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:translationZ="2dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_gifts_count"
+            fontPath="fonts/PeridotPE-SemiBold.ttf"
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:textColor="@color/cos_light_black"
+            android:textSize="12sp"
+            tools:text="6" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:id="@+id/rv_deals_count"
+    android:layout_width="104dp"
+    android:layout_height="104dp">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_deals_count"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginHorizontal="2dp"
+        android:layout_marginVertical="4dp"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="2dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white">
+
+            <ImageView
+                android:id="@+id/iv_deals_logo_count"
+                android:layout_width="52dp"
+                android:layout_height="32dp"
+                android:src="@drawable/sv_deals_logo_redesign"
+                app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <View
+                android:id="@+id/v_separator_deals_count"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="8dp"
+                android:background="@color/cos_grey2"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_deals_count_title"
+                fontPath="fonts/PeridotPE-SemiBold.ttf"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="@string/cos_deals_tile"
+                android:textColor="@color/cos_light_black"
+                android:textSize="10sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+    <LinearLayout
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="1dp"
+        android:background="@drawable/shape_cos_counter_orange"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:translationZ="2dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_deals_count"
+            fontPath="fonts/PeridotPE-SemiBold.ttf"
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:textColor="@color/cos_light_black"
+            android:textSize="12sp"
+            tools:text="6" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:id="@+id/rv_sm_count"
+    android:layout_width="104dp"
+    android:layout_height="104dp">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_sm_count"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginHorizontal="2dp"
+        android:layout_marginVertical="4dp"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="2dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white">
+
+            <ImageView
+                android:id="@+id/iv_sm_logo_count"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:src="@drawable/sv_unified_redesign"
+                app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <View
+                android:id="@+id/v_separator_sm_count"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginHorizontal="8dp"
+                android:background="@color/cos_grey2"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_sm_count_title"
+                fontPath="fonts/PeridotPE-SemiBold.ttf"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="@string/cos_market_title"
+                android:textColor="@color/cos_light_black"
+                android:textSize="10sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+    <LinearLayout
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="1dp"
+        android:background="@drawable/shape_cos_counter_orange"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:translationZ="2dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_sm_count"
+            fontPath="fonts/PeridotPE-SemiBold.ttf"
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:textColor="@color/cos_light_black"
+            android:textSize="12sp"
+            tools:text="6" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file

@@ -16,11 +16,14 @@
     <string name="cos_profile_title">My Rewards</string>
     <string name="cos_profile_title">My Rewards</string>
     <string name="cos_deals_title">Deals for You</string>
     <string name="cos_deals_title">Deals for You</string>
     <string name="cos_deals_title2">DEALS FOR YOU</string>
     <string name="cos_deals_title2">DEALS FOR YOU</string>
+    <string name="cos_deals_tile">DEALS FOR YOU\n</string>
     <string name="cos_profile_more">Δες περισσότερα</string>
     <string name="cos_profile_more">Δες περισσότερα</string>
     <string name="cos_gifts_title">GIFTS FOR YOU</string>
     <string name="cos_gifts_title">GIFTS FOR YOU</string>
     <string name="cos_more_title">MORE FOR YOU</string>
     <string name="cos_more_title">MORE FOR YOU</string>
     <string name="cos_free_coupons">FREE COUPONS</string>
     <string name="cos_free_coupons">FREE COUPONS</string>
+    <string name="cos_free_coupons_tile">FREE COUPONS\n</string>
     <string name="cos_box">BOX</string>
     <string name="cos_box">BOX</string>
+    <string name="cos_box_tile">BOX\n</string>
     <string name="menu_home">Αρχική</string>
     <string name="menu_home">Αρχική</string>
     <string name="menu_explore">Ανακάλυψε</string>
     <string name="menu_explore">Ανακάλυψε</string>
     <string name="menu_shop">Shop</string>
     <string name="menu_shop">Shop</string>