open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
bf034332 1 parent 3bd3be7f

redesign changes

Inline Side-by-side
Showing 15 changed files with 915 additions and 228 deletions
......@@ -87,6 +87,11 @@
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.activities.ActiveGiftsActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name="ly.warp.sdk.dexter.PermissionsActivity"
android:exported="false"
android:launchMode="singleInstance"
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import java.io.Serializable;
import java.util.ArrayList;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.CampaignList;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.io.models.MergedActiveGifts;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.views.adapters.MergedActiveGiftsAdapter;
public class ActiveGiftsActivity extends Activity implements View.OnClickListener {
// ===========================================================
// Constants
// ===========================================================
// ===========================================================
// Fields
// ===========================================================
private ImageView mIvBack;
private ArrayList<MergedActiveGifts> mData = new ArrayList();
private RecyclerView mRecyclerMergedActiveGifts;
private MergedActiveGiftsAdapter mAdapterMergedActiveGifts;
// ===========================================================
// Methods for/from SuperClass/Interfaces
// ===========================================================
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_active_gifts);
mergeDatasets(
/*WarplyManagerHelper.getUniqueCampaignList().get("gifts_for_you")*/null,
WarplyManagerHelper.getCouponList()
);
mIvBack = findViewById(R.id.iv_list_close);
mRecyclerMergedActiveGifts = findViewById(R.id.rv_merged_active_gifts);
initViews();
}
@Override
public void onResume() {
super.onResume();
}
@Override
public void onClick(View view) {
if (view.getId() == R.id.iv_list_close) {
onBackPressed();
return;
}
}
// ===========================================================
// Methods
// ===========================================================
private void initViews() {
mIvBack.setOnClickListener(this);
if (mData != null && mData.size() > 0) {
mRecyclerMergedActiveGifts.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
mAdapterMergedActiveGifts = new MergedActiveGiftsAdapter(this, mData);
mRecyclerMergedActiveGifts.setAdapter(mAdapterMergedActiveGifts);
mAdapterMergedActiveGifts.getPositionClicks()
.doOnNext(dataItem -> {
if (dataItem.getDataType() == 1) {
startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())));
} else if (dataItem.getDataType() == 2) {
Intent intent = new Intent(ActiveGiftsActivity.this, CouponInfoActivity.class);
intent.putExtra("coupon", (Serializable) dataItem.getCoupon());
startActivity(intent);
}
})
.doOnError(error -> {
})
.subscribe();
} else {
// mClCouponsOuter.setVisibility(View.GONE);
}
}
private ArrayList<MergedActiveGifts> mergeDatasets(CampaignList campaignList, CouponList couponsList) {
if (campaignList != null && campaignList.size() > 0) {
for (Campaign campaign : campaignList) {
MergedActiveGifts data = new MergedActiveGifts();
data.setCampaign(campaign);
data.setCoupon(null);
data.setDataType(1);
mData.add(data);
}
}
if (couponsList.size() > 0) {
for (Coupon coupon : couponsList) {
MergedActiveGifts data = new MergedActiveGifts();
data.setCampaign(null);
data.setCoupon(coupon);
data.setDataType(2);
mData.add(data);
}
}
return mData;
}
// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
}
......@@ -31,7 +31,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
private ImageView mIvBack;
private TextView mTvUsername, mTvActiveCoupons,
mTvActiveRewards, mTvUserBadge;
private ConstraintLayout mClActiveCoupons, mClActiveRewards;
private ConstraintLayout mClActiveCoupons, mClActiveRewards, mClActiveGifts;
private LinearLayout mLlAnalysisButton, mLlQuestionnaire, mLlUserBadge,
mLlPastCoupons;
......@@ -49,13 +49,16 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
mTvUsername = findViewById(R.id.tv_name);
mLlQuestionnaire = findViewById(R.id.ll_user_questionnaire);
mLlUserBadge = findViewById(R.id.ll_user_badge);
mClActiveCoupons = findViewById(R.id.cl_loyalty_coupon);
mTvActiveCoupons = findViewById(R.id.tv_active_coupons);
mClActiveRewards = findViewById(R.id.cl_loyalty_rewards);
mTvActiveRewards = findViewById(R.id.tv_active_rewards);
mLlAnalysisButton = findViewById(R.id.ll_analysis);
/**** Old functionality ****/
// mClActiveCoupons = findViewById(R.id.cl_loyalty_coupon);
// mTvActiveCoupons = findViewById(R.id.tv_active_coupons);
// mClActiveRewards = findViewById(R.id.cl_loyalty_rewards);
// mLlAnalysisButton = findViewById(R.id.ll_analysis);
// mLlPastCoupons = findViewById(R.id.ll_old_coupons);
/**** Old functionality ****/
mTvActiveRewards = findViewById(R.id.tv_active_deals_text);
mTvUserBadge = findViewById(R.id.tv_type);
mLlPastCoupons = findViewById(R.id.ll_old_coupons);
mClActiveGifts = findViewById(R.id.cl_mygifts);
initViews();
}
......@@ -71,11 +74,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
onBackPressed();
return;
}
if (view.getId() == R.id.ll_analysis) {
Intent intent = new Intent(this, LoyaltyActivity.class);
startActivity(intent);
return;
}
/**** Old functionality ****/
// if (view.getId() == R.id.ll_analysis) {
// Intent intent = new Intent(this, LoyaltyActivity.class);
// startActivity(intent);
// return;
// }
/**** Old functionality ****/
if (view.getId() == R.id.ll_user_questionnaire) {
CampaignList cl = WarplyManagerHelper.getUniqueCampaignList().get("more_for_you");
Campaign camp = null;
......@@ -94,21 +99,27 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
startActivity(WarpViewActivity.createIntentFromURL(LoyaltyWallet.this, WarplyManagerHelper.constructCampaignUrl(camp)));
return;
}
if (view.getId() == R.id.cl_loyalty_coupon) {
Intent intent = new Intent(LoyaltyWallet.this, ActiveCouponsActivity.class);
intent.putExtra("couponlist", WarplyManagerHelper.getCouponList());
startActivity(intent);
return;
}
if (view.getId() == R.id.cl_loyalty_rewards) {
Intent intent = new Intent(LoyaltyWallet.this, ActiveRewardsActivity.class);
intent.putExtra("couponlist", WarplyManagerHelper.getCouponList());
startActivity(intent);
return;
}
if (view.getId() == R.id.ll_old_coupons) {
Intent intent = new Intent(LoyaltyWallet.this, PastCouponsActivity.class);
intent.putExtra("couponlist", WarplyManagerHelper.getCouponList());
/**** Old functionality ****/
// if (view.getId() == R.id.cl_loyalty_coupon) {
// Intent intent = new Intent(LoyaltyWallet.this, ActiveCouponsActivity.class);
// intent.putExtra("couponlist", WarplyManagerHelper.getCouponList());
// startActivity(intent);
// return;
// }
// if (view.getId() == R.id.cl_loyalty_rewards) {
// Intent intent = new Intent(LoyaltyWallet.this, ActiveRewardsActivity.class);
// intent.putExtra("couponlist", WarplyManagerHelper.getCouponList());
// startActivity(intent);
// return;
// }
// if (view.getId() == R.id.ll_old_coupons) {
// Intent intent = new Intent(LoyaltyWallet.this, PastCouponsActivity.class);
// intent.putExtra("couponlist", WarplyManagerHelper.getCouponList());
// startActivity(intent);
// }
/**** Old functionality ****/
if (view.getId() == R.id.cl_mygifts) {
Intent intent = new Intent(LoyaltyWallet.this, ActiveGiftsActivity.class);
startActivity(intent);
}
}
......@@ -143,13 +154,16 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
mIvBack.setOnClickListener(this);
// mTvAnalysisButton.setOnClickListener(this);
mLlQuestionnaire.setOnClickListener(this);
mTvActiveCoupons.setText(String.format(getResources().getString(R.string.cos_active_coupons), String.valueOf(cpnlist.size())));
mClActiveCoupons.setOnClickListener(this);
/**** Old functionality ****/
// mTvActiveCoupons.setText(String.format(getResources().getString(R.string.cos_active_coupons), String.valueOf(cpnlist.size())));
// mClActiveCoupons.setOnClickListener(this);
// mClActiveRewards.setOnClickListener(this);
// mLlAnalysisButton.setOnClickListener(this);
// mLlPastCoupons.setOnClickListener(this);
/**** Old functionality ****/
//TODO: change the parameter, for testing purposes only
mTvActiveRewards.setText(String.format(getResources().getString(R.string.cos_active_rewards), String.valueOf(cpnlist.size())));
mClActiveRewards.setOnClickListener(this);
mLlAnalysisButton.setOnClickListener(this);
mLlPastCoupons.setOnClickListener(this);
mClActiveGifts.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 11-May-22.
*/
public class MergedActiveGifts {
private int dataType = 0;
private Coupon coupon;
private Campaign campaign;
public void setDataType(int dataType) {
this.dataType = dataType;
}
public void setCoupon(Coupon coupon) {
this.coupon = coupon;
}
public void setCampaign(Campaign campaign) {
this.campaign = campaign;
}
public int getDataType() {
return dataType;
}
public Coupon getCoupon() {
return coupon;
}
public Campaign getCampaign() {
return campaign;
}
}
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.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.MergedActiveGifts;
import ly.warp.sdk.io.models.MergedGifts;
public class MergedActiveGiftsAdapter extends RecyclerView.Adapter<MergedActiveGiftsAdapter.MergedActiveGiftsViewHolder> {
private Context mContext;
private ArrayList<MergedActiveGifts> mMergedActiveGifts;
private final PublishSubject<MergedActiveGifts> onClickSubject = PublishSubject.create();
public MergedActiveGiftsAdapter(Context mContext, ArrayList<MergedActiveGifts> mergedactivegifts) {
this.mContext = mContext;
this.mMergedActiveGifts = mergedactivegifts;
}
public class MergedActiveGiftsViewHolder extends RecyclerView.ViewHolder {
private ImageView ivMergedActiveGiftsLogo;
private TextView tvMergedActiveGiftsTitle, tvMergedActiveGiftsValue, tvMergedActiveGiftsDate,
tvMergedActiveGiftsDescription;
public MergedActiveGiftsViewHolder(View view) {
super(view);
ivMergedActiveGiftsLogo = view.findViewById(R.id.iv_active_coupon);
tvMergedActiveGiftsTitle = view.findViewById(R.id.tv_active_coupons_title);
tvMergedActiveGiftsValue = view.findViewById(R.id.tv_active_coupons_value);
tvMergedActiveGiftsDate = view.findViewById(R.id.tv_active_coupons_date);
tvMergedActiveGiftsDescription = view.findViewById(R.id.tv_active_coupons_description);
}
}
@Override
public int getItemCount() {
if (mMergedActiveGifts == null)
return 0;
else
return mMergedActiveGifts.size();
}
public MergedActiveGifts getItem(int id) {
return mMergedActiveGifts.get(id);
}
public void updateData(ArrayList<MergedActiveGifts> mergedactivegifts) {
mMergedActiveGifts.clear();
mMergedActiveGifts.addAll(mergedactivegifts);
notifyDataSetChanged();
}
@Override
public MergedActiveGiftsViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View itemView;
// if ()
// itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_merged_gifts_recycler, parent, false);
// else
itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.active_coupon_layout, parent, false);
return new MergedActiveGiftsViewHolder(itemView);
}
@Override
public void onBindViewHolder(final MergedActiveGiftsViewHolder holder, int position) {
MergedActiveGifts mergedgiftsItem = mMergedActiveGifts.get(position);
if (mergedgiftsItem != null && mergedgiftsItem.getDataType() == 1) {
if (!TextUtils.isEmpty(mergedgiftsItem.getCampaign().getLogoUrl())) {
Glide.with(mContext)
.load(mergedgiftsItem.getCampaign().getLogoUrl())
.transform(new CenterCrop(), new RoundedCorners(4))
.diskCacheStrategy(DiskCacheStrategy.DATA)
.into(holder.ivMergedActiveGiftsLogo);
} else {
Glide.with(mContext)
.load(R.drawable.ic_cosmote_logo_horizontal_grey)
.into(holder.ivMergedActiveGiftsLogo);
}
holder.tvMergedActiveGiftsTitle.setText(mergedgiftsItem.getCampaign().getTitle());
} else if (mergedgiftsItem != null && mergedgiftsItem.getDataType() == 2) {
if (!TextUtils.isEmpty(mergedgiftsItem.getCoupon().getImage())) {
Glide.with(mContext)
// .setDefaultRequestOptions(
// RequestOptions
// .placeholderOf(R.drawable.ic_default_contact_photo)
// .error(R.drawable.ic_default_contact_photo))
.load(mergedgiftsItem.getCoupon().getImage())
.diskCacheStrategy(DiskCacheStrategy.DATA)
.into(holder.ivMergedActiveGiftsLogo);
} else {
Glide.with(mContext)
.load(R.drawable.ic_cosmote_logo_horizontal_grey)
.into(holder.ivMergedActiveGiftsLogo);
}
holder.tvMergedActiveGiftsTitle.setText(mergedgiftsItem.getCoupon().getName());
holder.tvMergedActiveGiftsDescription.setText(mergedgiftsItem.getCoupon().getDescription());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
Date newDate = new Date();
try {
newDate = simpleDateFormat.parse(mergedgiftsItem.getCoupon().getExpiration());
} catch (ParseException e) {
e.printStackTrace();
}
simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
holder.tvMergedActiveGiftsDate.setText(String.format(mContext.getString(R.string.cos_coupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
holder.tvMergedActiveGiftsValue.setText(mergedgiftsItem.getCoupon().getDiscount() + mContext.getResources().getString(R.string.euro));
}
holder.itemView.setOnClickListener(v -> onClickSubject.onNext(mergedgiftsItem));
}
public Observable<MergedActiveGifts> getPositionClicks() {
return onClickSubject.cache();
}
private long getDifferenceDays(Date d1, Date d2) {
long diff = d2.getTime() - d1.getTime();
return TimeUnit.DAYS.convert(diff, TimeUnit.MILLISECONDS);
}
}
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dp" />
<solid
android:color="@color/cos_grey6" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="5dp" />
<solid android:color="@color/cos_grey_tr" />
</shape>
</item>
<item
android:bottom="7dp"
android:left="7dp"
android:right="7dp"
android:top="7dp">
<shape android:shape="rectangle">
<solid android:color="@color/cos_grey6" />
<corners android:radius="5dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
<?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:id="@+id/cl_bill_payment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bill_header"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@android:color/white">
<ImageView
android:id="@+id/iv_list_close"
android:layout_width="21dp"
android:layout_height="20dp"
android:layout_marginStart="24dp"
android:layout_marginTop="4dp"
android:src="@drawable/ic_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/textView3" />
<TextView
android:id="@+id/textView3"
android:layout_width="206dp"
android:layout_height="32dp"
android:gravity="center"
android:textColor="@color/grey"
android:textSize="17sp"
android:textStyle="bold"
android:text="@string/cos_active_gifts_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.356"
app:layout_constraintStart_toEndOf="@+id/iv_list_close"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_merged_active_gifts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingTop="44dp" />
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_gifts_title2"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_gifts"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_gifts_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_recycler_inner"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_rewards_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_rewards_title"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_rewards"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_rewards_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_recycler_inner2"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_coupons_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_coupons_title"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_coupons"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="24dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_coupons_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
......@@ -127,18 +127,84 @@
android:paddingBottom="24dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="32dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_06"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.074" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win_inner"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/shape_cos_grey4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/gl_vertical_06"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_16"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.16" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/cos_deals_win_title"
android:textColor="@android:color/white"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_16"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginVertical="4dp"
android:src="@drawable/ic_hands"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/gl_vertical_06"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_06"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/iv_deals_logo_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/cl_deals_win"
android:layout_marginStart="12dp"
android:layout_marginTop="48dp"
android:src="@drawable/ic_deals_logo_new" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_deals"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_deals_logo_new"
android:layout_marginHorizontal="6dp"
android:layout_marginTop="48dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_cos_white2"
android:paddingVertical="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="38dp"
android:layout_marginStart="24dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -166,7 +232,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Λήγει σε 4 ημέρες"
android:textColor="@color/cos_grey3"
android:textColor="@color/blue_dark"
android:textFontWeight="600" />
</LinearLayout>
......@@ -174,225 +240,291 @@
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_marginEnd="32dp"
android:src="@drawable/ic_loyalty_deals"
android:src="@drawable/ic_deals_green"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_active_coupons"
android:layout_width="match_parent"
<TextView
android:id="@+id/tv_mygifts_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_loyalty_deals"
android:layout_marginTop="64dp"
android:paddingBottom="4dp">
android:layout_marginStart="12dp"
android:layout_marginTop="48dp"
android:text="@string/cos_mygifts"
android:textColor="@android:color/white"
android:textFontWeight="600"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_coupons_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/cos_loyalty_coupons"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mygifts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_mygifts_title"
android:layout_marginHorizontal="6dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_cos_white2"
android:paddingVertical="10dp">
<LinearLayout
android:id="@+id/ll_old_coupons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/tv_coupons_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_coupons_title">
android:layout_marginStart="24dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_active_gifts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/cos_loyalty_old_coupons"
android:textColor="@color/white_tr4"
android:text="@string/cos_gifts_banner_title"
android:textColor="@color/blue_dark"
android:textFontWeight="600"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_more"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginEnd="24dp"
android:src="@drawable/ic_arrow_right_white" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_coupon"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_marginTop="16dp"
android:background="@drawable/ic_coupon_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_coupons_title">
android:textSize="18sp" />
<LinearLayout
<TextView
android:id="@+id/tv_active_deals_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_active_coupons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textColor="@color/blue_dark"
android:textFontWeight="600"
android:textSize="18sp"
tools:text="@string/cos_active_coupons" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/cos_see_all"
android:textColor="@color/blue_dark" />
</LinearLayout>
<ImageView
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_marginEnd="32dp"
android:src="@drawable/ic_gifts_for_you"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_cl_active_rewards"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_active_coupons"
android:layout_marginTop="64dp"
android:paddingBottom="4dp">
<TextView
android:id="@+id/tv_rewards_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/cos_loyalty_rewards"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_old_rewards"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/tv_rewards_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_rewards_title">
android:text="@string/cos_active_rewards"
android:textColor="@color/blue_dark"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/cos_loyalty_old_rewards"
android:textColor="@color/white_tr4"
android:textFontWeight="600"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_more2"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginEnd="24dp"
android:src="@drawable/ic_arrow_right_white" />
android:text="@string/cos_see_more"
android:textColor="@color/blue_dark" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_rewards"
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_marginHorizontal="6dp"
android:layout_marginTop="16dp"
android:background="@drawable/shape_cos_white2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_rewards_title">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="38dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_active_rewards"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textColor="@color/blue_dark"
android:textFontWeight="600"
android:textSize="18sp"
tools:text="@string/cos_active_rewards" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/cos_see_all"
android:textColor="@color/blue_dark" />
</LinearLayout>
<ImageView
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_marginEnd="32dp"
android:src="@drawable/ic_loyalty_rewards"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <ImageView-->
<!-- android:layout_width="90dp"-->
<!-- android:layout_height="90dp"-->
<!-- android:layout_marginEnd="32dp"-->
<!-- android:src="@drawable/ic_deals_green"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_analysis"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_below="@+id/cl_cl_active_rewards"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="64dp"
android:layout_marginBottom="32dp"
android:background="@drawable/selector_button_grey"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cos_analysis"
android:textColor="@color/cos_green6"
android:textSize="17dp"
android:textStyle="bold" />
</LinearLayout>
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_active_coupons"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_loyalty_deals"-->
<!-- android:layout_marginTop="64dp"-->
<!-- android:paddingBottom="4dp">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_coupons_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_loyalty_coupons"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_old_coupons"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:orientation="horizontal"-->
<!-- app:layout_constraintBottom_toBottomOf="@+id/tv_coupons_title"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="@+id/tv_coupons_title">-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="8dp"-->
<!-- android:text="@string/cos_loyalty_old_coupons"-->
<!-- android:textColor="@color/white_tr4"-->
<!-- android:textFontWeight="600"-->
<!-- android:textSize="16sp" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_more"-->
<!-- android:layout_width="20dp"-->
<!-- android:layout_height="20dp"-->
<!-- android:layout_marginEnd="24dp"-->
<!-- android:src="@drawable/ic_arrow_right_white" />-->
<!-- </LinearLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_loyalty_coupon"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="140dp"-->
<!-- android:layout_marginTop="16dp"-->
<!-- android:background="@drawable/ic_coupon_background"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_coupons_title">-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="40dp"-->
<!-- android:orientation="vertical"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_active_coupons"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="8dp"-->
<!-- android:textColor="@color/blue_dark"-->
<!-- android:textFontWeight="600"-->
<!-- android:textSize="18sp"-->
<!-- tools:text="@string/cos_active_coupons" />-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="8dp"-->
<!-- android:text="@string/cos_see_all"-->
<!-- android:textColor="@color/blue_dark" />-->
<!-- </LinearLayout>-->
<!-- <ImageView-->
<!-- android:layout_width="90dp"-->
<!-- android:layout_height="90dp"-->
<!-- android:layout_marginEnd="32dp"-->
<!-- android:src="@drawable/ic_gifts_for_you"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_cl_active_rewards"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_active_coupons"-->
<!-- android:layout_marginTop="64dp"-->
<!-- android:paddingBottom="4dp">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_rewards_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_loyalty_rewards"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_old_rewards"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:orientation="horizontal"-->
<!-- app:layout_constraintBottom_toBottomOf="@+id/tv_rewards_title"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="@+id/tv_rewards_title">-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="8dp"-->
<!-- android:text="@string/cos_loyalty_old_rewards"-->
<!-- android:textColor="@color/white_tr4"-->
<!-- android:textFontWeight="600"-->
<!-- android:textSize="16sp" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_more2"-->
<!-- android:layout_width="20dp"-->
<!-- android:layout_height="20dp"-->
<!-- android:layout_marginEnd="24dp"-->
<!-- android:src="@drawable/ic_arrow_right_white" />-->
<!-- </LinearLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_loyalty_rewards"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="160dp"-->
<!-- android:layout_marginHorizontal="6dp"-->
<!-- android:layout_marginTop="16dp"-->
<!-- android:background="@drawable/shape_cos_white2"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_rewards_title">-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="38dp"-->
<!-- android:orientation="vertical"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_active_rewards"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="8dp"-->
<!-- android:textColor="@color/blue_dark"-->
<!-- android:textFontWeight="600"-->
<!-- android:textSize="18sp"-->
<!-- tools:text="@string/cos_active_rewards" />-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="8dp"-->
<!-- android:text="@string/cos_see_all"-->
<!-- android:textColor="@color/blue_dark" />-->
<!-- </LinearLayout>-->
<!-- <ImageView-->
<!-- android:layout_width="90dp"-->
<!-- android:layout_height="90dp"-->
<!-- android:layout_marginEnd="32dp"-->
<!-- android:src="@drawable/ic_loyalty_rewards"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_analysis"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="50dp"-->
<!-- android:layout_below="@+id/cl_cl_active_rewards"-->
<!-- android:layout_marginHorizontal="32dp"-->
<!-- android:layout_marginTop="64dp"-->
<!-- android:layout_marginBottom="32dp"-->
<!-- android:background="@drawable/selector_button_grey"-->
<!-- android:gravity="center"-->
<!-- android:orientation="horizontal"-->
<!-- android:visibility="gone">-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:text="@string/cos_analysis"-->
<!-- android:textColor="@color/cos_green6"-->
<!-- android:textSize="17dp"-->
<!-- android:textStyle="bold" />-->
<!-- </LinearLayout>-->
</RelativeLayout>
</ScrollView>
</RelativeLayout>
......
......@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:scaleType="centerInside"
android:src="@drawable/ic_gifts_for_you_white" />
android:src="@drawable/ic_more_for_you_new" />
<TextView
android:layout_width="wrap_content"
......
......@@ -46,4 +46,6 @@
<color name="cos_light_grey">#F4F4F4</color>
<color name="cos_green9">#86C15F</color>
<color name="cos_skyblue">#13ACD4</color>
<color name="cos_grey6">#536C79</color>
<color name="cos_grey_tr">#00000029</color>
</resources>
\ No newline at end of file
......
......@@ -46,7 +46,7 @@
<string name="cos_loyalty_rewards">My rewards</string>
<string name="cos_loyalty_old_rewards">Παλαιότερα δώρα</string>
<string name="cos_see_all">Δες τα όλα -></string>
<string name="cos_active_rewards">Έχεις %1$s ενεργά\nδώρα</string>
<string name="cos_active_rewards">Έχεις %1$s ενεργά δώρα</string>
<string name="cos_analysis">Ανάλυση</string>
<string name="cos_active_deals">Ενεργός κωδικός:</string>
<string name="cos_monthly">Μηνιαία</string>
......@@ -67,6 +67,11 @@
<string name="cos_gift_it">Κάντο δώρο!</string>
<string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string>
<string name="cos_popup_more_subtitle">Εδώ μπορείς να βρεις διαγωνισμούς και\nνα σε επιβραβεύσουμε για τις αθλητικές σου\nδραστηριότητες!</string>
<string name="cos_deals_win_title">Μέχρι τώρα έχεις κερδίσει 30 κουπόνια\nκαι 20,00€ σε προσφορές!</string>
<string name="cos_mygifts">Τα δώρα μου</string>
<string name="cos_gifts_banner_title">Δώρα:</string>
<string name="cos_see_more">Δες περισσότερα</string>
<string name="cos_active_gifts_title">Ενεργά δώρα</string>
<string-array name="coupons_array">
<item>Κουπόνια</item>
......