open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
705e8a16 1 parent e68e3841

redesign part3

Expand all
Inline Side-by-side
Showing 16 changed files with 70 additions and 67 deletions
...@@ -257,10 +257,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -257,10 +257,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
257 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 257 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
258 CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 258 CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
259 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 259 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
260 - sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 260 + sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
261 - sBuilder.setSpan(typefaceRegularSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 261 + sBuilder.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);
262 - sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 262 + sBuilder.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);
263 - sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).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); 263 + sBuilder.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);
264 264
265 mTvCouponsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE); 265 mTvCouponsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
266 266
......
...@@ -70,7 +70,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -70,7 +70,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
70 mTvActiveTitle, mTvActiveCouponsHeader; 70 mTvActiveTitle, mTvActiveCouponsHeader;
71 private ConstraintLayout mClDealsBanner, mClDealsView, 71 private ConstraintLayout mClDealsBanner, mClDealsView,
72 mClGiftsBanner, mClToolbar; 72 mClGiftsBanner, mClToolbar;
73 - private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet; 73 + private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts;
74 private FlowLayout mLlActiveCodesView; 74 private FlowLayout mLlActiveCodesView;
75 private float couponDfyValue = 0.0f; 75 private float couponDfyValue = 0.0f;
76 private RecyclerView mRecyclerCoupons; 76 private RecyclerView mRecyclerCoupons;
...@@ -105,6 +105,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -105,6 +105,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
105 mTvActiveDate = findViewById(R.id.tv_active_deals_date_text); 105 mTvActiveDate = findViewById(R.id.tv_active_deals_date_text);
106 mIvDealsLogo = findViewById(R.id.dfy_logo); 106 mIvDealsLogo = findViewById(R.id.dfy_logo);
107 mClDealsView = findViewById(R.id.cl_mygifts); 107 mClDealsView = findViewById(R.id.cl_mygifts);
108 + mLlDeals = findViewById(R.id.ll_mygifts);
108 mIvProfilePhoto = findViewById(R.id.iv_profile_photo); 109 mIvProfilePhoto = findViewById(R.id.iv_profile_photo);
109 mTvActiveTitle = findViewById(R.id.tv_active_gifts); 110 mTvActiveTitle = findViewById(R.id.tv_active_gifts);
110 mTvActiveCouponsHeader = findViewById(R.id.tv_active_coupons_header); 111 mTvActiveCouponsHeader = findViewById(R.id.tv_active_coupons_header);
...@@ -113,6 +114,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -113,6 +114,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
113 mScActiveCodes = findViewById(R.id.sv_active_deals_codes_view); 114 mScActiveCodes = findViewById(R.id.sv_active_deals_codes_view);
114 mSvLoyaltyWallet = findViewById(R.id.sv_loyalty_wallet); 115 mSvLoyaltyWallet = findViewById(R.id.sv_loyalty_wallet);
115 mClToolbar = findViewById(R.id.cl_loyalty_wallet_header); 116 mClToolbar = findViewById(R.id.cl_loyalty_wallet_header);
117 + mLlGifts = findViewById(R.id.ll_gifts_view);
116 118
117 if (WarplyManagerHelper.getActiveDFYCoupons() != null) { 119 if (WarplyManagerHelper.getActiveDFYCoupons() != null) {
118 Collections.sort(WarplyManagerHelper.getActiveDFYCoupons(), new Comparator<ActiveDFYCouponModel>() { 120 Collections.sort(WarplyManagerHelper.getActiveDFYCoupons(), new Comparator<ActiveDFYCouponModel>() {
...@@ -307,8 +309,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -307,8 +309,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
307 .subscribe(); 309 .subscribe();
308 mAdapterCoupons.notifyDataSetChanged(); 310 mAdapterCoupons.notifyDataSetChanged();
309 } else { 311 } else {
310 - mRecyclerCoupons.setVisibility(View.GONE); 312 + mLlGifts.setVisibility(View.GONE);
311 - mTvActiveCouponsHeader.setVisibility(View.GONE);
312 } 313 }
313 }); 314 });
314 } 315 }
...@@ -360,8 +361,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -360,8 +361,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
360 }) 361 })
361 .subscribe(); 362 .subscribe();
362 } else { 363 } else {
363 - mRecyclerCoupons.setVisibility(View.GONE); 364 + mLlGifts.setVisibility(View.GONE);
364 - mTvActiveCouponsHeader.setVisibility(View.GONE);
365 } 365 }
366 366
367 if (WarplyManagerHelper.getDealsCouponsSum() > 0) { 367 if (WarplyManagerHelper.getDealsCouponsSum() > 0) {
...@@ -403,10 +403,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -403,10 +403,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
403 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 403 CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
404 CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 404 CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
405 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 405 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
406 - sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 406 + sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
407 - sBuilder.setSpan(typefaceRegularSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 407 + sBuilder.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);
408 - sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 408 + sBuilder.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);
409 - sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).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); 409 + sBuilder.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);
410 410
411 mTvGiftsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE); 411 mTvGiftsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
412 } else { 412 } else {
...@@ -470,8 +470,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -470,8 +470,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
470 } 470 }
471 // mTvActiveCode.setText(codes); 471 // mTvActiveCode.setText(codes);
472 } else { 472 } else {
473 - mIvDealsLogo.setVisibility(View.GONE); 473 + mLlDeals.setVisibility(View.GONE);
474 - mClDealsView.setVisibility(View.GONE);
475 } 474 }
476 475
477 if (WarplyManagerHelper.getConsumer() != null) { 476 if (WarplyManagerHelper.getConsumer() != null) {
...@@ -500,7 +499,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -500,7 +499,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
500 } 499 }
501 500
502 if (mClDealsBanner.getVisibility() == View.GONE && mClGiftsBanner.getVisibility() == View.GONE 501 if (mClDealsBanner.getVisibility() == View.GONE && mClGiftsBanner.getVisibility() == View.GONE
503 - && mClDealsView.getVisibility() == View.GONE && WarplyManagerHelper.getCouponList().size() == 0) { 502 + && mLlDeals.getVisibility() == View.GONE && mLlGifts.getVisibility() == View.GONE) {
504 mLlEmptyWallet.setVisibility(View.VISIBLE); 503 mLlEmptyWallet.setVisibility(View.VISIBLE);
505 } 504 }
506 505
......
...@@ -122,7 +122,7 @@ public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapte ...@@ -122,7 +122,7 @@ public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapte
122 122
123 JSONObject extraFields = WarpJSONParser.getJSONFromString(couponItem.getTransactionMetadata()); 123 JSONObject extraFields = WarpJSONParser.getJSONFromString(couponItem.getTransactionMetadata());
124 124
125 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("E, MMM dd yyyy HH:mm:ss", Locale.US); 125 + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss", Locale.US);
126 Date newDate = new Date(); 126 Date newDate = new Date();
127 try { 127 try {
128 newDate = simpleDateFormat.parse(couponItem.getDate()); 128 newDate = simpleDateFormat.parse(couponItem.getDate());
......
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
99 <LinearLayout 99 <LinearLayout
100 android:id="@+id/ll_activate_button" 100 android:id="@+id/ll_activate_button"
101 android:layout_width="160dp" 101 android:layout_width="160dp"
102 - android:layout_height="42dp" 102 + android:layout_height="55dp"
103 android:background="@drawable/selector_button_green" 103 android:background="@drawable/selector_button_green"
104 android:gravity="center" 104 android:gravity="center"
105 android:orientation="horizontal" 105 android:orientation="horizontal"
......
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
213 <LinearLayout 213 <LinearLayout
214 android:id="@+id/ll_gift_it" 214 android:id="@+id/ll_gift_it"
215 android:layout_width="160dp" 215 android:layout_width="160dp"
216 - android:layout_height="42dp" 216 + android:layout_height="55dp"
217 android:layout_gravity="center" 217 android:layout_gravity="center"
218 android:layout_marginHorizontal="32dp" 218 android:layout_marginHorizontal="32dp"
219 android:layout_marginTop="64dp" 219 android:layout_marginTop="64dp"
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
236 <LinearLayout 236 <LinearLayout
237 android:id="@+id/ll_shops" 237 android:id="@+id/ll_shops"
238 android:layout_width="220dp" 238 android:layout_width="220dp"
239 - android:layout_height="42dp" 239 + android:layout_height="55dp"
240 android:layout_gravity="center" 240 android:layout_gravity="center"
241 android:layout_marginHorizontal="32dp" 241 android:layout_marginHorizontal="32dp"
242 android:layout_marginTop="24dp" 242 android:layout_marginTop="24dp"
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
261 <LinearLayout 261 <LinearLayout
262 android:id="@+id/ll_website" 262 android:id="@+id/ll_website"
263 android:layout_width="220dp" 263 android:layout_width="220dp"
264 - android:layout_height="42dp" 264 + android:layout_height="55dp"
265 android:layout_gravity="center" 265 android:layout_gravity="center"
266 android:layout_marginHorizontal="32dp" 266 android:layout_marginHorizontal="32dp"
267 android:layout_marginTop="24dp" 267 android:layout_marginTop="24dp"
......
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
146 146
147 <EditText 147 <EditText
148 android:id="@+id/et_phone" 148 android:id="@+id/et_phone"
149 + fontPath="fonts/PeridotPE-Regular.ttf"
149 android:layout_width="match_parent" 150 android:layout_width="match_parent"
150 android:layout_height="wrap_content" 151 android:layout_height="wrap_content"
151 android:layout_alignParentStart="true" 152 android:layout_alignParentStart="true"
...@@ -153,7 +154,6 @@ ...@@ -153,7 +154,6 @@
153 android:background="@android:color/transparent" 154 android:background="@android:color/transparent"
154 android:hint="@string/cos_coupon_share_hint" 155 android:hint="@string/cos_coupon_share_hint"
155 android:inputType="phone" 156 android:inputType="phone"
156 - fontPath="fonts/PeridotPE-Regular.ttf"
157 android:textColor="@color/cos_gray2" 157 android:textColor="@color/cos_gray2"
158 android:textColorHint="@color/cos_gray2" 158 android:textColorHint="@color/cos_gray2"
159 android:textSize="16sp" /> 159 android:textSize="16sp" />
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
172 <LinearLayout 172 <LinearLayout
173 android:id="@+id/ll_share_button" 173 android:id="@+id/ll_share_button"
174 android:layout_width="190dp" 174 android:layout_width="190dp"
175 - android:layout_height="42dp" 175 + android:layout_height="55dp"
176 android:layout_marginHorizontal="32dp" 176 android:layout_marginHorizontal="32dp"
177 android:layout_marginTop="64dp" 177 android:layout_marginTop="64dp"
178 android:background="@drawable/selector_button_green" 178 android:background="@drawable/selector_button_green"
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
85 <LinearLayout 85 <LinearLayout
86 android:id="@+id/ll_get_gift" 86 android:id="@+id/ll_get_gift"
87 android:layout_width="160dp" 87 android:layout_width="160dp"
88 - android:layout_height="42dp" 88 + android:layout_height="55dp"
89 android:layout_marginTop="27dp" 89 android:layout_marginTop="27dp"
90 android:background="@drawable/selector_button_green" 90 android:background="@drawable/selector_button_green"
91 android:gravity="center" 91 android:gravity="center"
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
119 android:layout_height="wrap_content" 119 android:layout_height="wrap_content"
120 android:layout_below="@+id/tv_expired_title" 120 android:layout_below="@+id/tv_expired_title"
121 android:layout_marginTop="32dp" 121 android:layout_marginTop="32dp"
122 + android:scrollbars="none"
122 android:overScrollMode="never"> 123 android:overScrollMode="never">
123 124
124 <LinearLayout 125 <LinearLayout
...@@ -138,20 +139,19 @@ ...@@ -138,20 +139,19 @@
138 android:layout_width="wrap_content" 139 android:layout_width="wrap_content"
139 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
140 android:layout_gravity="center" 141 android:layout_gravity="center"
141 - android:layout_marginTop="20dp"
142 android:gravity="center" 142 android:gravity="center"
143 android:orientation="horizontal" 143 android:orientation="horizontal"
144 - android:paddingBottom="56dp" 144 + android:paddingBottom="8dp"
145 android:visibility="gone" 145 android:visibility="gone"
146 tools:visibility="visible"> 146 tools:visibility="visible">
147 147
148 <TextView 148 <TextView
149 android:id="@+id/tv_expired_more" 149 android:id="@+id/tv_expired_more"
150 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 150 + fontPath="fonts/PeridotPE-Bold.ttf"
151 android:layout_width="wrap_content" 151 android:layout_width="wrap_content"
152 android:layout_height="wrap_content" 152 android:layout_height="wrap_content"
153 android:text="@string/cos_see_more" 153 android:text="@string/cos_see_more"
154 - android:textColor="@color/grey" 154 + android:textColor="@color/cos_light_black"
155 android:textSize="16sp" /> 155 android:textSize="16sp" />
156 156
157 <ImageView 157 <ImageView
...@@ -159,7 +159,8 @@ ...@@ -159,7 +159,8 @@
159 android:layout_width="14dp" 159 android:layout_width="14dp"
160 android:layout_height="14dp" 160 android:layout_height="14dp"
161 android:layout_marginStart="6dp" 161 android:layout_marginStart="6dp"
162 - android:src="@drawable/ic_down_dark" /> 162 + android:layout_marginTop="3dp"
163 + android:src="@drawable/ic_down_dark_new" />
163 </LinearLayout> 164 </LinearLayout>
164 </LinearLayout> 165 </LinearLayout>
165 </ScrollView> 166 </ScrollView>
...@@ -167,14 +168,14 @@ ...@@ -167,14 +168,14 @@
167 168
168 <TextView 169 <TextView
169 android:id="@+id/tv_expired_empty" 170 android:id="@+id/tv_expired_empty"
170 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 171 + fontPath="fonts/PeridotPE-Regular.ttf"
171 android:layout_width="wrap_content" 172 android:layout_width="wrap_content"
172 android:layout_height="wrap_content" 173 android:layout_height="wrap_content"
173 android:layout_below="@+id/tv_expired_title" 174 android:layout_below="@+id/tv_expired_title"
174 android:layout_centerHorizontal="true" 175 android:layout_centerHorizontal="true"
175 android:layout_marginTop="56dp" 176 android:layout_marginTop="56dp"
176 android:text="@string/cos_empty_expired_coupons" 177 android:text="@string/cos_empty_expired_coupons"
177 - android:textColor="@color/cos_light_grey2" 178 + android:textColor="@color/cos_light_black"
178 android:textSize="16sp" 179 android:textSize="16sp"
179 android:visibility="gone" /> 180 android:visibility="gone" />
180 </RelativeLayout> 181 </RelativeLayout>
...@@ -183,25 +184,29 @@ ...@@ -183,25 +184,29 @@
183 android:id="@+id/rl_shared_view" 184 android:id="@+id/rl_shared_view"
184 android:layout_width="match_parent" 185 android:layout_width="match_parent"
185 android:layout_height="wrap_content" 186 android:layout_height="wrap_content"
187 + android:background="@drawable/shape_cos_white_border"
186 android:layout_below="@+id/iv_gift_circle_logo" 188 android:layout_below="@+id/iv_gift_circle_logo"
187 android:layout_marginTop="32dp" 189 android:layout_marginTop="32dp"
190 + android:layout_marginHorizontal="12dp"
191 + android:paddingHorizontal="16dp"
192 + android:paddingVertical="16dp"
188 android:visibility="gone"> 193 android:visibility="gone">
189 194
190 <TextView 195 <TextView
191 android:id="@+id/tv_shared_title" 196 android:id="@+id/tv_shared_title"
192 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 197 + fontPath="fonts/BTCosmo-Bold.ttf"
193 android:layout_width="wrap_content" 198 android:layout_width="wrap_content"
194 android:layout_height="wrap_content" 199 android:layout_height="wrap_content"
195 - android:layout_centerHorizontal="true"
196 android:text="@string/cos_analysis2" 200 android:text="@string/cos_analysis2"
197 - android:textColor="@color/cos_blue_dark" 201 + android:textColor="@color/cos_light_black"
198 - android:textSize="16sp" /> 202 + android:textSize="21sp" />
199 203
200 <ScrollView 204 <ScrollView
201 android:layout_width="match_parent" 205 android:layout_width="match_parent"
202 android:layout_height="wrap_content" 206 android:layout_height="wrap_content"
203 android:layout_below="@+id/tv_shared_title" 207 android:layout_below="@+id/tv_shared_title"
204 android:layout_marginTop="24dp" 208 android:layout_marginTop="24dp"
209 + android:scrollbars="none"
205 android:overScrollMode="never"> 210 android:overScrollMode="never">
206 211
207 <LinearLayout 212 <LinearLayout
...@@ -213,7 +218,6 @@ ...@@ -213,7 +218,6 @@
213 android:id="@+id/rv_shared_coupons" 218 android:id="@+id/rv_shared_coupons"
214 android:layout_width="match_parent" 219 android:layout_width="match_parent"
215 android:layout_height="wrap_content" 220 android:layout_height="wrap_content"
216 - android:layout_marginHorizontal="8dp"
217 android:orientation="vertical" 221 android:orientation="vertical"
218 android:overScrollMode="never" /> 222 android:overScrollMode="never" />
219 223
...@@ -222,28 +226,28 @@ ...@@ -222,28 +226,28 @@
222 android:layout_width="wrap_content" 226 android:layout_width="wrap_content"
223 android:layout_height="wrap_content" 227 android:layout_height="wrap_content"
224 android:layout_gravity="center" 228 android:layout_gravity="center"
225 - android:layout_marginTop="20dp"
226 android:gravity="center" 229 android:gravity="center"
227 android:orientation="horizontal" 230 android:orientation="horizontal"
228 - android:paddingBottom="56dp" 231 + android:paddingBottom="8dp"
229 android:visibility="gone" 232 android:visibility="gone"
230 tools:visibility="visible"> 233 tools:visibility="visible">
231 234
232 <TextView 235 <TextView
233 android:id="@+id/tv_shared_more" 236 android:id="@+id/tv_shared_more"
234 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 237 + fontPath="fonts/PeridotPE-Bold.ttf"
235 android:layout_width="wrap_content" 238 android:layout_width="wrap_content"
236 android:layout_height="wrap_content" 239 android:layout_height="wrap_content"
237 android:text="@string/cos_see_more" 240 android:text="@string/cos_see_more"
238 - android:textColor="@color/grey" 241 + android:textColor="@color/cos_light_black"
239 android:textSize="16sp" /> 242 android:textSize="16sp" />
240 243
241 <ImageView 244 <ImageView
242 android:id="@+id/iv_shared_more_arrow" 245 android:id="@+id/iv_shared_more_arrow"
243 android:layout_width="14dp" 246 android:layout_width="14dp"
244 android:layout_height="14dp" 247 android:layout_height="14dp"
248 + android:layout_marginTop="3dp"
245 android:layout_marginStart="6dp" 249 android:layout_marginStart="6dp"
246 - android:src="@drawable/ic_down_dark" /> 250 + android:src="@drawable/ic_down_dark_new" />
247 </LinearLayout> 251 </LinearLayout>
248 </LinearLayout> 252 </LinearLayout>
249 </ScrollView> 253 </ScrollView>
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 <LinearLayout 150 <LinearLayout
151 android:id="@+id/ll_activate_button" 151 android:id="@+id/ll_activate_button"
152 android:layout_width="160dp" 152 android:layout_width="160dp"
153 - android:layout_height="42dp" 153 + android:layout_height="55dp"
154 android:layout_below="@+id/textView13" 154 android:layout_below="@+id/textView13"
155 android:layout_centerHorizontal="true" 155 android:layout_centerHorizontal="true"
156 android:layout_marginTop="44dp" 156 android:layout_marginTop="44dp"
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
7 7
8 <TextView 8 <TextView
9 android:id="@+id/tv_expired_coupons_date" 9 android:id="@+id/tv_expired_coupons_date"
10 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 10 + fontPath="fonts/PeridotPE-Bold.ttf"
11 android:layout_width="wrap_content" 11 android:layout_width="wrap_content"
12 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
13 - android:textColor="@color/cos_blue_dark2" 13 + android:textColor="@color/cos_light_black"
14 android:textSize="13sp" 14 android:textSize="13sp"
15 tools:text="05/05/2022" /> 15 tools:text="05/05/2022" />
16 16
...@@ -42,36 +42,36 @@ ...@@ -42,36 +42,36 @@
42 42
43 <TextView 43 <TextView
44 android:id="@+id/tv_expired_coupons_title" 44 android:id="@+id/tv_expired_coupons_title"
45 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 45 + fontPath="fonts/PeridotPE-Regular.ttf"
46 android:layout_width="wrap_content" 46 android:layout_width="wrap_content"
47 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
48 android:layout_weight="0.5" 48 android:layout_weight="0.5"
49 android:maxLines="2" 49 android:maxLines="2"
50 - android:textColor="@color/cos_blue_dark2" 50 + android:textColor="@color/cos_light_black"
51 - android:textSize="16sp" 51 + android:textSize="18sp"
52 tools:text="Box" /> 52 tools:text="Box" />
53 53
54 <TextView 54 <TextView
55 android:id="@+id/tv_expired_coupons_value" 55 android:id="@+id/tv_expired_coupons_value"
56 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 56 + fontPath="fonts/PeridotPE-Bold.ttf"
57 android:layout_width="wrap_content" 57 android:layout_width="wrap_content"
58 android:layout_height="wrap_content" 58 android:layout_height="wrap_content"
59 android:layout_weight="0.5" 59 android:layout_weight="0.5"
60 android:gravity="end" 60 android:gravity="end"
61 - android:textColor="@color/cos_blue_dark2" 61 + android:textColor="@color/cos_light_black"
62 - android:textSize="16sp" 62 + android:textSize="18sp"
63 tools:text="4$" /> 63 tools:text="4$" />
64 </LinearLayout> 64 </LinearLayout>
65 65
66 <TextView 66 <TextView
67 android:id="@+id/tv_expired_coupons_label" 67 android:id="@+id/tv_expired_coupons_label"
68 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 68 + fontPath="fonts/PeridotPE-Regular.ttf"
69 android:layout_width="wrap_content" 69 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 70 android:layout_height="wrap_content"
71 android:layout_below="@+id/ll_expired_info_view" 71 android:layout_below="@+id/ll_expired_info_view"
72 android:text="@string/cos_expired_coupon_label" 72 android:text="@string/cos_expired_coupon_label"
73 - android:textColor="@color/cos_light_grey2" 73 + android:textColor="@color/cos_gray"
74 - android:textSize="16sp" /> 74 + android:textSize="15sp" />
75 </LinearLayout> 75 </LinearLayout>
76 </LinearLayout> 76 </LinearLayout>
77 </RelativeLayout> 77 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
7 7
8 <TextView 8 <TextView
9 android:id="@+id/tv_shared_coupons_date" 9 android:id="@+id/tv_shared_coupons_date"
10 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 10 + fontPath="fonts/PeridotPE-Bold.ttf"
11 android:layout_width="wrap_content" 11 android:layout_width="wrap_content"
12 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
13 - android:textColor="@color/cos_blue_dark2" 13 + android:textColor="@color/cos_light_black"
14 android:textSize="13sp" 14 android:textSize="13sp"
15 tools:text="05/05/2022" /> 15 tools:text="05/05/2022" />
16 16
...@@ -42,43 +42,43 @@ ...@@ -42,43 +42,43 @@
42 42
43 <TextView 43 <TextView
44 android:id="@+id/tv_shared_coupons_title" 44 android:id="@+id/tv_shared_coupons_title"
45 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 45 + fontPath="fonts/PeridotPE-Regular.ttf"
46 android:layout_width="wrap_content" 46 android:layout_width="wrap_content"
47 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
48 android:layout_weight="0.5" 48 android:layout_weight="0.5"
49 android:maxLines="2" 49 android:maxLines="2"
50 - android:textColor="@color/cos_blue_dark2" 50 + android:textColor="@color/cos_light_black"
51 - android:textSize="16sp" 51 + android:textSize="18sp"
52 tools:text="Box" /> 52 tools:text="Box" />
53 53
54 <TextView 54 <TextView
55 android:id="@+id/tv_shared_coupons_value" 55 android:id="@+id/tv_shared_coupons_value"
56 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 56 + fontPath="fonts/PeridotPE-Bold.ttf"
57 android:layout_width="wrap_content" 57 android:layout_width="wrap_content"
58 android:layout_height="wrap_content" 58 android:layout_height="wrap_content"
59 android:layout_weight="0.5" 59 android:layout_weight="0.5"
60 android:gravity="end" 60 android:gravity="end"
61 - android:textColor="@color/cos_blue_dark2" 61 + android:textColor="@color/cos_light_black"
62 - android:textSize="16sp" 62 + android:textSize="18sp"
63 tools:text="4$" /> 63 tools:text="4$" />
64 </LinearLayout> 64 </LinearLayout>
65 65
66 <TextView 66 <TextView
67 android:id="@+id/tv_shared_coupons_label" 67 android:id="@+id/tv_shared_coupons_label"
68 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 68 + fontPath="fonts/PeridotPE-Regular.ttf"
69 android:layout_width="wrap_content" 69 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 70 android:layout_height="wrap_content"
71 - android:textColor="@color/cos_light_grey2" 71 + android:textColor="@color/cos_gray"
72 - android:textSize="16sp" 72 + android:textSize="15sp"
73 tools:text="@string/cos_expired_coupon_label" /> 73 tools:text="@string/cos_expired_coupon_label" />
74 74
75 <TextView 75 <TextView
76 android:id="@+id/tv_shared_coupons_phone" 76 android:id="@+id/tv_shared_coupons_phone"
77 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 77 + fontPath="fonts/PeridotPE-Regular.ttf"
78 android:layout_width="wrap_content" 78 android:layout_width="wrap_content"
79 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
80 - android:textColor="@color/cos_light_grey2" 80 + android:textColor="@color/cos_gray"
81 - android:textSize="16sp" 81 + android:textSize="15sp"
82 tools:text="@string/cos_expired_coupon_label" /> 82 tools:text="@string/cos_expired_coupon_label" />
83 </LinearLayout> 83 </LinearLayout>
84 </LinearLayout> 84 </LinearLayout>
......