open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
935fa9c7 1 parent 3aa057ba

feedback fixes

Inline Side-by-side
Showing 7 changed files with 136 additions and 54 deletions
...@@ -81,6 +81,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli ...@@ -81,6 +81,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
81 mFontHeader = findViewById(R.id.textView3); 81 mFontHeader = findViewById(R.id.textView3);
82 mIvInfo = findViewById(R.id.iv_coupons_info); 82 mIvInfo = findViewById(R.id.iv_coupons_info);
83 mClInfoView = findViewById(R.id.cl_info_view); 83 mClInfoView = findViewById(R.id.cl_info_view);
84 + mClInfoView.setOnTouchListener((v, event) -> true);
84 mTvInnerTitle = mClInfoView.findViewById(R.id.tv_inner_title); 85 mTvInnerTitle = mClInfoView.findViewById(R.id.tv_inner_title);
85 mTvInnerSubtitle = mClInfoView.findViewById(R.id.tv_inner_subtitle); 86 mTvInnerSubtitle = mClInfoView.findViewById(R.id.tv_inner_subtitle);
86 mIvInfoClose = mClInfoView.findViewById(R.id.iv_loyalty_history_close); 87 mIvInfoClose = mClInfoView.findViewById(R.id.iv_loyalty_history_close);
...@@ -136,7 +137,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli ...@@ -136,7 +137,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
136 137
137 @Subscribe() 138 @Subscribe()
138 public void onMessageEvent(WarplyEventBusManager event) { 139 public void onMessageEvent(WarplyEventBusManager event) {
139 - if (event.getRefreshUnifiedCouponsAdded() != null) { 140 + if (event.getRefreshUnifiedCouponsAdded() != null || event.getRefreshVouchersEventModel() != null) {
140 WarplyManager.getUnifiedCouponsDeals(mUnifiedCallback); 141 WarplyManager.getUnifiedCouponsDeals(mUnifiedCallback);
141 } 142 }
142 } 143 }
...@@ -208,6 +209,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli ...@@ -208,6 +209,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
208 if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().isEmpty() 209 if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().isEmpty()
209 && WarplyManagerHelper.getSmCouponsList() != null && WarplyManagerHelper.getSmCouponsList().isEmpty()) { 210 && WarplyManagerHelper.getSmCouponsList() != null && WarplyManagerHelper.getSmCouponsList().isEmpty()) {
210 mTvEmptyUnifiedCoupons.setVisibility(View.VISIBLE); 211 mTvEmptyUnifiedCoupons.setVisibility(View.VISIBLE);
212 + mLlActivateunified.setVisibility(View.GONE);
211 } 213 }
212 214
213 215
......
...@@ -442,6 +442,21 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -442,6 +442,21 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
442 mLlActiveGiftIt.setVisibility(View.VISIBLE); 442 mLlActiveGiftIt.setVisibility(View.VISIBLE);
443 mLlShops.setVisibility(View.GONE); 443 mLlShops.setVisibility(View.GONE);
444 mLlSMFindIt.setVisibility(View.VISIBLE); 444 mLlSMFindIt.setVisibility(View.VISIBLE);
445 + } else if (mIsUnified) {
446 + if (TextUtils.isEmpty(mCoupon.getDiscount_type())) {
447 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount().replace(".", ",") + getString(R.string.euro));
448 + } else {
449 + if (mCoupon.getDiscount_type().equals("value")) {
450 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount().replace(".", ",") + getString(R.string.euro));
451 + } else if (mCoupon.getDiscount_type().equals("percentage")) {
452 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount() + getString(R.string.percentage));
453 + } else if (mCoupon.getDiscount_type().equals("plus_one")) {
454 + mTvActiveSmCouponValue.setText(mCoupon.getDiscount() + getString(R.string.plus_one));
455 + } else {
456 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount().replace(".", ",") + getString(R.string.euro));
457 + }
458 + }
459 + mLlActiveSmCouponValue.setVisibility(View.VISIBLE);
445 } 460 }
446 } else { 461 } else {
447 if (mCoupon.getMerchantDetails() != null) { 462 if (mCoupon.getMerchantDetails() != null) {
...@@ -478,19 +493,26 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -478,19 +493,26 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
478 } 493 }
479 } 494 }
480 495
481 - if (mIsUnified) { 496 + if (mIsUnified || mIsActiveUnified) {
482 mIvCouponPhoto.setScaleType(ImageView.ScaleType.CENTER_INSIDE); 497 mIvCouponPhoto.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
483 498
484 if (mCoupon != null) { 499 if (mCoupon != null) {
485 - if (!TextUtils.isEmpty(mCoupon.getImage())) { 500 + if (mCoupon.getCouponsetDetails().getImg() != null && mCoupon.getCouponsetDetails().getImg().length() > 0) {
486 - Glide.with(this) 501 + try {
502 + String couponImage = (String) mCoupon.getCouponsetDetails().getImg().get(0);
503 + Glide.with(this)
487 // .setDefaultRequestOptions( 504 // .setDefaultRequestOptions(
488 // RequestOptions 505 // RequestOptions
489 // .placeholderOf(R.drawable.ic_default_contact_photo) 506 // .placeholderOf(R.drawable.ic_default_contact_photo)
490 // .error(R.drawable.ic_default_contact_photo)) 507 // .error(R.drawable.ic_default_contact_photo))
491 - .load(mCoupon.getImage()) 508 + .load(couponImage)
492 - .diskCacheStrategy(DiskCacheStrategy.DATA) 509 + .diskCacheStrategy(DiskCacheStrategy.DATA)
493 - .into(mIvCouponPhoto); 510 + .into(mIvCouponPhoto);
511 + } catch (JSONException e) {
512 + Glide.with(this)
513 + .load(R.drawable.ic_cosmote_logo_horizontal_grey)
514 + .into(mIvCouponPhoto);
515 + }
494 } else { 516 } else {
495 Glide.with(this) 517 Glide.with(this)
496 .load(R.drawable.ic_cosmote_logo_horizontal_grey) 518 .load(R.drawable.ic_cosmote_logo_horizontal_grey)
...@@ -591,6 +613,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -591,6 +613,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
591 mErrorAlertDialog = new AlertDialog.Builder(this) 613 mErrorAlertDialog = new AlertDialog.Builder(this)
592 .setTitle(R.string.cos_dlg_error_supermarket) 614 .setTitle(R.string.cos_dlg_error_supermarket)
593 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> { 615 .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
616 + mIsFindItPressed = false;
594 dialogPositive.dismiss(); 617 dialogPositive.dismiss();
595 }) 618 })
596 .setCancelable(false) 619 .setCancelable(false)
......
...@@ -480,13 +480,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -480,13 +480,13 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
480 /** Vouchers */ 480 /** Vouchers */
481 return; 481 return;
482 } 482 }
483 - if (event.getUnifiedCouponsAdded() != null) { 483 + if (event.getUnifiedCouponsAdded() != null || event.getRefreshUnifiedCouponsAdded() != null || event.getRefreshVouchersEventModel() != null) {
484 Handler mUIHandler = new Handler(Looper.getMainLooper()); 484 Handler mUIHandler = new Handler(Looper.getMainLooper());
485 mUIHandler.post(() -> { 485 mUIHandler.post(() -> {
486 - if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) 486 +// if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
487 - mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size())); 487 + mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size() + WarplyManagerHelper.getSmCouponsList().size()));
488 - else 488 +// else
489 - mTvUnifiedCountBadge.setText("0"); 489 +// mTvUnifiedCountBadge.setText("0");
490 // checkHistoryEmpty(); 490 // checkHistoryEmpty();
491 checkForEmpty(); 491 checkForEmpty();
492 }); 492 });
...@@ -690,10 +690,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -690,10 +690,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
690 /** Deals Badge */ 690 /** Deals Badge */
691 691
692 /** Unified Coupons List */ 692 /** Unified Coupons List */
693 - if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0) 693 +// if (WarplyManagerHelper.getMarketCouponsList() != null && WarplyManagerHelper.getMarketCouponsList().size() > 0)
694 - mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size())); 694 + mTvUnifiedCountBadge.setText(String.valueOf(WarplyManagerHelper.getMarketCouponsList().size() + WarplyManagerHelper.getSmCouponsList().size()));
695 - else 695 +// else
696 - mTvUnifiedCountBadge.setText("0"); 696 +// mTvUnifiedCountBadge.setText("0");
697 /** Unified Coupons List */ 697 /** Unified Coupons List */
698 698
699 /** Coupon List */ 699 /** Coupon List */
......
...@@ -193,7 +193,12 @@ public class Couponset implements Parcelable, Serializable { ...@@ -193,7 +193,12 @@ public class Couponset implements Parcelable, Serializable {
193 this.created = json.optString(CREATED); 193 this.created = json.optString(CREATED);
194 this.updated = json.optString(UPDATED); 194 this.updated = json.optString(UPDATED);
195 this.app_uuid = json.optString(APP_UUID); 195 this.app_uuid = json.optString(APP_UUID);
196 - this.img = json.optJSONArray(IMG); 196 +// this.img = json.optJSONArray(IMG);
197 + try {
198 + this.img = new JSONArray(json.optString(IMG));
199 + } catch (JSONException e) {
200 + e.printStackTrace();
201 + }
197 this.img_preview = json.optString(IMG_PREVIEW); 202 this.img_preview = json.optString(IMG_PREVIEW);
198 this.sorting = json.optInt(SORTING); 203 this.sorting = json.optInt(SORTING);
199 this.active = json.optBoolean(ACTIVE); 204 this.active = json.optBoolean(ACTIVE);
...@@ -236,7 +241,12 @@ public class Couponset implements Parcelable, Serializable { ...@@ -236,7 +241,12 @@ public class Couponset implements Parcelable, Serializable {
236 this.admin_name = json.optString(ADMIN_NAME); 241 this.admin_name = json.optString(ADMIN_NAME);
237 this.created = json.optString(CREATED); 242 this.created = json.optString(CREATED);
238 this.updated = json.optString(UPDATED); 243 this.updated = json.optString(UPDATED);
239 - this.img = json.optJSONArray(IMG); 244 +// this.img = json.optJSONArray(IMG);
245 + try {
246 + this.img = new JSONArray(json.optString(IMG));
247 + } catch (JSONException e) {
248 + e.printStackTrace();
249 + }
240 this.active = json.optBoolean(ACTIVE); 250 this.active = json.optBoolean(ACTIVE);
241 this.buyable = json.optBoolean(BUYABLE); 251 this.buyable = json.optBoolean(BUYABLE);
242 this.name = json.optString(NAME); 252 this.name = json.optString(NAME);
......
...@@ -545,7 +545,12 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { ...@@ -545,7 +545,12 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
545 // EventBus.getDefault().post(new WarplyEventBusManager(openMyRewards)); 545 // EventBus.getDefault().post(new WarplyEventBusManager(openMyRewards));
546 546
547 //Now the client does nothing, the sdk opens the active unified screen 547 //Now the client does nothing, the sdk opens the active unified screen
548 - WarplyManager.getUnifiedCouponsDeals(mUnifiedCallback); 548 + /* New Addition start */
549 +// WarplyManager.getUnifiedCouponsDeals(mUnifiedCallback);
550 +
551 + Intent intent = new Intent((WarpActivity != null && !WarpActivity.isFinishing()) ? WarpActivity : getContext(), ActiveUnifiedCouponsActivity.class);
552 + getContext().startActivity(intent);
553 + /* New Addition end */
549 554
550 RefreshVouchersEventModel vouchersRefreshed = new RefreshVouchersEventModel(); 555 RefreshVouchersEventModel vouchersRefreshed = new RefreshVouchersEventModel();
551 vouchersRefreshed.setRefreshed(true); 556 vouchersRefreshed.setRefreshed(true);
...@@ -949,19 +954,19 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { ...@@ -949,19 +954,19 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
949 } 954 }
950 } 955 }
951 956
952 - private final CallbackReceiver<ArrayList<UnifiedCoupon>> mUnifiedCallback = new CallbackReceiver<ArrayList<UnifiedCoupon>>() { 957 +// private final CallbackReceiver<ArrayList<UnifiedCoupon>> mUnifiedCallback = new CallbackReceiver<ArrayList<UnifiedCoupon>>() {
953 - @Override 958 +// @Override
954 - public void onSuccess(ArrayList<UnifiedCoupon> result) { 959 +// public void onSuccess(ArrayList<UnifiedCoupon> result) {
955 - Intent intent = new Intent((WarpActivity != null && !WarpActivity.isFinishing()) ? WarpActivity : getContext(), ActiveUnifiedCouponsActivity.class); 960 +// Intent intent = new Intent((WarpActivity != null && !WarpActivity.isFinishing()) ? WarpActivity : getContext(), ActiveUnifiedCouponsActivity.class);
956 - getContext().startActivity(intent); 961 +// getContext().startActivity(intent);
957 - } 962 +// }
958 - 963 +//
959 - @Override 964 +// @Override
960 - public void onFailure(int errorCode) { 965 +// public void onFailure(int errorCode) {
961 - Intent intent = new Intent((WarpActivity != null && !WarpActivity.isFinishing()) ? WarpActivity : getContext(), ActiveUnifiedCouponsActivity.class); 966 +// Intent intent = new Intent((WarpActivity != null && !WarpActivity.isFinishing()) ? WarpActivity : getContext(), ActiveUnifiedCouponsActivity.class);
962 - getContext().startActivity(intent); 967 +// getContext().startActivity(intent);
963 - } 968 +// }
964 - }; 969 +// };
965 970
966 private final CallbackReceiver<CouponList> mUserCouponsReceiver = new CallbackReceiver<CouponList>() { 971 private final CallbackReceiver<CouponList> mUserCouponsReceiver = new CallbackReceiver<CouponList>() {
967 @Override 972 @Override
......
...@@ -30,6 +30,7 @@ import io.reactivex.subjects.PublishSubject; ...@@ -30,6 +30,7 @@ import io.reactivex.subjects.PublishSubject;
30 import ly.warp.sdk.R; 30 import ly.warp.sdk.R;
31 import ly.warp.sdk.io.models.Coupon; 31 import ly.warp.sdk.io.models.Coupon;
32 import ly.warp.sdk.io.models.CouponList; 32 import ly.warp.sdk.io.models.CouponList;
33 +import ly.warp.sdk.io.models.Couponset;
33 import ly.warp.sdk.io.models.Merchant; 34 import ly.warp.sdk.io.models.Merchant;
34 import ly.warp.sdk.utils.WarpUtils; 35 import ly.warp.sdk.utils.WarpUtils;
35 import ly.warp.sdk.utils.WarplyManagerHelper; 36 import ly.warp.sdk.utils.WarplyManagerHelper;
...@@ -160,6 +161,13 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte ...@@ -160,6 +161,13 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte
160 } 161 }
161 } 162 }
162 163
164 + for (Couponset cpns : WarplyManagerHelper.getCouponsetsDeals()) {
165 + if (cpns.getUuid().equals(couponItem.getCouponsetUuid())) {
166 + couponItem.setCouponsetDetails(cpns);
167 + break;
168 + }
169 + }
170 +
163 if (couponItem.getStatus() == 1) { 171 if (couponItem.getStatus() == 1) {
164 holder.ivCouponLogo.setAlpha(1.0f); 172 holder.ivCouponLogo.setAlpha(1.0f);
165 holder.tvCouponTitle.setAlpha(1.0f); 173 holder.tvCouponTitle.setAlpha(1.0f);
...@@ -174,7 +182,23 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte ...@@ -174,7 +182,23 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte
174 holder.clCustomLayout.setBackgroundResource(R.drawable.ic_coupon_background_new2); 182 holder.clCustomLayout.setBackgroundResource(R.drawable.ic_coupon_background_new2);
175 } 183 }
176 184
177 - if (merchant != null && !TextUtils.isEmpty(merchant.getImgPreview())) { 185 + /* New Addition start */
186 +// if (merchant != null && !TextUtils.isEmpty(merchant.getImgPreview())) {
187 +// Glide.with(mContext)
188 +//// .setDefaultRequestOptions(
189 +//// RequestOptions
190 +//// .placeholderOf(R.drawable.ic_default_contact_photo)
191 +//// .error(R.drawable.ic_default_contact_photo))
192 +// .load(merchant.getImgPreview())
193 +// .diskCacheStrategy(DiskCacheStrategy.DATA)
194 +// .into(holder.ivCouponLogo);
195 +// } else {
196 +// Glide.with(mContext)
197 +// .load(R.drawable.ic_cosmote_logo_horizontal_grey)
198 +// .into(holder.ivCouponLogo);
199 +// }
200 +
201 + if (!TextUtils.isEmpty(couponItem.getCouponsetDetails().getImgPreview())) {
178 Glide.with(mContext) 202 Glide.with(mContext)
179 // .setDefaultRequestOptions( 203 // .setDefaultRequestOptions(
180 // RequestOptions 204 // RequestOptions
...@@ -188,6 +212,7 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte ...@@ -188,6 +212,7 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte
188 .load(R.drawable.ic_cosmote_logo_horizontal_grey) 212 .load(R.drawable.ic_cosmote_logo_horizontal_grey)
189 .into(holder.ivCouponLogo); 213 .into(holder.ivCouponLogo);
190 } 214 }
215 + /* New Addition end */
191 216
192 holder.tvCouponTitle.setText(!TextUtils.isEmpty(merchant.getAdminName()) ? merchant.getAdminName() : couponItem.getName()); 217 holder.tvCouponTitle.setText(!TextUtils.isEmpty(merchant.getAdminName()) ? merchant.getAdminName() : couponItem.getName());
193 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { 218 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
...@@ -268,28 +293,45 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte ...@@ -268,28 +293,45 @@ public class ActiveCouponAdapter extends RecyclerView.Adapter<ActiveCouponAdapte
268 }); 293 });
269 } 294 }
270 295
271 - if (!TextUtils.isEmpty(couponItem.getMerchantDetails().getImgPreview())) { 296 + if (mIsActiveSM) {
272 - Glide.with(mContext) 297 + if (!TextUtils.isEmpty(couponItem.getCouponsetDetails().getImgPreview())) {
298 + Glide.with(mContext)
273 // .setDefaultRequestOptions( 299 // .setDefaultRequestOptions(
274 // RequestOptions 300 // RequestOptions
275 // .placeholderOf(R.drawable.ic_default_contact_photo) 301 // .placeholderOf(R.drawable.ic_default_contact_photo)
276 // .error(R.drawable.ic_default_contact_photo)) 302 // .error(R.drawable.ic_default_contact_photo))
277 - .load(couponItem.getMerchantDetails().getImgPreview()) 303 + .load(couponItem.getCouponsetDetails().getImgPreview())
278 - .diskCacheStrategy(DiskCacheStrategy.DATA) 304 + .diskCacheStrategy(DiskCacheStrategy.DATA)
279 - .into(holder.ivCouponLogo); 305 + .into(holder.ivCouponLogo);
280 - } else if (!TextUtils.isEmpty(couponItem.getCouponsetDetails().getImgPreview())) { 306 + } else {
281 - Glide.with(mContext) 307 + Glide.with(mContext)
308 + .load(R.drawable.ic_cosmote_logo_horizontal_grey)
309 + .into(holder.ivCouponLogo);
310 + }
311 + } else {
312 + if (!TextUtils.isEmpty(couponItem.getMerchantDetails().getImgPreview())) {
313 + Glide.with(mContext)
282 // .setDefaultRequestOptions( 314 // .setDefaultRequestOptions(
283 // RequestOptions 315 // RequestOptions
284 // .placeholderOf(R.drawable.ic_default_contact_photo) 316 // .placeholderOf(R.drawable.ic_default_contact_photo)
285 // .error(R.drawable.ic_default_contact_photo)) 317 // .error(R.drawable.ic_default_contact_photo))
286 - .load(couponItem.getCouponsetDetails().getImgPreview()) 318 + .load(couponItem.getMerchantDetails().getImgPreview())
287 - .diskCacheStrategy(DiskCacheStrategy.DATA) 319 + .diskCacheStrategy(DiskCacheStrategy.DATA)
288 - .into(holder.ivCouponLogo); 320 + .into(holder.ivCouponLogo);
289 - } else { 321 + } else if (!TextUtils.isEmpty(couponItem.getCouponsetDetails().getImgPreview())) {
290 - Glide.with(mContext) 322 + Glide.with(mContext)
291 - .load(R.drawable.ic_cosmote_logo_horizontal_grey) 323 +// .setDefaultRequestOptions(
292 - .into(holder.ivCouponLogo); 324 +// RequestOptions
325 +// .placeholderOf(R.drawable.ic_default_contact_photo)
326 +// .error(R.drawable.ic_default_contact_photo))
327 + .load(couponItem.getCouponsetDetails().getImgPreview())
328 + .diskCacheStrategy(DiskCacheStrategy.DATA)
329 + .into(holder.ivCouponLogo);
330 + } else {
331 + Glide.with(mContext)
332 + .load(R.drawable.ic_cosmote_logo_horizontal_grey)
333 + .into(holder.ivCouponLogo);
334 + }
293 } 335 }
294 336
295 if (!TextUtils.isEmpty(couponItem.getMerchantDetails().getAdminName())) 337 if (!TextUtils.isEmpty(couponItem.getMerchantDetails().getAdminName()))
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 android:id="@+id/cl_info_view" 58 android:id="@+id/cl_info_view"
59 android:layout_width="match_parent" 59 android:layout_width="match_parent"
60 android:layout_height="wrap_content" 60 android:layout_height="wrap_content"
61 - android:layout_marginHorizontal="16dp" 61 + android:layout_marginHorizontal="14dp"
62 android:layout_marginTop="48dp" 62 android:layout_marginTop="48dp"
63 android:translationZ="1dp" 63 android:translationZ="1dp"
64 android:visibility="gone" 64 android:visibility="gone"
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
81 android:layout_height="wrap_content" 81 android:layout_height="wrap_content"
82 android:background="@drawable/background_grey_shadow" 82 android:background="@drawable/background_grey_shadow"
83 android:orientation="horizontal" 83 android:orientation="horizontal"
84 - android:paddingTop="20dp" 84 + android:paddingTop="18dp"
85 - android:paddingBottom="16dp" 85 + android:paddingBottom="14dp"
86 app:layout_constraintEnd_toEndOf="parent" 86 app:layout_constraintEnd_toEndOf="parent"
87 app:layout_constraintStart_toStartOf="parent" 87 app:layout_constraintStart_toStartOf="parent"
88 app:layout_constraintTop_toBottomOf="@+id/iv_arrow"> 88 app:layout_constraintTop_toBottomOf="@+id/iv_arrow">
...@@ -115,10 +115,10 @@ ...@@ -115,10 +115,10 @@
115 android:layout_width="0dp" 115 android:layout_width="0dp"
116 android:layout_height="wrap_content" 116 android:layout_height="wrap_content"
117 android:layout_marginHorizontal="24dp" 117 android:layout_marginHorizontal="24dp"
118 - android:layout_marginTop="16dp" 118 + android:layout_marginTop="14dp"
119 android:text="@string/cos_market_subtitle" 119 android:text="@string/cos_market_subtitle"
120 android:textColor="@color/cos_light_black" 120 android:textColor="@color/cos_light_black"
121 - android:textSize="17sp" 121 + android:textSize="16sp"
122 app:layout_constraintEnd_toEndOf="parent" 122 app:layout_constraintEnd_toEndOf="parent"
123 app:layout_constraintStart_toStartOf="parent" 123 app:layout_constraintStart_toStartOf="parent"
124 app:layout_constraintTop_toBottomOf="@+id/tv_inner_title" /> 124 app:layout_constraintTop_toBottomOf="@+id/tv_inner_title" />
...@@ -127,11 +127,11 @@ ...@@ -127,11 +127,11 @@
127 android:id="@+id/tv_inner_close" 127 android:id="@+id/tv_inner_close"
128 android:layout_width="0dp" 128 android:layout_width="0dp"
129 android:layout_height="wrap_content" 129 android:layout_height="wrap_content"
130 - android:layout_marginTop="16dp" 130 + android:layout_marginTop="14dp"
131 android:layout_marginEnd="24dp" 131 android:layout_marginEnd="24dp"
132 android:text="@string/cos_market_close" 132 android:text="@string/cos_market_close"
133 android:textColor="@color/cos_light_black" 133 android:textColor="@color/cos_light_black"
134 - android:textSize="16sp" 134 + android:textSize="15sp"
135 app:layout_constraintBottom_toBottomOf="parent" 135 app:layout_constraintBottom_toBottomOf="parent"
136 app:layout_constraintEnd_toEndOf="parent" 136 app:layout_constraintEnd_toEndOf="parent"
137 app:layout_constraintTop_toBottomOf="@+id/tv_inner_subtitle" /> 137 app:layout_constraintTop_toBottomOf="@+id/tv_inner_subtitle" />
......