open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
bdf378e4 1 parent 7044d2a7

vouchers part2

Inline Side-by-side
Showing 20 changed files with 1127 additions and 460 deletions
...@@ -19,6 +19,7 @@ android { ...@@ -19,6 +19,7 @@ android {
19 minSdkVersion 23 19 minSdkVersion 23
20 targetSdkVersion 31 20 targetSdkVersion 31
21 consumerProguardFiles 'proguard-rules.pro' 21 consumerProguardFiles 'proguard-rules.pro'
22 + vectorDrawables.useSupportLibrary = true
22 } 23 }
23 splits { 24 splits {
24 abi { 25 abi {
......
...@@ -13,6 +13,7 @@ import android.view.View; ...@@ -13,6 +13,7 @@ import android.view.View;
13 import android.view.ViewGroup; 13 import android.view.ViewGroup;
14 import android.widget.ImageView; 14 import android.widget.ImageView;
15 import android.widget.LinearLayout; 15 import android.widget.LinearLayout;
16 +import android.widget.RelativeLayout;
16 import android.widget.ScrollView; 17 import android.widget.ScrollView;
17 import android.widget.TextView; 18 import android.widget.TextView;
18 19
...@@ -53,6 +54,7 @@ import ly.warp.sdk.io.models.CouponList; ...@@ -53,6 +54,7 @@ import ly.warp.sdk.io.models.CouponList;
53 import ly.warp.sdk.io.models.Couponset; 54 import ly.warp.sdk.io.models.Couponset;
54 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 55 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
55 import ly.warp.sdk.io.models.UnifiedCoupon; 56 import ly.warp.sdk.io.models.UnifiedCoupon;
57 +import ly.warp.sdk.io.models.VouchersActivityEventModel;
56 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel; 58 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
57 import ly.warp.sdk.utils.WarpUtils; 59 import ly.warp.sdk.utils.WarpUtils;
58 import ly.warp.sdk.utils.WarplyManagerHelper; 60 import ly.warp.sdk.utils.WarplyManagerHelper;
...@@ -75,11 +77,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -75,11 +77,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
75 private ImageView mIvBack, mIvDealsLogo, mIvProfilePhoto, mIvExpArrow; 77 private ImageView mIvBack, mIvDealsLogo, mIvProfilePhoto, mIvExpArrow;
76 private TextView mTvUsername, mTvDealsValue, mTvDealsValueAll, 78 private TextView mTvUsername, mTvDealsValue, mTvDealsValueAll,
77 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate, 79 mTvUserBadge, mTvGiftsValue, mTvGiftsValueAll, mTvActiveCode, mTvActiveDate,
78 - mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue, mTvFavValueAll; 80 + mTvActiveTitle, mTvActiveCouponsHeader, mTvMarketValue, mTvMarketAll, mTvFavValue,
81 + mTvFavValueAll, mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge;
79 private ConstraintLayout mClDealsBanner, mClDealsView, 82 private ConstraintLayout mClDealsBanner, mClDealsView,
80 mClGiftsBanner, mClToolbar, mClMarket; 83 mClGiftsBanner, mClToolbar, mClMarket;
81 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts, 84 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts,
82 - mLlMarketView, mLlHistory; 85 + mLlMarketView, mLlHistory, mLlBannerInfo, mLlVouchers;
83 private FlowLayout mLlActiveCodesView; 86 private FlowLayout mLlActiveCodesView;
84 private float couponDfyValue = 0.0f, mFavValue = 0.0f; 87 private float couponDfyValue = 0.0f, mFavValue = 0.0f;
85 private RecyclerView mRecyclerCoupons, mRvMarketCoupons; 88 private RecyclerView mRecyclerCoupons, mRvMarketCoupons;
...@@ -94,10 +97,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -94,10 +97,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
94 private MarketCouponAdapter mAdapterMarketCoupons; 97 private MarketCouponAdapter mAdapterMarketCoupons;
95 private ExpandableLayout mElGifts; 98 private ExpandableLayout mElGifts;
96 private boolean mIsStayCollapsed = true; 99 private boolean mIsStayCollapsed = true;
97 - private CardView mClExp; 100 + private CardView mClExp, mCvVouchers;
98 private boolean mDfyPressed = false, mDealsBannerPressed = false, mQuestionnairePressed = false, 101 private boolean mDfyPressed = false, mDealsBannerPressed = false, mQuestionnairePressed = false,
99 mHistoryPressed = false, mHistoryMarketPressed = false, mUnifiedPressed = false, 102 mHistoryPressed = false, mHistoryMarketPressed = false, mUnifiedPressed = false,
100 - mCouponPressed = false, mHistoryBadgePressed = false; 103 + mCouponPressed = false, mHistoryBadgePressed = false, mUnifiedCountPressed = false,
104 + mGiftsCountPressed = false;
105 + private RelativeLayout mRlDeals, mRlUnified, mRlGifts;
101 106
102 // =========================================================== 107 // ===========================================================
103 // Methods for/from SuperClass/Interfaces 108 // Methods for/from SuperClass/Interfaces
...@@ -147,28 +152,26 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -147,28 +152,26 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
147 mTvFavValue = findViewById(R.id.tv_exp_value); 152 mTvFavValue = findViewById(R.id.tv_exp_value);
148 mTvFavValueAll = findViewById(R.id.tv_exp_value_all); 153 mTvFavValueAll = findViewById(R.id.tv_exp_value_all);
149 mLlHistory = findViewById(R.id.ll_loyalty_history); 154 mLlHistory = findViewById(R.id.ll_loyalty_history);
150 - 155 + mTvDealsCountBadge = findViewById(R.id.tv_deals_count);
151 - if (WarplyManagerHelper.getActiveDFYCoupons() != null) { 156 + mTvUnifiedCountBadge = findViewById(R.id.tv_sm_count);
152 - Collections.sort(WarplyManagerHelper.getActiveDFYCoupons(), new Comparator<ActiveDFYCouponModel>() { 157 + mTvGiftsCountBadge = findViewById(R.id.tv_gifts_count);
153 - public int compare(ActiveDFYCouponModel o1, ActiveDFYCouponModel o2) { 158 + mLlBannerInfo = findViewById(R.id.ll_banner_info_new);
154 - return o1.getDate().compareTo(o2.getDate()); 159 + mRlDeals = findViewById(R.id.rv_deals_count);
155 - } 160 + mRlUnified = findViewById(R.id.rv_sm_count);
156 - }); 161 + mRlGifts = findViewById(R.id.rv_gifts_count);
157 -
158 -// for (ActiveDFYCouponModel dfycoupon : WarplyManagerHelper.getActiveDFYCoupons()) {
159 -// try {
160 -// couponDfyValue += Float.parseFloat(dfycoupon.getValue());
161 -// } catch (NumberFormatException e) {
162 -//
163 -// }
164 -// }
165 - }
166 -
167 mRecyclerCoupons = findViewById(R.id.rv_active_coupons); 162 mRecyclerCoupons = findViewById(R.id.rv_active_coupons);
168 - mRecyclerCoupons.setNestedScrollingEnabled(false); 163 + mCvVouchers = findViewById(R.id.cv_vouchers);
169 - mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); 164 + mLlVouchers = findViewById(R.id.ll_vouchers);
170 - 165 +
171 - initViews(); 166 + /** Deals Badge */
167 +// if (WarplyManagerHelper.getActiveDFYCoupons() != null) {
168 +// Collections.sort(WarplyManagerHelper.getActiveDFYCoupons(), new Comparator<ActiveDFYCouponModel>() {
169 +// public int compare(ActiveDFYCouponModel o1, ActiveDFYCouponModel o2) {
170 +// return o1.getDate().compareTo(o2.getDate());
171 +// }
172 +// });
173 +// }
174 + /** Deals Badge */
172 } 175 }
173 176
174 @Override 177 @Override
...@@ -211,6 +214,9 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -211,6 +214,9 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
211 mUnifiedPressed = false; 214 mUnifiedPressed = false;
212 mCouponPressed = false; 215 mCouponPressed = false;
213 mHistoryBadgePressed = false; 216 mHistoryBadgePressed = false;
217 + mGiftsCountPressed = false;
218 + mUnifiedCountPressed = false;
219 + initViews();
214 } 220 }
215 221
216 @Override 222 @Override
...@@ -248,14 +254,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -248,14 +254,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
248 } 254 }
249 return; 255 return;
250 } 256 }
251 - if (view.getId() == R.id.cl_deals_win_inner_cos) { 257 + if (view.getId() == R.id.cl_deals_win_inner_cos || view.getId() == R.id.rv_deals_count) {
252 if (!mDealsBannerPressed) { 258 if (!mDealsBannerPressed) {
253 mDealsBannerPressed = true; 259 mDealsBannerPressed = true;
254 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen") 260 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
255 .concat(":") 261 .concat(":")
256 .concat("DealsBanner")); 262 .concat("DealsBanner"));
257 263
258 - WarpUtils.log("DFY coupon banner pressed!");
259 WarplyDealsAnalysisEventModel warplyDealsAnalysisEventModel = new WarplyDealsAnalysisEventModel(); 264 WarplyDealsAnalysisEventModel warplyDealsAnalysisEventModel = new WarplyDealsAnalysisEventModel();
260 warplyDealsAnalysisEventModel.setPressed(true); 265 warplyDealsAnalysisEventModel.setPressed(true);
261 EventBus.getDefault().post(new WarplyEventBusManager(warplyDealsAnalysisEventModel)); 266 EventBus.getDefault().post(new WarplyEventBusManager(warplyDealsAnalysisEventModel));
...@@ -267,6 +272,40 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -267,6 +272,40 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
267 } 272 }
268 return; 273 return;
269 } 274 }
275 + if (view.getId() == R.id.rv_sm_count) {
276 + if (!mUnifiedCountPressed) {
277 + mUnifiedCountPressed = true;
278 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
279 + .concat(":")
280 + .concat("SMDealsBanner"));
281 +
282 + LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
283 + analyticsEvent.setEventName("did_tap_sm_deals_badge");
284 + analyticsEvent.setParameter("screen", "Loyalty Wallet");
285 + EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
286 +
287 + Intent intent = new Intent(LoyaltyWallet.this, ActiveUnifiedCouponsActivity.class);
288 + startActivity(intent);
289 + }
290 + return;
291 + }
292 + if (view.getId() == R.id.rv_gifts_count) {
293 + if (!mGiftsCountPressed) {
294 + mGiftsCountPressed = true;
295 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
296 + .concat(":")
297 + .concat("GFYBanner"));
298 +
299 + LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
300 + analyticsEvent.setEventName("did_tap_gifts_badge");
301 + analyticsEvent.setParameter("screen", "Loyalty Wallet");
302 + EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
303 +
304 + Intent intent = new Intent(LoyaltyWallet.this, ActiveCouponsActivity.class);
305 + startActivity(intent);
306 + }
307 + return;
308 + }
270 if (view.getId() == R.id.cl_deals_win_inner) { 309 if (view.getId() == R.id.cl_deals_win_inner) {
271 if (!mHistoryPressed) { 310 if (!mHistoryPressed) {
272 mHistoryPressed = true; 311 mHistoryPressed = true;
...@@ -312,8 +351,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -312,8 +351,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
312 // } 351 // }
313 return; 352 return;
314 } 353 }
315 - if(view.getId() == R.id.ll_loyalty_history) { 354 + if (view.getId() == R.id.ll_loyalty_history) {
316 - if(!mHistoryBadgePressed) { 355 + if (!mHistoryBadgePressed) {
317 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen") 356 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
318 .concat(":") 357 .concat(":")
319 .concat("LoyaltyHistoryBadge")); 358 .concat("LoyaltyHistoryBadge"));
...@@ -325,6 +364,20 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -325,6 +364,20 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
325 } 364 }
326 return; 365 return;
327 } 366 }
367 + if (view.getId() == R.id.cv_vouchers) {
368 + WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
369 + .concat(":")
370 + .concat("VouchersBadge"));
371 +
372 + LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
373 + analyticsEvent.setEventName("did_tap_vouchers_badge");
374 + analyticsEvent.setParameter("screen", "Loyalty Wallet");
375 + EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
376 +
377 + VouchersActivityEventModel vouchersActivity = new VouchersActivityEventModel();
378 + EventBus.getDefault().post(new WarplyEventBusManager(vouchersActivity));
379 + return;
380 + }
328 if (view.getId() == R.id.cl_mygifts) { 381 if (view.getId() == R.id.cl_mygifts) {
329 if (!mDfyPressed) { 382 if (!mDfyPressed) {
330 mDfyPressed = true; 383 mDfyPressed = true;
...@@ -371,161 +424,183 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -371,161 +424,183 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
371 @Subscribe() 424 @Subscribe()
372 public void onMessageEvent(WarplyEventBusManager event) { 425 public void onMessageEvent(WarplyEventBusManager event) {
373 if (event.getVouchersFetched() != null) { 426 if (event.getVouchersFetched() != null) {
374 - WarpUtils.log(String.valueOf(event.getVouchersFetched().isFetched()));
375 - WarpUtils.log(WarplyManagerHelper.getShowVouchersBanner());
376 -
377 if (WarplyManagerHelper.getShowVouchersBanner().equals("true")) { 427 if (WarplyManagerHelper.getShowVouchersBanner().equals("true")) {
378 - //TODO: hide spinner and enable button 428 + //TODO: hide spinner
429 + runOnUiThread(() -> {
430 + mLlVouchers.setVisibility(View.VISIBLE);
431 + });
379 } else { 432 } else {
380 //.equals("false) 433 //.equals("false)
381 - //TODO: hide it completely or leave it disabled?? 434 + //TODO: hide spinner
382 } 435 }
383 return; 436 return;
384 } 437 }
385 if (event.getUnifiedCouponsAdded() != null) { 438 if (event.getUnifiedCouponsAdded() != null) {
386 mUnifiedPressed = false; 439 mUnifiedPressed = false;
387 - if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) { 440 + /** Unified Coupons List */
388 - ArrayList<UnifiedCoupon> tempCouponList = new ArrayList<UnifiedCoupon>(); 441 +// if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) {
389 - tempCouponList.addAll(WarplyManagerHelper.getMarketCouponsList()); 442 +// ArrayList<UnifiedCoupon> tempCouponList = new ArrayList<UnifiedCoupon>();
390 - 443 +// tempCouponList.addAll(WarplyManagerHelper.getMarketCouponsList());
391 - ArrayList<UnifiedCoupon> unilist = new ArrayList<UnifiedCoupon>(); 444 +//
392 - for (UnifiedCoupon unicpn : tempCouponList) { 445 +// ArrayList<UnifiedCoupon> unilist = new ArrayList<UnifiedCoupon>();
393 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); 446 +// for (UnifiedCoupon unicpn : tempCouponList) {
394 - Date newDate = new Date(); 447 +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
395 - try { 448 +// Date newDate = new Date();
396 - newDate = simpleDateFormat.parse(unicpn.getCreated()); 449 +// try {
397 - } catch (ParseException e) { 450 +// newDate = simpleDateFormat.parse(unicpn.getCreated());
398 - e.printStackTrace(); 451 +// } catch (ParseException e) {
399 - } 452 +// e.printStackTrace();
400 - unicpn.setExpirationDate(newDate); 453 +// }
401 - unilist.add(unicpn); 454 +// unicpn.setExpirationDate(newDate);
402 - } 455 +// unilist.add(unicpn);
403 - 456 +// }
404 - Collections.sort(unilist, (coupon1, coupon2) -> coupon2.getExpirationDate().compareTo(coupon1.getExpirationDate())); 457 +//
458 +// Collections.sort(unilist, (coupon1, coupon2) -> coupon2.getExpirationDate().compareTo(coupon1.getExpirationDate()));
459 +//
460 +// runOnUiThread(() -> {
461 +// mAdapterMarketCoupons = new MarketCouponAdapter(this, unilist);
462 +// mRvMarketCoupons.setAdapter(mAdapterMarketCoupons);
463 +// mAdapterMarketCoupons.getPositionClicks()
464 +// .doOnNext(coupon -> {
465 +// if (!mUnifiedPressed) {
466 +// mUnifiedPressed = true;
467 +// WarplyAnalyticsManager.logTrackersEvent(this, "click", ("UnifiedCoupon").concat(":").concat(coupon.getBarcode()));
468 +// Intent intent = new Intent(LoyaltyWallet.this, UnifiedCouponInfoActivity.class);
469 +// intent.putExtra("coupon", (Serializable) coupon);
470 +// intent.putExtra("isFromWallet", true);
471 +// startActivity(intent);
472 +// }
473 +//// startActivityForResult(intent, 1002);
474 +// })
475 +// .doOnError(error -> {
476 +// })
477 +// .subscribe();
478 +// mAdapterMarketCoupons.notifyDataSetChanged();
479 +// mLlMarketView.setVisibility(View.VISIBLE);
480 +//
481 +// // Third Expandable Banner
482 +// if (tempCouponList != null && tempCouponList.size() > 0) {
483 +// countValue = 0.0f;
484 +//
485 +// if (WarplyManagerHelper.getCouponRedeemedList().size() > 0) {
486 +// if (WarplyManagerHelper.getCouponsetsDeals().size() > 0) {
487 +// for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) {
488 +// for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
489 +// if (cou.getCouponsetUuid().equals(couset.getUuid())) {
490 +// countValue += Float.valueOf(cou.getDiscount());
491 +// cou.setDescription(couset.getShortDescription());
492 +// cou.setImage(couset.getImgPreview());
493 +// cou.setName(couset.getName());
494 +// cou.setMerchantUuid(couset.getMerchantUuid());
495 +// cou.setInnerText(couset.getInnerText());
496 +// cou.setDiscount_type(couset.getDiscount_type());
497 +// cou.setFinal_price(couset.getFinal_price());
498 +// break;
499 +// }
500 +// }
501 +// }
502 +// }
503 +// }
504 +//
505 +// mFavValue += countValue;
506 +// String badgeValue = String.format("%.02f", countValue);
507 +// mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
508 +// if (String.valueOf(countValue).length() >= 3) {
509 +// mTvMarketValue.setTextSize(12);
510 +// } else {
511 +// mTvMarketValue.setTextSize(14);
512 +// }
513 +// SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
514 +// sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
515 +// CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
516 +// sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
517 +// mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
518 +// } else {
519 +// String badgeValue = String.format("%.02f", 0.0f);
520 +// mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
521 +// SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
522 +// sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
523 +// CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
524 +// sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
525 +// mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
526 +// }
527 +// });
528 +// } else {
529 +// runOnUiThread(() -> {
530 +// mLlMarketView.setVisibility(View.GONE);
531 +// });
532 +// }
533 + /** Unified Coupons List */
405 534
406 - runOnUiThread(() -> { 535 + runOnUiThread(() -> {
407 - mAdapterMarketCoupons = new MarketCouponAdapter(this, unilist); 536 + if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
408 - mRvMarketCoupons.setAdapter(mAdapterMarketCoupons); 537 + mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size()));
409 - mAdapterMarketCoupons.getPositionClicks() 538 + else
410 - .doOnNext(coupon -> { 539 + mTvUnifiedCountBadge.setText("0");
411 - if (!mUnifiedPressed) { 540 + });
412 - mUnifiedPressed = true;
413 - WarplyAnalyticsManager.logTrackersEvent(this, "click", ("UnifiedCoupon").concat(":").concat(coupon.getBarcode()));
414 - Intent intent = new Intent(LoyaltyWallet.this, UnifiedCouponInfoActivity.class);
415 - intent.putExtra("coupon", (Serializable) coupon);
416 - intent.putExtra("isFromWallet", true);
417 - startActivity(intent);
418 - }
419 -// startActivityForResult(intent, 1002);
420 - })
421 - .doOnError(error -> {
422 - })
423 - .subscribe();
424 - mAdapterMarketCoupons.notifyDataSetChanged();
425 - mLlMarketView.setVisibility(View.VISIBLE);
426 -
427 - // Third Expandable Banner
428 - if (tempCouponList != null && tempCouponList.size() > 0) {
429 - countValue = 0.0f;
430 -
431 - if (WarplyManagerHelper.getCouponRedeemedList().size() > 0) {
432 - if (WarplyManagerHelper.getCouponsetsDeals().size() > 0) {
433 - for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) {
434 - for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
435 - if (cou.getCouponsetUuid().equals(couset.getUuid())) {
436 - countValue += Float.valueOf(cou.getDiscount());
437 - cou.setDescription(couset.getShortDescription());
438 - cou.setImage(couset.getImgPreview());
439 - cou.setName(couset.getName());
440 - cou.setMerchantUuid(couset.getMerchantUuid());
441 - cou.setInnerText(couset.getInnerText());
442 - cou.setDiscount_type(couset.getDiscount_type());
443 - cou.setFinal_price(couset.getFinal_price());
444 - break;
445 - }
446 - }
447 - }
448 - }
449 - }
450 -
451 - mFavValue += countValue;
452 - String badgeValue = String.format("%.02f", countValue);
453 - mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
454 - if (String.valueOf(countValue).length() >= 3) {
455 - mTvMarketValue.setTextSize(12);
456 - } else {
457 - mTvMarketValue.setTextSize(14);
458 - }
459 - SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
460 - sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
461 - CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
462 - sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
463 - mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
464 - } else {
465 - String badgeValue = String.format("%.02f", 0.0f);
466 - mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
467 - SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
468 - sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
469 - CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
470 - sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
471 - mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
472 - }
473 - });
474 - } else {
475 - runOnUiThread(() -> {
476 - mLlMarketView.setVisibility(View.GONE);
477 - });
478 - }
479 return; 541 return;
480 } 542 }
481 if (event.getCouponsAdded() != null) { 543 if (event.getCouponsAdded() != null) {
482 mCouponPressed = false; 544 mCouponPressed = false;
483 - CouponList tempCouponList = new CouponList(); 545 + /** Coupons List */
484 - CouponList cpnlist = new CouponList(); 546 +// CouponList tempCouponList = new CouponList();
485 - tempCouponList.clear(); 547 +// CouponList cpnlist = new CouponList();
486 - tempCouponList.addAll(WarplyManagerHelper.getCouponList()); 548 +// tempCouponList.clear();
487 - 549 +// tempCouponList.addAll(WarplyManagerHelper.getCouponList());
488 - for (Coupon cpn : tempCouponList) { 550 +//
489 - if (cpn.getStatus() == 1) { 551 +// for (Coupon cpn : tempCouponList) {
490 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm"); 552 +// if (cpn.getStatus() == 1) {
491 - Date newDate = new Date(); 553 +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
492 - try { 554 +// Date newDate = new Date();
493 - newDate = simpleDateFormat.parse(cpn.getExpiration()); 555 +// try {
494 - } catch (ParseException e) { 556 +// newDate = simpleDateFormat.parse(cpn.getExpiration());
495 - e.printStackTrace(); 557 +// } catch (ParseException e) {
496 - } 558 +// e.printStackTrace();
497 - cpn.setExpirationDate(newDate); 559 +// }
498 - cpnlist.add(cpn); 560 +// cpn.setExpirationDate(newDate);
499 - } 561 +// cpnlist.add(cpn);
500 - } 562 +// }
501 - 563 +// }
502 - Collections.sort(cpnlist, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate())); 564 +//
565 +// Collections.sort(cpnlist, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate()));
566 +//
567 +// runOnUiThread(() -> {
568 +// if (cpnlist != null && cpnlist.size() > 0) {
569 +// mAdapterCoupons = new ActiveCouponAdapter(this, cpnlist);
570 +// mRecyclerCoupons.setAdapter(mAdapterCoupons);
571 +// mAdapterCoupons.getPositionClicks()
572 +// .doOnNext(coupon -> {
573 +// if (!mCouponPressed) {
574 +// mCouponPressed = true;
575 +// WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Coupon").concat(":").concat(coupon.getName()));
576 +// Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
577 +// intent.putExtra("coupon", (Serializable) coupon);
578 +// intent.putExtra("isFromWallet", true);
579 +// startActivityForResult(intent, 1002);
580 +// }
581 +// })
582 +// .doOnError(error -> {
583 +// })
584 +// .subscribe();
585 +// mAdapterCoupons.notifyDataSetChanged();
586 +//// mLlGifts.setVisibility(View.VISIBLE);
587 +// } else {
588 +// mLlGifts.setVisibility(View.GONE);
589 +// }
590 +// });
591 + /** Coupons List */
503 592
504 runOnUiThread(() -> { 593 runOnUiThread(() -> {
505 - if (cpnlist != null && cpnlist.size() > 0) { 594 + if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0)
506 - mAdapterCoupons = new ActiveCouponAdapter(this, cpnlist); 595 + mTvGiftsCountBadge.setText(String.valueOf(WarplyManagerHelper.getCouponList().size()));
507 - mRecyclerCoupons.setAdapter(mAdapterCoupons); 596 + else
508 - mAdapterCoupons.getPositionClicks() 597 + mTvGiftsCountBadge.setText("0");
509 - .doOnNext(coupon -> {
510 - if (!mCouponPressed) {
511 - mCouponPressed = true;
512 - WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Coupon").concat(":").concat(coupon.getName()));
513 - Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
514 - intent.putExtra("coupon", (Serializable) coupon);
515 - intent.putExtra("isFromWallet", true);
516 - startActivityForResult(intent, 1002);
517 - }
518 - })
519 - .doOnError(error -> {
520 - })
521 - .subscribe();
522 - mAdapterCoupons.notifyDataSetChanged();
523 -// mLlGifts.setVisibility(View.VISIBLE);
524 - } else {
525 - mLlGifts.setVisibility(View.GONE);
526 - }
527 }); 598 });
528 } 599 }
600 +
601 + /** Empty View */
602 + runOnUiThread(this::checkForEmpty);
603 + /** Empty View */
529 } 604 }
530 605
531 @Override 606 @Override
...@@ -541,253 +616,281 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -541,253 +616,281 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
541 if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner())) { 616 if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner())) {
542 //TODO: show spinner 617 //TODO: show spinner
543 } else if (WarplyManagerHelper.getShowVouchersBanner().equals("true")) { 618 } else if (WarplyManagerHelper.getShowVouchersBanner().equals("true")) {
544 - //TODO: hide spinner and enable button 619 + //TODO: hide spinner
620 + mLlVouchers.setVisibility(View.VISIBLE);
545 } else { 621 } else {
546 //.equals("false) 622 //.equals("false)
547 - //TODO: hide it completely or leave it disabled?? 623 + //TODO: hide spinner
548 } 624 }
549 625
550 if (WarpUtils.getUserNonTelco(this)) { 626 if (WarpUtils.getUserNonTelco(this)) {
551 nonTelcoDialog(); 627 nonTelcoDialog();
552 } 628 }
553 629
554 - if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) { 630 + /** Unified Coupons List */
555 - ArrayList<UnifiedCoupon> unilist = new ArrayList<UnifiedCoupon>(); 631 +// if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) {
556 - for (UnifiedCoupon unicpn : WarplyManagerHelper.getMarketCouponsList()) { 632 +// ArrayList<UnifiedCoupon> unilist = new ArrayList<UnifiedCoupon>();
557 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); 633 +// for (UnifiedCoupon unicpn : WarplyManagerHelper.getMarketCouponsList()) {
558 - Date newDate = new Date(); 634 +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
559 - try { 635 +// Date newDate = new Date();
560 - newDate = simpleDateFormat.parse(unicpn.getCreated()); 636 +// try {
561 - } catch (ParseException e) { 637 +// newDate = simpleDateFormat.parse(unicpn.getCreated());
562 - e.printStackTrace(); 638 +// } catch (ParseException e) {
563 - } 639 +// e.printStackTrace();
564 - unicpn.setExpirationDate(newDate); 640 +// }
565 - unilist.add(unicpn); 641 +// unicpn.setExpirationDate(newDate);
566 - } 642 +// unilist.add(unicpn);
567 - 643 +// }
568 - Collections.sort(unilist, (coupon1, coupon2) -> coupon2.getExpirationDate().compareTo(coupon1.getExpirationDate())); 644 +//
569 - 645 +// Collections.sort(unilist, (coupon1, coupon2) -> coupon2.getExpirationDate().compareTo(coupon1.getExpirationDate()));
570 - mAdapterMarketCoupons = new MarketCouponAdapter(this, unilist); 646 +//
571 - mRvMarketCoupons.setAdapter(mAdapterMarketCoupons); 647 +// mAdapterMarketCoupons = new MarketCouponAdapter(this, unilist);
572 - mAdapterMarketCoupons.getPositionClicks() 648 +// mRvMarketCoupons.setAdapter(mAdapterMarketCoupons);
573 - .doOnNext(coupon -> { 649 +// mAdapterMarketCoupons.getPositionClicks()
574 - if (!mUnifiedPressed) { 650 +// .doOnNext(coupon -> {
575 - mUnifiedPressed = true; 651 +// if (!mUnifiedPressed) {
576 - WarplyAnalyticsManager.logTrackersEvent(this, "click", ("UnifiedCoupon").concat(":").concat(coupon.getBarcode())); 652 +// mUnifiedPressed = true;
577 - Intent intent = new Intent(LoyaltyWallet.this, UnifiedCouponInfoActivity.class); 653 +// WarplyAnalyticsManager.logTrackersEvent(this, "click", ("UnifiedCoupon").concat(":").concat(coupon.getBarcode()));
578 - intent.putExtra("coupon", (Serializable) coupon); 654 +// Intent intent = new Intent(LoyaltyWallet.this, UnifiedCouponInfoActivity.class);
579 - intent.putExtra("isFromWallet", true); 655 +// intent.putExtra("coupon", (Serializable) coupon);
580 - startActivity(intent); 656 +// intent.putExtra("isFromWallet", true);
581 - } 657 +// startActivity(intent);
582 -// startActivityForResult(intent, 1002);
583 - })
584 - .doOnError(error -> {
585 - })
586 - .subscribe();
587 - mLlMarketView.setVisibility(View.VISIBLE);
588 - } else {
589 - mLlMarketView.setVisibility(View.GONE);
590 - }
591 -
592 - if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0) {
593 - CouponList cpnlist = new CouponList();
594 - for (Coupon cpn : WarplyManagerHelper.getCouponList()) {
595 - if (cpn.getStatus() == 1) {
596 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
597 - Date newDate = new Date();
598 - try {
599 - newDate = simpleDateFormat.parse(cpn.getExpiration());
600 - } catch (ParseException e) {
601 - e.printStackTrace();
602 - }
603 - cpn.setExpirationDate(newDate);
604 - cpnlist.add(cpn);
605 - }
606 - }
607 -
608 - Collections.sort(cpnlist, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate()));
609 -
610 - mAdapterCoupons = new ActiveCouponAdapter(this, cpnlist);
611 - mRecyclerCoupons.setAdapter(mAdapterCoupons);
612 - mAdapterCoupons.getPositionClicks()
613 - .doOnNext(coupon -> {
614 - if (!mCouponPressed) {
615 - mCouponPressed = true;
616 - WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Coupon").concat(":").concat(coupon.getName()));
617 - Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
618 - intent.putExtra("coupon", (Serializable) coupon);
619 - intent.putExtra("isFromWallet", true);
620 - startActivityForResult(intent, 1002);
621 - }
622 - })
623 - .doOnError(error -> {
624 - })
625 - .subscribe();
626 - mLlGifts.setVisibility(View.VISIBLE);
627 - } else {
628 - mLlGifts.setVisibility(View.GONE);
629 - }
630 -
631 - // First Expandable Banner
632 - String badgeValueFirst = String.format("%.02f", WarplyManagerHelper.getDealsCouponsSum());
633 - mTvDealsValue.setText(String.format(getString(R.string.cos_value), badgeValueFirst));
634 - if (String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() >= 3) {
635 - mTvDealsValue.setTextSize(12);
636 - } else {
637 - mTvDealsValue.setTextSize(14);
638 - }
639 - SpannableStringBuilder sBuilder = new SpannableStringBuilder();
640 - sBuilder.append(String.format(getString(R.string.cos_deals_win_title_cos), badgeValueFirst));
641 - CalligraphyTypefaceSpan typefaceBoldSpanFirst = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
642 - sBuilder.setSpan(typefaceBoldSpanFirst, 15, 16 + badgeValueFirst.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
643 - mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
644 - mFavValue += WarplyManagerHelper.getDealsCouponsSum();
645 -
646 - // Second Expandable Banner
647 - if (WarplyManagerHelper.getLoyaltyBadge() != null && (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0 || WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)) {
648 - String badgeValue = String.format("%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
649 - mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue));
650 - if (String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() >= 3) {
651 - mTvGiftsValue.setTextSize(12);
652 - } else {
653 - mTvGiftsValue.setTextSize(14);
654 - }
655 - SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder();
656 - sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue));
657 - CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
658 - sBuilderSecond.setSpan(typefaceBoldSpanSecond, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
659 - mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE);
660 - mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue();
661 - }
662 -
663 - // Third Expandable Banner
664 - if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
665 - countValue = 0.0f;
666 -// for (UnifiedCoupon unicou : WarplyManagerHelper.getMarketCoupons()) {
667 -// if (unicou.getCoupons() != null && unicou.getCoupons().size() > 0) {
668 -// for (Coupon inncou : unicou.getCoupons()) {
669 -// if (inncou.getStatus() == 0) {
670 -// countValue += Float.valueOf(inncou.getDiscount());
671 // } 658 // }
659 +//// startActivityForResult(intent, 1002);
660 +// })
661 +// .doOnError(error -> {
662 +// })
663 +// .subscribe();
664 +// mLlMarketView.setVisibility(View.VISIBLE);
665 +// } else {
666 +// mLlMarketView.setVisibility(View.GONE);
667 +// }
668 + /** Unified Coupons List */
669 +
670 + if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
671 + mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size()));
672 + else
673 + mTvUnifiedCountBadge.setText("0");
674 +
675 + /** Coupon List */
676 +// if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0) {
677 +// CouponList cpnlist = new CouponList();
678 +// for (Coupon cpn : WarplyManagerHelper.getCouponList()) {
679 +// if (cpn.getStatus() == 1) {
680 +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
681 +// Date newDate = new Date();
682 +// try {
683 +// newDate = simpleDateFormat.parse(cpn.getExpiration());
684 +// } catch (ParseException e) {
685 +// e.printStackTrace();
672 // } 686 // }
687 +// cpn.setExpirationDate(newDate);
688 +// cpnlist.add(cpn);
673 // } 689 // }
674 // } 690 // }
675 - 691 +//
676 - if (WarplyManagerHelper.getCouponRedeemedList().size() > 0) { 692 +// Collections.sort(cpnlist, (coupon1, coupon2) -> coupon1.getExpirationDate().compareTo(coupon2.getExpirationDate()));
677 - if (WarplyManagerHelper.getCouponsetsDeals().size() > 0) { 693 +//
678 - for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) { 694 +// mRecyclerCoupons.setNestedScrollingEnabled(false);
679 - for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) { 695 +// mRecyclerCoupons.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
680 - if (cou.getCouponsetUuid().equals(couset.getUuid())) { 696 +// mAdapterCoupons = new ActiveCouponAdapter(this, cpnlist);
681 - countValue += Float.valueOf(cou.getDiscount()); 697 +// mRecyclerCoupons.setAdapter(mAdapterCoupons);
682 - cou.setDescription(couset.getShortDescription()); 698 +// mAdapterCoupons.getPositionClicks()
683 - cou.setImage(couset.getImgPreview()); 699 +// .doOnNext(coupon -> {
684 - cou.setName(couset.getName()); 700 +// if (!mCouponPressed) {
685 - cou.setMerchantUuid(couset.getMerchantUuid()); 701 +// mCouponPressed = true;
686 - cou.setInnerText(couset.getInnerText()); 702 +// WarplyAnalyticsManager.logTrackersEvent(this, "click", ("Coupon").concat(":").concat(coupon.getName()));
687 - cou.setDiscount_type(couset.getDiscount_type()); 703 +// Intent intent = new Intent(LoyaltyWallet.this, CouponInfoActivity.class);
688 - cou.setFinal_price(couset.getFinal_price()); 704 +// intent.putExtra("coupon", (Serializable) coupon);
689 - break; 705 +// intent.putExtra("isFromWallet", true);
690 - } 706 +// startActivityForResult(intent, 1002);
691 - } 707 +// }
692 - } 708 +// })
693 - } 709 +// .doOnError(error -> {
694 - } 710 +// })
695 - 711 +// .subscribe();
696 - mFavValue += countValue; 712 +// mLlGifts.setVisibility(View.VISIBLE);
697 - String badgeValue = String.format("%.02f", countValue); 713 +// } else {
698 - mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 714 +// mLlGifts.setVisibility(View.GONE);
699 - if (String.valueOf(countValue).length() >= 3) { 715 +// }
700 - mTvMarketValue.setTextSize(12); 716 + /** Coupon List */
701 - } else { 717 +
702 - mTvMarketValue.setTextSize(14); 718 + if (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0)
703 - } 719 + mTvGiftsCountBadge.setText(String.valueOf(WarplyManagerHelper.getCouponList().size()));
704 - SpannableStringBuilder sBuilderThird = new SpannableStringBuilder(); 720 + else
705 - sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue)); 721 + mTvGiftsCountBadge.setText("0");
706 - CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 722 +
707 - sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 723 + /** First Expandable Banner */
708 - mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE); 724 +// String badgeValueFirst = String.format("%.02f", WarplyManagerHelper.getDealsCouponsSum());
709 - } else { 725 +// mTvDealsValue.setText(String.format(getString(R.string.cos_value), badgeValueFirst));
710 - String badgeValue = String.format("%.02f", 0.0f); 726 +// if (String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() >= 3) {
711 - mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 727 +// mTvDealsValue.setTextSize(12);
712 - SpannableStringBuilder sBuilderThird = new SpannableStringBuilder(); 728 +// } else {
713 - sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue)); 729 +// mTvDealsValue.setTextSize(14);
714 - CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 730 +// }
715 - sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 731 +// SpannableStringBuilder sBuilder = new SpannableStringBuilder();
716 - mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE); 732 +// sBuilder.append(String.format(getString(R.string.cos_deals_win_title_cos), badgeValueFirst));
717 - } 733 +// CalligraphyTypefaceSpan typefaceBoldSpanFirst = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
718 - 734 +// sBuilder.setSpan(typefaceBoldSpanFirst, 15, 16 + badgeValueFirst.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
719 - // Sum Expandable Banner 735 +// mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
720 - String allValue = String.format("%.02f", mFavValue); 736 +// mFavValue += WarplyManagerHelper.getDealsCouponsSum();
721 - mTvFavValue.setText(String.format(getString(R.string.cos_value), allValue)); 737 + /** First Expandable Banner */
722 - if (String.valueOf(mFavValue).length() >= 3) { 738 +
723 - mTvFavValue.setTextSize(12); 739 + /** Second Expandable Banner */
724 - } else { 740 +// if (WarplyManagerHelper.getLoyaltyBadge() != null && (WarplyManagerHelper.getLoyaltyBadge().getCouponCount() > 0 || WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)) {
725 - mTvFavValue.setTextSize(14); 741 +// String badgeValue = String.format("%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
726 - } 742 +// mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue));
727 - SpannableStringBuilder sBuilderExp = new SpannableStringBuilder(); 743 +// if (String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() >= 3) {
728 - sBuilderExp.append(String.format(getString(R.string.cos_for_you_all), allValue)); 744 +// mTvGiftsValue.setTextSize(12);
729 - CalligraphyTypefaceSpan typefaceBoldExp = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 745 +// } else {
730 - sBuilderExp.setSpan(typefaceBoldExp, 26, 27 + allValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 746 +// mTvGiftsValue.setTextSize(14);
731 - mTvFavValueAll.setText(sBuilderExp, TextView.BufferType.SPANNABLE); 747 +// }
732 - mClExp.setVisibility(View.VISIBLE); 748 +// SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder();
733 - 749 +// sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue));
734 - if (WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() > 0) { 750 +// CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
735 - String codes = ""; 751 +// sBuilderSecond.setSpan(typefaceBoldSpanSecond, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
736 - if (WarplyManagerHelper.getActiveDFYCoupons().size() == 1) { 752 +// mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE);
737 - codes = WarplyManagerHelper.getActiveDFYCoupons().get(0).getCode(); 753 +// mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue();
738 - mTvActiveTitle.setText(String.format(getString(R.string.cos_active_deals), String.valueOf(1))); 754 +// }
739 - 755 + /** Second Expandable Banner */
740 - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm"); 756 +
741 - String date1 = WarplyManagerHelper.getActiveDFYCoupons().get(0).getDate(); 757 + /** Third Expandable Banner */
742 - String date2 = dateFormat.format(new Date()); 758 +// if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
743 - 759 +// countValue = 0.0f;
744 - mTvActiveCode.setText(codes); 760 +//// for (UnifiedCoupon unicou : WarplyManagerHelper.getMarketCoupons()) {
745 - 761 +//// if (unicou.getCoupons() != null && unicou.getCoupons().size() > 0) {
746 - try { 762 +//// for (Coupon inncou : unicou.getCoupons()) {
747 - Date toDate = dateFormat.parse(date2); 763 +//// if (inncou.getStatus() == 0) {
748 - Date fromDate = dateFormat.parse(date1); 764 +//// countValue += Float.valueOf(inncou.getDiscount());
749 - long diff = TimeUnit.MILLISECONDS.toDays(fromDate.getTime() - toDate.getTime()) + 1; 765 +//// }
750 - mTvActiveDate.setText(String.format(getString(R.string.cos_active_coupon_date), String.valueOf(diff))); 766 +//// }
751 - mTvActiveDate.setVisibility(View.VISIBLE); 767 +//// }
752 - } catch (ParseException e) { 768 +//// }
753 - e.printStackTrace(); 769 +//
754 - } 770 +// if (WarplyManagerHelper.getCouponRedeemedList().size() > 0) {
755 - } else { 771 +// if (WarplyManagerHelper.getCouponsetsDeals().size() > 0) {
756 -// for (ActiveDFYCouponModel coupon : WarplyManagerHelper.getActiveDFYCoupons()) { 772 +// for (Couponset couset : WarplyManagerHelper.getCouponsetsDeals()) {
757 -// codes = codes + coupon.getCode() + ","; 773 +// for (Coupon cou : WarplyManagerHelper.getCouponRedeemedList()) {
774 +// if (cou.getCouponsetUuid().equals(couset.getUuid())) {
775 +// countValue += Float.valueOf(cou.getDiscount());
776 +// cou.setDescription(couset.getShortDescription());
777 +// cou.setImage(couset.getImgPreview());
778 +// cou.setName(couset.getName());
779 +// cou.setMerchantUuid(couset.getMerchantUuid());
780 +// cou.setInnerText(couset.getInnerText());
781 +// cou.setDiscount_type(couset.getDiscount_type());
782 +// cou.setFinal_price(couset.getFinal_price());
783 +// break;
784 +// }
785 +// }
786 +// }
758 // } 787 // }
759 -// codes = codes.substring(0, codes.length() - 1); 788 +// }
760 - 789 +//
761 - mTvActiveTitle.setText(String.format(getString(R.string.cos_active_deals_plural), String.valueOf(WarplyManagerHelper.getActiveDFYCoupons().size()))); 790 +// mFavValue += countValue;
762 - mTvActiveCode.setVisibility(View.GONE); 791 +// String badgeValue = String.format("%.02f", countValue);
763 - 792 +// mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
764 -// Collections.reverse(WarplyManagerHelper.getActiveDFYCoupons()); 793 +// if (String.valueOf(countValue).length() >= 3) {
765 - for (int i = 0; i < WarplyManagerHelper.getActiveDFYCoupons().size(); i++) { 794 +// mTvMarketValue.setTextSize(12);
766 - LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); 795 +// } else {
767 - LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_selectable, null); 796 +// mTvMarketValue.setTextSize(14);
768 - TextView textView = (TextView) v.findViewById(R.id.tv_code_copy); 797 +// }
769 - TextView textViewComma = (TextView) v.findViewById(R.id.tv_code_comma); 798 +// SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
770 - CalligraphyTypefaceSpan typefaceBoldSpanDFY = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 799 +// sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
771 - SpannableStringBuilder sBuilderDFY = new SpannableStringBuilder(WarplyManagerHelper.getActiveDFYCoupons().get(i).getCode()); 800 +// CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
772 - SpannableStringBuilder sBuilderComma = new SpannableStringBuilder(getString(R.string.cos_comma)); 801 +// sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
773 - sBuilderDFY.setSpan(typefaceBoldSpanDFY, 0, sBuilderDFY.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 802 +// mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
774 - sBuilderComma.setSpan(typefaceBoldSpanDFY, 0, sBuilderComma.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 803 +// } else {
775 - textView.setText(sBuilderDFY, TextView.BufferType.SPANNABLE); 804 +// String badgeValue = String.format("%.02f", 0.0f);
776 - textView.setTextIsSelectable(true); 805 +// mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
777 - textViewComma.setText(sBuilderComma, TextView.BufferType.SPANNABLE); 806 +// SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
778 - mLlActiveCodesView.addView(v, 0, new ViewGroup.LayoutParams( 807 +// sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
779 - ViewGroup.LayoutParams.WRAP_CONTENT, 808 +// CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
780 - ViewGroup.LayoutParams.WRAP_CONTENT)); 809 +// sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
781 - } 810 +// mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
782 - 811 +// }
783 - mScActiveCodes.setVisibility(View.VISIBLE); 812 + /** First Expandable Banner */
784 - mLlActiveCodesView.setVisibility(View.VISIBLE); 813 +
785 - } 814 + /** Sum Expandable Banner */
786 -// mTvActiveCode.setText(codes); 815 +// String allValue = String.format("%.02f", mFavValue);
787 - mLlDeals.setVisibility(View.VISIBLE); 816 +// mTvFavValue.setText(String.format(getString(R.string.cos_value), allValue));
788 - } else { 817 +// if (String.valueOf(mFavValue).length() >= 3) {
789 - mLlDeals.setVisibility(View.GONE); 818 +// mTvFavValue.setTextSize(12);
790 - } 819 +// } else {
820 +// mTvFavValue.setTextSize(14);
821 +// }
822 +// SpannableStringBuilder sBuilderExp = new SpannableStringBuilder();
823 +// sBuilderExp.append(String.format(getString(R.string.cos_for_you_all), allValue));
824 +// CalligraphyTypefaceSpan typefaceBoldExp = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
825 +// sBuilderExp.setSpan(typefaceBoldExp, 26, 27 + allValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
826 +// mTvFavValueAll.setText(sBuilderExp, TextView.BufferType.SPANNABLE);
827 +// mClExp.setVisibility(View.VISIBLE);
828 + /** Sum Expandable Banner */
829 +
830 + /** Deals Badge */
831 +// if (WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() > 0) {
832 +// String codes = "";
833 +// if (WarplyManagerHelper.getActiveDFYCoupons().size() == 1) {
834 +// codes = WarplyManagerHelper.getActiveDFYCoupons().get(0).getCode();
835 +// mTvActiveTitle.setText(String.format(getString(R.string.cos_active_deals), String.valueOf(1)));
836 +//
837 +// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
838 +// String date1 = WarplyManagerHelper.getActiveDFYCoupons().get(0).getDate();
839 +// String date2 = dateFormat.format(new Date());
840 +//
841 +// mTvActiveCode.setText(codes);
842 +//
843 +// try {
844 +// Date toDate = dateFormat.parse(date2);
845 +// Date fromDate = dateFormat.parse(date1);
846 +// long diff = TimeUnit.MILLISECONDS.toDays(fromDate.getTime() - toDate.getTime()) + 1;
847 +// mTvActiveDate.setText(String.format(getString(R.string.cos_active_coupon_date), String.valueOf(diff)));
848 +// mTvActiveDate.setVisibility(View.VISIBLE);
849 +// } catch (ParseException e) {
850 +// e.printStackTrace();
851 +// }
852 +// } else {
853 +//// for (ActiveDFYCouponModel coupon : WarplyManagerHelper.getActiveDFYCoupons()) {
854 +//// codes = codes + coupon.getCode() + ",";
855 +//// }
856 +//// codes = codes.substring(0, codes.length() - 1);
857 +//
858 +// mTvActiveTitle.setText(String.format(getString(R.string.cos_active_deals_plural), String.valueOf(WarplyManagerHelper.getActiveDFYCoupons().size())));
859 +// mTvActiveCode.setVisibility(View.GONE);
860 +//
861 +//// Collections.reverse(WarplyManagerHelper.getActiveDFYCoupons());
862 +// for (int i = 0; i < WarplyManagerHelper.getActiveDFYCoupons().size(); i++) {
863 +// LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
864 +// LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_selectable, null);
865 +// TextView textView = (TextView) v.findViewById(R.id.tv_code_copy);
866 +// TextView textViewComma = (TextView) v.findViewById(R.id.tv_code_comma);
867 +// CalligraphyTypefaceSpan typefaceBoldSpanDFY = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
868 +// SpannableStringBuilder sBuilderDFY = new SpannableStringBuilder(WarplyManagerHelper.getActiveDFYCoupons().get(i).getCode());
869 +// SpannableStringBuilder sBuilderComma = new SpannableStringBuilder(getString(R.string.cos_comma));
870 +// sBuilderDFY.setSpan(typefaceBoldSpanDFY, 0, sBuilderDFY.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
871 +// sBuilderComma.setSpan(typefaceBoldSpanDFY, 0, sBuilderComma.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
872 +// textView.setText(sBuilderDFY, TextView.BufferType.SPANNABLE);
873 +// textView.setTextIsSelectable(true);
874 +// textViewComma.setText(sBuilderComma, TextView.BufferType.SPANNABLE);
875 +// mLlActiveCodesView.addView(v, 0, new ViewGroup.LayoutParams(
876 +// ViewGroup.LayoutParams.WRAP_CONTENT,
877 +// ViewGroup.LayoutParams.WRAP_CONTENT));
878 +// }
879 +//
880 +// mScActiveCodes.setVisibility(View.VISIBLE);
881 +// mLlActiveCodesView.setVisibility(View.VISIBLE);
882 +// }
883 +//// mTvActiveCode.setText(codes);
884 +// mLlDeals.setVisibility(View.VISIBLE);
885 +// } else {
886 +// mLlDeals.setVisibility(View.GONE);
887 +// }
888 + /** Deals Badge */
889 +
890 + if (WarplyManagerHelper.getActiveDFYCoupons() != null)
891 + mTvDealsCountBadge.setText(String.valueOf(WarplyManagerHelper.getActiveDFYCoupons().size()));
892 + else
893 + mTvDealsCountBadge.setText("0");
791 894
792 if (WarplyManagerHelper.getConsumer() != null) { 895 if (WarplyManagerHelper.getConsumer() != null) {
793 mTvUsername.setText(String.format(getResources().getString(R.string.cos_profile_loyalty_name), 896 mTvUsername.setText(String.format(getResources().getString(R.string.cos_profile_loyalty_name),
...@@ -814,17 +917,23 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -814,17 +917,23 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
814 } 917 }
815 } 918 }
816 919
817 - if (mLlMarketView.getVisibility() == View.GONE 920 + /** Expandable Banner */
818 - && WarplyManagerHelper.getDealsCouponsSum() == 0 921 +// if (mLlMarketView.getVisibility() == View.GONE
819 - && (WarplyManagerHelper.getLoyaltyBadge() != null && WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0) 922 +// && WarplyManagerHelper.getDealsCouponsSum() == 0
820 - && countValue == 0) { 923 +// && (WarplyManagerHelper.getLoyaltyBadge() != null && WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)
821 - mIvExpArrow.setVisibility(View.GONE); 924 +// && countValue == 0) {
822 -// mLlEmptyWallet.setVisibility(View.VISIBLE); 925 +// mIvExpArrow.setVisibility(View.GONE);
823 - mIsStayCollapsed = true; 926 +//// mLlEmptyWallet.setVisibility(View.VISIBLE);
824 - } else { 927 +// mIsStayCollapsed = true;
825 - mIvExpArrow.setVisibility(View.VISIBLE); 928 +// } else {
826 - mIsStayCollapsed = false; 929 +// mIvExpArrow.setVisibility(View.VISIBLE);
827 - } 930 +// mIsStayCollapsed = false;
931 +// }
932 + /** Expandable Banner */
933 +
934 + /** Empty View */
935 + checkForEmpty();
936 + /** Empty View */
828 937
829 mIvBack.setOnClickListener(this); 938 mIvBack.setOnClickListener(this);
830 mLlQuestionnaire.setOnClickListener(this); 939 mLlQuestionnaire.setOnClickListener(this);
...@@ -836,6 +945,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -836,6 +945,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
836 mClExp.setOnClickListener(this); 945 mClExp.setOnClickListener(this);
837 mClMarket.setOnClickListener(this); 946 mClMarket.setOnClickListener(this);
838 mLlHistory.setOnClickListener(this); 947 mLlHistory.setOnClickListener(this);
948 + mRlDeals.setOnClickListener(this);
949 + mRlUnified.setOnClickListener(this);
950 + mRlGifts.setOnClickListener(this);
951 + mCvVouchers.setOnClickListener(this);
839 } 952 }
840 953
841 private void nonTelcoDialog() { 954 private void nonTelcoDialog() {
...@@ -852,6 +965,26 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -852,6 +965,26 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
852 } 965 }
853 } 966 }
854 967
968 + private void checkForEmpty() {
969 + if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
970 + && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
971 + && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)
972 + && (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()))) {
973 + mLlEmptyWallet.setVisibility(View.VISIBLE);
974 + //TODO: check for spinner and show it
975 + } else {
976 + mLlEmptyWallet.setVisibility(View.GONE);
977 + if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() > 0)
978 + || (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
979 + || (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() > 0)) {
980 + mLlBannerInfo.setVisibility(View.VISIBLE);
981 + }
982 + if (WarplyManagerHelper.getShowVouchersBanner().equals("true")) {
983 + mLlVouchers.setVisibility(View.VISIBLE);
984 + }
985 + }
986 + }
987 +
855 // =========================================================== 988 // ===========================================================
856 // Inner and Anonymous Classes 989 // Inner and Anonymous Classes
857 // =========================================================== 990 // ===========================================================
......
...@@ -16,6 +16,7 @@ import ly.warp.sdk.io.models.LoyaltySDKSessionExpiredEventModel; ...@@ -16,6 +16,7 @@ import ly.warp.sdk.io.models.LoyaltySDKSessionExpiredEventModel;
16 import ly.warp.sdk.io.models.QuestionnaireEventModel; 16 import ly.warp.sdk.io.models.QuestionnaireEventModel;
17 import ly.warp.sdk.io.models.RefreshUnifiedCouponsEventModel; 17 import ly.warp.sdk.io.models.RefreshUnifiedCouponsEventModel;
18 import ly.warp.sdk.io.models.UnifiedCouponsEventModel; 18 import ly.warp.sdk.io.models.UnifiedCouponsEventModel;
19 +import ly.warp.sdk.io.models.VouchersActivityEventModel;
19 import ly.warp.sdk.io.models.VouchersFetchedEventModel; 20 import ly.warp.sdk.io.models.VouchersFetchedEventModel;
20 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel; 21 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel;
21 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; 22 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
...@@ -42,6 +43,7 @@ public class WarplyEventBusManager { ...@@ -42,6 +43,7 @@ public class WarplyEventBusManager {
42 private WarplyCCMSEnabledModel ccmsActivated; 43 private WarplyCCMSEnabledModel ccmsActivated;
43 private LoyaltyGiftsForYouOfferClickEvent giftsYou; 44 private LoyaltyGiftsForYouOfferClickEvent giftsYou;
44 private QuestionnaireEventModel questionnaire; 45 private QuestionnaireEventModel questionnaire;
46 + private VouchersActivityEventModel vouchersActivity;
45 private VouchersFetchedEventModel vouchersFetched; 47 private VouchersFetchedEventModel vouchersFetched;
46 private CouponEventModel coupon; 48 private CouponEventModel coupon;
47 private ActiveDFYCouponEventModel activeCoupon; 49 private ActiveDFYCouponEventModel activeCoupon;
...@@ -76,6 +78,10 @@ public class WarplyEventBusManager { ...@@ -76,6 +78,10 @@ public class WarplyEventBusManager {
76 this.questionnaire = questionnaire; 78 this.questionnaire = questionnaire;
77 } 79 }
78 80
81 + public WarplyEventBusManager(VouchersActivityEventModel vouchersActivity) {
82 + this.vouchersActivity = vouchersActivity;
83 + }
84 +
79 public WarplyEventBusManager(VouchersFetchedEventModel vouchersFetched) { 85 public WarplyEventBusManager(VouchersFetchedEventModel vouchersFetched) {
80 this.vouchersFetched = vouchersFetched; 86 this.vouchersFetched = vouchersFetched;
81 } 87 }
...@@ -226,6 +232,10 @@ public class WarplyEventBusManager { ...@@ -226,6 +232,10 @@ public class WarplyEventBusManager {
226 return questionnaire; 232 return questionnaire;
227 } 233 }
228 234
235 + public VouchersActivityEventModel getVouchersActivity() {
236 + return vouchersActivity;
237 + }
238 +
229 public VouchersFetchedEventModel getVouchersFetched() { 239 public VouchersFetchedEventModel getVouchersFetched() {
230 return vouchersFetched; 240 return vouchersFetched;
231 } 241 }
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <corners android:radius="4dp" />
5 +
6 + <solid android:color="@color/cos_orange" />
7 +</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 + android:shape="rectangle">
4 + <corners
5 + android:radius="16dp"/>
6 +
7 + <stroke android:width="1dp" android:color="@color/cos_grey2" />
8 +
9 + <solid android:color="@color/white" />
10 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<vector android:height="21.333334dp" android:viewportHeight="12"
2 + android:viewportWidth="18" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
3 + <path android:fillColor="#212121" android:fillType="evenOdd" android:pathData="M15.426,0.719L17.4,2.728L9,11.279L0.6,2.728L2.574,0.719L9,7.246L15.426,0.719Z"/>
4 +</vector>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="52dp"
3 + android:height="30dp"
4 + android:viewportWidth="52"
5 + android:viewportHeight="30">
6 + <path
7 + android:pathData="M16.62,5.068C15.091,5.168 13.825,3.845 13.99,2.27C14.113,1.097 15.034,0.151 16.192,0.025C17.737,-0.142 19.036,1.148 18.937,2.706C18.855,3.97 17.853,4.992 16.62,5.068ZM16.595,1.164C15.74,1.081 15.017,1.809 15.108,2.68C15.173,3.325 15.683,3.853 16.316,3.912C17.17,3.995 17.894,3.267 17.803,2.396C17.746,1.759 17.228,1.231 16.595,1.164Z"
8 + android:fillColor="#0EA600"/>
9 + <path
10 + android:pathData="M31.816,5.068C30.287,5.168 29.022,3.845 29.186,2.27C29.309,1.097 30.23,0.151 31.389,0.025C32.934,-0.142 34.232,1.148 34.134,2.706C34.052,3.97 33.049,4.992 31.816,5.068ZM31.791,1.164C30.937,1.081 30.213,1.809 30.304,2.68C30.37,3.325 30.879,3.853 31.512,3.912C32.367,3.995 33.09,3.267 33,2.396C32.942,1.759 32.424,1.231 31.791,1.164Z"
11 + android:fillColor="#0EA600"/>
12 + <path
13 + android:pathData="M35.597,5.034V1.198H34.216V0.05H38.112V1.198H36.723V5.034H35.597Z"
14 + android:fillColor="#0EA600"/>
15 + <path
16 + android:pathData="M27.871,5.034L27.427,2.203L26.31,4.515H25.858L24.756,2.228L24.312,5.034H23.187L23.967,0.05H25.028L26.088,2.379L27.123,0.05H28.216L28.997,5.034H27.871Z"
17 + android:fillColor="#0EA600"/>
18 + <path
19 + android:pathData="M11.787,5.076C10.373,5.076 9.239,3.87 9.305,2.421C9.363,1.206 10.275,0.193 11.45,0.034C12.321,-0.084 13.168,0.268 13.719,0.955L13.801,1.056L12.995,1.876L12.897,1.742C12.543,1.24 11.894,1.022 11.286,1.257C10.858,1.424 10.538,1.818 10.456,2.27C10.275,3.233 11.08,4.063 12.017,3.903C12.379,3.845 12.699,3.619 12.913,3.317L12.995,3.208L13.801,4.029L13.719,4.13C13.242,4.733 12.543,5.076 11.787,5.076Z"
20 + android:fillColor="#0EA600"/>
21 + <path
22 + android:pathData="M40.684,5.076C39.279,5.076 38.136,3.87 38.202,2.421C38.259,1.206 39.172,0.193 40.347,0.034C41.218,-0.084 42.065,0.268 42.615,0.955L42.698,1.056L41.892,1.876L41.794,1.742C41.539,1.382 41.128,1.164 40.684,1.164C40.142,1.164 39.648,1.499 39.435,2.002H41.07V3.066H39.418C39.64,3.644 40.232,4.012 40.865,3.92C41.243,3.87 41.58,3.644 41.802,3.326L41.876,3.217L42.681,4.037L42.599,4.138C42.139,4.733 41.44,5.076 40.684,5.076Z"
23 + android:fillColor="#0EA600"/>
24 + <path
25 + android:pathData="M21.107,5.076C20.063,5.076 19.373,4.314 19.34,4.28L19.25,4.18L19.981,3.434L20.08,3.51C20.162,3.577 20.244,3.635 20.335,3.686C20.606,3.862 20.869,3.954 21.107,3.954C21.502,3.954 21.682,3.736 21.682,3.535C21.682,3.309 21.518,3.15 21.222,3.074L20.713,2.94C19.899,2.739 19.406,2.195 19.406,1.474C19.406,0.578 20.072,0 21.099,0C22.069,0 22.775,0.745 22.8,0.779L22.899,0.88L22.159,1.633L22.06,1.55C21.962,1.457 21.855,1.382 21.756,1.323C21.526,1.181 21.313,1.114 21.107,1.114C20.754,1.114 20.556,1.248 20.556,1.491C20.556,1.608 20.589,1.767 20.91,1.851L21.403,1.977C22.365,2.22 22.825,2.731 22.825,3.535C22.825,4.423 22.102,5.076 21.107,5.076Z"
26 + android:fillColor="#0EA600"/>
27 + <path
28 + android:pathData="M6.578,8.234H10.09C11.009,8.234 11.827,8.433 12.542,8.832C13.265,9.231 13.827,9.787 14.227,10.498C14.636,11.21 14.84,12.017 14.84,12.919C14.84,13.821 14.636,14.628 14.227,15.34C13.827,16.051 13.265,16.607 12.542,17.006C11.827,17.405 11.009,17.604 10.09,17.604H6.578V8.234ZM9.962,15.86C10.533,15.86 11.035,15.739 11.469,15.496C11.912,15.244 12.252,14.897 12.491,14.455C12.738,14.012 12.861,13.5 12.861,12.919C12.861,12.338 12.738,11.826 12.491,11.383C12.252,10.941 11.912,10.598 11.469,10.355C11.035,10.104 10.533,9.978 9.962,9.978H8.57V15.86H9.962Z"
29 + android:fillColor="#00A5E3"/>
30 + <path
31 + android:pathData="M17.427,17.683C16.891,17.683 16.491,17.574 16.227,17.357C15.972,17.132 15.844,16.776 15.844,16.29V9.548C15.844,8.62 16.333,8.156 17.313,8.156C19.211,8.156 20.939,8.182 22.497,8.234V9.913H17.81V12.177H21.756V13.921H17.81V15.925H22.625V17.604C22.182,17.622 21.42,17.639 20.339,17.656C19.266,17.674 18.296,17.683 17.427,17.683Z"
32 + android:fillColor="#00A5E3"/>
33 + <path
34 + android:pathData="M26.308,8.234H28.683L32.105,17.604H30.049L29.232,15.262H25.759L24.941,17.604H22.885L26.308,8.234ZM28.67,13.622L27.496,10.225L26.333,13.622H28.67Z"
35 + android:fillColor="#00A5E3"/>
36 + <path
37 + android:pathData="M34.11,17.683C33.685,17.683 33.331,17.578 33.05,17.37C32.778,17.162 32.642,16.802 32.642,16.29V8.234H34.634V15.913H38.491V17.604C38.159,17.622 37.571,17.639 36.728,17.656C35.885,17.674 35.013,17.683 34.11,17.683Z"
38 + android:fillColor="#00A5E3"/>
39 + <path
40 + android:pathData="M42.37,17.683C41.621,17.683 40.969,17.544 40.416,17.266C39.863,16.988 39.433,16.598 39.126,16.095C38.828,15.583 38.679,14.993 38.679,14.325H40.633C40.633,14.828 40.799,15.227 41.131,15.522C41.463,15.817 41.919,15.965 42.498,15.965C42.915,15.965 43.242,15.878 43.481,15.704C43.719,15.531 43.838,15.296 43.838,15.001C43.838,14.706 43.698,14.468 43.417,14.286C43.136,14.095 42.655,13.925 41.974,13.778C41.233,13.613 40.646,13.418 40.212,13.192C39.778,12.958 39.463,12.672 39.267,12.333C39.071,11.986 38.973,11.561 38.973,11.058C38.973,10.476 39.105,9.969 39.369,9.535C39.641,9.093 40.024,8.754 40.518,8.52C41.012,8.277 41.587,8.156 42.242,8.156C42.915,8.156 43.506,8.286 44.017,8.546C44.536,8.806 44.937,9.171 45.217,9.639C45.507,10.099 45.652,10.633 45.652,11.24H43.711C43.711,10.841 43.57,10.516 43.289,10.264C43.017,10.004 42.659,9.874 42.217,9.874C41.817,9.874 41.489,9.973 41.233,10.173C40.978,10.364 40.85,10.615 40.85,10.928C40.85,11.205 40.986,11.435 41.259,11.618C41.54,11.791 42.025,11.952 42.715,12.099C43.481,12.264 44.085,12.464 44.528,12.698C44.971,12.923 45.29,13.205 45.486,13.544C45.681,13.873 45.779,14.29 45.779,14.793C45.779,15.366 45.639,15.873 45.358,16.316C45.077,16.75 44.677,17.088 44.158,17.331C43.647,17.565 43.051,17.683 42.37,17.683Z"
41 + android:fillColor="#00A5E3"/>
42 + <path
43 + android:pathData="M0,21.866C0,20.937 0.49,20.473 1.469,20.473C3.273,20.473 4.955,20.499 6.513,20.551V22.23H1.992V24.495H5.67V26.239H1.992V29.922H0V21.866Z"
44 + android:fillColor="#00A5E3"/>
45 + <path
46 + android:pathData="M11.451,30C10.54,30 9.719,29.796 8.987,29.388C8.263,28.972 7.693,28.403 7.275,27.683C6.867,26.955 6.663,26.139 6.663,25.236C6.663,24.334 6.867,23.523 7.275,22.803C7.693,22.074 8.263,21.506 8.987,21.098C9.719,20.681 10.54,20.473 11.451,20.473C12.362,20.473 13.179,20.681 13.903,21.098C14.635,21.506 15.206,22.074 15.614,22.803C16.031,23.523 16.24,24.334 16.24,25.236C16.24,26.139 16.031,26.955 15.614,27.683C15.206,28.403 14.635,28.972 13.903,29.388C13.179,29.796 12.362,30 11.451,30ZM8.642,25.236C8.642,25.818 8.761,26.334 8.999,26.785C9.238,27.236 9.57,27.592 9.995,27.853C10.421,28.104 10.906,28.23 11.451,28.23C11.996,28.23 12.481,28.104 12.907,27.853C13.333,27.592 13.665,27.236 13.903,26.785C14.141,26.334 14.261,25.818 14.261,25.236C14.261,24.655 14.141,24.139 13.903,23.688C13.665,23.237 13.333,22.885 12.907,22.633C12.481,22.373 11.996,22.243 11.451,22.243C10.906,22.243 10.421,22.373 9.995,22.633C9.57,22.885 9.238,23.237 8.999,23.688C8.761,24.139 8.642,24.655 8.642,25.236Z"
47 + android:fillColor="#00A5E3"/>
48 + <path
49 + android:pathData="M17.247,20.551H20.759C21.78,20.551 22.589,20.82 23.185,21.358C23.789,21.887 24.091,22.616 24.091,23.545C24.091,24.048 23.998,24.49 23.811,24.872C23.623,25.254 23.338,25.545 22.955,25.744C23.406,25.987 23.717,26.308 23.887,26.707C24.058,27.098 24.143,27.584 24.143,28.165C24.143,28.764 24.083,29.349 23.964,29.922H22.15V26.72H19.213V29.922H17.247V20.551ZM20.708,25.002C21.176,25.002 21.533,24.885 21.78,24.651C22.036,24.417 22.163,24.078 22.163,23.636C22.163,23.193 22.036,22.855 21.78,22.621C21.533,22.386 21.176,22.269 20.708,22.269H19.213V25.002H20.708Z"
50 + android:fillColor="#00A5E3"/>
51 + <path
52 + android:pathData="M29.623,26.226L26.545,20.551H28.665L30.606,24.286L32.585,20.551H34.693L31.615,26.226V29.922H29.623V26.226Z"
53 + android:fillColor="#00A5E3"/>
54 + <path
55 + android:pathData="M38.862,30C37.951,30 37.129,29.796 36.397,29.388C35.673,28.972 35.103,28.403 34.686,27.683C34.277,26.955 34.073,26.139 34.073,25.236C34.073,24.334 34.277,23.523 34.686,22.803C35.103,22.074 35.673,21.506 36.397,21.098C37.129,20.681 37.951,20.473 38.862,20.473C39.773,20.473 40.59,20.681 41.313,21.098C42.046,21.506 42.616,22.074 43.025,22.803C43.442,23.523 43.65,24.334 43.65,25.236C43.65,26.139 43.442,26.955 43.025,27.683C42.616,28.403 42.046,28.972 41.313,29.388C40.59,29.796 39.773,30 38.862,30ZM36.052,25.236C36.052,25.818 36.172,26.334 36.41,26.785C36.648,27.236 36.98,27.592 37.406,27.853C37.832,28.104 38.317,28.23 38.862,28.23C39.407,28.23 39.892,28.104 40.317,27.853C40.743,27.592 41.075,27.236 41.313,26.785C41.552,26.334 41.671,25.818 41.671,25.236C41.671,24.655 41.552,24.139 41.313,23.688C41.075,23.237 40.743,22.885 40.317,22.633C39.892,22.373 39.407,22.243 38.862,22.243C38.317,22.243 37.832,22.373 37.406,22.633C36.98,22.885 36.648,23.237 36.41,23.688C36.172,24.139 36.052,24.655 36.052,25.236Z"
56 + android:fillColor="#00A5E3"/>
57 + <path
58 + android:pathData="M48.271,30C47.096,30 46.181,29.675 45.526,29.024C44.879,28.373 44.555,27.449 44.555,26.252V20.551H46.547V26.069C46.547,27.51 47.122,28.23 48.271,28.23C48.842,28.23 49.271,28.052 49.561,27.696C49.859,27.332 50.008,26.79 50.008,26.069V20.551H52V26.252C52,27.449 51.672,28.373 51.017,29.024C50.361,29.675 49.446,30 48.271,30Z"
59 + android:fillColor="#00A5E3"/>
60 +</vector>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="32dp"
3 + android:height="32dp"
4 + android:viewportWidth="32"
5 + android:viewportHeight="32">
6 + <path
7 + android:pathData="M23.437,30.397C23.483,30.397 23.52,30.36 23.52,30.314L23.518,20.797L22.092,20.814L15.673,29.083L14.246,29.083L7.827,20.814L6.4,20.797L6.4,30.314C6.4,30.36 6.437,30.396 6.483,30.396L23.437,30.397ZM7.827,28.754L7.827,20.814L14.246,29.083H8.183C7.987,29.083 7.827,28.936 7.827,28.754ZM21.736,29.083L15.673,29.083L22.092,20.814V28.753C22.092,28.936 21.932,29.083 21.736,29.083Z"
8 + android:fillColor="#00A5E3"
9 + android:fillType="evenOdd"/>
10 + <path
11 + android:pathData="M23.37,20.631L24.439,21.697C24.471,21.729 24.523,21.729 24.555,21.697L28.657,17.594C28.689,17.563 28.689,17.511 28.657,17.479L25.096,13.905C25.991,13.994 26.792,13.752 27.339,13.205C28.35,12.194 28.254,10.513 27.122,9.38C25.934,8.193 24.447,8.326 23.197,8.803C23.675,7.555 23.808,6.067 22.62,4.879C21.487,3.746 19.806,3.651 18.795,4.662C18.248,5.21 18.006,6.009 18.095,6.905L14.524,3.333C14.492,3.301 14.44,3.301 14.408,3.333L10.303,7.445C10.271,7.477 10.271,7.529 10.303,7.561L11.368,8.63L23.37,20.631ZM26.566,17.687L24.639,19.613C24.512,19.741 24.296,19.732 24.158,19.594L18.782,14.219L21.171,11.83L26.547,17.206C26.685,17.343 26.694,17.559 26.566,17.687ZM26.197,10.305C26.836,10.944 26.77,11.773 26.338,12.205C25.995,12.548 25.444,12.651 24.786,12.497C24.222,12.364 23.339,11.984 22.179,10.956C23.14,10.284 25.076,9.185 26.197,10.305ZM21.695,5.804C22.816,6.925 21.716,8.86 21.044,9.82C20.017,8.661 19.637,7.779 19.504,7.214C19.348,6.556 19.452,6.005 19.795,5.662C20.227,5.231 21.056,5.165 21.695,5.804ZM12.387,7.361L14.314,5.435C14.441,5.307 14.657,5.316 14.795,5.454L20.171,10.83L17.783,13.218L12.406,7.842C12.269,7.704 12.26,7.489 12.387,7.361Z"
12 + android:fillColor="#00A5E3"
13 + android:fillType="evenOdd"/>
14 + <path
15 + android:pathData="M14.96,25.602L14.345,25.049C12.162,23.095 10.72,21.806 10.72,20.224C10.72,18.935 11.746,17.922 13.052,17.922C13.79,17.922 14.498,18.261 14.96,18.797C15.422,18.261 16.131,17.922 16.868,17.922C18.174,17.922 19.2,18.935 19.2,20.224C19.2,21.806 17.759,23.095 15.575,25.054L14.96,25.602Z"
16 + android:fillColor="#00A5E3"
17 + android:fillType="evenOdd"/>
18 +</vector>
1 +<vector android:height="32dp" android:viewportHeight="16"
2 + android:viewportWidth="16" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
3 + <path android:fillColor="#0EA600" android:fillType="evenOdd" android:pathData="M0.227,6.932H1.81C2.307,3.381 5.277,0.641 8.864,0.641C12.799,0.641 16,3.934 16,7.98C16,12.027 12.799,15.32 8.864,15.32C6.652,15.32 4.602,14.29 3.238,12.495L4.041,11.85C5.21,13.389 6.968,14.271 8.864,14.271C12.237,14.271 14.981,11.449 14.981,7.98C14.981,4.511 12.237,1.689 8.864,1.689C5.84,1.689 3.328,3.961 2.84,6.932H4.25C4.309,6.932 4.366,6.955 4.408,6.996C4.498,7.083 4.5,7.227 4.412,7.317L2.238,9.553L0.064,7.317C0.023,7.274 0,7.218 0,7.159C0,7.033 0.102,6.932 0.227,6.932ZM7.831,8.336L7.832,5.336C7.833,5.223 7.924,5.132 8.036,5.132H8.545L8.545,5.132C8.657,5.132 8.748,5.223 8.748,5.336L8.747,8.147L10.761,10.16H10.761C10.841,10.24 10.841,10.369 10.761,10.448L10.402,10.808C10.322,10.887 10.193,10.887 10.113,10.808L7.965,8.66C7.879,8.574 7.831,8.458 7.831,8.336Z"/>
4 +</vector>
1 +<vector android:height="34.133335dp" android:viewportHeight="16"
2 + android:viewportWidth="15" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
3 + <path android:fillColor="#0EA600" android:fillType="evenOdd" android:pathData="M8.722,6.775V1.028C8.722,0.827 8.562,0.664 8.382,0.664H6.617C6.43,0.664 6.278,0.815 6.278,1.028V6.775H0.53C0.329,6.775 0.167,6.936 0.167,7.115V8.88C0.167,9.067 0.318,9.22 0.53,9.22H6.278V14.967C6.278,15.168 6.438,15.331 6.617,15.331H8.382C8.57,15.331 8.722,15.18 8.722,14.967V9.22H14.469C14.67,9.22 14.833,9.059 14.833,8.88V7.115C14.833,6.927 14.682,6.775 14.469,6.775H8.722Z"/>
4 +</vector>
1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:width="32dp"
3 + android:height="32dp"
4 + android:viewportWidth="32"
5 + android:viewportHeight="32">
6 + <path
7 + android:pathData="M8.939,21.363H9.957L27.313,21.363C27.732,21.363 28.101,21.105 28.221,20.729L31.961,8.984C32.046,8.716 31.991,8.425 31.812,8.201C31.633,7.976 31.351,7.844 31.052,7.844L6.924,7.844L5.649,3.837C5.529,3.461 5.159,3.203 4.74,3.203L0.948,3.203C0.425,3.203 0,3.6 0,4.09C0,4.58 0.425,4.977 0.948,4.977H4.033L5.303,8.965C5.307,8.978 5.311,8.991 5.315,9.004L8.688,19.598C6.763,19.719 5.236,21.222 5.236,23.053C5.236,24.963 6.897,26.517 8.939,26.517H9.88C10.291,27.836 11.595,28.803 13.136,28.803C14.677,28.803 15.981,27.836 16.392,26.517H21.422C21.834,27.836 23.137,28.803 24.678,28.803C26.22,28.803 27.523,27.836 27.934,26.517H29.156C29.679,26.517 30.104,26.12 30.104,25.63C30.104,25.14 29.679,24.743 29.156,24.743H27.934C27.523,23.424 26.22,22.457 24.678,22.457C23.137,22.457 21.833,23.424 21.422,24.743H16.392C15.981,23.424 14.677,22.457 13.136,22.457C11.595,22.457 10.291,23.424 9.88,24.743H8.939C7.942,24.743 7.132,23.985 7.132,23.053C7.132,22.121 7.943,21.363 8.939,21.363ZM22.847,9.618H29.781L28.476,13.716H22.847V9.618ZM22.847,15.49H27.911L26.606,19.589H22.847L22.847,15.49ZM15.832,9.618L20.951,9.618V13.716H15.832L15.832,9.618ZM15.832,15.49H20.951L20.951,19.589H15.832V15.49ZM13.936,19.589H10.664L9.359,15.49H13.936V19.589ZM7.489,9.618L13.936,9.618L13.936,13.716H8.794L7.489,9.618ZM24.64,24.003C25.522,24.003 26.24,24.721 26.24,25.603C26.24,26.485 25.522,27.203 24.64,27.203C23.758,27.203 23.04,26.485 23.04,25.603C23.04,24.721 23.758,24.003 24.64,24.003ZM13.12,24.003C14.002,24.003 14.72,24.721 14.72,25.603C14.72,26.485 14.002,27.203 13.12,27.203C12.238,27.203 11.52,26.485 11.52,25.603C11.52,24.721 12.238,24.003 13.12,24.003Z"
8 + android:fillColor="#00A5E3"
9 + android:fillType="evenOdd"/>
10 +</vector>
1 +<vector android:height="28.8dp" android:viewportHeight="18"
2 + android:viewportWidth="20" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
3 + <path android:fillColor="@color/cos_skyblue6" android:fillType="evenOdd" android:pathData="M18.329,0C19.247,0.004 19.99,0.776 19.993,1.729C19.993,2.262 19.998,2.685 20,3.027L20,3.401C19.994,4.193 19.938,4.449 19.654,4.841C20.067,5.408 19.993,5.609 19.993,7.953C19.99,8.328 19.871,8.692 19.654,8.991C19.871,9.29 19.99,9.653 19.993,10.028C19.993,10.561 19.998,10.984 20,11.326L20,11.7C19.994,12.492 19.938,12.748 19.654,13.14C20.067,13.707 19.993,13.908 19.993,16.252C19.993,17.207 19.248,17.981 18.329,17.981C18.182,17.981 18.037,17.981 17.896,17.981L17.077,17.983C15.373,17.986 14.111,17.997 13.165,18L12.38,18C10.856,17.995 10.447,17.944 10.151,17.74L10.085,17.69C10.063,17.672 10.041,17.654 10.019,17.634L9.952,17.572L9.881,17.504C6.902,18.658 3.546,17.683 1.576,15.091C-0.395,12.498 -0.53,8.881 1.242,6.138C3.013,3.395 6.286,2.153 9.342,3.064V1.729C9.342,0.774 10.087,0 11.006,0H18.329ZM7.345,4.15C4.036,4.15 1.354,6.936 1.354,10.374C1.354,12.025 1.985,13.608 3.109,14.775C4.232,15.942 5.756,16.598 7.345,16.598C10.654,16.598 13.336,13.811 13.336,10.374C13.336,6.936 10.654,4.15 7.345,4.15ZM18.329,13.832H13.862C13.314,14.935 12.517,15.884 11.539,16.598H18.329C18.511,16.594 18.658,16.442 18.662,16.252V14.177C18.658,13.988 18.511,13.835 18.329,13.832ZM18.329,9.682H14.668C14.745,10.615 14.648,11.554 14.382,12.448H18.329C18.511,12.445 18.658,12.292 18.662,12.103V10.028C18.658,9.839 18.511,9.686 18.329,9.682ZM18.316,5.533H12.99C13.633,6.345 14.107,7.287 14.382,8.299H18.329C18.511,8.295 18.658,8.143 18.662,7.953V5.878C18.66,5.785 18.623,5.696 18.558,5.631C18.493,5.566 18.406,5.531 18.316,5.533ZM18.329,1.383H11.006C10.824,1.387 10.677,1.54 10.674,1.729V3.603C11.959,4.29 10.352,4.166 17.101,4.151L17.901,4.15L18.329,4.15C18.511,4.146 18.658,3.993 18.662,3.804C18.662,1.75 18.768,1.383 18.329,1.383Z"/>
4 + <path android:fillColor="@color/cos_skyblue6" android:pathData="M7.934,14C6.983,14 6.172,13.767 5.501,13.3C4.829,12.834 4.358,12.219 4.086,11.454H3V10.361H3.849C3.841,10.281 3.837,10.16 3.837,10C3.837,9.847 3.841,9.734 3.849,9.661H3V8.568H4.075C4.347,7.796 4.818,7.177 5.489,6.71C6.161,6.237 6.972,6 7.922,6C8.601,6 9.201,6.109 9.721,6.328C10.242,6.539 10.664,6.842 10.989,7.235L9.891,8.372C9.65,8.058 9.348,7.825 8.986,7.672C8.631,7.519 8.254,7.443 7.854,7.443C7.417,7.443 7.025,7.545 6.678,7.749C6.338,7.945 6.07,8.219 5.874,8.568H8.612V9.661H5.535C5.527,9.734 5.523,9.847 5.523,10C5.523,10.08 5.531,10.2 5.546,10.361H8.612V11.454H5.885C6.089,11.803 6.361,12.076 6.7,12.273C7.04,12.463 7.428,12.557 7.866,12.557C8.265,12.557 8.643,12.481 8.997,12.328C9.359,12.175 9.661,11.942 9.902,11.628L11,12.765C10.676,13.158 10.253,13.465 9.733,13.683C9.212,13.894 8.612,14 7.934,14Z"/>
5 +</vector>
...@@ -61,11 +61,14 @@ ...@@ -61,11 +61,14 @@
61 fontPath="fonts/PeridotPE-Regular.ttf" 61 fontPath="fonts/PeridotPE-Regular.ttf"
62 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
63 android:layout_height="wrap_content" 63 android:layout_height="wrap_content"
64 - android:layout_centerInParent="true" 64 + android:layout_centerHorizontal="true"
65 - android:layout_gravity="center" 65 + android:layout_marginTop="24dp"
66 + android:layout_marginHorizontal="24dp"
67 + android:gravity="center"
66 android:text="@string/cos_no_active_coupons" 68 android:text="@string/cos_no_active_coupons"
67 android:textColor="@color/cos_light_black" 69 android:textColor="@color/cos_light_black"
68 android:textSize="16sp" 70 android:textSize="16sp"
71 + android:lineHeight="24dp"
69 android:visibility="gone" /> 72 android:visibility="gone" />
70 </RelativeLayout> 73 </RelativeLayout>
71 </LinearLayout> 74 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -61,9 +61,12 @@ ...@@ -61,9 +61,12 @@
61 fontPath="fonts/PeridotPE-Regular.ttf" 61 fontPath="fonts/PeridotPE-Regular.ttf"
62 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
63 android:layout_height="wrap_content" 63 android:layout_height="wrap_content"
64 - android:layout_centerInParent="true" 64 + android:layout_centerHorizontal="true"
65 - android:layout_gravity="center" 65 + android:layout_marginTop="24dp"
66 - android:text="@string/cos_no_active_coupons" 66 + android:layout_marginHorizontal="24dp"
67 + android:gravity="center"
68 + android:lineHeight="24dp"
69 + android:text="@string/cos_no_active_unified_coupons"
67 android:textColor="@color/cos_light_black" 70 android:textColor="@color/cos_light_black"
68 android:textSize="16sp" 71 android:textSize="16sp"
69 android:visibility="gone" /> 72 android:visibility="gone" />
......
...@@ -64,31 +64,31 @@ ...@@ -64,31 +64,31 @@
64 android:layout_height="74dp" 64 android:layout_height="74dp"
65 android:padding="1dp" 65 android:padding="1dp"
66 android:src="@drawable/ic_default_photo" 66 android:src="@drawable/ic_default_photo"
67 + app:layout_constraintBottom_toBottomOf="parent"
68 + app:layout_constraintStart_toStartOf="parent"
69 + app:layout_constraintTop_toTopOf="parent"
67 app:shapeAppearanceOverlay="@style/ShapeAppearanceProfileImage" 70 app:shapeAppearanceOverlay="@style/ShapeAppearanceProfileImage"
68 app:strokeColor="@color/cos_grey2" 71 app:strokeColor="@color/cos_grey2"
69 - app:strokeWidth="1dp" 72 + app:strokeWidth="1dp" />
70 - app:layout_constraintTop_toTopOf="parent"
71 - app:layout_constraintBottom_toBottomOf="parent"
72 - app:layout_constraintStart_toStartOf="parent"/>
73 73
74 <LinearLayout 74 <LinearLayout
75 android:layout_width="0dp" 75 android:layout_width="0dp"
76 android:layout_height="0dp" 76 android:layout_height="0dp"
77 android:layout_marginStart="8dp" 77 android:layout_marginStart="8dp"
78 - app:layout_constraintTop_toTopOf="@+id/iv_profile_photo" 78 + android:orientation="vertical"
79 app:layout_constraintBottom_toBottomOf="@+id/iv_profile_photo" 79 app:layout_constraintBottom_toBottomOf="@+id/iv_profile_photo"
80 - app:layout_constraintStart_toEndOf="@+id/iv_profile_photo"
81 app:layout_constraintEnd_toEndOf="parent" 80 app:layout_constraintEnd_toEndOf="parent"
82 - android:orientation="vertical"> 81 + app:layout_constraintStart_toEndOf="@+id/iv_profile_photo"
82 + app:layout_constraintTop_toTopOf="@+id/iv_profile_photo">
83 83
84 <TextView 84 <TextView
85 android:id="@+id/tv_profile_name" 85 android:id="@+id/tv_profile_name"
86 - fontPath="fonts/PeridotPE-Bold.ttf" 86 + fontPath="fonts/PeridotPE-SemiBold.ttf"
87 android:layout_width="wrap_content" 87 android:layout_width="wrap_content"
88 android:layout_height="wrap_content" 88 android:layout_height="wrap_content"
89 - android:maxLines="1"
90 - android:includeFontPadding="false"
91 android:layout_marginBottom="4dp" 89 android:layout_marginBottom="4dp"
90 + android:includeFontPadding="false"
91 + android:maxLines="1"
92 android:textColor="@color/cos_light_black" 92 android:textColor="@color/cos_light_black"
93 android:textSize="22sp" 93 android:textSize="22sp"
94 tools:text="Test Name" /> 94 tools:text="Test Name" />
...@@ -128,6 +128,12 @@ ...@@ -128,6 +128,12 @@
128 android:visibility="gone" 128 android:visibility="gone"
129 tools:visibility="visible"> 129 tools:visibility="visible">
130 130
131 + <ImageView
132 + android:layout_width="16dp"
133 + android:layout_height="16dp"
134 + android:layout_marginEnd="4dp"
135 + android:src="@drawable/sv_plus_sign_green" />
136 +
131 <TextView 137 <TextView
132 android:id="@+id/tv_questionnaire" 138 android:id="@+id/tv_questionnaire"
133 fontPath="fonts/PeridotPE-Bold.ttf" 139 fontPath="fonts/PeridotPE-Bold.ttf"
...@@ -143,11 +149,15 @@ ...@@ -143,11 +149,15 @@
143 android:id="@+id/ll_loyalty_history" 149 android:id="@+id/ll_loyalty_history"
144 android:layout_width="52dp" 150 android:layout_width="52dp"
145 android:layout_height="42dp" 151 android:layout_height="42dp"
152 + android:layout_marginStart="4dp"
146 android:background="@drawable/selector_button_green_border" 153 android:background="@drawable/selector_button_green_border"
147 android:gravity="center" 154 android:gravity="center"
148 - android:layout_marginStart="4dp"
149 android:orientation="vertical"> 155 android:orientation="vertical">
150 156
157 + <ImageView
158 + android:layout_width="16dp"
159 + android:layout_height="16dp"
160 + android:src="@drawable/sv_history" />
151 </LinearLayout> 161 </LinearLayout>
152 </LinearLayout> 162 </LinearLayout>
153 </LinearLayout> 163 </LinearLayout>
...@@ -164,6 +174,408 @@ ...@@ -164,6 +174,408 @@
164 android:gravity="center_horizontal" 174 android:gravity="center_horizontal"
165 android:orientation="vertical"> 175 android:orientation="vertical">
166 176
177 + <LinearLayout
178 + android:id="@+id/ll_banner_info_new"
179 + android:layout_width="match_parent"
180 + android:layout_height="wrap_content"
181 + android:layout_marginHorizontal="14dp"
182 + android:layout_marginTop="16dp"
183 + android:orientation="vertical"
184 + android:visibility="gone"
185 + tools:visibility="visible">
186 +
187 + <TextView
188 + android:id="@+id/tv_coupons_header"
189 + fontPath="fonts/PeridotPE-SemiBold.ttf"
190 + android:layout_width="wrap_content"
191 + android:layout_height="wrap_content"
192 + android:includeFontPadding="false"
193 + android:maxLines="1"
194 + android:text="@string/cos_coupons_loyalty_title"
195 + android:textColor="@color/cos_light_black"
196 + android:textSize="22sp" />
197 +
198 + <androidx.constraintlayout.widget.ConstraintLayout
199 + android:layout_width="match_parent"
200 + android:layout_height="wrap_content"
201 + android:layout_marginTop="20dp">
202 +
203 + <RelativeLayout
204 + android:id="@+id/rv_deals_count"
205 + android:layout_width="0dp"
206 + android:layout_height="104dp"
207 + app:layout_constraintBottom_toBottomOf="parent"
208 + app:layout_constraintEnd_toStartOf="@+id/rv_sm_count"
209 + app:layout_constraintStart_toStartOf="parent"
210 + app:layout_constraintTop_toTopOf="parent">
211 +
212 + <androidx.cardview.widget.CardView
213 + android:id="@+id/cv_deals_count"
214 + android:layout_width="match_parent"
215 + android:layout_height="match_parent"
216 + android:layout_marginHorizontal="2dp"
217 + android:layout_marginVertical="2dp"
218 + app:cardCornerRadius="16dp"
219 + app:cardElevation="2dp">
220 +
221 + <androidx.constraintlayout.widget.ConstraintLayout
222 + android:layout_width="match_parent"
223 + android:layout_height="match_parent"
224 + android:background="@color/cos_green_tr">
225 +
226 + <ImageView
227 + android:id="@+id/iv_deals_logo_count"
228 + android:layout_width="52dp"
229 + android:layout_height="32dp"
230 + android:src="@drawable/sv_deals_logo_redesign"
231 + app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"
232 + app:layout_constraintEnd_toEndOf="parent"
233 + app:layout_constraintStart_toStartOf="parent"
234 + app:layout_constraintTop_toTopOf="parent" />
235 +
236 + <View
237 + android:id="@+id/v_separator_deals_count"
238 + android:layout_width="match_parent"
239 + android:layout_height="1dp"
240 + android:layout_marginHorizontal="8dp"
241 + android:background="@color/cos_grey2"
242 + app:layout_constraintBottom_toBottomOf="parent"
243 + app:layout_constraintEnd_toEndOf="parent"
244 + app:layout_constraintStart_toStartOf="parent"
245 + app:layout_constraintTop_toTopOf="parent" />
246 +
247 + <TextView
248 + android:id="@+id/tv_deals_count_title"
249 + fontPath="fonts/PeridotPE-SemiBold.ttf"
250 + android:layout_width="0dp"
251 + android:layout_height="wrap_content"
252 + android:layout_marginHorizontal="8dp"
253 + android:gravity="center"
254 + android:includeFontPadding="false"
255 + android:text="@string/cos_deals_title2"
256 + android:textColor="@color/cos_light_black"
257 + android:textSize="12sp"
258 + app:layout_constraintBottom_toBottomOf="parent"
259 + app:layout_constraintEnd_toEndOf="parent"
260 + app:layout_constraintStart_toStartOf="parent"
261 + app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />
262 + </androidx.constraintlayout.widget.ConstraintLayout>
263 + </androidx.cardview.widget.CardView>
264 +
265 + <LinearLayout
266 + android:layout_width="16dp"
267 + android:layout_height="16dp"
268 + android:layout_alignParentEnd="true"
269 + android:layout_marginTop="1dp"
270 + android:layout_marginEnd="1dp"
271 + android:background="@drawable/shape_cos_counter_orange"
272 + android:gravity="center"
273 + android:orientation="vertical"
274 + android:translationZ="2dp"
275 + app:layout_constraintEnd_toEndOf="parent"
276 + app:layout_constraintTop_toTopOf="parent">
277 +
278 + <TextView
279 + android:id="@+id/tv_deals_count"
280 + fontPath="fonts/PeridotPE-SemiBold.ttf"
281 + android:layout_width="wrap_content"
282 + android:layout_height="16dp"
283 + android:includeFontPadding="false"
284 + android:maxLines="1"
285 + android:textColor="@color/cos_light_black"
286 + android:textSize="12sp"
287 + tools:text="6" />
288 + </LinearLayout>
289 + </RelativeLayout>
290 +
291 + <RelativeLayout
292 + android:id="@+id/rv_sm_count"
293 + android:layout_width="0dp"
294 + android:layout_height="104dp"
295 + android:layout_marginHorizontal="12dp"
296 + app:layout_constraintBottom_toBottomOf="parent"
297 + app:layout_constraintEnd_toStartOf="@+id/rv_gifts_count"
298 + app:layout_constraintStart_toEndOf="@+id/rv_deals_count"
299 + app:layout_constraintTop_toTopOf="parent">
300 +
301 + <androidx.cardview.widget.CardView
302 + android:id="@+id/cv_sm_count"
303 + android:layout_width="match_parent"
304 + android:layout_height="match_parent"
305 + android:layout_marginHorizontal="2dp"
306 + android:layout_marginVertical="2dp"
307 + app:cardCornerRadius="16dp"
308 + app:cardElevation="2dp">
309 +
310 + <androidx.constraintlayout.widget.ConstraintLayout
311 + android:layout_width="match_parent"
312 + android:layout_height="match_parent"
313 + android:background="@color/cos_creme">
314 +
315 + <ImageView
316 + android:id="@+id/iv_sm_logo_count"
317 + android:layout_width="32dp"
318 + android:layout_height="32dp"
319 + android:src="@drawable/sv_unified_redesign"
320 + app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"
321 + app:layout_constraintEnd_toEndOf="parent"
322 + app:layout_constraintStart_toStartOf="parent"
323 + app:layout_constraintTop_toTopOf="parent" />
324 +
325 + <View
326 + android:id="@+id/v_separator_sm_count"
327 + android:layout_width="match_parent"
328 + android:layout_height="1dp"
329 + android:layout_marginHorizontal="8dp"
330 + android:background="@color/cos_grey2"
331 + app:layout_constraintBottom_toBottomOf="parent"
332 + app:layout_constraintEnd_toEndOf="parent"
333 + app:layout_constraintStart_toStartOf="parent"
334 + app:layout_constraintTop_toTopOf="parent" />
335 +
336 + <TextView
337 + android:id="@+id/tv_sm_count_title"
338 + fontPath="fonts/PeridotPE-SemiBold.ttf"
339 + android:layout_width="0dp"
340 + android:layout_height="wrap_content"
341 + android:layout_marginHorizontal="8dp"
342 + android:gravity="center"
343 + android:includeFontPadding="false"
344 + android:text="@string/cos_market_title"
345 + android:textColor="@color/cos_light_black"
346 + android:textSize="12sp"
347 + app:layout_constraintBottom_toBottomOf="parent"
348 + app:layout_constraintEnd_toEndOf="parent"
349 + app:layout_constraintStart_toStartOf="parent"
350 + app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />
351 + </androidx.constraintlayout.widget.ConstraintLayout>
352 + </androidx.cardview.widget.CardView>
353 +
354 + <LinearLayout
355 + android:layout_width="16dp"
356 + android:layout_height="16dp"
357 + android:layout_alignParentEnd="true"
358 + android:layout_marginTop="1dp"
359 + android:layout_marginEnd="1dp"
360 + android:background="@drawable/shape_cos_counter_orange"
361 + android:gravity="center"
362 + android:orientation="vertical"
363 + android:translationZ="2dp"
364 + app:layout_constraintEnd_toEndOf="parent"
365 + app:layout_constraintTop_toTopOf="parent">
366 +
367 + <TextView
368 + android:id="@+id/tv_sm_count"
369 + fontPath="fonts/PeridotPE-SemiBold.ttf"
370 + android:layout_width="wrap_content"
371 + android:layout_height="16dp"
372 + android:includeFontPadding="false"
373 + android:maxLines="1"
374 + android:textColor="@color/cos_light_black"
375 + android:textSize="12sp"
376 + tools:text="6" />
377 + </LinearLayout>
378 + </RelativeLayout>
379 +
380 + <RelativeLayout
381 + android:id="@+id/rv_gifts_count"
382 + android:layout_width="0dp"
383 + android:layout_height="104dp"
384 + app:layout_constraintBottom_toBottomOf="parent"
385 + app:layout_constraintEnd_toEndOf="parent"
386 + app:layout_constraintStart_toEndOf="@+id/rv_sm_count"
387 + app:layout_constraintTop_toTopOf="parent">
388 +
389 + <androidx.cardview.widget.CardView
390 + android:id="@+id/cv_gifts_count"
391 + android:layout_width="match_parent"
392 + android:layout_height="match_parent"
393 + android:layout_marginHorizontal="2dp"
394 + android:layout_marginVertical="2dp"
395 + app:cardCornerRadius="16dp"
396 + app:cardElevation="2dp">
397 +
398 + <androidx.constraintlayout.widget.ConstraintLayout
399 + android:layout_width="match_parent"
400 + android:layout_height="match_parent"
401 + android:background="@color/cos_skyblue5">
402 +
403 + <ImageView
404 + android:id="@+id/iv_gifts_logo_count"
405 + android:layout_width="34dp"
406 + android:layout_height="34dp"
407 + android:src="@drawable/sv_gifts_redesign"
408 + app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"
409 + app:layout_constraintEnd_toEndOf="parent"
410 + app:layout_constraintStart_toStartOf="parent"
411 + app:layout_constraintTop_toTopOf="parent" />
412 +
413 + <View
414 + android:id="@+id/v_separator_gifts_count"
415 + android:layout_width="match_parent"
416 + android:layout_height="1dp"
417 + android:layout_marginHorizontal="8dp"
418 + android:background="@color/cos_grey2"
419 + app:layout_constraintBottom_toBottomOf="parent"
420 + app:layout_constraintEnd_toEndOf="parent"
421 + app:layout_constraintStart_toStartOf="parent"
422 + app:layout_constraintTop_toTopOf="parent" />
423 +
424 + <TextView
425 + android:id="@+id/tv_gifts_count_title"
426 + fontPath="fonts/PeridotPE-SemiBold.ttf"
427 + android:layout_width="0dp"
428 + android:layout_height="wrap_content"
429 + android:layout_marginHorizontal="8dp"
430 + android:gravity="center"
431 + android:includeFontPadding="false"
432 + android:text="@string/cos_gifts_title"
433 + android:textColor="@color/cos_light_black"
434 + android:textSize="12sp"
435 + app:layout_constraintBottom_toBottomOf="parent"
436 + app:layout_constraintEnd_toEndOf="parent"
437 + app:layout_constraintStart_toStartOf="parent"
438 + app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />
439 + </androidx.constraintlayout.widget.ConstraintLayout>
440 + </androidx.cardview.widget.CardView>
441 +
442 + <LinearLayout
443 + android:layout_width="16dp"
444 + android:layout_height="16dp"
445 + android:layout_alignParentEnd="true"
446 + android:layout_marginTop="1dp"
447 + android:layout_marginEnd="1dp"
448 + android:background="@drawable/shape_cos_counter_orange"
449 + android:gravity="center"
450 + android:orientation="vertical"
451 + android:translationZ="2dp"
452 + app:layout_constraintEnd_toEndOf="parent"
453 + app:layout_constraintTop_toTopOf="parent">
454 +
455 + <TextView
456 + android:id="@+id/tv_gifts_count"
457 + fontPath="fonts/PeridotPE-SemiBold.ttf"
458 + android:layout_width="wrap_content"
459 + android:layout_height="16dp"
460 + android:includeFontPadding="false"
461 + android:maxLines="1"
462 + android:textColor="@color/cos_light_black"
463 + android:textSize="12sp"
464 + tools:text="6" />
465 + </LinearLayout>
466 + </RelativeLayout>
467 + </androidx.constraintlayout.widget.ConstraintLayout>
468 +
469 + <LinearLayout
470 + android:id="@+id/ll_vouchers"
471 + android:layout_width="match_parent"
472 + android:layout_height="wrap_content"
473 + android:layout_marginTop="32dp"
474 + android:orientation="vertical"
475 + android:visibility="gone"
476 + tools:visibility="visible">
477 +
478 + <View
479 + android:id="@+id/v_separator_vouchers"
480 + android:layout_width="match_parent"
481 + android:layout_height="1dp"
482 + android:background="@color/cos_gray" />
483 +
484 + <TextView
485 + fontPath="fonts/PeridotPE-SemiBold.ttf"
486 + android:layout_width="wrap_content"
487 + android:layout_height="wrap_content"
488 + android:layout_marginTop="24dp"
489 + android:includeFontPadding="false"
490 + android:maxLines="1"
491 + android:text="@string/cos_vouchers_title"
492 + android:textColor="@color/cos_light_black"
493 + android:textSize="22sp" />
494 +
495 + <androidx.cardview.widget.CardView
496 + android:id="@+id/cv_vouchers"
497 + android:layout_width="match_parent"
498 + android:layout_height="70dp"
499 + android:layout_marginHorizontal="2dp"
500 + android:layout_marginTop="24dp"
501 + android:layout_marginBottom="4dp"
502 + app:cardCornerRadius="16dp"
503 + app:cardElevation="2dp">
504 +
505 + <androidx.constraintlayout.widget.ConstraintLayout
506 + android:layout_width="match_parent"
507 + android:layout_height="match_parent"
508 + android:background="@color/white">
509 +
510 + <ImageView
511 + android:id="@+id/iv_vouchers_logo"
512 + android:layout_width="32dp"
513 + android:layout_height="30dp"
514 + android:layout_marginStart="16dp"
515 + android:src="@drawable/sv_vouchers"
516 + app:layout_constraintBottom_toBottomOf="parent"
517 + app:layout_constraintStart_toStartOf="parent"
518 + app:layout_constraintTop_toTopOf="parent" />
519 +
520 + <TextView
521 + android:id="@+id/tv_vouchers_info_title"
522 + fontPath="fonts/PeridotPE-Regular.ttf"
523 + android:layout_width="wrap_content"
524 + android:layout_height="wrap_content"
525 + android:layout_marginHorizontal="8dp"
526 + android:includeFontPadding="false"
527 + android:lineHeight="24dp"
528 + android:text="@string/cos_vouchers_info_title"
529 + android:textColor="@color/cos_light_black"
530 + android:textSize="14sp"
531 + app:layout_constraintBottom_toBottomOf="@+id/iv_vouchers_logo"
532 + app:layout_constraintEnd_toStartOf="@+id/iv_vouchers_arrow"
533 + app:layout_constraintHorizontal_bias="0.0"
534 + app:layout_constraintStart_toEndOf="@+id/iv_vouchers_logo"
535 + app:layout_constraintTop_toTopOf="@+id/iv_vouchers_logo" />
536 +
537 + <ImageView
538 + android:id="@+id/iv_vouchers_arrow"
539 + android:layout_width="16dp"
540 + android:layout_height="10dp"
541 + android:layout_marginEnd="16dp"
542 + android:rotation="270"
543 + android:src="@drawable/sv_arrow_down"
544 + app:layout_constraintBottom_toBottomOf="parent"
545 + app:layout_constraintEnd_toEndOf="parent"
546 + app:layout_constraintTop_toTopOf="parent" />
547 + </androidx.constraintlayout.widget.ConstraintLayout>
548 + </androidx.cardview.widget.CardView>
549 + </LinearLayout>
550 + </LinearLayout>
551 +
552 + <LinearLayout
553 + android:id="@+id/ll_empty_wallet"
554 + android:layout_width="match_parent"
555 + android:layout_height="wrap_content"
556 + android:layout_marginHorizontal="32dp"
557 + android:layout_marginTop="32dp"
558 + android:gravity="center"
559 + android:orientation="vertical"
560 + android:visibility="gone"
561 + tools:visibility="gone">
562 +
563 + <ImageView
564 + android:layout_width="72dp"
565 + android:layout_height="72dp"
566 + android:src="@drawable/ic_empty_wallet" />
567 +
568 + <TextView
569 + fontPath="fonts/PeridotPE-Regular.ttf"
570 + android:layout_width="wrap_content"
571 + android:layout_height="wrap_content"
572 + android:layout_marginTop="8dp"
573 + android:gravity="center"
574 + android:text="@string/cos_empty_wallet"
575 + android:textColor="@color/cos_light_black"
576 + android:textSize="16sp" />
577 + </LinearLayout>
578 +
167 <androidx.cardview.widget.CardView 579 <androidx.cardview.widget.CardView
168 android:id="@+id/cl_exp" 580 android:id="@+id/cl_exp"
169 android:layout_width="match_parent" 581 android:layout_width="match_parent"
...@@ -173,7 +585,7 @@ ...@@ -173,7 +585,7 @@
173 android:visibility="gone" 585 android:visibility="gone"
174 app:cardCornerRadius="16dp" 586 app:cardCornerRadius="16dp"
175 app:cardElevation="2dp" 587 app:cardElevation="2dp"
176 - tools:visibility="visible"> 588 + tools:visibility="gone">
177 589
178 <androidx.constraintlayout.widget.ConstraintLayout 590 <androidx.constraintlayout.widget.ConstraintLayout
179 android:layout_width="match_parent" 591 android:layout_width="match_parent"
...@@ -452,7 +864,7 @@ ...@@ -452,7 +864,7 @@
452 android:layout_marginTop="20dp" 864 android:layout_marginTop="20dp"
453 android:orientation="vertical" 865 android:orientation="vertical"
454 android:visibility="gone" 866 android:visibility="gone"
455 - tools:visibility="visible"> 867 + tools:visibility="gone">
456 868
457 <TextView 869 <TextView
458 android:id="@+id/tv_market_header" 870 android:id="@+id/tv_market_header"
...@@ -482,7 +894,7 @@ ...@@ -482,7 +894,7 @@
482 android:layout_marginTop="24dp" 894 android:layout_marginTop="24dp"
483 android:orientation="vertical" 895 android:orientation="vertical"
484 android:visibility="gone" 896 android:visibility="gone"
485 - tools:visibility="visible"> 897 + tools:visibility="gone">
486 898
487 <ImageView 899 <ImageView
488 android:id="@+id/dfy_logo" 900 android:id="@+id/dfy_logo"
...@@ -589,7 +1001,7 @@ ...@@ -589,7 +1001,7 @@
589 android:layout_marginTop="24dp" 1001 android:layout_marginTop="24dp"
590 android:orientation="vertical" 1002 android:orientation="vertical"
591 android:visibility="gone" 1003 android:visibility="gone"
592 - tools:visibility="visible"> 1004 + tools:visibility="gone">
593 1005
594 <TextView 1006 <TextView
595 android:id="@+id/tv_active_coupons_header" 1007 android:id="@+id/tv_active_coupons_header"
...@@ -611,32 +1023,6 @@ ...@@ -611,32 +1023,6 @@
611 android:overScrollMode="never" 1023 android:overScrollMode="never"
612 android:paddingBottom="40dp" 1024 android:paddingBottom="40dp"
613 android:scrollbars="none" /> 1025 android:scrollbars="none" />
614 -
615 - <LinearLayout
616 - android:id="@+id/ll_empty_wallet"
617 - android:layout_width="match_parent"
618 - android:layout_height="wrap_content"
619 - android:layout_marginHorizontal="32dp"
620 - android:layout_marginTop="24dp"
621 - android:gravity="center"
622 - android:orientation="vertical"
623 - android:visibility="gone">
624 -
625 - <ImageView
626 - android:layout_width="72dp"
627 - android:layout_height="72dp"
628 - android:src="@drawable/ic_empty_wallet" />
629 -
630 - <TextView
631 - fontPath="fonts/PeridotPE-Regular.ttf"
632 - android:layout_width="wrap_content"
633 - android:layout_height="wrap_content"
634 - android:layout_marginTop="8dp"
635 - android:gravity="center"
636 - android:text="@string/cos_empty_wallet"
637 - android:textColor="@color/cos_light_black"
638 - android:textSize="16sp" />
639 - </LinearLayout>
640 </LinearLayout> 1026 </LinearLayout>
641 </LinearLayout> 1027 </LinearLayout>
642 </RelativeLayout> 1028 </RelativeLayout>
......
...@@ -75,4 +75,9 @@ ...@@ -75,4 +75,9 @@
75 <color name="cos_blue6">#004B87</color> 75 <color name="cos_blue6">#004B87</color>
76 <color name="cos_skyblue4">#B8E0EF</color> 76 <color name="cos_skyblue4">#B8E0EF</color>
77 <color name="cos_grey_line_tr">#40A9A9A9</color> 77 <color name="cos_grey_line_tr">#40A9A9A9</color>
78 + <color name="cos_green_tr">#0D76BF73</color>
79 + <color name="cos_orange">#EABF68</color>
80 + <color name="cos_creme">#FEFCF7</color>
81 + <color name="cos_skyblue5">#F4F8FB</color>
82 + <color name="cos_skyblue6">#0099CC</color>
78 </resources> 83 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
15 <string name="cos_profile_reward">My Loyalty\nWallet</string> 15 <string name="cos_profile_reward">My Loyalty\nWallet</string>
16 <string name="cos_profile_title">My Rewards</string> 16 <string name="cos_profile_title">My Rewards</string>
17 <string name="cos_deals_title">Deals for You</string> 17 <string name="cos_deals_title">Deals for You</string>
18 + <string name="cos_deals_title2">DEALS FOR YOU</string>
18 <string name="cos_profile_more">Δες περισσότερα</string> 19 <string name="cos_profile_more">Δες περισσότερα</string>
19 <string name="cos_gifts_title">GIFTS FOR YOU</string> 20 <string name="cos_gifts_title">GIFTS FOR YOU</string>
20 <string name="cos_more_title">MORE FOR YOU</string> 21 <string name="cos_more_title">MORE FOR YOU</string>
...@@ -63,7 +64,8 @@ ...@@ -63,7 +64,8 @@
63 <string name="cos_profile_questionnaire">Ερωτηματολόγιο</string> 64 <string name="cos_profile_questionnaire">Ερωτηματολόγιο</string>
64 <string name="cos_active_all_coupons">Ενεργά κουπόνια</string> 65 <string name="cos_active_all_coupons">Ενεργά κουπόνια</string>
65 <string name="cos_active_all_rewards">Όλα τα δώρα μου</string> 66 <string name="cos_active_all_rewards">Όλα τα δώρα μου</string>
66 - <string name="cos_no_active_coupons">Δεν υπάρχουν κουπόνια</string> 67 + <string name="cos_no_active_coupons">Αυτήν τη στιγμή δεν έχεις κάποιο ενεργό κουπόνι. Στην ενότητα FOR YOU μπορείς να βρεις κουπόνια αποκλειστικά για σένα!</string>
68 + <string name="cos_no_active_unified_coupons">Αυτήν τη στιγμή δεν έχεις κάποιο ενεργό κουπόνι. Στην ενότητα FOR YOU μπορείς να βρεις κουπόνια αποκλειστικά για σένα!</string>
67 <string name="cos_no_active_rewards">Δεν υπάρχουν δώρα</string> 69 <string name="cos_no_active_rewards">Δεν υπάρχουν δώρα</string>
68 <string name="cos_past_all_coupons">Παλαιότερα κουπόνια</string> 70 <string name="cos_past_all_coupons">Παλαιότερα κουπόνια</string>
69 <string name="cos_coupon_expired_date">Εξαργυρώθηκε την %1$s</string> 71 <string name="cos_coupon_expired_date">Εξαργυρώθηκε την %1$s</string>
...@@ -92,7 +94,7 @@ ...@@ -92,7 +94,7 @@
92 <string name="cos_dlg_reject_text">Το δώρο θα επιστραφεί και δεν θα μπορεί να ενεργοποιηθεί ξανά.</string> 94 <string name="cos_dlg_reject_text">Το δώρο θα επιστραφεί και δεν θα μπορεί να ενεργοποιηθεί ξανά.</string>
93 <string name="cos_dlg_return_text">Έλαβες πίσω το δώρο σου, κουπόνι αξίας 100€ για τα Intersport</string> 95 <string name="cos_dlg_return_text">Έλαβες πίσω το δώρο σου, κουπόνι αξίας 100€ για τα Intersport</string>
94 <string name="cos_dlg_negative_button2">Άκυρο</string> 96 <string name="cos_dlg_negative_button2">Άκυρο</string>
95 - <string name="cos_profile_preferences">+Προτιμήσεις</string> 97 + <string name="cos_profile_preferences">Προτιμήσεις</string>
96 <string name="cos_shops">Δες τα καταστήματα</string> 98 <string name="cos_shops">Δες τα καταστήματα</string>
97 <string name="cos_website">Δες το eshop</string> 99 <string name="cos_website">Δες το eshop</string>
98 <string name="cos_coupon_shops_title">Καταστήματα</string> 100 <string name="cos_coupon_shops_title">Καταστήματα</string>
...@@ -198,6 +200,8 @@ ...@@ -198,6 +200,8 @@
198 <string name="cos_dlg_cancel_unified_coupon_success_subtitle2">Είσαι σίγουρος ότι θέλεις να ακυρώσεις το κουπόνι σου;</string> 200 <string name="cos_dlg_cancel_unified_coupon_success_subtitle2">Είσαι σίγουρος ότι θέλεις να ακυρώσεις το κουπόνι σου;</string>
199 <string name="cos_dlg_negative_button4">Όχι</string> 201 <string name="cos_dlg_negative_button4">Όχι</string>
200 <string name="cos_dlg_positive_button3">Ναι</string> 202 <string name="cos_dlg_positive_button3">Ναι</string>
203 + <string name="cos_vouchers_title">Υπόλοιπο επιδότησης</string>
204 + <string name="cos_vouchers_info_title">Ενημερώσου για το υπόλοιπο επιδότησης</string>
201 205
202 <string-array name="coupons_array"> 206 <string-array name="coupons_array">
203 <item>Κουπόνια</item> 207 <item>Κουπόνια</item>
......