open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
02cbcf69 1 parent 091decd3

custom fonts implementation without calligraphy

Inline Side-by-side
Showing 47 changed files with 701 additions and 1141 deletions
...@@ -118,12 +118,6 @@ ...@@ -118,12 +118,6 @@
118 android:theme="@style/SDKAppTheme" /> 118 android:theme="@style/SDKAppTheme" />
119 119
120 <activity 120 <activity
121 - android:name="ly.warp.sdk.activities.ActiveGiftsActivity"
122 - android:exported="false"
123 - android:screenOrientation="portrait"
124 - android:theme="@style/SDKAppTheme" />
125 -
126 - <activity
127 android:name="ly.warp.sdk.activities.ShopsActivity" 121 android:name="ly.warp.sdk.activities.ShopsActivity"
128 android:exported="false" 122 android:exported="false"
129 android:screenOrientation="portrait" 123 android:screenOrientation="portrait"
......
1 -package ly.warp.sdk.activities;
2 -
3 -import android.app.Activity;
4 -import android.content.Intent;
5 -import android.os.Bundle;
6 -import android.view.View;
7 -import android.widget.ImageView;
8 -
9 -import androidx.recyclerview.widget.LinearLayoutManager;
10 -import androidx.recyclerview.widget.RecyclerView;
11 -
12 -import java.io.Serializable;
13 -import java.util.ArrayList;
14 -
15 -import ly.warp.sdk.R;
16 -import ly.warp.sdk.io.models.Campaign;
17 -import ly.warp.sdk.io.models.CampaignList;
18 -import ly.warp.sdk.io.models.Coupon;
19 -import ly.warp.sdk.io.models.CouponList;
20 -import ly.warp.sdk.io.models.MergedActiveGifts;
21 -import ly.warp.sdk.utils.WarplyManagerHelper;
22 -import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
23 -import ly.warp.sdk.views.adapters.MergedActiveGiftsAdapter;
24 -
25 -
26 -public class ActiveGiftsActivity extends Activity implements View.OnClickListener {
27 -
28 - // ===========================================================
29 - // Constants
30 - // ===========================================================
31 -
32 - // ===========================================================
33 - // Fields
34 - // ===========================================================
35 -
36 - private ImageView mIvBack;
37 - private ArrayList<MergedActiveGifts> mData = new ArrayList();
38 - private RecyclerView mRecyclerMergedActiveGifts;
39 - private MergedActiveGiftsAdapter mAdapterMergedActiveGifts;
40 -
41 - // ===========================================================
42 - // Methods for/from SuperClass/Interfaces
43 - // ===========================================================
44 - @Override
45 - public void onCreate(Bundle savedInstanceState) {
46 - super.onCreate(savedInstanceState);
47 - setContentView(R.layout.activity_active_gifts);
48 -
49 - mergeDatasets(
50 - /*WarplyManagerHelper.getUniqueCampaignList().get("gifts_for_you")*/null,
51 - WarplyManagerHelper.getCouponList()
52 - );
53 -
54 - mIvBack = findViewById(R.id.iv_list_close);
55 -
56 - mRecyclerMergedActiveGifts = findViewById(R.id.rv_merged_active_gifts);
57 -
58 - initViews();
59 - }
60 -
61 - @Override
62 - public void onResume() {
63 - super.onResume();
64 - WarplyAnalyticsManager.logTrackersEvent(this, "screen", "ActiveGiftsScreen");
65 - }
66 -
67 - @Override
68 - public void onClick(View view) {
69 - if (view.getId() == R.id.iv_list_close) {
70 - onBackPressed();
71 - return;
72 - }
73 - }
74 -
75 - // ===========================================================
76 - // Methods
77 - // ===========================================================
78 -
79 - private void initViews() {
80 - mIvBack.setOnClickListener(this);
81 -
82 - if (mData != null && mData.size() > 0) {
83 - mRecyclerMergedActiveGifts.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
84 - mAdapterMergedActiveGifts = new MergedActiveGiftsAdapter(this, mData);
85 - mRecyclerMergedActiveGifts.setAdapter(mAdapterMergedActiveGifts);
86 - mAdapterMergedActiveGifts.getPositionClicks()
87 - .doOnNext(dataItem -> {
88 - if (dataItem.getDataType() == 1) {
89 - if (!WarplyManagerHelper.noInternetDialog(ActiveGiftsActivity.this, true)) {
90 - WarplyManagerHelper.noInternetDialog(ActiveGiftsActivity.this);
91 - return;
92 - }
93 - startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())));
94 - } else if (dataItem.getDataType() == 2) {
95 - Intent intent = new Intent(ActiveGiftsActivity.this, CouponInfoActivity.class);
96 - intent.putExtra("coupon", dataItem.getCoupon().getCoupon());
97 - startActivity(intent);
98 - }
99 - })
100 - .doOnError(error -> {
101 - })
102 - .subscribe();
103 - } else {
104 -// mClCouponsOuter.setVisibility(View.GONE);
105 - }
106 - }
107 -
108 - private ArrayList<MergedActiveGifts> mergeDatasets(CampaignList campaignList, CouponList couponsList) {
109 - if (campaignList != null && campaignList.size() > 0) {
110 - for (Campaign campaign : campaignList) {
111 - MergedActiveGifts data = new MergedActiveGifts();
112 - data.setCampaign(campaign);
113 - data.setCoupon(null);
114 - data.setDataType(1);
115 - mData.add(data);
116 - }
117 - }
118 -
119 - if (couponsList.size() > 0) {
120 - for (Coupon coupon : couponsList) {
121 - MergedActiveGifts data = new MergedActiveGifts();
122 - data.setCampaign(null);
123 - data.setCoupon(coupon);
124 - data.setDataType(2);
125 - mData.add(data);
126 - }
127 - }
128 -
129 - return mData;
130 - }
131 -
132 - // ===========================================================
133 - // Inner and Anonymous Classes
134 - // ===========================================================
135 -
136 -}
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.os.Handler; 6 import android.os.Handler;
...@@ -9,7 +8,6 @@ import android.os.Looper; ...@@ -9,7 +8,6 @@ import android.os.Looper;
9 import android.view.View; 8 import android.view.View;
10 import android.widget.ImageView; 9 import android.widget.ImageView;
11 import android.widget.TextView; 10 import android.widget.TextView;
12 -import android.widget.Toast;
13 11
14 import androidx.recyclerview.widget.LinearLayoutManager; 12 import androidx.recyclerview.widget.LinearLayoutManager;
15 import androidx.recyclerview.widget.RecyclerView; 13 import androidx.recyclerview.widget.RecyclerView;
...@@ -24,10 +22,10 @@ import java.util.ArrayList; ...@@ -24,10 +22,10 @@ import java.util.ArrayList;
24 import java.util.Collections; 22 import java.util.Collections;
25 import java.util.Date; 23 import java.util.Date;
26 24
27 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
28 import ly.warp.sdk.R; 25 import ly.warp.sdk.R;
29 import ly.warp.sdk.io.callbacks.CallbackReceiver; 26 import ly.warp.sdk.io.callbacks.CallbackReceiver;
30 import ly.warp.sdk.io.models.UnifiedCoupon; 27 import ly.warp.sdk.io.models.UnifiedCoupon;
28 +import ly.warp.sdk.utils.WarpUtils;
31 import ly.warp.sdk.utils.WarplyManagerHelper; 29 import ly.warp.sdk.utils.WarplyManagerHelper;
32 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 30 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
33 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 31 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
...@@ -48,7 +46,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli ...@@ -48,7 +46,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
48 private ImageView mIvBack; 46 private ImageView mIvBack;
49 private RecyclerView mRecyclerUnifiedCoupons; 47 private RecyclerView mRecyclerUnifiedCoupons;
50 private MarketCouponAdapter mAdapterUnifiedCoupons; 48 private MarketCouponAdapter mAdapterUnifiedCoupons;
51 - private TextView mTvEmptyUnifiedCoupons; 49 + private TextView mTvEmptyUnifiedCoupons, mFontHeader;
52 private boolean mUnifiedPressed = false; 50 private boolean mUnifiedPressed = false;
53 51
54 // =========================================================== 52 // ===========================================================
...@@ -63,6 +61,9 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli ...@@ -63,6 +61,9 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
63 mIvBack = findViewById(R.id.iv_coupons_close); 61 mIvBack = findViewById(R.id.iv_coupons_close);
64 mTvEmptyUnifiedCoupons = findViewById(R.id.tv_no_unified_coupons); 62 mTvEmptyUnifiedCoupons = findViewById(R.id.tv_no_unified_coupons);
65 mRecyclerUnifiedCoupons = findViewById(R.id.rv_active_unified_coupons); 63 mRecyclerUnifiedCoupons = findViewById(R.id.rv_active_unified_coupons);
64 + mFontHeader = findViewById(R.id.textView3);
65 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
66 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvEmptyUnifiedCoupons);
66 67
67 initViews(); 68 initViews();
68 } 69 }
...@@ -108,11 +109,6 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli ...@@ -108,11 +109,6 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
108 } 109 }
109 } 110 }
110 111
111 - @Override
112 - protected void attachBaseContext(Context newBase) {
113 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
114 - }
115 -
116 // =========================================================== 112 // ===========================================================
117 // Methods 113 // Methods
118 // =========================================================== 114 // ===========================================================
......
...@@ -4,7 +4,6 @@ import android.app.Activity; ...@@ -4,7 +4,6 @@ import android.app.Activity;
4 import android.content.Context; 4 import android.content.Context;
5 import android.os.Bundle; 5 import android.os.Bundle;
6 import android.text.TextUtils; 6 import android.text.TextUtils;
7 -import android.text.method.LinkMovementMethod;
8 import android.util.Log; 7 import android.util.Log;
9 import android.view.LayoutInflater; 8 import android.view.LayoutInflater;
10 import android.view.View; 9 import android.view.View;
...@@ -14,7 +13,6 @@ import android.widget.LinearLayout; ...@@ -14,7 +13,6 @@ import android.widget.LinearLayout;
14 import android.widget.TextView; 13 import android.widget.TextView;
15 14
16 import androidx.appcompat.app.AlertDialog; 15 import androidx.appcompat.app.AlertDialog;
17 -import androidx.core.text.HtmlCompat;
18 import androidx.work.OneTimeWorkRequest; 16 import androidx.work.OneTimeWorkRequest;
19 import androidx.work.WorkManager; 17 import androidx.work.WorkManager;
20 18
...@@ -23,8 +21,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; ...@@ -23,8 +21,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
23 import com.google.android.material.bottomsheet.BottomSheetDialog; 21 import com.google.android.material.bottomsheet.BottomSheetDialog;
24 22
25 import org.greenrobot.eventbus.EventBus; 23 import org.greenrobot.eventbus.EventBus;
26 -import org.json.JSONArray;
27 -import org.json.JSONException;
28 import org.json.JSONObject; 24 import org.json.JSONObject;
29 25
30 import java.util.ArrayList; 26 import java.util.ArrayList;
...@@ -39,8 +35,8 @@ import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; ...@@ -39,8 +35,8 @@ import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
39 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel; 35 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel;
40 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; 36 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
41 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest; 37 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest;
42 -import ly.warp.sdk.io.request.WarplyConsumerRequest;
43 import ly.warp.sdk.services.EventCampaignService; 38 import ly.warp.sdk.services.EventCampaignService;
39 +import ly.warp.sdk.utils.WarpUtils;
44 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 40 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
45 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 41 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
46 import ly.warp.sdk.utils.managers.WarplyManager; 42 import ly.warp.sdk.utils.managers.WarplyManager;
...@@ -59,7 +55,8 @@ public class ContextualActivity extends Activity implements View.OnClickListener ...@@ -59,7 +55,8 @@ public class ContextualActivity extends Activity implements View.OnClickListener
59 // =========================================================== 55 // ===========================================================
60 56
61 private ImageView mIvBack, mIvCampaignPhoto, mIvTermsArrow; 57 private ImageView mIvBack, mIvCampaignPhoto, mIvTermsArrow;
62 - private TextView mTvCampaignTitle, mTvCampaignSubtitle, mTvTerms, mTvTermsValue; 58 + private TextView mTvCampaignTitle, mTvCampaignSubtitle, mTvTerms, mTvTermsValue,
59 + mFontHeader, mFontActivateButton;
63 private LoyaltyContextualOfferModel mCCMS = new LoyaltyContextualOfferModel(); 60 private LoyaltyContextualOfferModel mCCMS = new LoyaltyContextualOfferModel();
64 private LinearLayout mLlActivateOffer, mLlTerms; 61 private LinearLayout mLlActivateOffer, mLlTerms;
65 private Consumer mConsumer; 62 private Consumer mConsumer;
...@@ -87,6 +84,12 @@ public class ContextualActivity extends Activity implements View.OnClickListener ...@@ -87,6 +84,12 @@ public class ContextualActivity extends Activity implements View.OnClickListener
87 mLlTerms = findViewById(R.id.ll_terms_inner); 84 mLlTerms = findViewById(R.id.ll_terms_inner);
88 mIvTermsArrow = findViewById(R.id.iv_terms_arrow); 85 mIvTermsArrow = findViewById(R.id.iv_terms_arrow);
89 mTvTermsValue = findViewById(R.id.tv_terms_value); 86 mTvTermsValue = findViewById(R.id.tv_terms_value);
87 + mFontHeader = findViewById(R.id.textView3);
88 + mFontActivateButton = findViewById(R.id.tv_activate_button);
89 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCampaignTitle);
90 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCampaignSubtitle, mTvTermsValue);
91 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontActivateButton);
92 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvTerms);
90 93
91 initViews(); 94 initViews();
92 } 95 }
...@@ -162,46 +165,19 @@ public class ContextualActivity extends Activity implements View.OnClickListener ...@@ -162,46 +165,19 @@ public class ContextualActivity extends Activity implements View.OnClickListener
162 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this); 165 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
163 bottomSheetDialog.setContentView(R.layout.dl_share); 166 bottomSheetDialog.setContentView(R.layout.dl_share);
164 TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value); 167 TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
168 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, tvHeader);
165 tvHeader.setText(R.string.cos_coupon_share_telco); 169 tvHeader.setText(R.string.cos_coupon_share_telco);
166 LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner); 170 LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
167 171
168 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close); 172 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close);
169 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss()); 173 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
170 174
171 -// if (mConsumer != null) {
172 -// try {
173 -// JSONObject profMeta = new JSONObject(mConsumer.getProfileMetadata());
174 -// if (profMeta != null) {
175 -// JSONArray msisdnList = new JSONArray();
176 -// msisdnList = profMeta.optJSONArray(MSISDN_LIST);
177 -// if (msisdnList != null && msisdnList.length() > 0) {
178 -// for (int i = 0; i < msisdnList.length(); i++) {
179 -// LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
180 -// LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
181 -// TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
182 -// textView.setText(msisdnList.optString(i));
183 -// textView.setOnClickListener(view -> {
184 -// TextView tv = (TextView) view;
185 -// mSender = tv.getText().toString();
186 -// bottomSheetDialog.dismiss();
187 -// askActivateDialog();
188 -// });
189 -// parent.addView(v, 0, new ViewGroup.LayoutParams(
190 -// ViewGroup.LayoutParams.MATCH_PARENT,
191 -// ViewGroup.LayoutParams.WRAP_CONTENT));
192 -// }
193 -// }
194 -// }
195 -// } catch (JSONException e) {
196 -// e.printStackTrace();
197 -// }
198 -// }
199 -
200 if (mCCMS.getEligibleAssets() != null && mCCMS.getEligibleAssets().size() > 0) { 175 if (mCCMS.getEligibleAssets() != null && mCCMS.getEligibleAssets().size() > 0) {
201 for (int i = 0; i < mCCMS.getEligibleAssets().size(); i++) { 176 for (int i = 0; i < mCCMS.getEligibleAssets().size(); i++) {
202 LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); 177 LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
203 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null); 178 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
204 TextView textView = (TextView) v.findViewById(R.id.tv_phone_share); 179 TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
180 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, textView);
205 textView.setText(mCCMS.getEligibleAssets().get(i)); 181 textView.setText(mCCMS.getEligibleAssets().get(i));
206 textView.setOnClickListener(view -> { 182 textView.setOnClickListener(view -> {
207 TextView tv = (TextView) view; 183 TextView tv = (TextView) view;
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.graphics.Bitmap; 5 import android.graphics.Bitmap;
7 import android.graphics.Color; 6 import android.graphics.Color;
...@@ -27,22 +26,17 @@ import com.google.zxing.BarcodeFormat; ...@@ -27,22 +26,17 @@ import com.google.zxing.BarcodeFormat;
27 import com.google.zxing.common.BitMatrix; 26 import com.google.zxing.common.BitMatrix;
28 import com.google.zxing.oned.EAN13Writer; 27 import com.google.zxing.oned.EAN13Writer;
29 28
30 -import org.greenrobot.eventbus.EventBus;
31 -
32 -import java.io.Serializable;
33 import java.text.ParseException; 29 import java.text.ParseException;
34 import java.text.SimpleDateFormat; 30 import java.text.SimpleDateFormat;
35 import java.util.Date; 31 import java.util.Date;
36 32
37 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
38 import ly.warp.sdk.R; 33 import ly.warp.sdk.R;
39 import ly.warp.sdk.io.models.Coupon; 34 import ly.warp.sdk.io.models.Coupon;
40 import ly.warp.sdk.io.models.UnifiedCoupon; 35 import ly.warp.sdk.io.models.UnifiedCoupon;
41 -import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
42 import ly.warp.sdk.services.EventCouponsService; 36 import ly.warp.sdk.services.EventCouponsService;
37 +import ly.warp.sdk.utils.WarpUtils;
43 import ly.warp.sdk.utils.WarplyManagerHelper; 38 import ly.warp.sdk.utils.WarplyManagerHelper;
44 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 39 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
45 -import ly.warp.sdk.utils.managers.WarplyEventBusManager;
46 40
47 41
48 public class CouponInfoActivity extends Activity implements View.OnClickListener { 42 public class CouponInfoActivity extends Activity implements View.OnClickListener {
...@@ -57,7 +51,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -57,7 +51,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
57 51
58 private ImageView mIvBack, mIvCouponPhoto, mIvBarcode; 52 private ImageView mIvBack, mIvCouponPhoto, mIvBarcode;
59 private TextView mTvTerms, mTvCouponCode, mTvCouponTitle, mTvCouponSubtitle, mTvCouponDate, 53 private TextView mTvTerms, mTvCouponCode, mTvCouponTitle, mTvCouponSubtitle, mTvCouponDate,
60 - mTvTermsValue, mTvFullBarcode, mTvDescription, mTvCouponCodeTitle; 54 + mTvTermsValue, mTvFullBarcode, mTvDescription, mTvCouponCodeTitle, mFontHeader,
55 + mFontButtonGiftIt, mFontButtonShops, mFontButtonSite;
61 private LinearLayout mLlGiftIt, mLlShops, mLlBarcodeShown, mLlBarcodeContainer, mLlTerms, mLlWebsite; 56 private LinearLayout mLlGiftIt, mLlShops, mLlBarcodeShown, mLlBarcodeContainer, mLlTerms, mLlWebsite;
62 private Coupon mCoupon; 57 private Coupon mCoupon;
63 private boolean mIsBarcodeShown = false, mIsTermsShown = false, mIsFromWallet = false, 58 private boolean mIsBarcodeShown = false, mIsTermsShown = false, mIsFromWallet = false,
...@@ -116,6 +111,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -116,6 +111,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
116 mTvFullBarcode = findViewById(R.id.tv_full_barcode); 111 mTvFullBarcode = findViewById(R.id.tv_full_barcode);
117 mTvDescription = findViewById(R.id.tv_clickable_link); 112 mTvDescription = findViewById(R.id.tv_clickable_link);
118 mTvCouponCodeTitle = findViewById(R.id.textView15); 113 mTvCouponCodeTitle = findViewById(R.id.textView15);
114 + mFontHeader = findViewById(R.id.textView3);
115 + mFontButtonGiftIt = findViewById(R.id.button_gift_it);
116 + mFontButtonShops = findViewById(R.id.button_shops);
117 + mFontButtonSite = findViewById(R.id.button_site);
118 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCouponTitle);
119 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponSubtitle, mTvDescription,
120 + mTvFullBarcode, mTvCouponDate, mTvTermsValue);
121 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvCouponCodeTitle, mTvCouponCode,
122 + mFontButtonShops, mFontButtonSite, mTvTerms);
123 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonGiftIt);
119 124
120 initViews(); 125 initViews();
121 } 126 }
...@@ -202,6 +207,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -202,6 +207,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
202 if (mIsBarcodeShown) { 207 if (mIsBarcodeShown) {
203 mLlBarcodeContainer.setVisibility(View.GONE); 208 mLlBarcodeContainer.setVisibility(View.GONE);
204 TextView barcodeButtonTitle = mLlBarcodeShown.findViewById(R.id.tv_barcode); 209 TextView barcodeButtonTitle = mLlBarcodeShown.findViewById(R.id.tv_barcode);
210 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, barcodeButtonTitle);
205 ImageView barcodeButtonArrow = mLlBarcodeShown.findViewById(R.id.iv_barcode_arrow); 211 ImageView barcodeButtonArrow = mLlBarcodeShown.findViewById(R.id.iv_barcode_arrow);
206 barcodeButtonTitle.setText(getString(R.string.cos_show_barcode)); 212 barcodeButtonTitle.setText(getString(R.string.cos_show_barcode));
207 barcodeButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_down_dark_new)); 213 barcodeButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_down_dark_new));
...@@ -209,6 +215,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -209,6 +215,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
209 } else { 215 } else {
210 mLlBarcodeContainer.setVisibility(View.VISIBLE); 216 mLlBarcodeContainer.setVisibility(View.VISIBLE);
211 TextView barcodeButtonTitle = mLlBarcodeShown.findViewById(R.id.tv_barcode); 217 TextView barcodeButtonTitle = mLlBarcodeShown.findViewById(R.id.tv_barcode);
218 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, barcodeButtonTitle);
212 ImageView barcodeButtonArrow = mLlBarcodeShown.findViewById(R.id.iv_barcode_arrow); 219 ImageView barcodeButtonArrow = mLlBarcodeShown.findViewById(R.id.iv_barcode_arrow);
213 barcodeButtonTitle.setText(getString(R.string.cos_hide_barcode)); 220 barcodeButtonTitle.setText(getString(R.string.cos_hide_barcode));
214 barcodeButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_up_dark_new)); 221 barcodeButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_up_dark_new));
...@@ -231,11 +238,6 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -231,11 +238,6 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
231 } 238 }
232 } 239 }
233 240
234 - @Override
235 - protected void attachBaseContext(Context newBase) {
236 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
237 - }
238 -
239 // =========================================================== 241 // ===========================================================
240 // Methods 242 // Methods
241 // =========================================================== 243 // ===========================================================
......
...@@ -28,7 +28,6 @@ import org.json.JSONObject; ...@@ -28,7 +28,6 @@ import org.json.JSONObject;
28 28
29 import java.util.ArrayList; 29 import java.util.ArrayList;
30 30
31 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
32 import ly.warp.sdk.R; 31 import ly.warp.sdk.R;
33 import ly.warp.sdk.io.callbacks.CallbackReceiver; 32 import ly.warp.sdk.io.callbacks.CallbackReceiver;
34 import ly.warp.sdk.io.models.Consumer; 33 import ly.warp.sdk.io.models.Consumer;
...@@ -37,7 +36,7 @@ import ly.warp.sdk.io.models.CouponList; ...@@ -37,7 +36,7 @@ import ly.warp.sdk.io.models.CouponList;
37 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; 36 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
38 import ly.warp.sdk.io.request.CosmoteCouponSharingRequest; 37 import ly.warp.sdk.io.request.CosmoteCouponSharingRequest;
39 import ly.warp.sdk.io.request.WarplyConsumerRequest; 38 import ly.warp.sdk.io.request.WarplyConsumerRequest;
40 -import ly.warp.sdk.io.request.WarplyUserCouponsRequest; 39 +import ly.warp.sdk.utils.WarpUtils;
41 import ly.warp.sdk.utils.WarplyManagerHelper; 40 import ly.warp.sdk.utils.WarplyManagerHelper;
42 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 41 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
43 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 42 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
...@@ -57,7 +56,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -57,7 +56,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
57 // =========================================================== 56 // ===========================================================
58 57
59 private ImageView mIvBack, mIvCouponPhoto; 58 private ImageView mIvBack, mIvCouponPhoto;
60 - private TextView mTvCouponTitle, mTvPhoneHeader; 59 + private TextView mTvCouponTitle, mTvPhoneHeader, mFontHeader, mFontDescription, mFontButtonShare;
61 private Coupon mCoupon; 60 private Coupon mCoupon;
62 private Consumer mConsumer; 61 private Consumer mConsumer;
63 private RelativeLayout mRlSenderView; 62 private RelativeLayout mRlSenderView;
...@@ -94,6 +93,12 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -94,6 +93,12 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
94 mLlShareButton = findViewById(R.id.ll_share_button); 93 mLlShareButton = findViewById(R.id.ll_share_button);
95 mTvPhoneHeader = findViewById(R.id.tv_phone); 94 mTvPhoneHeader = findViewById(R.id.tv_phone);
96 mEdtReceiver = findViewById(R.id.et_phone); 95 mEdtReceiver = findViewById(R.id.et_phone);
96 + mFontHeader = findViewById(R.id.textView3);
97 + mFontDescription = findViewById(R.id.textView14);
98 + mFontButtonShare = findViewById(R.id.button_share);
99 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCouponTitle);
100 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mFontDescription, mTvPhoneHeader, mEdtReceiver);
101 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonShare);
97 102
98 initViews(); 103 initViews();
99 } 104 }
...@@ -152,11 +157,6 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -152,11 +157,6 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
152 } 157 }
153 } 158 }
154 159
155 - @Override
156 - protected void attachBaseContext(Context newBase) {
157 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
158 - }
159 -
160 // =========================================================== 160 // ===========================================================
161 // Methods 161 // Methods
162 // =========================================================== 162 // ===========================================================
...@@ -202,6 +202,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -202,6 +202,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
202 LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); 202 LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
203 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null); 203 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
204 TextView textView = (TextView) v.findViewById(R.id.tv_phone_share); 204 TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
205 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, textView);
205 textView.setText(msisdnList.optString(i)); 206 textView.setText(msisdnList.optString(i));
206 textView.setOnClickListener(view -> { 207 textView.setOnClickListener(view -> {
207 TextView tv = (TextView) view; 208 TextView tv = (TextView) view;
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.text.TextUtils; 6 import android.text.TextUtils;
...@@ -25,7 +24,6 @@ import org.json.JSONObject; ...@@ -25,7 +24,6 @@ import org.json.JSONObject;
25 24
26 import java.util.ArrayList; 25 import java.util.ArrayList;
27 26
28 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
29 import ly.warp.sdk.R; 27 import ly.warp.sdk.R;
30 import ly.warp.sdk.io.callbacks.CallbackReceiver; 28 import ly.warp.sdk.io.callbacks.CallbackReceiver;
31 import ly.warp.sdk.io.models.Campaign; 29 import ly.warp.sdk.io.models.Campaign;
...@@ -56,7 +54,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -56,7 +54,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
56 // =========================================================== 54 // ===========================================================
57 55
58 private ImageView mIvBack, mIvCouponsetPhoto, mIvTermsArrow; 56 private ImageView mIvBack, mIvCouponsetPhoto, mIvTermsArrow;
59 - private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle, mTvTermsValue; 57 + private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle, mTvTermsValue,
58 + mFontHeader, mFontButtonGetIt;
60 private Couponset mCouponset; 59 private Couponset mCouponset;
61 private LinearLayout mLlRedeem, mLlTerms; 60 private LinearLayout mLlRedeem, mLlTerms;
62 private ProgressBar mPbLoading; 61 private ProgressBar mPbLoading;
...@@ -104,6 +103,12 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -104,6 +103,12 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
104 mLlTerms = findViewById(R.id.ll_terms_inner); 103 mLlTerms = findViewById(R.id.ll_terms_inner);
105 mTvTermsValue = findViewById(R.id.tv_terms_value); 104 mTvTermsValue = findViewById(R.id.tv_terms_value);
106 mIvTermsArrow = findViewById(R.id.iv_terms_arrow); 105 mIvTermsArrow = findViewById(R.id.iv_terms_arrow);
106 + mFontHeader = findViewById(R.id.textView3);
107 + mFontButtonGetIt = findViewById(R.id.button_get_it);
108 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCouponsetTitle);
109 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponsetSubtitle, mTvTermsValue);
110 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonGetIt);
111 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvTerms);
107 112
108 initViews(); 113 initViews();
109 } 114 }
...@@ -177,11 +182,6 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe ...@@ -177,11 +182,6 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
177 } 182 }
178 } 183 }
179 184
180 - @Override
181 - protected void attachBaseContext(Context newBase) {
182 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
183 - }
184 -
185 // =========================================================== 185 // ===========================================================
186 // Methods 186 // Methods
187 // =========================================================== 187 // ===========================================================
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 -import android.content.Context;
4 import android.content.Intent; 3 import android.content.Intent;
5 import android.os.Bundle; 4 import android.os.Bundle;
6 import android.os.Handler; 5 import android.os.Handler;
...@@ -21,13 +20,11 @@ import org.greenrobot.eventbus.EventBus; ...@@ -21,13 +20,11 @@ import org.greenrobot.eventbus.EventBus;
21 import org.greenrobot.eventbus.Subscribe; 20 import org.greenrobot.eventbus.Subscribe;
22 import org.json.JSONObject; 21 import org.json.JSONObject;
23 22
24 -import java.io.Serializable;
25 import java.util.ArrayList; 23 import java.util.ArrayList;
26 import java.util.HashSet; 24 import java.util.HashSet;
27 import java.util.LinkedHashSet; 25 import java.util.LinkedHashSet;
28 import java.util.Set; 26 import java.util.Set;
29 27
30 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
31 import ly.warp.sdk.R; 28 import ly.warp.sdk.R;
32 import ly.warp.sdk.io.models.Campaign; 29 import ly.warp.sdk.io.models.Campaign;
33 import ly.warp.sdk.io.models.Couponset; 30 import ly.warp.sdk.io.models.Couponset;
...@@ -85,6 +82,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -85,6 +82,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
85 mIvPopupClose = findViewById(R.id.iv_popup_gifts_close); 82 mIvPopupClose = findViewById(R.id.iv_popup_gifts_close);
86 mLlGiftsPopup = findViewById(R.id.ll_gifts_popup); 83 mLlGiftsPopup = findViewById(R.id.ll_gifts_popup);
87 mRecyclerMergedGifts = findViewById(R.id.rv_merged_gifts); 84 mRecyclerMergedGifts = findViewById(R.id.rv_merged_gifts);
85 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mTvTitle);
88 86
89 filterItems(); 87 filterItems();
90 88
...@@ -151,11 +149,6 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli ...@@ -151,11 +149,6 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
151 } 149 }
152 150
153 @Override 151 @Override
154 - protected void attachBaseContext(Context newBase) {
155 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
156 - }
157 -
158 - @Override
159 protected void onActivityResult(int requestCode, int resultCode, Intent data) { 152 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
160 super.onActivityResult(requestCode, resultCode, data); 153 super.onActivityResult(requestCode, resultCode, data);
161 if (requestCode == 1004) { 154 if (requestCode == 1004) {
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.graphics.Typeface; 4 import android.graphics.Typeface;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.os.Handler; 6 import android.os.Handler;
...@@ -15,6 +14,7 @@ import android.widget.TextView; ...@@ -15,6 +14,7 @@ import android.widget.TextView;
15 14
16 import androidx.cardview.widget.CardView; 15 import androidx.cardview.widget.CardView;
17 import androidx.core.content.ContextCompat; 16 import androidx.core.content.ContextCompat;
17 +import androidx.core.content.res.ResourcesCompat;
18 import androidx.recyclerview.widget.LinearLayoutManager; 18 import androidx.recyclerview.widget.LinearLayoutManager;
19 import androidx.recyclerview.widget.RecyclerView; 19 import androidx.recyclerview.widget.RecyclerView;
20 20
...@@ -22,14 +22,11 @@ import org.greenrobot.eventbus.EventBus; ...@@ -22,14 +22,11 @@ import org.greenrobot.eventbus.EventBus;
22 22
23 import java.util.ArrayList; 23 import java.util.ArrayList;
24 24
25 -import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
26 -import io.github.inflationx.calligraphy3.TypefaceUtils;
27 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
28 import ly.warp.sdk.R; 25 import ly.warp.sdk.R;
29 import ly.warp.sdk.io.callbacks.CallbackReceiver; 26 import ly.warp.sdk.io.callbacks.CallbackReceiver;
30 import ly.warp.sdk.io.models.Coupon; 27 import ly.warp.sdk.io.models.Coupon;
31 -import ly.warp.sdk.io.models.CouponList;
32 import ly.warp.sdk.io.models.Couponset; 28 import ly.warp.sdk.io.models.Couponset;
29 +import ly.warp.sdk.io.models.CustomTypefaceSpan;
33 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 30 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
34 import ly.warp.sdk.io.models.SharingCoupon; 31 import ly.warp.sdk.io.models.SharingCoupon;
35 import ly.warp.sdk.io.models.SharingList; 32 import ly.warp.sdk.io.models.SharingList;
...@@ -54,7 +51,8 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -54,7 +51,8 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
54 // =========================================================== 51 // ===========================================================
55 52
56 private ImageView mIvBack; 53 private ImageView mIvBack;
57 - private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty; 54 + private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty, mFontHeader,
55 + mFontExpired, mFontExpiredMore, mFontShared, mFontSharedMore;
58 private RecyclerView mRvExpiredCoupons, mRvSharedCoupons; 56 private RecyclerView mRvExpiredCoupons, mRvSharedCoupons;
59 private ExpiredCouponAdapter mAdapterExpiredCoupons; 57 private ExpiredCouponAdapter mAdapterExpiredCoupons;
60 private SharedCouponAdapter mAdapterSharedCoupons; 58 private SharedCouponAdapter mAdapterSharedCoupons;
...@@ -88,6 +86,17 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -88,6 +86,17 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
88 mLlShowMoreExpired = findViewById(R.id.ll_show_more_expired); 86 mLlShowMoreExpired = findViewById(R.id.ll_show_more_expired);
89 mLlShowMoreShared = findViewById(R.id.ll_show_more_shared); 87 mLlShowMoreShared = findViewById(R.id.ll_show_more_shared);
90 mCvExpiredInnerTitle = findViewById(R.id.cv_expired_coupons_inner_title); 88 mCvExpiredInnerTitle = findViewById(R.id.cv_expired_coupons_inner_title);
89 + mFontHeader = findViewById(R.id.textView3);
90 + mFontExpired = findViewById(R.id.tv_expired_title);
91 + mFontExpiredMore = findViewById(R.id.tv_expired_more);
92 + mFontShared = findViewById(R.id.tv_shared_title);
93 + mFontSharedMore = findViewById(R.id.tv_shared_more);
94 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mFontExpired,
95 + mFontShared);
96 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponsValueAll,
97 + mTvExpiredEmpty, mTvSharedEmpty);
98 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontExpiredMore,
99 + mFontSharedMore);
91 100
92 initViews(); 101 initViews();
93 } 102 }
...@@ -150,7 +159,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -150,7 +159,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
150 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue); 159 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
151 TextView expiredTab = findViewById(R.id.tv_expired_tab); 160 TextView expiredTab = findViewById(R.id.tv_expired_tab);
152 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black)); 161 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
153 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 162 +
163 + Typeface typefaceBoldOne = ResourcesCompat.getFont(this, R.font.peridot_bold);
164 + CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldOne);
165 +
154 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 166 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
155 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 167 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
156 sBuilderExpired.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 168 sBuilderExpired.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -159,10 +171,13 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -159,10 +171,13 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
159 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent); 171 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
160 TextView sharedTab = findViewById(R.id.tv_shared_tab); 172 TextView sharedTab = findViewById(R.id.tv_shared_tab);
161 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2)); 173 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
162 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf")); 174 +
175 + Typeface typefaceSemiBoldOne = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
176 + CustomTypefaceSpan typefaceSemiBoldSpan = new CustomTypefaceSpan(typefaceSemiBoldOne);
177 +
163 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 178 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
164 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 179 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
165 - sBuilderShared.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 180 + sBuilderShared.setSpan(typefaceSemiBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
166 sharedTab.setText(sBuilderShared, TextView.BufferType.SPANNABLE); 181 sharedTab.setText(sBuilderShared, TextView.BufferType.SPANNABLE);
167 182
168 mRlSharedView.setVisibility(View.GONE); 183 mRlSharedView.setVisibility(View.GONE);
...@@ -177,7 +192,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -177,7 +192,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
177 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue); 192 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
178 TextView sharedTab = findViewById(R.id.tv_shared_tab); 193 TextView sharedTab = findViewById(R.id.tv_shared_tab);
179 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black)); 194 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
180 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 195 +
196 + Typeface typefaceBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_bold);
197 + CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldTwo);
198 +
181 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 199 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
182 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 200 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
183 sBuilderShared.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 201 sBuilderShared.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -186,10 +204,13 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -186,10 +204,13 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
186 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent); 204 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent);
187 TextView expiredTab = findViewById(R.id.tv_expired_tab); 205 TextView expiredTab = findViewById(R.id.tv_expired_tab);
188 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2)); 206 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
189 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf")); 207 +
208 + Typeface typefaceSemiBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
209 + CustomTypefaceSpan typefaceSemiBoldSpan = new CustomTypefaceSpan(typefaceSemiBoldTwo);
210 +
190 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 211 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
191 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 212 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
192 - sBuilderExpired.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 213 + sBuilderExpired.setSpan(typefaceSemiBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
193 expiredTab.setText(sBuilderExpired, TextView.BufferType.SPANNABLE); 214 expiredTab.setText(sBuilderExpired, TextView.BufferType.SPANNABLE);
194 215
195 mRlExpiredView.setVisibility(View.GONE); 216 mRlExpiredView.setVisibility(View.GONE);
...@@ -211,11 +232,6 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -211,11 +232,6 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
211 } 232 }
212 } 233 }
213 234
214 - @Override
215 - protected void attachBaseContext(Context newBase) {
216 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
217 - }
218 -
219 // =========================================================== 235 // ===========================================================
220 // Methods 236 // Methods
221 // =========================================================== 237 // ===========================================================
...@@ -230,7 +246,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -230,7 +246,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
230 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue); 246 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
231 TextView expiredTab = findViewById(R.id.tv_expired_tab); 247 TextView expiredTab = findViewById(R.id.tv_expired_tab);
232 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black)); 248 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
233 - CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 249 +
250 + Typeface typefaceBoldThree = ResourcesCompat.getFont(this, R.font.peridot_bold);
251 + CustomTypefaceSpan typefaceBoldExpiredSpan = new CustomTypefaceSpan(typefaceBoldThree);
252 +
234 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 253 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
235 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 254 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
236 sBuilderExpired.setSpan(typefaceBoldExpiredSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 255 sBuilderExpired.setSpan(typefaceBoldExpiredSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -239,7 +258,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -239,7 +258,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
239 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent); 258 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
240 TextView sharedTab = findViewById(R.id.tv_shared_tab); 259 TextView sharedTab = findViewById(R.id.tv_shared_tab);
241 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2)); 260 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
242 - CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf")); 261 +
262 + Typeface typefaceSemiBoldThree = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
263 + CustomTypefaceSpan typefaceRegularSharedSpan = new CustomTypefaceSpan(typefaceSemiBoldThree);
264 +
243 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 265 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
244 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 266 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
245 sBuilderShared.setSpan(typefaceRegularSharedSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 267 sBuilderShared.setSpan(typefaceRegularSharedSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -255,11 +277,21 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis ...@@ -255,11 +277,21 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
255 .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()))) 277 .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount())))
256 .append(getString(R.string.cos_wallet_text5)); 278 .append(getString(R.string.cos_wallet_text5));
257 279
258 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf")); 280 + Typeface typefaceRegularOne = ResourcesCompat.getFont(this, R.font.peridot_regular);
259 - CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf")); 281 + CustomTypefaceSpan typefaceRegularSpan = new CustomTypefaceSpan(typefaceRegularOne);
260 - CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf")); 282 +
261 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 283 + Typeface typefaceRegularTwo = ResourcesCompat.getFont(this, R.font.peridot_regular);
262 - CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 284 + CustomTypefaceSpan typefaceRegularSpan2 = new CustomTypefaceSpan(typefaceRegularTwo);
285 +
286 + Typeface typefaceRegularThree = ResourcesCompat.getFont(this, R.font.peridot_regular);
287 + CustomTypefaceSpan typefaceRegularSpan3 = new CustomTypefaceSpan(typefaceRegularThree);
288 +
289 + Typeface typefaceBoldFour = ResourcesCompat.getFont(this, R.font.peridot_bold);
290 + CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldFour);
291 +
292 + Typeface typefaceBoldFive = ResourcesCompat.getFont(this, R.font.peridot_bold);
293 + CustomTypefaceSpan typefaceBoldSpan2 = new CustomTypefaceSpan(typefaceBoldFive);
294 +
263 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 295 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
264 sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 296 sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
265 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); 297 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);
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
5 +import android.graphics.Typeface;
6 import android.os.Bundle; 6 import android.os.Bundle;
7 import android.os.Handler; 7 import android.os.Handler;
8 import android.text.SpannableStringBuilder; 8 import android.text.SpannableStringBuilder;
...@@ -12,19 +12,20 @@ import android.widget.ImageView; ...@@ -12,19 +12,20 @@ import android.widget.ImageView;
12 import android.widget.RelativeLayout; 12 import android.widget.RelativeLayout;
13 import android.widget.TextView; 13 import android.widget.TextView;
14 14
15 +import androidx.core.content.res.ResourcesCompat;
16 +
15 import org.greenrobot.eventbus.EventBus; 17 import org.greenrobot.eventbus.EventBus;
16 import org.greenrobot.eventbus.Subscribe; 18 import org.greenrobot.eventbus.Subscribe;
17 19
18 import java.util.Locale; 20 import java.util.Locale;
19 21
20 -import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
21 -import io.github.inflationx.calligraphy3.TypefaceUtils;
22 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
23 import ly.warp.sdk.R; 22 import ly.warp.sdk.R;
24 import ly.warp.sdk.io.models.Coupon; 23 import ly.warp.sdk.io.models.Coupon;
24 +import ly.warp.sdk.io.models.CustomTypefaceSpan;
25 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 25 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
26 import ly.warp.sdk.io.models.WarplyBoxAnalysisEventModel; 26 import ly.warp.sdk.io.models.WarplyBoxAnalysisEventModel;
27 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel; 27 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
28 +import ly.warp.sdk.utils.WarpUtils;
28 import ly.warp.sdk.utils.WarplyManagerHelper; 29 import ly.warp.sdk.utils.WarplyManagerHelper;
29 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 30 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
30 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 31 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
...@@ -44,7 +45,8 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -44,7 +45,8 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
44 private int mTimer = 0; 45 private int mTimer = 0;
45 private Handler mSecondsHandler; 46 private Handler mSecondsHandler;
46 private TextView mTvFavValue, mTvDealsValue, mTvGiftsValue, mTvMarketValue, mTvDealsValueAll, 47 private TextView mTvFavValue, mTvDealsValue, mTvGiftsValue, mTvMarketValue, mTvDealsValueAll,
47 - mTvGiftsValueAll, mTvMarketAll, mTvBoxValue, mTvBoxValueAll; 48 + mTvGiftsValueAll, mTvMarketAll, mTvBoxValue, mTvBoxValueAll, mFontHeader,
49 + mFontValueAll;
48 private float mFavValue = 0.0f, countValue = 0.0f; 50 private float mFavValue = 0.0f, countValue = 0.0f;
49 private RelativeLayout mRlDealsBanner, mRlGiftsBanner, mRlUnifiedBanner, mRlBoxBanner; 51 private RelativeLayout mRlDealsBanner, mRlGiftsBanner, mRlUnifiedBanner, mRlBoxBanner;
50 private boolean mDealsBannerPressed = false, mHistoryPressed = false, 52 private boolean mDealsBannerPressed = false, mHistoryPressed = false,
...@@ -74,6 +76,13 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -74,6 +76,13 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
74 mRlBoxBanner = findViewById(R.id.rl_fourth_banner); 76 mRlBoxBanner = findViewById(R.id.rl_fourth_banner);
75 mRlGiftsBanner = findViewById(R.id.rl_third_banner); 77 mRlGiftsBanner = findViewById(R.id.rl_third_banner);
76 mRlUnifiedBanner = findViewById(R.id.rl_second_banner); 78 mRlUnifiedBanner = findViewById(R.id.rl_second_banner);
79 + mFontHeader = findViewById(R.id.textView3);
80 + mFontValueAll = findViewById(R.id.tv_exp_value_all);
81 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvFavValue);
82 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mFontValueAll,
83 + mTvDealsValueAll, mTvMarketAll, mTvGiftsValueAll, mTvBoxValueAll);
84 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvDealsValue, mTvMarketValue,
85 + mTvGiftsValue, mTvBoxValue);
77 86
78 initViews(); 87 initViews();
79 } 88 }
...@@ -213,11 +222,6 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -213,11 +222,6 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
213 } 222 }
214 } 223 }
215 224
216 - @Override
217 - protected void attachBaseContext(Context newBase) {
218 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
219 - }
220 -
221 // =========================================================== 225 // ===========================================================
222 // Methods 226 // Methods
223 // =========================================================== 227 // ===========================================================
...@@ -239,7 +243,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -239,7 +243,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
239 } 243 }
240 SpannableStringBuilder sBuilder = new SpannableStringBuilder(); 244 SpannableStringBuilder sBuilder = new SpannableStringBuilder();
241 sBuilder.append(String.format(getString(R.string.cos_deals_win_title_cos), badgeValueFirst)); 245 sBuilder.append(String.format(getString(R.string.cos_deals_win_title_cos), badgeValueFirst));
242 - CalligraphyTypefaceSpan typefaceBoldSpanFirst = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 246 +
247 + Typeface typefaceBoldOne = ResourcesCompat.getFont(this, R.font.peridot_bold);
248 + CustomTypefaceSpan typefaceBoldSpanFirst = new CustomTypefaceSpan(typefaceBoldOne);
249 +
243 sBuilder.setSpan(typefaceBoldSpanFirst, 24, 24 + badgeValueFirst.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 250 sBuilder.setSpan(typefaceBoldSpanFirst, 24, 24 + badgeValueFirst.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
244 mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE); 251 mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
245 mFavValue += WarplyManagerHelper.getDealsCouponsSum(); 252 mFavValue += WarplyManagerHelper.getDealsCouponsSum();
...@@ -274,7 +281,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -274,7 +281,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
274 } 281 }
275 SpannableStringBuilder sBuilderThird = new SpannableStringBuilder(); 282 SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
276 sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue)); 283 sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
277 - CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 284 +
285 + Typeface typefaceBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_bold);
286 + CustomTypefaceSpan typefaceBoldSpanThird = new CustomTypefaceSpan(typefaceBoldTwo);
287 +
278 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 288 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
279 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE); 289 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
280 } else { 290 } else {
...@@ -282,7 +292,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -282,7 +292,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
282 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue)); 292 mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
283 SpannableStringBuilder sBuilderThird = new SpannableStringBuilder(); 293 SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
284 sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue)); 294 sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
285 - CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 295 +
296 + Typeface typefaceBoldThree = ResourcesCompat.getFont(this, R.font.peridot_bold);
297 + CustomTypefaceSpan typefaceBoldSpanThird = new CustomTypefaceSpan(typefaceBoldThree);
298 +
286 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 299 sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
287 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE); 300 mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
288 } 301 }
...@@ -299,7 +312,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -299,7 +312,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
299 } 312 }
300 SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder(); 313 SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder();
301 sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue)); 314 sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue));
302 - CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 315 +
316 + Typeface typefaceBoldFour = ResourcesCompat.getFont(this, R.font.peridot_bold);
317 + CustomTypefaceSpan typefaceBoldSpanSecond = new CustomTypefaceSpan(typefaceBoldFour);
318 +
303 sBuilderSecond.setSpan(typefaceBoldSpanSecond, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 319 sBuilderSecond.setSpan(typefaceBoldSpanSecond, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
304 mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE); 320 mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE);
305 mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue(); 321 mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue();
...@@ -316,7 +332,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList ...@@ -316,7 +332,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
316 } 332 }
317 SpannableStringBuilder sBuilderFourth = new SpannableStringBuilder(); 333 SpannableStringBuilder sBuilderFourth = new SpannableStringBuilder();
318 sBuilderFourth.append(String.format(getString(R.string.cos_box_win_title_cos), badgeValueFourth)); 334 sBuilderFourth.append(String.format(getString(R.string.cos_box_win_title_cos), badgeValueFourth));
319 - CalligraphyTypefaceSpan typefaceBoldSpanFourth = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 335 +
336 + Typeface typefaceBoldFive = ResourcesCompat.getFont(this, R.font.peridot_bold);
337 + CustomTypefaceSpan typefaceBoldSpanFourth = new CustomTypefaceSpan(typefaceBoldFive);
338 +
320 sBuilderFourth.setSpan(typefaceBoldSpanFourth, 24, 24 + badgeValueFourth.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 339 sBuilderFourth.setSpan(typefaceBoldSpanFourth, 24, 24 + badgeValueFourth.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
321 mTvBoxValueAll.setText(sBuilderFourth, TextView.BufferType.SPANNABLE); 340 mTvBoxValueAll.setText(sBuilderFourth, TextView.BufferType.SPANNABLE);
322 mFavValue += WarplyManagerHelper.getBoxCouponsSum(); 341 mFavValue += WarplyManagerHelper.getBoxCouponsSum();
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context; 4 +import android.graphics.Typeface;
5 import android.os.Bundle; 5 import android.os.Bundle;
6 import android.os.Handler; 6 import android.os.Handler;
7 import android.os.Looper; 7 import android.os.Looper;
...@@ -15,29 +15,25 @@ import android.widget.TextView; ...@@ -15,29 +15,25 @@ import android.widget.TextView;
15 15
16 import androidx.cardview.widget.CardView; 16 import androidx.cardview.widget.CardView;
17 import androidx.core.content.ContextCompat; 17 import androidx.core.content.ContextCompat;
18 +import androidx.core.content.res.ResourcesCompat;
18 import androidx.recyclerview.widget.LinearLayoutManager; 19 import androidx.recyclerview.widget.LinearLayoutManager;
19 import androidx.recyclerview.widget.RecyclerView; 20 import androidx.recyclerview.widget.RecyclerView;
20 21
21 import org.greenrobot.eventbus.EventBus; 22 import org.greenrobot.eventbus.EventBus;
22 -import org.json.JSONArray;
23 -import org.json.JSONObject;
24 23
25 import java.util.ArrayList; 24 import java.util.ArrayList;
26 import java.util.Collections; 25 import java.util.Collections;
27 import java.util.concurrent.ExecutorService; 26 import java.util.concurrent.ExecutorService;
28 import java.util.concurrent.Executors; 27 import java.util.concurrent.Executors;
29 28
30 -import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
31 -import io.github.inflationx.calligraphy3.TypefaceUtils;
32 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
33 import ly.warp.sdk.R; 29 import ly.warp.sdk.R;
34 import ly.warp.sdk.io.callbacks.CallbackReceiver; 30 import ly.warp.sdk.io.callbacks.CallbackReceiver;
35 import ly.warp.sdk.io.models.Coupon; 31 import ly.warp.sdk.io.models.Coupon;
36 import ly.warp.sdk.io.models.Couponset; 32 import ly.warp.sdk.io.models.Couponset;
33 +import ly.warp.sdk.io.models.CustomTypefaceSpan;
37 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 34 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
38 import ly.warp.sdk.io.models.SharingCoupon; 35 import ly.warp.sdk.io.models.SharingCoupon;
39 import ly.warp.sdk.io.models.SharingList; 36 import ly.warp.sdk.io.models.SharingList;
40 -import ly.warp.sdk.io.models.UnifiedCoupon;
41 import ly.warp.sdk.io.request.WarplySharingHistoryRequest; 37 import ly.warp.sdk.io.request.WarplySharingHistoryRequest;
42 import ly.warp.sdk.utils.WarpUtils; 38 import ly.warp.sdk.utils.WarpUtils;
43 import ly.warp.sdk.utils.WarplyManagerHelper; 39 import ly.warp.sdk.utils.WarplyManagerHelper;
...@@ -55,7 +51,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -55,7 +51,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
55 // Fields 51 // Fields
56 // =========================================================== 52 // ===========================================================
57 private ImageView mIvBack; 53 private ImageView mIvBack;
58 - private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty; 54 + private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty, mFontHeader,
55 + mFontExpired, mFontExpiredMore, mFontShared, mFontSharedMore;
59 private RecyclerView mRvExpiredCoupons, mRvSharedCoupons; 56 private RecyclerView mRvExpiredCoupons, mRvSharedCoupons;
60 private ExpiredCouponAdapter mAdapterExpiredCoupons; 57 private ExpiredCouponAdapter mAdapterExpiredCoupons;
61 private SharedCouponAdapter mAdapterSharedCoupons; 58 private SharedCouponAdapter mAdapterSharedCoupons;
...@@ -89,6 +86,19 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -89,6 +86,19 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
89 mLlShowMoreExpired = findViewById(R.id.ll_show_more_expired); 86 mLlShowMoreExpired = findViewById(R.id.ll_show_more_expired);
90 mLlShowMoreShared = findViewById(R.id.ll_show_more_shared); 87 mLlShowMoreShared = findViewById(R.id.ll_show_more_shared);
91 mCvExpiredInfoView = findViewById(R.id.cv_expired_coupons_inner_title); 88 mCvExpiredInfoView = findViewById(R.id.cv_expired_coupons_inner_title);
89 + mFontHeader = findViewById(R.id.textView3);
90 + mFontExpired = findViewById(R.id.tv_expired_title);
91 + mFontExpiredMore = findViewById(R.id.tv_expired_more);
92 + mFontShared = findViewById(R.id.tv_shared_title);
93 + mFontSharedMore = findViewById(R.id.tv_shared_more);
94 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mFontExpired,
95 + mFontShared);
96 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponsValueAll,
97 + mTvExpiredEmpty, mTvSharedEmpty);
98 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontExpiredMore,
99 + mFontSharedMore);
100 +
101 +
92 if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) { 102 if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
93 final ExecutorService executor = Executors.newFixedThreadPool(1); 103 final ExecutorService executor = Executors.newFixedThreadPool(1);
94 executor.submit(() -> { 104 executor.submit(() -> {
...@@ -174,7 +184,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -174,7 +184,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
174 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue); 184 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
175 TextView expiredTab = findViewById(R.id.tv_expired_tab); 185 TextView expiredTab = findViewById(R.id.tv_expired_tab);
176 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black)); 186 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
177 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 187 +
188 + Typeface typefaceBoldOne = ResourcesCompat.getFont(this, R.font.peridot_bold);
189 + CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldOne);
190 +
178 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 191 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
179 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 192 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
180 sBuilderExpired.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 193 sBuilderExpired.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -182,7 +195,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -182,7 +195,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
182 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent); 195 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
183 TextView sharedTab = findViewById(R.id.tv_shared_tab); 196 TextView sharedTab = findViewById(R.id.tv_shared_tab);
184 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 197 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
185 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf")); 198 +
199 + Typeface typefaceSemiBoldOne = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
200 + CustomTypefaceSpan typefaceRegularSpan = new CustomTypefaceSpan(typefaceSemiBoldOne);
201 +
186 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 202 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
187 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 203 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
188 sBuilderShared.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 204 sBuilderShared.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -198,7 +214,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -198,7 +214,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
198 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue); 214 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
199 TextView sharedTab = findViewById(R.id.tv_shared_tab); 215 TextView sharedTab = findViewById(R.id.tv_shared_tab);
200 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black)); 216 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
201 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 217 +
218 + Typeface typefaceBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_bold);
219 + CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldTwo);
220 +
202 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 221 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
203 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 222 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
204 sBuilderShared.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 223 sBuilderShared.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -206,7 +225,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -206,7 +225,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
206 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent); 225 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent);
207 TextView expiredTab = findViewById(R.id.tv_expired_tab); 226 TextView expiredTab = findViewById(R.id.tv_expired_tab);
208 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 227 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
209 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf")); 228 +
229 + Typeface typefaceSemiBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
230 + CustomTypefaceSpan typefaceRegularSpan = new CustomTypefaceSpan(typefaceSemiBoldTwo);
231 +
210 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 232 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
211 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 233 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
212 sBuilderExpired.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 234 sBuilderExpired.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -230,11 +252,6 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -230,11 +252,6 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
230 } 252 }
231 } 253 }
232 254
233 - @Override
234 - protected void attachBaseContext(Context newBase) {
235 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
236 - }
237 -
238 // =========================================================== 255 // ===========================================================
239 // Methods 256 // Methods
240 // =========================================================== 257 // ===========================================================
...@@ -247,7 +264,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -247,7 +264,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
247 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue); 264 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
248 TextView expiredTab = findViewById(R.id.tv_expired_tab); 265 TextView expiredTab = findViewById(R.id.tv_expired_tab);
249 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black)); 266 expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
250 - CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 267 +
268 + Typeface typefaceBoldThree = ResourcesCompat.getFont(this, R.font.peridot_bold);
269 + CustomTypefaceSpan typefaceBoldExpiredSpan = new CustomTypefaceSpan(typefaceBoldThree);
270 +
251 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 271 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
252 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 272 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
253 sBuilderExpired.setSpan(typefaceBoldExpiredSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 273 sBuilderExpired.setSpan(typefaceBoldExpiredSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -255,7 +275,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -255,7 +275,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
255 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent); 275 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
256 TextView sharedTab = findViewById(R.id.tv_shared_tab); 276 TextView sharedTab = findViewById(R.id.tv_shared_tab);
257 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 277 sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
258 - CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf")); 278 +
279 + Typeface typefaceSemiBoldThree = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
280 + CustomTypefaceSpan typefaceRegularSharedSpan = new CustomTypefaceSpan(typefaceSemiBoldThree);
281 +
259 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 282 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
260 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 283 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
261 sBuilderShared.setSpan(typefaceRegularSharedSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 284 sBuilderShared.setSpan(typefaceRegularSharedSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
...@@ -263,8 +286,13 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl ...@@ -263,8 +286,13 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
263 String badgeValue = String.format("%.02f", countValue); 286 String badgeValue = String.format("%.02f", countValue);
264 SpannableStringBuilder sBuilder = new SpannableStringBuilder(); 287 SpannableStringBuilder sBuilder = new SpannableStringBuilder();
265 sBuilder.append(String.format(getString(R.string.cos_supermarket_history), badgeValue, String.valueOf(mExpiredMarketCoupons.size()))); 288 sBuilder.append(String.format(getString(R.string.cos_supermarket_history), badgeValue, String.valueOf(mExpiredMarketCoupons.size())));
266 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 289 +
267 - CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf")); 290 + Typeface typefaceBoldFour = ResourcesCompat.getFont(this, R.font.peridot_bold);
291 + CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldFour);
292 +
293 + Typeface typefaceBoldFive = ResourcesCompat.getFont(this, R.font.peridot_bold);
294 + CustomTypefaceSpan typefaceBoldSpan2 = new CustomTypefaceSpan(typefaceBoldFive);
295 +
268 sBuilder.setSpan(typefaceBoldSpan, 26, 26 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 296 sBuilder.setSpan(typefaceBoldSpan, 26, 26 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
269 sBuilder.setSpan(typefaceBoldSpan2, 26 + badgeValue.length() + 1 + 18, 26 + badgeValue.length() + 1 + 18 + String.valueOf(mExpiredMarketCoupons.size()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 297 sBuilder.setSpan(typefaceBoldSpan2, 26 + badgeValue.length() + 1 + 18, 26 + badgeValue.length() + 1 + 18 + String.valueOf(mExpiredMarketCoupons.size()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
270 mTvCouponsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE); 298 mTvCouponsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.os.Handler; 6 import android.os.Handler;
...@@ -32,7 +31,6 @@ import org.greenrobot.eventbus.Subscribe; ...@@ -32,7 +31,6 @@ import org.greenrobot.eventbus.Subscribe;
32 31
33 import java.util.ArrayList; 32 import java.util.ArrayList;
34 33
35 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
36 import ly.warp.sdk.R; 34 import ly.warp.sdk.R;
37 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel; 35 import ly.warp.sdk.io.models.ActiveDFYCouponEventModel;
38 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 36 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
...@@ -618,10 +616,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -618,10 +616,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
618 } 616 }
619 } 617 }
620 618
621 - @Override 619 +// @Override
622 - protected void attachBaseContext(Context newBase) { 620 +// protected void attachBaseContext(Context newBase) {
623 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase)); 621 +// super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
624 - } 622 +// }
625 623
626 // =========================================================== 624 // ===========================================================
627 // Methods 625 // Methods
......
1 package ly.warp.sdk.activities; 1 package ly.warp.sdk.activities;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.Context;
5 import android.content.Intent; 4 import android.content.Intent;
6 import android.os.Bundle; 5 import android.os.Bundle;
7 import android.os.Handler; 6 import android.os.Handler;
...@@ -20,13 +19,11 @@ import org.greenrobot.eventbus.EventBus; ...@@ -20,13 +19,11 @@ import org.greenrobot.eventbus.EventBus;
20 import org.greenrobot.eventbus.Subscribe; 19 import org.greenrobot.eventbus.Subscribe;
21 import org.json.JSONObject; 20 import org.json.JSONObject;
22 21
23 -import java.io.Serializable;
24 import java.util.ArrayList; 22 import java.util.ArrayList;
25 import java.util.HashMap; 23 import java.util.HashMap;
26 import java.util.Map; 24 import java.util.Map;
27 import java.util.TreeMap; 25 import java.util.TreeMap;
28 26
29 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
30 import ly.warp.sdk.R; 27 import ly.warp.sdk.R;
31 import ly.warp.sdk.io.models.Campaign; 28 import ly.warp.sdk.io.models.Campaign;
32 import ly.warp.sdk.io.models.CampaignList; 29 import ly.warp.sdk.io.models.CampaignList;
...@@ -116,6 +113,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -116,6 +113,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
116 mTvContextualSection = findViewById(R.id.tv_contextual_section); 113 mTvContextualSection = findViewById(R.id.tv_contextual_section);
117 mLlContextualItems = findViewById(R.id.ll_contextual_items); 114 mLlContextualItems = findViewById(R.id.ll_contextual_items);
118 mContextualItems = findViewById(R.id.rv_contextual_items); 115 mContextualItems = findViewById(R.id.rv_contextual_items);
116 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mTvTitle, mTvResearchSection,
117 + mTvExclusiveSection, mTvContestSection, mTvContextualSection);
119 /** New Implementation */ 118 /** New Implementation */
120 119
121 /** New Implementation */ 120 /** New Implementation */
...@@ -194,11 +193,6 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -194,11 +193,6 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
194 } 193 }
195 194
196 @Override 195 @Override
197 - protected void attachBaseContext(Context newBase) {
198 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
199 - }
200 -
201 - @Override
202 protected void onActivityResult(int requestCode, int resultCode, Intent data) { 196 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
203 if (requestCode == 1003) { 197 if (requestCode == 1003) {
204 OneTimeWorkRequest mywork = new OneTimeWorkRequest.Builder(EventCampaignService.class).build(); 198 OneTimeWorkRequest mywork = new OneTimeWorkRequest.Builder(EventCampaignService.class).build();
......
...@@ -20,11 +20,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; ...@@ -20,11 +20,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
20 import com.google.android.material.bottomsheet.BottomSheetDialog; 20 import com.google.android.material.bottomsheet.BottomSheetDialog;
21 21
22 import org.greenrobot.eventbus.EventBus; 22 import org.greenrobot.eventbus.EventBus;
23 -import org.json.JSONArray;
24 -import org.json.JSONException;
25 import org.json.JSONObject; 23 import org.json.JSONObject;
26 24
27 -import io.github.inflationx.viewpump.ViewPumpContextWrapper;
28 import ly.warp.sdk.R; 25 import ly.warp.sdk.R;
29 import ly.warp.sdk.io.callbacks.CallbackReceiver; 26 import ly.warp.sdk.io.callbacks.CallbackReceiver;
30 import ly.warp.sdk.io.models.Campaign; 27 import ly.warp.sdk.io.models.Campaign;
...@@ -33,7 +30,7 @@ import ly.warp.sdk.io.models.LoyaltyContextualOfferModel; ...@@ -33,7 +30,7 @@ import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
33 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel; 30 import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
34 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel; 31 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel;
35 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest; 32 import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest;
36 -import ly.warp.sdk.io.request.WarplyConsumerRequest; 33 +import ly.warp.sdk.utils.WarpUtils;
37 import ly.warp.sdk.utils.WarplyManagerHelper; 34 import ly.warp.sdk.utils.WarplyManagerHelper;
38 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 35 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
39 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 36 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
...@@ -54,7 +51,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -54,7 +51,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
54 51
55 private ImageView mIvBack, mIvCampaignPhoto; 52 private ImageView mIvBack, mIvCampaignPhoto;
56 private TextView mTvCampaignTitle, mTvTelcoGiftValue, mTvTelcoGiftType, mTvTelcoHeaderTitle, 53 private TextView mTvCampaignTitle, mTvTelcoGiftValue, mTvTelcoGiftType, mTvTelcoHeaderTitle,
57 - mTvTelcoGiftDuration, mTvSeeMoreValue; 54 + mTvTelcoGiftDuration, mTvSeeMoreValue, mFontButtonGetIt, mFontButtonSeeMore;
58 private LoyaltyContextualOfferModel mCCMS = new LoyaltyContextualOfferModel(); 55 private LoyaltyContextualOfferModel mCCMS = new LoyaltyContextualOfferModel();
59 private Campaign mLoyalty = new Campaign(); 56 private Campaign mLoyalty = new Campaign();
60 private LinearLayout mLlActivateOffer; 57 private LinearLayout mLlActivateOffer;
...@@ -93,6 +90,13 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -93,6 +90,13 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
93 mTvTelcoGiftDuration = findViewById(R.id.tv_telco_gift_duration); 90 mTvTelcoGiftDuration = findViewById(R.id.tv_telco_gift_duration);
94 mLlSeeMore = findViewById(R.id.ll_see_more); 91 mLlSeeMore = findViewById(R.id.ll_see_more);
95 mTvSeeMoreValue = findViewById(R.id.tv_see_more_value); 92 mTvSeeMoreValue = findViewById(R.id.tv_see_more_value);
93 + mFontButtonGetIt = findViewById(R.id.button_get_it);
94 + mFontButtonSeeMore = findViewById(R.id.tv_see_more);
95 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mTvTelcoHeaderTitle);
96 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mTvTelcoGiftValue, mFontButtonGetIt);
97 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvTelcoGiftType, mTvTelcoGiftDuration,
98 + mTvCampaignTitle, mTvSeeMoreValue);
99 + WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontButtonSeeMore);
96 100
97 initViews(); 101 initViews();
98 } 102 }
...@@ -136,11 +140,6 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -136,11 +140,6 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
136 } 140 }
137 } 141 }
138 142
139 - @Override
140 - protected void attachBaseContext(Context newBase) {
141 - super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
142 - }
143 -
144 // =========================================================== 143 // ===========================================================
145 // Methods 144 // Methods
146 // =========================================================== 145 // ===========================================================
...@@ -176,46 +175,19 @@ public class TelcoActivity extends Activity implements View.OnClickListener { ...@@ -176,46 +175,19 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
176 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this); 175 final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
177 bottomSheetDialog.setContentView(R.layout.dl_share); 176 bottomSheetDialog.setContentView(R.layout.dl_share);
178 TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value); 177 TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
178 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, tvHeader);
179 tvHeader.setText(R.string.cos_coupon_share_telco); 179 tvHeader.setText(R.string.cos_coupon_share_telco);
180 LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner); 180 LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
181 181
182 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close); 182 ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close);
183 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss()); 183 dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
184 184
185 -// if (mConsumer != null) {
186 -// try {
187 -// JSONObject profMeta = new JSONObject(mConsumer.getProfileMetadata());
188 -// if (profMeta != null) {
189 -// JSONArray msisdnList = new JSONArray();
190 -// msisdnList = profMeta.optJSONArray(MSISDN_LIST);
191 -// if (msisdnList != null && msisdnList.length() > 0) {
192 -// for (int i = 0; i < msisdnList.length(); i++) {
193 -// LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
194 -// LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
195 -// TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
196 -// textView.setText(msisdnList.optString(i));
197 -// textView.setOnClickListener(view -> {
198 -// TextView tv = (TextView) view;
199 -// mSender = tv.getText().toString();
200 -// bottomSheetDialog.dismiss();
201 -// askActivateDialog();
202 -// });
203 -// parent.addView(v, 0, new ViewGroup.LayoutParams(
204 -// ViewGroup.LayoutParams.MATCH_PARENT,
205 -// ViewGroup.LayoutParams.WRAP_CONTENT));
206 -// }
207 -// }
208 -// }
209 -// } catch (JSONException e) {
210 -// e.printStackTrace();
211 -// }
212 -// }
213 -
214 if (mCCMS.getEligibleAssets() != null && mCCMS.getEligibleAssets().size() > 0) { 185 if (mCCMS.getEligibleAssets() != null && mCCMS.getEligibleAssets().size() > 0) {
215 for (int i = 0; i < mCCMS.getEligibleAssets().size(); i++) { 186 for (int i = 0; i < mCCMS.getEligibleAssets().size(); i++) {
216 LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); 187 LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
217 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null); 188 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
218 TextView textView = (TextView) v.findViewById(R.id.tv_phone_share); 189 TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
190 + WarpUtils.renderCustomFont(this, R.font.peridot_regular, textView);
219 textView.setText(mCCMS.getEligibleAssets().get(i)); 191 textView.setText(mCCMS.getEligibleAssets().get(i));
220 textView.setOnClickListener(view -> { 192 textView.setOnClickListener(view -> {
221 TextView tv = (TextView) view; 193 TextView tv = (TextView) view;
......
...@@ -2,7 +2,6 @@ package ly.warp.sdk.fragments; ...@@ -2,7 +2,6 @@ package ly.warp.sdk.fragments;
2 2
3 import static android.app.Activity.RESULT_OK; 3 import static android.app.Activity.RESULT_OK;
4 4
5 -import android.content.Context;
6 import android.content.Intent; 5 import android.content.Intent;
7 import android.os.Bundle; 6 import android.os.Bundle;
8 import android.os.Handler; 7 import android.os.Handler;
...@@ -11,7 +10,6 @@ import android.text.TextUtils; ...@@ -11,7 +10,6 @@ import android.text.TextUtils;
11 import android.view.LayoutInflater; 10 import android.view.LayoutInflater;
12 import android.view.View; 11 import android.view.View;
13 import android.view.ViewGroup; 12 import android.view.ViewGroup;
14 -import android.view.ViewTreeObserver;
15 import android.widget.HorizontalScrollView; 13 import android.widget.HorizontalScrollView;
16 import android.widget.ImageView; 14 import android.widget.ImageView;
17 import android.widget.LinearLayout; 15 import android.widget.LinearLayout;
...@@ -29,7 +27,6 @@ import org.greenrobot.eventbus.Subscribe; ...@@ -29,7 +27,6 @@ import org.greenrobot.eventbus.Subscribe;
29 27
30 import java.util.ArrayList; 28 import java.util.ArrayList;
31 import java.util.Collections; 29 import java.util.Collections;
32 -import java.util.Comparator;
33 30
34 import ly.warp.sdk.R; 31 import ly.warp.sdk.R;
35 import ly.warp.sdk.activities.ActiveCouponsActivity; 32 import ly.warp.sdk.activities.ActiveCouponsActivity;
...@@ -64,7 +61,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -64,7 +61,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
64 61
65 private TextView mTvUserBadge, mTvUserBadgeCentered, mTvBoxCountBadge, 62 private TextView mTvUserBadge, mTvUserBadgeCentered, mTvBoxCountBadge,
66 mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge, 63 mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge,
67 - mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle; 64 + mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle,
65 + mTvVouchersSubtitle, mFontHeader, mFontEmptyText, mFontQuestionnaire,
66 + mFontQuestionnaireCentered, mFontCountDisabled, mFontDealsCountBadge,
67 + mFontUnifiedCountBadge, mFontGiftsCountBadge, mFontBoxCountBadge;
68 private ConstraintLayout mLlQuestionnaireCentered, 68 private ConstraintLayout mLlQuestionnaireCentered,
69 mLlQuestionnaire, mLlUserBadge, mLlUserBadgeCentered; 69 mLlQuestionnaire, mLlUserBadge, mLlUserBadgeCentered;
70 private LinearLayout mLlEmptyWallet, mLlTilesParent, 70 private LinearLayout mLlEmptyWallet, mLlTilesParent,
...@@ -136,6 +136,21 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -136,6 +136,21 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
136 mFirstEnd = view.findViewById(R.id.v_first_end); 136 mFirstEnd = view.findViewById(R.id.v_first_end);
137 mSecondStart = view.findViewById(R.id.v_second_start); 137 mSecondStart = view.findViewById(R.id.v_second_start);
138 mSecondEnd = view.findViewById(R.id.v_second_end); 138 mSecondEnd = view.findViewById(R.id.v_second_end);
139 + mFontHeader = view.findViewById(R.id.tv_coupons_header);
140 + mFontEmptyText = view.findViewById(R.id.empty_text);
141 + mFontQuestionnaire = view.findViewById(R.id.tv_questionnaire);
142 + mFontQuestionnaireCentered = view.findViewById(R.id.tv_questionnaire_centered);
143 + mFontCountDisabled = view.findViewById(R.id.tv_vouchers_count_disabled);
144 +
145 + if (getContext() != null) {
146 + WarpUtils.renderCustomFont(getContext(), R.font.bt_cosmo_bold, mFontHeader, mTvVouchersTitle,
147 + mTvVouchersDisabledTitle);
148 + WarpUtils.renderCustomFont(getContext(), R.font.peridot_regular, mFontEmptyText,
149 + mTvVouchersSubtitle, mTvVouchersDisabledSubtitle);
150 + WarpUtils.renderCustomFont(getContext(), R.font.peridot_bold, mTvUserBadge,
151 + mTvUserBadgeCentered, mFontQuestionnaire, mFontQuestionnaireCentered);
152 + WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mFontCountDisabled);
153 + }
139 154
140 defineAndSortTiles(); 155 defineAndSortTiles();
141 createTiles(); 156 createTiles();
...@@ -571,7 +586,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -571,7 +586,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
571 EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel)); 586 EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel));
572 } 587 }
573 }); 588 });
589 + mFontDealsCountBadge = (TextView) view.findViewById(R.id.tv_deals_count_title);
574 mTvDealsCountBadge = (TextView) view.findViewById(R.id.tv_deals_count); 590 mTvDealsCountBadge = (TextView) view.findViewById(R.id.tv_deals_count);
591 + if (getContext() != null) {
592 + WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvDealsCountBadge, mFontDealsCountBadge);
593 + }
575 mLlTilesParent.addView(view); 594 mLlTilesParent.addView(view);
576 } 595 }
577 /** Unified Coupons List */ 596 /** Unified Coupons List */
...@@ -593,7 +612,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -593,7 +612,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
593 startActivity(intent); 612 startActivity(intent);
594 } 613 }
595 }); 614 });
615 + mFontUnifiedCountBadge = (TextView) view.findViewById(R.id.tv_sm_count_title);
596 mTvUnifiedCountBadge = (TextView) view.findViewById(R.id.tv_sm_count); 616 mTvUnifiedCountBadge = (TextView) view.findViewById(R.id.tv_sm_count);
617 + if (getContext() != null) {
618 + WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvUnifiedCountBadge, mFontUnifiedCountBadge);
619 + }
597 mLlTilesParent.addView(view); 620 mLlTilesParent.addView(view);
598 } 621 }
599 /** Coupon List */ 622 /** Coupon List */
...@@ -615,7 +638,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -615,7 +638,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
615 startActivity(intent); 638 startActivity(intent);
616 } 639 }
617 }); 640 });
641 + mFontGiftsCountBadge = (TextView) view.findViewById(R.id.tv_gifts_count_title);
618 mTvGiftsCountBadge = (TextView) view.findViewById(R.id.tv_gifts_count); 642 mTvGiftsCountBadge = (TextView) view.findViewById(R.id.tv_gifts_count);
643 + if (getContext() != null) {
644 + WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvGiftsCountBadge, mFontGiftsCountBadge);
645 + }
619 mLlTilesParent.addView(view); 646 mLlTilesParent.addView(view);
620 } 647 }
621 /** Box Badge */ 648 /** Box Badge */
...@@ -638,7 +665,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener ...@@ -638,7 +665,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
638 EventBus.getDefault().post(new WarplyEventBusManager(activeBoxEventModel)); 665 EventBus.getDefault().post(new WarplyEventBusManager(activeBoxEventModel));
639 } 666 }
640 }); 667 });
668 + mFontBoxCountBadge = (TextView) view.findViewById(R.id.tv_box_count_title);
641 mTvBoxCountBadge = (TextView) view.findViewById(R.id.tv_box_count); 669 mTvBoxCountBadge = (TextView) view.findViewById(R.id.tv_box_count);
670 + if (getContext() != null) {
671 + WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvBoxCountBadge, mFontBoxCountBadge);
672 + }
642 mLlTilesParent.addView(view); 673 mLlTilesParent.addView(view);
643 } 674 }
644 } 675 }
......
1 +package ly.warp.sdk.io.models;
2 +
3 +import android.graphics.Paint;
4 +import android.graphics.Typeface;
5 +import android.text.TextPaint;
6 +import android.text.style.MetricAffectingSpan;
7 +
8 +public class CustomTypefaceSpan extends MetricAffectingSpan {
9 + private final Typeface typeface;
10 +
11 + public CustomTypefaceSpan(Typeface typeface) {
12 + this.typeface = typeface;
13 + }
14 +
15 + @Override
16 + public void updateMeasureState(TextPaint p) {
17 + applyCustomTypeFace(p, typeface);
18 + }
19 +
20 + @Override
21 + public void updateDrawState(TextPaint tp) {
22 + applyCustomTypeFace(tp, typeface);
23 + }
24 +
25 + private static void applyCustomTypeFace(Paint paint, Typeface tf) {
26 + int oldStyle;
27 + Typeface old = paint.getTypeface();
28 + if (old == null) {
29 + oldStyle = 0;
30 + } else {
31 + oldStyle = old.getStyle();
32 + }
33 +
34 + int fake = oldStyle & ~tf.getStyle();
35 + if ((fake & Typeface.BOLD) != 0) {
36 + paint.setFakeBoldText(true);
37 + }
38 +
39 + if ((fake & Typeface.ITALIC) != 0) {
40 + paint.setTextSkewX(-0.25f);
41 + }
42 +
43 + paint.setTypeface(tf);
44 + }
45 +}
...@@ -24,6 +24,7 @@ import io.reactivex.subjects.PublishSubject; ...@@ -24,6 +24,7 @@ import io.reactivex.subjects.PublishSubject;
24 import ly.warp.sdk.R; 24 import ly.warp.sdk.R;
25 import ly.warp.sdk.io.models.Coupon; 25 import ly.warp.sdk.io.models.Coupon;
26 import ly.warp.sdk.io.models.CouponList; 26 import ly.warp.sdk.io.models.CouponList;
27 +import ly.warp.sdk.utils.WarpUtils;
27 28
28 public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdapter.ExpiredCouponViewHolder> { 29 public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdapter.ExpiredCouponViewHolder> {
29 30
...@@ -49,7 +50,7 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap ...@@ -49,7 +50,7 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap
49 } 50 }
50 51
51 public class ExpiredCouponViewHolder extends RecyclerView.ViewHolder { 52 public class ExpiredCouponViewHolder extends RecyclerView.ViewHolder {
52 - private TextView tvCouponTitle, tvCouponValue, tvCouponDate; 53 + private TextView tvCouponTitle, tvCouponValue, tvCouponDate, tvCouponSubtitle;
53 private ImageView ivCouponLogo; 54 private ImageView ivCouponLogo;
54 55
55 public ExpiredCouponViewHolder(View view) { 56 public ExpiredCouponViewHolder(View view) {
...@@ -58,6 +59,10 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap ...@@ -58,6 +59,10 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap
58 tvCouponValue = view.findViewById(R.id.tv_expired_coupons_value); 59 tvCouponValue = view.findViewById(R.id.tv_expired_coupons_value);
59 tvCouponDate = view.findViewById(R.id.tv_expired_coupons_date); 60 tvCouponDate = view.findViewById(R.id.tv_expired_coupons_date);
60 ivCouponLogo = view.findViewById(R.id.iv_expired_logo); 61 ivCouponLogo = view.findViewById(R.id.iv_expired_logo);
62 + tvCouponSubtitle = view.findViewById(R.id.tv_expired_coupons_label);
63 +
64 + WarpUtils.renderCustomFont(mContext, R.font.peridot_bold, tvCouponDate, tvCouponValue);
65 + WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCouponTitle, tvCouponSubtitle);
61 } 66 }
62 } 67 }
63 68
......
...@@ -21,6 +21,7 @@ import io.reactivex.subjects.PublishSubject; ...@@ -21,6 +21,7 @@ import io.reactivex.subjects.PublishSubject;
21 import ly.warp.sdk.R; 21 import ly.warp.sdk.R;
22 import ly.warp.sdk.io.models.Coupon; 22 import ly.warp.sdk.io.models.Coupon;
23 import ly.warp.sdk.io.models.UnifiedCoupon; 23 import ly.warp.sdk.io.models.UnifiedCoupon;
24 +import ly.warp.sdk.utils.WarpUtils;
24 25
25 public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapter.ActiveCouponViewHolder> { 26 public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapter.ActiveCouponViewHolder> {
26 27
...@@ -51,6 +52,9 @@ public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapte ...@@ -51,6 +52,9 @@ public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapte
51 tvCouponTitle = view.findViewById(R.id.tv_market_coupons_title); 52 tvCouponTitle = view.findViewById(R.id.tv_market_coupons_title);
52 tvCouponDate = view.findViewById(R.id.tv_market_coupons_date); 53 tvCouponDate = view.findViewById(R.id.tv_market_coupons_date);
53 tvCouponCount = view.findViewById(R.id.tv_market_coupons_count); 54 tvCouponCount = view.findViewById(R.id.tv_market_coupons_count);
55 +
56 + WarpUtils.renderCustomFont(mContext, R.font.bt_cosmo_bold, tvCouponTitle);
57 + WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCouponDate, tvCouponCount);
54 } 58 }
55 } 59 }
56 60
......
1 package ly.warp.sdk.views.adapters; 1 package ly.warp.sdk.views.adapters;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 -import android.content.Intent;
5 import android.text.TextUtils; 4 import android.text.TextUtils;
6 import android.view.LayoutInflater; 5 import android.view.LayoutInflater;
7 import android.view.View; 6 import android.view.View;
...@@ -18,7 +17,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; ...@@ -18,7 +17,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
18 17
19 import org.json.JSONObject; 18 import org.json.JSONObject;
20 19
21 -import java.io.Serializable;
22 import java.util.ArrayList; 20 import java.util.ArrayList;
23 import java.util.Date; 21 import java.util.Date;
24 import java.util.concurrent.TimeUnit; 22 import java.util.concurrent.TimeUnit;
...@@ -26,14 +24,11 @@ import java.util.concurrent.TimeUnit; ...@@ -26,14 +24,11 @@ import java.util.concurrent.TimeUnit;
26 import io.reactivex.Observable; 24 import io.reactivex.Observable;
27 import io.reactivex.subjects.PublishSubject; 25 import io.reactivex.subjects.PublishSubject;
28 import ly.warp.sdk.R; 26 import ly.warp.sdk.R;
29 -import ly.warp.sdk.activities.GiftsForYouActivity;
30 -import ly.warp.sdk.activities.TelcoActivity;
31 -import ly.warp.sdk.activities.WarpViewActivity;
32 import ly.warp.sdk.io.models.LoyaltyContextualOfferModel; 27 import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
33 import ly.warp.sdk.io.models.MergedGifts; 28 import ly.warp.sdk.io.models.MergedGifts;
34 import ly.warp.sdk.utils.WarpJSONParser; 29 import ly.warp.sdk.utils.WarpJSONParser;
30 +import ly.warp.sdk.utils.WarpUtils;
35 import ly.warp.sdk.utils.WarplyManagerHelper; 31 import ly.warp.sdk.utils.WarplyManagerHelper;
36 -import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
37 32
38 public class MergedGiftsAdapter extends RecyclerView.Adapter<MergedGiftsAdapter.MergedGiftsViewHolder> { 33 public class MergedGiftsAdapter extends RecyclerView.Adapter<MergedGiftsAdapter.MergedGiftsViewHolder> {
39 34
...@@ -56,6 +51,8 @@ public class MergedGiftsAdapter extends RecyclerView.Adapter<MergedGiftsAdapter. ...@@ -56,6 +51,8 @@ public class MergedGiftsAdapter extends RecyclerView.Adapter<MergedGiftsAdapter.
56 ivMergedGiftsLogo = view.findViewById(R.id.iv_campaign_logo); 51 ivMergedGiftsLogo = view.findViewById(R.id.iv_campaign_logo);
57 tvMergedGiftsTitle = view.findViewById(R.id.tv_campaign_title); 52 tvMergedGiftsTitle = view.findViewById(R.id.tv_campaign_title);
58 ivIsNew = view.findViewById(R.id.iv_campaign_new); 53 ivIsNew = view.findViewById(R.id.iv_campaign_new);
54 +
55 + WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvMergedGiftsTitle);
59 } 56 }
60 } 57 }
61 58
......
...@@ -25,6 +25,7 @@ import ly.warp.sdk.R; ...@@ -25,6 +25,7 @@ import ly.warp.sdk.R;
25 import ly.warp.sdk.io.models.Campaign; 25 import ly.warp.sdk.io.models.Campaign;
26 import ly.warp.sdk.io.models.LoyaltyContextualOfferModel; 26 import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
27 import ly.warp.sdk.utils.WarpJSONParser; 27 import ly.warp.sdk.utils.WarpJSONParser;
28 +import ly.warp.sdk.utils.WarpUtils;
28 import ly.warp.sdk.utils.WarplyManagerHelper; 29 import ly.warp.sdk.utils.WarplyManagerHelper;
29 30
30 public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapter.MoreCampaignViewHolder> { 31 public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapter.MoreCampaignViewHolder> {
...@@ -50,6 +51,10 @@ public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapte ...@@ -50,6 +51,10 @@ public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapte
50 ivIsNew = view.findViewById(R.id.iv_campaign_new); 51 ivIsNew = view.findViewById(R.id.iv_campaign_new);
51 tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle); 52 tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle);
52 tvCampaignMessage = view.findViewById(R.id.tv_campaign_message); 53 tvCampaignMessage = view.findViewById(R.id.tv_campaign_message);
54 +
55 + WarpUtils.renderCustomFont(mContext, R.font.bt_cosmo_bold, tvCampaignTitle);
56 + WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCampaignSubtitle);
57 + WarpUtils.renderCustomFont(mContext, R.font.peridot_semi_bold, tvCampaignMessage);
53 } 58 }
54 } 59 }
55 60
......
...@@ -20,8 +20,8 @@ import java.util.ArrayList; ...@@ -20,8 +20,8 @@ import java.util.ArrayList;
20 import io.reactivex.Observable; 20 import io.reactivex.Observable;
21 import io.reactivex.subjects.PublishSubject; 21 import io.reactivex.subjects.PublishSubject;
22 import ly.warp.sdk.R; 22 import ly.warp.sdk.R;
23 -import ly.warp.sdk.io.models.Campaign;
24 import ly.warp.sdk.io.models.LoyaltyContextualOfferModel; 23 import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
24 +import ly.warp.sdk.utils.WarpUtils;
25 25
26 public class MoreContextualAdapter extends RecyclerView.Adapter<MoreContextualAdapter.MoreContextualViewHolder> { 26 public class MoreContextualAdapter extends RecyclerView.Adapter<MoreContextualAdapter.MoreContextualViewHolder> {
27 27
...@@ -46,6 +46,10 @@ public class MoreContextualAdapter extends RecyclerView.Adapter<MoreContextualAd ...@@ -46,6 +46,10 @@ public class MoreContextualAdapter extends RecyclerView.Adapter<MoreContextualAd
46 ivIsNew = view.findViewById(R.id.iv_campaign_new); 46 ivIsNew = view.findViewById(R.id.iv_campaign_new);
47 tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle); 47 tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle);
48 tvCampaignMessage = view.findViewById(R.id.tv_campaign_message); 48 tvCampaignMessage = view.findViewById(R.id.tv_campaign_message);
49 +
50 + WarpUtils.renderCustomFont(mContext, R.font.bt_cosmo_bold, tvCampaignTitle);
51 + WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCampaignSubtitle);
52 + WarpUtils.renderCustomFont(mContext, R.font.peridot_semi_bold, tvCampaignMessage);
49 } 53 }
50 } 54 }
51 55
......
...@@ -29,6 +29,7 @@ import ly.warp.sdk.io.models.Merchant; ...@@ -29,6 +29,7 @@ import ly.warp.sdk.io.models.Merchant;
29 import ly.warp.sdk.io.models.SharingCoupon; 29 import ly.warp.sdk.io.models.SharingCoupon;
30 import ly.warp.sdk.io.models.SharingList; 30 import ly.warp.sdk.io.models.SharingList;
31 import ly.warp.sdk.utils.WarpJSONParser; 31 import ly.warp.sdk.utils.WarpJSONParser;
32 +import ly.warp.sdk.utils.WarpUtils;
32 import ly.warp.sdk.utils.WarplyManagerHelper; 33 import ly.warp.sdk.utils.WarplyManagerHelper;
33 34
34 public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapter.SharedCouponViewHolder> { 35 public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapter.SharedCouponViewHolder> {
...@@ -59,6 +60,10 @@ public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapte ...@@ -59,6 +60,10 @@ public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapte
59 tvCouponLabel = view.findViewById(R.id.tv_shared_coupons_label); 60 tvCouponLabel = view.findViewById(R.id.tv_shared_coupons_label);
60 tvCouponPhone = view.findViewById(R.id.tv_shared_coupons_phone); 61 tvCouponPhone = view.findViewById(R.id.tv_shared_coupons_phone);
61 ivCouponLogo = view.findViewById(R.id.iv_shared_logo); 62 ivCouponLogo = view.findViewById(R.id.iv_shared_logo);
63 +
64 + WarpUtils.renderCustomFont(mContext, R.font.peridot_bold, tvCouponDate, tvCouponValue);
65 + WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCouponTitle, tvCouponLabel,
66 + tvCouponPhone);
62 } 67 }
63 } 68 }
64 69
......
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"
4 - android:id="@+id/cl_bill_payment"
5 - android:layout_width="match_parent"
6 - android:layout_height="match_parent"
7 - android:background="@android:color/white"
8 - android:orientation="vertical">
9 -
10 - <androidx.constraintlayout.widget.ConstraintLayout
11 - android:id="@+id/cl_bill_header"
12 - android:layout_width="match_parent"
13 - android:layout_height="48dp"
14 - android:background="@android:color/white">
15 -
16 - <ImageView
17 - android:id="@+id/iv_list_close"
18 - android:layout_width="48dp"
19 - android:layout_height="48dp"
20 - android:layout_marginStart="16dp"
21 - android:scaleType="centerInside"
22 - android:src="@drawable/ic_back"
23 - app:layout_constraintBottom_toBottomOf="parent"
24 - app:layout_constraintStart_toStartOf="parent"
25 - app:layout_constraintTop_toTopOf="parent" />
26 -
27 - <TextView
28 - android:id="@+id/textView3"
29 - android:layout_width="wrap_content"
30 - android:layout_height="wrap_content"
31 - android:gravity="center"
32 - android:textColor="@color/grey"
33 - android:textSize="17sp"
34 - android:textStyle="bold"
35 - android:text="@string/cos_active_gifts_title"
36 - app:layout_constraintBottom_toBottomOf="parent"
37 - app:layout_constraintEnd_toEndOf="parent"
38 - app:layout_constraintStart_toStartOf="parent"
39 - app:layout_constraintTop_toTopOf="parent" />
40 - </androidx.constraintlayout.widget.ConstraintLayout>
41 -
42 - <RelativeLayout
43 - android:layout_width="match_parent"
44 - android:layout_height="match_parent"
45 - android:background="@drawable/shape_cos_loyalty"
46 - android:orientation="vertical">
47 -
48 - <androidx.recyclerview.widget.RecyclerView
49 - android:id="@+id/rv_merged_active_gifts"
50 - android:layout_width="match_parent"
51 - android:layout_height="wrap_content"
52 - android:layout_marginTop="4dp"
53 - android:clipToPadding="false"
54 - android:orientation="vertical"
55 - android:paddingTop="44dp" />
56 -
57 - <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
58 - <!-- android:id="@+id/cl_recycler_inner"-->
59 - <!-- android:layout_width="match_parent"-->
60 - <!-- android:layout_height="wrap_content"-->
61 - <!-- android:layout_marginTop="36dp"-->
62 - <!-- android:paddingBottom="4dp"-->
63 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
64 - <!-- app:layout_constraintRight_toRightOf="parent"-->
65 - <!-- app:layout_constraintTop_toTopOf="parent">-->
66 -
67 - <!-- <TextView-->
68 - <!-- android:id="@+id/tv_gifts_title"-->
69 - <!-- android:layout_width="wrap_content"-->
70 - <!-- android:layout_height="wrap_content"-->
71 - <!-- android:layout_marginStart="10dp"-->
72 - <!-- android:text="@string/cos_gifts_title2"-->
73 - <!-- android:textColor="@android:color/white"-->
74 - <!-- android:textSize="18sp"-->
75 - <!-- android:textStyle="bold"-->
76 - <!-- app:layout_constraintStart_toStartOf="parent"-->
77 - <!-- app:layout_constraintTop_toTopOf="parent" />-->
78 -
79 - <!-- <androidx.recyclerview.widget.RecyclerView-->
80 - <!-- android:id="@+id/rv_gifts"-->
81 - <!-- android:layout_width="match_parent"-->
82 - <!-- android:layout_height="wrap_content"-->
83 - <!-- android:layout_marginTop="24dp"-->
84 - <!-- android:clipToPadding="false"-->
85 - <!-- android:orientation="horizontal"-->
86 - <!-- android:paddingEnd="10dp"-->
87 - <!-- app:layout_constraintBottom_toBottomOf="parent"-->
88 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
89 - <!-- app:layout_constraintRight_toRightOf="parent"-->
90 - <!-- app:layout_constraintTop_toBottomOf="@+id/tv_gifts_title" />-->
91 - <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
92 -
93 - <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
94 - <!-- android:id="@+id/cl_recycler_inner2"-->
95 - <!-- android:layout_width="match_parent"-->
96 - <!-- android:layout_height="wrap_content"-->
97 - <!-- android:layout_below="@+id/cl_recycler_inner"-->
98 - <!-- android:layout_marginTop="36dp"-->
99 - <!-- android:paddingBottom="4dp"-->
100 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
101 - <!-- app:layout_constraintRight_toRightOf="parent"-->
102 - <!-- app:layout_constraintTop_toTopOf="parent">-->
103 -
104 - <!-- <TextView-->
105 - <!-- android:id="@+id/tv_rewards_title"-->
106 - <!-- android:layout_width="wrap_content"-->
107 - <!-- android:layout_height="wrap_content"-->
108 - <!-- android:layout_marginStart="10dp"-->
109 - <!-- android:text="@string/cos_rewards_title"-->
110 - <!-- android:textColor="@android:color/white"-->
111 - <!-- android:textSize="18sp"-->
112 - <!-- android:textStyle="bold"-->
113 - <!-- app:layout_constraintStart_toStartOf="parent"-->
114 - <!-- app:layout_constraintTop_toTopOf="parent" />-->
115 -
116 - <!-- <androidx.recyclerview.widget.RecyclerView-->
117 - <!-- android:id="@+id/rv_rewards"-->
118 - <!-- android:layout_width="match_parent"-->
119 - <!-- android:layout_height="wrap_content"-->
120 - <!-- android:layout_marginTop="24dp"-->
121 - <!-- android:clipToPadding="false"-->
122 - <!-- android:orientation="horizontal"-->
123 - <!-- android:paddingEnd="10dp"-->
124 - <!-- app:layout_constraintBottom_toBottomOf="parent"-->
125 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
126 - <!-- app:layout_constraintRight_toRightOf="parent"-->
127 - <!-- app:layout_constraintTop_toBottomOf="@+id/tv_rewards_title" />-->
128 - <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
129 -
130 - <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
131 - <!-- android:id="@+id/cl_recycler_inner3"-->
132 - <!-- android:layout_width="match_parent"-->
133 - <!-- android:layout_height="wrap_content"-->
134 - <!-- android:layout_below="@+id/cl_recycler_inner2"-->
135 - <!-- android:layout_marginTop="36dp"-->
136 - <!-- android:paddingBottom="4dp"-->
137 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
138 - <!-- app:layout_constraintRight_toRightOf="parent"-->
139 - <!-- app:layout_constraintTop_toTopOf="parent">-->
140 -
141 - <!-- <TextView-->
142 - <!-- android:id="@+id/tv_coupons_title"-->
143 - <!-- android:layout_width="wrap_content"-->
144 - <!-- android:layout_height="wrap_content"-->
145 - <!-- android:layout_marginStart="10dp"-->
146 - <!-- android:text="@string/cos_coupons_title"-->
147 - <!-- android:textColor="@android:color/white"-->
148 - <!-- android:textSize="18sp"-->
149 - <!-- android:textStyle="bold"-->
150 - <!-- app:layout_constraintStart_toStartOf="parent"-->
151 - <!-- app:layout_constraintTop_toTopOf="parent" />-->
152 -
153 - <!-- <androidx.recyclerview.widget.RecyclerView-->
154 - <!-- android:id="@+id/rv_coupons"-->
155 - <!-- android:layout_width="match_parent"-->
156 - <!-- android:layout_height="wrap_content"-->
157 - <!-- android:layout_marginTop="24dp"-->
158 - <!-- android:clipToPadding="false"-->
159 - <!-- android:orientation="horizontal"-->
160 - <!-- android:paddingEnd="24dp"-->
161 - <!-- app:layout_constraintBottom_toBottomOf="parent"-->
162 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
163 - <!-- app:layout_constraintRight_toRightOf="parent"-->
164 - <!-- app:layout_constraintTop_toBottomOf="@+id/tv_coupons_title" />-->
165 - <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
166 - </RelativeLayout>
167 -</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
26 26
27 <TextView 27 <TextView
28 android:id="@+id/textView3" 28 android:id="@+id/textView3"
29 - fontPath="fonts/BTCosmo-Bold.ttf"
30 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
32 android:gravity="center" 31 android:gravity="center"
...@@ -58,7 +57,6 @@ ...@@ -58,7 +57,6 @@
58 57
59 <TextView 58 <TextView
60 android:id="@+id/tv_no_unified_coupons" 59 android:id="@+id/tv_no_unified_coupons"
61 - fontPath="fonts/PeridotPE-Regular.ttf"
62 android:layout_width="wrap_content" 60 android:layout_width="wrap_content"
63 android:layout_height="wrap_content" 61 android:layout_height="wrap_content"
64 android:layout_centerHorizontal="true" 62 android:layout_centerHorizontal="true"
......
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
16 android:layout_width="48dp" 16 android:layout_width="48dp"
17 android:layout_height="48dp" 17 android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 - android:src="@drawable/ic_back"
20 android:scaleType="centerInside" 19 android:scaleType="centerInside"
20 + android:src="@drawable/ic_back"
21 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
22 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/BTCosmo-Bold.ttf" 26 + android:id="@+id/textView3"
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:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
...@@ -37,16 +37,16 @@ ...@@ -37,16 +37,16 @@
37 <ScrollView 37 <ScrollView
38 android:layout_width="match_parent" 38 android:layout_width="match_parent"
39 android:layout_height="match_parent" 39 android:layout_height="match_parent"
40 + android:layout_below="@+id/cl_loyalty_wallet_header"
40 android:fillViewport="true" 41 android:fillViewport="true"
41 - android:scrollbars="none" 42 + android:scrollbars="none">
42 - android:layout_below="@+id/cl_loyalty_wallet_header">
43 43
44 <androidx.constraintlayout.widget.ConstraintLayout 44 <androidx.constraintlayout.widget.ConstraintLayout
45 android:layout_width="match_parent" 45 android:layout_width="match_parent"
46 android:layout_height="match_parent" 46 android:layout_height="match_parent"
47 android:background="@color/white"> 47 android:background="@color/white">
48 48
49 -<!-- android:background="@drawable/shape_cos_loyalty_white"--> 49 + <!-- android:background="@drawable/shape_cos_loyalty_white"-->
50 <androidx.constraintlayout.widget.ConstraintLayout 50 <androidx.constraintlayout.widget.ConstraintLayout
51 android:id="@+id/cl_loyalty_info_view_inner" 51 android:id="@+id/cl_loyalty_info_view_inner"
52 android:layout_width="match_parent" 52 android:layout_width="match_parent"
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
66 tools:src="@drawable/carousel_banner" /> 66 tools:src="@drawable/carousel_banner" />
67 67
68 <TextView 68 <TextView
69 - fontPath="fonts/BTCosmo-Bold.ttf"
70 android:id="@+id/textView13" 69 android:id="@+id/textView13"
71 android:layout_width="match_parent" 70 android:layout_width="match_parent"
72 android:layout_height="wrap_content" 71 android:layout_height="wrap_content"
...@@ -83,7 +82,6 @@ ...@@ -83,7 +82,6 @@
83 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> 82 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
84 83
85 <TextView 84 <TextView
86 - fontPath="fonts/PeridotPE-Regular.ttf"
87 android:id="@+id/textView14" 85 android:id="@+id/textView14"
88 android:layout_width="match_parent" 86 android:layout_width="match_parent"
89 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
...@@ -92,10 +90,10 @@ ...@@ -92,10 +90,10 @@
92 android:paddingHorizontal="32dp" 90 android:paddingHorizontal="32dp"
93 android:textColor="@color/cos_light_black" 91 android:textColor="@color/cos_light_black"
94 android:textSize="16sp" 92 android:textSize="16sp"
95 - tools:text="test test"
96 app:layout_constraintEnd_toEndOf="parent" 93 app:layout_constraintEnd_toEndOf="parent"
97 app:layout_constraintStart_toStartOf="parent" 94 app:layout_constraintStart_toStartOf="parent"
98 - app:layout_constraintTop_toBottomOf="@+id/textView13" /> 95 + app:layout_constraintTop_toBottomOf="@+id/textView13"
96 + tools:text="test test" />
99 97
100 <LinearLayout 98 <LinearLayout
101 android:id="@+id/ll_activate_button" 99 android:id="@+id/ll_activate_button"
...@@ -105,12 +103,12 @@ ...@@ -105,12 +103,12 @@
105 android:background="@drawable/selector_button_green" 103 android:background="@drawable/selector_button_green"
106 android:gravity="center" 104 android:gravity="center"
107 android:orientation="horizontal" 105 android:orientation="horizontal"
108 - app:layout_constraintTop_toBottomOf="@+id/textView14"
109 app:layout_constraintEnd_toEndOf="parent" 106 app:layout_constraintEnd_toEndOf="parent"
110 - app:layout_constraintStart_toStartOf="parent"> 107 + app:layout_constraintStart_toStartOf="parent"
108 + app:layout_constraintTop_toBottomOf="@+id/textView14">
111 109
112 <TextView 110 <TextView
113 - fontPath="fonts/PeridotPE-SemiBold.ttf" 111 + android:id="@+id/tv_activate_button"
114 android:layout_width="wrap_content" 112 android:layout_width="wrap_content"
115 android:layout_height="wrap_content" 113 android:layout_height="wrap_content"
116 android:gravity="center" 114 android:gravity="center"
...@@ -126,9 +124,9 @@ ...@@ -126,9 +124,9 @@
126 android:layout_height="wrap_content" 124 android:layout_height="wrap_content"
127 android:layout_marginTop="32dp" 125 android:layout_marginTop="32dp"
128 android:gravity="center" 126 android:gravity="center"
129 - app:layout_constraintTop_toBottomOf="@+id/ll_activate_button" 127 + app:layout_constraintEnd_toEndOf="parent"
130 app:layout_constraintStart_toStartOf="parent" 128 app:layout_constraintStart_toStartOf="parent"
131 - app:layout_constraintEnd_toEndOf="parent"> 129 + app:layout_constraintTop_toBottomOf="@+id/ll_activate_button">
132 130
133 <LinearLayout 131 <LinearLayout
134 android:id="@+id/ll_terms_inner" 132 android:id="@+id/ll_terms_inner"
...@@ -140,7 +138,6 @@ ...@@ -140,7 +138,6 @@
140 138
141 <TextView 139 <TextView
142 android:id="@+id/tv_terms" 140 android:id="@+id/tv_terms"
143 - fontPath="fonts/PeridotPE-Bold.ttf"
144 android:layout_width="wrap_content" 141 android:layout_width="wrap_content"
145 android:layout_height="wrap_content" 142 android:layout_height="wrap_content"
146 android:text="@string/cos_coupon_terms_title" 143 android:text="@string/cos_coupon_terms_title"
...@@ -151,14 +148,13 @@ ...@@ -151,14 +148,13 @@
151 android:id="@+id/iv_terms_arrow" 148 android:id="@+id/iv_terms_arrow"
152 android:layout_width="14dp" 149 android:layout_width="14dp"
153 android:layout_height="14dp" 150 android:layout_height="14dp"
154 - android:layout_marginTop="3dp"
155 android:layout_marginStart="6dp" 151 android:layout_marginStart="6dp"
152 + android:layout_marginTop="3dp"
156 android:src="@drawable/ic_down_dark_new" /> 153 android:src="@drawable/ic_down_dark_new" />
157 </LinearLayout> 154 </LinearLayout>
158 155
159 <TextView 156 <TextView
160 android:id="@+id/tv_terms_value" 157 android:id="@+id/tv_terms_value"
161 - fontPath="fonts/PeridotPE-Regular.ttf"
162 android:layout_width="wrap_content" 158 android:layout_width="wrap_content"
163 android:layout_height="wrap_content" 159 android:layout_height="wrap_content"
164 android:layout_below="@+id/ll_terms_inner" 160 android:layout_below="@+id/ll_terms_inner"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/BTCosmo-Bold.ttf" 26 + android:id="@+id/textView3"
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"
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
63 63
64 <TextView 64 <TextView
65 android:id="@+id/textView13" 65 android:id="@+id/textView13"
66 - 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"
...@@ -75,7 +74,6 @@ ...@@ -75,7 +74,6 @@
75 74
76 <TextView 75 <TextView
77 android:id="@+id/textView14" 76 android:id="@+id/textView14"
78 - fontPath="fonts/PeridotPE-Regular.ttf"
79 android:layout_width="match_parent" 77 android:layout_width="match_parent"
80 android:layout_height="wrap_content" 78 android:layout_height="wrap_content"
81 android:layout_marginTop="16dp" 79 android:layout_marginTop="16dp"
...@@ -87,7 +85,6 @@ ...@@ -87,7 +85,6 @@
87 85
88 <TextView 86 <TextView
89 android:id="@+id/tv_clickable_link" 87 android:id="@+id/tv_clickable_link"
90 - fontPath="fonts/PeridotPE-Regular.ttf"
91 android:layout_width="match_parent" 88 android:layout_width="match_parent"
92 android:layout_height="wrap_content" 89 android:layout_height="wrap_content"
93 android:layout_marginTop="16dp" 90 android:layout_marginTop="16dp"
...@@ -99,7 +96,6 @@ ...@@ -99,7 +96,6 @@
99 96
100 <TextView 97 <TextView
101 android:id="@+id/textView15" 98 android:id="@+id/textView15"
102 - fontPath="fonts/PeridotPE-Bold.ttf"
103 android:layout_width="wrap_content" 99 android:layout_width="wrap_content"
104 android:layout_height="wrap_content" 100 android:layout_height="wrap_content"
105 android:layout_gravity="center" 101 android:layout_gravity="center"
...@@ -110,7 +106,6 @@ ...@@ -110,7 +106,6 @@
110 106
111 <TextView 107 <TextView
112 android:id="@+id/textView16" 108 android:id="@+id/textView16"
113 - fontPath="fonts/PeridotPE-Bold.ttf"
114 android:layout_width="match_parent" 109 android:layout_width="match_parent"
115 android:layout_height="50dp" 110 android:layout_height="50dp"
116 android:layout_marginHorizontal="32dp" 111 android:layout_marginHorizontal="32dp"
...@@ -158,7 +153,6 @@ ...@@ -158,7 +153,6 @@
158 153
159 <TextView 154 <TextView
160 android:id="@+id/tv_full_barcode" 155 android:id="@+id/tv_full_barcode"
161 - fontPath="fonts/PeridotPE-Regular.ttf"
162 android:layout_width="wrap_content" 156 android:layout_width="wrap_content"
163 android:layout_height="wrap_content" 157 android:layout_height="wrap_content"
164 android:layout_marginTop="12dp" 158 android:layout_marginTop="12dp"
...@@ -187,7 +181,6 @@ ...@@ -187,7 +181,6 @@
187 181
188 <TextView 182 <TextView
189 android:id="@+id/tv_barcode" 183 android:id="@+id/tv_barcode"
190 - fontPath="fonts/PeridotPE-SemiBold.ttf"
191 android:layout_width="wrap_content" 184 android:layout_width="wrap_content"
192 android:layout_height="wrap_content" 185 android:layout_height="wrap_content"
193 android:text="@string/cos_show_barcode" 186 android:text="@string/cos_show_barcode"
...@@ -206,7 +199,6 @@ ...@@ -206,7 +199,6 @@
206 199
207 <TextView 200 <TextView
208 android:id="@+id/textView17" 201 android:id="@+id/textView17"
209 - fontPath="fonts/PeridotPE-Regular.ttf"
210 android:layout_width="wrap_content" 202 android:layout_width="wrap_content"
211 android:layout_height="wrap_content" 203 android:layout_height="wrap_content"
212 android:layout_gravity="center" 204 android:layout_gravity="center"
...@@ -228,7 +220,7 @@ ...@@ -228,7 +220,7 @@
228 android:paddingVertical="8dp"> 220 android:paddingVertical="8dp">
229 221
230 <TextView 222 <TextView
231 - fontPath="fonts/PeridotPE-SemiBold.ttf" 223 + android:id="@+id/button_gift_it"
232 android:layout_width="wrap_content" 224 android:layout_width="wrap_content"
233 android:layout_height="wrap_content" 225 android:layout_height="wrap_content"
234 android:gravity="center" 226 android:gravity="center"
...@@ -253,7 +245,7 @@ ...@@ -253,7 +245,7 @@
253 tools:visibility="visible"> 245 tools:visibility="visible">
254 246
255 <TextView 247 <TextView
256 - fontPath="fonts/PeridotPE-Bold.ttf" 248 + android:id="@+id/button_shops"
257 android:layout_width="wrap_content" 249 android:layout_width="wrap_content"
258 android:layout_height="wrap_content" 250 android:layout_height="wrap_content"
259 android:gravity="center" 251 android:gravity="center"
...@@ -278,7 +270,7 @@ ...@@ -278,7 +270,7 @@
278 tools:visibility="visible"> 270 tools:visibility="visible">
279 271
280 <TextView 272 <TextView
281 - fontPath="fonts/PeridotPE-Bold.ttf" 273 + android:id="@+id/button_site"
282 android:layout_width="wrap_content" 274 android:layout_width="wrap_content"
283 android:layout_height="wrap_content" 275 android:layout_height="wrap_content"
284 android:gravity="center" 276 android:gravity="center"
...@@ -306,7 +298,6 @@ ...@@ -306,7 +298,6 @@
306 298
307 <TextView 299 <TextView
308 android:id="@+id/tv_terms" 300 android:id="@+id/tv_terms"
309 - fontPath="fonts/PeridotPE-Bold.ttf"
310 android:layout_width="wrap_content" 301 android:layout_width="wrap_content"
311 android:layout_height="wrap_content" 302 android:layout_height="wrap_content"
312 android:text="@string/cos_coupon_terms_title" 303 android:text="@string/cos_coupon_terms_title"
...@@ -324,7 +315,6 @@ ...@@ -324,7 +315,6 @@
324 315
325 <TextView 316 <TextView
326 android:id="@+id/tv_terms_value" 317 android:id="@+id/tv_terms_value"
327 - fontPath="fonts/PeridotPE-Regular.ttf"
328 android:layout_width="wrap_content" 318 android:layout_width="wrap_content"
329 android:layout_height="wrap_content" 319 android:layout_height="wrap_content"
330 android:layout_below="@+id/ll_terms_inner" 320 android:layout_below="@+id/ll_terms_inner"
......
...@@ -16,19 +16,19 @@ ...@@ -16,19 +16,19 @@
16 android:layout_width="48dp" 16 android:layout_width="48dp"
17 android:layout_height="48dp" 17 android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 - android:src="@drawable/ic_back"
20 android:scaleType="centerInside" 19 android:scaleType="centerInside"
20 + android:src="@drawable/ic_back"
21 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
22 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 + android:id="@+id/textView3"
26 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
27 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
28 android:text="@string/cos_coupon_gift" 29 android:text="@string/cos_coupon_gift"
29 android:textColor="@color/cos_light_black" 30 android:textColor="@color/cos_light_black"
30 android:textSize="19sp" 31 android:textSize="19sp"
31 - fontPath="fonts/BTCosmo-Bold.ttf"
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"
...@@ -38,15 +38,15 @@ ...@@ -38,15 +38,15 @@
38 <ScrollView 38 <ScrollView
39 android:layout_width="match_parent" 39 android:layout_width="match_parent"
40 android:layout_height="match_parent" 40 android:layout_height="match_parent"
41 - android:scrollbars="none" 41 + android:layout_below="@+id/cl_loyalty_wallet_header"
42 - android:layout_below="@+id/cl_loyalty_wallet_header"> 42 + android:scrollbars="none">
43 43
44 <androidx.constraintlayout.widget.ConstraintLayout 44 <androidx.constraintlayout.widget.ConstraintLayout
45 android:layout_width="match_parent" 45 android:layout_width="match_parent"
46 android:layout_height="match_parent" 46 android:layout_height="match_parent"
47 android:background="@color/white"> 47 android:background="@color/white">
48 48
49 -<!-- android:background="@drawable/shape_cos_loyalty_white"--> 49 + <!-- android:background="@drawable/shape_cos_loyalty_white"-->
50 <androidx.constraintlayout.widget.ConstraintLayout 50 <androidx.constraintlayout.widget.ConstraintLayout
51 android:id="@+id/cl_loyalty_info_view_inner" 51 android:id="@+id/cl_loyalty_info_view_inner"
52 android:layout_width="match_parent" 52 android:layout_width="match_parent"
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
74 android:paddingHorizontal="32dp" 74 android:paddingHorizontal="32dp"
75 android:textColor="@color/cos_light_black" 75 android:textColor="@color/cos_light_black"
76 android:textSize="18sp" 76 android:textSize="18sp"
77 - fontPath="fonts/BTCosmo-Bold.ttf"
78 app:layout_constraintEnd_toEndOf="parent" 77 app:layout_constraintEnd_toEndOf="parent"
79 app:layout_constraintStart_toStartOf="parent" 78 app:layout_constraintStart_toStartOf="parent"
80 app:layout_constraintTop_toBottomOf="@+id/imageView6" 79 app:layout_constraintTop_toBottomOf="@+id/imageView6"
...@@ -90,7 +89,6 @@ ...@@ -90,7 +89,6 @@
90 android:text="@string/cos_coupon_share_gift_title" 89 android:text="@string/cos_coupon_share_gift_title"
91 android:textColor="@color/cos_light_black" 90 android:textColor="@color/cos_light_black"
92 android:textSize="16sp" 91 android:textSize="16sp"
93 - fontPath="fonts/PeridotPE-Regular.ttf"
94 app:layout_constraintEnd_toEndOf="parent" 92 app:layout_constraintEnd_toEndOf="parent"
95 app:layout_constraintStart_toStartOf="parent" 93 app:layout_constraintStart_toStartOf="parent"
96 app:layout_constraintTop_toBottomOf="@+id/textView13" /> 94 app:layout_constraintTop_toBottomOf="@+id/textView13" />
...@@ -112,7 +110,6 @@ ...@@ -112,7 +110,6 @@
112 android:layout_alignParentStart="true" 110 android:layout_alignParentStart="true"
113 android:layout_centerVertical="true" 111 android:layout_centerVertical="true"
114 android:text="@string/cos_coupon_share_sender" 112 android:text="@string/cos_coupon_share_sender"
115 - fontPath="fonts/PeridotPE-Regular.ttf"
116 android:textColor="@color/cos_gray2" 113 android:textColor="@color/cos_gray2"
117 android:textSize="16sp" /> 114 android:textSize="16sp" />
118 115
...@@ -147,7 +144,6 @@ ...@@ -147,7 +144,6 @@
147 144
148 <EditText 145 <EditText
149 android:id="@+id/et_phone" 146 android:id="@+id/et_phone"
150 - fontPath="fonts/PeridotPE-Regular.ttf"
151 android:layout_width="match_parent" 147 android:layout_width="match_parent"
152 android:layout_height="wrap_content" 148 android:layout_height="wrap_content"
153 android:layout_alignParentStart="true" 149 android:layout_alignParentStart="true"
...@@ -184,13 +180,13 @@ ...@@ -184,13 +180,13 @@
184 app:layout_constraintTop_toBottomOf="@+id/v_separator2"> 180 app:layout_constraintTop_toBottomOf="@+id/v_separator2">
185 181
186 <TextView 182 <TextView
183 + android:id="@+id/button_share"
187 android:layout_width="wrap_content" 184 android:layout_width="wrap_content"
188 android:layout_height="wrap_content" 185 android:layout_height="wrap_content"
189 android:gravity="center" 186 android:gravity="center"
190 android:includeFontPadding="false" 187 android:includeFontPadding="false"
191 android:text="@string/cos_coupon_share_button" 188 android:text="@string/cos_coupon_share_button"
192 android:textColor="@color/white" 189 android:textColor="@color/white"
193 - fontPath="fonts/PeridotPE-SemiBold.ttf"
194 android:textSize="16sp" /> 190 android:textSize="16sp" />
195 </LinearLayout> 191 </LinearLayout>
196 </androidx.constraintlayout.widget.ConstraintLayout> 192 </androidx.constraintlayout.widget.ConstraintLayout>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/BTCosmo-Bold.ttf" 26 + android:id="@+id/textView3"
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"
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
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 android:background="@color/white" 42 android:background="@color/white"
43 - android:scrollbars="none" 43 + android:fillViewport="true"
44 - android:fillViewport="true"> 44 + android:scrollbars="none">
45 45
46 <LinearLayout 46 <LinearLayout
47 android:id="@+id/cl_loyalty_info_view_inner" 47 android:id="@+id/cl_loyalty_info_view_inner"
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
61 61
62 <TextView 62 <TextView
63 android:id="@+id/textView13" 63 android:id="@+id/textView13"
64 - fontPath="fonts/BTCosmo-Bold.ttf"
65 android:layout_width="match_parent" 64 android:layout_width="match_parent"
66 android:layout_height="wrap_content" 65 android:layout_height="wrap_content"
67 android:layout_marginTop="32dp" 66 android:layout_marginTop="32dp"
...@@ -73,7 +72,6 @@ ...@@ -73,7 +72,6 @@
73 72
74 <TextView 73 <TextView
75 android:id="@+id/textView14" 74 android:id="@+id/textView14"
76 - fontPath="fonts/PeridotPE-Regular.ttf"
77 android:layout_width="match_parent" 75 android:layout_width="match_parent"
78 android:layout_height="wrap_content" 76 android:layout_height="wrap_content"
79 android:layout_marginTop="16dp" 77 android:layout_marginTop="16dp"
...@@ -87,14 +85,14 @@ ...@@ -87,14 +85,14 @@
87 android:id="@+id/ll_get_gift" 85 android:id="@+id/ll_get_gift"
88 android:layout_width="match_parent" 86 android:layout_width="match_parent"
89 android:layout_height="45dp" 87 android:layout_height="45dp"
90 - android:layout_marginTop="27dp"
91 android:layout_marginHorizontal="12dp" 88 android:layout_marginHorizontal="12dp"
89 + android:layout_marginTop="27dp"
92 android:background="@drawable/selector_button_green" 90 android:background="@drawable/selector_button_green"
93 android:gravity="center" 91 android:gravity="center"
94 android:orientation="horizontal"> 92 android:orientation="horizontal">
95 93
96 <TextView 94 <TextView
97 - fontPath="fonts/PeridotPE-SemiBold.ttf" 95 + android:id="@+id/button_get_it"
98 android:layout_width="wrap_content" 96 android:layout_width="wrap_content"
99 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
100 android:gravity="center" 98 android:gravity="center"
...@@ -121,7 +119,6 @@ ...@@ -121,7 +119,6 @@
121 119
122 <TextView 120 <TextView
123 android:id="@+id/tv_terms" 121 android:id="@+id/tv_terms"
124 - fontPath="fonts/PeridotPE-Bold.ttf"
125 android:layout_width="wrap_content" 122 android:layout_width="wrap_content"
126 android:layout_height="wrap_content" 123 android:layout_height="wrap_content"
127 android:text="@string/cos_coupon_terms_title" 124 android:text="@string/cos_coupon_terms_title"
...@@ -132,14 +129,13 @@ ...@@ -132,14 +129,13 @@
132 android:id="@+id/iv_terms_arrow" 129 android:id="@+id/iv_terms_arrow"
133 android:layout_width="14dp" 130 android:layout_width="14dp"
134 android:layout_height="14dp" 131 android:layout_height="14dp"
135 - android:layout_marginTop="3dp"
136 android:layout_marginStart="6dp" 132 android:layout_marginStart="6dp"
133 + android:layout_marginTop="3dp"
137 android:src="@drawable/ic_down_dark_new" /> 134 android:src="@drawable/ic_down_dark_new" />
138 </LinearLayout> 135 </LinearLayout>
139 136
140 <TextView 137 <TextView
141 android:id="@+id/tv_terms_value" 138 android:id="@+id/tv_terms_value"
142 - fontPath="fonts/PeridotPE-Regular.ttf"
143 android:layout_width="wrap_content" 139 android:layout_width="wrap_content"
144 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
145 android:layout_below="@+id/ll_terms_inner" 141 android:layout_below="@+id/ll_terms_inner"
......
...@@ -30,10 +30,9 @@ ...@@ -30,10 +30,9 @@
30 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
32 android:gravity="center" 32 android:gravity="center"
33 + android:text="@string/cos_free_coupons"
33 android:textColor="@color/cos_light_black" 34 android:textColor="@color/cos_light_black"
34 android:textSize="19sp" 35 android:textSize="19sp"
35 - fontPath="fonts/BTCosmo-Bold.ttf"
36 - android:text="@string/cos_free_coupons"
37 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
38 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
39 app:layout_constraintStart_toStartOf="parent" 38 app:layout_constraintStart_toStartOf="parent"
...@@ -97,119 +96,9 @@ ...@@ -97,119 +96,9 @@
97 android:layout_width="match_parent" 96 android:layout_width="match_parent"
98 android:layout_height="wrap_content" 97 android:layout_height="wrap_content"
99 android:clipToPadding="false" 98 android:clipToPadding="false"
100 - android:scrollbars="none"
101 android:orientation="vertical" 99 android:orientation="vertical"
102 android:overScrollMode="never" 100 android:overScrollMode="never"
103 - android:paddingVertical="24dp" /> 101 + android:paddingVertical="24dp"
104 - 102 + android:scrollbars="none" />
105 - <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
106 - <!-- android:id="@+id/cl_recycler_inner"-->
107 - <!-- android:layout_width="match_parent"-->
108 - <!-- android:layout_height="wrap_content"-->
109 - <!-- android:layout_marginTop="36dp"-->
110 - <!-- android:paddingBottom="4dp"-->
111 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
112 - <!-- app:layout_constraintRight_toRightOf="parent"-->
113 - <!-- app:layout_constraintTop_toTopOf="parent">-->
114 -
115 - <!-- <TextView-->
116 - <!-- android:id="@+id/tv_gifts_title"-->
117 - <!-- android:layout_width="wrap_content"-->
118 - <!-- android:layout_height="wrap_content"-->
119 - <!-- android:layout_marginStart="10dp"-->
120 - <!-- android:text="@string/cos_gifts_title2"-->
121 - <!-- android:textColor="@android:color/white"-->
122 - <!-- android:textSize="18sp"-->
123 - <!-- android:textStyle="bold"-->
124 - <!-- app:layout_constraintStart_toStartOf="parent"-->
125 - <!-- app:layout_constraintTop_toTopOf="parent" />-->
126 -
127 - <!-- <androidx.recyclerview.widget.RecyclerView-->
128 - <!-- android:id="@+id/rv_gifts"-->
129 - <!-- android:layout_width="match_parent"-->
130 - <!-- android:layout_height="wrap_content"-->
131 - <!-- android:layout_marginTop="24dp"-->
132 - <!-- android:clipToPadding="false"-->
133 - <!-- android:orientation="horizontal"-->
134 - <!-- android:paddingEnd="10dp"-->
135 - <!-- app:layout_constraintBottom_toBottomOf="parent"-->
136 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
137 - <!-- app:layout_constraintRight_toRightOf="parent"-->
138 - <!-- app:layout_constraintTop_toBottomOf="@+id/tv_gifts_title" />-->
139 - <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
140 -
141 - <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
142 - <!-- android:id="@+id/cl_recycler_inner2"-->
143 - <!-- android:layout_width="match_parent"-->
144 - <!-- android:layout_height="wrap_content"-->
145 - <!-- android:layout_below="@+id/cl_recycler_inner"-->
146 - <!-- android:layout_marginTop="36dp"-->
147 - <!-- android:paddingBottom="4dp"-->
148 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
149 - <!-- app:layout_constraintRight_toRightOf="parent"-->
150 - <!-- app:layout_constraintTop_toTopOf="parent">-->
151 -
152 - <!-- <TextView-->
153 - <!-- android:id="@+id/tv_rewards_title"-->
154 - <!-- android:layout_width="wrap_content"-->
155 - <!-- android:layout_height="wrap_content"-->
156 - <!-- android:layout_marginStart="10dp"-->
157 - <!-- android:text="@string/cos_rewards_title"-->
158 - <!-- android:textColor="@android:color/white"-->
159 - <!-- android:textSize="18sp"-->
160 - <!-- android:textStyle="bold"-->
161 - <!-- app:layout_constraintStart_toStartOf="parent"-->
162 - <!-- app:layout_constraintTop_toTopOf="parent" />-->
163 -
164 - <!-- <androidx.recyclerview.widget.RecyclerView-->
165 - <!-- android:id="@+id/rv_rewards"-->
166 - <!-- android:layout_width="match_parent"-->
167 - <!-- android:layout_height="wrap_content"-->
168 - <!-- android:layout_marginTop="24dp"-->
169 - <!-- android:clipToPadding="false"-->
170 - <!-- android:orientation="horizontal"-->
171 - <!-- android:paddingEnd="10dp"-->
172 - <!-- app:layout_constraintBottom_toBottomOf="parent"-->
173 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
174 - <!-- app:layout_constraintRight_toRightOf="parent"-->
175 - <!-- app:layout_constraintTop_toBottomOf="@+id/tv_rewards_title" />-->
176 - <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
177 -
178 - <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
179 - <!-- android:id="@+id/cl_recycler_inner3"-->
180 - <!-- android:layout_width="match_parent"-->
181 - <!-- android:layout_height="wrap_content"-->
182 - <!-- android:layout_below="@+id/cl_recycler_inner2"-->
183 - <!-- android:layout_marginTop="36dp"-->
184 - <!-- android:paddingBottom="4dp"-->
185 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
186 - <!-- app:layout_constraintRight_toRightOf="parent"-->
187 - <!-- app:layout_constraintTop_toTopOf="parent">-->
188 -
189 - <!-- <TextView-->
190 - <!-- android:id="@+id/tv_coupons_title"-->
191 - <!-- android:layout_width="wrap_content"-->
192 - <!-- android:layout_height="wrap_content"-->
193 - <!-- android:layout_marginStart="10dp"-->
194 - <!-- android:text="@string/cos_coupons_title"-->
195 - <!-- android:textColor="@android:color/white"-->
196 - <!-- android:textSize="18sp"-->
197 - <!-- android:textStyle="bold"-->
198 - <!-- app:layout_constraintStart_toStartOf="parent"-->
199 - <!-- app:layout_constraintTop_toTopOf="parent" />-->
200 -
201 - <!-- <androidx.recyclerview.widget.RecyclerView-->
202 - <!-- android:id="@+id/rv_coupons"-->
203 - <!-- android:layout_width="match_parent"-->
204 - <!-- android:layout_height="wrap_content"-->
205 - <!-- android:layout_marginTop="24dp"-->
206 - <!-- android:clipToPadding="false"-->
207 - <!-- android:orientation="horizontal"-->
208 - <!-- android:paddingEnd="24dp"-->
209 - <!-- app:layout_constraintBottom_toBottomOf="parent"-->
210 - <!-- app:layout_constraintLeft_toLeftOf="parent"-->
211 - <!-- app:layout_constraintRight_toRightOf="parent"-->
212 - <!-- app:layout_constraintTop_toBottomOf="@+id/tv_coupons_title" />-->
213 - <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
214 </LinearLayout> 103 </LinearLayout>
215 </LinearLayout> 104 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 app:layout_constraintTop_toTopOf="parent" /> 25 app:layout_constraintTop_toTopOf="parent" />
26 26
27 <TextView 27 <TextView
28 - fontPath="fonts/BTCosmo-Bold.ttf" 28 + android:id="@+id/textView3"
29 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:text="@string/cos_analysis" 31 android:text="@string/cos_analysis"
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
101 101
102 <TextView 102 <TextView
103 android:id="@+id/tv_expired_coupons_title" 103 android:id="@+id/tv_expired_coupons_title"
104 - fontPath="fonts/PeridotPE-Regular.ttf"
105 android:layout_width="wrap_content" 104 android:layout_width="wrap_content"
106 android:layout_height="wrap_content" 105 android:layout_height="wrap_content"
107 android:layout_marginHorizontal="32dp" 106 android:layout_marginHorizontal="32dp"
...@@ -135,7 +134,6 @@ ...@@ -135,7 +134,6 @@
135 134
136 <TextView 135 <TextView
137 android:id="@+id/tv_expired_title" 136 android:id="@+id/tv_expired_title"
138 - fontPath="fonts/BTCosmo-Bold.ttf"
139 android:layout_width="wrap_content" 137 android:layout_width="wrap_content"
140 android:layout_height="wrap_content" 138 android:layout_height="wrap_content"
141 android:text="@string/cos_analysis2" 139 android:text="@string/cos_analysis2"
...@@ -169,7 +167,6 @@ ...@@ -169,7 +167,6 @@
169 167
170 <TextView 168 <TextView
171 android:id="@+id/tv_expired_more" 169 android:id="@+id/tv_expired_more"
172 - fontPath="fonts/PeridotPE-Bold.ttf"
173 android:layout_width="wrap_content" 170 android:layout_width="wrap_content"
174 android:layout_height="wrap_content" 171 android:layout_height="wrap_content"
175 android:text="@string/cos_see_more" 172 android:text="@string/cos_see_more"
...@@ -190,7 +187,6 @@ ...@@ -190,7 +187,6 @@
190 187
191 <TextView 188 <TextView
192 android:id="@+id/tv_expired_empty" 189 android:id="@+id/tv_expired_empty"
193 - fontPath="fonts/PeridotPE-Regular.ttf"
194 android:layout_width="wrap_content" 190 android:layout_width="wrap_content"
195 android:layout_height="wrap_content" 191 android:layout_height="wrap_content"
196 android:layout_below="@+id/cv_expired_coupons_title" 192 android:layout_below="@+id/cv_expired_coupons_title"
...@@ -224,7 +220,6 @@ ...@@ -224,7 +220,6 @@
224 220
225 <TextView 221 <TextView
226 android:id="@+id/tv_shared_title" 222 android:id="@+id/tv_shared_title"
227 - fontPath="fonts/BTCosmo-Bold.ttf"
228 android:layout_width="wrap_content" 223 android:layout_width="wrap_content"
229 android:layout_height="wrap_content" 224 android:layout_height="wrap_content"
230 android:text="@string/cos_analysis2" 225 android:text="@string/cos_analysis2"
...@@ -258,7 +253,6 @@ ...@@ -258,7 +253,6 @@
258 253
259 <TextView 254 <TextView
260 android:id="@+id/tv_shared_more" 255 android:id="@+id/tv_shared_more"
261 - fontPath="fonts/PeridotPE-Bold.ttf"
262 android:layout_width="wrap_content" 256 android:layout_width="wrap_content"
263 android:layout_height="wrap_content" 257 android:layout_height="wrap_content"
264 android:text="@string/cos_see_more" 258 android:text="@string/cos_see_more"
...@@ -277,7 +271,6 @@ ...@@ -277,7 +271,6 @@
277 271
278 <TextView 272 <TextView
279 android:id="@+id/tv_shared_empty" 273 android:id="@+id/tv_shared_empty"
280 - fontPath="fonts/PeridotPE-Regular.ttf"
281 android:layout_width="wrap_content" 274 android:layout_width="wrap_content"
282 android:layout_height="wrap_content" 275 android:layout_height="wrap_content"
283 android:layout_below="@+id/tv_shared_title" 276 android:layout_below="@+id/tv_shared_title"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 app:layout_constraintTop_toTopOf="parent" /> 25 app:layout_constraintTop_toTopOf="parent" />
26 26
27 <TextView 27 <TextView
28 - fontPath="fonts/BTCosmo-Bold.ttf" 28 + android:id="@+id/textView3"
29 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:text="@string/cos_loyalty_history" 31 android:text="@string/cos_loyalty_history"
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
72 72
73 <TextView 73 <TextView
74 android:id="@+id/tv_exp_value" 74 android:id="@+id/tv_exp_value"
75 - fontPath="fonts/BTCosmo-Bold.ttf"
76 android:layout_width="wrap_content" 75 android:layout_width="wrap_content"
77 android:layout_height="wrap_content" 76 android:layout_height="wrap_content"
78 android:layout_marginStart="8dp" 77 android:layout_marginStart="8dp"
...@@ -86,7 +85,6 @@ ...@@ -86,7 +85,6 @@
86 85
87 <TextView 86 <TextView
88 android:id="@+id/tv_exp_value_all" 87 android:id="@+id/tv_exp_value_all"
89 - fontPath="fonts/PeridotPE-Regular.ttf"
90 android:layout_width="0dp" 88 android:layout_width="0dp"
91 android:layout_height="wrap_content" 89 android:layout_height="wrap_content"
92 android:layout_marginHorizontal="16dp" 90 android:layout_marginHorizontal="16dp"
...@@ -140,7 +138,6 @@ ...@@ -140,7 +138,6 @@
140 138
141 <TextView 139 <TextView
142 android:id="@+id/tv_deals_value" 140 android:id="@+id/tv_deals_value"
143 - fontPath="fonts/PeridotPE-Bold.ttf"
144 android:layout_width="wrap_content" 141 android:layout_width="wrap_content"
145 android:layout_height="wrap_content" 142 android:layout_height="wrap_content"
146 android:includeFontPadding="false" 143 android:includeFontPadding="false"
...@@ -173,7 +170,6 @@ ...@@ -173,7 +170,6 @@
173 170
174 <TextView 171 <TextView
175 android:id="@+id/tv_deals_value_all" 172 android:id="@+id/tv_deals_value_all"
176 - fontPath="fonts/PeridotPE-Regular.ttf"
177 android:layout_width="match_parent" 173 android:layout_width="match_parent"
178 android:layout_height="wrap_content" 174 android:layout_height="wrap_content"
179 android:layout_gravity="center" 175 android:layout_gravity="center"
...@@ -221,7 +217,6 @@ ...@@ -221,7 +217,6 @@
221 217
222 <TextView 218 <TextView
223 android:id="@+id/tv_market_value" 219 android:id="@+id/tv_market_value"
224 - fontPath="fonts/PeridotPE-Bold.ttf"
225 android:layout_width="wrap_content" 220 android:layout_width="wrap_content"
226 android:layout_height="wrap_content" 221 android:layout_height="wrap_content"
227 android:includeFontPadding="false" 222 android:includeFontPadding="false"
...@@ -254,7 +249,6 @@ ...@@ -254,7 +249,6 @@
254 249
255 <TextView 250 <TextView
256 android:id="@+id/tv_market_value_all" 251 android:id="@+id/tv_market_value_all"
257 - fontPath="fonts/PeridotPE-Regular.ttf"
258 android:layout_width="match_parent" 252 android:layout_width="match_parent"
259 android:layout_height="wrap_content" 253 android:layout_height="wrap_content"
260 android:layout_gravity="center" 254 android:layout_gravity="center"
...@@ -302,7 +296,6 @@ ...@@ -302,7 +296,6 @@
302 296
303 <TextView 297 <TextView
304 android:id="@+id/tv_gifts_value" 298 android:id="@+id/tv_gifts_value"
305 - fontPath="fonts/PeridotPE-Bold.ttf"
306 android:layout_width="wrap_content" 299 android:layout_width="wrap_content"
307 android:layout_height="wrap_content" 300 android:layout_height="wrap_content"
308 android:includeFontPadding="false" 301 android:includeFontPadding="false"
...@@ -335,7 +328,6 @@ ...@@ -335,7 +328,6 @@
335 328
336 <TextView 329 <TextView
337 android:id="@+id/tv_gifts_value_all" 330 android:id="@+id/tv_gifts_value_all"
338 - fontPath="fonts/PeridotPE-Regular.ttf"
339 android:layout_width="match_parent" 331 android:layout_width="match_parent"
340 android:layout_height="wrap_content" 332 android:layout_height="wrap_content"
341 android:layout_gravity="center" 333 android:layout_gravity="center"
...@@ -354,9 +346,9 @@ ...@@ -354,9 +346,9 @@
354 android:id="@+id/rl_fourth_banner" 346 android:id="@+id/rl_fourth_banner"
355 android:layout_width="match_parent" 347 android:layout_width="match_parent"
356 android:layout_height="wrap_content" 348 android:layout_height="wrap_content"
357 - android:layout_marginTop="16dp" 349 + android:layout_below="@+id/rl_third_banner"
358 android:layout_marginHorizontal="16dp" 350 android:layout_marginHorizontal="16dp"
359 - android:layout_below="@+id/rl_third_banner"> 351 + android:layout_marginTop="16dp">
360 352
361 <RelativeLayout 353 <RelativeLayout
362 android:layout_width="wrap_content" 354 android:layout_width="wrap_content"
...@@ -383,7 +375,6 @@ ...@@ -383,7 +375,6 @@
383 375
384 <TextView 376 <TextView
385 android:id="@+id/tv_box_value" 377 android:id="@+id/tv_box_value"
386 - fontPath="fonts/PeridotPE-Bold.ttf"
387 android:layout_width="wrap_content" 378 android:layout_width="wrap_content"
388 android:layout_height="wrap_content" 379 android:layout_height="wrap_content"
389 android:includeFontPadding="false" 380 android:includeFontPadding="false"
...@@ -416,7 +407,6 @@ ...@@ -416,7 +407,6 @@
416 407
417 <TextView 408 <TextView
418 android:id="@+id/tv_box_value_all" 409 android:id="@+id/tv_box_value_all"
419 - fontPath="fonts/PeridotPE-Regular.ttf"
420 android:layout_width="match_parent" 410 android:layout_width="match_parent"
421 android:layout_height="wrap_content" 411 android:layout_height="wrap_content"
422 android:layout_gravity="center" 412 android:layout_gravity="center"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 app:layout_constraintTop_toTopOf="parent" /> 25 app:layout_constraintTop_toTopOf="parent" />
26 26
27 <TextView 27 <TextView
28 - fontPath="fonts/BTCosmo-Bold.ttf" 28 + android:id="@+id/textView3"
29 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:text="@string/cos_analysis" 31 android:text="@string/cos_analysis"
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
101 101
102 <TextView 102 <TextView
103 android:id="@+id/tv_expired_coupons_title" 103 android:id="@+id/tv_expired_coupons_title"
104 - fontPath="fonts/PeridotPE-Regular.ttf"
105 android:layout_width="wrap_content" 104 android:layout_width="wrap_content"
106 android:layout_height="wrap_content" 105 android:layout_height="wrap_content"
107 android:layout_marginHorizontal="32dp" 106 android:layout_marginHorizontal="32dp"
...@@ -135,7 +134,6 @@ ...@@ -135,7 +134,6 @@
135 134
136 <TextView 135 <TextView
137 android:id="@+id/tv_expired_title" 136 android:id="@+id/tv_expired_title"
138 - fontPath="fonts/BTCosmo-Bold.ttf"
139 android:layout_width="wrap_content" 137 android:layout_width="wrap_content"
140 android:layout_height="wrap_content" 138 android:layout_height="wrap_content"
141 android:text="@string/cos_analysis2" 139 android:text="@string/cos_analysis2"
...@@ -170,7 +168,6 @@ ...@@ -170,7 +168,6 @@
170 168
171 <TextView 169 <TextView
172 android:id="@+id/tv_expired_more" 170 android:id="@+id/tv_expired_more"
173 - fontPath="fonts/PeridotPE-Bold.ttf"
174 android:layout_width="wrap_content" 171 android:layout_width="wrap_content"
175 android:layout_height="wrap_content" 172 android:layout_height="wrap_content"
176 android:text="@string/cos_see_more" 173 android:text="@string/cos_see_more"
...@@ -191,7 +188,6 @@ ...@@ -191,7 +188,6 @@
191 188
192 <TextView 189 <TextView
193 android:id="@+id/tv_expired_empty" 190 android:id="@+id/tv_expired_empty"
194 - fontPath="fonts/PeridotPE-Regular.ttf"
195 android:layout_width="wrap_content" 191 android:layout_width="wrap_content"
196 android:layout_height="wrap_content" 192 android:layout_height="wrap_content"
197 android:layout_below="@+id/cv_expired_coupons_title" 193 android:layout_below="@+id/cv_expired_coupons_title"
...@@ -225,7 +221,6 @@ ...@@ -225,7 +221,6 @@
225 221
226 <TextView 222 <TextView
227 android:id="@+id/tv_shared_title" 223 android:id="@+id/tv_shared_title"
228 - fontPath="fonts/BTCosmo-Bold.ttf"
229 android:layout_width="wrap_content" 224 android:layout_width="wrap_content"
230 android:layout_height="wrap_content" 225 android:layout_height="wrap_content"
231 android:text="@string/cos_analysis2" 226 android:text="@string/cos_analysis2"
...@@ -259,7 +254,6 @@ ...@@ -259,7 +254,6 @@
259 254
260 <TextView 255 <TextView
261 android:id="@+id/tv_shared_more" 256 android:id="@+id/tv_shared_more"
262 - fontPath="fonts/PeridotPE-Bold.ttf"
263 android:layout_width="wrap_content" 257 android:layout_width="wrap_content"
264 android:layout_height="wrap_content" 258 android:layout_height="wrap_content"
265 android:text="@string/cos_see_more" 259 android:text="@string/cos_see_more"
...@@ -278,7 +272,6 @@ ...@@ -278,7 +272,6 @@
278 272
279 <TextView 273 <TextView
280 android:id="@+id/tv_shared_empty" 274 android:id="@+id/tv_shared_empty"
281 - fontPath="fonts/PeridotPE-Regular.ttf"
282 android:layout_width="wrap_content" 275 android:layout_width="wrap_content"
283 android:layout_height="wrap_content" 276 android:layout_height="wrap_content"
284 android:layout_below="@+id/tv_shared_title" 277 android:layout_below="@+id/tv_shared_title"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/BTCosmo-Bold.ttf"
27 android:layout_width="wrap_content" 26 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
29 android:text="@string/cos_profile_title" 28 android:text="@string/cos_profile_title"
...@@ -59,8 +58,8 @@ ...@@ -59,8 +58,8 @@
59 android:id="@+id/ll_first_view" 58 android:id="@+id/ll_first_view"
60 android:layout_width="match_parent" 59 android:layout_width="match_parent"
61 android:layout_height="wrap_content" 60 android:layout_height="wrap_content"
62 - android:paddingVertical="24dp" 61 + android:paddingHorizontal="16dp"
63 - android:paddingHorizontal="16dp"> 62 + android:paddingVertical="24dp">
64 63
65 <com.google.android.material.imageview.ShapeableImageView 64 <com.google.android.material.imageview.ShapeableImageView
66 android:id="@+id/iv_profile_photo" 65 android:id="@+id/iv_profile_photo"
...@@ -87,7 +86,6 @@ ...@@ -87,7 +86,6 @@
87 86
88 <TextView 87 <TextView
89 android:id="@+id/tv_profile_name" 88 android:id="@+id/tv_profile_name"
90 - fontPath="fonts/PeridotPE-SemiBold.ttf"
91 android:layout_width="wrap_content" 89 android:layout_width="wrap_content"
92 android:layout_height="wrap_content" 90 android:layout_height="wrap_content"
93 android:layout_marginBottom="4dp" 91 android:layout_marginBottom="4dp"
...@@ -113,7 +111,6 @@ ...@@ -113,7 +111,6 @@
113 111
114 <TextView 112 <TextView
115 android:id="@+id/tv_type" 113 android:id="@+id/tv_type"
116 - fontPath="fonts/PeridotPE-SemiBold.ttf"
117 android:layout_width="wrap_content" 114 android:layout_width="wrap_content"
118 android:layout_height="wrap_content" 115 android:layout_height="wrap_content"
119 android:layout_marginHorizontal="20dp" 116 android:layout_marginHorizontal="20dp"
...@@ -140,7 +137,6 @@ ...@@ -140,7 +137,6 @@
140 137
141 <TextView 138 <TextView
142 android:id="@+id/tv_questionnaire" 139 android:id="@+id/tv_questionnaire"
143 - fontPath="fonts/PeridotPE-Bold.ttf"
144 android:layout_width="wrap_content" 140 android:layout_width="wrap_content"
145 android:layout_height="wrap_content" 141 android:layout_height="wrap_content"
146 android:includeFontPadding="false" 142 android:includeFontPadding="false"
...@@ -191,7 +187,6 @@ ...@@ -191,7 +187,6 @@
191 187
192 <TextView 188 <TextView
193 android:id="@+id/tv_coupons_header" 189 android:id="@+id/tv_coupons_header"
194 - fontPath="fonts/PeridotPE-SemiBold.ttf"
195 android:layout_width="wrap_content" 190 android:layout_width="wrap_content"
196 android:layout_height="wrap_content" 191 android:layout_height="wrap_content"
197 android:includeFontPadding="false" 192 android:includeFontPadding="false"
...@@ -251,7 +246,6 @@ ...@@ -251,7 +246,6 @@
251 246
252 <TextView 247 <TextView
253 android:id="@+id/tv_deals_count_title" 248 android:id="@+id/tv_deals_count_title"
254 - fontPath="fonts/PeridotPE-SemiBold.ttf"
255 android:layout_width="0dp" 249 android:layout_width="0dp"
256 android:layout_height="wrap_content" 250 android:layout_height="wrap_content"
257 android:layout_marginHorizontal="8dp" 251 android:layout_marginHorizontal="8dp"
...@@ -282,7 +276,6 @@ ...@@ -282,7 +276,6 @@
282 276
283 <TextView 277 <TextView
284 android:id="@+id/tv_deals_count" 278 android:id="@+id/tv_deals_count"
285 - fontPath="fonts/PeridotPE-SemiBold.ttf"
286 android:layout_width="wrap_content" 279 android:layout_width="wrap_content"
287 android:layout_height="16dp" 280 android:layout_height="16dp"
288 android:includeFontPadding="false" 281 android:includeFontPadding="false"
...@@ -340,7 +333,6 @@ ...@@ -340,7 +333,6 @@
340 333
341 <TextView 334 <TextView
342 android:id="@+id/tv_sm_count_title" 335 android:id="@+id/tv_sm_count_title"
343 - fontPath="fonts/PeridotPE-SemiBold.ttf"
344 android:layout_width="0dp" 336 android:layout_width="0dp"
345 android:layout_height="wrap_content" 337 android:layout_height="wrap_content"
346 android:layout_marginHorizontal="8dp" 338 android:layout_marginHorizontal="8dp"
...@@ -371,7 +363,6 @@ ...@@ -371,7 +363,6 @@
371 363
372 <TextView 364 <TextView
373 android:id="@+id/tv_sm_count" 365 android:id="@+id/tv_sm_count"
374 - fontPath="fonts/PeridotPE-SemiBold.ttf"
375 android:layout_width="wrap_content" 366 android:layout_width="wrap_content"
376 android:layout_height="16dp" 367 android:layout_height="16dp"
377 android:includeFontPadding="false" 368 android:includeFontPadding="false"
...@@ -428,7 +419,6 @@ ...@@ -428,7 +419,6 @@
428 419
429 <TextView 420 <TextView
430 android:id="@+id/tv_gifts_count_title" 421 android:id="@+id/tv_gifts_count_title"
431 - fontPath="fonts/PeridotPE-SemiBold.ttf"
432 android:layout_width="0dp" 422 android:layout_width="0dp"
433 android:layout_height="wrap_content" 423 android:layout_height="wrap_content"
434 android:layout_marginHorizontal="8dp" 424 android:layout_marginHorizontal="8dp"
...@@ -459,7 +449,6 @@ ...@@ -459,7 +449,6 @@
459 449
460 <TextView 450 <TextView
461 android:id="@+id/tv_gifts_count" 451 android:id="@+id/tv_gifts_count"
462 - fontPath="fonts/PeridotPE-SemiBold.ttf"
463 android:layout_width="wrap_content" 452 android:layout_width="wrap_content"
464 android:layout_height="16dp" 453 android:layout_height="16dp"
465 android:includeFontPadding="false" 454 android:includeFontPadding="false"
...@@ -507,7 +496,6 @@ ...@@ -507,7 +496,6 @@
507 android:background="@color/cos_gray" /> 496 android:background="@color/cos_gray" />
508 497
509 <TextView 498 <TextView
510 - fontPath="fonts/PeridotPE-SemiBold.ttf"
511 android:id="@+id/tv_vouchers_title" 499 android:id="@+id/tv_vouchers_title"
512 android:layout_width="wrap_content" 500 android:layout_width="wrap_content"
513 android:layout_height="wrap_content" 501 android:layout_height="wrap_content"
...@@ -545,7 +533,6 @@ ...@@ -545,7 +533,6 @@
545 533
546 <TextView 534 <TextView
547 android:id="@+id/tv_vouchers_info_title" 535 android:id="@+id/tv_vouchers_info_title"
548 - fontPath="fonts/PeridotPE-Regular.ttf"
549 android:layout_width="0dp" 536 android:layout_width="0dp"
550 android:layout_height="wrap_content" 537 android:layout_height="wrap_content"
551 android:layout_marginHorizontal="8dp" 538 android:layout_marginHorizontal="8dp"
...@@ -591,7 +578,6 @@ ...@@ -591,7 +578,6 @@
591 android:background="@color/cos_gray" /> 578 android:background="@color/cos_gray" />
592 579
593 <TextView 580 <TextView
594 - fontPath="fonts/PeridotPE-SemiBold.ttf"
595 android:id="@+id/tv_vouchers_title_disabled" 581 android:id="@+id/tv_vouchers_title_disabled"
596 android:layout_width="wrap_content" 582 android:layout_width="wrap_content"
597 android:layout_height="wrap_content" 583 android:layout_height="wrap_content"
...@@ -629,7 +615,6 @@ ...@@ -629,7 +615,6 @@
629 615
630 <TextView 616 <TextView
631 android:id="@+id/tv_vouchers_info_title_disabled" 617 android:id="@+id/tv_vouchers_info_title_disabled"
632 - fontPath="fonts/PeridotPE-Regular.ttf"
633 android:layout_width="wrap_content" 618 android:layout_width="wrap_content"
634 android:layout_height="wrap_content" 619 android:layout_height="wrap_content"
635 android:layout_marginHorizontal="8dp" 620 android:layout_marginHorizontal="8dp"
...@@ -668,7 +653,6 @@ ...@@ -668,7 +653,6 @@
668 653
669 <TextView 654 <TextView
670 android:id="@+id/tv_vouchers_count_disabled" 655 android:id="@+id/tv_vouchers_count_disabled"
671 - fontPath="fonts/PeridotPE-SemiBold.ttf"
672 android:layout_width="wrap_content" 656 android:layout_width="wrap_content"
673 android:layout_height="16dp" 657 android:layout_height="16dp"
674 android:includeFontPadding="false" 658 android:includeFontPadding="false"
...@@ -698,7 +682,6 @@ ...@@ -698,7 +682,6 @@
698 android:src="@drawable/ic_empty_wallet" /> 682 android:src="@drawable/ic_empty_wallet" />
699 683
700 <TextView 684 <TextView
701 - fontPath="fonts/PeridotPE-Regular.ttf"
702 android:layout_width="wrap_content" 685 android:layout_width="wrap_content"
703 android:layout_height="wrap_content" 686 android:layout_height="wrap_content"
704 android:layout_marginTop="8dp" 687 android:layout_marginTop="8dp"
...@@ -745,7 +728,6 @@ ...@@ -745,7 +728,6 @@
745 728
746 <TextView 729 <TextView
747 android:id="@+id/tv_exp_value" 730 android:id="@+id/tv_exp_value"
748 - fontPath="fonts/PeridotPE-Bold.ttf"
749 android:layout_width="wrap_content" 731 android:layout_width="wrap_content"
750 android:layout_height="wrap_content" 732 android:layout_height="wrap_content"
751 android:includeFontPadding="false" 733 android:includeFontPadding="false"
...@@ -758,7 +740,6 @@ ...@@ -758,7 +740,6 @@
758 740
759 <TextView 741 <TextView
760 android:id="@+id/tv_exp_value_all" 742 android:id="@+id/tv_exp_value_all"
761 - fontPath="fonts/PeridotPE-Regular.ttf"
762 android:layout_width="0dp" 743 android:layout_width="0dp"
763 android:layout_height="wrap_content" 744 android:layout_height="wrap_content"
764 android:layout_marginHorizontal="8dp" 745 android:layout_marginHorizontal="8dp"
...@@ -830,7 +811,6 @@ ...@@ -830,7 +811,6 @@
830 811
831 <TextView 812 <TextView
832 android:id="@+id/tv_deals_value_all" 813 android:id="@+id/tv_deals_value_all"
833 - fontPath="fonts/PeridotPE-Regular.ttf"
834 android:layout_width="0dp" 814 android:layout_width="0dp"
835 android:layout_height="wrap_content" 815 android:layout_height="wrap_content"
836 android:layout_marginHorizontal="8dp" 816 android:layout_marginHorizontal="8dp"
...@@ -845,7 +825,6 @@ ...@@ -845,7 +825,6 @@
845 825
846 <TextView 826 <TextView
847 android:id="@+id/tv_deals_value" 827 android:id="@+id/tv_deals_value"
848 - fontPath="fonts/PeridotPE-Bold.ttf"
849 android:layout_width="wrap_content" 828 android:layout_width="wrap_content"
850 android:layout_height="wrap_content" 829 android:layout_height="wrap_content"
851 android:includeFontPadding="false" 830 android:includeFontPadding="false"
...@@ -894,7 +873,6 @@ ...@@ -894,7 +873,6 @@
894 873
895 <TextView 874 <TextView
896 android:id="@+id/tv_gifts_value_all" 875 android:id="@+id/tv_gifts_value_all"
897 - fontPath="fonts/PeridotPE-Regular.ttf"
898 android:layout_width="0dp" 876 android:layout_width="0dp"
899 android:layout_height="wrap_content" 877 android:layout_height="wrap_content"
900 android:layout_marginHorizontal="8dp" 878 android:layout_marginHorizontal="8dp"
...@@ -909,7 +887,6 @@ ...@@ -909,7 +887,6 @@
909 887
910 <TextView 888 <TextView
911 android:id="@+id/tv_gifts_value" 889 android:id="@+id/tv_gifts_value"
912 - fontPath="fonts/PeridotPE-Bold.ttf"
913 android:layout_width="wrap_content" 890 android:layout_width="wrap_content"
914 android:layout_height="wrap_content" 891 android:layout_height="wrap_content"
915 android:includeFontPadding="false" 892 android:includeFontPadding="false"
...@@ -959,7 +936,6 @@ ...@@ -959,7 +936,6 @@
959 936
960 <TextView 937 <TextView
961 android:id="@+id/tv_market_value_all" 938 android:id="@+id/tv_market_value_all"
962 - fontPath="fonts/PeridotPE-Regular.ttf"
963 android:layout_width="0dp" 939 android:layout_width="0dp"
964 android:layout_height="wrap_content" 940 android:layout_height="wrap_content"
965 android:layout_marginHorizontal="8dp" 941 android:layout_marginHorizontal="8dp"
...@@ -974,7 +950,6 @@ ...@@ -974,7 +950,6 @@
974 950
975 <TextView 951 <TextView
976 android:id="@+id/tv_market_value" 952 android:id="@+id/tv_market_value"
977 - fontPath="fonts/PeridotPE-Bold.ttf"
978 android:layout_width="wrap_content" 953 android:layout_width="wrap_content"
979 android:layout_height="wrap_content" 954 android:layout_height="wrap_content"
980 android:includeFontPadding="false" 955 android:includeFontPadding="false"
...@@ -1000,7 +975,6 @@ ...@@ -1000,7 +975,6 @@
1000 975
1001 <TextView 976 <TextView
1002 android:id="@+id/tv_market_header" 977 android:id="@+id/tv_market_header"
1003 - fontPath="fonts/BTCosmo-Bold.ttf"
1004 android:layout_width="wrap_content" 978 android:layout_width="wrap_content"
1005 android:layout_height="wrap_content" 979 android:layout_height="wrap_content"
1006 android:layout_gravity="start" 980 android:layout_gravity="start"
...@@ -1066,7 +1040,6 @@ ...@@ -1066,7 +1040,6 @@
1066 1040
1067 <TextView 1041 <TextView
1068 android:id="@+id/tv_active_gifts" 1042 android:id="@+id/tv_active_gifts"
1069 - fontPath="fonts/PeridotPE-Regular.ttf"
1070 android:layout_width="wrap_content" 1043 android:layout_width="wrap_content"
1071 android:layout_height="wrap_content" 1044 android:layout_height="wrap_content"
1072 android:textColor="@color/cos_light_black" 1045 android:textColor="@color/cos_light_black"
...@@ -1075,7 +1048,6 @@ ...@@ -1075,7 +1048,6 @@
1075 1048
1076 <TextView 1049 <TextView
1077 android:id="@+id/tv_active_deals_text" 1050 android:id="@+id/tv_active_deals_text"
1078 - fontPath="fonts/PeridotPE-Bold.ttf"
1079 android:layout_width="wrap_content" 1051 android:layout_width="wrap_content"
1080 android:layout_height="wrap_content" 1052 android:layout_height="wrap_content"
1081 android:ellipsize="end" 1053 android:ellipsize="end"
...@@ -1104,7 +1076,6 @@ ...@@ -1104,7 +1076,6 @@
1104 1076
1105 <TextView 1077 <TextView
1106 android:id="@+id/tv_active_deals_date_text" 1078 android:id="@+id/tv_active_deals_date_text"
1107 - fontPath="fonts/PeridotPE-Regular.ttf"
1108 android:layout_width="wrap_content" 1079 android:layout_width="wrap_content"
1109 android:layout_height="wrap_content" 1080 android:layout_height="wrap_content"
1110 android:textColor="@color/cos_light_black" 1081 android:textColor="@color/cos_light_black"
...@@ -1137,7 +1108,6 @@ ...@@ -1137,7 +1108,6 @@
1137 1108
1138 <TextView 1109 <TextView
1139 android:id="@+id/tv_active_coupons_header" 1110 android:id="@+id/tv_active_coupons_header"
1140 - fontPath="fonts/BTCosmo-Bold.ttf"
1141 android:layout_width="wrap_content" 1111 android:layout_width="wrap_content"
1142 android:layout_height="wrap_content" 1112 android:layout_height="wrap_content"
1143 android:layout_gravity="start" 1113 android:layout_gravity="start"
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
27 27
28 <TextView 28 <TextView
29 android:id="@+id/textView3" 29 android:id="@+id/textView3"
30 - fontPath="fonts/BTCosmo-Bold.ttf"
31 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
32 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
33 android:gravity="center" 32 android:gravity="center"
...@@ -127,7 +126,6 @@ ...@@ -127,7 +126,6 @@
127 126
128 <TextView 127 <TextView
129 android:id="@+id/tv_research_section" 128 android:id="@+id/tv_research_section"
130 - fontPath="fonts/BTCosmo-Bold.ttf"
131 android:layout_width="wrap_content" 129 android:layout_width="wrap_content"
132 android:layout_height="wrap_content" 130 android:layout_height="wrap_content"
133 android:layout_marginHorizontal="16dp" 131 android:layout_marginHorizontal="16dp"
...@@ -158,7 +156,6 @@ ...@@ -158,7 +156,6 @@
158 156
159 <TextView 157 <TextView
160 android:id="@+id/tv_exclusive_section" 158 android:id="@+id/tv_exclusive_section"
161 - fontPath="fonts/BTCosmo-Bold.ttf"
162 android:layout_width="wrap_content" 159 android:layout_width="wrap_content"
163 android:layout_height="wrap_content" 160 android:layout_height="wrap_content"
164 android:layout_marginHorizontal="16dp" 161 android:layout_marginHorizontal="16dp"
...@@ -189,7 +186,6 @@ ...@@ -189,7 +186,6 @@
189 186
190 <TextView 187 <TextView
191 android:id="@+id/tv_contest_section" 188 android:id="@+id/tv_contest_section"
192 - fontPath="fonts/BTCosmo-Bold.ttf"
193 android:layout_width="wrap_content" 189 android:layout_width="wrap_content"
194 android:layout_height="wrap_content" 190 android:layout_height="wrap_content"
195 android:layout_marginHorizontal="16dp" 191 android:layout_marginHorizontal="16dp"
...@@ -220,7 +216,6 @@ ...@@ -220,7 +216,6 @@
220 216
221 <TextView 217 <TextView
222 android:id="@+id/tv_contextual_section" 218 android:id="@+id/tv_contextual_section"
223 - fontPath="fonts/BTCosmo-Bold.ttf"
224 android:layout_width="wrap_content" 219 android:layout_width="wrap_content"
225 android:layout_height="wrap_content" 220 android:layout_height="wrap_content"
226 android:layout_marginHorizontal="16dp" 221 android:layout_marginHorizontal="16dp"
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
24 24
25 <TextView 25 <TextView
26 android:id="@+id/tv_telco_header_title" 26 android:id="@+id/tv_telco_header_title"
27 - fontPath="fonts/BTCosmo-Bold.ttf"
28 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
29 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
30 android:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
...@@ -80,7 +79,6 @@ ...@@ -80,7 +79,6 @@
80 79
81 <TextView 80 <TextView
82 android:id="@+id/tv_telco_gift_value" 81 android:id="@+id/tv_telco_gift_value"
83 - fontPath="fonts/PeridotPE-SemiBold.ttf"
84 android:layout_width="64dp" 82 android:layout_width="64dp"
85 android:layout_height="64dp" 83 android:layout_height="64dp"
86 android:background="@drawable/shape_round_border_gradient" 84 android:background="@drawable/shape_round_border_gradient"
...@@ -91,7 +89,6 @@ ...@@ -91,7 +89,6 @@
91 89
92 <TextView 90 <TextView
93 android:id="@+id/tv_telco_gift_type" 91 android:id="@+id/tv_telco_gift_type"
94 - fontPath="fonts/PeridotPE-Regular.ttf"
95 android:layout_width="wrap_content" 92 android:layout_width="wrap_content"
96 android:layout_height="wrap_content" 93 android:layout_height="wrap_content"
97 android:layout_marginStart="8dp" 94 android:layout_marginStart="8dp"
...@@ -119,7 +116,6 @@ ...@@ -119,7 +116,6 @@
119 116
120 <TextView 117 <TextView
121 android:id="@+id/tv_telco_gift_duration" 118 android:id="@+id/tv_telco_gift_duration"
122 - fontPath="fonts/PeridotPE-Regular.ttf"
123 android:layout_width="wrap_content" 119 android:layout_width="wrap_content"
124 android:layout_height="wrap_content" 120 android:layout_height="wrap_content"
125 android:background="@drawable/shape_round_border_gradient2" 121 android:background="@drawable/shape_round_border_gradient2"
...@@ -137,7 +133,6 @@ ...@@ -137,7 +133,6 @@
137 133
138 <TextView 134 <TextView
139 android:id="@+id/textView13" 135 android:id="@+id/textView13"
140 - fontPath="fonts/PeridotPE-Regular.ttf"
141 android:layout_width="match_parent" 136 android:layout_width="match_parent"
142 android:layout_height="wrap_content" 137 android:layout_height="wrap_content"
143 android:layout_below="@+id/cl_telco_duration_view" 138 android:layout_below="@+id/cl_telco_duration_view"
...@@ -160,7 +155,7 @@ ...@@ -160,7 +155,7 @@
160 android:orientation="horizontal"> 155 android:orientation="horizontal">
161 156
162 <TextView 157 <TextView
163 - fontPath="fonts/PeridotPE-SemiBold.ttf" 158 + android:id="@+id/button_get_it"
164 android:layout_width="wrap_content" 159 android:layout_width="wrap_content"
165 android:layout_height="wrap_content" 160 android:layout_height="wrap_content"
166 android:gravity="center" 161 android:gravity="center"
...@@ -189,7 +184,6 @@ ...@@ -189,7 +184,6 @@
189 184
190 <TextView 185 <TextView
191 android:id="@+id/tv_see_more" 186 android:id="@+id/tv_see_more"
192 - fontPath="fonts/PeridotPE-Bold.ttf"
193 android:layout_width="wrap_content" 187 android:layout_width="wrap_content"
194 android:layout_height="wrap_content" 188 android:layout_height="wrap_content"
195 android:text="@string/cos_see_more2" 189 android:text="@string/cos_see_more2"
...@@ -207,7 +201,6 @@ ...@@ -207,7 +201,6 @@
207 201
208 <TextView 202 <TextView
209 android:id="@+id/tv_see_more_value" 203 android:id="@+id/tv_see_more_value"
210 - fontPath="fonts/PeridotPE-Regular.ttf"
211 android:layout_width="wrap_content" 204 android:layout_width="wrap_content"
212 android:layout_height="wrap_content" 205 android:layout_height="wrap_content"
213 android:layout_below="@+id/ll_see_more" 206 android:layout_below="@+id/ll_see_more"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 15
16 <TextView 16 <TextView
17 android:id="@+id/tv_sender_value" 17 android:id="@+id/tv_sender_value"
18 - fontPath="fonts/BTCosmo-Bold.ttf"
19 android:layout_width="wrap_content" 18 android:layout_width="wrap_content"
20 android:layout_height="wrap_content" 19 android:layout_height="wrap_content"
21 android:layout_alignParentStart="true" 20 android:layout_alignParentStart="true"
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
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/PeridotPE-Bold.ttf"
11 android:layout_width="wrap_content" 10 android:layout_width="wrap_content"
12 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
13 android:textColor="@color/cos_light_black" 12 android:textColor="@color/cos_light_black"
...@@ -42,7 +41,6 @@ ...@@ -42,7 +41,6 @@
42 41
43 <TextView 42 <TextView
44 android:id="@+id/tv_expired_coupons_title" 43 android:id="@+id/tv_expired_coupons_title"
45 - fontPath="fonts/PeridotPE-Regular.ttf"
46 android:layout_width="wrap_content" 44 android:layout_width="wrap_content"
47 android:layout_height="wrap_content" 45 android:layout_height="wrap_content"
48 android:layout_weight="0.5" 46 android:layout_weight="0.5"
...@@ -53,7 +51,6 @@ ...@@ -53,7 +51,6 @@
53 51
54 <TextView 52 <TextView
55 android:id="@+id/tv_expired_coupons_value" 53 android:id="@+id/tv_expired_coupons_value"
56 - fontPath="fonts/PeridotPE-Bold.ttf"
57 android:layout_width="wrap_content" 54 android:layout_width="wrap_content"
58 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
59 android:layout_weight="0.5" 56 android:layout_weight="0.5"
...@@ -65,7 +62,6 @@ ...@@ -65,7 +62,6 @@
65 62
66 <TextView 63 <TextView
67 android:id="@+id/tv_expired_coupons_label" 64 android:id="@+id/tv_expired_coupons_label"
68 - fontPath="fonts/PeridotPE-Regular.ttf"
69 android:layout_width="wrap_content" 65 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
71 android:layout_below="@+id/ll_expired_info_view" 67 android:layout_below="@+id/ll_expired_info_view"
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
28 28
29 <TextView 29 <TextView
30 android:id="@+id/tv_coupons_header" 30 android:id="@+id/tv_coupons_header"
31 - fontPath="fonts/BTCosmo-Bold.ttf"
32 android:layout_width="wrap_content" 31 android:layout_width="wrap_content"
33 android:layout_height="wrap_content" 32 android:layout_height="wrap_content"
34 android:layout_weight="1" 33 android:layout_weight="1"
...@@ -67,341 +66,341 @@ ...@@ -67,341 +66,341 @@
67 android:paddingHorizontal="14dp" 66 android:paddingHorizontal="14dp"
68 android:showDividers="middle"> 67 android:showDividers="middle">
69 68
70 -<!-- <RelativeLayout--> 69 + <!-- <RelativeLayout-->
71 -<!-- android:id="@+id/rv_deals_count"--> 70 + <!-- android:id="@+id/rv_deals_count"-->
72 -<!-- android:layout_width="104dp"--> 71 + <!-- android:layout_width="104dp"-->
73 -<!-- android:layout_height="104dp">--> 72 + <!-- android:layout_height="104dp">-->
74 - 73 +
75 -<!-- <androidx.cardview.widget.CardView--> 74 + <!-- <androidx.cardview.widget.CardView-->
76 -<!-- android:id="@+id/cv_deals_count"--> 75 + <!-- android:id="@+id/cv_deals_count"-->
77 -<!-- android:layout_width="match_parent"--> 76 + <!-- android:layout_width="match_parent"-->
78 -<!-- android:layout_height="match_parent"--> 77 + <!-- android:layout_height="match_parent"-->
79 -<!-- android:layout_marginHorizontal="2dp"--> 78 + <!-- android:layout_marginHorizontal="2dp"-->
80 -<!-- android:layout_marginVertical="4dp"--> 79 + <!-- android:layout_marginVertical="4dp"-->
81 -<!-- app:cardCornerRadius="16dp"--> 80 + <!-- app:cardCornerRadius="16dp"-->
82 -<!-- app:cardElevation="2dp">--> 81 + <!-- app:cardElevation="2dp">-->
83 - 82 +
84 -<!-- <androidx.constraintlayout.widget.ConstraintLayout--> 83 + <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
85 -<!-- android:layout_width="match_parent"--> 84 + <!-- android:layout_width="match_parent"-->
86 -<!-- android:layout_height="match_parent"--> 85 + <!-- android:layout_height="match_parent"-->
87 -<!-- android:background="@color/white">--> 86 + <!-- android:background="@color/white">-->
88 - 87 +
89 -<!-- <ImageView--> 88 + <!-- <ImageView-->
90 -<!-- android:id="@+id/iv_deals_logo_count"--> 89 + <!-- android:id="@+id/iv_deals_logo_count"-->
91 -<!-- android:layout_width="52dp"--> 90 + <!-- android:layout_width="52dp"-->
92 -<!-- android:layout_height="32dp"--> 91 + <!-- android:layout_height="32dp"-->
93 -<!-- android:src="@drawable/sv_deals_logo_redesign"--> 92 + <!-- android:src="@drawable/sv_deals_logo_redesign"-->
94 -<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"--> 93 + <!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"-->
95 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 94 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
96 -<!-- app:layout_constraintStart_toStartOf="parent"--> 95 + <!-- app:layout_constraintStart_toStartOf="parent"-->
97 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 96 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
98 - 97 +
99 -<!-- <View--> 98 + <!-- <View-->
100 -<!-- android:id="@+id/v_separator_deals_count"--> 99 + <!-- android:id="@+id/v_separator_deals_count"-->
101 -<!-- android:layout_width="match_parent"--> 100 + <!-- android:layout_width="match_parent"-->
102 -<!-- android:layout_height="1dp"--> 101 + <!-- android:layout_height="1dp"-->
103 -<!-- android:layout_marginHorizontal="8dp"--> 102 + <!-- android:layout_marginHorizontal="8dp"-->
104 -<!-- android:background="@color/cos_grey2"--> 103 + <!-- android:background="@color/cos_grey2"-->
105 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 104 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
106 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 105 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
107 -<!-- app:layout_constraintStart_toStartOf="parent"--> 106 + <!-- app:layout_constraintStart_toStartOf="parent"-->
108 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 107 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
109 - 108 +
110 -<!-- <TextView--> 109 + <!-- <TextView-->
111 -<!-- android:id="@+id/tv_deals_count_title"--> 110 + <!-- android:id="@+id/tv_deals_count_title"-->
112 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 111 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
113 -<!-- android:layout_width="0dp"--> 112 + <!-- android:layout_width="0dp"-->
114 -<!-- android:layout_height="wrap_content"--> 113 + <!-- android:layout_height="wrap_content"-->
115 -<!-- android:layout_marginHorizontal="8dp"--> 114 + <!-- android:layout_marginHorizontal="8dp"-->
116 -<!-- android:gravity="center"--> 115 + <!-- android:gravity="center"-->
117 -<!-- android:includeFontPadding="false"--> 116 + <!-- android:includeFontPadding="false"-->
118 -<!-- android:text="@string/cos_deals_tile"--> 117 + <!-- android:text="@string/cos_deals_tile"-->
119 -<!-- android:textColor="@color/cos_light_black"--> 118 + <!-- android:textColor="@color/cos_light_black"-->
120 -<!-- android:textSize="10sp"--> 119 + <!-- android:textSize="10sp"-->
121 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 120 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
122 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 121 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
123 -<!-- app:layout_constraintStart_toStartOf="parent"--> 122 + <!-- app:layout_constraintStart_toStartOf="parent"-->
124 -<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />--> 123 + <!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />-->
125 -<!-- </androidx.constraintlayout.widget.ConstraintLayout>--> 124 + <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
126 -<!-- </androidx.cardview.widget.CardView>--> 125 + <!-- </androidx.cardview.widget.CardView>-->
127 - 126 +
128 -<!-- <LinearLayout--> 127 + <!-- <LinearLayout-->
129 -<!-- android:layout_width="16dp"--> 128 + <!-- android:layout_width="16dp"-->
130 -<!-- android:layout_height="16dp"--> 129 + <!-- android:layout_height="16dp"-->
131 -<!-- android:layout_alignParentEnd="true"--> 130 + <!-- android:layout_alignParentEnd="true"-->
132 -<!-- android:layout_marginTop="4dp"--> 131 + <!-- android:layout_marginTop="4dp"-->
133 -<!-- android:layout_marginEnd="1dp"--> 132 + <!-- android:layout_marginEnd="1dp"-->
134 -<!-- android:background="@drawable/shape_cos_counter_orange"--> 133 + <!-- android:background="@drawable/shape_cos_counter_orange"-->
135 -<!-- android:gravity="center"--> 134 + <!-- android:gravity="center"-->
136 -<!-- android:orientation="vertical"--> 135 + <!-- android:orientation="vertical"-->
137 -<!-- android:translationZ="2dp"--> 136 + <!-- android:translationZ="2dp"-->
138 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 137 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
139 -<!-- app:layout_constraintTop_toTopOf="parent">--> 138 + <!-- app:layout_constraintTop_toTopOf="parent">-->
140 - 139 +
141 -<!-- <TextView--> 140 + <!-- <TextView-->
142 -<!-- android:id="@+id/tv_deals_count"--> 141 + <!-- android:id="@+id/tv_deals_count"-->
143 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 142 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
144 -<!-- android:layout_width="wrap_content"--> 143 + <!-- android:layout_width="wrap_content"-->
145 -<!-- android:layout_height="16dp"--> 144 + <!-- android:layout_height="16dp"-->
146 -<!-- android:includeFontPadding="false"--> 145 + <!-- android:includeFontPadding="false"-->
147 -<!-- android:maxLines="1"--> 146 + <!-- android:maxLines="1"-->
148 -<!-- android:textColor="@color/cos_light_black"--> 147 + <!-- android:textColor="@color/cos_light_black"-->
149 -<!-- android:textSize="12sp"--> 148 + <!-- android:textSize="12sp"-->
150 -<!-- tools:text="6" />--> 149 + <!-- tools:text="6" />-->
151 -<!-- </LinearLayout>--> 150 + <!-- </LinearLayout>-->
152 -<!-- </RelativeLayout>--> 151 + <!-- </RelativeLayout>-->
153 - 152 +
154 -<!-- <RelativeLayout--> 153 + <!-- <RelativeLayout-->
155 -<!-- android:id="@+id/rv_sm_count"--> 154 + <!-- android:id="@+id/rv_sm_count"-->
156 -<!-- android:layout_width="104dp"--> 155 + <!-- android:layout_width="104dp"-->
157 -<!-- android:layout_height="104dp">--> 156 + <!-- android:layout_height="104dp">-->
158 - 157 +
159 -<!-- <androidx.cardview.widget.CardView--> 158 + <!-- <androidx.cardview.widget.CardView-->
160 -<!-- android:id="@+id/cv_sm_count"--> 159 + <!-- android:id="@+id/cv_sm_count"-->
161 -<!-- android:layout_width="match_parent"--> 160 + <!-- android:layout_width="match_parent"-->
162 -<!-- android:layout_height="match_parent"--> 161 + <!-- android:layout_height="match_parent"-->
163 -<!-- android:layout_marginHorizontal="2dp"--> 162 + <!-- android:layout_marginHorizontal="2dp"-->
164 -<!-- android:layout_marginVertical="4dp"--> 163 + <!-- android:layout_marginVertical="4dp"-->
165 -<!-- app:cardCornerRadius="16dp"--> 164 + <!-- app:cardCornerRadius="16dp"-->
166 -<!-- app:cardElevation="2dp">--> 165 + <!-- app:cardElevation="2dp">-->
167 - 166 +
168 -<!-- <androidx.constraintlayout.widget.ConstraintLayout--> 167 + <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
169 -<!-- android:layout_width="match_parent"--> 168 + <!-- android:layout_width="match_parent"-->
170 -<!-- android:layout_height="match_parent"--> 169 + <!-- android:layout_height="match_parent"-->
171 -<!-- android:background="@color/white">--> 170 + <!-- android:background="@color/white">-->
172 - 171 +
173 -<!-- <ImageView--> 172 + <!-- <ImageView-->
174 -<!-- android:id="@+id/iv_sm_logo_count"--> 173 + <!-- android:id="@+id/iv_sm_logo_count"-->
175 -<!-- android:layout_width="32dp"--> 174 + <!-- android:layout_width="32dp"-->
176 -<!-- android:layout_height="32dp"--> 175 + <!-- android:layout_height="32dp"-->
177 -<!-- android:src="@drawable/sv_unified_redesign"--> 176 + <!-- android:src="@drawable/sv_unified_redesign"-->
178 -<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"--> 177 + <!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"-->
179 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 178 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
180 -<!-- app:layout_constraintStart_toStartOf="parent"--> 179 + <!-- app:layout_constraintStart_toStartOf="parent"-->
181 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 180 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
182 - 181 +
183 -<!-- <View--> 182 + <!-- <View-->
184 -<!-- android:id="@+id/v_separator_sm_count"--> 183 + <!-- android:id="@+id/v_separator_sm_count"-->
185 -<!-- android:layout_width="match_parent"--> 184 + <!-- android:layout_width="match_parent"-->
186 -<!-- android:layout_height="1dp"--> 185 + <!-- android:layout_height="1dp"-->
187 -<!-- android:layout_marginHorizontal="8dp"--> 186 + <!-- android:layout_marginHorizontal="8dp"-->
188 -<!-- android:background="@color/cos_grey2"--> 187 + <!-- android:background="@color/cos_grey2"-->
189 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 188 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
190 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 189 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
191 -<!-- app:layout_constraintStart_toStartOf="parent"--> 190 + <!-- app:layout_constraintStart_toStartOf="parent"-->
192 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 191 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
193 - 192 +
194 -<!-- <TextView--> 193 + <!-- <TextView-->
195 -<!-- android:id="@+id/tv_sm_count_title"--> 194 + <!-- android:id="@+id/tv_sm_count_title"-->
196 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 195 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
197 -<!-- android:layout_width="0dp"--> 196 + <!-- android:layout_width="0dp"-->
198 -<!-- android:layout_height="wrap_content"--> 197 + <!-- android:layout_height="wrap_content"-->
199 -<!-- android:layout_marginHorizontal="8dp"--> 198 + <!-- android:layout_marginHorizontal="8dp"-->
200 -<!-- android:gravity="center"--> 199 + <!-- android:gravity="center"-->
201 -<!-- android:includeFontPadding="false"--> 200 + <!-- android:includeFontPadding="false"-->
202 -<!-- android:text="@string/cos_market_title"--> 201 + <!-- android:text="@string/cos_market_title"-->
203 -<!-- android:textColor="@color/cos_light_black"--> 202 + <!-- android:textColor="@color/cos_light_black"-->
204 -<!-- android:textSize="10sp"--> 203 + <!-- android:textSize="10sp"-->
205 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 204 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
206 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 205 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
207 -<!-- app:layout_constraintStart_toStartOf="parent"--> 206 + <!-- app:layout_constraintStart_toStartOf="parent"-->
208 -<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />--> 207 + <!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />-->
209 -<!-- </androidx.constraintlayout.widget.ConstraintLayout>--> 208 + <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
210 -<!-- </androidx.cardview.widget.CardView>--> 209 + <!-- </androidx.cardview.widget.CardView>-->
211 - 210 +
212 -<!-- <LinearLayout--> 211 + <!-- <LinearLayout-->
213 -<!-- android:layout_width="16dp"--> 212 + <!-- android:layout_width="16dp"-->
214 -<!-- android:layout_height="16dp"--> 213 + <!-- android:layout_height="16dp"-->
215 -<!-- android:layout_alignParentEnd="true"--> 214 + <!-- android:layout_alignParentEnd="true"-->
216 -<!-- android:layout_marginTop="4dp"--> 215 + <!-- android:layout_marginTop="4dp"-->
217 -<!-- android:layout_marginEnd="1dp"--> 216 + <!-- android:layout_marginEnd="1dp"-->
218 -<!-- android:background="@drawable/shape_cos_counter_orange"--> 217 + <!-- android:background="@drawable/shape_cos_counter_orange"-->
219 -<!-- android:gravity="center"--> 218 + <!-- android:gravity="center"-->
220 -<!-- android:orientation="vertical"--> 219 + <!-- android:orientation="vertical"-->
221 -<!-- android:translationZ="2dp"--> 220 + <!-- android:translationZ="2dp"-->
222 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 221 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
223 -<!-- app:layout_constraintTop_toTopOf="parent">--> 222 + <!-- app:layout_constraintTop_toTopOf="parent">-->
224 - 223 +
225 -<!-- <TextView--> 224 + <!-- <TextView-->
226 -<!-- android:id="@+id/tv_sm_count"--> 225 + <!-- android:id="@+id/tv_sm_count"-->
227 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 226 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
228 -<!-- android:layout_width="wrap_content"--> 227 + <!-- android:layout_width="wrap_content"-->
229 -<!-- android:layout_height="16dp"--> 228 + <!-- android:layout_height="16dp"-->
230 -<!-- android:includeFontPadding="false"--> 229 + <!-- android:includeFontPadding="false"-->
231 -<!-- android:maxLines="1"--> 230 + <!-- android:maxLines="1"-->
232 -<!-- android:textColor="@color/cos_light_black"--> 231 + <!-- android:textColor="@color/cos_light_black"-->
233 -<!-- android:textSize="12sp"--> 232 + <!-- android:textSize="12sp"-->
234 -<!-- tools:text="6" />--> 233 + <!-- tools:text="6" />-->
235 -<!-- </LinearLayout>--> 234 + <!-- </LinearLayout>-->
236 -<!-- </RelativeLayout>--> 235 + <!-- </RelativeLayout>-->
237 - 236 +
238 -<!-- <RelativeLayout--> 237 + <!-- <RelativeLayout-->
239 -<!-- android:id="@+id/rv_gifts_count"--> 238 + <!-- android:id="@+id/rv_gifts_count"-->
240 -<!-- android:layout_width="104dp"--> 239 + <!-- android:layout_width="104dp"-->
241 -<!-- android:layout_height="104dp">--> 240 + <!-- android:layout_height="104dp">-->
242 - 241 +
243 -<!-- <androidx.cardview.widget.CardView--> 242 + <!-- <androidx.cardview.widget.CardView-->
244 -<!-- android:id="@+id/cv_gifts_count"--> 243 + <!-- android:id="@+id/cv_gifts_count"-->
245 -<!-- android:layout_width="match_parent"--> 244 + <!-- android:layout_width="match_parent"-->
246 -<!-- android:layout_height="match_parent"--> 245 + <!-- android:layout_height="match_parent"-->
247 -<!-- android:layout_marginHorizontal="2dp"--> 246 + <!-- android:layout_marginHorizontal="2dp"-->
248 -<!-- android:layout_marginVertical="4dp"--> 247 + <!-- android:layout_marginVertical="4dp"-->
249 -<!-- app:cardCornerRadius="16dp"--> 248 + <!-- app:cardCornerRadius="16dp"-->
250 -<!-- app:cardElevation="2dp">--> 249 + <!-- app:cardElevation="2dp">-->
251 - 250 +
252 -<!-- <androidx.constraintlayout.widget.ConstraintLayout--> 251 + <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
253 -<!-- android:layout_width="match_parent"--> 252 + <!-- android:layout_width="match_parent"-->
254 -<!-- android:layout_height="match_parent"--> 253 + <!-- android:layout_height="match_parent"-->
255 -<!-- android:background="@color/white">--> 254 + <!-- android:background="@color/white">-->
256 - 255 +
257 -<!-- <ImageView--> 256 + <!-- <ImageView-->
258 -<!-- android:id="@+id/iv_gifts_logo_count"--> 257 + <!-- android:id="@+id/iv_gifts_logo_count"-->
259 -<!-- android:layout_width="34dp"--> 258 + <!-- android:layout_width="34dp"-->
260 -<!-- android:layout_height="34dp"--> 259 + <!-- android:layout_height="34dp"-->
261 -<!-- android:src="@drawable/sv_gifts_redesign"--> 260 + <!-- android:src="@drawable/sv_gifts_redesign"-->
262 -<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"--> 261 + <!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"-->
263 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 262 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
264 -<!-- app:layout_constraintStart_toStartOf="parent"--> 263 + <!-- app:layout_constraintStart_toStartOf="parent"-->
265 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 264 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
266 - 265 +
267 -<!-- <View--> 266 + <!-- <View-->
268 -<!-- android:id="@+id/v_separator_gifts_count"--> 267 + <!-- android:id="@+id/v_separator_gifts_count"-->
269 -<!-- android:layout_width="match_parent"--> 268 + <!-- android:layout_width="match_parent"-->
270 -<!-- android:layout_height="1dp"--> 269 + <!-- android:layout_height="1dp"-->
271 -<!-- android:layout_marginHorizontal="8dp"--> 270 + <!-- android:layout_marginHorizontal="8dp"-->
272 -<!-- android:background="@color/cos_grey2"--> 271 + <!-- android:background="@color/cos_grey2"-->
273 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 272 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
274 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 273 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
275 -<!-- app:layout_constraintStart_toStartOf="parent"--> 274 + <!-- app:layout_constraintStart_toStartOf="parent"-->
276 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 275 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
277 - 276 +
278 -<!-- <TextView--> 277 + <!-- <TextView-->
279 -<!-- android:id="@+id/tv_gifts_count_title"--> 278 + <!-- android:id="@+id/tv_gifts_count_title"-->
280 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 279 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
281 -<!-- android:layout_width="0dp"--> 280 + <!-- android:layout_width="0dp"-->
282 -<!-- android:layout_height="wrap_content"--> 281 + <!-- android:layout_height="wrap_content"-->
283 -<!-- android:layout_marginHorizontal="8dp"--> 282 + <!-- android:layout_marginHorizontal="8dp"-->
284 -<!-- android:gravity="center"--> 283 + <!-- android:gravity="center"-->
285 -<!-- android:includeFontPadding="false"--> 284 + <!-- android:includeFontPadding="false"-->
286 -<!-- android:text="@string/cos_free_coupons_tile"--> 285 + <!-- android:text="@string/cos_free_coupons_tile"-->
287 -<!-- android:textColor="@color/cos_light_black"--> 286 + <!-- android:textColor="@color/cos_light_black"-->
288 -<!-- android:textSize="10sp"--> 287 + <!-- android:textSize="10sp"-->
289 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 288 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
290 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 289 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
291 -<!-- app:layout_constraintStart_toStartOf="parent"--> 290 + <!-- app:layout_constraintStart_toStartOf="parent"-->
292 -<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />--> 291 + <!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />-->
293 -<!-- </androidx.constraintlayout.widget.ConstraintLayout>--> 292 + <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
294 -<!-- </androidx.cardview.widget.CardView>--> 293 + <!-- </androidx.cardview.widget.CardView>-->
295 - 294 +
296 -<!-- <LinearLayout--> 295 + <!-- <LinearLayout-->
297 -<!-- android:layout_width="16dp"--> 296 + <!-- android:layout_width="16dp"-->
298 -<!-- android:layout_height="16dp"--> 297 + <!-- android:layout_height="16dp"-->
299 -<!-- android:layout_alignParentEnd="true"--> 298 + <!-- android:layout_alignParentEnd="true"-->
300 -<!-- android:layout_marginTop="4dp"--> 299 + <!-- android:layout_marginTop="4dp"-->
301 -<!-- android:layout_marginEnd="1dp"--> 300 + <!-- android:layout_marginEnd="1dp"-->
302 -<!-- android:background="@drawable/shape_cos_counter_orange"--> 301 + <!-- android:background="@drawable/shape_cos_counter_orange"-->
303 -<!-- android:gravity="center"--> 302 + <!-- android:gravity="center"-->
304 -<!-- android:orientation="vertical"--> 303 + <!-- android:orientation="vertical"-->
305 -<!-- android:translationZ="2dp"--> 304 + <!-- android:translationZ="2dp"-->
306 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 305 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
307 -<!-- app:layout_constraintTop_toTopOf="parent">--> 306 + <!-- app:layout_constraintTop_toTopOf="parent">-->
308 - 307 +
309 -<!-- <TextView--> 308 + <!-- <TextView-->
310 -<!-- android:id="@+id/tv_gifts_count"--> 309 + <!-- android:id="@+id/tv_gifts_count"-->
311 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 310 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
312 -<!-- android:layout_width="wrap_content"--> 311 + <!-- android:layout_width="wrap_content"-->
313 -<!-- android:layout_height="16dp"--> 312 + <!-- android:layout_height="16dp"-->
314 -<!-- android:includeFontPadding="false"--> 313 + <!-- android:includeFontPadding="false"-->
315 -<!-- android:maxLines="1"--> 314 + <!-- android:maxLines="1"-->
316 -<!-- android:textColor="@color/cos_light_black"--> 315 + <!-- android:textColor="@color/cos_light_black"-->
317 -<!-- android:textSize="12sp"--> 316 + <!-- android:textSize="12sp"-->
318 -<!-- tools:text="6" />--> 317 + <!-- tools:text="6" />-->
319 -<!-- </LinearLayout>--> 318 + <!-- </LinearLayout>-->
320 -<!-- </RelativeLayout>--> 319 + <!-- </RelativeLayout>-->
321 - 320 +
322 -<!-- <RelativeLayout--> 321 + <!-- <RelativeLayout-->
323 -<!-- android:id="@+id/rv_box_count"--> 322 + <!-- android:id="@+id/rv_box_count"-->
324 -<!-- android:layout_width="104dp"--> 323 + <!-- android:layout_width="104dp"-->
325 -<!-- android:layout_height="104dp">--> 324 + <!-- android:layout_height="104dp">-->
326 - 325 +
327 -<!-- <androidx.cardview.widget.CardView--> 326 + <!-- <androidx.cardview.widget.CardView-->
328 -<!-- android:id="@+id/cv_box_count"--> 327 + <!-- android:id="@+id/cv_box_count"-->
329 -<!-- android:layout_width="match_parent"--> 328 + <!-- android:layout_width="match_parent"-->
330 -<!-- android:layout_height="match_parent"--> 329 + <!-- android:layout_height="match_parent"-->
331 -<!-- android:layout_marginHorizontal="2dp"--> 330 + <!-- android:layout_marginHorizontal="2dp"-->
332 -<!-- android:layout_marginVertical="4dp"--> 331 + <!-- android:layout_marginVertical="4dp"-->
333 -<!-- app:cardCornerRadius="16dp"--> 332 + <!-- app:cardCornerRadius="16dp"-->
334 -<!-- app:cardElevation="2dp">--> 333 + <!-- app:cardElevation="2dp">-->
335 - 334 +
336 -<!-- <androidx.constraintlayout.widget.ConstraintLayout--> 335 + <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
337 -<!-- android:layout_width="match_parent"--> 336 + <!-- android:layout_width="match_parent"-->
338 -<!-- android:layout_height="match_parent"--> 337 + <!-- android:layout_height="match_parent"-->
339 -<!-- android:background="@color/white">--> 338 + <!-- android:background="@color/white">-->
340 - 339 +
341 -<!-- <ImageView--> 340 + <!-- <ImageView-->
342 -<!-- android:id="@+id/iv_box_logo_count"--> 341 + <!-- android:id="@+id/iv_box_logo_count"-->
343 -<!-- android:layout_width="34dp"--> 342 + <!-- android:layout_width="34dp"-->
344 -<!-- android:layout_height="34dp"--> 343 + <!-- android:layout_height="34dp"-->
345 -<!-- android:src="@drawable/sv_box_logo"--> 344 + <!-- android:src="@drawable/sv_box_logo"-->
346 -<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_box_count"--> 345 + <!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_box_count"-->
347 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 346 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
348 -<!-- app:layout_constraintStart_toStartOf="parent"--> 347 + <!-- app:layout_constraintStart_toStartOf="parent"-->
349 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 348 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
350 - 349 +
351 -<!-- <View--> 350 + <!-- <View-->
352 -<!-- android:id="@+id/v_separator_box_count"--> 351 + <!-- android:id="@+id/v_separator_box_count"-->
353 -<!-- android:layout_width="match_parent"--> 352 + <!-- android:layout_width="match_parent"-->
354 -<!-- android:layout_height="1dp"--> 353 + <!-- android:layout_height="1dp"-->
355 -<!-- android:layout_marginHorizontal="8dp"--> 354 + <!-- android:layout_marginHorizontal="8dp"-->
356 -<!-- android:background="@color/cos_grey2"--> 355 + <!-- android:background="@color/cos_grey2"-->
357 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 356 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
358 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 357 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
359 -<!-- app:layout_constraintStart_toStartOf="parent"--> 358 + <!-- app:layout_constraintStart_toStartOf="parent"-->
360 -<!-- app:layout_constraintTop_toTopOf="parent" />--> 359 + <!-- app:layout_constraintTop_toTopOf="parent" />-->
361 - 360 +
362 -<!-- <TextView--> 361 + <!-- <TextView-->
363 -<!-- android:id="@+id/tv_box_count_title"--> 362 + <!-- android:id="@+id/tv_box_count_title"-->
364 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 363 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
365 -<!-- android:layout_width="0dp"--> 364 + <!-- android:layout_width="0dp"-->
366 -<!-- android:layout_height="wrap_content"--> 365 + <!-- android:layout_height="wrap_content"-->
367 -<!-- android:layout_marginHorizontal="8dp"--> 366 + <!-- android:layout_marginHorizontal="8dp"-->
368 -<!-- android:gravity="center"--> 367 + <!-- android:gravity="center"-->
369 -<!-- android:includeFontPadding="false"--> 368 + <!-- android:includeFontPadding="false"-->
370 -<!-- android:text="@string/cos_box_tile"--> 369 + <!-- android:text="@string/cos_box_tile"-->
371 -<!-- android:textColor="@color/cos_light_black"--> 370 + <!-- android:textColor="@color/cos_light_black"-->
372 -<!-- android:textSize="10sp"--> 371 + <!-- android:textSize="10sp"-->
373 -<!-- app:layout_constraintBottom_toBottomOf="parent"--> 372 + <!-- app:layout_constraintBottom_toBottomOf="parent"-->
374 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 373 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
375 -<!-- app:layout_constraintStart_toStartOf="parent"--> 374 + <!-- app:layout_constraintStart_toStartOf="parent"-->
376 -<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_box_count" />--> 375 + <!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_box_count" />-->
377 -<!-- </androidx.constraintlayout.widget.ConstraintLayout>--> 376 + <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
378 -<!-- </androidx.cardview.widget.CardView>--> 377 + <!-- </androidx.cardview.widget.CardView>-->
379 - 378 +
380 -<!-- <LinearLayout--> 379 + <!-- <LinearLayout-->
381 -<!-- android:layout_width="16dp"--> 380 + <!-- android:layout_width="16dp"-->
382 -<!-- android:layout_height="16dp"--> 381 + <!-- android:layout_height="16dp"-->
383 -<!-- android:layout_alignParentEnd="true"--> 382 + <!-- android:layout_alignParentEnd="true"-->
384 -<!-- android:layout_marginTop="4dp"--> 383 + <!-- android:layout_marginTop="4dp"-->
385 -<!-- android:layout_marginEnd="1dp"--> 384 + <!-- android:layout_marginEnd="1dp"-->
386 -<!-- android:background="@drawable/shape_cos_counter_orange"--> 385 + <!-- android:background="@drawable/shape_cos_counter_orange"-->
387 -<!-- android:gravity="center"--> 386 + <!-- android:gravity="center"-->
388 -<!-- android:orientation="vertical"--> 387 + <!-- android:orientation="vertical"-->
389 -<!-- android:translationZ="2dp"--> 388 + <!-- android:translationZ="2dp"-->
390 -<!-- app:layout_constraintEnd_toEndOf="parent"--> 389 + <!-- app:layout_constraintEnd_toEndOf="parent"-->
391 -<!-- app:layout_constraintTop_toTopOf="parent">--> 390 + <!-- app:layout_constraintTop_toTopOf="parent">-->
392 - 391 +
393 -<!-- <TextView--> 392 + <!-- <TextView-->
394 -<!-- android:id="@+id/tv_box_count"--> 393 + <!-- android:id="@+id/tv_box_count"-->
395 -<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"--> 394 + <!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
396 -<!-- android:layout_width="wrap_content"--> 395 + <!-- android:layout_width="wrap_content"-->
397 -<!-- android:layout_height="16dp"--> 396 + <!-- android:layout_height="16dp"-->
398 -<!-- android:includeFontPadding="false"--> 397 + <!-- android:includeFontPadding="false"-->
399 -<!-- android:maxLines="1"--> 398 + <!-- android:maxLines="1"-->
400 -<!-- android:textColor="@color/cos_light_black"--> 399 + <!-- android:textColor="@color/cos_light_black"-->
401 -<!-- android:textSize="12sp"--> 400 + <!-- android:textSize="12sp"-->
402 -<!-- tools:text="6" />--> 401 + <!-- tools:text="6" />-->
403 -<!-- </LinearLayout>--> 402 + <!-- </LinearLayout>-->
404 -<!-- </RelativeLayout>--> 403 + <!-- </RelativeLayout>-->
405 </LinearLayout> 404 </LinearLayout>
406 </HorizontalScrollView> 405 </HorizontalScrollView>
407 406
...@@ -409,39 +408,39 @@ ...@@ -409,39 +408,39 @@
409 android:layout_width="match_parent" 408 android:layout_width="match_parent"
410 android:layout_height="wrap_content" 409 android:layout_height="wrap_content"
411 android:layout_marginTop="20dp" 410 android:layout_marginTop="20dp"
412 - android:orientation="horizontal" 411 + android:gravity="center"
413 - android:gravity="center"> 412 + android:orientation="horizontal">
414 413
415 <View 414 <View
416 android:id="@+id/v_first_start" 415 android:id="@+id/v_first_start"
417 android:layout_width="12dp" 416 android:layout_width="12dp"
418 android:layout_height="12dp" 417 android:layout_height="12dp"
419 - android:background="@drawable/shape_indicator"/> 418 + android:background="@drawable/shape_indicator" />
420 419
421 <View 420 <View
422 android:id="@+id/v_first_end" 421 android:id="@+id/v_first_end"
423 android:layout_width="8dp" 422 android:layout_width="8dp"
424 android:layout_height="8dp" 423 android:layout_height="8dp"
425 - android:visibility="gone" 424 + android:background="@drawable/shape_indicator"
426 - android:background="@drawable/shape_indicator"/> 425 + android:visibility="gone" />
427 426
428 <View 427 <View
429 android:layout_width="6dp" 428 android:layout_width="6dp"
430 android:layout_height="12dp" 429 android:layout_height="12dp"
431 - android:background="@drawable/divider_vertical"/> 430 + android:background="@drawable/divider_vertical" />
432 431
433 <View 432 <View
434 android:id="@+id/v_second_start" 433 android:id="@+id/v_second_start"
435 android:layout_width="12dp" 434 android:layout_width="12dp"
436 android:layout_height="12dp" 435 android:layout_height="12dp"
437 - android:visibility="gone" 436 + android:background="@drawable/shape_indicator"
438 - android:background="@drawable/shape_indicator"/> 437 + android:visibility="gone" />
439 438
440 <View 439 <View
441 android:id="@+id/v_second_end" 440 android:id="@+id/v_second_end"
442 android:layout_width="8dp" 441 android:layout_width="8dp"
443 android:layout_height="8dp" 442 android:layout_height="8dp"
444 - android:background="@drawable/shape_indicator"/> 443 + android:background="@drawable/shape_indicator" />
445 </LinearLayout> 444 </LinearLayout>
446 445
447 <LinearLayout 446 <LinearLayout
...@@ -462,7 +461,7 @@ ...@@ -462,7 +461,7 @@
462 android:src="@drawable/ic_empty_wallet" /> 461 android:src="@drawable/ic_empty_wallet" />
463 462
464 <TextView 463 <TextView
465 - fontPath="fonts/PeridotPE-Regular.ttf" 464 + android:id="@+id/empty_text"
466 android:layout_width="wrap_content" 465 android:layout_width="wrap_content"
467 android:layout_height="wrap_content" 466 android:layout_height="wrap_content"
468 android:layout_marginTop="8dp" 467 android:layout_marginTop="8dp"
...@@ -488,7 +487,6 @@ ...@@ -488,7 +487,6 @@
488 487
489 <TextView 488 <TextView
490 android:id="@+id/tv_type" 489 android:id="@+id/tv_type"
491 - fontPath="fonts/PeridotPE-Bold.ttf"
492 android:layout_width="wrap_content" 490 android:layout_width="wrap_content"
493 android:layout_height="wrap_content" 491 android:layout_height="wrap_content"
494 android:includeFontPadding="false" 492 android:includeFontPadding="false"
...@@ -517,7 +515,6 @@ ...@@ -517,7 +515,6 @@
517 515
518 <TextView 516 <TextView
519 android:id="@+id/tv_type_centered" 517 android:id="@+id/tv_type_centered"
520 - fontPath="fonts/PeridotPE-Bold.ttf"
521 android:layout_width="wrap_content" 518 android:layout_width="wrap_content"
522 android:layout_height="wrap_content" 519 android:layout_height="wrap_content"
523 android:includeFontPadding="false" 520 android:includeFontPadding="false"
...@@ -555,7 +552,6 @@ ...@@ -555,7 +552,6 @@
555 552
556 <TextView 553 <TextView
557 android:id="@+id/tv_questionnaire" 554 android:id="@+id/tv_questionnaire"
558 - fontPath="fonts/PeridotPE-Bold.ttf"
559 android:layout_width="wrap_content" 555 android:layout_width="wrap_content"
560 android:layout_height="wrap_content" 556 android:layout_height="wrap_content"
561 android:layout_marginStart="8dp" 557 android:layout_marginStart="8dp"
...@@ -594,7 +590,6 @@ ...@@ -594,7 +590,6 @@
594 590
595 <TextView 591 <TextView
596 android:id="@+id/tv_questionnaire_centered" 592 android:id="@+id/tv_questionnaire_centered"
597 - fontPath="fonts/PeridotPE-Bold.ttf"
598 android:layout_width="wrap_content" 593 android:layout_width="wrap_content"
599 android:layout_height="wrap_content" 594 android:layout_height="wrap_content"
600 android:layout_marginStart="8dp" 595 android:layout_marginStart="8dp"
...@@ -682,7 +677,6 @@ ...@@ -682,7 +677,6 @@
682 677
683 <TextView 678 <TextView
684 android:id="@+id/tv_vouchers_title" 679 android:id="@+id/tv_vouchers_title"
685 - fontPath="fonts/BTCosmo-Bold.ttf"
686 android:layout_width="wrap_content" 680 android:layout_width="wrap_content"
687 android:layout_height="wrap_content" 681 android:layout_height="wrap_content"
688 android:includeFontPadding="false" 682 android:includeFontPadding="false"
...@@ -718,7 +712,6 @@ ...@@ -718,7 +712,6 @@
718 712
719 <TextView 713 <TextView
720 android:id="@+id/tv_vouchers_info_title" 714 android:id="@+id/tv_vouchers_info_title"
721 - fontPath="fonts/PeridotPE-Regular.ttf"
722 android:layout_width="0dp" 715 android:layout_width="0dp"
723 android:layout_height="wrap_content" 716 android:layout_height="wrap_content"
724 android:layout_marginHorizontal="8dp" 717 android:layout_marginHorizontal="8dp"
...@@ -757,7 +750,6 @@ ...@@ -757,7 +750,6 @@
757 750
758 <TextView 751 <TextView
759 android:id="@+id/tv_vouchers_title_disabled" 752 android:id="@+id/tv_vouchers_title_disabled"
760 - fontPath="fonts/BTCosmo-Bold.ttf"
761 android:layout_width="wrap_content" 753 android:layout_width="wrap_content"
762 android:layout_height="wrap_content" 754 android:layout_height="wrap_content"
763 android:includeFontPadding="false" 755 android:includeFontPadding="false"
...@@ -793,7 +785,6 @@ ...@@ -793,7 +785,6 @@
793 785
794 <TextView 786 <TextView
795 android:id="@+id/tv_vouchers_info_title_disabled" 787 android:id="@+id/tv_vouchers_info_title_disabled"
796 - fontPath="fonts/PeridotPE-Regular.ttf"
797 android:layout_width="wrap_content" 788 android:layout_width="wrap_content"
798 android:layout_height="wrap_content" 789 android:layout_height="wrap_content"
799 android:layout_marginHorizontal="8dp" 790 android:layout_marginHorizontal="8dp"
...@@ -830,7 +821,6 @@ ...@@ -830,7 +821,6 @@
830 821
831 <TextView 822 <TextView
832 android:id="@+id/tv_vouchers_count_disabled" 823 android:id="@+id/tv_vouchers_count_disabled"
833 - fontPath="fonts/PeridotPE-SemiBold.ttf"
834 android:layout_width="wrap_content" 824 android:layout_width="wrap_content"
835 android:layout_height="16dp" 825 android:layout_height="16dp"
836 android:includeFontPadding="false" 826 android:includeFontPadding="false"
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
38 38
39 <TextView 39 <TextView
40 android:id="@+id/tv_campaign_title" 40 android:id="@+id/tv_campaign_title"
41 - fontPath="fonts/PeridotPE-Regular.ttf"
42 android:layout_width="0dp" 41 android:layout_width="0dp"
43 android:layout_height="wrap_content" 42 android:layout_height="wrap_content"
44 android:layout_marginHorizontal="12dp" 43 android:layout_marginHorizontal="12dp"
......
...@@ -31,21 +31,21 @@ ...@@ -31,21 +31,21 @@
31 android:id="@+id/iv_campaign_logo" 31 android:id="@+id/iv_campaign_logo"
32 android:layout_width="0dp" 32 android:layout_width="0dp"
33 android:layout_height="0dp" 33 android:layout_height="0dp"
34 - android:scaleType="centerInside"
35 android:layout_margin="1dp" 34 android:layout_margin="1dp"
36 - app:shapeAppearanceOverlay="@style/ShapeAppearanceMfyImage" 35 + android:scaleType="centerInside"
37 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
38 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
39 app:layout_constraintStart_toEndOf="@+id/gl_vertical_54_percent" 38 app:layout_constraintStart_toEndOf="@+id/gl_vertical_54_percent"
40 app:layout_constraintTop_toTopOf="parent" 39 app:layout_constraintTop_toTopOf="parent"
40 + app:shapeAppearanceOverlay="@style/ShapeAppearanceMfyImage"
41 tools:src="@drawable/ic_cosmote_logo_horizontal_grey" /> 41 tools:src="@drawable/ic_cosmote_logo_horizontal_grey" />
42 42
43 <androidx.constraintlayout.widget.ConstraintLayout 43 <androidx.constraintlayout.widget.ConstraintLayout
44 android:layout_width="0dp" 44 android:layout_width="0dp"
45 android:layout_height="match_parent" 45 android:layout_height="match_parent"
46 + android:layout_margin="1dp"
46 android:background="@drawable/svg_background_more" 47 android:background="@drawable/svg_background_more"
47 android:orientation="vertical" 48 android:orientation="vertical"
48 - android:layout_margin="1dp"
49 app:layout_constraintBottom_toBottomOf="parent" 49 app:layout_constraintBottom_toBottomOf="parent"
50 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent" 50 app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent"
51 app:layout_constraintStart_toStartOf="parent" 51 app:layout_constraintStart_toStartOf="parent"
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
60 60
61 <TextView 61 <TextView
62 android:id="@+id/tv_campaign_title" 62 android:id="@+id/tv_campaign_title"
63 - fontPath="fonts/BTCosmo-Bold.ttf"
64 android:layout_width="0dp" 63 android:layout_width="0dp"
65 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
66 android:layout_marginHorizontal="12dp" 65 android:layout_marginHorizontal="12dp"
...@@ -75,7 +74,6 @@ ...@@ -75,7 +74,6 @@
75 74
76 <TextView 75 <TextView
77 android:id="@+id/tv_campaign_subtitle" 76 android:id="@+id/tv_campaign_subtitle"
78 - fontPath="fonts/PeridotPE-Regular.ttf"
79 android:layout_width="0dp" 77 android:layout_width="0dp"
80 android:layout_height="wrap_content" 78 android:layout_height="wrap_content"
81 android:layout_marginHorizontal="12dp" 79 android:layout_marginHorizontal="12dp"
...@@ -90,7 +88,6 @@ ...@@ -90,7 +88,6 @@
90 88
91 <TextView 89 <TextView
92 android:id="@+id/tv_campaign_message" 90 android:id="@+id/tv_campaign_message"
93 - fontPath="fonts/PeridotPE-SemiBold.ttf"
94 android:layout_width="0dp" 91 android:layout_width="0dp"
95 android:layout_height="wrap_content" 92 android:layout_height="wrap_content"
96 android:layout_marginHorizontal="12dp" 93 android:layout_marginHorizontal="12dp"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 15
16 <TextView 16 <TextView
17 android:id="@+id/tv_phone_share" 17 android:id="@+id/tv_phone_share"
18 - fontPath="fonts/PeridotPE-Regular.ttf"
19 android:layout_width="match_parent" 18 android:layout_width="match_parent"
20 android:layout_height="wrap_content" 19 android:layout_height="wrap_content"
21 android:layout_alignParentStart="true" 20 android:layout_alignParentStart="true"
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
56 56
57 <TextView 57 <TextView
58 android:id="@+id/tv_market_coupons_title" 58 android:id="@+id/tv_market_coupons_title"
59 - fontPath="fonts/BTCosmo-Bold.ttf"
60 android:layout_width="wrap_content" 59 android:layout_width="wrap_content"
61 android:layout_height="wrap_content" 60 android:layout_height="wrap_content"
62 android:ellipsize="end" 61 android:ellipsize="end"
...@@ -66,7 +65,6 @@ ...@@ -66,7 +65,6 @@
66 android:textSize="16sp" /> 65 android:textSize="16sp" />
67 66
68 <TextView 67 <TextView
69 - fontPath="fonts/pf_square_sans_pro_bold.ttf"
70 android:layout_width="wrap_content" 68 android:layout_width="wrap_content"
71 android:layout_height="wrap_content" 69 android:layout_height="wrap_content"
72 android:text="" 70 android:text=""
...@@ -75,7 +73,6 @@ ...@@ -75,7 +73,6 @@
75 73
76 <TextView 74 <TextView
77 android:id="@+id/tv_market_coupons_date" 75 android:id="@+id/tv_market_coupons_date"
78 - fontPath="fonts/PeridotPE-Regular.ttf"
79 android:layout_width="wrap_content" 76 android:layout_width="wrap_content"
80 android:layout_height="wrap_content" 77 android:layout_height="wrap_content"
81 android:textColor="@color/cos_light_black" 78 android:textColor="@color/cos_light_black"
...@@ -85,7 +82,6 @@ ...@@ -85,7 +82,6 @@
85 82
86 <TextView 83 <TextView
87 android:id="@+id/tv_market_coupons_count" 84 android:id="@+id/tv_market_coupons_count"
88 - fontPath="fonts/PeridotPE-Regular.ttf"
89 android:layout_width="0dp" 85 android:layout_width="0dp"
90 android:layout_height="wrap_content" 86 android:layout_height="wrap_content"
91 android:layout_marginStart="8dp" 87 android:layout_marginStart="8dp"
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
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/PeridotPE-Bold.ttf"
11 android:layout_width="wrap_content" 10 android:layout_width="wrap_content"
12 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
13 android:textColor="@color/cos_light_black" 12 android:textColor="@color/cos_light_black"
...@@ -42,7 +41,6 @@ ...@@ -42,7 +41,6 @@
42 41
43 <TextView 42 <TextView
44 android:id="@+id/tv_shared_coupons_title" 43 android:id="@+id/tv_shared_coupons_title"
45 - fontPath="fonts/PeridotPE-Regular.ttf"
46 android:layout_width="wrap_content" 44 android:layout_width="wrap_content"
47 android:layout_height="wrap_content" 45 android:layout_height="wrap_content"
48 android:layout_weight="0.5" 46 android:layout_weight="0.5"
...@@ -53,7 +51,6 @@ ...@@ -53,7 +51,6 @@
53 51
54 <TextView 52 <TextView
55 android:id="@+id/tv_shared_coupons_value" 53 android:id="@+id/tv_shared_coupons_value"
56 - fontPath="fonts/PeridotPE-Bold.ttf"
57 android:layout_width="wrap_content" 54 android:layout_width="wrap_content"
58 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
59 android:layout_weight="0.5" 56 android:layout_weight="0.5"
...@@ -65,7 +62,6 @@ ...@@ -65,7 +62,6 @@
65 62
66 <TextView 63 <TextView
67 android:id="@+id/tv_shared_coupons_label" 64 android:id="@+id/tv_shared_coupons_label"
68 - fontPath="fonts/PeridotPE-Regular.ttf"
69 android:layout_width="wrap_content" 65 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
71 android:textColor="@color/cos_light_black" 67 android:textColor="@color/cos_light_black"
...@@ -74,7 +70,6 @@ ...@@ -74,7 +70,6 @@
74 70
75 <TextView 71 <TextView
76 android:id="@+id/tv_shared_coupons_phone" 72 android:id="@+id/tv_shared_coupons_phone"
77 - fontPath="fonts/PeridotPE-Regular.ttf"
78 android:layout_width="wrap_content" 73 android:layout_width="wrap_content"
79 android:layout_height="wrap_content" 74 android:layout_height="wrap_content"
80 android:textColor="@color/cos_light_black" 75 android:textColor="@color/cos_light_black"
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
43 43
44 <TextView 44 <TextView
45 android:id="@+id/tv_box_count_title" 45 android:id="@+id/tv_box_count_title"
46 - fontPath="fonts/PeridotPE-SemiBold.ttf"
47 android:layout_width="0dp" 46 android:layout_width="0dp"
48 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
49 android:layout_marginHorizontal="8dp" 48 android:layout_marginHorizontal="8dp"
...@@ -75,7 +74,6 @@ ...@@ -75,7 +74,6 @@
75 74
76 <TextView 75 <TextView
77 android:id="@+id/tv_box_count" 76 android:id="@+id/tv_box_count"
78 - fontPath="fonts/PeridotPE-SemiBold.ttf"
79 android:layout_width="wrap_content" 77 android:layout_width="wrap_content"
80 android:layout_height="16dp" 78 android:layout_height="16dp"
81 android:includeFontPadding="false" 79 android:includeFontPadding="false"
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
43 43
44 <TextView 44 <TextView
45 android:id="@+id/tv_gifts_count_title" 45 android:id="@+id/tv_gifts_count_title"
46 - fontPath="fonts/PeridotPE-SemiBold.ttf"
47 android:layout_width="0dp" 46 android:layout_width="0dp"
48 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
49 android:layout_marginHorizontal="8dp" 48 android:layout_marginHorizontal="8dp"
...@@ -74,7 +73,6 @@ ...@@ -74,7 +73,6 @@
74 73
75 <TextView 74 <TextView
76 android:id="@+id/tv_gifts_count" 75 android:id="@+id/tv_gifts_count"
77 - fontPath="fonts/PeridotPE-SemiBold.ttf"
78 android:layout_width="wrap_content" 76 android:layout_width="wrap_content"
79 android:layout_height="16dp" 77 android:layout_height="16dp"
80 android:includeFontPadding="false" 78 android:includeFontPadding="false"
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
43 43
44 <TextView 44 <TextView
45 android:id="@+id/tv_deals_count_title" 45 android:id="@+id/tv_deals_count_title"
46 - fontPath="fonts/PeridotPE-SemiBold.ttf"
47 android:layout_width="0dp" 46 android:layout_width="0dp"
48 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
49 android:layout_marginHorizontal="8dp" 48 android:layout_marginHorizontal="8dp"
...@@ -74,7 +73,6 @@ ...@@ -74,7 +73,6 @@
74 73
75 <TextView 74 <TextView
76 android:id="@+id/tv_deals_count" 75 android:id="@+id/tv_deals_count"
77 - fontPath="fonts/PeridotPE-SemiBold.ttf"
78 android:layout_width="wrap_content" 76 android:layout_width="wrap_content"
79 android:layout_height="16dp" 77 android:layout_height="16dp"
80 android:includeFontPadding="false" 78 android:includeFontPadding="false"
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
43 43
44 <TextView 44 <TextView
45 android:id="@+id/tv_sm_count_title" 45 android:id="@+id/tv_sm_count_title"
46 - fontPath="fonts/PeridotPE-SemiBold.ttf"
47 android:layout_width="0dp" 46 android:layout_width="0dp"
48 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
49 android:layout_marginHorizontal="8dp" 48 android:layout_marginHorizontal="8dp"
...@@ -74,7 +73,6 @@ ...@@ -74,7 +73,6 @@
74 73
75 <TextView 74 <TextView
76 android:id="@+id/tv_sm_count" 75 android:id="@+id/tv_sm_count"
77 - fontPath="fonts/PeridotPE-SemiBold.ttf"
78 android:layout_width="wrap_content" 76 android:layout_width="wrap_content"
79 android:layout_height="16dp" 77 android:layout_height="16dp"
80 android:includeFontPadding="false" 78 android:includeFontPadding="false"
......