open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
519311f9 1 parent ba851c00

redesign supermarket part2

Inline Side-by-side
Showing 7 changed files with 73 additions and 86 deletions
...@@ -461,15 +461,9 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -461,15 +461,9 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
461 String badgeValueFirst = String.format("%.02f", WarplyManagerHelper.getDealsCouponsSum()); 461 String badgeValueFirst = String.format("%.02f", WarplyManagerHelper.getDealsCouponsSum());
462 mTvDealsValue.setText(String.format(getString(R.string.cos_value), badgeValueFirst)); 462 mTvDealsValue.setText(String.format(getString(R.string.cos_value), badgeValueFirst));
463 SpannableStringBuilder sBuilder = new SpannableStringBuilder(); 463 SpannableStringBuilder sBuilder = new SpannableStringBuilder();
464 - sBuilder 464 + sBuilder.append(String.format(getString(R.string.cos_deals_win_title_cos), badgeValueFirst));
465 - .append(getString(R.string.cos_wallet_text1)) 465 + CalligraphyTypefaceSpan typefaceBoldSpanFirst = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
466 - .append(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getDealsCouponsSum()))) 466 + sBuilder.setSpan(typefaceBoldSpanFirst, 15, 16 + badgeValueFirst.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
467 - .append(getString(R.string.cos_wallet_text2));
468 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
469 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
470 - sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text1).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
471 - sBuilder.setSpan(typefaceRegularSpan, getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length(), getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() + getString(R.string.cos_wallet_text2).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
472 - sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text1).length(), getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
473 mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE); 467 mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
474 mFavValue += WarplyManagerHelper.getDealsCouponsSum(); 468 mFavValue += WarplyManagerHelper.getDealsCouponsSum();
475 469
...@@ -478,22 +472,9 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -478,22 +472,9 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
478 String badgeValue = String.format("%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue()); 472 String badgeValue = String.format("%.02f", WarplyManagerHelper.getLoyaltyBadge().getValue());
479 mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 473 mTvGiftsValue.setText(String.format(getString(R.string.cos_value), badgeValue));
480 SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder(); 474 SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder();
481 - sBuilderSecond 475 + sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue));
482 - .append(getString(R.string.cos_wallet_text3))
483 - .append(String.format(getString(R.string.cos_value), badgeValue))
484 - .append(getString(R.string.cos_wallet_text4))
485 - .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount())))
486 - .append(getString(R.string.cos_wallet_text5));
487 - CalligraphyTypefaceSpan typefaceRegularSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
488 - CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
489 - CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
490 CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 476 CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
491 - CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 477 + sBuilderSecond.setSpan(typefaceBoldSpanSecond, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
492 - sBuilderSecond.setSpan(typefaceRegularSpanSecond, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
493 - sBuilderSecond.setSpan(typefaceBoldSpanSecond, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
494 - sBuilderSecond.setSpan(typefaceRegularSpan2, getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1, getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
495 - sBuilderSecond.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
496 - sBuilderSecond.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + 1 + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length() + getString(R.string.cos_wallet_text5).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
497 mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE); 478 mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE);
498 mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue(); 479 mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue();
499 } 480 }
...@@ -511,13 +492,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -511,13 +492,13 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
511 } 492 }
512 } 493 }
513 mFavValue += countValue; 494 mFavValue += countValue;
514 - if (countValue > 0) {
515 String badgeValue = String.format("%.02f", countValue); 495 String badgeValue = String.format("%.02f", countValue);
516 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 496 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
517 - } else { 497 + SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
518 - String badgeValue = String.format("%.02f", 0.0f); 498 + sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
519 - mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 499 + CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
520 - } 500 + sBuilderThird.setSpan(typefaceBoldSpanThird, 15, 16 + badgeValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
501 + mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
521 } else { 502 } else {
522 String badgeValue = String.format("%.02f", 0.0f); 503 String badgeValue = String.format("%.02f", 0.0f);
523 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 504 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
...@@ -526,6 +507,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -526,6 +507,12 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
526 // Sum Expandable Banner 507 // Sum Expandable Banner
527 String allValue = String.format("%.02f", mFavValue); 508 String allValue = String.format("%.02f", mFavValue);
528 mTvFavValue.setText(String.format(getString(R.string.cos_value), allValue)); 509 mTvFavValue.setText(String.format(getString(R.string.cos_value), allValue));
510 + SpannableStringBuilder sBuilderExp = new SpannableStringBuilder();
511 + sBuilderExp.append(String.format(getString(R.string.cos_for_you_all), allValue));
512 + CalligraphyTypefaceSpan typefaceBoldExp = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
513 + sBuilderExp.setSpan(typefaceBoldExp, 26, 27 + allValue.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
514 + mTvFavValueAll.setText(sBuilderExp, TextView.BufferType.SPANNABLE);
515 + mClExp.setVisibility(View.VISIBLE);
529 516
530 if (WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() > 0) { 517 if (WarplyManagerHelper.getActiveDFYCoupons() != null && WarplyManagerHelper.getActiveDFYCoupons().size() > 0) {
531 String codes = ""; 518 String codes = "";
...@@ -613,14 +600,14 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -613,14 +600,14 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
613 if (mLlMarketView.getVisibility() == View.GONE 600 if (mLlMarketView.getVisibility() == View.GONE
614 && WarplyManagerHelper.getDealsCouponsSum() == 0 601 && WarplyManagerHelper.getDealsCouponsSum() == 0
615 && (WarplyManagerHelper.getLoyaltyBadge() != null && WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0) 602 && (WarplyManagerHelper.getLoyaltyBadge() != null && WarplyManagerHelper.getLoyaltyBadge().getCouponCount() == 0)
616 - && mLlDeals.getVisibility() == View.GONE) { 603 + && countValue == 0) {
617 mIvExpArrow.setVisibility(View.GONE); 604 mIvExpArrow.setVisibility(View.GONE);
618 // mLlEmptyWallet.setVisibility(View.VISIBLE); 605 // mLlEmptyWallet.setVisibility(View.VISIBLE);
619 mIsStayCollapsed = true; 606 mIsStayCollapsed = true;
620 } else { 607 } else {
621 mIvExpArrow.setVisibility(View.VISIBLE); 608 mIvExpArrow.setVisibility(View.VISIBLE);
622 mIsStayCollapsed = false; 609 mIsStayCollapsed = false;
623 - } //TODO: change the case 610 + }
624 611
625 mIvBack.setOnClickListener(this); 612 mIvBack.setOnClickListener(this);
626 mLlQuestionnaire.setOnClickListener(this); 613 mLlQuestionnaire.setOnClickListener(this);
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@android:color/white"> 6 + android:background="@color/white">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="64dp" 11 android:layout_height="64dp"
12 - android:background="@android:color/white"> 12 + android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_coupon_info_back" 15 android:id="@+id/iv_coupon_info_back"
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 android:gravity="center" 119 android:gravity="center"
120 android:textColor="@color/cos_light_black" 120 android:textColor="@color/cos_light_black"
121 android:textIsSelectable="true" 121 android:textIsSelectable="true"
122 - android:textSize="25dp" 122 + android:textSize="25sp"
123 tools:text="1A2C378" /> 123 tools:text="1A2C378" />
124 124
125 <LinearLayout 125 <LinearLayout
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
208 android:layout_height="wrap_content" 208 android:layout_height="wrap_content"
209 android:layout_gravity="center" 209 android:layout_gravity="center"
210 android:layout_marginTop="24dp" 210 android:layout_marginTop="24dp"
211 + android:textSize="16sp"
211 android:textColor="@color/cos_gray" 212 android:textColor="@color/cos_gray"
212 tools:text="@string/cos_coupon_date" /> 213 tools:text="@string/cos_coupon_date" />
213 214
...@@ -289,7 +290,7 @@ ...@@ -289,7 +290,7 @@
289 android:layout_width="wrap_content" 290 android:layout_width="wrap_content"
290 android:layout_height="wrap_content" 291 android:layout_height="wrap_content"
291 android:layout_gravity="center" 292 android:layout_gravity="center"
292 - android:layout_marginTop="32dp" 293 + android:layout_marginTop="24dp"
293 android:gravity="center"> 294 android:gravity="center">
294 295
295 <LinearLayout 296 <LinearLayout
...@@ -326,11 +327,11 @@ ...@@ -326,11 +327,11 @@
326 android:layout_below="@+id/ll_terms_inner" 327 android:layout_below="@+id/ll_terms_inner"
327 android:layout_marginHorizontal="32dp" 328 android:layout_marginHorizontal="32dp"
328 android:layout_marginTop="16dp" 329 android:layout_marginTop="16dp"
329 - android:textSize="16sp"
330 android:textColor="@color/cos_gray" 330 android:textColor="@color/cos_gray"
331 + android:textSize="16sp"
331 android:visibility="gone" 332 android:visibility="gone"
332 tools:text="@string/cos_coupon_date" 333 tools:text="@string/cos_coupon_date"
333 - tools:visibility="visible"/> 334 + tools:visibility="visible" />
334 </RelativeLayout> 335 </RelativeLayout>
335 </LinearLayout> 336 </LinearLayout>
336 </ScrollView> 337 </ScrollView>
......
...@@ -141,7 +141,9 @@ ...@@ -141,7 +141,9 @@
141 android:layout_marginTop="24dp" 141 android:layout_marginTop="24dp"
142 android:background="@drawable/shape_cos_white_border" 142 android:background="@drawable/shape_cos_white_border"
143 android:paddingHorizontal="14dp" 143 android:paddingHorizontal="14dp"
144 - android:paddingVertical="14dp"> 144 + android:paddingVertical="14dp"
145 + android:visibility="gone"
146 + tools:visibility="visible">
145 147
146 <androidx.constraintlayout.widget.Guideline 148 <androidx.constraintlayout.widget.Guideline
147 android:id="@+id/gl_horizontal_64_exp" 149 android:id="@+id/gl_horizontal_64_exp"
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@android:color/white"> 6 + android:background="@color/white">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="48dp" 11 + android:layout_height="64dp"
12 - android:background="@android:color/white"> 12 + android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_coupon_info_back" 15 android:id="@+id/iv_coupon_info_back"
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 26 + fontPath="fonts/BTCosmo-Bold.ttf"
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_info_title" 29 android:text="@string/cos_coupon_info_title"
30 - android:textColor="@color/grey" 30 + android:textColor="@color/cos_light_black"
31 - android:textSize="17sp" 31 + android:textSize="21sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 android:layout_height="match_parent" 40 android:layout_height="match_parent"
41 android:layout_below="@+id/cl_loyalty_wallet_header"> 41 android:layout_below="@+id/cl_loyalty_wallet_header">
42 42
43 - <ScrollView 43 + <androidx.core.widget.NestedScrollView
44 android:layout_width="match_parent" 44 android:layout_width="match_parent"
45 android:layout_height="match_parent" 45 android:layout_height="match_parent"
46 android:overScrollMode="never"> 46 android:overScrollMode="never">
...@@ -53,61 +53,60 @@ ...@@ -53,61 +53,60 @@
53 android:orientation="vertical" 53 android:orientation="vertical"
54 android:paddingBottom="48dp"> 54 android:paddingBottom="48dp">
55 55
56 -<!-- <ImageView--> 56 + <ImageView
57 -<!-- android:id="@+id/imageView6"--> 57 + android:id="@+id/imageView6"
58 -<!-- android:layout_width="match_parent"--> 58 + android:layout_width="match_parent"
59 -<!-- android:layout_height="253dp"--> 59 + android:layout_height="295dp"
60 -<!-- android:layout_marginTop="0.5dp"--> 60 + android:scaleType="centerCrop"
61 -<!-- android:scaleType="centerCrop"--> 61 + android:src="@drawable/unified_coupon_banner" />
62 -<!-- android:src="@drawable/unified_coupon_banner" />-->
63 62
64 <TextView 63 <TextView
65 android:id="@+id/textView13" 64 android:id="@+id/textView13"
66 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 65 + fontPath="fonts/BTCosmo-Bold.ttf"
67 android:layout_width="match_parent" 66 android:layout_width="match_parent"
68 android:layout_height="wrap_content" 67 android:layout_height="wrap_content"
69 android:layout_marginTop="32dp" 68 android:layout_marginTop="32dp"
70 android:gravity="center" 69 android:gravity="center"
71 android:paddingHorizontal="32dp" 70 android:paddingHorizontal="32dp"
72 android:text="@string/cos_unified_title" 71 android:text="@string/cos_unified_title"
73 - android:textColor="#415564" 72 + android:textColor="@color/cos_light_black"
74 android:textSize="18sp" /> 73 android:textSize="18sp" />
75 74
76 <TextView 75 <TextView
77 android:id="@+id/textView14" 76 android:id="@+id/textView14"
78 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 77 + fontPath="fonts/PeridotPE-Regular.ttf"
79 android:layout_width="match_parent" 78 android:layout_width="match_parent"
80 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
81 android:layout_marginTop="16dp" 80 android:layout_marginTop="16dp"
82 android:gravity="center" 81 android:gravity="center"
83 android:paddingHorizontal="32dp" 82 android:paddingHorizontal="32dp"
84 android:text="@string/cos_unified_subtitle" 83 android:text="@string/cos_unified_subtitle"
85 - android:textColor="#415564" 84 + android:textColor="@color/cos_light_black"
86 android:textSize="16sp" /> 85 android:textSize="16sp" />
87 86
88 <TextView 87 <TextView
89 android:id="@+id/textView15" 88 android:id="@+id/textView15"
90 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 89 + fontPath="fonts/PeridotPE-Bold.ttf"
91 android:layout_width="wrap_content" 90 android:layout_width="wrap_content"
92 android:layout_height="wrap_content" 91 android:layout_height="wrap_content"
93 android:layout_gravity="center" 92 android:layout_gravity="center"
94 - android:layout_marginTop="36dp" 93 + android:layout_marginTop="24dp"
95 android:text="Κωδικός Κουπονιού" 94 android:text="Κωδικός Κουπονιού"
96 - android:textColor="#415564" 95 + android:textColor="@color/cos_light_black"
97 android:textSize="18sp" /> 96 android:textSize="18sp" />
98 97
99 <TextView 98 <TextView
100 android:id="@+id/textView16" 99 android:id="@+id/textView16"
101 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 100 + fontPath="fonts/PeridotPE-Bold.ttf"
102 android:layout_width="match_parent" 101 android:layout_width="match_parent"
103 android:layout_height="50dp" 102 android:layout_height="50dp"
104 android:layout_marginHorizontal="32dp" 103 android:layout_marginHorizontal="32dp"
105 android:layout_marginTop="12dp" 104 android:layout_marginTop="12dp"
106 android:background="@drawable/banner_border_light_grey" 105 android:background="@drawable/banner_border_light_grey"
107 android:gravity="center" 106 android:gravity="center"
108 - android:textColor="@color/grey" 107 + android:textColor="@color/cos_light_black"
109 android:textIsSelectable="true" 108 android:textIsSelectable="true"
110 - android:textSize="25dp" 109 + android:textSize="25sp"
111 tools:text="1A2C378" /> 110 tools:text="1A2C378" />
112 111
113 <LinearLayout 112 <LinearLayout
...@@ -162,12 +161,13 @@ ...@@ -162,12 +161,13 @@
162 161
163 <TextView 162 <TextView
164 android:id="@+id/textView17" 163 android:id="@+id/textView17"
165 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 164 + fontPath="fonts/PeridotPE-Regular.ttf"
166 android:layout_width="wrap_content" 165 android:layout_width="wrap_content"
167 android:layout_height="wrap_content" 166 android:layout_height="wrap_content"
168 android:layout_gravity="center" 167 android:layout_gravity="center"
169 android:layout_marginTop="16dp" 168 android:layout_marginTop="16dp"
170 - android:textColor="#415564" 169 + android:textColor="@color/cos_light_black"
170 + android:textSize="16sp"
171 tools:text="@string/cos_coupon_date" /> 171 tools:text="@string/cos_coupon_date" />
172 172
173 <LinearLayout 173 <LinearLayout
...@@ -181,11 +181,11 @@ ...@@ -181,11 +181,11 @@
181 181
182 <TextView 182 <TextView
183 android:id="@+id/tv_market_expand" 183 android:id="@+id/tv_market_expand"
184 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 184 + fontPath="fonts/PeridotPE-Bold.ttf"
185 android:layout_width="wrap_content" 185 android:layout_width="wrap_content"
186 android:layout_height="wrap_content" 186 android:layout_height="wrap_content"
187 android:text="@string/cos_hide_market_coupons" 187 android:text="@string/cos_hide_market_coupons"
188 - android:textColor="@color/grey" 188 + android:textColor="@color/cos_light_black"
189 android:textSize="16sp" /> 189 android:textSize="16sp" />
190 190
191 <ImageView 191 <ImageView
...@@ -193,6 +193,7 @@ ...@@ -193,6 +193,7 @@
193 android:layout_width="14dp" 193 android:layout_width="14dp"
194 android:layout_height="14dp" 194 android:layout_height="14dp"
195 android:layout_marginStart="6dp" 195 android:layout_marginStart="6dp"
196 + android:layout_marginTop="3dp"
196 android:src="@drawable/ic_up_dark_new" /> 197 android:src="@drawable/ic_up_dark_new" />
197 </LinearLayout> 198 </LinearLayout>
198 199
...@@ -201,6 +202,7 @@ ...@@ -201,6 +202,7 @@
201 android:layout_width="match_parent" 202 android:layout_width="match_parent"
202 android:layout_height="wrap_content" 203 android:layout_height="wrap_content"
203 android:layout_marginTop="16dp" 204 android:layout_marginTop="16dp"
205 + android:background="@color/cos_light_grey3"
204 android:orientation="vertical"> 206 android:orientation="vertical">
205 207
206 <androidx.recyclerview.widget.RecyclerView 208 <androidx.recyclerview.widget.RecyclerView
...@@ -211,11 +213,10 @@ ...@@ -211,11 +213,10 @@
211 android:overScrollMode="never" /> 213 android:overScrollMode="never" />
212 </LinearLayout> 214 </LinearLayout>
213 215
214 -
215 <LinearLayout 216 <LinearLayout
216 android:id="@+id/ll_shops" 217 android:id="@+id/ll_shops"
217 android:layout_width="220dp" 218 android:layout_width="220dp"
218 - android:layout_height="wrap_content" 219 + android:layout_height="55dp"
219 android:layout_gravity="center" 220 android:layout_gravity="center"
220 android:layout_marginHorizontal="32dp" 221 android:layout_marginHorizontal="32dp"
221 android:layout_marginTop="24dp" 222 android:layout_marginTop="24dp"
...@@ -225,13 +226,14 @@ ...@@ -225,13 +226,14 @@
225 android:paddingVertical="8dp"> 226 android:paddingVertical="8dp">
226 227
227 <TextView 228 <TextView
228 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 229 + fontPath="fonts/PeridotPE-SemiBold.ttf"
229 android:layout_width="wrap_content" 230 android:layout_width="wrap_content"
230 android:layout_height="wrap_content" 231 android:layout_height="wrap_content"
231 android:gravity="center" 232 android:gravity="center"
233 + android:includeFontPadding="false"
232 android:text="@string/cos_markets" 234 android:text="@string/cos_markets"
233 android:textColor="@color/white" 235 android:textColor="@color/white"
234 - android:textSize="17dp" /> 236 + android:textSize="16sp" />
235 </LinearLayout> 237 </LinearLayout>
236 238
237 <RelativeLayout 239 <RelativeLayout
...@@ -239,7 +241,7 @@ ...@@ -239,7 +241,7 @@
239 android:layout_width="wrap_content" 241 android:layout_width="wrap_content"
240 android:layout_height="wrap_content" 242 android:layout_height="wrap_content"
241 android:layout_gravity="center" 243 android:layout_gravity="center"
242 - android:layout_marginTop="32dp" 244 + android:layout_marginTop="24dp"
243 android:gravity="center"> 245 android:gravity="center">
244 246
245 <LinearLayout 247 <LinearLayout
...@@ -252,11 +254,11 @@ ...@@ -252,11 +254,11 @@
252 254
253 <TextView 255 <TextView
254 android:id="@+id/tv_terms" 256 android:id="@+id/tv_terms"
255 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 257 + fontPath="fonts/PeridotPE-Bold.ttf"
256 android:layout_width="wrap_content" 258 android:layout_width="wrap_content"
257 android:layout_height="wrap_content" 259 android:layout_height="wrap_content"
258 android:text="@string/cos_coupon_terms_title" 260 android:text="@string/cos_coupon_terms_title"
259 - android:textColor="@color/grey" 261 + android:textColor="@color/cos_light_black"
260 android:textSize="16sp" /> 262 android:textSize="16sp" />
261 263
262 <ImageView 264 <ImageView
...@@ -264,29 +266,24 @@ ...@@ -264,29 +266,24 @@
264 android:layout_width="14dp" 266 android:layout_width="14dp"
265 android:layout_height="14dp" 267 android:layout_height="14dp"
266 android:layout_marginStart="6dp" 268 android:layout_marginStart="6dp"
269 + android:layout_marginTop="3dp"
267 android:src="@drawable/ic_down_dark_new" /> 270 android:src="@drawable/ic_down_dark_new" />
268 </LinearLayout> 271 </LinearLayout>
269 272
270 <TextView 273 <TextView
271 android:id="@+id/tv_terms_value" 274 android:id="@+id/tv_terms_value"
272 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 275 + fontPath="fonts/PeridotPE-Regular.ttf"
273 android:layout_width="wrap_content" 276 android:layout_width="wrap_content"
274 android:layout_height="wrap_content" 277 android:layout_height="wrap_content"
275 android:layout_below="@+id/ll_terms_inner" 278 android:layout_below="@+id/ll_terms_inner"
276 android:layout_marginHorizontal="32dp" 279 android:layout_marginHorizontal="32dp"
277 android:layout_marginTop="16dp" 280 android:layout_marginTop="16dp"
278 android:text="@string/cos_market_terms" 281 android:text="@string/cos_market_terms"
279 - android:textColor="#415564" 282 + android:textColor="@color/cos_gray"
280 - android:visibility="gone" /> 283 + android:visibility="gone"
284 + tools:visibility="visible"/>
281 </RelativeLayout> 285 </RelativeLayout>
282 </LinearLayout> 286 </LinearLayout>
283 - </ScrollView> 287 + </androidx.core.widget.NestedScrollView>
284 -
285 - <LinearLayout
286 - android:layout_width="match_parent"
287 - android:layout_height="wrap_content"
288 - android:background="@drawable/ic_line">
289 -
290 - </LinearLayout>
291 </RelativeLayout> 288 </RelativeLayout>
292 </RelativeLayout> 289 </RelativeLayout>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:id="@+id/cl_custom_layout" 5 android:id="@+id/cl_custom_layout"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 - android:layout_height="130dp" 7 + android:layout_height="150dp"
8 android:layout_marginHorizontal="4dp" 8 android:layout_marginHorizontal="4dp"
9 android:layout_marginVertical="4dp" 9 android:layout_marginVertical="4dp"
10 android:background="@drawable/ic_coupon_background"> 10 android:background="@drawable/ic_coupon_background">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="130dp" 6 + android:layout_height="150dp"
7 android:layout_marginHorizontal="4dp" 7 android:layout_marginHorizontal="4dp"
8 android:layout_marginVertical="4dp" 8 android:layout_marginVertical="4dp"
9 android:background="@drawable/ic_coupon_background_new2"> 9 android:background="@drawable/ic_coupon_background_new2">
......