new mfy ui

@@ -31,17 +31,17 @@ package ly.warp.sdk.io.models;
  */
 
 public class HealthEventModel {
-    private double steps;
+    private double meters;
 
     public HealthEventModel() {
-        this.steps = 0.0d;
+        this.meters = 0.0d;
     }
 
-    public double getSteps() {
-        return steps;
+    public double getMeters() {
+        return meters;
     }
 
-    public void setSteps(double steps) {
-        this.steps = steps;
+    public void setMeters(double meters) {
+        this.meters = meters;
     }
 }

@@ -211,7 +211,7 @@ public class WarplyHealthService extends Service implements SensorEventListener
             mSteps++;
             mStepsAll++;
             HealthEventModel healthSteps = new HealthEventModel();
-            healthSteps.setSteps((mStepsAll * 0.762));
+            healthSteps.setMeters((mStepsAll * 0.762));
             EventBus.getDefault().post(new WarplyEventBusManager(healthSteps));
             WarpUtils.setStepsMetersCounter(this, (mStepsAll * 0.762));
             WarpUtils.setStepsCounter(this, mSteps);

@@ -745,7 +745,7 @@ public class WarplyManagerHelper {
      */
     public static void setSeasonalList(ArrayList<LoyaltyGiftsForYouPackage> seasonalCoupons) {
         mSeasonalList.clear();
-        mSeasonalList.addAll(seasonalCoupons);
+        mSeasonalList = seasonalCoupons;
     }
 
     /**

@@ -22,8 +22,7 @@ import io.reactivex.subjects.PublishSubject;
 import ly.warp.sdk.R;
 import ly.warp.sdk.io.models.Campaign;
 
-
-public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapter.ProfileCampaignViewHolder> {
+public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapter.MoreCampaignViewHolder> {
 
     private Context mContext;
     private ArrayList<Campaign> mCampaigns;
@@ -34,25 +33,17 @@ public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapte
         this.mCampaigns = campaignList;
     }
 
-    public class ProfileCampaignViewHolder extends RecyclerView.ViewHolder {
+    public class MoreCampaignViewHolder extends RecyclerView.ViewHolder {
         private ImageView ivCampaignTitle, ivIsNew;
         private TextView tvCampaignTitle, tvCampaignSubtitle, tvCampaignMessage;
 
-        public ProfileCampaignViewHolder(View view) {
-            super(view);
-            ivCampaignTitle = view.findViewById(R.id.iv_campaign_logo);
-            tvCampaignTitle = view.findViewById(R.id.tv_campaign_title);
-        }
-
-        public ProfileCampaignViewHolder(View view, boolean vertical) {
+        public MoreCampaignViewHolder(View view) {
             super(view);
             ivCampaignTitle = view.findViewById(R.id.iv_campaign_logo);
             tvCampaignTitle = view.findViewById(R.id.tv_campaign_title);
             ivIsNew = view.findViewById(R.id.iv_campaign_new);
-            if (vertical) {
-                tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle);
-                tvCampaignMessage = view.findViewById(R.id.tv_campaign_message);
-            }
+            tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle);
+            tvCampaignMessage = view.findViewById(R.id.tv_campaign_message);
         }
     }
 
@@ -76,15 +67,15 @@ public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapte
     }
 
     @Override
-    public ProfileCampaignViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public MoreCampaignViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View itemView;
 
         itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_profile_recycler_vertical, parent, false);
-        return new ProfileCampaignViewHolder(itemView, true);
+        return new MoreCampaignViewHolder(itemView);
     }
 
     @Override
-    public void onBindViewHolder(final ProfileCampaignViewHolder holder, int position) {
+    public void onBindViewHolder(final MoreCampaignViewHolder holder, int position) {
         Campaign campaignItem = mCampaigns.get(position);
 
         if (campaignItem != null) {

+package ly.warp.sdk.views.adapters;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+
+import java.util.ArrayList;
+
+import io.reactivex.Observable;
+import io.reactivex.subjects.PublishSubject;
+import ly.warp.sdk.R;
+import ly.warp.sdk.io.models.Campaign;
+import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
+
+public class MoreContextualAdapter extends RecyclerView.Adapter<MoreContextualAdapter.MoreContextualViewHolder> {
+
+    private Context mContext;
+    private ArrayList<LoyaltyContextualOfferModel> mCampaigns;
+    private final PublishSubject<LoyaltyContextualOfferModel> onClickSubject = PublishSubject.create();
+
+    public MoreContextualAdapter(Context mContext, ArrayList<LoyaltyContextualOfferModel> campaignList) {
+        this.mContext = mContext;
+        this.mCampaigns = campaignList;
+    }
+
+    public class MoreContextualViewHolder extends RecyclerView.ViewHolder {
+        private ImageView ivCampaignTitle, ivIsNew;
+        private TextView tvCampaignTitle, tvCampaignSubtitle, tvCampaignMessage;
+
+        public MoreContextualViewHolder(View view) {
+            super(view);
+            ivCampaignTitle = view.findViewById(R.id.iv_campaign_logo);
+            tvCampaignTitle = view.findViewById(R.id.tv_campaign_title);
+            ivIsNew = view.findViewById(R.id.iv_campaign_new);
+            tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle);
+            tvCampaignMessage = view.findViewById(R.id.tv_campaign_message);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mCampaigns == null)
+            return 0;
+        else
+            return mCampaigns.size();
+    }
+
+
+    public LoyaltyContextualOfferModel getItem(int id) {
+        return mCampaigns.get(id);
+    }
+
+    public void updateData(ArrayList<LoyaltyContextualOfferModel> campaignList) {
+        mCampaigns.clear();
+        mCampaigns.addAll(campaignList);
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public MoreContextualViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View itemView;
+
+        itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_profile_recycler_vertical, parent, false);
+        return new MoreContextualViewHolder(itemView);
+    }
+
+    @Override
+    public void onBindViewHolder(final MoreContextualViewHolder holder, int position) {
+        LoyaltyContextualOfferModel campaignItem = mCampaigns.get(position);
+
+        if (campaignItem != null) {
+            if (!TextUtils.isEmpty(campaignItem.getImageUrl())) {
+                Glide.with(mContext)
+                        .load(campaignItem.getImageUrl())
+                        .transform(new CenterCrop(), new RoundedCorners(4))
+                        .diskCacheStrategy(DiskCacheStrategy.DATA)
+                        .into(holder.ivCampaignTitle);
+            } else {
+                Glide.with(mContext)
+                        .load(R.drawable.ic_cosmote_logo_horizontal_grey)
+                        .into(holder.ivCampaignTitle);
+            }
+
+            holder.tvCampaignTitle.setText(campaignItem.getTitle());
+            holder.tvCampaignSubtitle.setText(campaignItem.getSubtitle());
+            holder.tvCampaignMessage.setText(campaignItem.getMessage());
+            holder.ivIsNew.setVisibility(View.GONE);
+
+            holder.itemView.setOnClickListener(v -> onClickSubject.onNext(campaignItem));
+        }
+    }
+
+    public Observable<LoyaltyContextualOfferModel> getPositionClicks() {
+        return onClickSubject.cache();
+    }
+
+}

@@ -132,6 +132,7 @@
     <string name="cos_empty_shared_coupons">Δεν έχεις μοιραστεί ακόμη κουπόνια</string>
     <string name="cos_empty_expired_coupons">Δεν έχεις εξαργυρώσει ακόμη κουπόνια</string>
     <string name="cos_dlg_pacing_goal">Πέτυχες το στόχο του μήνα! Διάλεξε το δώρο που επιθυμείς να ενεργοποιήσεις!</string>
+    <string name="cos_mfy_other">ΆΛΛΕΣ</string>
 
     <string-array name="coupons_array">
         <item>Κουπόνια</item>