open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
7cae7dbf 1 parent 468baa84

redesign my rewards fragment

Inline Side-by-side
Showing 17 changed files with 681 additions and 1228 deletions
...@@ -114,11 +114,11 @@ ...@@ -114,11 +114,11 @@
114 android:screenOrientation="portrait" 114 android:screenOrientation="portrait"
115 android:theme="@style/SDKAppTheme" /> 115 android:theme="@style/SDKAppTheme" />
116 116
117 - <activity 117 +<!-- <activity-->
118 - android:name="ly.warp.sdk.activities.LoyaltyWallet" 118 +<!-- android:name="ly.warp.sdk.activities.LoyaltyWallet"-->
119 - android:exported="false" 119 +<!-- android:exported="false"-->
120 - android:screenOrientation="portrait" 120 +<!-- android:screenOrientation="portrait"-->
121 - android:theme="@style/SDKAppTheme" /> 121 +<!-- android:theme="@style/SDKAppTheme" />-->
122 122
123 <activity 123 <activity
124 android:name="ly.warp.sdk.activities.ActiveGiftsActivity" 124 android:name="ly.warp.sdk.activities.ActiveGiftsActivity"
......
...@@ -199,25 +199,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -199,25 +199,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
199 mFavValue += WarplyManagerHelper.getDealsCouponsSum(); 199 mFavValue += WarplyManagerHelper.getDealsCouponsSum();
200 /** First Banner */ 200 /** First Banner */
201 201
202 - /** Second Banner */ 202 + /** Second Expandable Banner */
203 - if (WarplyManagerHelper.getLoyaltyBadge() != null && (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0 || WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)) {
204 - String badgeValue = String.format(Locale.GERMAN,"%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
205 - mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue));
206 - if (String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() >= 3) {
207 - mTvGiftsValue.setTextSize(12);
208 - } else {
209 - mTvGiftsValue.setTextSize(14);
210 - }
211 - SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder();
212 - sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue));
213 - CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
214 - sBuilderSecond.setSpan(typefaceBoldSpanSecond, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
215 - mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE);
216 - mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue();
217 - }
218 - /** Second Banner */
219 -
220 - /** Third Expandable Banner */
221 if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) { 203 if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
222 countValue = 0.0f; 204 countValue = 0.0f;
223 205
...@@ -226,7 +208,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -226,7 +208,7 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
226 for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) { 208 for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) {
227 for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) { 209 for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
228 if (cou.getCouponsetUuid().equals(couset.getUuid())) { 210 if (cou.getCouponsetUuid().equals(couset.getUuid())) {
229 - countValue += Float.valueOf(cou.getDiscount()); 211 + countValue += Float.parseFloat(cou.getDiscount());
230 cou.setDescription(couset.getShortDescription()); 212 cou.setDescription(couset.getShortDescription());
231 cou.setImage(couset.getImgPreview()); 213 cou.setImage(couset.getImgPreview());
232 cou.setName(couset.getName()); 214 cou.setName(couset.getName());
...@@ -263,7 +245,25 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -263,7 +245,25 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
263 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 245 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
264 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE); 246 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
265 } 247 }
266 - /** Third Expandable Banner */ 248 + /** Second Expandable Banner */
249 +
250 + /** Third Banner */
251 + if (WarplyManagerHelper.getLoyaltyBadge() != null && (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0 || WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)) {
252 + String badgeValue = String.format(Locale.GERMAN,"%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
253 + mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue));
254 + if (String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() >= 3) {
255 + mTvGiftsValue.setTextSize(12);
256 + } else {
257 + mTvGiftsValue.setTextSize(14);
258 + }
259 + SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder();
260 + sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue));
261 + CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
262 + sBuilderSecond.setSpan(typefaceBoldSpanSecond, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
263 + mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE);
264 + mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue();
265 + }
266 + /** Third Banner */
267 267
268 /** Sum Banner */ 268 /** Sum Banner */
269 String allValue = String.format(Locale.GERMAN,"%.02f", mFavValue); 269 String allValue = String.format(Locale.GERMAN,"%.02f", mFavValue);
......
...@@ -18,7 +18,6 @@ import org.json.JSONObject; ...@@ -18,7 +18,6 @@ import org.json.JSONObject;
18 18
19 import ly.warp.sdk.R; 19 import ly.warp.sdk.R;
20 import ly.warp.sdk.activities.GiftsForYouActivity; 20 import ly.warp.sdk.activities.GiftsForYouActivity;
21 -import ly.warp.sdk.activities.LoyaltyWallet;
22 import ly.warp.sdk.activities.MoreForYouActivity; 21 import ly.warp.sdk.activities.MoreForYouActivity;
23 import ly.warp.sdk.activities.WarpViewActivity; 22 import ly.warp.sdk.activities.WarpViewActivity;
24 import ly.warp.sdk.io.models.Campaign; 23 import ly.warp.sdk.io.models.Campaign;
...@@ -172,8 +171,7 @@ public class LoyaltyFragment extends Fragment implements View.OnClickListener { ...@@ -172,8 +171,7 @@ public class LoyaltyFragment extends Fragment implements View.OnClickListener {
172 @Override 171 @Override
173 public void onClick(View view) { 172 public void onClick(View view) {
174 if (view.getId() == R.id.cl_rewards_wallet) { 173 if (view.getId() == R.id.cl_rewards_wallet) {
175 - Intent intent = new Intent(getContext(), LoyaltyWallet.class); 174 +
176 - startActivity(intent);
177 return; 175 return;
178 } 176 }
179 if (view.getId() == R.id.iv_more2) { 177 if (view.getId() == R.id.iv_more2) {
......
...@@ -2,7 +2,6 @@ package ly.warp.sdk.fragments; ...@@ -2,7 +2,6 @@ package ly.warp.sdk.fragments;
2 2
3 import static android.app.Activity.RESULT_OK; 3 import static android.app.Activity.RESULT_OK;
4 4
5 -import android.content.Context;
6 import android.content.Intent; 5 import android.content.Intent;
7 import android.os.Bundle; 6 import android.os.Bundle;
8 import android.os.Handler; 7 import android.os.Handler;
...@@ -11,34 +10,19 @@ import android.text.TextUtils; ...@@ -11,34 +10,19 @@ import android.text.TextUtils;
11 import android.view.LayoutInflater; 10 import android.view.LayoutInflater;
12 import android.view.View; 11 import android.view.View;
13 import android.view.ViewGroup; 12 import android.view.ViewGroup;
14 -import android.widget.ImageView;
15 import android.widget.LinearLayout; 13 import android.widget.LinearLayout;
16 import android.widget.RelativeLayout; 14 import android.widget.RelativeLayout;
17 -import android.widget.ScrollView;
18 import android.widget.TextView; 15 import android.widget.TextView;
19 16
20 import androidx.annotation.NonNull; 17 import androidx.annotation.NonNull;
21 import androidx.appcompat.app.AlertDialog; 18 import androidx.appcompat.app.AlertDialog;
22 import androidx.cardview.widget.CardView; 19 import androidx.cardview.widget.CardView;
23 import androidx.constraintlayout.widget.ConstraintLayout; 20 import androidx.constraintlayout.widget.ConstraintLayout;
24 -import androidx.core.content.ContextCompat;
25 -import androidx.core.widget.NestedScrollView;
26 import androidx.fragment.app.Fragment; 21 import androidx.fragment.app.Fragment;
27 -import androidx.recyclerview.widget.LinearLayoutManager;
28 -import androidx.recyclerview.widget.RecyclerView;
29 22
30 -import com.bumptech.glide.Glide;
31 -import com.bumptech.glide.load.engine.DiskCacheStrategy;
32 -
33 -import net.cachapa.expandablelayout.ExpandableLayout;
34 -
35 -import org.apmem.tools.layouts.FlowLayout;
36 import org.greenrobot.eventbus.EventBus; 23 import org.greenrobot.eventbus.EventBus;
37 import org.greenrobot.eventbus.Subscribe; 24 import org.greenrobot.eventbus.Subscribe;
38 25
39 -import java.util.ArrayList;
40 -
41 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
42 import ly.warp.sdk.R; 26 import ly.warp.sdk.R;
43 import ly.warp.sdk.activities.ActiveCouponsActivity; 27 import ly.warp.sdk.activities.ActiveCouponsActivity;
44 import ly.warp.sdk.activities.ActiveUnifiedCouponsActivity; 28 import ly.warp.sdk.activities.ActiveUnifiedCouponsActivity;
...@@ -47,16 +31,15 @@ import ly.warp.sdk.activities.LoyaltyHistoryActivity; ...@@ -47,16 +31,15 @@ import ly.warp.sdk.activities.LoyaltyHistoryActivity;
47 import ly.warp.sdk.activities.LoyaltyMarketAnalysisActivity; 31 import ly.warp.sdk.activities.LoyaltyMarketAnalysisActivity;
48 import ly.warp.sdk.activities.WarpViewActivity; 32 import ly.warp.sdk.activities.WarpViewActivity;
49 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel; 33 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel;
34 +import ly.warp.sdk.io.models.Coupon;
35 +import ly.warp.sdk.io.models.Couponset;
50 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 36 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
51 -import ly.warp.sdk.io.models.UnifiedCoupon;
52 import ly.warp.sdk.io.models.VouchersActivityEventModel; 37 import ly.warp.sdk.io.models.VouchersActivityEventModel;
53 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel; 38 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
54 import ly.warp.sdk.utils.WarpUtils; 39 import ly.warp.sdk.utils.WarpUtils;
55 import ly.warp.sdk.utils.WarplyManagerHelper; 40 import ly.warp.sdk.utils.WarplyManagerHelper;
56 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 41 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
57 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 42 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
58 -import ly.warp.sdk.views.adapters.ActiveCouponAdapter;
59 -import ly.warp.sdk.views.adapters.MarketCouponAdapter;
60 43
61 44
62 public class MyRewardsFragment extends Fragment implements View.OnClickListener { 45 public class MyRewardsFragment extends Fragment implements View.OnClickListener {
...@@ -69,37 +52,24 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -69,37 +52,24 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
69 // Fields 52 // Fields
70 // =========================================================== 53 // ===========================================================
71 54
72 - private ImageView mIvDealsLogo, mIvProfilePhoto, mIvExpArrow; 55 + private TextView mTvUserBadge,
73 - private TextView mTvUsername, mTvDealsValue, mTvDealsValueAll, 56 + mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge,
74 - mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate,
75 - mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue,
76 - mTvFavValueAll, mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge,
77 mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle; 57 mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle;
78 - private ConstraintLayout mClDealsBanner, mClDealsView, 58 + private ConstraintLayout mLlHistory,
79 - mClGiftsBanner, mClMarket; 59 + mLlQuestionnaire, mLlUserBadge;
80 - private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts, 60 + private LinearLayout mLlEmptyWallet,
81 - mLlMarketView, mLlHistory, mLlBannerInfo, mLlVouchers, mLlVouchersSpinner, 61 + mLlBannerInfo, mLlVouchers, mLlVouchersSpinner,
82 mLlVouchersDisabled; 62 mLlVouchersDisabled;
83 - private FlowLayout mLlActiveCodesView;
84 - private float couponDfyValue = 0.0f, mFavValue = 0.0f;
85 - private RecyclerView mRecyclerCoupons, mRvMarketCoupons;
86 - private ActiveCouponAdapter mAdapterCoupons;
87 private AlertDialog mAlertDialogNonTelco, mAlertDialogVouchersService; 63 private AlertDialog mAlertDialogNonTelco, mAlertDialogVouchersService;
88 - private ScrollView mScActiveCodes;
89 private int mTimer = 0; 64 private int mTimer = 0;
90 private Handler mSecondsHandler; 65 private Handler mSecondsHandler;
91 - private ArrayList<UnifiedCoupon> mUnifiedCoupons = new ArrayList<UnifiedCoupon>(); 66 + private CardView mCvVouchers, mCvVouchersDisabled;
92 - private float countValue = 0.0f;
93 - private MarketCouponAdapter mAdapterMarketCoupons;
94 - private ExpandableLayout mElGifts;
95 - private boolean mIsStayCollapsed = true;
96 - private CardView mClExp, mCvVouchers, mCvVouchersDisabled;
97 private boolean mDfyPressed = false, mDealsBannerPressed = false, mQuestionnairePressed = false, 67 private boolean mDfyPressed = false, mDealsBannerPressed = false, mQuestionnairePressed = false,
98 - mHistoryPressed = false, mHistoryMarketPressed = false, mUnifiedPressed = false, 68 + mHistoryPressed = false, mHistoryMarketPressed = false,
99 - mCouponPressed = false, mHistoryBadgePressed = false, mUnifiedCountPressed = false, 69 + mHistoryBadgePressed = false, mUnifiedCountPressed = false,
100 mGiftsCountPressed = false; 70 mGiftsCountPressed = false;
101 private RelativeLayout mRlDeals, mRlUnified, mRlGifts; 71 private RelativeLayout mRlDeals, mRlUnified, mRlGifts;
102 - private View mSeparator, mSeparatorDisabled; 72 + private boolean mIsDealsEmpty = false, mIsMarketsEmpty = false, mIsCouponsEmpty = false;
103 73
104 // =========================================================== 74 // ===========================================================
105 // Methods for/from SuperClass/Interfaces 75 // Methods for/from SuperClass/Interfaces
...@@ -120,40 +90,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -120,40 +90,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
120 90
121 mSecondsHandler = new Handler(); 91 mSecondsHandler = new Handler();
122 92
123 - mTvUsername = view.findViewById(R.id.tv_profile_name);
124 mLlQuestionnaire = view.findViewById(R.id.ll_user_questionnaire); 93 mLlQuestionnaire = view.findViewById(R.id.ll_user_questionnaire);
125 mLlUserBadge = view.findViewById(R.id.ll_user_badge); 94 mLlUserBadge = view.findViewById(R.id.ll_user_badge);
126 mTvUserBadge = view.findViewById(R.id.tv_type); 95 mTvUserBadge = view.findViewById(R.id.tv_type);
127 - mTvGiftsValue = view.findViewById(R.id.tv_gifts_value);
128 - mTvGiftsValueAll = view.findViewById(R.id.tv_gifts_value_all);
129 - mClDealsBanner = view.findViewById(R.id.cl_deals_win_inner_cos);
130 - mClGiftsBanner = view.findViewById(R.id.cl_deals_win_inner);
131 - mTvDealsValue = view.findViewById(R.id.tv_deals_value);
132 - mTvDealsValueAll = view.findViewById(R.id.tv_deals_value_all);
133 - mTvActiveCode = view.findViewById(R.id.tv_active_deals_text);
134 - mTvActiveDate = view.findViewById(R.id.tv_active_deals_date_text);
135 - mIvDealsLogo = view.findViewById(R.id.dfy_logo);
136 - mClDealsView = view.findViewById(R.id.cl_mygifts);
137 - mLlDeals = view.findViewById(R.id.ll_mygifts);
138 - mIvProfilePhoto = view.findViewById(R.id.iv_profile_photo);
139 - mTvActiveTitle = view.findViewById(R.id.tv_active_gifts);
140 - mTvActiveCouponsHeader = view.findViewById(R.id.tv_active_coupons_header);
141 mLlEmptyWallet = view.findViewById(R.id.ll_empty_wallet); 96 mLlEmptyWallet = view.findViewById(R.id.ll_empty_wallet);
142 - mLlActiveCodesView = view.findViewById(R.id.ll_active_deals_codes_view);
143 - mScActiveCodes = view.findViewById(R.id.sv_active_deals_codes_view);
144 - mLlGifts = view.findViewById(R.id.ll_gifts_view);
145 - mLlMarketView = view.findViewById(R.id.ll_market_view);
146 - mRvMarketCoupons = view.findViewById(R.id.rv_market_coupons);
147 - mRvMarketCoupons.setNestedScrollingEnabled(false);
148 - mRvMarketCoupons.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
149 - mElGifts = view.findViewById(R.id.el_exp);
150 - mClExp = view.findViewById(R.id.cl_exp);
151 - mIvExpArrow = view.findViewById(R.id.iv_exp_arrow);
152 - mTvMarketValue = view.findViewById(R.id.tv_market_value);
153 - mTvMarketAll = view.findViewById(R.id.tv_market_value_all);
154 - mClMarket = view.findViewById(R.id.cl_market_inner);
155 - mTvFavValue = view.findViewById(R.id.tv_exp_value);
156 - mTvFavValueAll = view.findViewById(R.id.tv_exp_value_all);
157 mLlHistory = view.findViewById(R.id.ll_loyalty_history); 97 mLlHistory = view.findViewById(R.id.ll_loyalty_history);
158 mTvDealsCountBadge = view.findViewById(R.id.tv_deals_count); 98 mTvDealsCountBadge = view.findViewById(R.id.tv_deals_count);
159 mTvUnifiedCountBadge = view.findViewById(R.id.tv_sm_count); 99 mTvUnifiedCountBadge = view.findViewById(R.id.tv_sm_count);
...@@ -162,14 +102,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -162,14 +102,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
162 mRlDeals = view.findViewById(R.id.rv_deals_count); 102 mRlDeals = view.findViewById(R.id.rv_deals_count);
163 mRlUnified = view.findViewById(R.id.rv_sm_count); 103 mRlUnified = view.findViewById(R.id.rv_sm_count);
164 mRlGifts = view.findViewById(R.id.rv_gifts_count); 104 mRlGifts = view.findViewById(R.id.rv_gifts_count);
165 - mRecyclerCoupons = view.findViewById(R.id.rv_active_coupons);
166 mCvVouchers = view.findViewById(R.id.cv_vouchers); 105 mCvVouchers = view.findViewById(R.id.cv_vouchers);
167 mCvVouchersDisabled = view.findViewById(R.id.cv_vouchers_disabled); 106 mCvVouchersDisabled = view.findViewById(R.id.cv_vouchers_disabled);
168 mLlVouchers = view.findViewById(R.id.ll_vouchers); 107 mLlVouchers = view.findViewById(R.id.ll_vouchers);
169 mLlVouchersDisabled = view.findViewById(R.id.ll_vouchers_disabled); 108 mLlVouchersDisabled = view.findViewById(R.id.ll_vouchers_disabled);
170 mLlVouchersSpinner = view.findViewById(R.id.ll_vouchers_spinner); 109 mLlVouchersSpinner = view.findViewById(R.id.ll_vouchers_spinner);
171 - mSeparator = view.findViewById(R.id.v_separator_vouchers);
172 - mSeparatorDisabled = view.findViewById(R.id.v_separator_vouchers_disabled);
173 mTvVouchersDisabledTitle = view.findViewById(R.id.tv_vouchers_title_disabled); 110 mTvVouchersDisabledTitle = view.findViewById(R.id.tv_vouchers_title_disabled);
174 mTvVouchersDisabledSubtitle = view.findViewById(R.id.tv_vouchers_info_title_disabled); 111 mTvVouchersDisabledSubtitle = view.findViewById(R.id.tv_vouchers_info_title_disabled);
175 mTvVouchersTitle = view.findViewById(R.id.tv_vouchers_title); 112 mTvVouchersTitle = view.findViewById(R.id.tv_vouchers_title);
...@@ -213,8 +150,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -213,8 +150,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
213 mQuestionnairePressed = false; 150 mQuestionnairePressed = false;
214 mHistoryPressed = false; 151 mHistoryPressed = false;
215 mHistoryMarketPressed = false; 152 mHistoryMarketPressed = false;
216 - mUnifiedPressed = false;
217 - mCouponPressed = false;
218 mHistoryBadgePressed = false; 153 mHistoryBadgePressed = false;
219 mGiftsCountPressed = false; 154 mGiftsCountPressed = false;
220 mUnifiedCountPressed = false; 155 mUnifiedCountPressed = false;
...@@ -327,17 +262,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -327,17 +262,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
327 } 262 }
328 return; 263 return;
329 } 264 }
330 - if (view.getId() == R.id.cl_exp) {
331 - if (!mIsStayCollapsed) {
332 - mElGifts.toggle(true);
333 - if (mElGifts.isExpanded()) {
334 - mIvExpArrow.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_up_dark_new));
335 - } else {
336 - mIvExpArrow.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_down_dark_new));
337 - }
338 - }
339 - return;
340 - }
341 /** Unified History */ 265 /** Unified History */
342 if (view.getId() == R.id.cl_market_inner) { 266 if (view.getId() == R.id.cl_market_inner) {
343 if (!mHistoryMarketPressed) { 267 if (!mHistoryMarketPressed) {
...@@ -428,53 +352,38 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -428,53 +352,38 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
428 @Subscribe() 352 @Subscribe()
429 public void onMessageEvent(WarplyEventBusManager event) { 353 public void onMessageEvent(WarplyEventBusManager event) {
430 if (event.getVouchersServiceUnavailableEventModel() != null) { 354 if (event.getVouchersServiceUnavailableEventModel() != null) {
431 -
432 Handler mUIHandler = new Handler(Looper.getMainLooper()); 355 Handler mUIHandler = new Handler(Looper.getMainLooper());
433 - mUIHandler.post(new Runnable() { 356 + mUIHandler.post(this::vouchersServiceUnavailableDialog);
434 - @Override
435 - public void run() {
436 - vouchersServiceUnavailableDialog();
437 - }
438 - });
439 return; 357 return;
440 } 358 }
441 if (event.getVouchersFetched() != null) { 359 if (event.getVouchersFetched() != null) {
442 /** Vouchers */ 360 /** Vouchers */
443 Handler mUIHandler = new Handler(Looper.getMainLooper()); 361 Handler mUIHandler = new Handler(Looper.getMainLooper());
444 - mUIHandler.post(new Runnable() { 362 + mUIHandler.post(this::checkForEmpty);
445 - @Override
446 - public void run() {
447 - checkForEmpty();
448 - }
449 - });
450 /** Vouchers */ 363 /** Vouchers */
451 return; 364 return;
452 } 365 }
453 if (event.getUnifiedCouponsAdded() != null) { 366 if (event.getUnifiedCouponsAdded() != null) {
454 Handler mUIHandler = new Handler(Looper.getMainLooper()); 367 Handler mUIHandler = new Handler(Looper.getMainLooper());
455 - mUIHandler.post(new Runnable() { 368 + mUIHandler.post(() -> {
456 - @Override 369 + if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
457 - public void run() { 370 + mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size()));
458 - if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) 371 + else
459 - mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size())); 372 + mTvUnifiedCountBadge.setText("0");
460 - else 373 + checkHistoryEmpty();
461 - mTvUnifiedCountBadge.setText("0"); 374 + checkForEmpty();
462 - checkForEmpty();
463 - }
464 }); 375 });
465 return; 376 return;
466 } 377 }
467 if (event.getCouponsAdded() != null) { 378 if (event.getCouponsAdded() != null) {
468 Handler mUIHandler = new Handler(Looper.getMainLooper()); 379 Handler mUIHandler = new Handler(Looper.getMainLooper());
469 - mUIHandler.post(new Runnable() { 380 + mUIHandler.post(() -> {
470 - @Override 381 + if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0)
471 - public void run() { 382 + mTvGiftsCountBadge.setText(String.valueOf(WarplyManagerHelper.getCouponList().size()));
472 - if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0) 383 + else
473 - mTvGiftsCountBadge.setText(String.valueOf(WarplyManagerHelper.getCouponList().size())); 384 + mTvGiftsCountBadge.setText("0");
474 - else 385 + checkHistoryEmpty();
475 - mTvGiftsCountBadge.setText("0"); 386 + checkForEmpty();
476 - checkForEmpty();
477 - }
478 }); 387 });
479 } 388 }
480 } 389 }
...@@ -510,20 +419,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -510,20 +419,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
510 /** Deals Badge */ 419 /** Deals Badge */
511 420
512 if (WarplyManagerHelper.getConsumer() != null) { 421 if (WarplyManagerHelper.getConsumer() != null) {
513 - mTvUsername.setText(String.format(getResources().getString(R.string.cos_profile_loyalty_name),
514 - WarplyManagerHelper.getConsumer().getFirstName(), WarplyManagerHelper.getConsumer().getLastName()));
515 -
516 - if (!TextUtils.isEmpty(WarplyManagerHelper.getConsumer().getImageUrl()) && !WarplyManagerHelper.getConsumer().getImageUrl().equals("null")) {
517 - Glide.with(this)
518 - .load(WarplyManagerHelper.getConsumer().getImageUrl())
519 - .diskCacheStrategy(DiskCacheStrategy.DATA)
520 - .into(mIvProfilePhoto);
521 - } else {
522 - Glide.with(this)
523 - .load(R.drawable.ic_default_photo)
524 - .into(mIvProfilePhoto);
525 - }
526 -
527 if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) { 422 if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
528 mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext())); 423 mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
529 mLlQuestionnaire.setVisibility(View.GONE); 424 mLlQuestionnaire.setVisibility(View.GONE);
...@@ -534,17 +429,16 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -534,17 +429,16 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
534 } 429 }
535 } 430 }
536 431
432 + /** History View */
433 + checkHistoryEmpty();
434 + /** History View */
435 +
537 /** Empty View */ 436 /** Empty View */
538 checkForEmpty(); 437 checkForEmpty();
539 /** Empty View */ 438 /** Empty View */
540 439
541 mLlQuestionnaire.setOnClickListener(this); 440 mLlQuestionnaire.setOnClickListener(this);
542 mLlUserBadge.setOnClickListener(this); 441 mLlUserBadge.setOnClickListener(this);
543 - mClDealsBanner.setOnClickListener(this);
544 - mClGiftsBanner.setOnClickListener(this);
545 - mClDealsView.setOnClickListener(this);
546 - mClExp.setOnClickListener(this);
547 - mClMarket.setOnClickListener(this);
548 mLlHistory.setOnClickListener(this); 442 mLlHistory.setOnClickListener(this);
549 mRlDeals.setOnClickListener(this); 443 mRlDeals.setOnClickListener(this);
550 mRlUnified.setOnClickListener(this); 444 mRlUnified.setOnClickListener(this);
...@@ -584,7 +478,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -584,7 +478,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
584 if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) || (!TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) && WarplyManagerHelper.getShowVouchersBanner().equals("null"))) { 478 if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) || (!TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) && WarplyManagerHelper.getShowVouchersBanner().equals("null"))) {
585 /** Show spinner only if empty */ 479 /** Show spinner only if empty */
586 mLlVouchers.setVisibility(View.GONE); 480 mLlVouchers.setVisibility(View.GONE);
587 - mSeparator.setVisibility(View.VISIBLE);
588 if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner())) 481 if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()))
589 mLlVouchersSpinner.setVisibility(View.VISIBLE); 482 mLlVouchersSpinner.setVisibility(View.VISIBLE);
590 if (!TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) && WarplyManagerHelper.getShowVouchersBanner().equals("null")) 483 if (!TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) && WarplyManagerHelper.getShowVouchersBanner().equals("null"))
...@@ -594,9 +487,9 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -594,9 +487,9 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
594 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 487 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
595 /** Hide all and show empty view */ 488 /** Hide all and show empty view */
596 mLlVouchers.setVisibility(View.GONE); 489 mLlVouchers.setVisibility(View.GONE);
597 - mLlVouchersSpinner.setVisibility(View.GONE); 490 +// mLlVouchersSpinner.setVisibility(View.GONE);
598 - mSeparator.setVisibility(View.VISIBLE); 491 + if (!TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) && WarplyManagerHelper.getShowVouchersBanner().equals("null"))
599 - mLlEmptyWallet.setVisibility(View.VISIBLE); 492 + mLlEmptyWallet.setVisibility(View.VISIBLE);
600 } else { 493 } else {
601 /** Show loyalty banners and hide empty view 494 /** Show loyalty banners and hide empty view
602 * Show spinner only if empty */ 495 * Show spinner only if empty */
...@@ -617,16 +510,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -617,16 +510,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
617 } 510 }
618 mLlVouchers.setVisibility(View.VISIBLE); 511 mLlVouchers.setVisibility(View.VISIBLE);
619 mLlVouchersDisabled.setVisibility(View.GONE); 512 mLlVouchersDisabled.setVisibility(View.GONE);
620 - mSeparatorDisabled.setVisibility(View.VISIBLE);
621 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 513 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
622 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 514 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
623 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 515 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
624 /** Hide loyalty banners and hide separator */ 516 /** Hide loyalty banners and hide separator */
625 - mSeparator.setVisibility(View.GONE);
626 mLlBannerInfo.setVisibility(View.GONE); 517 mLlBannerInfo.setVisibility(View.GONE);
627 } else { 518 } else {
628 /** Show loyalty banners and show separator */ 519 /** Show loyalty banners and show separator */
629 - mSeparator.setVisibility(View.VISIBLE);
630 mLlBannerInfo.setVisibility(View.VISIBLE); 520 mLlBannerInfo.setVisibility(View.VISIBLE);
631 } 521 }
632 } else if (WarplyManagerHelper.getShowVouchersBanner().equals("false")) { 522 } else if (WarplyManagerHelper.getShowVouchersBanner().equals("false")) {
...@@ -634,7 +524,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -634,7 +524,6 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
634 mLlVouchersSpinner.setVisibility(View.GONE); 524 mLlVouchersSpinner.setVisibility(View.GONE);
635 mLlEmptyWallet.setVisibility(View.GONE); 525 mLlEmptyWallet.setVisibility(View.GONE);
636 mLlVouchers.setVisibility(View.GONE); 526 mLlVouchers.setVisibility(View.GONE);
637 - mSeparator.setVisibility(View.VISIBLE);
638 if (TextUtils.isEmpty(WarpUtils.getLanguage(getContext())) || WarpUtils.getLanguage(getContext()).equals("el")) { 527 if (TextUtils.isEmpty(WarpUtils.getLanguage(getContext())) || WarpUtils.getLanguage(getContext()).equals("el")) {
639 mTvVouchersDisabledTitle.setText(getString(R.string.cos_vouchers_title)); 528 mTvVouchersDisabledTitle.setText(getString(R.string.cos_vouchers_title));
640 mTvVouchersDisabledSubtitle.setText(getString(R.string.cos_vouchers_info_title_disabled)); 529 mTvVouchersDisabledSubtitle.setText(getString(R.string.cos_vouchers_info_title_disabled));
...@@ -643,23 +532,55 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -643,23 +532,55 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
643 mTvVouchersDisabledSubtitle.setText(getString(R.string.cos_vouchers_info_title_disabled_en)); 532 mTvVouchersDisabledSubtitle.setText(getString(R.string.cos_vouchers_info_title_disabled_en));
644 } 533 }
645 mLlVouchersDisabled.setVisibility(View.VISIBLE); 534 mLlVouchersDisabled.setVisibility(View.VISIBLE);
646 - mSeparatorDisabled.setVisibility(View.VISIBLE);
647 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 535 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
648 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 536 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
649 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 537 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
650 /** Hide loyalty banners and hide empty view and hide disabled separator */ 538 /** Hide loyalty banners and hide empty view and hide disabled separator */
651 mLlBannerInfo.setVisibility(View.GONE); 539 mLlBannerInfo.setVisibility(View.GONE);
652 mLlEmptyWallet.setVisibility(View.GONE); 540 mLlEmptyWallet.setVisibility(View.GONE);
653 - mSeparatorDisabled.setVisibility(View.GONE);
654 } else { 541 } else {
655 /** Show loyalty banners and show disabled separator */ 542 /** Show loyalty banners and show disabled separator */
656 mLlBannerInfo.setVisibility(View.VISIBLE); 543 mLlBannerInfo.setVisibility(View.VISIBLE);
657 - mSeparatorDisabled.setVisibility(View.VISIBLE);
658 } 544 }
659 } 545 }
660 } 546 }
661 } 547 }
662 548
549 + private void checkHistoryEmpty() {
550 + mIsDealsEmpty = WarplyManagerHelper.getDealsCouponsSum() == 0;
551 +
552 + if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
553 + float countValue = 0.0f;
554 +
555 + if (WarplyManagerHelper.getCouponRedeemedList().size() > 0) {
556 + if (WarplyManagerHelper.getCouponsetsDeals().size() > 0) {
557 + for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) {
558 + for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
559 + if (cou.getCouponsetUuid().equals(couset.getUuid())) {
560 + countValue += Float.parseFloat(cou.getDiscount());
561 + break;
562 + }
563 + }
564 + }
565 + }
566 + }
567 +
568 + mIsMarketsEmpty = countValue == 0;
569 + } else {
570 + mIsMarketsEmpty = true;
571 + }
572 +
573 + if (WarplyManagerHelper.getLoyaltyBadge() != null) {
574 + mIsCouponsEmpty = WarplyManagerHelper.getLoyaltyBadge().getValue() == 0;
575 + }
576 +
577 + if (mIsDealsEmpty && mIsMarketsEmpty && mIsCouponsEmpty) {
578 + mLlHistory.setVisibility(View.GONE);
579 + } else {
580 + mLlHistory.setVisibility(View.VISIBLE);
581 + }
582 + }
583 +
663 // =========================================================== 584 // ===========================================================
664 // Inner and Anonymous Classes 585 // Inner and Anonymous Classes
665 // =========================================================== 586 // ===========================================================
......
...@@ -43,7 +43,6 @@ import android.net.http.SslError; ...@@ -43,7 +43,6 @@ import android.net.http.SslError;
43 import android.os.Build; 43 import android.os.Build;
44 import android.text.TextUtils; 44 import android.text.TextUtils;
45 import android.util.AttributeSet; 45 import android.util.AttributeSet;
46 -import android.util.Log;
47 import android.webkit.GeolocationPermissions.Callback; 46 import android.webkit.GeolocationPermissions.Callback;
48 import android.webkit.JavascriptInterface; 47 import android.webkit.JavascriptInterface;
49 import android.webkit.SslErrorHandler; 48 import android.webkit.SslErrorHandler;
...@@ -84,7 +83,6 @@ import java.util.Map; ...@@ -84,7 +83,6 @@ import java.util.Map;
84 83
85 import ly.warp.sdk.R; 84 import ly.warp.sdk.R;
86 import ly.warp.sdk.Warply; 85 import ly.warp.sdk.Warply;
87 -import ly.warp.sdk.activities.LoyaltyWallet;
88 import ly.warp.sdk.activities.WarpViewActivity; 86 import ly.warp.sdk.activities.WarpViewActivity;
89 import ly.warp.sdk.db.WarplyDBHelper; 87 import ly.warp.sdk.db.WarplyDBHelper;
90 import ly.warp.sdk.io.models.CouponEventModel; 88 import ly.warp.sdk.io.models.CouponEventModel;
...@@ -494,8 +492,8 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { ...@@ -494,8 +492,8 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
494 } else if (parts[1].equals("couponRetrieved")) { 492 } else if (parts[1].equals("couponRetrieved")) {
495 EventBus.getDefault().post(new WarplyEventBusManager(new CouponEventModel())); 493 EventBus.getDefault().post(new WarplyEventBusManager(new CouponEventModel()));
496 } else if (parts[1].equals("loyaltyWallet")) { 494 } else if (parts[1].equals("loyaltyWallet")) {
497 - Intent intent = new Intent((WarpActivity != null && !WarpActivity.isFinishing()) ? WarpActivity : getContext(), LoyaltyWallet.class); 495 +// Intent intent = new Intent((WarpActivity != null && !WarpActivity.isFinishing()) ? WarpActivity : getContext(), LoyaltyWallet.class);
498 - getContext().startActivity(intent); 496 +// getContext().startActivity(intent);
499 497
500 RefreshVouchersEventModel vouchersRefreshed = new RefreshVouchersEventModel(); 498 RefreshVouchersEventModel vouchersRefreshed = new RefreshVouchersEventModel();
501 vouchersRefreshed.setRefreshed(true); 499 vouchersRefreshed.setRefreshed(true);
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="1dp" android:color="@color/cos_grey2" />
5 + <corners android:radius="16dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="1dp" android:color="@color/cos_grey2_tr" />
5 + <corners android:radius="16dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item android:drawable="@drawable/round_border_grey_tr" android:state_pressed="true" />
4 + <item android:drawable="@drawable/round_border_grey" android:state_pressed="false" />
5 +</selector>
...\ No newline at end of file ...\ No newline at end of file
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 android:textColor="@color/cos_light_black" 33 android:textColor="@color/cos_light_black"
34 android:textSize="19sp" 34 android:textSize="19sp"
35 fontPath="fonts/BTCosmo-Bold.ttf" 35 fontPath="fonts/BTCosmo-Bold.ttf"
36 - android:text="@string/cos_gifts_title" 36 + android:text="@string/cos_free_coupons"
37 app:layout_constraintBottom_toBottomOf="parent" 37 app:layout_constraintBottom_toBottomOf="parent"
38 app:layout_constraintEnd_toEndOf="parent" 38 app:layout_constraintEnd_toEndOf="parent"
39 app:layout_constraintStart_toStartOf="parent" 39 app:layout_constraintStart_toStartOf="parent"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 android:layout_height="48dp" 19 android:layout_height="48dp"
20 android:layout_marginStart="16dp" 20 android:layout_marginStart="16dp"
21 android:scaleType="centerInside" 21 android:scaleType="centerInside"
22 - android:src="@drawable/ic_back" 22 + android:src="@drawable/ic_close"
23 app:layout_constraintBottom_toBottomOf="parent" 23 app:layout_constraintBottom_toBottomOf="parent"
24 app:layout_constraintStart_toStartOf="parent" 24 app:layout_constraintStart_toStartOf="parent"
25 app:layout_constraintTop_toTopOf="parent" /> 25 app:layout_constraintTop_toTopOf="parent" />
...@@ -46,23 +46,11 @@ ...@@ -46,23 +46,11 @@
46 android:layout_marginTop="16dp" 46 android:layout_marginTop="16dp"
47 android:orientation="vertical"> 47 android:orientation="vertical">
48 48
49 - <TextView
50 - android:id="@+id/tv_coupons_header"
51 - fontPath="fonts/PeridotPE-SemiBold.ttf"
52 - android:layout_width="wrap_content"
53 - android:layout_height="wrap_content"
54 - android:includeFontPadding="false"
55 - android:maxLines="1"
56 - android:text="@string/cos_redeemed_coupons_loyalty_title"
57 - android:textColor="@color/cos_light_black"
58 - android:textSize="22sp" />
59 -
60 <androidx.cardview.widget.CardView 49 <androidx.cardview.widget.CardView
61 android:id="@+id/cl_exp" 50 android:id="@+id/cl_exp"
62 android:layout_width="match_parent" 51 android:layout_width="match_parent"
63 android:layout_height="wrap_content" 52 android:layout_height="wrap_content"
64 android:layout_marginHorizontal="2dp" 53 android:layout_marginHorizontal="2dp"
65 - android:layout_marginTop="20dp"
66 android:layout_marginBottom="4dp" 54 android:layout_marginBottom="4dp"
67 app:cardCornerRadius="16dp" 55 app:cardCornerRadius="16dp"
68 app:cardElevation="2dp"> 56 app:cardElevation="2dp">
...@@ -179,7 +167,7 @@ ...@@ -179,7 +167,7 @@
179 <LinearLayout 167 <LinearLayout
180 android:layout_width="match_parent" 168 android:layout_width="match_parent"
181 android:layout_height="match_parent" 169 android:layout_height="match_parent"
182 - android:background="@color/cos_green_tr" 170 + android:background="@color/white"
183 android:gravity="center" 171 android:gravity="center"
184 android:orientation="vertical"> 172 android:orientation="vertical">
185 173
...@@ -260,7 +248,7 @@ ...@@ -260,7 +248,7 @@
260 <LinearLayout 248 <LinearLayout
261 android:layout_width="match_parent" 249 android:layout_width="match_parent"
262 android:layout_height="match_parent" 250 android:layout_height="match_parent"
263 - android:background="@color/cos_creme" 251 + android:background="@color/white"
264 android:gravity="center" 252 android:gravity="center"
265 android:orientation="vertical"> 253 android:orientation="vertical">
266 254
...@@ -341,7 +329,7 @@ ...@@ -341,7 +329,7 @@
341 <LinearLayout 329 <LinearLayout
342 android:layout_width="match_parent" 330 android:layout_width="match_parent"
343 android:layout_height="match_parent" 331 android:layout_height="match_parent"
344 - android:background="@color/cos_skyblue5" 332 + android:background="@color/white"
345 android:gravity="center" 333 android:gravity="center"
346 android:orientation="vertical"> 334 android:orientation="vertical">
347 335
......
...@@ -3,1129 +3,653 @@ ...@@ -3,1129 +3,653 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@color/cos_light_grey3"> 6 + android:background="@color/white">
7 7
8 - <androidx.core.widget.NestedScrollView 8 + <LinearLayout
9 + android:id="@+id/ll_second_view"
9 android:layout_width="match_parent" 10 android:layout_width="match_parent"
10 android:layout_height="match_parent" 11 android:layout_height="match_parent"
11 - android:fillViewport="true" 12 + android:gravity="center_horizontal"
12 - android:overScrollMode="never" 13 + android:orientation="vertical">
13 - android:scrollbars="none">
14 14
15 <LinearLayout 15 <LinearLayout
16 + android:id="@+id/ll_banner_info_new"
16 android:layout_width="match_parent" 17 android:layout_width="match_parent"
17 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
18 - android:orientation="vertical"> 19 + android:layout_marginHorizontal="14dp"
19 - 20 + android:layout_marginTop="16dp"
20 - <RelativeLayout 21 + android:orientation="vertical"
21 - android:layout_width="match_parent" 22 + android:visibility="gone"
23 + tools:visibility="visible">
24 +
25 + <TextView
26 + android:id="@+id/tv_coupons_header"
27 + fontPath="fonts/BTCosmo-Bold.ttf"
28 + android:layout_width="wrap_content"
22 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
23 - android:background="@android:color/white" 30 + android:includeFontPadding="false"
24 - android:orientation="vertical"> 31 + android:maxLines="1"
25 - 32 + android:text="@string/cos_coupons_header"
26 - <androidx.constraintlayout.widget.ConstraintLayout 33 + android:textColor="@color/cos_light_black"
27 - android:id="@+id/ll_first_view" 34 + android:textSize="20sp" />
28 - android:layout_width="match_parent"
29 - android:layout_height="wrap_content"
30 - android:paddingVertical="24dp"
31 - android:paddingHorizontal="16dp">
32 -
33 - <com.google.android.material.imageview.ShapeableImageView
34 - android:id="@+id/iv_profile_photo"
35 - android:layout_width="74dp"
36 - android:layout_height="74dp"
37 - android:padding="1dp"
38 - android:src="@drawable/ic_default_photo"
39 - app:layout_constraintBottom_toBottomOf="parent"
40 - app:layout_constraintStart_toStartOf="parent"
41 - app:layout_constraintTop_toTopOf="parent"
42 - app:shapeAppearanceOverlay="@style/ShapeAppearanceProfileImage"
43 - app:strokeColor="@color/cos_grey2"
44 - app:strokeWidth="1dp" />
45 -
46 - <LinearLayout
47 - android:layout_width="0dp"
48 - android:layout_height="wrap_content"
49 - android:layout_marginStart="8dp"
50 - android:orientation="vertical"
51 - app:layout_constraintBottom_toBottomOf="parent"
52 - app:layout_constraintEnd_toEndOf="parent"
53 - app:layout_constraintStart_toEndOf="@+id/iv_profile_photo"
54 - app:layout_constraintTop_toTopOf="parent">
55 -
56 - <TextView
57 - android:id="@+id/tv_profile_name"
58 - fontPath="fonts/PeridotPE-SemiBold.ttf"
59 - android:layout_width="wrap_content"
60 - android:layout_height="wrap_content"
61 - android:layout_marginBottom="4dp"
62 - android:includeFontPadding="false"
63 - android:maxLines="1"
64 - android:textColor="@color/cos_light_black"
65 - android:textSize="22sp"
66 - tools:text="Test Name" />
67 -
68 - <LinearLayout
69 - android:layout_width="match_parent"
70 - android:layout_height="wrap_content"
71 - android:orientation="horizontal">
72 -
73 - <LinearLayout
74 - android:id="@+id/ll_user_badge"
75 - android:layout_width="wrap_content"
76 - android:layout_height="42dp"
77 - android:background="@drawable/selector_button_green_border"
78 - android:gravity="center"
79 - android:visibility="gone"
80 - tools:visibility="gone">
81 -
82 - <TextView
83 - android:id="@+id/tv_type"
84 - fontPath="fonts/PeridotPE-SemiBold.ttf"
85 - android:layout_width="wrap_content"
86 - android:layout_height="wrap_content"
87 - android:layout_marginHorizontal="20dp"
88 - android:includeFontPadding="false"
89 - android:textColor="@color/cos_green12"
90 - android:textSize="16sp"
91 - tools:text="@string/cos_profile_preferences_placeholder" />
92 - </LinearLayout>
93 -
94 - <LinearLayout
95 - android:id="@+id/ll_user_questionnaire"
96 - android:layout_width="160dp"
97 - android:layout_height="42dp"
98 - android:background="@drawable/selector_button_green_border"
99 - android:gravity="center"
100 - android:visibility="gone"
101 - tools:visibility="visible">
102 -
103 - <ImageView
104 - android:layout_width="16dp"
105 - android:layout_height="16dp"
106 - android:layout_marginEnd="4dp"
107 - android:src="@drawable/sv_plus_sign_green" />
108 -
109 - <TextView
110 - android:id="@+id/tv_questionnaire"
111 - fontPath="fonts/PeridotPE-Bold.ttf"
112 - android:layout_width="wrap_content"
113 - android:layout_height="wrap_content"
114 - android:includeFontPadding="false"
115 - android:text="@string/cos_profile_preferences"
116 - android:textColor="@color/cos_green12"
117 - android:textSize="16sp" />
118 - </LinearLayout>
119 -
120 - <LinearLayout
121 - android:id="@+id/ll_loyalty_history"
122 - android:layout_width="52dp"
123 - android:layout_height="42dp"
124 - android:layout_marginStart="4dp"
125 - android:background="@drawable/selector_button_green_border"
126 - android:gravity="center"
127 - android:orientation="vertical">
128 -
129 - <ImageView
130 - android:layout_width="16dp"
131 - android:layout_height="16dp"
132 - android:src="@drawable/sv_history" />
133 - </LinearLayout>
134 - </LinearLayout>
135 - </LinearLayout>
136 - </androidx.constraintlayout.widget.ConstraintLayout>
137 - </RelativeLayout>
138 35
139 - <RelativeLayout 36 + <androidx.constraintlayout.widget.ConstraintLayout
140 android:layout_width="match_parent" 37 android:layout_width="match_parent"
141 - android:layout_height="wrap_content"> 38 + android:layout_height="wrap_content"
39 + android:layout_marginTop="18dp">
142 40
143 - <LinearLayout 41 + <RelativeLayout
144 - android:id="@+id/ll_second_view" 42 + android:id="@+id/rv_deals_count"
145 - android:layout_width="match_parent" 43 + android:layout_width="0dp"
146 - android:layout_height="match_parent" 44 + android:layout_height="104dp"
147 - android:gravity="center_horizontal" 45 + app:layout_constraintBottom_toBottomOf="parent"
148 - android:orientation="vertical"> 46 + app:layout_constraintEnd_toStartOf="@+id/rv_sm_count"
47 + app:layout_constraintStart_toStartOf="parent"
48 + app:layout_constraintTop_toTopOf="parent">
149 49
150 - <LinearLayout 50 + <androidx.cardview.widget.CardView
151 - android:id="@+id/ll_banner_info_new" 51 + android:id="@+id/cv_deals_count"
152 android:layout_width="match_parent" 52 android:layout_width="match_parent"
153 - android:layout_height="wrap_content" 53 + android:layout_height="match_parent"
154 - android:layout_marginHorizontal="14dp" 54 + android:layout_marginHorizontal="2dp"
155 - android:layout_marginTop="16dp" 55 + android:layout_marginVertical="4dp"
156 - android:orientation="vertical" 56 + app:cardCornerRadius="16dp"
157 - android:visibility="gone" 57 + app:cardElevation="2dp">
158 - tools:visibility="visible">
159 -
160 - <TextView
161 - android:id="@+id/tv_coupons_header"
162 - fontPath="fonts/PeridotPE-SemiBold.ttf"
163 - android:layout_width="wrap_content"
164 - android:layout_height="wrap_content"
165 - android:includeFontPadding="false"
166 - android:maxLines="1"
167 - android:text="@string/cos_coupons_loyalty_title"
168 - android:textColor="@color/cos_light_black"
169 - android:textSize="22sp" />
170 58
171 <androidx.constraintlayout.widget.ConstraintLayout 59 <androidx.constraintlayout.widget.ConstraintLayout
172 android:layout_width="match_parent" 60 android:layout_width="match_parent"
173 - android:layout_height="wrap_content" 61 + android:layout_height="match_parent"
174 - android:layout_marginTop="18dp"> 62 + android:background="@color/white">
175 63
176 - <RelativeLayout 64 + <ImageView
177 - android:id="@+id/rv_deals_count" 65 + android:id="@+id/iv_deals_logo_count"
178 - android:layout_width="0dp" 66 + android:layout_width="52dp"
179 - android:layout_height="104dp" 67 + android:layout_height="32dp"
180 - app:layout_constraintBottom_toBottomOf="parent" 68 + android:src="@drawable/sv_deals_logo_redesign"
181 - app:layout_constraintEnd_toStartOf="@+id/rv_sm_count" 69 + app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"
70 + app:layout_constraintEnd_toEndOf="parent"
182 app:layout_constraintStart_toStartOf="parent" 71 app:layout_constraintStart_toStartOf="parent"
183 - app:layout_constraintTop_toTopOf="parent"> 72 + app:layout_constraintTop_toTopOf="parent" />
184 -
185 - <androidx.cardview.widget.CardView
186 - android:id="@+id/cv_deals_count"
187 - android:layout_width="match_parent"
188 - android:layout_height="match_parent"
189 - android:layout_marginHorizontal="2dp"
190 - android:layout_marginVertical="4dp"
191 - app:cardCornerRadius="16dp"
192 - app:cardElevation="2dp">
193 -
194 - <androidx.constraintlayout.widget.ConstraintLayout
195 - android:layout_width="match_parent"
196 - android:layout_height="match_parent"
197 - android:background="@color/cos_green_tr">
198 -
199 - <ImageView
200 - android:id="@+id/iv_deals_logo_count"
201 - android:layout_width="52dp"
202 - android:layout_height="32dp"
203 - android:src="@drawable/sv_deals_logo_redesign"
204 - app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"
205 - app:layout_constraintEnd_toEndOf="parent"
206 - app:layout_constraintStart_toStartOf="parent"
207 - app:layout_constraintTop_toTopOf="parent" />
208 -
209 - <View
210 - android:id="@+id/v_separator_deals_count"
211 - android:layout_width="match_parent"
212 - android:layout_height="1dp"
213 - android:layout_marginHorizontal="8dp"
214 - android:background="@color/cos_grey2"
215 - app:layout_constraintBottom_toBottomOf="parent"
216 - app:layout_constraintEnd_toEndOf="parent"
217 - app:layout_constraintStart_toStartOf="parent"
218 - app:layout_constraintTop_toTopOf="parent" />
219 -
220 - <TextView
221 - android:id="@+id/tv_deals_count_title"
222 - fontPath="fonts/PeridotPE-SemiBold.ttf"
223 - android:layout_width="0dp"
224 - android:layout_height="wrap_content"
225 - android:layout_marginHorizontal="8dp"
226 - android:gravity="center"
227 - android:includeFontPadding="false"
228 - android:text="@string/cos_deals_title2"
229 - android:textColor="@color/cos_light_black"
230 - android:textSize="10sp"
231 - app:layout_constraintBottom_toBottomOf="parent"
232 - app:layout_constraintEnd_toEndOf="parent"
233 - app:layout_constraintStart_toStartOf="parent"
234 - app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />
235 - </androidx.constraintlayout.widget.ConstraintLayout>
236 - </androidx.cardview.widget.CardView>
237 -
238 - <LinearLayout
239 - android:layout_width="16dp"
240 - android:layout_height="16dp"
241 - android:layout_alignParentEnd="true"
242 - android:layout_marginTop="4dp"
243 - android:layout_marginEnd="1dp"
244 - android:background="@drawable/shape_cos_counter_orange"
245 - android:gravity="center"
246 - android:orientation="vertical"
247 - android:translationZ="2dp"
248 - app:layout_constraintEnd_toEndOf="parent"
249 - app:layout_constraintTop_toTopOf="parent">
250 -
251 - <TextView
252 - android:id="@+id/tv_deals_count"
253 - fontPath="fonts/PeridotPE-SemiBold.ttf"
254 - android:layout_width="wrap_content"
255 - android:layout_height="16dp"
256 - android:includeFontPadding="false"
257 - android:maxLines="1"
258 - android:textColor="@color/cos_light_black"
259 - android:textSize="12sp"
260 - tools:text="6" />
261 - </LinearLayout>
262 - </RelativeLayout>
263 73
264 - <RelativeLayout 74 + <View
265 - android:id="@+id/rv_sm_count" 75 + android:id="@+id/v_separator_deals_count"
266 - android:layout_width="0dp" 76 + android:layout_width="match_parent"
267 - android:layout_height="104dp" 77 + android:layout_height="1dp"
268 - android:layout_marginHorizontal="12dp" 78 + android:layout_marginHorizontal="8dp"
79 + android:background="@color/cos_grey2"
269 app:layout_constraintBottom_toBottomOf="parent" 80 app:layout_constraintBottom_toBottomOf="parent"
270 - app:layout_constraintEnd_toStartOf="@+id/rv_gifts_count" 81 + app:layout_constraintEnd_toEndOf="parent"
271 - app:layout_constraintStart_toEndOf="@+id/rv_deals_count" 82 + app:layout_constraintStart_toStartOf="parent"
272 - app:layout_constraintTop_toTopOf="parent"> 83 + app:layout_constraintTop_toTopOf="parent" />
273 -
274 - <androidx.cardview.widget.CardView
275 - android:id="@+id/cv_sm_count"
276 - android:layout_width="match_parent"
277 - android:layout_height="match_parent"
278 - android:layout_marginHorizontal="2dp"
279 - android:layout_marginVertical="4dp"
280 - app:cardCornerRadius="16dp"
281 - app:cardElevation="2dp">
282 -
283 - <androidx.constraintlayout.widget.ConstraintLayout
284 - android:layout_width="match_parent"
285 - android:layout_height="match_parent"
286 - android:background="@color/cos_creme">
287 -
288 - <ImageView
289 - android:id="@+id/iv_sm_logo_count"
290 - android:layout_width="32dp"
291 - android:layout_height="32dp"
292 - android:src="@drawable/sv_unified_redesign"
293 - app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"
294 - app:layout_constraintEnd_toEndOf="parent"
295 - app:layout_constraintStart_toStartOf="parent"
296 - app:layout_constraintTop_toTopOf="parent" />
297 -
298 - <View
299 - android:id="@+id/v_separator_sm_count"
300 - android:layout_width="match_parent"
301 - android:layout_height="1dp"
302 - android:layout_marginHorizontal="8dp"
303 - android:background="@color/cos_grey2"
304 - app:layout_constraintBottom_toBottomOf="parent"
305 - app:layout_constraintEnd_toEndOf="parent"
306 - app:layout_constraintStart_toStartOf="parent"
307 - app:layout_constraintTop_toTopOf="parent" />
308 -
309 - <TextView
310 - android:id="@+id/tv_sm_count_title"
311 - fontPath="fonts/PeridotPE-SemiBold.ttf"
312 - android:layout_width="0dp"
313 - android:layout_height="wrap_content"
314 - android:layout_marginHorizontal="8dp"
315 - android:gravity="center"
316 - android:includeFontPadding="false"
317 - android:text="@string/cos_market_title"
318 - android:textColor="@color/cos_light_black"
319 - android:textSize="10sp"
320 - app:layout_constraintBottom_toBottomOf="parent"
321 - app:layout_constraintEnd_toEndOf="parent"
322 - app:layout_constraintStart_toStartOf="parent"
323 - app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />
324 - </androidx.constraintlayout.widget.ConstraintLayout>
325 - </androidx.cardview.widget.CardView>
326 -
327 - <LinearLayout
328 - android:layout_width="16dp"
329 - android:layout_height="16dp"
330 - android:layout_alignParentEnd="true"
331 - android:layout_marginTop="4dp"
332 - android:layout_marginEnd="1dp"
333 - android:background="@drawable/shape_cos_counter_orange"
334 - android:gravity="center"
335 - android:orientation="vertical"
336 - android:translationZ="2dp"
337 - app:layout_constraintEnd_toEndOf="parent"
338 - app:layout_constraintTop_toTopOf="parent">
339 -
340 - <TextView
341 - android:id="@+id/tv_sm_count"
342 - fontPath="fonts/PeridotPE-SemiBold.ttf"
343 - android:layout_width="wrap_content"
344 - android:layout_height="16dp"
345 - android:includeFontPadding="false"
346 - android:maxLines="1"
347 - android:textColor="@color/cos_light_black"
348 - android:textSize="12sp"
349 - tools:text="6" />
350 - </LinearLayout>
351 - </RelativeLayout>
352 84
353 - <RelativeLayout 85 + <TextView
354 - android:id="@+id/rv_gifts_count" 86 + android:id="@+id/tv_deals_count_title"
87 + fontPath="fonts/PeridotPE-SemiBold.ttf"
355 android:layout_width="0dp" 88 android:layout_width="0dp"
356 - android:layout_height="104dp" 89 + android:layout_height="wrap_content"
90 + android:layout_marginHorizontal="8dp"
91 + android:gravity="center"
92 + android:includeFontPadding="false"
93 + android:text="@string/cos_deals_title2"
94 + android:textColor="@color/cos_light_black"
95 + android:textSize="10sp"
357 app:layout_constraintBottom_toBottomOf="parent" 96 app:layout_constraintBottom_toBottomOf="parent"
358 app:layout_constraintEnd_toEndOf="parent" 97 app:layout_constraintEnd_toEndOf="parent"
359 - app:layout_constraintStart_toEndOf="@+id/rv_sm_count" 98 + app:layout_constraintStart_toStartOf="parent"
360 - app:layout_constraintTop_toTopOf="parent"> 99 + app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />
361 -
362 - <androidx.cardview.widget.CardView
363 - android:id="@+id/cv_gifts_count"
364 - android:layout_width="match_parent"
365 - android:layout_height="match_parent"
366 - android:layout_marginHorizontal="2dp"
367 - android:layout_marginVertical="4dp"
368 - app:cardCornerRadius="16dp"
369 - app:cardElevation="2dp">
370 -
371 - <androidx.constraintlayout.widget.ConstraintLayout
372 - android:layout_width="match_parent"
373 - android:layout_height="match_parent"
374 - android:background="@color/cos_skyblue5">
375 -
376 - <ImageView
377 - android:id="@+id/iv_gifts_logo_count"
378 - android:layout_width="34dp"
379 - android:layout_height="34dp"
380 - android:src="@drawable/sv_gifts_redesign"
381 - app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"
382 - app:layout_constraintEnd_toEndOf="parent"
383 - app:layout_constraintStart_toStartOf="parent"
384 - app:layout_constraintTop_toTopOf="parent" />
385 -
386 - <View
387 - android:id="@+id/v_separator_gifts_count"
388 - android:layout_width="match_parent"
389 - android:layout_height="1dp"
390 - android:layout_marginHorizontal="8dp"
391 - android:background="@color/cos_grey2"
392 - app:layout_constraintBottom_toBottomOf="parent"
393 - app:layout_constraintEnd_toEndOf="parent"
394 - app:layout_constraintStart_toStartOf="parent"
395 - app:layout_constraintTop_toTopOf="parent" />
396 -
397 - <TextView
398 - android:id="@+id/tv_gifts_count_title"
399 - fontPath="fonts/PeridotPE-SemiBold.ttf"
400 - android:layout_width="0dp"
401 - android:layout_height="wrap_content"
402 - android:layout_marginHorizontal="8dp"
403 - android:gravity="center"
404 - android:includeFontPadding="false"
405 - android:text="@string/cos_gifts_title"
406 - android:textColor="@color/cos_light_black"
407 - android:textSize="10sp"
408 - app:layout_constraintBottom_toBottomOf="parent"
409 - app:layout_constraintEnd_toEndOf="parent"
410 - app:layout_constraintStart_toStartOf="parent"
411 - app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />
412 - </androidx.constraintlayout.widget.ConstraintLayout>
413 - </androidx.cardview.widget.CardView>
414 -
415 - <LinearLayout
416 - android:layout_width="16dp"
417 - android:layout_height="16dp"
418 - android:layout_alignParentEnd="true"
419 - android:layout_marginTop="4dp"
420 - android:layout_marginEnd="1dp"
421 - android:background="@drawable/shape_cos_counter_orange"
422 - android:gravity="center"
423 - android:orientation="vertical"
424 - android:translationZ="2dp"
425 - app:layout_constraintEnd_toEndOf="parent"
426 - app:layout_constraintTop_toTopOf="parent">
427 -
428 - <TextView
429 - android:id="@+id/tv_gifts_count"
430 - fontPath="fonts/PeridotPE-SemiBold.ttf"
431 - android:layout_width="wrap_content"
432 - android:layout_height="16dp"
433 - android:includeFontPadding="false"
434 - android:maxLines="1"
435 - android:textColor="@color/cos_light_black"
436 - android:textSize="12sp"
437 - tools:text="6" />
438 - </LinearLayout>
439 - </RelativeLayout>
440 </androidx.constraintlayout.widget.ConstraintLayout> 100 </androidx.constraintlayout.widget.ConstraintLayout>
441 - </LinearLayout> 101 + </androidx.cardview.widget.CardView>
442 -
443 - <LinearLayout
444 - android:id="@+id/ll_vouchers_spinner"
445 - android:layout_width="match_parent"
446 - android:layout_height="wrap_content"
447 - android:layout_marginHorizontal="14dp"
448 - android:layout_marginTop="32dp"
449 - android:gravity="center_horizontal"
450 - android:orientation="vertical"
451 - android:visibility="gone"
452 - tools:visibility="visible">
453 -
454 - <ProgressBar
455 - android:id="@+id/pb_vouchers"
456 - android:layout_width="48dp"
457 - android:layout_height="48dp"
458 - android:theme="@style/progressBarGreen" />
459 - </LinearLayout>
460 102
461 <LinearLayout 103 <LinearLayout
462 - android:id="@+id/ll_vouchers" 104 + android:layout_width="16dp"
463 - android:layout_width="match_parent" 105 + android:layout_height="16dp"
464 - android:layout_height="wrap_content" 106 + android:layout_alignParentEnd="true"
465 - android:layout_marginHorizontal="14dp" 107 + android:layout_marginTop="4dp"
466 - android:layout_marginTop="32dp" 108 + android:layout_marginEnd="1dp"
109 + android:background="@drawable/shape_cos_counter_orange"
110 + android:gravity="center"
467 android:orientation="vertical" 111 android:orientation="vertical"
468 - android:visibility="gone" 112 + android:translationZ="2dp"
469 - tools:visibility="gone"> 113 + app:layout_constraintEnd_toEndOf="parent"
470 - 114 + app:layout_constraintTop_toTopOf="parent">
471 - <View
472 - android:id="@+id/v_separator_vouchers"
473 - android:layout_width="match_parent"
474 - android:layout_height="1dp"
475 - android:background="@color/cos_gray" />
476 115
477 <TextView 116 <TextView
117 + android:id="@+id/tv_deals_count"
478 fontPath="fonts/PeridotPE-SemiBold.ttf" 118 fontPath="fonts/PeridotPE-SemiBold.ttf"
479 - android:id="@+id/tv_vouchers_title"
480 android:layout_width="wrap_content" 119 android:layout_width="wrap_content"
481 - android:layout_height="wrap_content" 120 + android:layout_height="16dp"
482 - android:layout_marginTop="24dp"
483 android:includeFontPadding="false" 121 android:includeFontPadding="false"
484 android:maxLines="1" 122 android:maxLines="1"
485 - android:text="@string/cos_vouchers_title"
486 android:textColor="@color/cos_light_black" 123 android:textColor="@color/cos_light_black"
487 - android:textSize="22sp" /> 124 + android:textSize="12sp"
488 - 125 + tools:text="6" />
489 - <androidx.cardview.widget.CardView
490 - android:id="@+id/cv_vouchers"
491 - android:layout_width="match_parent"
492 - android:layout_height="70dp"
493 - android:layout_marginHorizontal="2dp"
494 - android:layout_marginTop="24dp"
495 - android:layout_marginBottom="4dp"
496 - app:cardCornerRadius="16dp"
497 - app:cardElevation="2dp">
498 -
499 - <androidx.constraintlayout.widget.ConstraintLayout
500 - android:layout_width="match_parent"
501 - android:layout_height="match_parent"
502 - android:background="@color/white">
503 -
504 - <ImageView
505 - android:id="@+id/iv_vouchers_logo"
506 - android:layout_width="32dp"
507 - android:layout_height="30dp"
508 - android:layout_marginStart="16dp"
509 - android:src="@drawable/sv_vouchers"
510 - app:layout_constraintBottom_toBottomOf="parent"
511 - app:layout_constraintStart_toStartOf="parent"
512 - app:layout_constraintTop_toTopOf="parent" />
513 -
514 - <TextView
515 - android:id="@+id/tv_vouchers_info_title"
516 - fontPath="fonts/PeridotPE-Regular.ttf"
517 - android:layout_width="0dp"
518 - android:layout_height="wrap_content"
519 - android:layout_marginHorizontal="8dp"
520 - android:includeFontPadding="false"
521 - android:lineHeight="24dp"
522 - android:text="@string/cos_vouchers_info_title"
523 - android:textColor="@color/cos_light_black"
524 - android:textSize="14sp"
525 - app:layout_constraintBottom_toBottomOf="@+id/iv_vouchers_logo"
526 - app:layout_constraintEnd_toStartOf="@+id/iv_vouchers_arrow"
527 - app:layout_constraintHorizontal_bias="0.0"
528 - app:layout_constraintStart_toEndOf="@+id/iv_vouchers_logo"
529 - app:layout_constraintTop_toTopOf="@+id/iv_vouchers_logo" />
530 -
531 - <ImageView
532 - android:id="@+id/iv_vouchers_arrow"
533 - android:layout_width="16dp"
534 - android:layout_height="10dp"
535 - android:layout_marginEnd="16dp"
536 - android:rotation="270"
537 - android:src="@drawable/sv_arrow_down"
538 - app:layout_constraintBottom_toBottomOf="parent"
539 - app:layout_constraintEnd_toEndOf="parent"
540 - app:layout_constraintTop_toTopOf="parent" />
541 - </androidx.constraintlayout.widget.ConstraintLayout>
542 - </androidx.cardview.widget.CardView>
543 </LinearLayout> 126 </LinearLayout>
127 + </RelativeLayout>
128 +
129 + <RelativeLayout
130 + android:id="@+id/rv_sm_count"
131 + android:layout_width="0dp"
132 + android:layout_height="104dp"
133 + android:layout_marginHorizontal="12dp"
134 + app:layout_constraintBottom_toBottomOf="parent"
135 + app:layout_constraintEnd_toStartOf="@+id/rv_gifts_count"
136 + app:layout_constraintStart_toEndOf="@+id/rv_deals_count"
137 + app:layout_constraintTop_toTopOf="parent">
544 138
545 - <LinearLayout 139 + <androidx.cardview.widget.CardView
546 - android:id="@+id/ll_vouchers_disabled" 140 + android:id="@+id/cv_sm_count"
547 android:layout_width="match_parent" 141 android:layout_width="match_parent"
548 - android:layout_height="wrap_content" 142 + android:layout_height="match_parent"
549 - android:layout_marginHorizontal="14dp" 143 + android:layout_marginHorizontal="2dp"
550 - android:layout_marginTop="32dp" 144 + android:layout_marginVertical="4dp"
551 - android:orientation="vertical" 145 + app:cardCornerRadius="16dp"
552 - android:visibility="gone" 146 + app:cardElevation="2dp">
553 - tools:visibility="gone">
554 147
555 - <View 148 + <androidx.constraintlayout.widget.ConstraintLayout
556 - android:id="@+id/v_separator_vouchers_disabled"
557 android:layout_width="match_parent" 149 android:layout_width="match_parent"
558 - android:layout_height="1dp" 150 + android:layout_height="match_parent"
559 - android:background="@color/cos_gray" /> 151 + android:background="@color/white">
560 -
561 - <TextView
562 - fontPath="fonts/PeridotPE-SemiBold.ttf"
563 - android:id="@+id/tv_vouchers_title_disabled"
564 - android:layout_width="wrap_content"
565 - android:layout_height="wrap_content"
566 - android:layout_marginTop="24dp"
567 - android:includeFontPadding="false"
568 - android:maxLines="1"
569 - android:text="@string/cos_vouchers_title"
570 - android:textColor="@color/cos_light_black"
571 - android:textSize="22sp" />
572 152
573 - <androidx.cardview.widget.CardView 153 + <ImageView
574 - android:id="@+id/cv_vouchers_disabled" 154 + android:id="@+id/iv_sm_logo_count"
575 - android:layout_width="match_parent" 155 + android:layout_width="32dp"
576 - android:layout_height="70dp" 156 + android:layout_height="32dp"
577 - android:layout_marginHorizontal="2dp" 157 + android:src="@drawable/sv_unified_redesign"
578 - android:layout_marginTop="24dp" 158 + app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"
579 - android:layout_marginBottom="4dp" 159 + app:layout_constraintEnd_toEndOf="parent"
580 - app:cardCornerRadius="16dp" 160 + app:layout_constraintStart_toStartOf="parent"
581 - app:cardElevation="2dp"> 161 + app:layout_constraintTop_toTopOf="parent" />
582 162
583 - <androidx.constraintlayout.widget.ConstraintLayout 163 + <View
164 + android:id="@+id/v_separator_sm_count"
584 android:layout_width="match_parent" 165 android:layout_width="match_parent"
585 - android:layout_height="match_parent" 166 + android:layout_height="1dp"
586 - android:background="@color/white"> 167 + android:layout_marginHorizontal="8dp"
587 - 168 + android:background="@color/cos_grey2"
588 - <ImageView 169 + app:layout_constraintBottom_toBottomOf="parent"
589 - android:id="@+id/iv_vouchers_logo_disabled" 170 + app:layout_constraintEnd_toEndOf="parent"
590 - android:layout_width="32dp" 171 + app:layout_constraintStart_toStartOf="parent"
591 - android:layout_height="30dp" 172 + app:layout_constraintTop_toTopOf="parent" />
592 - android:layout_marginStart="16dp"
593 - android:src="@drawable/sv_vouchers_disabled"
594 - app:layout_constraintBottom_toBottomOf="parent"
595 - app:layout_constraintStart_toStartOf="parent"
596 - app:layout_constraintTop_toTopOf="parent" />
597 -
598 - <TextView
599 - android:id="@+id/tv_vouchers_info_title_disabled"
600 - fontPath="fonts/PeridotPE-Regular.ttf"
601 - android:layout_width="wrap_content"
602 - android:layout_height="wrap_content"
603 - android:layout_marginHorizontal="8dp"
604 - android:includeFontPadding="false"
605 - android:lineHeight="24dp"
606 - android:text="@string/cos_vouchers_info_title_disabled"
607 - android:textColor="@color/cos_gray2"
608 - android:textSize="14sp"
609 - app:layout_constraintBottom_toBottomOf="@+id/iv_vouchers_logo_disabled"
610 - app:layout_constraintEnd_toStartOf="@+id/iv_vouchers_arrow_disabled"
611 - app:layout_constraintHorizontal_bias="0.0"
612 - app:layout_constraintStart_toEndOf="@+id/iv_vouchers_logo_disabled"
613 - app:layout_constraintTop_toTopOf="@+id/iv_vouchers_logo_disabled" />
614 -
615 - <ImageView
616 - android:id="@+id/iv_vouchers_arrow_disabled"
617 - android:layout_width="16dp"
618 - android:layout_height="10dp"
619 - android:layout_marginEnd="16dp"
620 - android:rotation="270"
621 - android:src="@drawable/sv_arrow_down"
622 - app:layout_constraintBottom_toBottomOf="parent"
623 - app:layout_constraintEnd_toEndOf="parent"
624 - app:layout_constraintTop_toTopOf="parent" />
625 -
626 - <LinearLayout
627 - android:layout_width="16dp"
628 - android:layout_height="16dp"
629 - android:layout_marginStart="2dp"
630 - android:background="@drawable/shape_cos_counter_orange"
631 - android:gravity="center"
632 - android:orientation="vertical"
633 - app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled"
634 - app:layout_constraintStart_toEndOf="@+id/tv_vouchers_info_title_disabled"
635 - app:layout_constraintTop_toTopOf="@+id/tv_vouchers_info_title_disabled">
636 173
637 - <TextView 174 + <TextView
638 - android:id="@+id/tv_vouchers_count_disabled" 175 + android:id="@+id/tv_sm_count_title"
639 - fontPath="fonts/PeridotPE-SemiBold.ttf" 176 + fontPath="fonts/PeridotPE-SemiBold.ttf"
640 - android:layout_width="wrap_content" 177 + android:layout_width="0dp"
641 - android:layout_height="16dp" 178 + android:layout_height="wrap_content"
642 - android:includeFontPadding="false" 179 + android:layout_marginHorizontal="8dp"
643 - android:maxLines="1" 180 + android:gravity="center"
644 - android:text="0" 181 + android:includeFontPadding="false"
645 - android:textColor="@color/cos_light_black" 182 + android:text="@string/cos_market_title"
646 - android:textSize="12sp" /> 183 + android:textColor="@color/cos_light_black"
647 - </LinearLayout> 184 + android:textSize="10sp"
648 - </androidx.constraintlayout.widget.ConstraintLayout> 185 + app:layout_constraintBottom_toBottomOf="parent"
649 - </androidx.cardview.widget.CardView> 186 + app:layout_constraintEnd_toEndOf="parent"
650 - </LinearLayout> 187 + app:layout_constraintStart_toStartOf="parent"
188 + app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />
189 + </androidx.constraintlayout.widget.ConstraintLayout>
190 + </androidx.cardview.widget.CardView>
651 191
652 <LinearLayout 192 <LinearLayout
653 - android:id="@+id/ll_empty_wallet" 193 + android:layout_width="16dp"
654 - android:layout_width="match_parent" 194 + android:layout_height="16dp"
655 - android:layout_height="wrap_content" 195 + android:layout_alignParentEnd="true"
656 - android:layout_marginHorizontal="32dp" 196 + android:layout_marginTop="4dp"
657 - android:layout_marginTop="32dp" 197 + android:layout_marginEnd="1dp"
198 + android:background="@drawable/shape_cos_counter_orange"
658 android:gravity="center" 199 android:gravity="center"
659 android:orientation="vertical" 200 android:orientation="vertical"
660 - android:visibility="gone" 201 + android:translationZ="2dp"
661 - tools:visibility="gone"> 202 + app:layout_constraintEnd_toEndOf="parent"
662 - 203 + app:layout_constraintTop_toTopOf="parent">
663 - <ImageView
664 - android:layout_width="72dp"
665 - android:layout_height="72dp"
666 - android:src="@drawable/ic_empty_wallet" />
667 204
668 <TextView 205 <TextView
669 - fontPath="fonts/PeridotPE-Regular.ttf" 206 + android:id="@+id/tv_sm_count"
207 + fontPath="fonts/PeridotPE-SemiBold.ttf"
670 android:layout_width="wrap_content" 208 android:layout_width="wrap_content"
671 - android:layout_height="wrap_content" 209 + android:layout_height="16dp"
672 - android:layout_marginTop="8dp" 210 + android:includeFontPadding="false"
673 - android:gravity="center" 211 + android:maxLines="1"
674 - android:text="@string/cos_empty_wallet"
675 android:textColor="@color/cos_light_black" 212 android:textColor="@color/cos_light_black"
676 - android:textSize="16sp" /> 213 + android:textSize="12sp"
214 + tools:text="6" />
677 </LinearLayout> 215 </LinearLayout>
216 + </RelativeLayout>
217 +
218 + <RelativeLayout
219 + android:id="@+id/rv_gifts_count"
220 + android:layout_width="0dp"
221 + android:layout_height="104dp"
222 + app:layout_constraintBottom_toBottomOf="parent"
223 + app:layout_constraintEnd_toEndOf="parent"
224 + app:layout_constraintStart_toEndOf="@+id/rv_sm_count"
225 + app:layout_constraintTop_toTopOf="parent">
678 226
679 <androidx.cardview.widget.CardView 227 <androidx.cardview.widget.CardView
680 - android:id="@+id/cl_exp" 228 + android:id="@+id/cv_gifts_count"
681 android:layout_width="match_parent" 229 android:layout_width="match_parent"
682 - android:layout_height="wrap_content" 230 + android:layout_height="match_parent"
683 - android:layout_marginHorizontal="11dp" 231 + android:layout_marginHorizontal="2dp"
684 - android:layout_marginTop="24dp" 232 + android:layout_marginVertical="4dp"
685 - android:visibility="gone"
686 app:cardCornerRadius="16dp" 233 app:cardCornerRadius="16dp"
687 - app:cardElevation="2dp" 234 + app:cardElevation="2dp">
688 - tools:visibility="gone">
689 235
690 <androidx.constraintlayout.widget.ConstraintLayout 236 <androidx.constraintlayout.widget.ConstraintLayout
691 android:layout_width="match_parent" 237 android:layout_width="match_parent"
692 - android:layout_height="wrap_content" 238 + android:layout_height="match_parent"
693 - android:background="@color/white" 239 + android:background="@color/white">
694 - android:paddingHorizontal="14dp"
695 - android:paddingVertical="14dp">
696 -
697 - <androidx.constraintlayout.widget.Guideline
698 - android:id="@+id/gl_horizontal_64_exp"
699 - android:layout_width="wrap_content"
700 - android:layout_height="match_parent"
701 - android:orientation="horizontal"
702 - app:layout_constraintGuide_percent="0.64" />
703 240
704 <ImageView 241 <ImageView
705 - android:id="@+id/iv_exp_logo" 242 + android:id="@+id/iv_gifts_logo_count"
706 - android:layout_width="76dp" 243 + android:layout_width="34dp"
707 - android:layout_height="76dp" 244 + android:layout_height="34dp"
708 - android:layout_marginVertical="4dp" 245 + android:src="@drawable/sv_gifts_redesign"
709 - android:src="@drawable/ic_foryou_polygon_new" 246 + app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"
710 - app:layout_constraintBottom_toBottomOf="parent" 247 + app:layout_constraintEnd_toEndOf="parent"
711 app:layout_constraintStart_toStartOf="parent" 248 app:layout_constraintStart_toStartOf="parent"
712 app:layout_constraintTop_toTopOf="parent" /> 249 app:layout_constraintTop_toTopOf="parent" />
713 250
714 - <TextView 251 + <View
715 - android:id="@+id/tv_exp_value" 252 + android:id="@+id/v_separator_gifts_count"
716 - fontPath="fonts/PeridotPE-Bold.ttf" 253 + android:layout_width="match_parent"
717 - android:layout_width="wrap_content" 254 + android:layout_height="1dp"
718 - android:layout_height="wrap_content" 255 + android:layout_marginHorizontal="8dp"
719 - android:includeFontPadding="false" 256 + android:background="@color/cos_grey2"
720 - android:textColor="@color/cos_light_black" 257 + app:layout_constraintBottom_toBottomOf="parent"
721 - android:textSize="14sp" 258 + app:layout_constraintEnd_toEndOf="parent"
722 - app:layout_constraintEnd_toEndOf="@+id/iv_exp_logo" 259 + app:layout_constraintStart_toStartOf="parent"
723 - app:layout_constraintStart_toStartOf="@+id/iv_exp_logo" 260 + app:layout_constraintTop_toTopOf="parent" />
724 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_64_exp"
725 - tools:text="18.00€" />
726 261
727 <TextView 262 <TextView
728 - android:id="@+id/tv_exp_value_all" 263 + android:id="@+id/tv_gifts_count_title"
729 - fontPath="fonts/PeridotPE-Regular.ttf" 264 + fontPath="fonts/PeridotPE-SemiBold.ttf"
730 android:layout_width="0dp" 265 android:layout_width="0dp"
731 android:layout_height="wrap_content" 266 android:layout_height="wrap_content"
732 android:layout_marginHorizontal="8dp" 267 android:layout_marginHorizontal="8dp"
268 + android:gravity="center"
733 android:includeFontPadding="false" 269 android:includeFontPadding="false"
734 - android:text="@string/cos_for_you_all" 270 + android:text="@string/cos_free_coupons"
735 android:textColor="@color/cos_light_black" 271 android:textColor="@color/cos_light_black"
736 - android:textSize="15sp" 272 + android:textSize="10sp"
737 - app:layout_constraintBottom_toBottomOf="parent"
738 - app:layout_constraintEnd_toStartOf="@+id/iv_exp_arrow"
739 - app:layout_constraintStart_toEndOf="@+id/iv_exp_logo"
740 - app:layout_constraintTop_toTopOf="parent" />
741 -
742 - <ImageView
743 - android:id="@+id/iv_exp_arrow"
744 - android:layout_width="14dp"
745 - android:layout_height="14dp"
746 - android:src="@drawable/ic_down_dark_new"
747 - android:visibility="gone"
748 app:layout_constraintBottom_toBottomOf="parent" 273 app:layout_constraintBottom_toBottomOf="parent"
749 app:layout_constraintEnd_toEndOf="parent" 274 app:layout_constraintEnd_toEndOf="parent"
750 - app:layout_constraintTop_toTopOf="parent" /> 275 + app:layout_constraintStart_toStartOf="parent"
276 + app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />
751 </androidx.constraintlayout.widget.ConstraintLayout> 277 </androidx.constraintlayout.widget.ConstraintLayout>
752 </androidx.cardview.widget.CardView> 278 </androidx.cardview.widget.CardView>
753 279
754 - <net.cachapa.expandablelayout.ExpandableLayout
755 - android:id="@+id/el_exp"
756 - android:layout_width="match_parent"
757 - android:layout_height="wrap_content"
758 - app:el_duration="300"
759 - app:el_expanded="false"
760 - app:el_parallax="0.5">
761 -
762 - <RelativeLayout
763 - android:layout_width="match_parent"
764 - android:layout_height="wrap_content">
765 -
766 - <androidx.cardview.widget.CardView
767 - android:id="@+id/cv_deals_win_inner_cos"
768 - android:layout_width="match_parent"
769 - android:layout_height="wrap_content"
770 - android:layout_marginHorizontal="16dp"
771 - android:layout_marginTop="6dp"
772 - app:cardCornerRadius="16dp"
773 - app:cardElevation="2dp">
774 -
775 - <androidx.constraintlayout.widget.ConstraintLayout
776 - android:id="@+id/cl_deals_win_inner_cos"
777 - android:layout_width="match_parent"
778 - android:layout_height="wrap_content"
779 - android:background="@color/white"
780 - android:paddingHorizontal="6dp"
781 - android:paddingVertical="4dp">
782 -
783 - <androidx.constraintlayout.widget.Guideline
784 - android:id="@+id/gl_horizontal_50_cos"
785 - android:layout_width="wrap_content"
786 - android:layout_height="match_parent"
787 - android:orientation="horizontal"
788 - app:layout_constraintGuide_percent="0.64" />
789 -
790 - <ImageView
791 - android:id="@+id/iv_deals_logo"
792 - android:layout_width="76dp"
793 - android:layout_height="76dp"
794 - android:src="@drawable/ic_deals_polygon_new"
795 - app:layout_constraintBottom_toBottomOf="parent"
796 - app:layout_constraintStart_toStartOf="parent"
797 - app:layout_constraintTop_toTopOf="parent" />
798 -
799 - <TextView
800 - android:id="@+id/tv_deals_value_all"
801 - fontPath="fonts/PeridotPE-Regular.ttf"
802 - android:layout_width="0dp"
803 - android:layout_height="wrap_content"
804 - android:layout_marginHorizontal="8dp"
805 - android:includeFontPadding="false"
806 - android:text="@string/cos_deals_win_title_cos"
807 - android:textColor="@color/cos_light_black"
808 - android:textSize="15sp"
809 - app:layout_constraintBottom_toBottomOf="parent"
810 - app:layout_constraintEnd_toEndOf="parent"
811 - app:layout_constraintStart_toEndOf="@+id/iv_deals_logo"
812 - app:layout_constraintTop_toTopOf="parent" />
813 -
814 - <TextView
815 - android:id="@+id/tv_deals_value"
816 - fontPath="fonts/PeridotPE-Bold.ttf"
817 - android:layout_width="wrap_content"
818 - android:layout_height="wrap_content"
819 - android:includeFontPadding="false"
820 - android:textColor="@color/cos_light_black"
821 - android:textSize="14sp"
822 - app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo"
823 - app:layout_constraintStart_toStartOf="@+id/iv_deals_logo"
824 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos"
825 - tools:text="18.00€" />
826 - </androidx.constraintlayout.widget.ConstraintLayout>
827 - </androidx.cardview.widget.CardView>
828 -
829 - <androidx.cardview.widget.CardView
830 - android:id="@+id/cv_deals_win_inner"
831 - android:layout_width="match_parent"
832 - android:layout_height="wrap_content"
833 - android:layout_below="@+id/cv_deals_win_inner_cos"
834 - android:layout_marginHorizontal="16dp"
835 - android:layout_marginTop="6dp"
836 - app:cardCornerRadius="16dp"
837 - app:cardElevation="2dp">
838 -
839 - <androidx.constraintlayout.widget.ConstraintLayout
840 - android:id="@+id/cl_deals_win_inner"
841 - android:layout_width="match_parent"
842 - android:layout_height="wrap_content"
843 - android:background="@color/white"
844 - android:paddingHorizontal="6dp"
845 - android:paddingVertical="4dp">
846 -
847 - <androidx.constraintlayout.widget.Guideline
848 - android:id="@+id/gl_horizontal_50"
849 - android:layout_width="wrap_content"
850 - android:layout_height="match_parent"
851 - android:orientation="horizontal"
852 - app:layout_constraintGuide_percent="0.64" />
853 -
854 - <ImageView
855 - android:id="@+id/iv_gifts_logo"
856 - android:layout_width="76dp"
857 - android:layout_height="76dp"
858 - android:src="@drawable/ic_gifts_polygon_new"
859 - app:layout_constraintBottom_toBottomOf="parent"
860 - app:layout_constraintStart_toStartOf="parent"
861 - app:layout_constraintTop_toTopOf="parent" />
862 -
863 - <TextView
864 - android:id="@+id/tv_gifts_value_all"
865 - fontPath="fonts/PeridotPE-Regular.ttf"
866 - android:layout_width="0dp"
867 - android:layout_height="wrap_content"
868 - android:layout_marginHorizontal="8dp"
869 - android:includeFontPadding="false"
870 - android:text="@string/cos_deals_win_title"
871 - android:textColor="@color/cos_light_black"
872 - android:textSize="15sp"
873 - app:layout_constraintBottom_toBottomOf="parent"
874 - app:layout_constraintEnd_toEndOf="parent"
875 - app:layout_constraintStart_toEndOf="@+id/iv_gifts_logo"
876 - app:layout_constraintTop_toTopOf="parent" />
877 -
878 - <TextView
879 - android:id="@+id/tv_gifts_value"
880 - fontPath="fonts/PeridotPE-Bold.ttf"
881 - android:layout_width="wrap_content"
882 - android:layout_height="wrap_content"
883 - android:includeFontPadding="false"
884 - android:textColor="@color/cos_light_black"
885 - android:textSize="14sp"
886 - app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo"
887 - app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo"
888 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50"
889 - tools:text="20.00€" />
890 - </androidx.constraintlayout.widget.ConstraintLayout>
891 - </androidx.cardview.widget.CardView>
892 -
893 - <androidx.cardview.widget.CardView
894 - android:id="@+id/cv_market_inner"
895 - android:layout_width="match_parent"
896 - android:layout_height="wrap_content"
897 - android:layout_below="@+id/cv_deals_win_inner"
898 - android:layout_marginHorizontal="16dp"
899 - android:layout_marginTop="6dp"
900 - android:layout_marginBottom="6dp"
901 - app:cardCornerRadius="16dp"
902 - app:cardElevation="2dp">
903 -
904 - <androidx.constraintlayout.widget.ConstraintLayout
905 - android:id="@+id/cl_market_inner"
906 - android:layout_width="match_parent"
907 - android:layout_height="wrap_content"
908 - android:background="@color/white"
909 - android:paddingHorizontal="6dp"
910 - android:paddingVertical="4dp">
911 -
912 - <androidx.constraintlayout.widget.Guideline
913 - android:id="@+id/gl_horizontal_50_market"
914 - android:layout_width="wrap_content"
915 - android:layout_height="match_parent"
916 - android:orientation="horizontal"
917 - app:layout_constraintGuide_percent="0.64" />
918 -
919 - <ImageView
920 - android:id="@+id/iv_market_logo"
921 - android:layout_width="76dp"
922 - android:layout_height="76dp"
923 - android:src="@drawable/ic_market_polygon"
924 - app:layout_constraintBottom_toBottomOf="parent"
925 - app:layout_constraintStart_toStartOf="parent"
926 - app:layout_constraintTop_toTopOf="parent" />
927 -
928 - <TextView
929 - android:id="@+id/tv_market_value_all"
930 - fontPath="fonts/PeridotPE-Regular.ttf"
931 - android:layout_width="0dp"
932 - android:layout_height="wrap_content"
933 - android:layout_marginHorizontal="8dp"
934 - android:includeFontPadding="false"
935 - android:text="@string/cos_supermarket_win"
936 - android:textColor="@color/cos_light_black"
937 - android:textSize="15sp"
938 - app:layout_constraintBottom_toBottomOf="parent"
939 - app:layout_constraintEnd_toEndOf="parent"
940 - app:layout_constraintStart_toEndOf="@+id/iv_market_logo"
941 - app:layout_constraintTop_toTopOf="parent" />
942 -
943 - <TextView
944 - android:id="@+id/tv_market_value"
945 - fontPath="fonts/PeridotPE-Bold.ttf"
946 - android:layout_width="wrap_content"
947 - android:layout_height="wrap_content"
948 - android:includeFontPadding="false"
949 - android:textColor="@color/cos_light_black"
950 - android:textSize="14sp"
951 - app:layout_constraintEnd_toEndOf="@+id/iv_market_logo"
952 - app:layout_constraintStart_toStartOf="@+id/iv_market_logo"
953 - app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_market"
954 - tools:text="20.00€" />
955 - </androidx.constraintlayout.widget.ConstraintLayout>
956 - </androidx.cardview.widget.CardView>
957 - </RelativeLayout>
958 - </net.cachapa.expandablelayout.ExpandableLayout>
959 -
960 <LinearLayout 280 <LinearLayout
961 - android:id="@+id/ll_market_view" 281 + android:layout_width="16dp"
962 - android:layout_width="match_parent" 282 + android:layout_height="16dp"
963 - android:layout_height="wrap_content" 283 + android:layout_alignParentEnd="true"
964 - android:layout_marginTop="20dp" 284 + android:layout_marginTop="4dp"
285 + android:layout_marginEnd="1dp"
286 + android:background="@drawable/shape_cos_counter_orange"
287 + android:gravity="center"
965 android:orientation="vertical" 288 android:orientation="vertical"
966 - android:visibility="gone" 289 + android:translationZ="2dp"
967 - tools:visibility="gone"> 290 + app:layout_constraintEnd_toEndOf="parent"
291 + app:layout_constraintTop_toTopOf="parent">
968 292
969 <TextView 293 <TextView
970 - android:id="@+id/tv_market_header" 294 + android:id="@+id/tv_gifts_count"
971 - fontPath="fonts/BTCosmo-Bold.ttf" 295 + fontPath="fonts/PeridotPE-SemiBold.ttf"
972 android:layout_width="wrap_content" 296 android:layout_width="wrap_content"
973 - android:layout_height="wrap_content" 297 + android:layout_height="16dp"
974 - android:layout_gravity="start" 298 + android:includeFontPadding="false"
975 - android:layout_marginHorizontal="16dp" 299 + android:maxLines="1"
976 - android:layout_marginBottom="10dp" 300 + android:textColor="@color/cos_light_black"
977 - android:text="@string/cos_market_title" 301 + android:textSize="12sp"
978 - android:textColor="@color/cos_light_blue" 302 + tools:text="6" />
979 - android:textSize="19sp" />
980 -
981 - <androidx.recyclerview.widget.RecyclerView
982 - android:id="@+id/rv_market_coupons"
983 - android:layout_width="match_parent"
984 - android:layout_height="wrap_content"
985 - android:layout_marginHorizontal="2dp"
986 - android:overScrollMode="never"
987 - android:scrollbars="none" />
988 </LinearLayout> 303 </LinearLayout>
304 + </RelativeLayout>
305 + </androidx.constraintlayout.widget.ConstraintLayout>
306 + </LinearLayout>
989 307
990 - <LinearLayout 308 + <androidx.constraintlayout.widget.ConstraintLayout
991 - android:id="@+id/ll_mygifts" 309 + android:id="@+id/ll_user_badge"
992 - android:layout_width="match_parent" 310 + android:layout_width="match_parent"
993 - android:layout_height="wrap_content" 311 + android:layout_height="56dp"
994 - android:layout_marginTop="24dp" 312 + android:layout_marginHorizontal="14dp"
995 - android:orientation="vertical" 313 + android:layout_marginTop="20dp"
996 - android:visibility="gone" 314 + android:background="@drawable/selector_button_grey_border"
997 - tools:visibility="gone"> 315 + android:gravity="center"
998 - 316 + android:paddingHorizontal="16dp"
999 - <ImageView 317 + android:elevation="1dp"
1000 - android:id="@+id/dfy_logo" 318 + android:visibility="gone"
1001 - android:layout_width="200dp" 319 + tools:visibility="visible">
1002 - android:layout_height="30dp" 320 +
1003 - android:layout_gravity="start" 321 + <TextView
1004 - android:layout_marginHorizontal="16dp" 322 + android:id="@+id/tv_type"
1005 - android:src="@drawable/ic_deals_horizontal" /> 323 + fontPath="fonts/PeridotPE-Regular.ttf"
1006 - 324 + android:layout_width="0dp"
1007 - <androidx.cardview.widget.CardView 325 + android:layout_height="wrap_content"
1008 - android:layout_width="match_parent" 326 + android:layout_marginEnd="16dp"
1009 - android:layout_height="wrap_content" 327 + android:includeFontPadding="false"
1010 - android:layout_marginHorizontal="11dp" 328 + android:textColor="@color/cos_light_black"
1011 - android:layout_marginTop="8dp" 329 + android:textSize="16sp"
1012 - android:layout_marginBottom="6dp" 330 + app:layout_constraintBottom_toBottomOf="parent"
1013 - android:paddingVertical="10dp" 331 + app:layout_constraintEnd_toStartOf="@+id/iv_right_questionnaire_answered"
1014 - app:cardCornerRadius="16dp" 332 + app:layout_constraintStart_toStartOf="parent"
1015 - app:cardElevation="2dp"> 333 + app:layout_constraintTop_toTopOf="parent"
1016 - 334 + tools:text="@string/cos_profile_preferences_placeholder" />
1017 - <androidx.constraintlayout.widget.ConstraintLayout 335 +
1018 - android:id="@+id/cl_mygifts" 336 + <ImageView
1019 - android:layout_width="match_parent" 337 + android:id="@+id/iv_right_questionnaire_answered"
1020 - android:layout_height="wrap_content" 338 + android:layout_width="16dp"
1021 - android:background="@color/white" 339 + android:layout_height="16dp"
1022 - android:paddingVertical="8dp"> 340 + android:src="@drawable/ic_right_black"
1023 - 341 + app:layout_constraintBottom_toBottomOf="parent"
1024 - <LinearLayout 342 + app:layout_constraintEnd_toEndOf="parent"
1025 - android:layout_width="0dp" 343 + app:layout_constraintTop_toTopOf="parent" />
1026 - android:layout_height="wrap_content" 344 + </androidx.constraintlayout.widget.ConstraintLayout>
1027 - android:layout_marginStart="20dp" 345 +
1028 - android:layout_marginEnd="24dp" 346 + <androidx.constraintlayout.widget.ConstraintLayout
1029 - android:orientation="vertical" 347 + android:id="@+id/ll_user_questionnaire"
1030 - app:layout_constraintBottom_toBottomOf="parent" 348 + android:layout_width="match_parent"
1031 - app:layout_constraintEnd_toStartOf="@+id/iv_deals_circle" 349 + android:layout_height="56dp"
1032 - app:layout_constraintStart_toStartOf="parent" 350 + android:layout_marginHorizontal="14dp"
1033 - app:layout_constraintTop_toTopOf="parent"> 351 + android:layout_marginTop="20dp"
352 + android:background="@drawable/selector_button_grey_border"
353 + android:gravity="center"
354 + android:paddingHorizontal="16dp"
355 + android:visibility="gone"
356 + android:elevation="1dp"
357 + tools:visibility="visible">
358 +
359 + <ImageView
360 + android:id="@+id/iv_plus_questionnaire"
361 + android:layout_width="20dp"
362 + android:layout_height="20dp"
363 + android:src="@drawable/ic_plus_sign_blue"
364 + app:layout_constraintBottom_toBottomOf="parent"
365 + app:layout_constraintStart_toStartOf="parent"
366 + app:layout_constraintTop_toTopOf="parent" />
367 +
368 + <TextView
369 + android:id="@+id/tv_questionnaire"
370 + fontPath="fonts/PeridotPE-Regular.ttf"
371 + android:layout_width="0dp"
372 + android:layout_height="wrap_content"
373 + android:layout_marginHorizontal="8dp"
374 + android:includeFontPadding="false"
375 + android:text="@string/cos_profile_preferences"
376 + android:textColor="@color/cos_light_black"
377 + android:textSize="16sp"
378 + app:layout_constraintBottom_toBottomOf="parent"
379 + app:layout_constraintEnd_toStartOf="@+id/iv_right_questionnaire"
380 + app:layout_constraintStart_toEndOf="@+id/iv_plus_questionnaire"
381 + app:layout_constraintTop_toTopOf="parent" />
382 +
383 + <ImageView
384 + android:id="@+id/iv_right_questionnaire"
385 + android:layout_width="16dp"
386 + android:layout_height="16dp"
387 + android:src="@drawable/ic_right_black"
388 + app:layout_constraintBottom_toBottomOf="parent"
389 + app:layout_constraintEnd_toEndOf="parent"
390 + app:layout_constraintTop_toTopOf="parent" />
391 + </androidx.constraintlayout.widget.ConstraintLayout>
392 +
393 + <androidx.constraintlayout.widget.ConstraintLayout
394 + android:id="@+id/ll_loyalty_history"
395 + android:layout_width="match_parent"
396 + android:layout_height="56dp"
397 + android:layout_marginHorizontal="14dp"
398 + android:layout_marginTop="6dp"
399 + android:background="@drawable/selector_button_grey_border"
400 + android:gravity="center"
401 + android:elevation="1dp"
402 + android:paddingHorizontal="16dp">
403 +
404 + <ImageView
405 + android:id="@+id/iv_history_icon"
406 + android:layout_width="24dp"
407 + android:layout_height="24dp"
408 + android:src="@drawable/ic_history_blue"
409 + app:layout_constraintBottom_toBottomOf="parent"
410 + app:layout_constraintStart_toStartOf="parent"
411 + app:layout_constraintTop_toTopOf="parent" />
412 +
413 + <TextView
414 + fontPath="fonts/PeridotPE-Regular.ttf"
415 + android:layout_width="0dp"
416 + android:layout_height="wrap_content"
417 + android:layout_marginHorizontal="8dp"
418 + android:includeFontPadding="false"
419 + android:text="@string/cos_profile_history"
420 + android:textColor="@color/cos_light_black"
421 + android:textSize="16sp"
422 + app:layout_constraintBottom_toBottomOf="parent"
423 + app:layout_constraintEnd_toStartOf="@+id/iv_right_history"
424 + app:layout_constraintStart_toEndOf="@+id/iv_history_icon"
425 + app:layout_constraintTop_toTopOf="parent" />
426 +
427 + <ImageView
428 + android:id="@+id/iv_right_history"
429 + android:layout_width="16dp"
430 + android:layout_height="16dp"
431 + android:src="@drawable/ic_right_black"
432 + app:layout_constraintBottom_toBottomOf="parent"
433 + app:layout_constraintEnd_toEndOf="parent"
434 + app:layout_constraintTop_toTopOf="parent" />
435 + </androidx.constraintlayout.widget.ConstraintLayout>
1034 436
1035 - <TextView 437 + <LinearLayout
1036 - android:id="@+id/tv_active_gifts" 438 + android:id="@+id/ll_vouchers_spinner"
1037 - fontPath="fonts/PeridotPE-Regular.ttf" 439 + android:layout_width="match_parent"
1038 - android:layout_width="wrap_content" 440 + android:layout_height="wrap_content"
1039 - android:layout_height="wrap_content" 441 + android:layout_marginHorizontal="14dp"
1040 - android:textColor="@color/cos_light_black" 442 + android:layout_marginTop="32dp"
1041 - android:textSize="18sp" 443 + android:gravity="center_horizontal"
1042 - tools:text="@string/cos_active_deals" /> 444 + android:orientation="vertical"
445 + android:visibility="gone"
446 + tools:visibility="visible">
447 +
448 + <ProgressBar
449 + android:id="@+id/pb_vouchers"
450 + android:layout_width="48dp"
451 + android:layout_height="48dp"
452 + android:theme="@style/progressBarBlue" />
453 + </LinearLayout>
1043 454
1044 - <TextView 455 + <LinearLayout
1045 - android:id="@+id/tv_active_deals_text" 456 + android:id="@+id/ll_vouchers"
1046 - fontPath="fonts/PeridotPE-Bold.ttf" 457 + android:layout_width="match_parent"
1047 - android:layout_width="wrap_content" 458 + android:layout_height="wrap_content"
1048 - android:layout_height="wrap_content" 459 + android:layout_marginHorizontal="14dp"
1049 - android:ellipsize="end" 460 + android:layout_marginTop="32dp"
1050 - android:maxLines="2" 461 + android:orientation="vertical"
1051 - android:textColor="@color/cos_light_black" 462 + android:visibility="gone"
1052 - android:textIsSelectable="true" 463 + tools:visibility="visible">
1053 - android:textSize="18sp" 464 +
1054 - tools:text="961544809" 465 + <TextView
1055 - tools:visibility="gone" /> 466 + android:id="@+id/tv_vouchers_title"
467 + fontPath="fonts/BTCosmo-Bold.ttf"
468 + android:layout_width="wrap_content"
469 + android:layout_height="wrap_content"
470 + android:includeFontPadding="false"
471 + android:maxLines="1"
472 + android:text="@string/cos_vouchers_title"
473 + android:textColor="@color/cos_light_black"
474 + android:textSize="20sp" />
475 +
476 + <androidx.cardview.widget.CardView
477 + android:id="@+id/cv_vouchers"
478 + android:layout_width="match_parent"
479 + android:layout_height="60dp"
480 + android:layout_marginHorizontal="2dp"
481 + android:layout_marginTop="24dp"
482 + android:layout_marginBottom="4dp"
483 + app:cardCornerRadius="16dp"
484 + app:cardElevation="2dp">
1056 485
1057 - <ScrollView 486 + <androidx.constraintlayout.widget.ConstraintLayout
1058 - android:id="@+id/sv_active_deals_codes_view" 487 + android:layout_width="match_parent"
1059 - android:layout_width="match_parent" 488 + android:layout_height="match_parent"
1060 - android:layout_height="48dp" 489 + android:background="@color/white">
1061 - android:nestedScrollingEnabled="true" 490 +
1062 - android:visibility="gone"> 491 + <ImageView
492 + android:id="@+id/iv_vouchers_logo"
493 + android:layout_width="32dp"
494 + android:layout_height="30dp"
495 + android:layout_marginStart="16dp"
496 + android:src="@drawable/sv_vouchers"
497 + app:layout_constraintBottom_toBottomOf="parent"
498 + app:layout_constraintStart_toStartOf="parent"
499 + app:layout_constraintTop_toTopOf="parent" />
1063 500
1064 - <org.apmem.tools.layouts.FlowLayout 501 + <TextView
1065 - android:id="@+id/ll_active_deals_codes_view" 502 + android:id="@+id/tv_vouchers_info_title"
1066 - android:layout_width="match_parent" 503 + fontPath="fonts/PeridotPE-Regular.ttf"
1067 - android:layout_height="wrap_content" 504 + android:layout_width="0dp"
1068 - android:visibility="gone"> 505 + android:layout_height="wrap_content"
506 + android:layout_marginHorizontal="8dp"
507 + android:includeFontPadding="false"
508 + android:text="@string/cos_vouchers_info_title"
509 + android:textColor="@color/cos_light_black"
510 + android:textSize="16sp"
511 + app:layout_constraintBottom_toBottomOf="@+id/iv_vouchers_logo"
512 + app:layout_constraintEnd_toStartOf="@+id/iv_vouchers_arrow"
513 + app:layout_constraintHorizontal_bias="0.0"
514 + app:layout_constraintStart_toEndOf="@+id/iv_vouchers_logo"
515 + app:layout_constraintTop_toTopOf="@+id/iv_vouchers_logo" />
516 +
517 + <ImageView
518 + android:id="@+id/iv_vouchers_arrow"
519 + android:layout_width="16dp"
520 + android:layout_height="16dp"
521 + android:layout_marginEnd="16dp"
522 + android:src="@drawable/ic_right_black"
523 + app:layout_constraintBottom_toBottomOf="parent"
524 + app:layout_constraintEnd_toEndOf="parent"
525 + app:layout_constraintTop_toTopOf="parent" />
526 + </androidx.constraintlayout.widget.ConstraintLayout>
527 + </androidx.cardview.widget.CardView>
528 + </LinearLayout>
1069 529
1070 - </org.apmem.tools.layouts.FlowLayout> 530 + <LinearLayout
1071 - </ScrollView> 531 + android:id="@+id/ll_vouchers_disabled"
532 + android:layout_width="match_parent"
533 + android:layout_height="wrap_content"
534 + android:layout_marginHorizontal="14dp"
535 + android:layout_marginTop="32dp"
536 + android:orientation="vertical"
537 + android:visibility="gone"
538 + tools:visibility="visible">
539 +
540 + <TextView
541 + android:id="@+id/tv_vouchers_title_disabled"
542 + fontPath="fonts/BTCosmo-Bold.ttf"
543 + android:layout_width="wrap_content"
544 + android:layout_height="wrap_content"
545 + android:includeFontPadding="false"
546 + android:maxLines="1"
547 + android:text="@string/cos_vouchers_title"
548 + android:textColor="@color/cos_light_black"
549 + android:textSize="20sp" />
550 +
551 + <androidx.cardview.widget.CardView
552 + android:id="@+id/cv_vouchers_disabled"
553 + android:layout_width="match_parent"
554 + android:layout_height="60dp"
555 + android:layout_marginHorizontal="2dp"
556 + android:layout_marginTop="24dp"
557 + android:layout_marginBottom="4dp"
558 + app:cardCornerRadius="16dp"
559 + app:cardElevation="2dp">
1072 560
1073 - <TextView 561 + <androidx.constraintlayout.widget.ConstraintLayout
1074 - android:id="@+id/tv_active_deals_date_text" 562 + android:layout_width="match_parent"
1075 - fontPath="fonts/PeridotPE-Regular.ttf" 563 + android:layout_height="match_parent"
1076 - android:layout_width="wrap_content" 564 + android:background="@color/white">
1077 - android:layout_height="wrap_content" 565 +
1078 - android:textColor="@color/cos_light_black" 566 + <ImageView
1079 - android:visibility="gone" 567 + android:id="@+id/iv_vouchers_logo_disabled"
1080 - tools:text="@string/cos_active_coupon_date" /> 568 + android:layout_width="32dp"
1081 - </LinearLayout> 569 + android:layout_height="30dp"
570 + android:layout_marginStart="16dp"
571 + android:src="@drawable/sv_vouchers_disabled"
572 + app:layout_constraintBottom_toBottomOf="parent"
573 + app:layout_constraintStart_toStartOf="parent"
574 + app:layout_constraintTop_toTopOf="parent" />
1082 575
1083 - <ImageView 576 + <TextView
1084 - android:id="@+id/iv_deals_circle" 577 + android:id="@+id/tv_vouchers_info_title_disabled"
1085 - android:layout_width="86dp" 578 + fontPath="fonts/PeridotPE-Regular.ttf"
1086 - android:layout_height="86dp" 579 + android:layout_width="wrap_content"
1087 - android:layout_marginVertical="4dp" 580 + android:layout_height="wrap_content"
1088 - android:layout_marginEnd="20dp" 581 + android:layout_marginHorizontal="8dp"
1089 - android:src="@drawable/ic_deals_new" 582 + android:includeFontPadding="false"
1090 - app:layout_constraintBottom_toBottomOf="parent" 583 + android:text="@string/cos_vouchers_info_title_disabled"
1091 - app:layout_constraintEnd_toEndOf="parent" 584 + android:textColor="@color/cos_gray2"
1092 - app:layout_constraintTop_toTopOf="parent" /> 585 + android:textSize="16sp"
1093 - </androidx.constraintlayout.widget.ConstraintLayout> 586 + app:layout_constraintBottom_toBottomOf="@+id/iv_vouchers_logo_disabled"
1094 - </androidx.cardview.widget.CardView> 587 + app:layout_constraintEnd_toStartOf="@+id/iv_vouchers_arrow_disabled"
1095 - </LinearLayout> 588 + app:layout_constraintHorizontal_bias="0.0"
589 + app:layout_constraintStart_toEndOf="@+id/iv_vouchers_logo_disabled"
590 + app:layout_constraintTop_toTopOf="@+id/iv_vouchers_logo_disabled" />
591 +
592 + <ImageView
593 + android:id="@+id/iv_vouchers_arrow_disabled"
594 + android:layout_width="16dp"
595 + android:layout_height="16dp"
596 + android:layout_marginEnd="16dp"
597 + android:src="@drawable/ic_right_black"
598 + app:layout_constraintBottom_toBottomOf="parent"
599 + app:layout_constraintEnd_toEndOf="parent"
600 + app:layout_constraintTop_toTopOf="parent" />
1096 601
1097 <LinearLayout 602 <LinearLayout
1098 - android:id="@+id/ll_gifts_view" 603 + android:layout_width="16dp"
1099 - android:layout_width="match_parent" 604 + android:layout_height="16dp"
1100 - android:layout_height="wrap_content" 605 + android:layout_marginStart="2dp"
1101 - android:layout_marginTop="24dp" 606 + android:background="@drawable/shape_cos_counter_orange"
607 + android:gravity="center"
1102 android:orientation="vertical" 608 android:orientation="vertical"
1103 - android:visibility="gone" 609 + app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled"
1104 - tools:visibility="gone"> 610 + app:layout_constraintStart_toEndOf="@+id/tv_vouchers_info_title_disabled"
611 + app:layout_constraintTop_toTopOf="@+id/tv_vouchers_info_title_disabled">
1105 612
1106 <TextView 613 <TextView
1107 - android:id="@+id/tv_active_coupons_header" 614 + android:id="@+id/tv_vouchers_count_disabled"
1108 - fontPath="fonts/BTCosmo-Bold.ttf" 615 + fontPath="fonts/PeridotPE-SemiBold.ttf"
1109 android:layout_width="wrap_content" 616 android:layout_width="wrap_content"
1110 - android:layout_height="wrap_content" 617 + android:layout_height="16dp"
1111 - android:layout_gravity="start" 618 + android:includeFontPadding="false"
1112 - android:layout_marginHorizontal="16dp" 619 + android:maxLines="1"
1113 - android:layout_marginBottom="10dp" 620 + android:text="0"
1114 - android:text="@string/cos_gifts_title" 621 + android:textColor="@color/cos_light_black"
1115 - android:textColor="@color/cos_light_blue" 622 + android:textSize="12sp" />
1116 - android:textSize="19sp" />
1117 -
1118 - <androidx.recyclerview.widget.RecyclerView
1119 - android:id="@+id/rv_active_coupons"
1120 - android:layout_width="match_parent"
1121 - android:layout_height="wrap_content"
1122 - android:layout_marginHorizontal="2dp"
1123 - android:overScrollMode="never"
1124 - android:paddingBottom="40dp"
1125 - android:scrollbars="none" />
1126 </LinearLayout> 623 </LinearLayout>
1127 - </LinearLayout> 624 + </androidx.constraintlayout.widget.ConstraintLayout>
1128 - </RelativeLayout> 625 + </androidx.cardview.widget.CardView>
626 + </LinearLayout>
627 +
628 + <LinearLayout
629 + android:id="@+id/ll_empty_wallet"
630 + android:layout_width="match_parent"
631 + android:layout_height="wrap_content"
632 + android:layout_marginHorizontal="32dp"
633 + android:layout_marginTop="32dp"
634 + android:gravity="center"
635 + android:orientation="vertical"
636 + android:visibility="gone"
637 + tools:visibility="visible">
638 +
639 + <ImageView
640 + android:layout_width="64dp"
641 + android:layout_height="64dp"
642 + android:src="@drawable/ic_empty_wallet" />
643 +
644 + <TextView
645 + fontPath="fonts/PeridotPE-Regular.ttf"
646 + android:layout_width="wrap_content"
647 + android:layout_height="wrap_content"
648 + android:layout_marginTop="8dp"
649 + android:gravity="center"
650 + android:text="@string/cos_empty_wallet"
651 + android:textColor="@color/cos_light_black"
652 + android:textSize="14sp" />
1129 </LinearLayout> 653 </LinearLayout>
1130 - </androidx.core.widget.NestedScrollView> 654 + </LinearLayout>
1131 </RelativeLayout> 655 </RelativeLayout>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 <string name="cos_profile_more">Δες περισσότερα</string> 19 <string name="cos_profile_more">Δες περισσότερα</string>
20 <string name="cos_gifts_title">GIFTS FOR YOU</string> 20 <string name="cos_gifts_title">GIFTS FOR YOU</string>
21 <string name="cos_more_title">MORE FOR YOU</string> 21 <string name="cos_more_title">MORE FOR YOU</string>
22 + <string name="cos_free_coupons">FREE COUPONS</string>
22 <string name="menu_home">Αρχική</string> 23 <string name="menu_home">Αρχική</string>
23 <string name="menu_explore">Ανακάλυψε</string> 24 <string name="menu_explore">Ανακάλυψε</string>
24 <string name="menu_shop">Shop</string> 25 <string name="menu_shop">Shop</string>
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
75 <string name="cos_gift_it">Δώρισέ το</string> 76 <string name="cos_gift_it">Δώρισέ το</string>
76 <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string> 77 <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string>
77 <string name="cos_popup_more_subtitle">Σε αυτή την ενότητα βρες έρευνες, παιχνίδια, διαγωνισμούς και επιβραβεύσεις για τις αθλητικές σου δραστηριότητες!</string> 78 <string name="cos_popup_more_subtitle">Σε αυτή την ενότητα βρες έρευνες, παιχνίδια, διαγωνισμούς και επιβραβεύσεις για τις αθλητικές σου δραστηριότητες!</string>
78 - <string name="cos_deals_win_title">Μέχρι τώρα έχεις όφελος %1$s€ από τα GIFTS FOR YOU</string> 79 + <string name="cos_deals_win_title">Μέχρι τώρα έχεις όφελος %1$s€ από τα FREE COUPONS</string>
79 <string name="cos_deals_win_title_cos">Μέχρι τώρα έχεις όφελος %1$s€ από τα DEALS FOR YOU</string> 80 <string name="cos_deals_win_title_cos">Μέχρι τώρα έχεις όφελος %1$s€ από τα DEALS FOR YOU</string>
80 <string name="cos_mygifts">Τα δώρα μου</string> 81 <string name="cos_mygifts">Τα δώρα μου</string>
81 <string name="cos_gifts_banner_title">Δώρα:</string> 82 <string name="cos_gifts_banner_title">Δώρα:</string>
...@@ -94,7 +95,8 @@ ...@@ -94,7 +95,8 @@
94 <string name="cos_dlg_reject_text">Το δώρο θα επιστραφεί και δεν θα μπορεί να ενεργοποιηθεί ξανά.</string> 95 <string name="cos_dlg_reject_text">Το δώρο θα επιστραφεί και δεν θα μπορεί να ενεργοποιηθεί ξανά.</string>
95 <string name="cos_dlg_return_text">Έλαβες πίσω το δώρο σου, κουπόνι αξίας 100€ για τα Intersport</string> 96 <string name="cos_dlg_return_text">Έλαβες πίσω το δώρο σου, κουπόνι αξίας 100€ για τα Intersport</string>
96 <string name="cos_dlg_negative_button2">Άκυρο</string> 97 <string name="cos_dlg_negative_button2">Άκυρο</string>
97 - <string name="cos_profile_preferences">Προτιμήσεις</string> 98 + <string name="cos_profile_preferences">Πρόσθεσε τις προτιμήσεις σου</string>
99 + <string name="cos_profile_history">Δες το ιστορικό σου</string>
98 <string name="cos_shops">Δες τα καταστήματα</string> 100 <string name="cos_shops">Δες τα καταστήματα</string>
99 <string name="cos_website">Δες το eshop</string> 101 <string name="cos_website">Δες το eshop</string>
100 <string name="cos_coupon_shops_title">Καταστήματα</string> 102 <string name="cos_coupon_shops_title">Καταστήματα</string>
...@@ -122,7 +124,7 @@ ...@@ -122,7 +124,7 @@
122 <string name="cos_shared_coupon_receiver">Εκπτωτικό κουπόνι προς</string> 124 <string name="cos_shared_coupon_receiver">Εκπτωτικό κουπόνι προς</string>
123 <string name="cos_shared_coupon_sender">Έκπτωτικό κουπόνι από</string> 125 <string name="cos_shared_coupon_sender">Έκπτωτικό κουπόνι από</string>
124 <string name="cos_steps_for_good_notification_title">Steps For Good</string> 126 <string name="cos_steps_for_good_notification_title">Steps For Good</string>
125 - <string name="cos_empty_wallet">Δεν έχεις κάποιον ενεργό κωδικό ή κουπόνι! Μπες τώρα στην ενότητα COSMOTE For You και βρες αποκλειστικές προσφορές!</string> 127 + <string name="cos_empty_wallet">Δεν έχεις ενεργό κωδικό ή κουπόνι! Μπες τώρα στην ενότητα COSMOTE For You και βρες αποκλειστικές προσφορές</string>
126 <string name="cos_wallet_text1">Μέχρι τώρα έχεις κερδίσει&#160;</string> 128 <string name="cos_wallet_text1">Μέχρι τώρα έχεις κερδίσει&#160;</string>
127 <string name="cos_wallet_text2">&#160;με το DEALS for YOU!</string> 129 <string name="cos_wallet_text2">&#160;με το DEALS for YOU!</string>
128 <string name="cos_wallet_text3">Μέχρι τώρα έχεις κερδίσει&#160;</string> 130 <string name="cos_wallet_text3">Μέχρι τώρα έχεις κερδίσει&#160;</string>
...@@ -212,6 +214,7 @@ ...@@ -212,6 +214,7 @@
212 <string name="cos_dlg_return">Επιστροφή</string> 214 <string name="cos_dlg_return">Επιστροφή</string>
213 <string name="cos_vouchers_info_title_disabled">Διαθέσιμο υπόλοιπο</string> 215 <string name="cos_vouchers_info_title_disabled">Διαθέσιμο υπόλοιπο</string>
214 <string name="cos_vouchers_info_title_disabled_en">Available balance</string> 216 <string name="cos_vouchers_info_title_disabled_en">Available balance</string>
217 + <string name="cos_coupons_header">Κουπόνια</string>
215 218
216 <string-array name="coupons_array"> 219 <string-array name="coupons_array">
217 <item>Κουπόνια</item> 220 <item>Κουπόνια</item>
......
...@@ -72,4 +72,8 @@ ...@@ -72,4 +72,8 @@
72 <item name="colorAccent">@color/cos_green12</item> 72 <item name="colorAccent">@color/cos_green12</item>
73 </style> 73 </style>
74 74
75 + <style name="progressBarBlue" parent="@style/Theme.AppCompat">
76 + <item name="colorAccent">@color/cos_light_blue</item>
77 + </style>
78 +
75 </resources> 79 </resources>
...\ No newline at end of file ...\ No newline at end of file
......