open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
ace8843c 1 parent 4ca9f1fb

my rewards fragment ui changes

Inline Side-by-side
Showing 9 changed files with 291 additions and 129 deletions
...@@ -10,6 +10,7 @@ import android.text.TextUtils; ...@@ -10,6 +10,7 @@ import android.text.TextUtils;
10 import android.view.LayoutInflater; 10 import android.view.LayoutInflater;
11 import android.view.View; 11 import android.view.View;
12 import android.view.ViewGroup; 12 import android.view.ViewGroup;
13 +import android.widget.ImageView;
13 import android.widget.LinearLayout; 14 import android.widget.LinearLayout;
14 import android.widget.RelativeLayout; 15 import android.widget.RelativeLayout;
15 import android.widget.TextView; 16 import android.widget.TextView;
...@@ -52,14 +53,15 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -52,14 +53,15 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
52 // Fields 53 // Fields
53 // =========================================================== 54 // ===========================================================
54 55
55 - private TextView mTvUserBadge, 56 + private TextView mTvUserBadge, mTvUserBadgeCentered,
56 mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge, 57 mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge,
57 mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle; 58 mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle;
58 - private ConstraintLayout mLlHistory, 59 + private ConstraintLayout mLlQuestionnaireCentered,
59 - mLlQuestionnaire, mLlUserBadge; 60 + mLlQuestionnaire, mLlUserBadge, mLlUserBadgeCentered;
60 private LinearLayout mLlEmptyWallet, 61 private LinearLayout mLlEmptyWallet,
61 mLlBannerInfo, mLlVouchers, mLlVouchersSpinner, 62 mLlBannerInfo, mLlVouchers, mLlVouchersSpinner,
62 mLlVouchersDisabled; 63 mLlVouchersDisabled;
64 + private ImageView mIvHistory;
63 private AlertDialog mAlertDialogNonTelco, mAlertDialogVouchersService; 65 private AlertDialog mAlertDialogNonTelco, mAlertDialogVouchersService;
64 private int mTimer = 0; 66 private int mTimer = 0;
65 private Handler mSecondsHandler; 67 private Handler mSecondsHandler;
...@@ -91,10 +93,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -91,10 +93,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
91 mSecondsHandler = new Handler(); 93 mSecondsHandler = new Handler();
92 94
93 mLlQuestionnaire = view.findViewById(R.id.ll_user_questionnaire); 95 mLlQuestionnaire = view.findViewById(R.id.ll_user_questionnaire);
96 + mLlQuestionnaireCentered = view.findViewById(R.id.ll_user_questionnaire_centered);
94 mLlUserBadge = view.findViewById(R.id.ll_user_badge); 97 mLlUserBadge = view.findViewById(R.id.ll_user_badge);
95 mTvUserBadge = view.findViewById(R.id.tv_type); 98 mTvUserBadge = view.findViewById(R.id.tv_type);
99 + mLlUserBadgeCentered = view.findViewById(R.id.ll_user_badge_centered);
100 + mTvUserBadgeCentered = view.findViewById(R.id.tv_type_centered);
96 mLlEmptyWallet = view.findViewById(R.id.ll_empty_wallet); 101 mLlEmptyWallet = view.findViewById(R.id.ll_empty_wallet);
97 - mLlHistory = view.findViewById(R.id.ll_loyalty_history); 102 + mIvHistory = view.findViewById(R.id.iv_loyalty_history);
98 mTvDealsCountBadge = view.findViewById(R.id.tv_deals_count); 103 mTvDealsCountBadge = view.findViewById(R.id.tv_deals_count);
99 mTvUnifiedCountBadge = view.findViewById(R.id.tv_sm_count); 104 mTvUnifiedCountBadge = view.findViewById(R.id.tv_sm_count);
100 mTvGiftsCountBadge = view.findViewById(R.id.tv_gifts_count); 105 mTvGiftsCountBadge = view.findViewById(R.id.tv_gifts_count);
...@@ -172,7 +177,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -172,7 +177,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
172 177
173 @Override 178 @Override
174 public void onClick(View view) { 179 public void onClick(View view) {
175 - if (view.getId() == R.id.ll_user_questionnaire || view.getId() == R.id.ll_user_badge) { 180 + if (view.getId() == R.id.ll_user_questionnaire
181 + || view.getId() == R.id.ll_user_badge
182 + || view.getId() == R.id.ll_user_badge_centered
183 + || view.getId() == R.id.ll_user_questionnaire_centered) {
176 if (!WarplyManagerHelper.noInternetDialog(getContext(), true)) { 184 if (!WarplyManagerHelper.noInternetDialog(getContext(), true)) {
177 if (getActivity() != null && !getActivity().isFinishing()) { 185 if (getActivity() != null && !getActivity().isFinishing()) {
178 WarplyManagerHelper.noInternetDialog(getActivity()); 186 WarplyManagerHelper.noInternetDialog(getActivity());
...@@ -281,7 +289,23 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -281,7 +289,23 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
281 return; 289 return;
282 } 290 }
283 /** New History */ 291 /** New History */
284 - if (view.getId() == R.id.ll_loyalty_history) { 292 +// if (view.getId() == R.id.ll_loyalty_history) {
293 +// if (!mHistoryBadgePressed) {
294 +// WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
295 +// .concat(":")
296 +// .concat("LoyaltyHistoryBadge"));
297 +//
298 +// LoyaltySDKFirebaseEventModel analyticsEvent = new LoyaltySDKFirebaseEventModel();
299 +// analyticsEvent.setEventName("did_tap_history_badge");
300 +// analyticsEvent.setParameter("screen", "Loyalty Wallet");
301 +// EventBus.getDefault().post(new WarplyEventBusManager(analyticsEvent));
302 +//
303 +// Intent intent = new Intent(getContext(), LoyaltyHistoryActivity.class);
304 +// startActivity(intent);
305 +// }
306 +// return;
307 +// }
308 + if (view.getId() == R.id.iv_loyalty_history) {
285 if (!mHistoryBadgePressed) { 309 if (!mHistoryBadgePressed) {
286 WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen") 310 WarplyAnalyticsManager.logTrackersEvent(getContext(), "click", ("LoyaltyWalletScreen")
287 .concat(":") 311 .concat(":")
...@@ -337,17 +361,36 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -337,17 +361,36 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
337 // super.onActivityResult(requestCode, resultCode, data); 361 // super.onActivityResult(requestCode, resultCode, data);
338 if (requestCode == 1000) { 362 if (requestCode == 1000) {
339 if (resultCode == RESULT_OK) { 363 if (resultCode == RESULT_OK) {
364 + if (mLlEmptyWallet.getVisibility() == View.VISIBLE) {
365 + if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
366 + mTvUserBadgeCentered.setText(WarplyManagerHelper.getUserTag(getContext()));
367 + mLlQuestionnaire.setVisibility(View.GONE);
368 + mLlQuestionnaireCentered.setVisibility(View.GONE);
369 + mLlUserBadge.setVisibility(View.GONE);
370 + mLlUserBadgeCentered.setVisibility(View.VISIBLE);
371 + } else {
372 + mLlUserBadge.setVisibility(View.GONE);
373 + mLlUserBadgeCentered.setVisibility(View.GONE);
374 + mLlQuestionnaire.setVisibility(View.GONE);
375 + mLlQuestionnaireCentered.setVisibility(View.VISIBLE);
376 + }
377 + } else {
340 if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) { 378 if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
341 mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext())); 379 mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
342 mLlQuestionnaire.setVisibility(View.GONE); 380 mLlQuestionnaire.setVisibility(View.GONE);
381 + mLlQuestionnaireCentered.setVisibility(View.GONE);
382 + mLlUserBadgeCentered.setVisibility(View.GONE);
343 mLlUserBadge.setVisibility(View.VISIBLE); 383 mLlUserBadge.setVisibility(View.VISIBLE);
344 } else { 384 } else {
345 mLlUserBadge.setVisibility(View.GONE); 385 mLlUserBadge.setVisibility(View.GONE);
386 + mLlUserBadgeCentered.setVisibility(View.GONE);
387 + mLlQuestionnaireCentered.setVisibility(View.GONE);
346 mLlQuestionnaire.setVisibility(View.VISIBLE); 388 mLlQuestionnaire.setVisibility(View.VISIBLE);
347 } 389 }
348 } 390 }
349 } 391 }
350 } 392 }
393 + }
351 394
352 @Subscribe() 395 @Subscribe()
353 public void onMessageEvent(WarplyEventBusManager event) { 396 public void onMessageEvent(WarplyEventBusManager event) {
...@@ -370,7 +413,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -370,7 +413,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
370 mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size())); 413 mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size()));
371 else 414 else
372 mTvUnifiedCountBadge.setText("0"); 415 mTvUnifiedCountBadge.setText("0");
373 - checkHistoryEmpty(); 416 +// checkHistoryEmpty();
374 checkForEmpty(); 417 checkForEmpty();
375 }); 418 });
376 return; 419 return;
...@@ -382,7 +425,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -382,7 +425,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
382 mTvGiftsCountBadge.setText(String.valueOf(WarplyManagerHelper.getCouponList().size())); 425 mTvGiftsCountBadge.setText(String.valueOf(WarplyManagerHelper.getCouponList().size()));
383 else 426 else
384 mTvGiftsCountBadge.setText("0"); 427 mTvGiftsCountBadge.setText("0");
385 - checkHistoryEmpty(); 428 +// checkHistoryEmpty();
386 checkForEmpty(); 429 checkForEmpty();
387 }); 430 });
388 } 431 }
...@@ -418,28 +461,62 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -418,28 +461,62 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
418 mTvDealsCountBadge.setText("0"); 461 mTvDealsCountBadge.setText("0");
419 /** Deals Badge */ 462 /** Deals Badge */
420 463
464 +// if (WarplyManagerHelper.getConsumer() != null) {
465 +// if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
466 +// mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
467 +// mLlQuestionnaire.setVisibility(View.GONE);
468 +// mLlUserBadge.setVisibility(View.VISIBLE);
469 +// } else {
470 +// mLlUserBadge.setVisibility(View.GONE);
471 +// mLlQuestionnaire.setVisibility(View.VISIBLE);
472 +// }
473 +// }
474 +
475 + /** History View */
476 +// checkHistoryEmpty();
477 + /** History View */
478 +
479 + /** Empty View */
480 + checkForEmpty();
481 + /** Empty View */
482 +
483 + if (mLlEmptyWallet.getVisibility() == View.VISIBLE) {
484 + if (WarplyManagerHelper.getConsumer() != null) {
485 + if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
486 + mTvUserBadgeCentered.setText(WarplyManagerHelper.getUserTag(getContext()));
487 + mLlQuestionnaire.setVisibility(View.GONE);
488 + mLlQuestionnaireCentered.setVisibility(View.GONE);
489 + mLlUserBadge.setVisibility(View.GONE);
490 + mLlUserBadgeCentered.setVisibility(View.VISIBLE);
491 + } else {
492 + mLlUserBadge.setVisibility(View.GONE);
493 + mLlUserBadgeCentered.setVisibility(View.GONE);
494 + mLlQuestionnaire.setVisibility(View.GONE);
495 + mLlQuestionnaireCentered.setVisibility(View.VISIBLE);
496 + }
497 + }
498 + } else {
421 if (WarplyManagerHelper.getConsumer() != null) { 499 if (WarplyManagerHelper.getConsumer() != null) {
422 if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) { 500 if (!TextUtils.isEmpty(WarplyManagerHelper.getUserTag(getContext()))) {
423 mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext())); 501 mTvUserBadge.setText(WarplyManagerHelper.getUserTag(getContext()));
424 mLlQuestionnaire.setVisibility(View.GONE); 502 mLlQuestionnaire.setVisibility(View.GONE);
503 + mLlQuestionnaireCentered.setVisibility(View.GONE);
504 + mLlUserBadgeCentered.setVisibility(View.GONE);
425 mLlUserBadge.setVisibility(View.VISIBLE); 505 mLlUserBadge.setVisibility(View.VISIBLE);
426 } else { 506 } else {
427 mLlUserBadge.setVisibility(View.GONE); 507 mLlUserBadge.setVisibility(View.GONE);
508 + mLlUserBadgeCentered.setVisibility(View.GONE);
509 + mLlQuestionnaireCentered.setVisibility(View.GONE);
428 mLlQuestionnaire.setVisibility(View.VISIBLE); 510 mLlQuestionnaire.setVisibility(View.VISIBLE);
429 } 511 }
430 } 512 }
431 - 513 + }
432 - /** History View */
433 - checkHistoryEmpty();
434 - /** History View */
435 -
436 - /** Empty View */
437 - checkForEmpty();
438 - /** Empty View */
439 514
440 mLlQuestionnaire.setOnClickListener(this); 515 mLlQuestionnaire.setOnClickListener(this);
516 + mLlQuestionnaireCentered.setOnClickListener(this);
441 mLlUserBadge.setOnClickListener(this); 517 mLlUserBadge.setOnClickListener(this);
442 - mLlHistory.setOnClickListener(this); 518 + mLlUserBadgeCentered.setOnClickListener(this);
519 + mIvHistory.setOnClickListener(this);
443 mRlDeals.setOnClickListener(this); 520 mRlDeals.setOnClickListener(this);
444 mRlUnified.setOnClickListener(this); 521 mRlUnified.setOnClickListener(this);
445 mRlGifts.setOnClickListener(this); 522 mRlGifts.setOnClickListener(this);
...@@ -484,7 +561,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -484,7 +561,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
484 mLlVouchersSpinner.setVisibility(View.GONE); 561 mLlVouchersSpinner.setVisibility(View.GONE);
485 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 562 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
486 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 563 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
487 - && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 564 + && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)
565 + && checkHistoryEmpty()) {
488 /** Hide all and show empty view */ 566 /** Hide all and show empty view */
489 mLlVouchers.setVisibility(View.GONE); 567 mLlVouchers.setVisibility(View.GONE);
490 // mLlVouchersSpinner.setVisibility(View.GONE); 568 // mLlVouchersSpinner.setVisibility(View.GONE);
...@@ -512,7 +590,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -512,7 +590,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
512 mLlVouchersDisabled.setVisibility(View.GONE); 590 mLlVouchersDisabled.setVisibility(View.GONE);
513 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 591 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
514 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 592 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
515 - && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 593 + && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)
594 + && checkHistoryEmpty()) {
516 /** Hide loyalty banners and hide separator */ 595 /** Hide loyalty banners and hide separator */
517 mLlBannerInfo.setVisibility(View.GONE); 596 mLlBannerInfo.setVisibility(View.GONE);
518 } else { 597 } else {
...@@ -534,7 +613,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -534,7 +613,8 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
534 mLlVouchersDisabled.setVisibility(View.VISIBLE); 613 mLlVouchersDisabled.setVisibility(View.VISIBLE);
535 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 614 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
536 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 615 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
537 - && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 616 + && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)
617 + && checkHistoryEmpty()) {
538 /** Hide loyalty banners and hide empty view and hide disabled separator */ 618 /** Hide loyalty banners and hide empty view and hide disabled separator */
539 mLlBannerInfo.setVisibility(View.GONE); 619 mLlBannerInfo.setVisibility(View.GONE);
540 mLlEmptyWallet.setVisibility(View.GONE); 620 mLlEmptyWallet.setVisibility(View.GONE);
...@@ -546,7 +626,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -546,7 +626,7 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
546 } 626 }
547 } 627 }
548 628
549 - private void checkHistoryEmpty() { 629 + private boolean checkHistoryEmpty() {
550 mIsDealsEmpty = WarplyManagerHelper.getDealsCouponsSum() == 0; 630 mIsDealsEmpty = WarplyManagerHelper.getDealsCouponsSum() == 0;
551 631
552 if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) { 632 if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
...@@ -574,11 +654,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -574,11 +654,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
574 mIsCouponsEmpty = WarplyManagerHelper.getLoyaltyBadge().getValue() == 0; 654 mIsCouponsEmpty = WarplyManagerHelper.getLoyaltyBadge().getValue() == 0;
575 } 655 }
576 656
577 - if (mIsDealsEmpty && mIsMarketsEmpty && mIsCouponsEmpty) { 657 +// if (mIsDealsEmpty && mIsMarketsEmpty && mIsCouponsEmpty) {
578 - mLlHistory.setVisibility(View.GONE); 658 +// mLlHistory.setVisibility(View.GONE);
579 - } else { 659 +// } else {
580 - mLlHistory.setVisibility(View.VISIBLE); 660 +// mLlHistory.setVisibility(View.VISIBLE);
581 - } 661 +// }
662 +
663 + return (mIsDealsEmpty && mIsMarketsEmpty && mIsCouponsEmpty);
582 } 664 }
583 665
584 // =========================================================== 666 // ===========================================================
......
...@@ -3,8 +3,6 @@ package ly.warp.sdk.services; ...@@ -3,8 +3,6 @@ package ly.warp.sdk.services;
3 import android.content.Context; 3 import android.content.Context;
4 4
5 import androidx.annotation.NonNull; 5 import androidx.annotation.NonNull;
6 -import androidx.work.OneTimeWorkRequest;
7 -import androidx.work.WorkManager;
8 import androidx.work.Worker; 6 import androidx.work.Worker;
9 import androidx.work.WorkerParameters; 7 import androidx.work.WorkerParameters;
10 8
...@@ -12,17 +10,11 @@ import org.greenrobot.eventbus.EventBus; ...@@ -12,17 +10,11 @@ import org.greenrobot.eventbus.EventBus;
12 10
13 import java.util.ArrayList; 11 import java.util.ArrayList;
14 12
15 -import ly.warp.sdk.Warply;
16 -import ly.warp.sdk.activities.CouponsetInfoActivity;
17 import ly.warp.sdk.io.callbacks.CallbackReceiver; 13 import ly.warp.sdk.io.callbacks.CallbackReceiver;
18 import ly.warp.sdk.io.models.Campaign; 14 import ly.warp.sdk.io.models.Campaign;
19 -import ly.warp.sdk.io.models.CampaignList;
20 import ly.warp.sdk.io.models.CouponList; 15 import ly.warp.sdk.io.models.CouponList;
21 -import ly.warp.sdk.io.models.CouponsEventModel;
22 import ly.warp.sdk.io.models.LoyaltyEventModel; 16 import ly.warp.sdk.io.models.LoyaltyEventModel;
23 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; 17 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
24 -import ly.warp.sdk.io.request.WarplyGetCampaignsRequest;
25 -import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
26 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 18 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
27 import ly.warp.sdk.utils.managers.WarplyManager; 19 import ly.warp.sdk.utils.managers.WarplyManager;
28 20
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="1dp" android:color="@color/cos_green12" />
5 + <corners android:radius="12dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <solid android:color="@color/white"/>
4 + <stroke android:width="1dp" android:color="@color/cos_green6_tr" />
5 + <corners android:radius="12dp" />
6 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item android:drawable="@drawable/round_border_green3_tr" android:state_pressed="true" />
4 + <item android:drawable="@drawable/round_border_green3" android:state_pressed="false" />
5 +</selector>
...\ No newline at end of file ...\ No newline at end of file
...@@ -85,9 +85,10 @@ ...@@ -85,9 +85,10 @@
85 85
86 <LinearLayout 86 <LinearLayout
87 android:id="@+id/ll_get_gift" 87 android:id="@+id/ll_get_gift"
88 - android:layout_width="140dp" 88 + android:layout_width="match_parent"
89 android:layout_height="45dp" 89 android:layout_height="45dp"
90 android:layout_marginTop="27dp" 90 android:layout_marginTop="27dp"
91 + android:layout_marginHorizontal="12dp"
91 android:background="@drawable/selector_button_green" 92 android:background="@drawable/selector_button_green"
92 android:gravity="center" 93 android:gravity="center"
93 android:orientation="horizontal"> 94 android:orientation="horizontal">
...@@ -98,7 +99,7 @@ ...@@ -98,7 +99,7 @@
98 android:layout_height="wrap_content" 99 android:layout_height="wrap_content"
99 android:gravity="center" 100 android:gravity="center"
100 android:includeFontPadding="false" 101 android:includeFontPadding="false"
101 - android:text="@string/cos_redeem_coupon" 102 + android:text="@string/cos_redeem_coupon2"
102 android:textColor="@color/white" 103 android:textColor="@color/white"
103 android:textSize="16sp" /> 104 android:textSize="16sp" />
104 </LinearLayout> 105 </LinearLayout>
......
...@@ -22,17 +22,34 @@ ...@@ -22,17 +22,34 @@
22 android:visibility="gone" 22 android:visibility="gone"
23 tools:visibility="visible"> 23 tools:visibility="visible">
24 24
25 + <LinearLayout
26 + android:layout_width="match_parent"
27 + android:layout_height="wrap_content"
28 + android:orientation="horizontal"
29 + android:weightSum="1">
30 +
25 <TextView 31 <TextView
26 android:id="@+id/tv_coupons_header" 32 android:id="@+id/tv_coupons_header"
27 fontPath="fonts/BTCosmo-Bold.ttf" 33 fontPath="fonts/BTCosmo-Bold.ttf"
28 android:layout_width="wrap_content" 34 android:layout_width="wrap_content"
29 android:layout_height="wrap_content" 35 android:layout_height="wrap_content"
36 + android:layout_weight="1"
30 android:includeFontPadding="false" 37 android:includeFontPadding="false"
31 android:maxLines="1" 38 android:maxLines="1"
32 android:text="@string/cos_coupons_header" 39 android:text="@string/cos_coupons_header"
33 android:textColor="@color/cos_light_black" 40 android:textColor="@color/cos_light_black"
34 android:textSize="20sp" /> 41 android:textSize="20sp" />
35 42
43 + <ImageView
44 + android:id="@+id/iv_loyalty_history"
45 + android:layout_width="24dp"
46 + android:layout_height="24dp"
47 + android:src="@drawable/ic_history_black"
48 + app:layout_constraintBottom_toBottomOf="parent"
49 + app:layout_constraintStart_toStartOf="parent"
50 + app:layout_constraintTop_toTopOf="parent" />
51 + </LinearLayout>
52 +
36 <androidx.constraintlayout.widget.ConstraintLayout 53 <androidx.constraintlayout.widget.ConstraintLayout
37 android:layout_width="match_parent" 54 android:layout_width="match_parent"
38 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
...@@ -305,135 +322,214 @@ ...@@ -305,135 +322,214 @@
305 </androidx.constraintlayout.widget.ConstraintLayout> 322 </androidx.constraintlayout.widget.ConstraintLayout>
306 </LinearLayout> 323 </LinearLayout>
307 324
325 + <LinearLayout
326 + android:id="@+id/ll_empty_wallet"
327 + android:layout_width="match_parent"
328 + android:layout_height="wrap_content"
329 + android:layout_marginHorizontal="32dp"
330 + android:layout_marginTop="32dp"
331 + android:layout_marginBottom="12dp"
332 + android:gravity="center"
333 + android:orientation="vertical"
334 + android:visibility="gone"
335 + tools:visibility="gone">
336 +
337 + <ImageView
338 + android:layout_width="64dp"
339 + android:layout_height="64dp"
340 + android:src="@drawable/ic_empty_wallet" />
341 +
342 + <TextView
343 + fontPath="fonts/PeridotPE-Regular.ttf"
344 + android:layout_width="wrap_content"
345 + android:layout_height="wrap_content"
346 + android:layout_marginTop="8dp"
347 + android:gravity="center"
348 + android:text="@string/cos_empty_wallet"
349 + android:textColor="@color/cos_light_black"
350 + android:textSize="14sp" />
351 + </LinearLayout>
352 +
308 <androidx.constraintlayout.widget.ConstraintLayout 353 <androidx.constraintlayout.widget.ConstraintLayout
309 android:id="@+id/ll_user_badge" 354 android:id="@+id/ll_user_badge"
310 - android:layout_width="match_parent" 355 + android:layout_width="wrap_content"
311 - android:layout_height="56dp" 356 + android:layout_height="40dp"
357 + android:layout_gravity="start"
312 android:layout_marginHorizontal="14dp" 358 android:layout_marginHorizontal="14dp"
313 android:layout_marginTop="20dp" 359 android:layout_marginTop="20dp"
314 - android:background="@drawable/selector_button_grey_border" 360 + android:background="@drawable/selector_button_green_border2"
361 + android:elevation="1dp"
315 android:gravity="center" 362 android:gravity="center"
316 android:paddingHorizontal="16dp" 363 android:paddingHorizontal="16dp"
317 - android:elevation="1dp"
318 android:visibility="gone" 364 android:visibility="gone"
319 - tools:visibility="visible"> 365 + tools:visibility="gone">
320 366
321 <TextView 367 <TextView
322 android:id="@+id/tv_type" 368 android:id="@+id/tv_type"
323 - fontPath="fonts/PeridotPE-Regular.ttf" 369 + fontPath="fonts/PeridotPE-Bold.ttf"
324 - android:layout_width="0dp" 370 + android:layout_width="wrap_content"
325 android:layout_height="wrap_content" 371 android:layout_height="wrap_content"
326 - android:layout_marginEnd="16dp"
327 android:includeFontPadding="false" 372 android:includeFontPadding="false"
328 - android:textColor="@color/cos_light_black" 373 + android:textColor="@color/cos_green12"
329 android:textSize="16sp" 374 android:textSize="16sp"
330 app:layout_constraintBottom_toBottomOf="parent" 375 app:layout_constraintBottom_toBottomOf="parent"
331 - app:layout_constraintEnd_toStartOf="@+id/iv_right_questionnaire_answered" 376 + app:layout_constraintEnd_toEndOf="parent"
332 app:layout_constraintStart_toStartOf="parent" 377 app:layout_constraintStart_toStartOf="parent"
333 app:layout_constraintTop_toTopOf="parent" 378 app:layout_constraintTop_toTopOf="parent"
334 tools:text="@string/cos_profile_preferences_placeholder" /> 379 tools:text="@string/cos_profile_preferences_placeholder" />
380 + </androidx.constraintlayout.widget.ConstraintLayout>
335 381
336 - <ImageView 382 + <androidx.constraintlayout.widget.ConstraintLayout
337 - android:id="@+id/iv_right_questionnaire_answered" 383 + android:id="@+id/ll_user_badge_centered"
338 - android:layout_width="16dp" 384 + android:layout_width="wrap_content"
339 - android:layout_height="16dp" 385 + android:layout_height="40dp"
340 - android:src="@drawable/ic_right_black" 386 + android:layout_gravity="center_horizontal"
387 + android:layout_marginHorizontal="14dp"
388 + android:layout_marginTop="20dp"
389 + android:background="@drawable/selector_button_green_border2"
390 + android:elevation="1dp"
391 + android:gravity="center"
392 + android:paddingHorizontal="16dp"
393 + android:visibility="gone"
394 + tools:visibility="gone">
395 +
396 + <TextView
397 + android:id="@+id/tv_type_centered"
398 + fontPath="fonts/PeridotPE-Bold.ttf"
399 + android:layout_width="wrap_content"
400 + android:layout_height="wrap_content"
401 + android:includeFontPadding="false"
402 + android:textColor="@color/cos_green12"
403 + android:textSize="16sp"
341 app:layout_constraintBottom_toBottomOf="parent" 404 app:layout_constraintBottom_toBottomOf="parent"
342 app:layout_constraintEnd_toEndOf="parent" 405 app:layout_constraintEnd_toEndOf="parent"
343 - app:layout_constraintTop_toTopOf="parent" /> 406 + app:layout_constraintStart_toStartOf="parent"
407 + app:layout_constraintTop_toTopOf="parent"
408 + tools:text="@string/cos_profile_preferences_placeholder" />
344 </androidx.constraintlayout.widget.ConstraintLayout> 409 </androidx.constraintlayout.widget.ConstraintLayout>
345 410
346 <androidx.constraintlayout.widget.ConstraintLayout 411 <androidx.constraintlayout.widget.ConstraintLayout
347 android:id="@+id/ll_user_questionnaire" 412 android:id="@+id/ll_user_questionnaire"
348 - android:layout_width="match_parent" 413 + android:layout_width="wrap_content"
349 - android:layout_height="56dp" 414 + android:layout_height="40dp"
415 + android:layout_gravity="start"
350 android:layout_marginHorizontal="14dp" 416 android:layout_marginHorizontal="14dp"
351 android:layout_marginTop="20dp" 417 android:layout_marginTop="20dp"
352 - android:background="@drawable/selector_button_grey_border" 418 + android:background="@drawable/selector_button_green_border2"
419 + android:elevation="1dp"
353 android:gravity="center" 420 android:gravity="center"
354 android:paddingHorizontal="16dp" 421 android:paddingHorizontal="16dp"
355 android:visibility="gone" 422 android:visibility="gone"
356 - android:elevation="1dp" 423 + tools:visibility="gone">
357 - tools:visibility="visible">
358 424
359 <ImageView 425 <ImageView
360 android:id="@+id/iv_plus_questionnaire" 426 android:id="@+id/iv_plus_questionnaire"
361 android:layout_width="20dp" 427 android:layout_width="20dp"
362 android:layout_height="20dp" 428 android:layout_height="20dp"
363 - android:src="@drawable/ic_plus_sign_blue" 429 + android:src="@drawable/sv_plus_sign_green"
364 app:layout_constraintBottom_toBottomOf="parent" 430 app:layout_constraintBottom_toBottomOf="parent"
365 app:layout_constraintStart_toStartOf="parent" 431 app:layout_constraintStart_toStartOf="parent"
366 app:layout_constraintTop_toTopOf="parent" /> 432 app:layout_constraintTop_toTopOf="parent" />
367 433
368 <TextView 434 <TextView
369 android:id="@+id/tv_questionnaire" 435 android:id="@+id/tv_questionnaire"
370 - fontPath="fonts/PeridotPE-Regular.ttf" 436 + fontPath="fonts/PeridotPE-Bold.ttf"
371 - android:layout_width="0dp" 437 + android:layout_width="wrap_content"
372 android:layout_height="wrap_content" 438 android:layout_height="wrap_content"
373 - android:layout_marginHorizontal="8dp" 439 + android:layout_marginStart="8dp"
374 android:includeFontPadding="false" 440 android:includeFontPadding="false"
375 android:text="@string/cos_profile_preferences" 441 android:text="@string/cos_profile_preferences"
376 - android:textColor="@color/cos_light_black" 442 + android:textColor="@color/cos_green12"
377 android:textSize="16sp" 443 android:textSize="16sp"
378 app:layout_constraintBottom_toBottomOf="parent" 444 app:layout_constraintBottom_toBottomOf="parent"
379 - app:layout_constraintEnd_toStartOf="@+id/iv_right_questionnaire"
380 - app:layout_constraintStart_toEndOf="@+id/iv_plus_questionnaire"
381 - app:layout_constraintTop_toTopOf="parent" />
382 -
383 - <ImageView
384 - android:id="@+id/iv_right_questionnaire"
385 - android:layout_width="16dp"
386 - android:layout_height="16dp"
387 - android:src="@drawable/ic_right_black"
388 - app:layout_constraintBottom_toBottomOf="parent"
389 app:layout_constraintEnd_toEndOf="parent" 445 app:layout_constraintEnd_toEndOf="parent"
446 + app:layout_constraintStart_toEndOf="@+id/iv_plus_questionnaire"
390 app:layout_constraintTop_toTopOf="parent" /> 447 app:layout_constraintTop_toTopOf="parent" />
391 </androidx.constraintlayout.widget.ConstraintLayout> 448 </androidx.constraintlayout.widget.ConstraintLayout>
392 449
393 <androidx.constraintlayout.widget.ConstraintLayout 450 <androidx.constraintlayout.widget.ConstraintLayout
394 - android:id="@+id/ll_loyalty_history" 451 + android:id="@+id/ll_user_questionnaire_centered"
395 - android:layout_width="match_parent" 452 + android:layout_width="wrap_content"
396 - android:layout_height="56dp" 453 + android:layout_height="40dp"
454 + android:layout_gravity="center_horizontal"
397 android:layout_marginHorizontal="14dp" 455 android:layout_marginHorizontal="14dp"
398 - android:layout_marginTop="6dp" 456 + android:layout_marginTop="20dp"
399 - android:background="@drawable/selector_button_grey_border" 457 + android:background="@drawable/selector_button_green_border2"
400 - android:gravity="center"
401 android:elevation="1dp" 458 android:elevation="1dp"
402 - android:paddingHorizontal="16dp"> 459 + android:gravity="center"
460 + android:paddingHorizontal="16dp"
461 + android:visibility="gone"
462 + tools:visibility="gone">
403 463
404 <ImageView 464 <ImageView
405 - android:id="@+id/iv_history_icon" 465 + android:id="@+id/iv_plus_questionnaire_centered"
406 - android:layout_width="24dp" 466 + android:layout_width="20dp"
407 - android:layout_height="24dp" 467 + android:layout_height="20dp"
408 - android:src="@drawable/ic_history_blue" 468 + android:src="@drawable/sv_plus_sign_green"
409 app:layout_constraintBottom_toBottomOf="parent" 469 app:layout_constraintBottom_toBottomOf="parent"
410 app:layout_constraintStart_toStartOf="parent" 470 app:layout_constraintStart_toStartOf="parent"
411 app:layout_constraintTop_toTopOf="parent" /> 471 app:layout_constraintTop_toTopOf="parent" />
412 472
413 <TextView 473 <TextView
414 - fontPath="fonts/PeridotPE-Regular.ttf" 474 + android:id="@+id/tv_questionnaire_centered"
415 - android:layout_width="0dp" 475 + fontPath="fonts/PeridotPE-Bold.ttf"
476 + android:layout_width="wrap_content"
416 android:layout_height="wrap_content" 477 android:layout_height="wrap_content"
417 - android:layout_marginHorizontal="8dp" 478 + android:layout_marginStart="8dp"
418 android:includeFontPadding="false" 479 android:includeFontPadding="false"
419 - android:text="@string/cos_profile_history" 480 + android:text="@string/cos_profile_preferences"
420 - android:textColor="@color/cos_light_black" 481 + android:textColor="@color/cos_green12"
421 android:textSize="16sp" 482 android:textSize="16sp"
422 app:layout_constraintBottom_toBottomOf="parent" 483 app:layout_constraintBottom_toBottomOf="parent"
423 - app:layout_constraintEnd_toStartOf="@+id/iv_right_history"
424 - app:layout_constraintStart_toEndOf="@+id/iv_history_icon"
425 - app:layout_constraintTop_toTopOf="parent" />
426 -
427 - <ImageView
428 - android:id="@+id/iv_right_history"
429 - android:layout_width="16dp"
430 - android:layout_height="16dp"
431 - android:src="@drawable/ic_right_black"
432 - app:layout_constraintBottom_toBottomOf="parent"
433 app:layout_constraintEnd_toEndOf="parent" 484 app:layout_constraintEnd_toEndOf="parent"
485 + app:layout_constraintStart_toEndOf="@+id/iv_plus_questionnaire_centered"
434 app:layout_constraintTop_toTopOf="parent" /> 486 app:layout_constraintTop_toTopOf="parent" />
435 </androidx.constraintlayout.widget.ConstraintLayout> 487 </androidx.constraintlayout.widget.ConstraintLayout>
436 488
489 + <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
490 + <!-- android:id="@+id/ll_loyalty_history"-->
491 + <!-- android:layout_width="match_parent"-->
492 + <!-- android:layout_height="56dp"-->
493 + <!-- android:layout_marginHorizontal="14dp"-->
494 + <!-- android:layout_marginTop="6dp"-->
495 + <!-- android:background="@drawable/selector_button_grey_border"-->
496 + <!-- android:elevation="1dp"-->
497 + <!-- android:gravity="center"-->
498 + <!-- android:paddingHorizontal="16dp">-->
499 +
500 + <!-- <ImageView-->
501 + <!-- android:id="@+id/iv_history_icon"-->
502 + <!-- android:layout_width="24dp"-->
503 + <!-- android:layout_height="24dp"-->
504 + <!-- android:src="@drawable/ic_history_blue"-->
505 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
506 + <!-- app:layout_constraintStart_toStartOf="parent"-->
507 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
508 +
509 + <!-- <TextView-->
510 + <!-- fontPath="fonts/PeridotPE-Regular.ttf"-->
511 + <!-- android:layout_width="0dp"-->
512 + <!-- android:layout_height="wrap_content"-->
513 + <!-- android:layout_marginHorizontal="8dp"-->
514 + <!-- android:includeFontPadding="false"-->
515 + <!-- android:text="@string/cos_profile_history"-->
516 + <!-- android:textColor="@color/cos_light_black"-->
517 + <!-- android:textSize="16sp"-->
518 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
519 + <!-- app:layout_constraintEnd_toStartOf="@+id/iv_right_history"-->
520 + <!-- app:layout_constraintStart_toEndOf="@+id/iv_history_icon"-->
521 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
522 +
523 + <!-- <ImageView-->
524 + <!-- android:id="@+id/iv_right_history"-->
525 + <!-- android:layout_width="16dp"-->
526 + <!-- android:layout_height="16dp"-->
527 + <!-- android:src="@drawable/ic_right_black"-->
528 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
529 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
530 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
531 + <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
532 +
437 <LinearLayout 533 <LinearLayout
438 android:id="@+id/ll_vouchers_spinner" 534 android:id="@+id/ll_vouchers_spinner"
439 android:layout_width="match_parent" 535 android:layout_width="match_parent"
...@@ -443,7 +539,7 @@ ...@@ -443,7 +539,7 @@
443 android:gravity="center_horizontal" 539 android:gravity="center_horizontal"
444 android:orientation="vertical" 540 android:orientation="vertical"
445 android:visibility="gone" 541 android:visibility="gone"
446 - tools:visibility="visible"> 542 + tools:visibility="gone">
447 543
448 <ProgressBar 544 <ProgressBar
449 android:id="@+id/pb_vouchers" 545 android:id="@+id/pb_vouchers"
...@@ -460,7 +556,7 @@ ...@@ -460,7 +556,7 @@
460 android:layout_marginTop="32dp" 556 android:layout_marginTop="32dp"
461 android:orientation="vertical" 557 android:orientation="vertical"
462 android:visibility="gone" 558 android:visibility="gone"
463 - tools:visibility="visible"> 559 + tools:visibility="gone">
464 560
465 <TextView 561 <TextView
466 android:id="@+id/tv_vouchers_title" 562 android:id="@+id/tv_vouchers_title"
...@@ -535,7 +631,7 @@ ...@@ -535,7 +631,7 @@
535 android:layout_marginTop="32dp" 631 android:layout_marginTop="32dp"
536 android:orientation="vertical" 632 android:orientation="vertical"
537 android:visibility="gone" 633 android:visibility="gone"
538 - tools:visibility="visible"> 634 + tools:visibility="gone">
539 635
540 <TextView 636 <TextView
541 android:id="@+id/tv_vouchers_title_disabled" 637 android:id="@+id/tv_vouchers_title_disabled"
...@@ -624,32 +720,5 @@ ...@@ -624,32 +720,5 @@
624 </androidx.constraintlayout.widget.ConstraintLayout> 720 </androidx.constraintlayout.widget.ConstraintLayout>
625 </androidx.cardview.widget.CardView> 721 </androidx.cardview.widget.CardView>
626 </LinearLayout> 722 </LinearLayout>
627 -
628 - <LinearLayout
629 - android:id="@+id/ll_empty_wallet"
630 - android:layout_width="match_parent"
631 - android:layout_height="wrap_content"
632 - android:layout_marginHorizontal="32dp"
633 - android:layout_marginTop="32dp"
634 - android:gravity="center"
635 - android:orientation="vertical"
636 - android:visibility="gone"
637 - tools:visibility="visible">
638 -
639 - <ImageView
640 - android:layout_width="64dp"
641 - android:layout_height="64dp"
642 - android:src="@drawable/ic_empty_wallet" />
643 -
644 - <TextView
645 - fontPath="fonts/PeridotPE-Regular.ttf"
646 - android:layout_width="wrap_content"
647 - android:layout_height="wrap_content"
648 - android:layout_marginTop="8dp"
649 - android:gravity="center"
650 - android:text="@string/cos_empty_wallet"
651 - android:textColor="@color/cos_light_black"
652 - android:textSize="14sp" />
653 - </LinearLayout>
654 </LinearLayout> 723 </LinearLayout>
655 </RelativeLayout> 724 </RelativeLayout>
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
39 <string name="cos_coupons_title">ΚΟΥΠΟΝΙΑ</string> 39 <string name="cos_coupons_title">ΚΟΥΠΟΝΙΑ</string>
40 <string name="cos_coupon_terms_title">Όροι χρήσης</string> 40 <string name="cos_coupon_terms_title">Όροι χρήσης</string>
41 <string name="cos_redeem_coupon">Απόκτησέ το</string> 41 <string name="cos_redeem_coupon">Απόκτησέ το</string>
42 + <string name="cos_redeem_coupon2">Απόκτησέ το δωρεάν</string>
42 <string name="cos_dlg_success_subtitle">Το κουπόνι εξαργυρώθηκε με επιτυχία</string> 43 <string name="cos_dlg_success_subtitle">Το κουπόνι εξαργυρώθηκε με επιτυχία</string>
43 <string name="cos_dlg_error_title">Αποτυχία</string> 44 <string name="cos_dlg_error_title">Αποτυχία</string>
44 <string name="cos_dlg_error_title2">Αποτυχία αποστολής</string> 45 <string name="cos_dlg_error_title2">Αποτυχία αποστολής</string>
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
113 <string name="cos_dlg_negative_button3">Αποστολή</string> 114 <string name="cos_dlg_negative_button3">Αποστολή</string>
114 <string name="cos_dlg_error_subtitle2">Παρακαλούμε συμπλήρωσε σωστά τα πεδία.</string> 115 <string name="cos_dlg_error_subtitle2">Παρακαλούμε συμπλήρωσε σωστά τα πεδία.</string>
115 <string name="cos_dlg_success_couponset_title">Επιτυχής ενεργοποίηση</string> 116 <string name="cos_dlg_success_couponset_title">Επιτυχής ενεργοποίηση</string>
116 - <string name="cos_dlg_success_couponset_subtitle">Το κουπόνι σου έχει ενεργοποιηθεί στην ενότητα My Rewards.</string> 117 + <string name="cos_dlg_success_couponset_subtitle">Το κουπόνι σου έχει ενεργοποιηθεί και βρίσκεται στην ενότητα My Rewards.</string>
117 <string name="cos_dlg_activate_telco_title">Ενεργοποίηση υπηρεσίας</string> 118 <string name="cos_dlg_activate_telco_title">Ενεργοποίηση υπηρεσίας</string>
118 <string name="cos_dlg_activate_telco_subtitle">Θέλετε να γίνει ενεργοποίηση στο Κινητό μου;</string> 119 <string name="cos_dlg_activate_telco_subtitle">Θέλετε να γίνει ενεργοποίηση στο Κινητό μου;</string>
119 <string name="cos_dlg_activate_success_title">Το αίτημά σου ολοκληρώθηκε επιτυχώς!</string> 120 <string name="cos_dlg_activate_success_title">Το αίτημά σου ολοκληρώθηκε επιτυχώς!</string>
......