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 @@
android:theme="@style/SDKAppTheme" />
<activity
android:name="ly.warp.sdk.activities.ActiveGiftsActivity"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/SDKAppTheme" />
<activity
android:name="ly.warp.sdk.activities.ShopsActivity"
android:exported="false"
android:screenOrientation="portrait"
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import java.io.Serializable;
import java.util.ArrayList;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.CampaignList;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.io.models.MergedActiveGifts;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.views.adapters.MergedActiveGiftsAdapter;
public class ActiveGiftsActivity extends Activity implements View.OnClickListener {
// ===========================================================
// Constants
// ===========================================================
// ===========================================================
// Fields
// ===========================================================
private ImageView mIvBack;
private ArrayList<MergedActiveGifts> mData = new ArrayList();
private RecyclerView mRecyclerMergedActiveGifts;
private MergedActiveGiftsAdapter mAdapterMergedActiveGifts;
// ===========================================================
// Methods for/from SuperClass/Interfaces
// ===========================================================
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_active_gifts);
mergeDatasets(
/*WarplyManagerHelper.getUniqueCampaignList().get("gifts_for_you")*/null,
WarplyManagerHelper.getCouponList()
);
mIvBack = findViewById(R.id.iv_list_close);
mRecyclerMergedActiveGifts = findViewById(R.id.rv_merged_active_gifts);
initViews();
}
@Override
public void onResume() {
super.onResume();
WarplyAnalyticsManager.logTrackersEvent(this, "screen", "ActiveGiftsScreen");
}
@Override
public void onClick(View view) {
if (view.getId() == R.id.iv_list_close) {
onBackPressed();
return;
}
}
// ===========================================================
// Methods
// ===========================================================
private void initViews() {
mIvBack.setOnClickListener(this);
if (mData != null && mData.size() > 0) {
mRecyclerMergedActiveGifts.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
mAdapterMergedActiveGifts = new MergedActiveGiftsAdapter(this, mData);
mRecyclerMergedActiveGifts.setAdapter(mAdapterMergedActiveGifts);
mAdapterMergedActiveGifts.getPositionClicks()
.doOnNext(dataItem -> {
if (dataItem.getDataType() == 1) {
if (!WarplyManagerHelper.noInternetDialog(ActiveGiftsActivity.this, true)) {
WarplyManagerHelper.noInternetDialog(ActiveGiftsActivity.this);
return;
}
startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())));
} else if (dataItem.getDataType() == 2) {
Intent intent = new Intent(ActiveGiftsActivity.this, CouponInfoActivity.class);
intent.putExtra("coupon", dataItem.getCoupon().getCoupon());
startActivity(intent);
}
})
.doOnError(error -> {
})
.subscribe();
} else {
// mClCouponsOuter.setVisibility(View.GONE);
}
}
private ArrayList<MergedActiveGifts> mergeDatasets(CampaignList campaignList, CouponList couponsList) {
if (campaignList != null && campaignList.size() > 0) {
for (Campaign campaign : campaignList) {
MergedActiveGifts data = new MergedActiveGifts();
data.setCampaign(campaign);
data.setCoupon(null);
data.setDataType(1);
mData.add(data);
}
}
if (couponsList.size() > 0) {
for (Coupon coupon : couponsList) {
MergedActiveGifts data = new MergedActiveGifts();
data.setCampaign(null);
data.setCoupon(coupon);
data.setDataType(2);
mData.add(data);
}
}
return mData;
}
// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
}
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
......@@ -9,7 +8,6 @@ import android.os.Looper;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
......@@ -24,10 +22,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.UnifiedCoupon;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
......@@ -48,7 +46,7 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
private ImageView mIvBack;
private RecyclerView mRecyclerUnifiedCoupons;
private MarketCouponAdapter mAdapterUnifiedCoupons;
private TextView mTvEmptyUnifiedCoupons;
private TextView mTvEmptyUnifiedCoupons, mFontHeader;
private boolean mUnifiedPressed = false;
// ===========================================================
......@@ -63,6 +61,9 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
mIvBack = findViewById(R.id.iv_coupons_close);
mTvEmptyUnifiedCoupons = findViewById(R.id.tv_no_unified_coupons);
mRecyclerUnifiedCoupons = findViewById(R.id.rv_active_unified_coupons);
mFontHeader = findViewById(R.id.textView3);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvEmptyUnifiedCoupons);
initViews();
}
......@@ -108,11 +109,6 @@ public class ActiveUnifiedCouponsActivity extends Activity implements View.OnCli
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......
......@@ -4,7 +4,6 @@ import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
......@@ -14,7 +13,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.core.text.HtmlCompat;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
......@@ -23,8 +21,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
......@@ -39,8 +35,8 @@ import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
import ly.warp.sdk.io.models.WarplyCCMSEnabledModel;
import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest;
import ly.warp.sdk.io.request.WarplyConsumerRequest;
import ly.warp.sdk.services.EventCampaignService;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
import ly.warp.sdk.utils.managers.WarplyManager;
......@@ -59,7 +55,8 @@ public class ContextualActivity extends Activity implements View.OnClickListener
// ===========================================================
private ImageView mIvBack, mIvCampaignPhoto, mIvTermsArrow;
private TextView mTvCampaignTitle, mTvCampaignSubtitle, mTvTerms, mTvTermsValue;
private TextView mTvCampaignTitle, mTvCampaignSubtitle, mTvTerms, mTvTermsValue,
mFontHeader, mFontActivateButton;
private LoyaltyContextualOfferModel mCCMS = new LoyaltyContextualOfferModel();
private LinearLayout mLlActivateOffer, mLlTerms;
private Consumer mConsumer;
......@@ -87,6 +84,12 @@ public class ContextualActivity extends Activity implements View.OnClickListener
mLlTerms = findViewById(R.id.ll_terms_inner);
mIvTermsArrow = findViewById(R.id.iv_terms_arrow);
mTvTermsValue = findViewById(R.id.tv_terms_value);
mFontHeader = findViewById(R.id.textView3);
mFontActivateButton = findViewById(R.id.tv_activate_button);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCampaignTitle);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCampaignSubtitle, mTvTermsValue);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontActivateButton);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvTerms);
initViews();
}
......@@ -162,46 +165,19 @@ public class ContextualActivity extends Activity implements View.OnClickListener
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
bottomSheetDialog.setContentView(R.layout.dl_share);
TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, tvHeader);
tvHeader.setText(R.string.cos_coupon_share_telco);
LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close);
dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
// if (mConsumer != null) {
// try {
// JSONObject profMeta = new JSONObject(mConsumer.getProfileMetadata());
// if (profMeta != null) {
// JSONArray msisdnList = new JSONArray();
// msisdnList = profMeta.optJSONArray(MSISDN_LIST);
// if (msisdnList != null && msisdnList.length() > 0) {
// for (int i = 0; i < msisdnList.length(); i++) {
// LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
// LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
// TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
// textView.setText(msisdnList.optString(i));
// textView.setOnClickListener(view -> {
// TextView tv = (TextView) view;
// mSender = tv.getText().toString();
// bottomSheetDialog.dismiss();
// askActivateDialog();
// });
// parent.addView(v, 0, new ViewGroup.LayoutParams(
// ViewGroup.LayoutParams.MATCH_PARENT,
// ViewGroup.LayoutParams.WRAP_CONTENT));
// }
// }
// }
// } catch (JSONException e) {
// e.printStackTrace();
// }
// }
if (mCCMS.getEligibleAssets() != null && mCCMS.getEligibleAssets().size() > 0) {
for (int i = 0; i < mCCMS.getEligibleAssets().size(); i++) {
LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, textView);
textView.setText(mCCMS.getEligibleAssets().get(i));
textView.setOnClickListener(view -> {
TextView tv = (TextView) view;
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
......@@ -27,22 +26,17 @@ import com.google.zxing.BarcodeFormat;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.oned.EAN13Writer;
import org.greenrobot.eventbus.EventBus;
import java.io.Serializable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.UnifiedCoupon;
import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
import ly.warp.sdk.services.EventCouponsService;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
public class CouponInfoActivity extends Activity implements View.OnClickListener {
......@@ -57,7 +51,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
private ImageView mIvBack, mIvCouponPhoto, mIvBarcode;
private TextView mTvTerms, mTvCouponCode, mTvCouponTitle, mTvCouponSubtitle, mTvCouponDate,
mTvTermsValue, mTvFullBarcode, mTvDescription, mTvCouponCodeTitle;
mTvTermsValue, mTvFullBarcode, mTvDescription, mTvCouponCodeTitle, mFontHeader,
mFontButtonGiftIt, mFontButtonShops, mFontButtonSite;
private LinearLayout mLlGiftIt, mLlShops, mLlBarcodeShown, mLlBarcodeContainer, mLlTerms, mLlWebsite;
private Coupon mCoupon;
private boolean mIsBarcodeShown = false, mIsTermsShown = false, mIsFromWallet = false,
......@@ -116,6 +111,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
mTvFullBarcode = findViewById(R.id.tv_full_barcode);
mTvDescription = findViewById(R.id.tv_clickable_link);
mTvCouponCodeTitle = findViewById(R.id.textView15);
mFontHeader = findViewById(R.id.textView3);
mFontButtonGiftIt = findViewById(R.id.button_gift_it);
mFontButtonShops = findViewById(R.id.button_shops);
mFontButtonSite = findViewById(R.id.button_site);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCouponTitle);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponSubtitle, mTvDescription,
mTvFullBarcode, mTvCouponDate, mTvTermsValue);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvCouponCodeTitle, mTvCouponCode,
mFontButtonShops, mFontButtonSite, mTvTerms);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonGiftIt);
initViews();
}
......@@ -202,6 +207,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
if (mIsBarcodeShown) {
mLlBarcodeContainer.setVisibility(View.GONE);
TextView barcodeButtonTitle = mLlBarcodeShown.findViewById(R.id.tv_barcode);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, barcodeButtonTitle);
ImageView barcodeButtonArrow = mLlBarcodeShown.findViewById(R.id.iv_barcode_arrow);
barcodeButtonTitle.setText(getString(R.string.cos_show_barcode));
barcodeButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_down_dark_new));
......@@ -209,6 +215,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
} else {
mLlBarcodeContainer.setVisibility(View.VISIBLE);
TextView barcodeButtonTitle = mLlBarcodeShown.findViewById(R.id.tv_barcode);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, barcodeButtonTitle);
ImageView barcodeButtonArrow = mLlBarcodeShown.findViewById(R.id.iv_barcode_arrow);
barcodeButtonTitle.setText(getString(R.string.cos_hide_barcode));
barcodeButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_up_dark_new));
......@@ -231,11 +238,6 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......
......@@ -28,7 +28,6 @@ import org.json.JSONObject;
import java.util.ArrayList;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Consumer;
......@@ -37,7 +36,7 @@ import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
import ly.warp.sdk.io.request.CosmoteCouponSharingRequest;
import ly.warp.sdk.io.request.WarplyConsumerRequest;
import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
......@@ -57,7 +56,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
// ===========================================================
private ImageView mIvBack, mIvCouponPhoto;
private TextView mTvCouponTitle, mTvPhoneHeader;
private TextView mTvCouponTitle, mTvPhoneHeader, mFontHeader, mFontDescription, mFontButtonShare;
private Coupon mCoupon;
private Consumer mConsumer;
private RelativeLayout mRlSenderView;
......@@ -94,6 +93,12 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
mLlShareButton = findViewById(R.id.ll_share_button);
mTvPhoneHeader = findViewById(R.id.tv_phone);
mEdtReceiver = findViewById(R.id.et_phone);
mFontHeader = findViewById(R.id.textView3);
mFontDescription = findViewById(R.id.textView14);
mFontButtonShare = findViewById(R.id.button_share);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCouponTitle);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mFontDescription, mTvPhoneHeader, mEdtReceiver);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonShare);
initViews();
}
......@@ -152,11 +157,6 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......@@ -202,6 +202,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, textView);
textView.setText(msisdnList.optString(i));
textView.setOnClickListener(view -> {
TextView tv = (TextView) view;
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
......@@ -25,7 +24,6 @@ import org.json.JSONObject;
import java.util.ArrayList;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Campaign;
......@@ -56,7 +54,8 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
// ===========================================================
private ImageView mIvBack, mIvCouponsetPhoto, mIvTermsArrow;
private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle, mTvTermsValue;
private TextView mTvTerms, mTvCouponsetTitle, mTvCouponsetSubtitle, mTvTermsValue,
mFontHeader, mFontButtonGetIt;
private Couponset mCouponset;
private LinearLayout mLlRedeem, mLlTerms;
private ProgressBar mPbLoading;
......@@ -104,6 +103,12 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
mLlTerms = findViewById(R.id.ll_terms_inner);
mTvTermsValue = findViewById(R.id.tv_terms_value);
mIvTermsArrow = findViewById(R.id.iv_terms_arrow);
mFontHeader = findViewById(R.id.textView3);
mFontButtonGetIt = findViewById(R.id.button_get_it);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCouponsetTitle);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponsetSubtitle, mTvTermsValue);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonGetIt);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvTerms);
initViews();
}
......@@ -177,11 +182,6 @@ public class CouponsetInfoActivity extends Activity implements View.OnClickListe
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......
package ly.warp.sdk.activities;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
......@@ -21,13 +20,11 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.json.JSONObject;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.Couponset;
......@@ -85,6 +82,7 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
mIvPopupClose = findViewById(R.id.iv_popup_gifts_close);
mLlGiftsPopup = findViewById(R.id.ll_gifts_popup);
mRecyclerMergedGifts = findViewById(R.id.rv_merged_gifts);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mTvTitle);
filterItems();
......@@ -151,11 +149,6 @@ public class GiftsForYouActivity extends AppCompatActivity implements View.OnCli
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 1004) {
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.graphics.Typeface;
import android.os.Bundle;
import android.os.Handler;
......@@ -15,6 +14,7 @@ import android.widget.TextView;
import androidx.cardview.widget.CardView;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
......@@ -22,14 +22,11 @@ import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
import io.github.inflationx.calligraphy3.TypefaceUtils;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.io.models.Couponset;
import ly.warp.sdk.io.models.CustomTypefaceSpan;
import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
import ly.warp.sdk.io.models.SharingCoupon;
import ly.warp.sdk.io.models.SharingList;
......@@ -54,7 +51,8 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
// ===========================================================
private ImageView mIvBack;
private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty;
private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty, mFontHeader,
mFontExpired, mFontExpiredMore, mFontShared, mFontSharedMore;
private RecyclerView mRvExpiredCoupons, mRvSharedCoupons;
private ExpiredCouponAdapter mAdapterExpiredCoupons;
private SharedCouponAdapter mAdapterSharedCoupons;
......@@ -88,6 +86,17 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
mLlShowMoreExpired = findViewById(R.id.ll_show_more_expired);
mLlShowMoreShared = findViewById(R.id.ll_show_more_shared);
mCvExpiredInnerTitle = findViewById(R.id.cv_expired_coupons_inner_title);
mFontHeader = findViewById(R.id.textView3);
mFontExpired = findViewById(R.id.tv_expired_title);
mFontExpiredMore = findViewById(R.id.tv_expired_more);
mFontShared = findViewById(R.id.tv_shared_title);
mFontSharedMore = findViewById(R.id.tv_shared_more);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mFontExpired,
mFontShared);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponsValueAll,
mTvExpiredEmpty, mTvSharedEmpty);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontExpiredMore,
mFontSharedMore);
initViews();
}
......@@ -150,7 +159,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldOne = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldOne);
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
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
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
Typeface typefaceSemiBoldOne = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
CustomTypefaceSpan typefaceSemiBoldSpan = new CustomTypefaceSpan(typefaceSemiBoldOne);
SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
sBuilderShared.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilderShared.setSpan(typefaceSemiBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sharedTab.setText(sBuilderShared, TextView.BufferType.SPANNABLE);
mRlSharedView.setVisibility(View.GONE);
......@@ -177,7 +192,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldTwo);
SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
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
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
Typeface typefaceSemiBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
CustomTypefaceSpan typefaceSemiBoldSpan = new CustomTypefaceSpan(typefaceSemiBoldTwo);
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
sBuilderExpired.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilderExpired.setSpan(typefaceSemiBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
expiredTab.setText(sBuilderExpired, TextView.BufferType.SPANNABLE);
mRlExpiredView.setVisibility(View.GONE);
......@@ -211,11 +232,6 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......@@ -230,7 +246,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldThree = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldExpiredSpan = new CustomTypefaceSpan(typefaceBoldThree);
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
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
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
Typeface typefaceSemiBoldThree = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
CustomTypefaceSpan typefaceRegularSharedSpan = new CustomTypefaceSpan(typefaceSemiBoldThree);
SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
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
.append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount())))
.append(getString(R.string.cos_wallet_text5));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceRegularOne = ResourcesCompat.getFont(this, R.font.peridot_regular);
CustomTypefaceSpan typefaceRegularSpan = new CustomTypefaceSpan(typefaceRegularOne);
Typeface typefaceRegularTwo = ResourcesCompat.getFont(this, R.font.peridot_regular);
CustomTypefaceSpan typefaceRegularSpan2 = new CustomTypefaceSpan(typefaceRegularTwo);
Typeface typefaceRegularThree = ResourcesCompat.getFont(this, R.font.peridot_regular);
CustomTypefaceSpan typefaceRegularSpan3 = new CustomTypefaceSpan(typefaceRegularThree);
Typeface typefaceBoldFour = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldFour);
Typeface typefaceBoldFive = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan2 = new CustomTypefaceSpan(typefaceBoldFive);
sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text3).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
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);
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
import android.os.Handler;
import android.text.SpannableStringBuilder;
......@@ -12,19 +12,20 @@ import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.core.content.res.ResourcesCompat;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.Locale;
import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
import io.github.inflationx.calligraphy3.TypefaceUtils;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.CustomTypefaceSpan;
import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
import ly.warp.sdk.io.models.WarplyBoxAnalysisEventModel;
import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
......@@ -44,7 +45,8 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
private int mTimer = 0;
private Handler mSecondsHandler;
private TextView mTvFavValue, mTvDealsValue, mTvGiftsValue, mTvMarketValue, mTvDealsValueAll,
mTvGiftsValueAll, mTvMarketAll, mTvBoxValue, mTvBoxValueAll;
mTvGiftsValueAll, mTvMarketAll, mTvBoxValue, mTvBoxValueAll, mFontHeader,
mFontValueAll;
private float mFavValue = 0.0f, countValue = 0.0f;
private RelativeLayout mRlDealsBanner, mRlGiftsBanner, mRlUnifiedBanner, mRlBoxBanner;
private boolean mDealsBannerPressed = false, mHistoryPressed = false,
......@@ -74,6 +76,13 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
mRlBoxBanner = findViewById(R.id.rl_fourth_banner);
mRlGiftsBanner = findViewById(R.id.rl_third_banner);
mRlUnifiedBanner = findViewById(R.id.rl_second_banner);
mFontHeader = findViewById(R.id.textView3);
mFontValueAll = findViewById(R.id.tv_exp_value_all);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvFavValue);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mFontValueAll,
mTvDealsValueAll, mTvMarketAll, mTvGiftsValueAll, mTvBoxValueAll);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvDealsValue, mTvMarketValue,
mTvGiftsValue, mTvBoxValue);
initViews();
}
......@@ -213,11 +222,6 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......@@ -239,7 +243,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
}
SpannableStringBuilder sBuilder = new SpannableStringBuilder();
sBuilder.append(String.format(getString(R.string.cos_deals_win_title_cos), badgeValueFirst));
CalligraphyTypefaceSpan typefaceBoldSpanFirst = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldOne = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpanFirst = new CustomTypefaceSpan(typefaceBoldOne);
sBuilder.setSpan(typefaceBoldSpanFirst, 24, 24 + badgeValueFirst.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvDealsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
mFavValue += WarplyManagerHelper.getDealsCouponsSum();
......@@ -274,7 +281,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
}
SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpanThird = new CustomTypefaceSpan(typefaceBoldTwo);
sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
} else {
......@@ -282,7 +292,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
mTvMarketValue.setText(String.format(getString(R.string.cos_value), badgeValue));
SpannableStringBuilder sBuilderThird = new SpannableStringBuilder();
sBuilderThird.append(String.format(getString(R.string.cos_supermarket_win), badgeValue));
CalligraphyTypefaceSpan typefaceBoldSpanThird = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldThree = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpanThird = new CustomTypefaceSpan(typefaceBoldThree);
sBuilderThird.setSpan(typefaceBoldSpanThird, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvMarketAll.setText(sBuilderThird, TextView.BufferType.SPANNABLE);
}
......@@ -299,7 +312,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
}
SpannableStringBuilder sBuilderSecond = new SpannableStringBuilder();
sBuilderSecond.append(String.format(getString(R.string.cos_deals_win_title), badgeValue));
CalligraphyTypefaceSpan typefaceBoldSpanSecond = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldFour = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpanSecond = new CustomTypefaceSpan(typefaceBoldFour);
sBuilderSecond.setSpan(typefaceBoldSpanSecond, 24, 24 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvGiftsValueAll.setText(sBuilderSecond, TextView.BufferType.SPANNABLE);
mFavValue += WarplyManagerHelper.getLoyaltyBadge().getValue();
......@@ -316,7 +332,10 @@ public class LoyaltyHistoryActivity extends Activity implements View.OnClickList
}
SpannableStringBuilder sBuilderFourth = new SpannableStringBuilder();
sBuilderFourth.append(String.format(getString(R.string.cos_box_win_title_cos), badgeValueFourth));
CalligraphyTypefaceSpan typefaceBoldSpanFourth = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldFive = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpanFourth = new CustomTypefaceSpan(typefaceBoldFive);
sBuilderFourth.setSpan(typefaceBoldSpanFourth, 24, 24 + badgeValueFourth.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvBoxValueAll.setText(sBuilderFourth, TextView.BufferType.SPANNABLE);
mFavValue += WarplyManagerHelper.getBoxCouponsSum();
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.graphics.Typeface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
......@@ -15,29 +15,25 @@ import android.widget.TextView;
import androidx.cardview.widget.CardView;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONArray;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan;
import io.github.inflationx.calligraphy3.TypefaceUtils;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.Couponset;
import ly.warp.sdk.io.models.CustomTypefaceSpan;
import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
import ly.warp.sdk.io.models.SharingCoupon;
import ly.warp.sdk.io.models.SharingList;
import ly.warp.sdk.io.models.UnifiedCoupon;
import ly.warp.sdk.io.request.WarplySharingHistoryRequest;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
......@@ -55,7 +51,8 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
// Fields
// ===========================================================
private ImageView mIvBack;
private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty;
private TextView mTvCouponsValueAll, mTvSharedEmpty, mTvExpiredEmpty, mFontHeader,
mFontExpired, mFontExpiredMore, mFontShared, mFontSharedMore;
private RecyclerView mRvExpiredCoupons, mRvSharedCoupons;
private ExpiredCouponAdapter mAdapterExpiredCoupons;
private SharedCouponAdapter mAdapterSharedCoupons;
......@@ -89,6 +86,19 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
mLlShowMoreExpired = findViewById(R.id.ll_show_more_expired);
mLlShowMoreShared = findViewById(R.id.ll_show_more_shared);
mCvExpiredInfoView = findViewById(R.id.cv_expired_coupons_inner_title);
mFontHeader = findViewById(R.id.textView3);
mFontExpired = findViewById(R.id.tv_expired_title);
mFontExpiredMore = findViewById(R.id.tv_expired_more);
mFontShared = findViewById(R.id.tv_shared_title);
mFontSharedMore = findViewById(R.id.tv_shared_more);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mFontExpired,
mFontShared);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponsValueAll,
mTvExpiredEmpty, mTvSharedEmpty);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontExpiredMore,
mFontSharedMore);
if (WarplyManagerHelper.getMarketCoupons() != null && WarplyManagerHelper.getMarketCoupons().size() > 0) {
final ExecutorService executor = Executors.newFixedThreadPool(1);
executor.submit(() -> {
......@@ -174,7 +184,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldOne = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldOne);
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
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
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
Typeface typefaceSemiBoldOne = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
CustomTypefaceSpan typefaceRegularSpan = new CustomTypefaceSpan(typefaceSemiBoldOne);
SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
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
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldTwo);
SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
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
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
Typeface typefaceSemiBoldTwo = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
CustomTypefaceSpan typefaceRegularSpan = new CustomTypefaceSpan(typefaceSemiBoldTwo);
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
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
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......@@ -247,7 +264,10 @@ public class LoyaltyMarketAnalysisActivity extends Activity implements View.OnCl
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldThree = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldExpiredSpan = new CustomTypefaceSpan(typefaceBoldThree);
SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
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
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey));
CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
Typeface typefaceSemiBoldThree = ResourcesCompat.getFont(this, R.font.peridot_semi_bold);
CustomTypefaceSpan typefaceRegularSharedSpan = new CustomTypefaceSpan(typefaceSemiBoldThree);
SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
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
String badgeValue = String.format("%.02f", countValue);
SpannableStringBuilder sBuilder = new SpannableStringBuilder();
sBuilder.append(String.format(getString(R.string.cos_supermarket_history), badgeValue, String.valueOf(mExpiredMarketCoupons.size())));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
Typeface typefaceBoldFour = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan = new CustomTypefaceSpan(typefaceBoldFour);
Typeface typefaceBoldFive = ResourcesCompat.getFont(this, R.font.peridot_bold);
CustomTypefaceSpan typefaceBoldSpan2 = new CustomTypefaceSpan(typefaceBoldFive);
sBuilder.setSpan(typefaceBoldSpan, 26, 26 + badgeValue.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceBoldSpan2, 26 + badgeValue.length() + 1 + 18, 26 + badgeValue.length() + 1 + 18 + String.valueOf(mExpiredMarketCoupons.size()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvCouponsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
......@@ -32,7 +31,6 @@ import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.ActiveDFYCouponEventModel;
import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
......@@ -618,10 +616,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// @Override
// protected void attachBaseContext(Context newBase) {
// super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
// }
// ===========================================================
// Methods
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
......@@ -20,13 +19,11 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.json.JSONObject;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.CampaignList;
......@@ -116,6 +113,8 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
mTvContextualSection = findViewById(R.id.tv_contextual_section);
mLlContextualItems = findViewById(R.id.ll_contextual_items);
mContextualItems = findViewById(R.id.rv_contextual_items);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mTvTitle, mTvResearchSection,
mTvExclusiveSection, mTvContestSection, mTvContextualSection);
/** New Implementation */
/** New Implementation */
......@@ -194,11 +193,6 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == 1003) {
OneTimeWorkRequest mywork = new OneTimeWorkRequest.Builder(EventCampaignService.class).build();
......
......@@ -20,11 +20,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Campaign;
......@@ -33,7 +30,7 @@ import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
import ly.warp.sdk.io.models.LoyaltySDKFirebaseEventModel;
import ly.warp.sdk.io.models.WarplyCCMSEnabledModel;
import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest;
import ly.warp.sdk.io.request.WarplyConsumerRequest;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
import ly.warp.sdk.utils.managers.WarplyEventBusManager;
......@@ -54,7 +51,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
private ImageView mIvBack, mIvCampaignPhoto;
private TextView mTvCampaignTitle, mTvTelcoGiftValue, mTvTelcoGiftType, mTvTelcoHeaderTitle,
mTvTelcoGiftDuration, mTvSeeMoreValue;
mTvTelcoGiftDuration, mTvSeeMoreValue, mFontButtonGetIt, mFontButtonSeeMore;
private LoyaltyContextualOfferModel mCCMS = new LoyaltyContextualOfferModel();
private Campaign mLoyalty = new Campaign();
private LinearLayout mLlActivateOffer;
......@@ -93,6 +90,13 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
mTvTelcoGiftDuration = findViewById(R.id.tv_telco_gift_duration);
mLlSeeMore = findViewById(R.id.ll_see_more);
mTvSeeMoreValue = findViewById(R.id.tv_see_more_value);
mFontButtonGetIt = findViewById(R.id.button_get_it);
mFontButtonSeeMore = findViewById(R.id.tv_see_more);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mTvTelcoHeaderTitle);
WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mTvTelcoGiftValue, mFontButtonGetIt);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvTelcoGiftType, mTvTelcoGiftDuration,
mTvCampaignTitle, mTvSeeMoreValue);
WarpUtils.renderCustomFont(this, R.font.peridot_bold, mFontButtonSeeMore);
initViews();
}
......@@ -136,11 +140,6 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
}
// ===========================================================
// Methods
// ===========================================================
......@@ -176,46 +175,19 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
bottomSheetDialog.setContentView(R.layout.dl_share);
TextView tvHeader = bottomSheetDialog.findViewById(R.id.tv_sender_value);
WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, tvHeader);
tvHeader.setText(R.string.cos_coupon_share_telco);
LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close);
dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
// if (mConsumer != null) {
// try {
// JSONObject profMeta = new JSONObject(mConsumer.getProfileMetadata());
// if (profMeta != null) {
// JSONArray msisdnList = new JSONArray();
// msisdnList = profMeta.optJSONArray(MSISDN_LIST);
// if (msisdnList != null && msisdnList.length() > 0) {
// for (int i = 0; i < msisdnList.length(); i++) {
// LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
// LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
// TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
// textView.setText(msisdnList.optString(i));
// textView.setOnClickListener(view -> {
// TextView tv = (TextView) view;
// mSender = tv.getText().toString();
// bottomSheetDialog.dismiss();
// askActivateDialog();
// });
// parent.addView(v, 0, new ViewGroup.LayoutParams(
// ViewGroup.LayoutParams.MATCH_PARENT,
// ViewGroup.LayoutParams.WRAP_CONTENT));
// }
// }
// }
// } catch (JSONException e) {
// e.printStackTrace();
// }
// }
if (mCCMS.getEligibleAssets() != null && mCCMS.getEligibleAssets().size() > 0) {
for (int i = 0; i < mCCMS.getEligibleAssets().size(); i++) {
LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
WarpUtils.renderCustomFont(this, R.font.peridot_regular, textView);
textView.setText(mCCMS.getEligibleAssets().get(i));
textView.setOnClickListener(view -> {
TextView tv = (TextView) view;
......
......@@ -2,7 +2,6 @@ package ly.warp.sdk.fragments;
import static android.app.Activity.RESULT_OK;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
......@@ -11,7 +10,6 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.HorizontalScrollView;
import android.widget.ImageView;
import android.widget.LinearLayout;
......@@ -29,7 +27,6 @@ import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import ly.warp.sdk.R;
import ly.warp.sdk.activities.ActiveCouponsActivity;
......@@ -64,7 +61,10 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
private TextView mTvUserBadge, mTvUserBadgeCentered, mTvBoxCountBadge,
mTvDealsCountBadge, mTvUnifiedCountBadge, mTvGiftsCountBadge,
mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle, mTvVouchersSubtitle;
mTvVouchersDisabledTitle, mTvVouchersDisabledSubtitle, mTvVouchersTitle,
mTvVouchersSubtitle, mFontHeader, mFontEmptyText, mFontQuestionnaire,
mFontQuestionnaireCentered, mFontCountDisabled, mFontDealsCountBadge,
mFontUnifiedCountBadge, mFontGiftsCountBadge, mFontBoxCountBadge;
private ConstraintLayout mLlQuestionnaireCentered,
mLlQuestionnaire, mLlUserBadge, mLlUserBadgeCentered;
private LinearLayout mLlEmptyWallet, mLlTilesParent,
......@@ -136,6 +136,21 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
mFirstEnd = view.findViewById(R.id.v_first_end);
mSecondStart = view.findViewById(R.id.v_second_start);
mSecondEnd = view.findViewById(R.id.v_second_end);
mFontHeader = view.findViewById(R.id.tv_coupons_header);
mFontEmptyText = view.findViewById(R.id.empty_text);
mFontQuestionnaire = view.findViewById(R.id.tv_questionnaire);
mFontQuestionnaireCentered = view.findViewById(R.id.tv_questionnaire_centered);
mFontCountDisabled = view.findViewById(R.id.tv_vouchers_count_disabled);
if (getContext() != null) {
WarpUtils.renderCustomFont(getContext(), R.font.bt_cosmo_bold, mFontHeader, mTvVouchersTitle,
mTvVouchersDisabledTitle);
WarpUtils.renderCustomFont(getContext(), R.font.peridot_regular, mFontEmptyText,
mTvVouchersSubtitle, mTvVouchersDisabledSubtitle);
WarpUtils.renderCustomFont(getContext(), R.font.peridot_bold, mTvUserBadge,
mTvUserBadgeCentered, mFontQuestionnaire, mFontQuestionnaireCentered);
WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mFontCountDisabled);
}
defineAndSortTiles();
createTiles();
......@@ -571,7 +586,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
EventBus.getDefault().post(new WarplyEventBusManager(activeCouponEventModel));
}
});
mFontDealsCountBadge = (TextView) view.findViewById(R.id.tv_deals_count_title);
mTvDealsCountBadge = (TextView) view.findViewById(R.id.tv_deals_count);
if (getContext() != null) {
WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvDealsCountBadge, mFontDealsCountBadge);
}
mLlTilesParent.addView(view);
}
/** Unified Coupons List */
......@@ -593,7 +612,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
startActivity(intent);
}
});
mFontUnifiedCountBadge = (TextView) view.findViewById(R.id.tv_sm_count_title);
mTvUnifiedCountBadge = (TextView) view.findViewById(R.id.tv_sm_count);
if (getContext() != null) {
WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvUnifiedCountBadge, mFontUnifiedCountBadge);
}
mLlTilesParent.addView(view);
}
/** Coupon List */
......@@ -615,7 +638,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
startActivity(intent);
}
});
mFontGiftsCountBadge = (TextView) view.findViewById(R.id.tv_gifts_count_title);
mTvGiftsCountBadge = (TextView) view.findViewById(R.id.tv_gifts_count);
if (getContext() != null) {
WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvGiftsCountBadge, mFontGiftsCountBadge);
}
mLlTilesParent.addView(view);
}
/** Box Badge */
......@@ -638,7 +665,11 @@ public class MyRewardsFragment extends Fragment implements View.OnClickListener
EventBus.getDefault().post(new WarplyEventBusManager(activeBoxEventModel));
}
});
mFontBoxCountBadge = (TextView) view.findViewById(R.id.tv_box_count_title);
mTvBoxCountBadge = (TextView) view.findViewById(R.id.tv_box_count);
if (getContext() != null) {
WarpUtils.renderCustomFont(getContext(), R.font.peridot_semi_bold, mTvBoxCountBadge, mFontBoxCountBadge);
}
mLlTilesParent.addView(view);
}
}
......
package ly.warp.sdk.io.models;
import android.graphics.Paint;
import android.graphics.Typeface;
import android.text.TextPaint;
import android.text.style.MetricAffectingSpan;
public class CustomTypefaceSpan extends MetricAffectingSpan {
private final Typeface typeface;
public CustomTypefaceSpan(Typeface typeface) {
this.typeface = typeface;
}
@Override
public void updateMeasureState(TextPaint p) {
applyCustomTypeFace(p, typeface);
}
@Override
public void updateDrawState(TextPaint tp) {
applyCustomTypeFace(tp, typeface);
}
private static void applyCustomTypeFace(Paint paint, Typeface tf) {
int oldStyle;
Typeface old = paint.getTypeface();
if (old == null) {
oldStyle = 0;
} else {
oldStyle = old.getStyle();
}
int fake = oldStyle & ~tf.getStyle();
if ((fake & Typeface.BOLD) != 0) {
paint.setFakeBoldText(true);
}
if ((fake & Typeface.ITALIC) != 0) {
paint.setTextSkewX(-0.25f);
}
paint.setTypeface(tf);
}
}
......@@ -24,6 +24,7 @@ import io.reactivex.subjects.PublishSubject;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.CouponList;
import ly.warp.sdk.utils.WarpUtils;
public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdapter.ExpiredCouponViewHolder> {
......@@ -49,7 +50,7 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap
}
public class ExpiredCouponViewHolder extends RecyclerView.ViewHolder {
private TextView tvCouponTitle, tvCouponValue, tvCouponDate;
private TextView tvCouponTitle, tvCouponValue, tvCouponDate, tvCouponSubtitle;
private ImageView ivCouponLogo;
public ExpiredCouponViewHolder(View view) {
......@@ -58,6 +59,10 @@ public class ExpiredCouponAdapter extends RecyclerView.Adapter<ExpiredCouponAdap
tvCouponValue = view.findViewById(R.id.tv_expired_coupons_value);
tvCouponDate = view.findViewById(R.id.tv_expired_coupons_date);
ivCouponLogo = view.findViewById(R.id.iv_expired_logo);
tvCouponSubtitle = view.findViewById(R.id.tv_expired_coupons_label);
WarpUtils.renderCustomFont(mContext, R.font.peridot_bold, tvCouponDate, tvCouponValue);
WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCouponTitle, tvCouponSubtitle);
}
}
......
......@@ -21,6 +21,7 @@ import io.reactivex.subjects.PublishSubject;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Coupon;
import ly.warp.sdk.io.models.UnifiedCoupon;
import ly.warp.sdk.utils.WarpUtils;
public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapter.ActiveCouponViewHolder> {
......@@ -51,6 +52,9 @@ public class MarketCouponAdapter extends RecyclerView.Adapter<MarketCouponAdapte
tvCouponTitle = view.findViewById(R.id.tv_market_coupons_title);
tvCouponDate = view.findViewById(R.id.tv_market_coupons_date);
tvCouponCount = view.findViewById(R.id.tv_market_coupons_count);
WarpUtils.renderCustomFont(mContext, R.font.bt_cosmo_bold, tvCouponTitle);
WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCouponDate, tvCouponCount);
}
}
......
package ly.warp.sdk.views.adapters;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
......@@ -18,7 +17,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import org.json.JSONObject;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.concurrent.TimeUnit;
......@@ -26,14 +24,11 @@ import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
import ly.warp.sdk.R;
import ly.warp.sdk.activities.GiftsForYouActivity;
import ly.warp.sdk.activities.TelcoActivity;
import ly.warp.sdk.activities.WarpViewActivity;
import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
import ly.warp.sdk.io.models.MergedGifts;
import ly.warp.sdk.utils.WarpJSONParser;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
public class MergedGiftsAdapter extends RecyclerView.Adapter<MergedGiftsAdapter.MergedGiftsViewHolder> {
......@@ -56,6 +51,8 @@ public class MergedGiftsAdapter extends RecyclerView.Adapter<MergedGiftsAdapter.
ivMergedGiftsLogo = view.findViewById(R.id.iv_campaign_logo);
tvMergedGiftsTitle = view.findViewById(R.id.tv_campaign_title);
ivIsNew = view.findViewById(R.id.iv_campaign_new);
WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvMergedGiftsTitle);
}
}
......
......@@ -25,6 +25,7 @@ import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
import ly.warp.sdk.utils.WarpJSONParser;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapter.MoreCampaignViewHolder> {
......@@ -50,6 +51,10 @@ public class MoreCampaignAdapter extends RecyclerView.Adapter<MoreCampaignAdapte
ivIsNew = view.findViewById(R.id.iv_campaign_new);
tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle);
tvCampaignMessage = view.findViewById(R.id.tv_campaign_message);
WarpUtils.renderCustomFont(mContext, R.font.bt_cosmo_bold, tvCampaignTitle);
WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCampaignSubtitle);
WarpUtils.renderCustomFont(mContext, R.font.peridot_semi_bold, tvCampaignMessage);
}
}
......
......@@ -20,8 +20,8 @@ import java.util.ArrayList;
import io.reactivex.Observable;
import io.reactivex.subjects.PublishSubject;
import ly.warp.sdk.R;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
import ly.warp.sdk.utils.WarpUtils;
public class MoreContextualAdapter extends RecyclerView.Adapter<MoreContextualAdapter.MoreContextualViewHolder> {
......@@ -46,6 +46,10 @@ public class MoreContextualAdapter extends RecyclerView.Adapter<MoreContextualAd
ivIsNew = view.findViewById(R.id.iv_campaign_new);
tvCampaignSubtitle = view.findViewById(R.id.tv_campaign_subtitle);
tvCampaignMessage = view.findViewById(R.id.tv_campaign_message);
WarpUtils.renderCustomFont(mContext, R.font.bt_cosmo_bold, tvCampaignTitle);
WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCampaignSubtitle);
WarpUtils.renderCustomFont(mContext, R.font.peridot_semi_bold, tvCampaignMessage);
}
}
......
......@@ -29,6 +29,7 @@ import ly.warp.sdk.io.models.Merchant;
import ly.warp.sdk.io.models.SharingCoupon;
import ly.warp.sdk.io.models.SharingList;
import ly.warp.sdk.utils.WarpJSONParser;
import ly.warp.sdk.utils.WarpUtils;
import ly.warp.sdk.utils.WarplyManagerHelper;
public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapter.SharedCouponViewHolder> {
......@@ -59,6 +60,10 @@ public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapte
tvCouponLabel = view.findViewById(R.id.tv_shared_coupons_label);
tvCouponPhone = view.findViewById(R.id.tv_shared_coupons_phone);
ivCouponLogo = view.findViewById(R.id.iv_shared_logo);
WarpUtils.renderCustomFont(mContext, R.font.peridot_bold, tvCouponDate, tvCouponValue);
WarpUtils.renderCustomFont(mContext, R.font.peridot_regular, tvCouponTitle, tvCouponLabel,
tvCouponPhone);
}
}
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/cl_bill_payment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bill_header"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@android:color/white">
<ImageView
android:id="@+id/iv_list_close"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:scaleType="centerInside"
android:src="@drawable/ic_back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/grey"
android:textSize="17sp"
android:textStyle="bold"
android:text="@string/cos_active_gifts_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_cos_loyalty"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_merged_active_gifts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingTop="44dp" />
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_gifts_title2"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_gifts"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_gifts_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_recycler_inner"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_rewards_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_rewards_title"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_rewards"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_rewards_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_recycler_inner2"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_coupons_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_coupons_title"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_coupons"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="24dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_coupons_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
......@@ -26,7 +26,6 @@
<TextView
android:id="@+id/textView3"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -58,7 +57,6 @@
<TextView
android:id="@+id/tv_no_unified_coupons"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
......
......@@ -16,14 +16,14 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_back"
android:scaleType="centerInside"
android:src="@drawable/ic_back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -37,16 +37,16 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:fillViewport="true"
android:scrollbars="none"
android:layout_below="@+id/cl_loyalty_wallet_header">
android:scrollbars="none">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
......@@ -66,7 +66,6 @@
tools:src="@drawable/carousel_banner" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView13"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -83,7 +82,6 @@
tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
<TextView
fontPath="fonts/PeridotPE-Regular.ttf"
android:id="@+id/textView14"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -92,10 +90,10 @@
android:paddingHorizontal="32dp"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
tools:text="test test"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13" />
app:layout_constraintTop_toBottomOf="@+id/textView13"
tools:text="test test" />
<LinearLayout
android:id="@+id/ll_activate_button"
......@@ -105,12 +103,12 @@
android:background="@drawable/selector_button_green"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/textView14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView14">
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/tv_activate_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -126,9 +124,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:gravity="center"
app:layout_constraintTop_toBottomOf="@+id/ll_activate_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
app:layout_constraintTop_toBottomOf="@+id/ll_activate_button">
<LinearLayout
android:id="@+id/ll_terms_inner"
......@@ -140,7 +138,6 @@
<TextView
android:id="@+id/tv_terms"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_terms_title"
......@@ -151,14 +148,13 @@
android:id="@+id/iv_terms_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="3dp"
android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
android:src="@drawable/ic_down_dark_new" />
</LinearLayout>
<TextView
android:id="@+id/tv_terms_value"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_terms_inner"
......
......@@ -23,7 +23,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_info_title"
......@@ -63,7 +63,6 @@
<TextView
android:id="@+id/textView13"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
......@@ -75,7 +74,6 @@
<TextView
android:id="@+id/textView14"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
......@@ -87,7 +85,6 @@
<TextView
android:id="@+id/tv_clickable_link"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
......@@ -99,7 +96,6 @@
<TextView
android:id="@+id/textView15"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -110,7 +106,6 @@
<TextView
android:id="@+id/textView16"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="32dp"
......@@ -158,7 +153,6 @@
<TextView
android:id="@+id/tv_full_barcode"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
......@@ -187,7 +181,6 @@
<TextView
android:id="@+id/tv_barcode"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_show_barcode"
......@@ -206,7 +199,6 @@
<TextView
android:id="@+id/textView17"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -228,7 +220,7 @@
android:paddingVertical="8dp">
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/button_gift_it"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -253,7 +245,7 @@
tools:visibility="visible">
<TextView
fontPath="fonts/PeridotPE-Bold.ttf"
android:id="@+id/button_shops"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -278,7 +270,7 @@
tools:visibility="visible">
<TextView
fontPath="fonts/PeridotPE-Bold.ttf"
android:id="@+id/button_site"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -306,7 +298,6 @@
<TextView
android:id="@+id/tv_terms"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_terms_title"
......@@ -324,7 +315,6 @@
<TextView
android:id="@+id/tv_terms_value"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_terms_inner"
......
......@@ -16,19 +16,19 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_back"
android:scaleType="centerInside"
android:src="@drawable/ic_back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_gift"
android:textColor="@color/cos_light_black"
android:textSize="19sp"
fontPath="fonts/BTCosmo-Bold.ttf"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -38,15 +38,15 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="none"
android:layout_below="@+id/cl_loyalty_wallet_header">
android:layout_below="@+id/cl_loyalty_wallet_header"
android:scrollbars="none">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<!-- android:background="@drawable/shape_cos_loyalty_white"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_info_view_inner"
android:layout_width="match_parent"
......@@ -74,7 +74,6 @@
android:paddingHorizontal="32dp"
android:textColor="@color/cos_light_black"
android:textSize="18sp"
fontPath="fonts/BTCosmo-Bold.ttf"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView6"
......@@ -90,7 +89,6 @@
android:text="@string/cos_coupon_share_gift_title"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
fontPath="fonts/PeridotPE-Regular.ttf"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13" />
......@@ -112,7 +110,6 @@
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:text="@string/cos_coupon_share_sender"
fontPath="fonts/PeridotPE-Regular.ttf"
android:textColor="@color/cos_gray2"
android:textSize="16sp" />
......@@ -147,7 +144,6 @@
<EditText
android:id="@+id/et_phone"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
......@@ -184,13 +180,13 @@
app:layout_constraintTop_toBottomOf="@+id/v_separator2">
<TextView
android:id="@+id/button_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/cos_coupon_share_button"
android:textColor="@color/white"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:textSize="16sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
......
......@@ -23,7 +23,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_info_title"
......@@ -40,8 +40,8 @@
android:layout_height="match_parent"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:background="@color/white"
android:scrollbars="none"
android:fillViewport="true">
android:fillViewport="true"
android:scrollbars="none">
<LinearLayout
android:id="@+id/cl_loyalty_info_view_inner"
......@@ -61,7 +61,6 @@
<TextView
android:id="@+id/textView13"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
......@@ -73,7 +72,6 @@
<TextView
android:id="@+id/textView14"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
......@@ -87,14 +85,14 @@
android:id="@+id/ll_get_gift"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="27dp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="27dp"
android:background="@drawable/selector_button_green"
android:gravity="center"
android:orientation="horizontal">
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/button_get_it"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -121,7 +119,6 @@
<TextView
android:id="@+id/tv_terms"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_terms_title"
......@@ -132,14 +129,13 @@
android:id="@+id/iv_terms_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="3dp"
android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
android:src="@drawable/ic_down_dark_new" />
</LinearLayout>
<TextView
android:id="@+id/tv_terms_value"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_terms_inner"
......
......@@ -30,10 +30,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cos_free_coupons"
android:textColor="@color/cos_light_black"
android:textSize="19sp"
fontPath="fonts/BTCosmo-Bold.ttf"
android:text="@string/cos_free_coupons"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -97,119 +96,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:scrollbars="none"
android:orientation="vertical"
android:overScrollMode="never"
android:paddingVertical="24dp" />
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_gifts_title2"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_gifts"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_gifts_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_recycler_inner"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_rewards_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_rewards_title"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_rewards"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="10dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_rewards_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:id="@+id/cl_recycler_inner3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/cl_recycler_inner2"-->
<!-- android:layout_marginTop="36dp"-->
<!-- android:paddingBottom="4dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_coupons_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="10dp"-->
<!-- android:text="@string/cos_coupons_title"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="18sp"-->
<!-- android:textStyle="bold"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_coupons"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="24dp"-->
<!-- android:clipToPadding="false"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingEnd="24dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_coupons_title" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
android:paddingVertical="24dp"
android:scrollbars="none" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......
......@@ -25,7 +25,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis"
......@@ -101,7 +101,6 @@
<TextView
android:id="@+id/tv_expired_coupons_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
......@@ -135,7 +134,6 @@
<TextView
android:id="@+id/tv_expired_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
......@@ -169,7 +167,6 @@
<TextView
android:id="@+id/tv_expired_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
......@@ -190,7 +187,6 @@
<TextView
android:id="@+id/tv_expired_empty"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/cv_expired_coupons_title"
......@@ -224,7 +220,6 @@
<TextView
android:id="@+id/tv_shared_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
......@@ -258,7 +253,6 @@
<TextView
android:id="@+id/tv_shared_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
......@@ -277,7 +271,6 @@
<TextView
android:id="@+id/tv_shared_empty"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_shared_title"
......
......@@ -25,7 +25,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_loyalty_history"
......@@ -72,7 +72,6 @@
<TextView
android:id="@+id/tv_exp_value"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......@@ -86,7 +85,6 @@
<TextView
android:id="@+id/tv_exp_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
......@@ -140,7 +138,6 @@
<TextView
android:id="@+id/tv_deals_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -173,7 +170,6 @@
<TextView
android:id="@+id/tv_deals_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -221,7 +217,6 @@
<TextView
android:id="@+id/tv_market_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -254,7 +249,6 @@
<TextView
android:id="@+id/tv_market_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -302,7 +296,6 @@
<TextView
android:id="@+id/tv_gifts_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -335,7 +328,6 @@
<TextView
android:id="@+id/tv_gifts_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -354,9 +346,9 @@
android:id="@+id/rl_fourth_banner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_below="@+id/rl_third_banner"
android:layout_marginHorizontal="16dp"
android:layout_below="@+id/rl_third_banner">
android:layout_marginTop="16dp">
<RelativeLayout
android:layout_width="wrap_content"
......@@ -383,7 +375,6 @@
<TextView
android:id="@+id/tv_box_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -416,7 +407,6 @@
<TextView
android:id="@+id/tv_box_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......
......@@ -25,7 +25,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis"
......@@ -101,7 +101,6 @@
<TextView
android:id="@+id/tv_expired_coupons_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
......@@ -135,7 +134,6 @@
<TextView
android:id="@+id/tv_expired_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
......@@ -170,7 +168,6 @@
<TextView
android:id="@+id/tv_expired_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
......@@ -191,7 +188,6 @@
<TextView
android:id="@+id/tv_expired_empty"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/cv_expired_coupons_title"
......@@ -225,7 +221,6 @@
<TextView
android:id="@+id/tv_shared_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis2"
......@@ -259,7 +254,6 @@
<TextView
android:id="@+id/tv_shared_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
......@@ -278,7 +272,6 @@
<TextView
android:id="@+id/tv_shared_empty"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_shared_title"
......
......@@ -23,7 +23,6 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_profile_title"
......@@ -59,8 +58,8 @@
android:id="@+id/ll_first_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="24dp"
android:paddingHorizontal="16dp">
android:paddingHorizontal="16dp"
android:paddingVertical="24dp">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/iv_profile_photo"
......@@ -87,7 +86,6 @@
<TextView
android:id="@+id/tv_profile_name"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
......@@ -113,7 +111,6 @@
<TextView
android:id="@+id/tv_type"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
......@@ -140,7 +137,6 @@
<TextView
android:id="@+id/tv_questionnaire"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -191,7 +187,6 @@
<TextView
android:id="@+id/tv_coupons_header"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -251,7 +246,6 @@
<TextView
android:id="@+id/tv_deals_count_title"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -282,7 +276,6 @@
<TextView
android:id="@+id/tv_deals_count"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......@@ -340,7 +333,6 @@
<TextView
android:id="@+id/tv_sm_count_title"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -371,7 +363,6 @@
<TextView
android:id="@+id/tv_sm_count"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......@@ -428,7 +419,6 @@
<TextView
android:id="@+id/tv_gifts_count_title"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -459,7 +449,6 @@
<TextView
android:id="@+id/tv_gifts_count"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......@@ -507,7 +496,6 @@
android:background="@color/cos_gray" />
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/tv_vouchers_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -545,7 +533,6 @@
<TextView
android:id="@+id/tv_vouchers_info_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -591,7 +578,6 @@
android:background="@color/cos_gray" />
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/tv_vouchers_title_disabled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -629,7 +615,6 @@
<TextView
android:id="@+id/tv_vouchers_info_title_disabled"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -668,7 +653,6 @@
<TextView
android:id="@+id/tv_vouchers_count_disabled"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......@@ -698,7 +682,6 @@
android:src="@drawable/ic_empty_wallet" />
<TextView
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
......@@ -745,7 +728,6 @@
<TextView
android:id="@+id/tv_exp_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -758,7 +740,6 @@
<TextView
android:id="@+id/tv_exp_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -830,7 +811,6 @@
<TextView
android:id="@+id/tv_deals_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -845,7 +825,6 @@
<TextView
android:id="@+id/tv_deals_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -894,7 +873,6 @@
<TextView
android:id="@+id/tv_gifts_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -909,7 +887,6 @@
<TextView
android:id="@+id/tv_gifts_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -959,7 +936,6 @@
<TextView
android:id="@+id/tv_market_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -974,7 +950,6 @@
<TextView
android:id="@+id/tv_market_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -1000,7 +975,6 @@
<TextView
android:id="@+id/tv_market_header"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
......@@ -1066,7 +1040,6 @@
<TextView
android:id="@+id/tv_active_gifts"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -1075,7 +1048,6 @@
<TextView
android:id="@+id/tv_active_deals_text"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
......@@ -1104,7 +1076,6 @@
<TextView
android:id="@+id/tv_active_deals_date_text"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -1137,7 +1108,6 @@
<TextView
android:id="@+id/tv_active_coupons_header"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
......
......@@ -27,7 +27,6 @@
<TextView
android:id="@+id/textView3"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -127,7 +126,6 @@
<TextView
android:id="@+id/tv_research_section"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
......@@ -158,7 +156,6 @@
<TextView
android:id="@+id/tv_exclusive_section"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
......@@ -189,7 +186,6 @@
<TextView
android:id="@+id/tv_contest_section"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
......@@ -220,7 +216,6 @@
<TextView
android:id="@+id/tv_contextual_section"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
......
......@@ -24,7 +24,6 @@
<TextView
android:id="@+id/tv_telco_header_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -80,7 +79,6 @@
<TextView
android:id="@+id/tv_telco_gift_value"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/shape_round_border_gradient"
......@@ -91,7 +89,6 @@
<TextView
android:id="@+id/tv_telco_gift_type"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......@@ -119,7 +116,6 @@
<TextView
android:id="@+id/tv_telco_gift_duration"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_round_border_gradient2"
......@@ -137,7 +133,6 @@
<TextView
android:id="@+id/textView13"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_telco_duration_view"
......@@ -160,7 +155,7 @@
android:orientation="horizontal">
<TextView
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:id="@+id/button_get_it"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -189,7 +184,6 @@
<TextView
android:id="@+id/tv_see_more"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more2"
......@@ -207,7 +201,6 @@
<TextView
android:id="@+id/tv_see_more_value"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_see_more"
......
......@@ -15,7 +15,6 @@
<TextView
android:id="@+id/tv_sender_value"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
......
......@@ -7,7 +7,6 @@
<TextView
android:id="@+id/tv_expired_coupons_date"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -42,7 +41,6 @@
<TextView
android:id="@+id/tv_expired_coupons_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
......@@ -53,7 +51,6 @@
<TextView
android:id="@+id/tv_expired_coupons_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
......@@ -65,7 +62,6 @@
<TextView
android:id="@+id/tv_expired_coupons_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_expired_info_view"
......
......@@ -28,7 +28,6 @@
<TextView
android:id="@+id/tv_coupons_header"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -67,341 +66,341 @@
android:paddingHorizontal="14dp"
android:showDividers="middle">
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_deals_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_deals_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_deals_logo_count"-->
<!-- android:layout_width="52dp"-->
<!-- android:layout_height="32dp"-->
<!-- android:src="@drawable/sv_deals_logo_redesign"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_deals_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_deals_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_deals_tile"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_deals_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_sm_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_sm_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_sm_logo_count"-->
<!-- android:layout_width="32dp"-->
<!-- android:layout_height="32dp"-->
<!-- android:src="@drawable/sv_unified_redesign"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_sm_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_sm_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_market_title"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_sm_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_gifts_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_gifts_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_gifts_logo_count"-->
<!-- android:layout_width="34dp"-->
<!-- android:layout_height="34dp"-->
<!-- android:src="@drawable/sv_gifts_redesign"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_gifts_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_free_coupons_tile"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_box_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_box_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_box_logo_count"-->
<!-- android:layout_width="34dp"-->
<!-- android:layout_height="34dp"-->
<!-- android:src="@drawable/sv_box_logo"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_box_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_box_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_box_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_box_tile"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_box_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_box_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_deals_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_deals_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_deals_logo_count"-->
<!-- android:layout_width="52dp"-->
<!-- android:layout_height="32dp"-->
<!-- android:src="@drawable/sv_deals_logo_redesign"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_deals_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_deals_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_deals_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_deals_tile"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_deals_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_deals_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_sm_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_sm_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_sm_logo_count"-->
<!-- android:layout_width="32dp"-->
<!-- android:layout_height="32dp"-->
<!-- android:src="@drawable/sv_unified_redesign"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_sm_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_sm_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_sm_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_market_title"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_sm_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_sm_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_gifts_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_gifts_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_gifts_logo_count"-->
<!-- android:layout_width="34dp"-->
<!-- android:layout_height="34dp"-->
<!-- android:src="@drawable/sv_gifts_redesign"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_gifts_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_gifts_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_free_coupons_tile"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_gifts_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_gifts_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/rv_box_count"-->
<!-- android:layout_width="104dp"-->
<!-- android:layout_height="104dp">-->
<!-- <androidx.cardview.widget.CardView-->
<!-- android:id="@+id/cv_box_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginHorizontal="2dp"-->
<!-- android:layout_marginVertical="4dp"-->
<!-- app:cardCornerRadius="16dp"-->
<!-- app:cardElevation="2dp">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@color/white">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_box_logo_count"-->
<!-- android:layout_width="34dp"-->
<!-- android:layout_height="34dp"-->
<!-- android:src="@drawable/sv_box_logo"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/v_separator_box_count"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <View-->
<!-- android:id="@+id/v_separator_box_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:background="@color/cos_grey2"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_box_count_title"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="@string/cos_box_tile"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="10sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/v_separator_box_count" />-->
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
<!-- <LinearLayout-->
<!-- android:layout_width="16dp"-->
<!-- android:layout_height="16dp"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="4dp"-->
<!-- android:layout_marginEnd="1dp"-->
<!-- android:background="@drawable/shape_cos_counter_orange"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical"-->
<!-- android:translationZ="2dp"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_box_count"-->
<!-- fontPath="fonts/PeridotPE-SemiBold.ttf"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="16dp"-->
<!-- android:includeFontPadding="false"-->
<!-- android:maxLines="1"-->
<!-- android:textColor="@color/cos_light_black"-->
<!-- android:textSize="12sp"-->
<!-- tools:text="6" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
</LinearLayout>
</HorizontalScrollView>
......@@ -409,39 +408,39 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"
android:gravity="center">
android:gravity="center"
android:orientation="horizontal">
<View
android:id="@+id/v_first_start"
android:layout_width="12dp"
android:layout_height="12dp"
android:background="@drawable/shape_indicator"/>
android:background="@drawable/shape_indicator" />
<View
android:id="@+id/v_first_end"
android:layout_width="8dp"
android:layout_height="8dp"
android:visibility="gone"
android:background="@drawable/shape_indicator"/>
android:background="@drawable/shape_indicator"
android:visibility="gone" />
<View
android:layout_width="6dp"
android:layout_height="12dp"
android:background="@drawable/divider_vertical"/>
android:background="@drawable/divider_vertical" />
<View
android:id="@+id/v_second_start"
android:layout_width="12dp"
android:layout_height="12dp"
android:visibility="gone"
android:background="@drawable/shape_indicator"/>
android:background="@drawable/shape_indicator"
android:visibility="gone" />
<View
android:id="@+id/v_second_end"
android:layout_width="8dp"
android:layout_height="8dp"
android:background="@drawable/shape_indicator"/>
android:background="@drawable/shape_indicator" />
</LinearLayout>
<LinearLayout
......@@ -462,7 +461,7 @@
android:src="@drawable/ic_empty_wallet" />
<TextView
fontPath="fonts/PeridotPE-Regular.ttf"
android:id="@+id/empty_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
......@@ -488,7 +487,6 @@
<TextView
android:id="@+id/tv_type"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -517,7 +515,6 @@
<TextView
android:id="@+id/tv_type_centered"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -555,7 +552,6 @@
<TextView
android:id="@+id/tv_questionnaire"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......@@ -594,7 +590,6 @@
<TextView
android:id="@+id/tv_questionnaire_centered"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......@@ -682,7 +677,6 @@
<TextView
android:id="@+id/tv_vouchers_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -718,7 +712,6 @@
<TextView
android:id="@+id/tv_vouchers_info_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -757,7 +750,6 @@
<TextView
android:id="@+id/tv_vouchers_title_disabled"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
......@@ -793,7 +785,6 @@
<TextView
android:id="@+id/tv_vouchers_info_title_disabled"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -830,7 +821,6 @@
<TextView
android:id="@+id/tv_vouchers_count_disabled"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......
......@@ -38,7 +38,6 @@
<TextView
android:id="@+id/tv_campaign_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
......
......@@ -31,21 +31,21 @@
android:id="@+id/iv_campaign_logo"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerInside"
android:layout_margin="1dp"
app:shapeAppearanceOverlay="@style/ShapeAppearanceMfyImage"
android:scaleType="centerInside"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/gl_vertical_54_percent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/ShapeAppearanceMfyImage"
tools:src="@drawable/ic_cosmote_logo_horizontal_grey" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="1dp"
android:background="@drawable/svg_background_more"
android:orientation="vertical"
android:layout_margin="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/gl_vertical_80_percent"
app:layout_constraintStart_toStartOf="parent"
......@@ -60,7 +60,6 @@
<TextView
android:id="@+id/tv_campaign_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
......@@ -75,7 +74,6 @@
<TextView
android:id="@+id/tv_campaign_subtitle"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
......@@ -90,7 +88,6 @@
<TextView
android:id="@+id/tv_campaign_message"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
......
......@@ -15,7 +15,6 @@
<TextView
android:id="@+id/tv_phone_share"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
......
......@@ -56,7 +56,6 @@
<TextView
android:id="@+id/tv_market_coupons_title"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
......@@ -66,7 +65,6 @@
android:textSize="16sp" />
<TextView
fontPath="fonts/pf_square_sans_pro_bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
......@@ -75,7 +73,6 @@
<TextView
android:id="@+id/tv_market_coupons_date"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -85,7 +82,6 @@
<TextView
android:id="@+id/tv_market_coupons_count"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......
......@@ -7,7 +7,6 @@
<TextView
android:id="@+id/tv_shared_coupons_date"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -42,7 +41,6 @@
<TextView
android:id="@+id/tv_shared_coupons_title"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
......@@ -53,7 +51,6 @@
<TextView
android:id="@+id/tv_shared_coupons_value"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
......@@ -65,7 +62,6 @@
<TextView
android:id="@+id/tv_shared_coupons_label"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......@@ -74,7 +70,6 @@
<TextView
android:id="@+id/tv_shared_coupons_phone"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
......
......@@ -43,7 +43,6 @@
<TextView
android:id="@+id/tv_box_count_title"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -75,7 +74,6 @@
<TextView
android:id="@+id/tv_box_count"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......
......@@ -43,7 +43,6 @@
<TextView
android:id="@+id/tv_gifts_count_title"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -74,7 +73,6 @@
<TextView
android:id="@+id/tv_gifts_count"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......
......@@ -43,7 +43,6 @@
<TextView
android:id="@+id/tv_deals_count_title"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -74,7 +73,6 @@
<TextView
android:id="@+id/tv_deals_count"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......
......@@ -43,7 +43,6 @@
<TextView
android:id="@+id/tv_sm_count_title"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
......@@ -74,7 +73,6 @@
<TextView
android:id="@+id/tv_sm_count"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:includeFontPadding="false"
......