unified screen basket part5, fixed all bottom sheets, couponset model fixes, overall fixes

@@ -58,7 +58,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
     private TextView mTvEmptyUnifiedCoupons, mFontHeader, mTvInnerTitle,
             mTvInnerSubtitle, mTvInnerClose, mTvUnifieCouponsTitle, mTvActiveUnifiedCouponsTitle,
             mTvChooseAll, mTvActivate;
-    private boolean mUnifiedPressed = false, mActiveUnifiedPressed = false;
+    private boolean mUnifiedPressed = false, mActiveUnifiedPressed = false, mIsActivatePressed = false;
     private ConstraintLayout mClInfoView, mClActiveCouponsHeader;
     private RelativeLayout mRlUnifiedCoupons, mRlActiveUnifiedCoupons;
     private ActiveCouponAdapter mAdapterCoupons;
@@ -111,6 +111,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
         WarplyAnalyticsManager.logTrackersEvent(this, "screen", "ActiveUnifiedCouponsScreen");
         mUnifiedPressed = false;
         mActiveUnifiedPressed = false;
+        mIsActivatePressed = false;
         filterItems();
     }
 
@@ -170,6 +171,9 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
             return;
         }
         if (view.getId() == R.id.ll_activate_unified) {
+            if (!mIsActivatePressed) {
+                mIsActivatePressed = true;
+
                 if (!mSelectedItems.isEmpty()) {
                     JSONArray tempArray = new JSONArray();
                     for (Coupon selectedCoupon : mSelectedItems) {
@@ -180,6 +184,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
                 }
             }
         }
+    }
 
     // ===========================================================
     // Methods

@@ -167,7 +167,7 @@ public class ContextualActivity extends Activity implements View.OnClickListener
             return;
         }
 
-        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
+        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
         bottomSheetDialog.setContentView(R.layout.dl_share);
         TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
         WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, tvHeader);

 package ly.warp.sdk.activities;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -8,11 +10,14 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.work.OneTimeWorkRequest;
@@ -22,16 +27,22 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.oned.EAN13Writer;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import ly.warp.sdk.R;
 import ly.warp.sdk.io.models.Coupon;
+import ly.warp.sdk.io.models.Couponset;
 import ly.warp.sdk.io.models.UnifiedCoupon;
 import ly.warp.sdk.services.EventCouponsService;
 import ly.warp.sdk.utils.WarpUtils;
@@ -83,6 +94,14 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
                     for (Coupon cpn : couponItem.getCoupons()) {
                         if (cpn.getCoupon().equals(couponCode)) {
                             mCoupon = cpn;
+
+                            for (Couponset cpns : WarplyManagerHelper.getCouponsetsDeals()) {
+                                if (cpns.getUuid().equals(mCoupon.getCouponsetUuid())) {
+                                    mCoupon.setCouponsetDetails(cpns);
+                                    break;
+                                }
+                            }
+
                             break;
                         }
                     }
@@ -268,6 +287,9 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
         if (view.getId() == R.id.ll_find_shops) {
             if (!mIsFindItPressed) {
                 mIsFindItPressed = true;
+
+                //TODO: add check to open the sheet only if there are available merchants
+                showChooseMerchantDialog();
             }
         }
     }
@@ -276,6 +298,46 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
     // Methods
     // ===========================================================
 
+    private void showChooseMerchantDialog() {
+        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
+        bottomSheetDialog.setContentView(R.layout.dl_bottom_sheet_merchants);
+        bottomSheetDialog.setOnDismissListener(dialog -> {
+            bottomSheetDialog.dismiss();
+            mIsFindItPressed = false;
+        });
+        TextView sheetTitle = bottomSheetDialog.findViewById(R.id.tv_sm_sheet_title);
+        TextView sheetSubtitle = bottomSheetDialog.findViewById(R.id.tv_sm_sheet_subtitle);
+        WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, sheetTitle);
+        WarpUtils.renderCustomFont(this, R.font.peridot_regular, sheetSubtitle);
+        LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_sm_sheet_view_inner);
+
+        ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sm_sheet_close);
+        dialogClose.setOnClickListener(view -> {
+            bottomSheetDialog.dismiss();
+            mIsFindItPressed = false;
+        });
+
+        int tempLoop = 2;
+        for (int i = 0; i < tempLoop; i++) {
+            LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_sheet_merchant, null);
+
+            TextView textView = (TextView) v.findViewById(R.id.button_sm_buy_it);
+            WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, textView);
+            ConstraintLayout buyButton = (ConstraintLayout) v.findViewById(R.id.cl_button_sm_buy_it);
+            buyButton.setOnClickListener(view -> {
+                //TODO: open webview with the specified url
+                bottomSheetDialog.dismiss();
+            });
+
+            parent.addView(v, 0, new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT));
+        }
+
+        bottomSheetDialog.show();
+    }
+
     private void initViews() {
         if (mIsUnified) {
             mTvCouponCodeTitle.setVisibility(View.GONE);
@@ -288,7 +350,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
 
         if (mCoupon != null) {
             if (mIsUnified) {
-                mTvCouponTitle.setText(HtmlCompat.fromHtml(mCoupon.getName(), HtmlCompat.FROM_HTML_MODE_COMPACT));
+//                mTvCouponTitle.setText(HtmlCompat.fromHtml(mCoupon.getName(), HtmlCompat.FROM_HTML_MODE_COMPACT));
+                mTvCouponTitle.setText(mCoupon.getCouponsetDetails().getName());
             } else {
                 mTvCouponCode.setText(mCoupon.getCoupon());
                 mTvCouponTitle.setText(mCoupon.getCouponsetDetails().getName());

@@ -196,7 +196,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
     }
 
     private void showSharingDialog() {
-        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
+        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
         bottomSheetDialog.setContentView(R.layout.dl_share);
         LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
 

@@ -211,7 +211,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
         for (Merchant merch : mMerchantList) {
             if (merch.getUuid().equals(marker.getSnippet())) {
                 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShopsScreenMarker").concat(":").concat(marker.getSnippet()));
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
                 bottomSheetDialog.setContentView(R.layout.dl_map_pin);
 
                 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_map_pin_close);

@@ -212,7 +212,7 @@ public class ShopsHuaweiActivity extends FragmentActivity implements View.OnClic
         for (Merchant merch : mMerchantList) {
             if (merch.getUuid().equals(marker.getSnippet())) {
                 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShopsScreenMarker").concat(":").concat(marker.getSnippet()));
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
                 bottomSheetDialog.setContentView(R.layout.dl_map_pin);
 
                 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_map_pin_close);

@@ -172,7 +172,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
     }
 
     private void showActivationDialog() {
-        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
+        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
         bottomSheetDialog.setContentView(R.layout.dl_share);
         TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
         WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, tvHeader);

 package ly.warp.sdk.activities;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.oned.EAN13Writer;
@@ -56,7 +61,7 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
     private ImageView mIvBack, mIvBarcode, mIvMarketExpand;
     private TextView mTvTerms, mTvCouponCode, mTvCouponDate, mTvMarketExpand, mFontSMLabel,
             mTvTermsValue, mTvFullBarcode, mTvActiveValue, mFontHeader, mFontCouponLabel,
-            mFontShopsLabel, mFontCancelLabel;
+            mFontShopsLabel, mFontCancelLabel, mTvBarcodeTitle;
     private LinearLayout mLlShops, mLlBarcodeContainer, mLlTerms, mLlMarketCoupons, mLlMarketExpand,
             mLlCancelUnified;
     private UnifiedCoupon mCoupon;
@@ -108,11 +113,12 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
         mFontCouponLabel = findViewById(R.id.textView15);
         mFontShopsLabel = findViewById(R.id.shops_label);
         mFontCancelLabel = findViewById(R.id.cancel_label);
+        mTvBarcodeTitle = findViewById(R.id.tv_barcode_title);
         WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mFontSMLabel);
-        WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvActiveValue, mTvCouponDate,
+        WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvActiveValue,
                 mTvTermsValue);
         WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontCouponLabel, mTvCouponCode,
-                mTvMarketExpand, mTvTerms);
+                mTvMarketExpand, mTvTerms, mTvCouponDate, mTvBarcodeTitle);
         WarpUtils.renderCustomFont(this, R.font.pf_square_sans_pro_regular, mTvFullBarcode);
         WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontShopsLabel, mFontCancelLabel);
 
@@ -137,19 +143,7 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
             return;
         }
         if (view.getId() == R.id.ll_shops) {
-            if (!mShopsPressed) {
-                mShopsPressed = true;
-                WarplyAnalyticsManager.logTrackersEvent(this, "click", "SeeShops");
-                if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(UnifiedCouponInfoActivity.this) == ConnectionResult.SUCCESS) {
-                    Intent intent = new Intent(UnifiedCouponInfoActivity.this, ShopsActivity.class);
-                    startActivity(intent);
-                    return;
-                } else {
-                    Intent intent = new Intent(UnifiedCouponInfoActivity.this, ShopsHuaweiActivity.class);
-                    startActivity(intent);
-                    return;
-                }
-            }
+            showChooseCategoryDialog();
         }
         if (view.getId() == R.id.ll_terms_inner) {
             if (mIsTermsShown) {
@@ -188,6 +182,81 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
     // Methods
     // ===========================================================
 
+    private void showChooseCategoryDialog() {
+        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
+        bottomSheetDialog.setContentView(R.layout.dl_bottom_sheet_categories);
+        bottomSheetDialog.setOnDismissListener(dialog -> bottomSheetDialog.dismiss());
+        ImageView dialogCLose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sm_sheet_category_close);
+        dialogCLose.setOnClickListener(view -> bottomSheetDialog.dismiss());
+        TextView sheetButtonShops = bottomSheetDialog.findViewById(R.id.shops_label);
+        TextView sheetButtonEShops = bottomSheetDialog.findViewById(R.id.eshops_label);
+        WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, sheetButtonShops);
+        WarpUtils.renderCustomFont(this, R.font.peridot_bold, sheetButtonEShops);
+
+        LinearLayout buttonShops = bottomSheetDialog.findViewById(R.id.ll_unified_shops);
+        LinearLayout buttonEshops = bottomSheetDialog.findViewById(R.id.ll_unified_eshops);
+
+        buttonShops.setOnClickListener(view -> {
+            if (!mShopsPressed) {
+                mShopsPressed = true;
+                bottomSheetDialog.dismiss();
+                WarplyAnalyticsManager.logTrackersEvent(this, "click", "SeeShops");
+                if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(UnifiedCouponInfoActivity.this) == ConnectionResult.SUCCESS) {
+                    Intent intent = new Intent(UnifiedCouponInfoActivity.this, ShopsActivity.class);
+                    startActivity(intent);
+                } else {
+                    Intent intent = new Intent(UnifiedCouponInfoActivity.this, ShopsHuaweiActivity.class);
+                    startActivity(intent);
+                }
+            }
+        });
+
+        buttonEshops.setOnClickListener(view -> {
+            bottomSheetDialog.dismiss();
+            showChooseMerchantDialog();
+        });
+
+        bottomSheetDialog.show();
+    }
+
+    private void showChooseMerchantDialog() {
+        final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
+        bottomSheetDialog.setContentView(R.layout.dl_bottom_sheet_merchants);
+        bottomSheetDialog.setOnDismissListener(dialog -> bottomSheetDialog.dismiss());
+        TextView sheetTitle = bottomSheetDialog.findViewById(R.id.tv_sm_sheet_title);
+        sheetTitle.setText(R.string.cos_markets_eshop);
+        TextView sheetSubtitle = bottomSheetDialog.findViewById(R.id.tv_sm_sheet_subtitle);
+        WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, sheetTitle);
+        WarpUtils.renderCustomFont(this, R.font.peridot_regular, sheetSubtitle);
+        LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_sm_sheet_view_inner);
+
+        ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sm_sheet_close);
+        dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
+
+        int tempLoop = 2;
+        for (int i = 0; i < tempLoop; i++) {
+            LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_sheet_merchant, null);
+
+            TextView textView = (TextView) v.findViewById(R.id.button_sm_buy_it);
+            textView.setText(R.string.cos_markets_eshop_item);
+            WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, textView);
+            ImageView buttonIcon = (ImageView) v.findViewById(R.id.iv_sheet_cart);
+            buttonIcon.setVisibility(View.GONE);
+            ConstraintLayout buyButton = (ConstraintLayout) v.findViewById(R.id.cl_button_sm_buy_it);
+            buyButton.setOnClickListener(view -> {
+                //TODO: open webview with the specified url
+                bottomSheetDialog.dismiss();
+            });
+
+            parent.addView(v, 0, new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT));
+        }
+
+        bottomSheetDialog.show();
+    }
+
     private void initViews() {
         mTvCouponCode.setText(mCoupon.getBarcode());
 
@@ -228,7 +297,7 @@ public class UnifiedCouponInfoActivity extends Activity implements View.OnClickL
                         e.printStackTrace();
                     }
                     simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
-                    mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_mycoupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
+                    mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_coupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
                     break;
                 }
             }

@@ -79,6 +79,7 @@ public class Couponset implements Parcelable, Serializable {
     private static final String INNER_TEXT = "inner_text";
     private static final String FINAL_PRICE = "final_price";
     private static final String DISCOUNT_TYPE = "discount_type";
+    private static final String EXTRA_FIELDS = "extra_fields";
 
 
     /* Member variables of the Campaign object */
@@ -113,6 +114,7 @@ public class Couponset implements Parcelable, Serializable {
     private double final_price = 0.0d;
     private Date endDate = new Date();
     private String couponsetType = "";
+    private JSONObject extraFields = new JSONObject();
 
     public Couponset() {
         this.uuid = "";
@@ -143,6 +145,7 @@ public class Couponset implements Parcelable, Serializable {
         this.innerText = "";
         this.discount_type = "";
         this.final_price = 0.0d;
+        this.extraFields = new JSONObject();
     }
 
     public Couponset(boolean isUniversal) {
@@ -164,6 +167,7 @@ public class Couponset implements Parcelable, Serializable {
         this.img_preview = "";
         this.innerText = "";
         this.final_price = 0.0d;
+        this.extraFields = new JSONObject();
     }
 
     /**
@@ -219,6 +223,7 @@ public class Couponset implements Parcelable, Serializable {
             this.innerText = json.optString(INNER_TEXT);
             this.discount_type = json.isNull(DISCOUNT_TYPE) ? "" : json.optString(DISCOUNT_TYPE);
             this.final_price = json.isNull(FINAL_PRICE) ? 0.0d : json.optDouble(FINAL_PRICE);
+            this.extraFields = json.optJSONObject(EXTRA_FIELDS);
         }
     }
 
@@ -241,6 +246,7 @@ public class Couponset implements Parcelable, Serializable {
             this.img_preview = json.optString(IMG_PREVIEW);
             this.innerText = json.optString(INNER_TEXT);
             this.final_price = json.isNull(FINAL_PRICE) ? 0.0d : json.optDouble(FINAL_PRICE);
+            this.extraFields = json.optJSONObject(EXTRA_FIELDS);
 //            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
 //            Date newDate = new Date();
 //            String tempRedeemDate = json.optString("end_date");
@@ -371,6 +377,7 @@ public class Couponset implements Parcelable, Serializable {
             jObj.putOpt(INNER_TEXT, this.innerText);
             jObj.putOpt(DISCOUNT_TYPE, this.discount_type);
             jObj.putOpt(FINAL_PRICE, this.final_price);
+            jObj.putOpt(EXTRA_FIELDS, this.extraFields);
         } catch (JSONException e) {
             if (WarpConstants.DEBUG) {
                 e.printStackTrace();
@@ -642,6 +649,26 @@ public class Couponset implements Parcelable, Serializable {
         this.couponsetType = couponsetType;
     }
 
+    public String getAdmin_name() {
+        return admin_name;
+    }
+
+    public JSONObject getExtraFields() {
+        return extraFields;
+    }
+
+    public void setExtraFields(JSONObject extraFields) {
+        this.extraFields = extraFields;
+    }
+
+    public String getShort_description() {
+        return short_description;
+    }
+
+    public String getImg_preview() {
+        return img_preview;
+    }
+
     @Override
     public int describeContents() {
         return 0;

@@ -4252,7 +4252,7 @@ public class WarplyManager {
         Map<String, Object> jsonParams = new ArrayMap<>();
         jsonParams.put("action", "retrieve_multilingual");
         jsonParams.put("active", true);
-        jsonParams.put("visible", true);
+        jsonParams.put("visible", JSONObject.NULL);
         jsonParams.put("language", WarplyProperty.getLanguage(Warply.getWarplyContext()));
         jsonParams.put("couponset_types", new JSONArray().put("supermarket"));
 

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_cos_green_tr2" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_cos_green2" android:state_pressed="false" />
+</selector>
\ 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="rectangle">
+    <corners android:radius="12dp" />
+
+    <solid
+        android:width="2dp"
+        android:color="@color/cos_green12" />
+</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="rectangle">
+    <corners android:radius="12dp" />
+
+    <solid
+        android:width="2dp"
+        android:color="@color/cos_green6_tr" />
+</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="rectangle">
+    <corners android:radius="20dp" />
+
+    <solid android:color="@color/cos_light_grey3" />
+</shape>
\ No newline at end of file

@@ -72,6 +72,20 @@
                     android:textSize="18sp" />
 
                 <TextView
+                    android:id="@+id/textView17"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/shape_rounded_blue"
+                    android:includeFontPadding="false"
+                    android:paddingHorizontal="14dp"
+                    android:paddingVertical="3dp"
+                    android:textColor="@color/cos_blue6"
+                    android:textSize="14sp"
+                    tools:text="@string/cos_coupon_date" />
+
+                <TextView
                     android:id="@+id/textView14"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -122,18 +136,29 @@
                         android:orientation="vertical"
                         tools:visibility="visible">
 
+                        <TextView
+                            android:id="@+id/tv_barcode_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="@string/cos_barcode_coupon_title"
+                            android:textColor="@color/cos_light_black"
+                            android:textSize="16sp" />
+
                         <View
                             android:id="@+id/view5"
                             android:layout_width="match_parent"
                             android:layout_height="0.8dp"
+                            android:layout_marginTop="16dp"
                             android:layout_marginHorizontal="32dp"
                             android:background="#E6E6E6" />
 
                         <ImageView
                             android:id="@+id/iv_barcode"
-                            android:layout_width="284dp"
+                            android:layout_width="match_parent"
                             android:layout_height="86dp"
                             android:layout_marginTop="16dp"
+                            android:layout_marginHorizontal="48dp"
                             android:scaleType="fitXY"
                             tools:srcCompat="@tools:sample/avatars" />
 
@@ -152,21 +177,11 @@
                             android:layout_width="match_parent"
                             android:layout_height="0.8dp"
                             android:layout_marginHorizontal="32dp"
-                            android:layout_marginTop="20dp"
+                            android:layout_marginTop="16dp"
                             android:background="#E6E6E6" />
                     </LinearLayout>
                 </LinearLayout>
 
-                <TextView
-                    android:id="@+id/textView17"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="16dp"
-                    android:textColor="@color/cos_light_black"
-                    android:textSize="16sp"
-                    tools:text="@string/cos_coupon_date" />
-
                 <LinearLayout
                     android:id="@+id/ll_market_expand"
                     android:layout_width="wrap_content"

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rl_sm_sheet_dialog_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/shape_cos_white_rounded_top"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/rl_sm_sheet"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:paddingTop="16dp">
+
+        <ImageView
+            android:id="@+id/iv_sm_sheet_category_close"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="24dp"
+            android:src="@drawable/ic_close" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_unified_shops"
+        android:layout_width="312dp"
+        android:layout_height="55dp"
+        android:layout_gravity="center"
+        android:background="@drawable/selector_button_green"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingVertical="8dp">
+
+        <TextView
+            android:id="@+id/shops_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="@string/cos_markets_map"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_unified_eshops"
+        android:layout_width="312dp"
+        android:layout_height="55dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="48dp"
+        android:background="@drawable/selector_button_green_border"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingVertical="8dp">
+
+        <TextView
+            android:id="@+id/eshops_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="@string/cos_markets_eshop"
+            android:textColor="@color/cos_green12"
+            android:textSize="16sp" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rl_sm_sheet_dialog_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/shape_cos_white_rounded_top">
+
+    <RelativeLayout
+        android:id="@+id/rl_sm_sheet"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:paddingTop="16dp">
+
+        <TextView
+            android:id="@+id/tv_sm_sheet_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="24dp"
+            android:text="@string/cos_find_sm_product"
+            android:textColor="@color/cos_light_black"
+            android:textSize="17sp" />
+
+        <ImageView
+            android:id="@+id/iv_sm_sheet_close"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="24dp"
+            android:src="@drawable/ic_close" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_sm_sheet_view_inner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="48dp"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_sm_sheet_subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="48dp"
+        android:layout_marginVertical="32dp"
+        android:text="@string/cos_sm_sheet_subtitle"
+        android:textColor="@color/cos_light_black"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="14sp" />
+</LinearLayout>
\ No newline at end of file

@@ -4,7 +4,7 @@
     android:id="@+id/rl_map_pin_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
+    android:background="@drawable/shape_cos_white_rounded_top"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"
-        android:background="@drawable/shape_cos_white_rounded_top"
         android:paddingHorizontal="24dp"
         android:paddingTop="16dp">
 

@@ -3,14 +3,14 @@
     android:id="@+id/rl_share_dialog_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@drawable/shape_cos_white_rounded_top">
 
     <RelativeLayout
         android:id="@+id/rl_sender_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"
-        android:background="@drawable/shape_cos_white_rounded_top"
         android:paddingTop="16dp">
 
         <TextView

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginBottom="32dp"
+        android:background="@drawable/shape_cos_sheet_item">
+
+        <ImageView
+            android:layout_width="140dp"
+            android:layout_height="36dp"
+            android:layout_marginStart="24dp"
+            android:background="@color/blue_dark"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_button_sm_buy_it"
+            android:layout_width="150dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/selector_button_green2"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/button_sm_buy_it"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:text="@string/cos_sm_buy_it"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/iv_sheet_cart"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/ic_sm_cart"
+                android:layout_marginEnd="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
\ No newline at end of file

@@ -88,6 +88,7 @@
     <string name="cos_mycoupon_date">Το κουπόνι ισχύει έως %1$s</string>
     <string name="cos_gift_it">Δώρισέ το</string>
     <string name="cos_sm_find_it">Βρες το στα supermarket</string>
+    <string name="cos_sm_buy_it">Βρες το</string>
     <string name="cos_activate_unified">Συνδύασε τις προσφορές σε ένα κουπόνι</string>
     <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string>
     <string name="cos_popup_more_subtitle">Σε αυτή την ενότητα βρες έρευνες, παιχνίδια, διαγωνισμούς και επιβραβεύσεις για τις αθλητικές σου δραστηριότητες!</string>
@@ -122,6 +123,8 @@
     <string name="cos_coupon_gift">Δώρισέ το</string>
     <string name="cos_coupon_share_gift_title">Επίλεξε το κινητό από το οποίο θα γίνει η αποστολή και συμπλήρωσε το COSMOTE κινητό που θα λάβει το δώρο.</string>
     <string name="cos_coupon_share_sender">Αποστολέας</string>
+    <string name="cos_find_sm_product">Βρες το προϊον στα supermarket</string>
+    <string name="cos_sm_sheet_subtitle">Η διαθεσιμότητα ενδέχεται να διαφέρει ανάλογα με την τοποθεσία.</string>
     <string name="cos_coupon_share_hint">Καταχώρηση τηλεφώνου</string>
     <string name="cos_coupon_share_button">Αποστολή με SMS</string>
     <string name="cod_dlg_reject_title">Απόρριψη δώρου</string>
@@ -188,6 +191,9 @@
     <string name="cos_unified_subtitle">Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών αξίας <![CDATA[<b>%1$s€</b>]]>.</string>
     <string name="cos_unified_subtitle2">Χρησιμοποίησε τον παρακάτω κωδικό και πάρε έκπτωση στα ενεργά κουπόνια προσφορών.</string>
     <string name="cos_markets">Δες τα supermarket</string>
+    <string name="cos_markets_map">Δες τα καταστήματα στο χάρτη</string>
+    <string name="cos_markets_eshop">Δες τα eshop</string>
+    <string name="cos_markets_eshop_item">Δες το eshop</string>
     <string name="cos_show_market_coupons">Εμφάνιση προσφορών</string>
     <string name="cos_hide_market_coupons">Απόκρυψη προσφορών</string>
     <string name="cos_market_terms">1. Το εκπτωτικό κουπόνι ισχύει έως την ημερομηνία που αναφέρεται παραπάνω.\n

@@ -76,4 +76,11 @@
         <item name="colorAccent">@color/cos_light_blue</item>
     </style>
 
+    <style name="BottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/bottomSheetStyleWrapper</item>
+    </style>
+
+    <style name="bottomSheetStyleWrapper" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@android:color/transparent</item>
+    </style>
 </resources>
\ No newline at end of file