open-source / warply_android_sdk_maven_plugin

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

redesign part2

Expand all
Inline Side-by-side
Showing 30 changed files with 226 additions and 157 deletions
......@@ -31,6 +31,7 @@
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border_gradient2.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border_gradient_grey_bg.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border_grey_transparent.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border_light_blue.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border_transparent.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/button_border_dark_blue.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/button_border_grey.xml" value="0.2705" />
......@@ -79,6 +80,7 @@
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_loyalty_white.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_gradient.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_profile_image.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_sky_blue.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_transparent.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_transparent_rounded.xml" value="0.2705" />
......@@ -88,6 +90,7 @@
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_transparent_upper_circle.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_white.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_white2.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_white_border.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_white_rounded_lower.xml" value="0.2705" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_white_rounded_top.xml" value="0.2965" />
<entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_cos_white_tr.xml" value="0.2705" />
......
......@@ -143,10 +143,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
.concat(":")
.concat("TabExpired"));
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
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);
......@@ -154,8 +154,8 @@ 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_dark_grey));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
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);
......@@ -170,10 +170,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
.concat(":")
.concat("TabShared"));
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView sharedTab = findViewById(R.id.tv_shared_tab);
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
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);
......@@ -181,8 +181,8 @@ 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_dark_grey));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
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);
......@@ -223,10 +223,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
mLlShowMoreExpired.setOnClickListener(this);
mLlShowMoreShared.setOnClickListener(this);
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2);
mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
TextView expiredTab = findViewById(R.id.tv_expired_tab);
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4));
CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
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);
......@@ -234,8 +234,8 @@ 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_dark_grey));
CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
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);
......@@ -251,11 +251,11 @@ 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/pf_square_sans_pro_regular.ttf"));
CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
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"));
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);
......
......@@ -71,7 +71,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
private ConstraintLayout mClDealsBanner, mClDealsView,
mClGiftsBanner, mClToolbar;
private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet;
FlowLayout mLlActiveCodesView;
private FlowLayout mLlActiveCodesView;
private float couponDfyValue = 0.0f;
private RecyclerView mRecyclerCoupons;
private ActiveCouponAdapter mAdapterCoupons;
......@@ -372,8 +372,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
.append(getString(R.string.cos_wallet_text1))
.append(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getDealsCouponsSum())))
.append(getString(R.string.cos_wallet_text2));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text1).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceRegularSpan, getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length(), getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() + getString(R.string.cos_wallet_text2).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sBuilder.setSpan(typefaceBoldSpan, getString(R.string.cos_wallet_text1).length(), getString(R.string.cos_wallet_text1).length() + String.valueOf(WarplyManagerHelper.getDealsCouponsSum()).length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
......@@ -397,11 +397,11 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
.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/pf_square_sans_pro_regular.ttf"));
CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
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"));
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);
......@@ -452,7 +452,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_selectable, null);
TextView textView = (TextView) v.findViewById(R.id.tv_code_copy);
TextView textViewComma = (TextView) v.findViewById(R.id.tv_code_comma);
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
SpannableStringBuilder sBuilder = new SpannableStringBuilder(WarplyManagerHelper.getActiveDFYCoupons().get(i).getCode());
SpannableStringBuilder sBuilderComma = new SpannableStringBuilder(getString(R.string.cos_comma));
sBuilder.setSpan(typefaceBoldSpan, 0, sBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
......
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient
android:angle="180"
android:endColor="@color/cos_light_blue"
android:startColor="@color/cos_light_blue" />
</shape>
</item>
<item android:bottom="2dp">
<shape android:shape="rectangle">
<solid android:color="@color/white" />
</shape>
</item>
</layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="19dp" android:bottomRightRadius="19dp" />
<solid android:color="@color/cos_cyan3" />
<!-- <stroke-->
<!-- android:width="1dp"-->
<!-- android:color="@color/cos_green" />-->
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="16dp" />
<stroke android:width="1dp" android:color="@color/cos_grey2" />
<solid
android:color="@color/white" />
</shape>
\ No newline at end of file
......@@ -4,7 +4,7 @@
<stroke
android:width="1dp"
android:color="@color/grey2"
android:dashWidth="12px"
android:dashGap="12px" />
android:color="@color/cos_gray"
android:dashWidth="32px"
android:dashGap="24px" />
</shape>
\ No newline at end of file
......
......@@ -3,10 +3,10 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_marginVertical="4dp"
android:layout_height="150dp"
android:layout_marginVertical="6dp"
android:layout_marginHorizontal="4dp"
android:background="@drawable/ic_coupon_background_new">
android:background="@drawable/ic_coupon_background_new2">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_vertical_72_percent"
......@@ -30,7 +30,7 @@
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginVertical="16dp"
android:layout_marginStart="8dp"
android:layout_marginStart="16dp"
android:background="@drawable/shape_dashed_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_active_coupon"
......@@ -53,8 +53,8 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#3A5266"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:textColor="@color/cos_light_black"
fontPath="fonts/BTCosmo-Bold.ttf"
android:textSize="16sp"
tools:text="Εκπτωτικο κουπονι 10$ για αγορες στα ΙΚΕΑ" />
......@@ -62,17 +62,17 @@
android:id="@+id/tv_active_coupons_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#3A5266"
android:textColor="@color/cos_light_black"
android:textSize="42sp"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
tools:text="10$" />
<TextView
android:id="@+id/tv_active_coupons_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#617181"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:textColor="@color/cos_gray"
fontPath="fonts/PeridotPE-Regular.ttf"
android:textSize="12sp"
tools:text="@string/cos_active_coupon_date" />
</LinearLayout>
......@@ -83,9 +83,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="32dp"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
fontPath="fonts/PeridotPE-Regular.ttf"
android:maxLines="4"
android:textColor="#617181"
android:textColor="@color/cos_gray"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -4,14 +4,14 @@
android:id="@+id/cl_bill_payment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
android:background="@color/cos_light_grey3"
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">
android:layout_height="64dp"
android:background="@color/white">
<ImageView
android:id="@+id/iv_coupons_close"
......@@ -30,9 +30,9 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cos_active_all_coupons"
android:textColor="@color/grey"
android:textSize="17sp"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:textColor="@color/cos_light_black"
android:textSize="21sp"
fontPath="fonts/BTCosmo-Bold.ttf"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -44,34 +44,28 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/cos_grey5">
android:background="@color/cos_light_grey3">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_active_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0.5dp"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingTop="44dp"
android:overScrollMode="never"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_line">
</LinearLayout>
android:overScrollMode="never"
android:paddingVertical="24dp" />
</RelativeLayout>
<TextView
fontPath="fonts/PeridotPE-Regular.ttf"
android:id="@+id/tv_no_coupons"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/cos_no_active_coupons"
android:textColor="@color/grey"
android:textSize="18sp"
android:textStyle="bold"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
android:layout_marginTop="40dp"
android:visibility="gone" />
</LinearLayout>
\ No newline at end of file
......
......@@ -27,8 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
android:textSize="17sp"
android:textStyle="bold"
android:textSize="21sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -100,7 +99,7 @@
<LinearLayout
android:id="@+id/ll_activate_button"
android:layout_width="160dp"
android:layout_height="50dp"
android:layout_height="42dp"
android:background="@drawable/selector_button_green"
android:gravity="center"
android:orientation="horizontal"
......
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:text="@string/cos_coupon_info_title"
android:textColor="@color/cos_light_black"
android:textSize="17sp"
android:textSize="21sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -213,7 +213,7 @@
<LinearLayout
android:id="@+id/ll_gift_it"
android:layout_width="160dp"
android:layout_height="50dp"
android:layout_height="42dp"
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="50dp"
android:layout_height="42dp"
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="50dp"
android:layout_height="42dp"
android:layout_gravity="center"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="24dp"
......
......@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:text="@string/cos_coupon_gift"
android:textColor="@color/cos_light_black"
android:textSize="17sp"
android:textSize="21sp"
fontPath="fonts/BTCosmo-Bold.ttf"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -172,7 +172,7 @@
<LinearLayout
android:id="@+id/ll_share_button"
android:layout_width="190dp"
android:layout_height="50dp"
android:layout_height="42dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="64dp"
android:background="@drawable/selector_button_green"
......
......@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:text="@string/cos_coupon_info_title"
android:textColor="@color/cos_light_black"
android:textSize="17sp"
android:textSize="21sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -85,7 +85,7 @@
<LinearLayout
android:id="@+id/ll_get_gift"
android:layout_width="160dp"
android:layout_height="50dp"
android:layout_height="42dp"
android:layout_marginTop="27dp"
android:background="@drawable/selector_button_green"
android:gravity="center"
......
......@@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/cos_light_black"
android:textSize="17sp"
android:textSize="21sp"
fontPath="fonts/BTCosmo-Bold.ttf"
android:text="@string/cos_gifts_title"
app:layout_constraintBottom_toBottomOf="parent"
......
......@@ -5,52 +5,62 @@
android:id="@+id/rl_analysis_payment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
android:background="@color/cos_light_grey3">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_loyalty_analysis_header"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@android:color/white">
android:layout_height="64dp"
android:background="@color/white">
<ImageView
android:id="@+id/iv_loyalty_analysis_close"
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/pf_square_sans_pro_medium.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_analysis"
android:textColor="@color/grey"
android:textSize="17sp"
android:textColor="@color/cos_light_black"
android:textSize="21sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include
android:id="@+id/cl_tab_coupon_analysis"
layout="@layout/tab_coupon_analysis"
<LinearLayout
android:id="@+id/ll_tab_coupon_analysis"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_loyalty_analysis_header"
android:layout_marginHorizontal="12dp"
android:layout_marginVertical="24dp" />
android:layout_marginBottom="24dp"
android:background="@color/white"
android:gravity="center_horizontal"
android:paddingHorizontal="12dp"
android:paddingTop="12dp"
android:paddingBottom="8dp">
<include
android:id="@+id/cl_tab_coupon_analysis"
layout="@layout/tab_coupon_analysis"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<ImageView
android:id="@+id/iv_gift_circle_logo"
android:layout_width="140dp"
android:layout_height="140dp"
android:layout_below="@+id/cl_tab_coupon_analysis"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_below="@+id/ll_tab_coupon_analysis"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_gift_circle" />
......@@ -64,85 +74,96 @@
<LinearLayout
android:id="@+id/ll_expired_coupons_title"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:background="@drawable/banner_border_gradient">
android:background="@drawable/shape_cos_white_border"
android:paddingVertical="16dp">
<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"
android:layout_marginVertical="8dp"
android:gravity="center"
android:textColor="@color/cos_blue_dark"
android:includeFontPadding="false"
android:textColor="@color/cos_light_black"
android:textSize="16sp"
tools:text="@string/cos_deals_win_title" />
</LinearLayout>
<TextView
android:id="@+id/tv_expired_title"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_expired_coupons_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="32dp"
android:text="@string/cos_analysis2"
android:textColor="@color/cos_blue_dark"
android:textSize="16sp" />
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_cos_white_border"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_expired_title"
android:layout_marginTop="24dp"
android:overScrollMode="never">
<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"
android:textColor="@color/cos_light_black"
android:textSize="21sp" />
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_below="@+id/tv_expired_title"
android:layout_marginTop="32dp"
android:overScrollMode="never">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_expired_coupons"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:orientation="vertical"
android:overScrollMode="never" />
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_show_more_expired"
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:visibility="gone"
tools:visibility="visible">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_expired_coupons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:overScrollMode="never" />
<TextView
android:id="@+id/tv_expired_more"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
<LinearLayout
android:id="@+id/ll_show_more_expired"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
android:textColor="@color/grey"
android:textSize="16sp" />
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:gravity="center"
android:orientation="horizontal"
android:paddingBottom="56dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/iv_expired_more_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="6dp"
android:src="@drawable/ic_down_dark" />
<TextView
android:id="@+id/tv_expired_more"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_see_more"
android:textColor="@color/grey"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_expired_more_arrow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="6dp"
android:src="@drawable/ic_down_dark" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</ScrollView>
</RelativeLayout>
<TextView
android:id="@+id/tv_expired_empty"
......
......@@ -26,9 +26,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_shops_title"
android:textColor="@color/grey"
android:textSize="17sp"
fontPath="fonts/pf_square_sans_pro_medium.ttf"
android:textColor="@color/cos_light_black"
android:textSize="21sp"
fontPath="fonts/BTCosmo-Bold.ttf"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
......@@ -23,12 +23,12 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
fontPath="fonts/pf_square_sans_pro_medium.ttf"
fontPath="fonts/BTCosmo-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_coupon_shops_title"
android:textColor="@color/grey"
android:textSize="17sp"
android:textColor="@color/cos_light_black"
android:textSize="21sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
......@@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cos_light_black"
android:textSize="17sp"
android:textSize="21sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -150,7 +150,7 @@
<LinearLayout
android:id="@+id/ll_activate_button"
android:layout_width="160dp"
android:layout_height="50dp"
android:layout_height="42dp"
android:layout_below="@+id/textView13"
android:layout_centerHorizontal="true"
android:layout_marginTop="44dp"
......
......@@ -7,7 +7,7 @@
<TextView
android:id="@+id/tv_code_copy"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
......@@ -17,7 +17,7 @@
<TextView
android:id="@+id/tv_code_comma"
fontPath="fonts/pf_square_sans_pro_bold.ttf"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
......
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:weightSum="1">
......@@ -10,18 +11,23 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_weight="0.2"
android:background="@drawable/bottom_border_gradient2"
android:background="@drawable/bottom_border_light_blue"
android:gravity="center_horizontal">
<TextView
android:id="@+id/tv_expired_tab"
fontPath="fonts/PeridotPE-Bold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_redeemed_coupons_tab"
android:textColor="@color/cos_cyan4"
android:textSize="14sp" />
android:textColor="@color/cos_light_black"
android:textSize="16sp" />
</LinearLayout>
<View
android:layout_width="16dp"
android:layout_height="32dp" />
<LinearLayout
android:id="@+id/ll_tab_shared"
android:layout_width="wrap_content"
......@@ -32,10 +38,11 @@
<TextView
android:id="@+id/tv_shared_tab"
fontPath="fonts/PeridotPE-SemiBold.ttf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cos_shared_gifts_tab"
android:textColor="@color/cos_dark_grey"
android:textSize="14sp" />
android:textColor="@color/cos_gray2"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......
......@@ -70,4 +70,5 @@
<color name="cos_green6_tr">#660EA600</color>
<color name="cos_gray">#9D9D9C</color>
<color name="cos_gray2">#848484</color>
<color name="cos_light_blue">#00A5E3</color>
</resources>
\ No newline at end of file
......
......@@ -56,7 +56,7 @@
<string name="cos_monthly">Μηνιαία</string>
<string name="cos_six_months">6Μηνο</string>
<string name="cos_annual">12Μηνο</string>
<string name="cos_analysis2">Αναλυτικά:</string>
<string name="cos_analysis2">Αναλυτικά</string>
<string name="euro">€</string>
<string name="percentage">%</string>
<string name="plus_one">1+1</string>
......
......@@ -38,5 +38,12 @@
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="ShapeAppearanceProfileImage" parent="">
<item name="cornerFamilyTopLeft">rounded</item>
<item name="cornerFamilyBottomRight">rounded</item>
<item name="cornerSizeTopLeft">19dp</item>
<item name="cornerSizeBottomRight">19dp</item>
</style>
</resources>
\ No newline at end of file
......