Panagiotis Triantafyllou

sm deals changes

...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { ...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
36 public void onWarplyReady() { 36 public void onWarplyReady() {
37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { 37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() 38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
39 - .setGuid("7000000831"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910,prod 7000070282 39 + .setGuid("7000000833"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990, prod 6005892749, live 3000184910,prod 7000070282
40 mLoginReceiver); 40 mLoginReceiver);
41 } else { 41 } else {
42 startNextActivity(); 42 startNextActivity();
......
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.5.4r2' 5 + PUBLISH_VERSION = '4.5.5.4r3'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -65,7 +65,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -65,7 +65,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
65 private ConstraintLayout mClDealsBanner, mClDealsView, 65 private ConstraintLayout mClDealsBanner, mClDealsView,
66 mClGiftsBanner, mClToolbar, mClMarket; 66 mClGiftsBanner, mClToolbar, mClMarket;
67 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts, 67 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts,
68 - mLlMarketView, mLlHistory, mLlBannerInfo, mLlVouchers, mLlVouchersSpinner; 68 + mLlMarketView, mLlHistory, mLlBannerInfo, mLlVouchers, mLlVouchersSpinner,
69 + mLlVouchersDisabled;
69 private FlowLayout mLlActiveCodesView; 70 private FlowLayout mLlActiveCodesView;
70 private float couponDfyValue = 0.0f, mFavValue = 0.0f; 71 private float couponDfyValue = 0.0f, mFavValue = 0.0f;
71 private RecyclerView mRecyclerCoupons, mRvMarketCoupons; 72 private RecyclerView mRecyclerCoupons, mRvMarketCoupons;
...@@ -80,13 +81,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -80,13 +81,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
80 private MarketCouponAdapter mAdapterMarketCoupons; 81 private MarketCouponAdapter mAdapterMarketCoupons;
81 private ExpandableLayout mElGifts; 82 private ExpandableLayout mElGifts;
82 private boolean mIsStayCollapsed = true; 83 private boolean mIsStayCollapsed = true;
83 - private CardView mClExp, mCvVouchers; 84 + private CardView mClExp, mCvVouchers, mCvVouchersDisabled;
84 private boolean mDfyPressed = false, mDealsBannerPressed = false, mQuestionnairePressed = false, 85 private boolean mDfyPressed = false, mDealsBannerPressed = false, mQuestionnairePressed = false,
85 mHistoryPressed = false, mHistoryMarketPressed = false, mUnifiedPressed = false, 86 mHistoryPressed = false, mHistoryMarketPressed = false, mUnifiedPressed = false,
86 mCouponPressed = false, mHistoryBadgePressed = false, mUnifiedCountPressed = false, 87 mCouponPressed = false, mHistoryBadgePressed = false, mUnifiedCountPressed = false,
87 mGiftsCountPressed = false; 88 mGiftsCountPressed = false;
88 private RelativeLayout mRlDeals, mRlUnified, mRlGifts; 89 private RelativeLayout mRlDeals, mRlUnified, mRlGifts;
89 - private View mSeparator; 90 + private View mSeparator, mSeparatorDisabled;
90 91
91 // =========================================================== 92 // ===========================================================
92 // Methods for/from SuperClass/Interfaces 93 // Methods for/from SuperClass/Interfaces
...@@ -145,9 +146,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -145,9 +146,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
145 mRlGifts = findViewById(R.id.rv_gifts_count); 146 mRlGifts = findViewById(R.id.rv_gifts_count);
146 mRecyclerCoupons = findViewById(R.id.rv_active_coupons); 147 mRecyclerCoupons = findViewById(R.id.rv_active_coupons);
147 mCvVouchers = findViewById(R.id.cv_vouchers); 148 mCvVouchers = findViewById(R.id.cv_vouchers);
149 + mCvVouchersDisabled = findViewById(R.id.cv_vouchers_disabled);
148 mLlVouchers = findViewById(R.id.ll_vouchers); 150 mLlVouchers = findViewById(R.id.ll_vouchers);
151 + mLlVouchersDisabled = findViewById(R.id.ll_vouchers_disabled);
149 mLlVouchersSpinner = findViewById(R.id.ll_vouchers_spinner); 152 mLlVouchersSpinner = findViewById(R.id.ll_vouchers_spinner);
150 mSeparator = findViewById(R.id.v_separator_vouchers); 153 mSeparator = findViewById(R.id.v_separator_vouchers);
154 + mSeparatorDisabled = findViewById(R.id.v_separator_vouchers_disabled);
151 155
152 /** Deals Badge */ 156 /** Deals Badge */
153 // if (WarplyManagerHelper.getActiveDFYCoupons() != null) { 157 // if (WarplyManagerHelper.getActiveDFYCoupons() != null) {
...@@ -370,7 +374,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -370,7 +374,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
370 return; 374 return;
371 } 375 }
372 /** Vouchers Client's Screen */ 376 /** Vouchers Client's Screen */
373 - if (view.getId() == R.id.cv_vouchers) { 377 + if (view.getId() == R.id.cv_vouchers || view.getId() == R.id.cv_vouchers_disabled) {
374 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen") 378 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("LoyaltyWalletScreen")
375 .concat(":") 379 .concat(":")
376 .concat("VouchersBadge")); 380 .concat("VouchersBadge"));
...@@ -945,6 +949,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -945,6 +949,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
945 mRlUnified.setOnClickListener(this); 949 mRlUnified.setOnClickListener(this);
946 mRlGifts.setOnClickListener(this); 950 mRlGifts.setOnClickListener(this);
947 mCvVouchers.setOnClickListener(this); 951 mCvVouchers.setOnClickListener(this);
952 + mCvVouchersDisabled.setOnClickListener(this);
948 } 953 }
949 954
950 private void nonTelcoDialog() { 955 private void nonTelcoDialog() {
...@@ -977,11 +982,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -977,11 +982,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
977 } 982 }
978 983
979 private void checkForEmpty() { 984 private void checkForEmpty() {
980 - if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner())) { 985 + if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) || (!TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()) && WarplyManagerHelper.getShowVouchersBanner().equals("null"))) {
981 - /** Show spinner */ 986 + /** Show spinner only if empty */
982 mLlVouchers.setVisibility(View.GONE); 987 mLlVouchers.setVisibility(View.GONE);
983 mSeparator.setVisibility(View.VISIBLE); 988 mSeparator.setVisibility(View.VISIBLE);
984 - mLlVouchersSpinner.setVisibility(View.VISIBLE); 989 + if (TextUtils.isEmpty(WarplyManagerHelper.getShowVouchersBanner()))
990 + mLlVouchersSpinner.setVisibility(View.VISIBLE);
985 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 991 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
986 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 992 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
987 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 993 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
...@@ -991,16 +997,19 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -991,16 +997,19 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
991 mSeparator.setVisibility(View.VISIBLE); 997 mSeparator.setVisibility(View.VISIBLE);
992 mLlEmptyWallet.setVisibility(View.VISIBLE); 998 mLlEmptyWallet.setVisibility(View.VISIBLE);
993 } else { 999 } else {
994 - /** Show loyalty banners and show spinner and hide empty view */ 1000 + /** Show loyalty banners and hide empty view
1001 + * Show spinner only if empty */
995 mLlEmptyWallet.setVisibility(View.GONE); 1002 mLlEmptyWallet.setVisibility(View.GONE);
996 mLlBannerInfo.setVisibility(View.VISIBLE); 1003 mLlBannerInfo.setVisibility(View.VISIBLE);
997 } 1004 }
998 } else { 1005 } else {
999 if (WarplyManagerHelper.getShowVouchersBanner().equals("true")) { 1006 if (WarplyManagerHelper.getShowVouchersBanner().equals("true")) {
1000 - /** Hide spinner and hide empty view and show vouchers */ 1007 + /** Hide spinner and hide empty view and show vouchers and hide disabled vouchers */
1001 mLlVouchersSpinner.setVisibility(View.GONE); 1008 mLlVouchersSpinner.setVisibility(View.GONE);
1002 mLlEmptyWallet.setVisibility(View.GONE); 1009 mLlEmptyWallet.setVisibility(View.GONE);
1003 mLlVouchers.setVisibility(View.VISIBLE); 1010 mLlVouchers.setVisibility(View.VISIBLE);
1011 + mLlVouchersDisabled.setVisibility(View.GONE);
1012 + mSeparatorDisabled.setVisibility(View.VISIBLE);
1004 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 1013 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
1005 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 1014 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
1006 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 1015 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
...@@ -1013,20 +1022,24 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -1013,20 +1022,24 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
1013 mLlBannerInfo.setVisibility(View.VISIBLE); 1022 mLlBannerInfo.setVisibility(View.VISIBLE);
1014 } 1023 }
1015 } else if (WarplyManagerHelper.getShowVouchersBanner().equals("false")) { 1024 } else if (WarplyManagerHelper.getShowVouchersBanner().equals("false")) {
1016 - /** Hide spinner and hide vouchers */ 1025 + /** Hide spinner and hide vouchers and hide empty view and show disabled vouchers and show disabled separator */
1017 mLlVouchersSpinner.setVisibility(View.GONE); 1026 mLlVouchersSpinner.setVisibility(View.GONE);
1027 + mLlEmptyWallet.setVisibility(View.GONE);
1018 mLlVouchers.setVisibility(View.GONE); 1028 mLlVouchers.setVisibility(View.GONE);
1019 mSeparator.setVisibility(View.VISIBLE); 1029 mSeparator.setVisibility(View.VISIBLE);
1030 + mLlVouchersDisabled.setVisibility(View.VISIBLE);
1031 + mSeparatorDisabled.setVisibility(View.VISIBLE);
1020 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0) 1032 if ((WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() == 0)
1021 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0) 1033 && (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() == 0)
1022 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) { 1034 && (WarplyManagerHelper.getCouponList() != null && WarplyManagerHelper.getCouponList().size() == 0)) {
1023 - /** Hide loyalty banners and show empty view */ 1035 + /** Hide loyalty banners and hide empty view and hide disabled separator */
1024 mLlBannerInfo.setVisibility(View.GONE); 1036 mLlBannerInfo.setVisibility(View.GONE);
1025 - mLlEmptyWallet.setVisibility(View.VISIBLE);
1026 - } else {
1027 - /** Show loyalty banners and hide empty view */
1028 mLlEmptyWallet.setVisibility(View.GONE); 1037 mLlEmptyWallet.setVisibility(View.GONE);
1038 + mSeparatorDisabled.setVisibility(View.GONE);
1039 + } else {
1040 + /** Show loyalty banners and show disabled separator */
1029 mLlBannerInfo.setVisibility(View.VISIBLE); 1041 mLlBannerInfo.setVisibility(View.VISIBLE);
1042 + mSeparatorDisabled.setVisibility(View.VISIBLE);
1030 } 1043 }
1031 } 1044 }
1032 } 1045 }
......
...@@ -1413,16 +1413,18 @@ public class WarplyManagerHelper { ...@@ -1413,16 +1413,18 @@ public class WarplyManagerHelper {
1413 showVouchersBanner = ""; 1413 showVouchersBanner = "";
1414 } 1414 }
1415 1415
1416 - public static void setShowVouchersBanner(boolean show) { 1416 + public static void setShowVouchersBanner(String show) {
1417 - showVouchersBanner = String.valueOf(show); 1417 + showVouchersBanner = show;
1418 } 1418 }
1419 1419
1420 public static String getShowVouchersBanner() { 1420 public static String getShowVouchersBanner() {
1421 return showVouchersBanner; 1421 return showVouchersBanner;
1422 } 1422 }
1423 1423
1424 - public static void setVouchersFetched(boolean success) { 1424 + public static void setVouchersFetched(String success) {
1425 - setShowVouchersBanner(success); 1425 + if (success.equals("true") || success.equals("false") || success.equals("null")) {
1426 + setShowVouchersBanner(success);
1427 + }
1426 1428
1427 OneTimeWorkRequest mywork = new OneTimeWorkRequest.Builder(VouchersFetchedService.class).build(); 1429 OneTimeWorkRequest mywork = new OneTimeWorkRequest.Builder(VouchersFetchedService.class).build();
1428 WorkManager.getInstance(Warply.getWarplyContext()).enqueue(mywork); 1430 WorkManager.getInstance(Warply.getWarplyContext()).enqueue(mywork);
......
1 +<vector android:height="29.866667dp" android:viewportHeight="28"
2 + android:viewportWidth="30" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
3 + <path android:fillColor="#848484" android:fillType="evenOdd" android:pathData="M27.494,0.5C28.87,0.506 29.985,1.663 29.99,3.093C29.99,3.894 29.997,4.528 30,5.041L30,5.602C29.991,6.789 29.907,7.174 29.481,7.762C30.1,8.612 29.99,8.913 29.99,12.43C29.985,12.992 29.806,13.537 29.481,13.986C29.806,14.435 29.985,14.98 29.99,15.542C29.99,16.342 29.997,16.976 30,17.489L30,18.05C29.991,19.237 29.907,19.622 29.481,20.21C30.1,21.061 29.99,21.362 29.99,24.878C29.99,26.311 28.872,27.472 27.494,27.472C27.273,27.472 27.056,27.472 26.843,27.472L25.615,27.474C23.059,27.479 21.166,27.495 19.748,27.499L18.569,27.5C16.284,27.492 15.67,27.417 15.227,27.11L15.127,27.035C15.094,27.008 15.062,26.98 15.029,26.951L14.929,26.858L14.822,26.756C10.353,28.487 5.32,27.025 2.364,23.136C-0.592,19.248 -0.795,13.822 1.862,9.707C4.519,5.592 9.429,3.729 14.013,5.096V3.093C14.013,1.661 15.131,0.5 16.51,0.5H27.494ZM11.018,6.724C6.054,6.724 2.031,10.904 2.031,16.061C2.031,18.537 2.978,20.912 4.663,22.663C6.348,24.413 8.634,25.397 11.018,25.397C15.981,25.397 20.005,21.217 20.005,16.061C20.005,10.904 15.981,6.724 11.018,6.724ZM27.494,21.248H20.793C19.971,22.903 18.775,24.326 17.309,25.397H27.494C27.767,25.392 27.988,25.163 27.993,24.878V21.766C27.988,21.482 27.767,21.253 27.494,21.248ZM27.494,15.023H22.002C22.118,16.422 21.972,17.831 21.572,19.173H27.494C27.767,19.167 27.988,18.938 27.993,18.654V15.542C27.988,15.258 27.767,15.029 27.494,15.023ZM27.474,8.799H19.485C20.45,10.017 21.16,11.43 21.572,12.948H27.494C27.767,12.943 27.988,12.714 27.993,12.43V9.318C27.99,9.177 27.934,9.044 27.837,8.947C27.739,8.849 27.609,8.796 27.474,8.799ZM27.494,2.575H16.51C16.236,2.58 16.016,2.809 16.01,3.093V5.905C17.938,6.936 15.528,6.749 25.651,6.726L26.852,6.725L27.494,6.724C27.767,6.719 27.988,6.49 27.993,6.206C27.993,3.125 28.153,2.575 27.494,2.575Z"/>
4 + <path android:fillColor="#848484" android:pathData="M11.9,21.5C10.474,21.5 9.258,21.15 8.251,20.451C7.244,19.751 6.537,18.828 6.129,17.68H4.5V16.041H5.773C5.762,15.921 5.756,15.74 5.756,15.5C5.756,15.271 5.762,15.101 5.773,14.992H4.5V13.352H6.112C6.52,12.194 7.227,11.265 8.234,10.566C9.241,9.855 10.458,9.5 11.883,9.5C12.902,9.5 13.801,9.664 14.582,9.992C15.363,10.309 15.997,10.762 16.483,11.352L14.837,13.057C14.474,12.587 14.022,12.238 13.479,12.008C12.947,11.779 12.381,11.664 11.781,11.664C11.125,11.664 10.537,11.817 10.016,12.123C9.507,12.418 9.105,12.828 8.811,13.352H12.919V14.992H8.302C8.291,15.101 8.285,15.271 8.285,15.5C8.285,15.62 8.296,15.8 8.319,16.041H12.919V17.68H8.828C9.134,18.205 9.541,18.615 10.05,18.91C10.559,19.194 11.142,19.336 11.798,19.336C12.398,19.336 12.964,19.221 13.496,18.992C14.039,18.762 14.491,18.413 14.854,17.943L16.5,19.647C16.013,20.238 15.38,20.697 14.599,21.025C13.818,21.341 12.919,21.5 11.9,21.5Z"/>
5 +</vector>
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
493 android:layout_marginTop="32dp" 493 android:layout_marginTop="32dp"
494 android:orientation="vertical" 494 android:orientation="vertical"
495 android:visibility="gone" 495 android:visibility="gone"
496 - tools:visibility="visible"> 496 + tools:visibility="gone">
497 497
498 <View 498 <View
499 android:id="@+id/v_separator_vouchers" 499 android:id="@+id/v_separator_vouchers"
...@@ -569,6 +569,112 @@ ...@@ -569,6 +569,112 @@
569 </LinearLayout> 569 </LinearLayout>
570 570
571 <LinearLayout 571 <LinearLayout
572 + android:id="@+id/ll_vouchers_disabled"
573 + android:layout_width="match_parent"
574 + android:layout_height="wrap_content"
575 + android:layout_marginHorizontal="14dp"
576 + android:layout_marginTop="32dp"
577 + android:orientation="vertical"
578 + android:visibility="gone"
579 + tools:visibility="visible">
580 +
581 + <View
582 + android:id="@+id/v_separator_vouchers_disabled"
583 + android:layout_width="match_parent"
584 + android:layout_height="1dp"
585 + android:background="@color/cos_gray" />
586 +
587 + <TextView
588 + fontPath="fonts/PeridotPE-SemiBold.ttf"
589 + android:layout_width="wrap_content"
590 + android:layout_height="wrap_content"
591 + android:layout_marginTop="24dp"
592 + android:includeFontPadding="false"
593 + android:maxLines="1"
594 + android:text="@string/cos_vouchers_title"
595 + android:textColor="@color/cos_light_black"
596 + android:textSize="22sp" />
597 +
598 + <androidx.cardview.widget.CardView
599 + android:id="@+id/cv_vouchers_disabled"
600 + android:layout_width="match_parent"
601 + android:layout_height="70dp"
602 + android:layout_marginHorizontal="2dp"
603 + android:layout_marginTop="24dp"
604 + android:layout_marginBottom="4dp"
605 + app:cardCornerRadius="16dp"
606 + app:cardElevation="2dp">
607 +
608 + <androidx.constraintlayout.widget.ConstraintLayout
609 + android:layout_width="match_parent"
610 + android:layout_height="match_parent"
611 + android:background="@color/white">
612 +
613 + <ImageView
614 + android:id="@+id/iv_vouchers_logo_disabled"
615 + android:layout_width="32dp"
616 + android:layout_height="30dp"
617 + android:layout_marginStart="16dp"
618 + android:src="@drawable/sv_vouchers_disabled"
619 + app:layout_constraintBottom_toBottomOf="parent"
620 + app:layout_constraintStart_toStartOf="parent"
621 + app:layout_constraintTop_toTopOf="parent" />
622 +
623 + <TextView
624 + android:id="@+id/tv_vouchers_info_title_disabled"
625 + fontPath="fonts/PeridotPE-Regular.ttf"
626 + android:layout_width="wrap_content"
627 + android:layout_height="wrap_content"
628 + android:layout_marginHorizontal="8dp"
629 + android:includeFontPadding="false"
630 + android:lineHeight="24dp"
631 + android:text="@string/cos_vouchers_info_title_disabled"
632 + android:textColor="@color/cos_gray2"
633 + android:textSize="14sp"
634 + app:layout_constraintBottom_toBottomOf="@+id/iv_vouchers_logo_disabled"
635 + app:layout_constraintEnd_toStartOf="@+id/iv_vouchers_arrow_disabled"
636 + app:layout_constraintHorizontal_bias="0.0"
637 + app:layout_constraintStart_toEndOf="@+id/iv_vouchers_logo_disabled"
638 + app:layout_constraintTop_toTopOf="@+id/iv_vouchers_logo_disabled" />
639 +
640 + <ImageView
641 + android:id="@+id/iv_vouchers_arrow_disabled"
642 + android:layout_width="16dp"
643 + android:layout_height="10dp"
644 + android:layout_marginEnd="16dp"
645 + android:rotation="270"
646 + android:src="@drawable/sv_arrow_down"
647 + app:layout_constraintBottom_toBottomOf="parent"
648 + app:layout_constraintEnd_toEndOf="parent"
649 + app:layout_constraintTop_toTopOf="parent" />
650 +
651 + <LinearLayout
652 + android:layout_width="16dp"
653 + android:layout_height="16dp"
654 + android:background="@drawable/shape_cos_counter_orange"
655 + android:gravity="center"
656 + android:orientation="vertical"
657 + android:layout_marginStart="2dp"
658 + app:layout_constraintTop_toTopOf="@+id/tv_vouchers_info_title_disabled"
659 + app:layout_constraintBottom_toTopOf="@+id/tv_vouchers_info_title_disabled"
660 + app:layout_constraintStart_toEndOf="@+id/tv_vouchers_info_title_disabled">
661 +
662 + <TextView
663 + android:id="@+id/tv_vouchers_count_disabled"
664 + fontPath="fonts/PeridotPE-SemiBold.ttf"
665 + android:layout_width="wrap_content"
666 + android:layout_height="16dp"
667 + android:includeFontPadding="false"
668 + android:maxLines="1"
669 + android:textColor="@color/cos_light_black"
670 + android:textSize="12sp"
671 + android:text="0" />
672 + </LinearLayout>
673 + </androidx.constraintlayout.widget.ConstraintLayout>
674 + </androidx.cardview.widget.CardView>
675 + </LinearLayout>
676 +
677 + <LinearLayout
572 android:id="@+id/ll_empty_wallet" 678 android:id="@+id/ll_empty_wallet"
573 android:layout_width="match_parent" 679 android:layout_width="match_parent"
574 android:layout_height="wrap_content" 680 android:layout_height="wrap_content"
......
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
208 <string name="cos_dlg_try_again">Προσπάθησε ξανά αργότερα</string> 208 <string name="cos_dlg_try_again">Προσπάθησε ξανά αργότερα</string>
209 <string name="cos_dlg_service_unavailable">Προσωρινά μη διαθέσιμη πληροφορία.\nΠαρακαλούμε δοκίμασε ξανά σε λίγο.</string> 209 <string name="cos_dlg_service_unavailable">Προσωρινά μη διαθέσιμη πληροφορία.\nΠαρακαλούμε δοκίμασε ξανά σε λίγο.</string>
210 <string name="cos_dlg_return">Επιστροφή</string> 210 <string name="cos_dlg_return">Επιστροφή</string>
211 + <string name="cos_vouchers_info_title_disabled">Διαθέσιμο υπόλοιπο</string>
211 212
212 <string-array name="coupons_array"> 213 <string-array name="coupons_array">
213 <item>Κουπόνια</item> 214 <item>Κουπόνια</item>
......