Panagiotis Triantafyllou

redesign part3

......@@ -257,10 +257,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
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() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceRegularSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length() + getString(R.string.cos_wallet_text5).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
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);
sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + 1 + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length() + getString(R.string.cos_wallet_text5).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvCouponsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
......
......@@ -70,7 +70,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
mTvActiveTitle, mTvActiveCouponsHeader;
private ConstraintLayout mClDealsBanner, mClDealsView,
mClGiftsBanner, mClToolbar;
private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet;
private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet, mLlDeals, mLlGifts;
private FlowLayout mLlActiveCodesView;
private float couponDfyValue = 0.0f;
private RecyclerView mRecyclerCoupons;
......@@ -105,6 +105,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
mTvActiveDate = findViewById(R.id.tv_active_deals_date_text);
mIvDealsLogo = findViewById(R.id.dfy_logo);
mClDealsView = findViewById(R.id.cl_mygifts);
mLlDeals = findViewById(R.id.ll_mygifts);
mIvProfilePhoto = findViewById(R.id.iv_profile_photo);
mTvActiveTitle = findViewById(R.id.tv_active_gifts);
mTvActiveCouponsHeader = findViewById(R.id.tv_active_coupons_header);
......@@ -113,6 +114,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
mScActiveCodes = findViewById(R.id.sv_active_deals_codes_view);
mSvLoyaltyWallet = findViewById(R.id.sv_loyalty_wallet);
mClToolbar = findViewById(R.id.cl_loyalty_wallet_header);
mLlGifts = findViewById(R.id.ll_gifts_view);
if (WarplyManagerHelper.getActiveDFYCoupons() != null) {
Collections.sort(WarplyManagerHelper.getActiveDFYCoupons(), new Comparator<ActiveDFYCouponModel>() {
......@@ -307,8 +309,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
.subscribe();
mAdapterCoupons.notifyDataSetChanged();
} else {
mRecyclerCoupons.setVisibility(View.GONE);
mTvActiveCouponsHeader.setVisibility(View.GONE);
mLlGifts.setVisibility(View.GONE);
}
});
}
......@@ -360,8 +361,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
})
.subscribe();
} else {
mRecyclerCoupons.setVisibility(View.GONE);
mTvActiveCouponsHeader.setVisibility(View.GONE);
mLlGifts.setVisibility(View.GONE);
}
if (WarplyManagerHelper.getDealsCouponsSum() > 0) {
......@@ -403,10 +403,10 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
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() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceRegularSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getValue()).length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length() + getString(R.string.cos_wallet_text5).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
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);
sBuilder.setSpan(typefaceBoldSpan2, getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceRegularSpan3, getString(R.string.cos_wallet_text3).length() + 1 + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length(), getString(R.string.cos_wallet_text3).length() + badgeValue.length() + 1 + getString(R.string.cos_wallet_text4).length() + String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()).length() + getString(R.string.cos_wallet_text5).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvGiftsValueAll.setText(sBuilder, TextView.BufferType.SPANNABLE);
} else {
......@@ -470,8 +470,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
}
// mTvActiveCode.setText(codes);
} else {
mIvDealsLogo.setVisibility(View.GONE);
mClDealsView.setVisibility(View.GONE);
mLlDeals.setVisibility(View.GONE);
}
if (WarplyManagerHelper.getConsumer() != null) {
......@@ -500,7 +499,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
}
if (mClDealsBanner.getVisibility() == View.GONE && mClGiftsBanner.getVisibility() == View.GONE
&& mClDealsView.getVisibility() == View.GONE && WarplyManagerHelper.getCouponList().size() == 0) {
&& mLlDeals.getVisibility() == View.GONE && mLlGifts.getVisibility() == View.GONE) {
mLlEmptyWallet.setVisibility(View.VISIBLE);
}
......
......@@ -122,7 +122,7 @@ public class SharedCouponAdapter extends RecyclerView.Adapter<SharedCouponAdapte
JSONObject extraFields = WarpJSONParser.getJSONFromString(couponItem.getTransactionMetadata());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("E, MMM dd yyyy HH:mm:ss", Locale.US);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss", Locale.US);
Date newDate = new Date();
try {
newDate = simpleDateFormat.parse(couponItem.getDate());
......
......@@ -99,7 +99,7 @@
<LinearLayout
android:id="@+id/ll_activate_button"
android:layout_width="160dp"
android:layout_height="42dp"
android:layout_height="55dp"
android:background="@drawable/selector_button_green"
android:gravity="center"
android:orientation="horizontal"
......
......@@ -213,7 +213,7 @@
<LinearLayout
android:id="@+id/ll_gift_it"
android:layout_width="160dp"
android:layout_height="42dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="64dp"
......@@ -236,7 +236,7 @@
<LinearLayout
android:id="@+id/ll_shops"
android:layout_width="220dp"
android:layout_height="42dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="24dp"
......@@ -261,7 +261,7 @@
<LinearLayout
android:id="@+id/ll_website"
android:layout_width="220dp"
android:layout_height="42dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="24dp"
......
......@@ -146,6 +146,7 @@
<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"
......@@ -153,7 +154,6 @@
android:background="@android:color/transparent"
android:hint="@string/cos_coupon_share_hint"
android:inputType="phone"
fontPath="fonts/PeridotPE-Regular.ttf"
android:textColor="@color/cos_gray2"
android:textColorHint="@color/cos_gray2"
android:textSize="16sp" />
......@@ -172,7 +172,7 @@
<LinearLayout
android:id="@+id/ll_share_button"
android:layout_width="190dp"
android:layout_height="42dp"
android:layout_height="55dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="64dp"
android:background="@drawable/selector_button_green"
......
......@@ -85,7 +85,7 @@
<LinearLayout
android:id="@+id/ll_get_gift"
android:layout_width="160dp"
android:layout_height="42dp"
android:layout_height="55dp"
android:layout_marginTop="27dp"
android:background="@drawable/selector_button_green"
android:gravity="center"
......
......@@ -119,6 +119,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_expired_title"
android:layout_marginTop="32dp"
android:scrollbars="none"
android:overScrollMode="never">
<LinearLayout
......@@ -138,20 +139,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal"
android:paddingBottom="56dp"
android:paddingBottom="8dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv_expired_more"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
android:textColor="@color/grey"
android:textColor="@color/cos_light_black"
android:textSize="16sp" />
<ImageView
......@@ -159,7 +159,8 @@
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="6dp"
android:src="@drawable/ic_down_dark" />
android:layout_marginTop="3dp"
android:src="@drawable/ic_down_dark_new" />
</LinearLayout>
</LinearLayout>
</ScrollView>
......@@ -167,14 +168,14 @@
<TextView
android:id="@+id/tv_expired_empty"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_expired_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="56dp"
android:text="@string/cos_empty_expired_coupons"
android:textColor="@color/cos_light_grey2"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
android:visibility="gone" />
</RelativeLayout>
......@@ -183,25 +184,29 @@
android:id="@+id/rl_shared_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_cos_white_border"
android:layout_below="@+id/iv_gift_circle_logo"
android:layout_marginTop="32dp"
android:layout_marginHorizontal="12dp"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_shared_title"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="@string/cos_analysis2"
android:textColor="@color/cos_blue_dark"
android:textSize="16sp" />
android:textColor="@color/cos_light_black"
android:textSize="21sp" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_shared_title"
android:layout_marginTop="24dp"
android:scrollbars="none"
android:overScrollMode="never">
<LinearLayout
......@@ -213,7 +218,6 @@
android:id="@+id/rv_shared_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:orientation="vertical"
android:overScrollMode="never" />
......@@ -222,28 +226,28 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal"
android:paddingBottom="56dp"
android:paddingBottom="8dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv_shared_more"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
android:textColor="@color/grey"
android:textColor="@color/cos_light_black"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_shared_more_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="3dp"
android:layout_marginStart="6dp"
android:src="@drawable/ic_down_dark" />
android:src="@drawable/ic_down_dark_new" />
</LinearLayout>
</LinearLayout>
</ScrollView>
......
......@@ -41,6 +41,7 @@
android:layout_height="match_parent"
android:layout_below="@+id/cl_loyalty_wallet_header"
android:fillViewport="true"
android:scrollbars="none"
android:overScrollMode="never">
<LinearLayout
......@@ -61,12 +62,12 @@
android:id="@+id/iv_profile_photo"
android:layout_width="70dp"
android:layout_height="70dp"
tools:background="@color/cos_cyan3"
android:src="@drawable/ic_default_photo"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/ShapeAppearanceProfileImage" />
app:shapeAppearanceOverlay="@style/ShapeAppearanceProfileImage"
tools:background="@color/cos_cyan3" />
<TextView
android:id="@+id/tv_profile_name"
......@@ -76,7 +77,7 @@
android:layout_marginVertical="6dp"
android:maxLines="1"
android:textColor="@color/cos_light_black"
android:textSize="15sp"
android:textSize="18sp"
tools:text="Test Name" />
<LinearLayout
......@@ -136,21 +137,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="32dp">
android:layout_marginTop="24dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_06_cos"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.09" />
app:layout_constraintGuide_begin="24dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_50_cos"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.56" />
app:layout_constraintGuide_percent="0.64" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win_inner_cos"
......@@ -167,15 +168,15 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.16" />
app:layout_constraintGuide_percent="0.17" />
<TextView
android:id="@+id/tv_deals_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:includeFontPadding="false"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:includeFontPadding="false"
android:text="@string/cos_deals_win_title_cos"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
......@@ -190,10 +191,9 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginVertical="4dp"
android:src="@drawable/ic_deals_polygon"
android:src="@drawable/ic_deals_polygon_new"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/gl_vertical_06_cos"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_06_cos"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
......@@ -201,8 +201,9 @@
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/cos_light_black"
android:textSize="12sp"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo"
app:layout_constraintStart_toStartOf="@+id/iv_deals_logo"
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50_cos"
......@@ -215,21 +216,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="32dp">
android:layout_marginTop="12dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_06"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.09" />
app:layout_constraintGuide_begin="24dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_50"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.56" />
app:layout_constraintGuide_percent="0.64" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_deals_win_inner"
......@@ -246,15 +247,15 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.16" />
app:layout_constraintGuide_percent="0.17" />
<TextView
android:id="@+id/tv_gifts_value_all"
fontPath="fonts/PeridotPE-Regular.ttf"
android:includeFontPadding="false"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:includeFontPadding="false"
android:text="@string/cos_deals_win_title"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
......@@ -269,10 +270,9 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginVertical="4dp"
android:src="@drawable/ic_gifts_polygon"
android:src="@drawable/ic_gifts_polygon_new"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/gl_vertical_06"
app:layout_constraintStart_toStartOf="@+id/gl_vertical_06"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
......@@ -280,8 +280,9 @@
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/cos_light_black"
android:textSize="12sp"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo"
app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo"
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_50"
......@@ -289,13 +290,21 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_mygifts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/dfy_logo"
android:layout_width="220dp"
android:layout_height="30dp"
android:layout_gravity="start"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="48dp"
android:src="@drawable/ic_deals_horizontal" />
<androidx.constraintlayout.widget.ConstraintLayout
......@@ -371,11 +380,19 @@
android:layout_height="86dp"
android:layout_marginVertical="4dp"
android:layout_marginEnd="32dp"
android:src="@drawable/ic_deals_circle"
android:src="@drawable/ic_deals_new"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_gifts_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:orientation="vertical">
<TextView
android:id="@+id/tv_active_coupons_header"
......@@ -384,7 +401,6 @@
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="48dp"
android:layout_marginBottom="10dp"
android:text="@string/cos_gifts_title"
android:textColor="@color/cos_light_black"
......@@ -424,6 +440,7 @@
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</ScrollView>
......
......@@ -150,7 +150,7 @@
<LinearLayout
android:id="@+id/ll_activate_button"
android:layout_width="160dp"
android:layout_height="42dp"
android:layout_height="55dp"
android:layout_below="@+id/textView13"
android:layout_centerHorizontal="true"
android:layout_marginTop="44dp"
......
......@@ -7,10 +7,10 @@
<TextView
android:id="@+id/tv_expired_coupons_date"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_blue_dark2"
android:textColor="@color/cos_light_black"
android:textSize="13sp"
tools:text="05/05/2022" />
......@@ -42,36 +42,36 @@
<TextView
android:id="@+id/tv_expired_coupons_title"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:maxLines="2"
android:textColor="@color/cos_blue_dark2"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="18sp"
tools:text="Box" />
<TextView
android:id="@+id/tv_expired_coupons_value"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:gravity="end"
android:textColor="@color/cos_blue_dark2"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="18sp"
tools:text="4$" />
</LinearLayout>
<TextView
android:id="@+id/tv_expired_coupons_label"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_expired_info_view"
android:text="@string/cos_expired_coupon_label"
android:textColor="@color/cos_light_grey2"
android:textSize="16sp" />
android:textColor="@color/cos_gray"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
......
......@@ -7,10 +7,10 @@
<TextView
android:id="@+id/tv_shared_coupons_date"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_blue_dark2"
android:textColor="@color/cos_light_black"
android:textSize="13sp"
tools:text="05/05/2022" />
......@@ -42,43 +42,43 @@
<TextView
android:id="@+id/tv_shared_coupons_title"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:maxLines="2"
android:textColor="@color/cos_blue_dark2"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="18sp"
tools:text="Box" />
<TextView
android:id="@+id/tv_shared_coupons_value"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:gravity="end"
android:textColor="@color/cos_blue_dark2"
android:textSize="16sp"
android:textColor="@color/cos_light_black"
android:textSize="18sp"
tools:text="4$" />
</LinearLayout>
<TextView
android:id="@+id/tv_shared_coupons_label"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_grey2"
android:textSize="16sp"
android:textColor="@color/cos_gray"
android:textSize="15sp"
tools:text="@string/cos_expired_coupon_label" />
<TextView
android:id="@+id/tv_shared_coupons_phone"
fontPath="fonts/pf_square_sans_pro_regular.ttf"
fontPath="fonts/PeridotPE-Regular.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_grey2"
android:textSize="16sp"
android:textColor="@color/cos_gray"
android:textSize="15sp"
tools:text="@string/cos_expired_coupon_label" />
</LinearLayout>
</LinearLayout>
......