open-source / warply_android_sdk_maven_plugin

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

redesign part2

Inline Side-by-side
Showing 30 changed files with 283 additions and 210 deletions
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
31 <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" /> 31 <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" />
32 <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" /> 32 <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" />
33 <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" /> 33 <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" />
34 + <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" />
34 <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" /> 35 <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" />
35 <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" /> 36 <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" />
36 <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" /> 37 <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 @@ ...@@ -79,6 +80,7 @@
79 <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" /> 80 <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" />
80 <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" /> 81 <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" />
81 <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" /> 82 <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" />
83 + <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" />
82 <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" /> 84 <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" />
83 <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" /> 85 <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" />
84 <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" /> 86 <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 @@ ...@@ -88,6 +90,7 @@
88 <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" /> 90 <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" />
89 <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" /> 91 <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" />
90 <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" /> 92 <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" />
93 + <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" />
91 <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" /> 94 <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" />
92 <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" /> 95 <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" />
93 <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" /> 96 <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 ...@@ -143,10 +143,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
143 .concat(":") 143 .concat(":")
144 .concat("TabExpired")); 144 .concat("TabExpired"));
145 145
146 - mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 146 + mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
147 TextView expiredTab = findViewById(R.id.tv_expired_tab); 147 TextView expiredTab = findViewById(R.id.tv_expired_tab);
148 - expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 148 + expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
149 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 149 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
150 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 150 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
151 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 151 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
152 sBuilderExpired.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 152 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 ...@@ -154,8 +154,8 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
154 154
155 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent); 155 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
156 TextView sharedTab = findViewById(R.id.tv_shared_tab); 156 TextView sharedTab = findViewById(R.id.tv_shared_tab);
157 - sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 157 + sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
158 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 158 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
159 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 159 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
160 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 160 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
161 sBuilderShared.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 161 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 ...@@ -170,10 +170,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
170 .concat(":") 170 .concat(":")
171 .concat("TabShared")); 171 .concat("TabShared"));
172 172
173 - mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 173 + mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
174 TextView sharedTab = findViewById(R.id.tv_shared_tab); 174 TextView sharedTab = findViewById(R.id.tv_shared_tab);
175 - sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 175 + sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
176 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 176 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
177 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 177 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
178 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 178 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
179 sBuilderShared.setSpan(typefaceBoldSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 179 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 ...@@ -181,8 +181,8 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
181 181
182 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent); 182 mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_transparent);
183 TextView expiredTab = findViewById(R.id.tv_expired_tab); 183 TextView expiredTab = findViewById(R.id.tv_expired_tab);
184 - expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 184 + expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
185 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 185 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
186 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 186 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
187 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 187 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
188 sBuilderExpired.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 188 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 ...@@ -223,10 +223,10 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
223 mLlShowMoreExpired.setOnClickListener(this); 223 mLlShowMoreExpired.setOnClickListener(this);
224 mLlShowMoreShared.setOnClickListener(this); 224 mLlShowMoreShared.setOnClickListener(this);
225 225
226 - mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_gradient2); 226 + mLlExpiredTab.setBackgroundResource(R.drawable.bottom_border_light_blue);
227 TextView expiredTab = findViewById(R.id.tv_expired_tab); 227 TextView expiredTab = findViewById(R.id.tv_expired_tab);
228 - expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_cyan4)); 228 + expiredTab.setTextColor(ContextCompat.getColor(this, R.color.cos_light_black));
229 - CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 229 + CalligraphyTypefaceSpan typefaceBoldExpiredSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
230 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder(); 230 SpannableStringBuilder sBuilderExpired = new SpannableStringBuilder();
231 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab)); 231 sBuilderExpired.append(getString(R.string.cos_redeemed_coupons_tab));
232 sBuilderExpired.setSpan(typefaceBoldExpiredSpan, 0, getString(R.string.cos_redeemed_coupons_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 232 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 ...@@ -234,8 +234,8 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
234 234
235 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent); 235 mLlSharedTab.setBackgroundResource(R.drawable.bottom_border_transparent);
236 TextView sharedTab = findViewById(R.id.tv_shared_tab); 236 TextView sharedTab = findViewById(R.id.tv_shared_tab);
237 - sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_dark_grey)); 237 + sharedTab.setTextColor(ContextCompat.getColor(this, R.color.cos_gray2));
238 - CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 238 + CalligraphyTypefaceSpan typefaceRegularSharedSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-SemiBold.ttf"));
239 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder(); 239 SpannableStringBuilder sBuilderShared = new SpannableStringBuilder();
240 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab)); 240 sBuilderShared.append(getString(R.string.cos_shared_gifts_tab));
241 sBuilderShared.setSpan(typefaceRegularSharedSpan, 0, getString(R.string.cos_shared_gifts_tab).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 241 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 ...@@ -251,11 +251,11 @@ public class LoyaltyAnalysisActivity extends Activity implements View.OnClickLis
251 .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()))) 251 .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount())))
252 .append(getString(R.string.cos_wallet_text5)); 252 .append(getString(R.string.cos_wallet_text5));
253 253
254 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 254 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
255 - CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 255 + CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
256 - CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 256 + CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
257 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 257 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
258 - CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 258 + CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
259 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 259 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
260 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); 260 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);
261 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); 261 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 ...@@ -71,7 +71,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
71 private ConstraintLayout mClDealsBanner, mClDealsView, 71 private ConstraintLayout mClDealsBanner, mClDealsView,
72 mClGiftsBanner, mClToolbar; 72 mClGiftsBanner, mClToolbar;
73 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet; 73 private LinearLayout mLlQuestionnaire, mLlUserBadge, mLlEmptyWallet;
74 - FlowLayout mLlActiveCodesView; 74 + private FlowLayout mLlActiveCodesView;
75 private float couponDfyValue = 0.0f; 75 private float couponDfyValue = 0.0f;
76 private RecyclerView mRecyclerCoupons; 76 private RecyclerView mRecyclerCoupons;
77 private ActiveCouponAdapter mAdapterCoupons; 77 private ActiveCouponAdapter mAdapterCoupons;
...@@ -372,8 +372,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie ...@@ -372,8 +372,8 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
372 .append(getString(R.string.cos_wallet_text1)) 372 .append(getString(R.string.cos_wallet_text1))
373 .append(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getDealsCouponsSum()))) 373 .append(String.format(getString(R.string.cos_value), String.valueOf(WarplyManagerHelper.getDealsCouponsSum())))
374 .append(getString(R.string.cos_wallet_text2)); 374 .append(getString(R.string.cos_wallet_text2));
375 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 375 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
376 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 376 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
377 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text1).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 377 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text1).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
378 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); 378 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);
379 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); 379 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 ...@@ -397,11 +397,11 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
397 .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount()))) 397 .append(String.format(getString(R.string.cos_value2), String.valueOf(WarplyManagerHelper.getLoyaltyBadge().getCouponCount())))
398 .append(getString(R.string.cos_wallet_text5)); 398 .append(getString(R.string.cos_wallet_text5));
399 399
400 - CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 400 + CalligraphyTypefaceSpan typefaceRegularSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
401 - CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 401 + CalligraphyTypefaceSpan typefaceRegularSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
402 - CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_regular.ttf")); 402 + CalligraphyTypefaceSpan typefaceRegularSpan3 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Regular.ttf"));
403 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 403 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
404 - CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 404 + CalligraphyTypefaceSpan typefaceBoldSpan2 = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
405 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 405 sBuilder.setSpan(typefaceRegularSpan, 0, getString(R.string.cos_wallet_text3).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
406 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); 406 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);
407 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); 407 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 ...@@ -452,7 +452,7 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener, Vie
452 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_selectable, null); 452 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_selectable, null);
453 TextView textView = (TextView) v.findViewById(R.id.tv_code_copy); 453 TextView textView = (TextView) v.findViewById(R.id.tv_code_copy);
454 TextView textViewComma = (TextView) v.findViewById(R.id.tv_code_comma); 454 TextView textViewComma = (TextView) v.findViewById(R.id.tv_code_comma);
455 - CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf")); 455 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/PeridotPE-Bold.ttf"));
456 SpannableStringBuilder sBuilder = new SpannableStringBuilder(WarplyManagerHelper.getActiveDFYCoupons().get(i).getCode()); 456 SpannableStringBuilder sBuilder = new SpannableStringBuilder(WarplyManagerHelper.getActiveDFYCoupons().get(i).getCode());
457 SpannableStringBuilder sBuilderComma = new SpannableStringBuilder(getString(R.string.cos_comma)); 457 SpannableStringBuilder sBuilderComma = new SpannableStringBuilder(getString(R.string.cos_comma));
458 sBuilder.setSpan(typefaceBoldSpan, 0, sBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); 458 sBuilder.setSpan(typefaceBoldSpan, 0, sBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item>
4 + <shape android:shape="rectangle">
5 + <gradient
6 + android:angle="180"
7 + android:endColor="@color/cos_light_blue"
8 + android:startColor="@color/cos_light_blue" />
9 + </shape>
10 + </item>
11 +
12 + <item android:bottom="2dp">
13 + <shape android:shape="rectangle">
14 + <solid android:color="@color/white" />
15 + </shape>
16 + </item>
17 +
18 +</layer-list>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <corners android:topLeftRadius="19dp" android:bottomRightRadius="19dp" />
5 +
6 + <solid android:color="@color/cos_cyan3" />
7 +
8 +<!-- <stroke-->
9 +<!-- android:width="1dp"-->
10 +<!-- android:color="@color/cos_green" />-->
11 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <corners android:radius="16dp" />
5 + <stroke android:width="1dp" android:color="@color/cos_grey2" />
6 + <solid
7 + android:color="@color/white" />
8 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 4
5 <stroke 5 <stroke
6 android:width="1dp" 6 android:width="1dp"
7 - android:color="@color/grey2" 7 + android:color="@color/cos_gray"
8 - android:dashWidth="12px" 8 + android:dashWidth="32px"
9 - android:dashGap="12px" /> 9 + android:dashGap="24px" />
10 </shape> 10 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="130dp" 6 + android:layout_height="150dp"
7 - android:layout_marginVertical="4dp" 7 + android:layout_marginVertical="6dp"
8 android:layout_marginHorizontal="4dp" 8 android:layout_marginHorizontal="4dp"
9 - android:background="@drawable/ic_coupon_background_new"> 9 + android:background="@drawable/ic_coupon_background_new2">
10 10
11 <androidx.constraintlayout.widget.Guideline 11 <androidx.constraintlayout.widget.Guideline
12 android:id="@+id/gl_vertical_72_percent" 12 android:id="@+id/gl_vertical_72_percent"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 android:layout_width="1dp" 30 android:layout_width="1dp"
31 android:layout_height="match_parent" 31 android:layout_height="match_parent"
32 android:layout_marginVertical="16dp" 32 android:layout_marginVertical="16dp"
33 - android:layout_marginStart="8dp" 33 + android:layout_marginStart="16dp"
34 android:background="@drawable/shape_dashed_vertical" 34 android:background="@drawable/shape_dashed_vertical"
35 app:layout_constraintBottom_toBottomOf="parent" 35 app:layout_constraintBottom_toBottomOf="parent"
36 app:layout_constraintStart_toEndOf="@+id/iv_active_coupon" 36 app:layout_constraintStart_toEndOf="@+id/iv_active_coupon"
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
53 android:layout_height="wrap_content" 53 android:layout_height="wrap_content"
54 android:ellipsize="end" 54 android:ellipsize="end"
55 android:maxLines="1" 55 android:maxLines="1"
56 - android:textColor="#3A5266" 56 + android:textColor="@color/cos_light_black"
57 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 57 + fontPath="fonts/BTCosmo-Bold.ttf"
58 android:textSize="16sp" 58 android:textSize="16sp"
59 tools:text="Εκπτωτικο κουπονι 10$ για αγορες στα ΙΚΕΑ" /> 59 tools:text="Εκπτωτικο κουπονι 10$ για αγορες στα ΙΚΕΑ" />
60 60
...@@ -62,17 +62,17 @@ ...@@ -62,17 +62,17 @@
62 android:id="@+id/tv_active_coupons_value" 62 android:id="@+id/tv_active_coupons_value"
63 android:layout_width="wrap_content" 63 android:layout_width="wrap_content"
64 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
65 - android:textColor="#3A5266" 65 + android:textColor="@color/cos_light_black"
66 android:textSize="42sp" 66 android:textSize="42sp"
67 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 67 + fontPath="fonts/BTCosmo-Bold.ttf"
68 tools:text="10$" /> 68 tools:text="10$" />
69 69
70 <TextView 70 <TextView
71 android:id="@+id/tv_active_coupons_date" 71 android:id="@+id/tv_active_coupons_date"
72 android:layout_width="wrap_content" 72 android:layout_width="wrap_content"
73 android:layout_height="wrap_content" 73 android:layout_height="wrap_content"
74 - android:textColor="#617181" 74 + android:textColor="@color/cos_gray"
75 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 75 + fontPath="fonts/PeridotPE-Regular.ttf"
76 android:textSize="12sp" 76 android:textSize="12sp"
77 tools:text="@string/cos_active_coupon_date" /> 77 tools:text="@string/cos_active_coupon_date" />
78 </LinearLayout> 78 </LinearLayout>
...@@ -83,9 +83,9 @@ ...@@ -83,9 +83,9 @@
83 android:layout_height="wrap_content" 83 android:layout_height="wrap_content"
84 android:layout_marginStart="8dp" 84 android:layout_marginStart="8dp"
85 android:layout_marginEnd="32dp" 85 android:layout_marginEnd="32dp"
86 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 86 + fontPath="fonts/PeridotPE-Regular.ttf"
87 android:maxLines="4" 87 android:maxLines="4"
88 - android:textColor="#617181" 88 + android:textColor="@color/cos_gray"
89 android:textSize="12sp" 89 android:textSize="12sp"
90 app:layout_constraintBottom_toBottomOf="parent" 90 app:layout_constraintBottom_toBottomOf="parent"
91 app:layout_constraintEnd_toEndOf="parent" 91 app:layout_constraintEnd_toEndOf="parent"
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
4 android:id="@+id/cl_bill_payment" 4 android:id="@+id/cl_bill_payment"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - android:background="@android:color/white" 7 + android:background="@color/cos_light_grey3"
8 android:orientation="vertical"> 8 android:orientation="vertical">
9 9
10 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
11 android:id="@+id/cl_bill_header" 11 android:id="@+id/cl_bill_header"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 - android:layout_height="48dp" 13 + android:layout_height="64dp"
14 - android:background="@android:color/white"> 14 + android:background="@color/white">
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_coupons_close" 17 android:id="@+id/iv_coupons_close"
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:gravity="center" 31 android:gravity="center"
32 android:text="@string/cos_active_all_coupons" 32 android:text="@string/cos_active_all_coupons"
33 - android:textColor="@color/grey" 33 + android:textColor="@color/cos_light_black"
34 - android:textSize="17sp" 34 + android:textSize="21sp"
35 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 35 + fontPath="fonts/BTCosmo-Bold.ttf"
36 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
37 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
38 app:layout_constraintStart_toStartOf="parent" 38 app:layout_constraintStart_toStartOf="parent"
...@@ -44,34 +44,28 @@ ...@@ -44,34 +44,28 @@
44 android:layout_width="match_parent" 44 android:layout_width="match_parent"
45 android:layout_height="match_parent" 45 android:layout_height="match_parent"
46 android:orientation="vertical" 46 android:orientation="vertical"
47 - android:background="@color/cos_grey5"> 47 + android:background="@color/cos_light_grey3">
48 48
49 <androidx.recyclerview.widget.RecyclerView 49 <androidx.recyclerview.widget.RecyclerView
50 android:id="@+id/rv_active_coupons" 50 android:id="@+id/rv_active_coupons"
51 android:layout_width="match_parent" 51 android:layout_width="match_parent"
52 android:layout_height="wrap_content" 52 android:layout_height="wrap_content"
53 - android:layout_marginTop="0.5dp"
54 android:clipToPadding="false" 53 android:clipToPadding="false"
55 android:orientation="vertical" 54 android:orientation="vertical"
56 - android:paddingTop="44dp" 55 + android:overScrollMode="never"
57 - android:overScrollMode="never"/> 56 + android:paddingVertical="24dp" />
58 -
59 - <LinearLayout
60 - android:layout_width="match_parent"
61 - android:layout_height="wrap_content"
62 - android:background="@drawable/ic_line">
63 -
64 - </LinearLayout>
65 </RelativeLayout> 57 </RelativeLayout>
66 58
67 <TextView 59 <TextView
60 + fontPath="fonts/PeridotPE-Regular.ttf"
68 android:id="@+id/tv_no_coupons" 61 android:id="@+id/tv_no_coupons"
62 + android:layout_gravity="center_horizontal"
69 android:layout_width="wrap_content" 63 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
71 android:layout_centerInParent="true" 65 android:layout_centerInParent="true"
72 android:text="@string/cos_no_active_coupons" 66 android:text="@string/cos_no_active_coupons"
73 - android:textColor="@color/grey" 67 + android:textColor="@color/cos_light_black"
74 - android:textSize="18sp" 68 + android:textSize="16sp"
75 - android:textStyle="bold" 69 + android:layout_marginTop="40dp"
76 android:visibility="gone" /> 70 android:visibility="gone" />
77 </LinearLayout> 71 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
30 - android:textSize="17sp" 30 + android:textSize="21sp"
31 - android:textStyle="bold"
32 app:layout_constraintBottom_toBottomOf="parent" 31 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 32 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 33 app:layout_constraintStart_toStartOf="parent"
...@@ -100,7 +99,7 @@ ...@@ -100,7 +99,7 @@
100 <LinearLayout 99 <LinearLayout
101 android:id="@+id/ll_activate_button" 100 android:id="@+id/ll_activate_button"
102 android:layout_width="160dp" 101 android:layout_width="160dp"
103 - android:layout_height="50dp" 102 + android:layout_height="42dp"
104 android:background="@drawable/selector_button_green" 103 android:background="@drawable/selector_button_green"
105 android:gravity="center" 104 android:gravity="center"
106 android:orientation="horizontal" 105 android:orientation="horizontal"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_info_title" 29 android:text="@string/cos_coupon_info_title"
30 android:textColor="@color/cos_light_black" 30 android:textColor="@color/cos_light_black"
31 - android:textSize="17sp" 31 + android:textSize="21sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
213 <LinearLayout 213 <LinearLayout
214 android:id="@+id/ll_gift_it" 214 android:id="@+id/ll_gift_it"
215 android:layout_width="160dp" 215 android:layout_width="160dp"
216 - android:layout_height="50dp" 216 + android:layout_height="42dp"
217 android:layout_gravity="center" 217 android:layout_gravity="center"
218 android:layout_marginHorizontal="32dp" 218 android:layout_marginHorizontal="32dp"
219 android:layout_marginTop="64dp" 219 android:layout_marginTop="64dp"
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
236 <LinearLayout 236 <LinearLayout
237 android:id="@+id/ll_shops" 237 android:id="@+id/ll_shops"
238 android:layout_width="220dp" 238 android:layout_width="220dp"
239 - android:layout_height="50dp" 239 + android:layout_height="42dp"
240 android:layout_gravity="center" 240 android:layout_gravity="center"
241 android:layout_marginHorizontal="32dp" 241 android:layout_marginHorizontal="32dp"
242 android:layout_marginTop="24dp" 242 android:layout_marginTop="24dp"
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
261 <LinearLayout 261 <LinearLayout
262 android:id="@+id/ll_website" 262 android:id="@+id/ll_website"
263 android:layout_width="220dp" 263 android:layout_width="220dp"
264 - android:layout_height="50dp" 264 + android:layout_height="42dp"
265 android:layout_gravity="center" 265 android:layout_gravity="center"
266 android:layout_marginHorizontal="32dp" 266 android:layout_marginHorizontal="32dp"
267 android:layout_marginTop="24dp" 267 android:layout_marginTop="24dp"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
28 android:text="@string/cos_coupon_gift" 28 android:text="@string/cos_coupon_gift"
29 android:textColor="@color/cos_light_black" 29 android:textColor="@color/cos_light_black"
30 - android:textSize="17sp" 30 + android:textSize="21sp"
31 fontPath="fonts/BTCosmo-Bold.ttf" 31 fontPath="fonts/BTCosmo-Bold.ttf"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
172 <LinearLayout 172 <LinearLayout
173 android:id="@+id/ll_share_button" 173 android:id="@+id/ll_share_button"
174 android:layout_width="190dp" 174 android:layout_width="190dp"
175 - android:layout_height="50dp" 175 + android:layout_height="42dp"
176 android:layout_marginHorizontal="32dp" 176 android:layout_marginHorizontal="32dp"
177 android:layout_marginTop="64dp" 177 android:layout_marginTop="64dp"
178 android:background="@drawable/selector_button_green" 178 android:background="@drawable/selector_button_green"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_info_title" 29 android:text="@string/cos_coupon_info_title"
30 android:textColor="@color/cos_light_black" 30 android:textColor="@color/cos_light_black"
31 - android:textSize="17sp" 31 + android:textSize="21sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
85 <LinearLayout 85 <LinearLayout
86 android:id="@+id/ll_get_gift" 86 android:id="@+id/ll_get_gift"
87 android:layout_width="160dp" 87 android:layout_width="160dp"
88 - android:layout_height="50dp" 88 + android:layout_height="42dp"
89 android:layout_marginTop="27dp" 89 android:layout_marginTop="27dp"
90 android:background="@drawable/selector_button_green" 90 android:background="@drawable/selector_button_green"
91 android:gravity="center" 91 android:gravity="center"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
32 android:gravity="center" 32 android:gravity="center"
33 android:textColor="@color/cos_light_black" 33 android:textColor="@color/cos_light_black"
34 - android:textSize="17sp" 34 + android:textSize="21sp"
35 fontPath="fonts/BTCosmo-Bold.ttf" 35 fontPath="fonts/BTCosmo-Bold.ttf"
36 android:text="@string/cos_gifts_title" 36 android:text="@string/cos_gifts_title"
37 app:layout_constraintBottom_toBottomOf="parent" 37 app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -5,52 +5,62 @@ ...@@ -5,52 +5,62 @@
5 android:id="@+id/rl_analysis_payment" 5 android:id="@+id/rl_analysis_payment"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 android:layout_height="match_parent" 7 android:layout_height="match_parent"
8 - android:background="@android:color/white"> 8 + android:background="@color/cos_light_grey3">
9 9
10 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
11 android:id="@+id/cl_loyalty_analysis_header" 11 android:id="@+id/cl_loyalty_analysis_header"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 - android:layout_height="48dp" 13 + android:layout_height="64dp"
14 - android:background="@android:color/white"> 14 + android:background="@color/white">
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_loyalty_analysis_close" 17 android:id="@+id/iv_loyalty_analysis_close"
18 android:layout_width="48dp" 18 android:layout_width="48dp"
19 android:layout_height="48dp" 19 android:layout_height="48dp"
20 android:layout_marginStart="16dp" 20 android:layout_marginStart="16dp"
21 - android:src="@drawable/ic_back"
22 android:scaleType="centerInside" 21 android:scaleType="centerInside"
22 + android:src="@drawable/ic_back"
23 app:layout_constraintBottom_toBottomOf="parent" 23 app:layout_constraintBottom_toBottomOf="parent"
24 app:layout_constraintStart_toStartOf="parent" 24 app:layout_constraintStart_toStartOf="parent"
25 app:layout_constraintTop_toTopOf="parent" /> 25 app:layout_constraintTop_toTopOf="parent" />
26 26
27 <TextView 27 <TextView
28 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 28 + fontPath="fonts/BTCosmo-Bold.ttf"
29 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:text="@string/cos_analysis" 31 android:text="@string/cos_analysis"
32 - android:textColor="@color/grey" 32 + android:textColor="@color/cos_light_black"
33 - android:textSize="17sp" 33 + android:textSize="21sp"
34 app:layout_constraintBottom_toBottomOf="parent" 34 app:layout_constraintBottom_toBottomOf="parent"
35 app:layout_constraintEnd_toEndOf="parent" 35 app:layout_constraintEnd_toEndOf="parent"
36 app:layout_constraintStart_toStartOf="parent" 36 app:layout_constraintStart_toStartOf="parent"
37 app:layout_constraintTop_toTopOf="parent" /> 37 app:layout_constraintTop_toTopOf="parent" />
38 </androidx.constraintlayout.widget.ConstraintLayout> 38 </androidx.constraintlayout.widget.ConstraintLayout>
39 39
40 - <include 40 + <LinearLayout
41 - android:id="@+id/cl_tab_coupon_analysis" 41 + android:id="@+id/ll_tab_coupon_analysis"
42 - layout="@layout/tab_coupon_analysis"
43 android:layout_width="match_parent" 42 android:layout_width="match_parent"
44 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
45 android:layout_below="@+id/cl_loyalty_analysis_header" 44 android:layout_below="@+id/cl_loyalty_analysis_header"
46 - android:layout_marginHorizontal="12dp" 45 + android:layout_marginBottom="24dp"
47 - android:layout_marginVertical="24dp" /> 46 + android:background="@color/white"
47 + android:gravity="center_horizontal"
48 + android:paddingHorizontal="12dp"
49 + android:paddingTop="12dp"
50 + android:paddingBottom="8dp">
51 +
52 + <include
53 + android:id="@+id/cl_tab_coupon_analysis"
54 + layout="@layout/tab_coupon_analysis"
55 + android:layout_width="match_parent"
56 + android:layout_height="wrap_content" />
57 + </LinearLayout>
48 58
49 <ImageView 59 <ImageView
50 android:id="@+id/iv_gift_circle_logo" 60 android:id="@+id/iv_gift_circle_logo"
51 - android:layout_width="140dp" 61 + android:layout_width="120dp"
52 - android:layout_height="140dp" 62 + android:layout_height="120dp"
53 - android:layout_below="@+id/cl_tab_coupon_analysis" 63 + android:layout_below="@+id/ll_tab_coupon_analysis"
54 android:layout_centerHorizontal="true" 64 android:layout_centerHorizontal="true"
55 android:src="@drawable/ic_gift_circle" /> 65 android:src="@drawable/ic_gift_circle" />
56 66
...@@ -64,85 +74,96 @@ ...@@ -64,85 +74,96 @@
64 74
65 <LinearLayout 75 <LinearLayout
66 android:id="@+id/ll_expired_coupons_title" 76 android:id="@+id/ll_expired_coupons_title"
67 - android:layout_width="wrap_content" 77 + android:layout_width="match_parent"
68 android:layout_height="wrap_content" 78 android:layout_height="wrap_content"
69 android:layout_marginHorizontal="12dp" 79 android:layout_marginHorizontal="12dp"
70 - android:background="@drawable/banner_border_gradient"> 80 + android:background="@drawable/shape_cos_white_border"
81 + android:paddingVertical="16dp">
71 82
72 <TextView 83 <TextView
73 android:id="@+id/tv_expired_coupons_title" 84 android:id="@+id/tv_expired_coupons_title"
85 + fontPath="fonts/PeridotPE-Regular.ttf"
74 android:layout_width="wrap_content" 86 android:layout_width="wrap_content"
75 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
76 android:layout_marginHorizontal="32dp" 88 android:layout_marginHorizontal="32dp"
77 android:layout_marginVertical="8dp" 89 android:layout_marginVertical="8dp"
78 android:gravity="center" 90 android:gravity="center"
79 - android:textColor="@color/cos_blue_dark" 91 + android:includeFontPadding="false"
92 + android:textColor="@color/cos_light_black"
80 android:textSize="16sp" 93 android:textSize="16sp"
81 tools:text="@string/cos_deals_win_title" /> 94 tools:text="@string/cos_deals_win_title" />
82 </LinearLayout> 95 </LinearLayout>
83 96
84 - <TextView 97 + <RelativeLayout
85 - android:id="@+id/tv_expired_title" 98 + android:layout_width="match_parent"
86 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
87 - android:layout_width="wrap_content"
88 android:layout_height="wrap_content" 99 android:layout_height="wrap_content"
89 android:layout_below="@+id/ll_expired_coupons_title" 100 android:layout_below="@+id/ll_expired_coupons_title"
90 - android:layout_centerHorizontal="true" 101 + android:layout_marginHorizontal="12dp"
91 - android:layout_marginTop="32dp" 102 + android:layout_marginTop="12dp"
92 - android:text="@string/cos_analysis2" 103 + android:background="@drawable/shape_cos_white_border"
93 - android:textColor="@color/cos_blue_dark" 104 + android:orientation="vertical"
94 - android:textSize="16sp" /> 105 + android:paddingHorizontal="16dp"
106 + android:paddingVertical="16dp">
95 107
96 - <ScrollView 108 + <TextView
97 - android:layout_width="match_parent" 109 + android:id="@+id/tv_expired_title"
98 - android:layout_height="wrap_content" 110 + fontPath="fonts/BTCosmo-Bold.ttf"
99 - android:layout_below="@+id/tv_expired_title" 111 + android:layout_width="wrap_content"
100 - android:layout_marginTop="24dp" 112 + android:layout_height="wrap_content"
101 - android:overScrollMode="never"> 113 + android:text="@string/cos_analysis2"
114 + android:textColor="@color/cos_light_black"
115 + android:textSize="21sp" />
102 116
103 - <LinearLayout 117 + <ScrollView
104 android:layout_width="match_parent" 118 android:layout_width="match_parent"
105 android:layout_height="wrap_content" 119 android:layout_height="wrap_content"
106 - android:orientation="vertical"> 120 + android:layout_below="@+id/tv_expired_title"
121 + android:layout_marginTop="32dp"
122 + android:overScrollMode="never">
107 123
108 - <androidx.recyclerview.widget.RecyclerView 124 + <LinearLayout
109 - android:id="@+id/rv_expired_coupons"
110 android:layout_width="match_parent" 125 android:layout_width="match_parent"
111 android:layout_height="wrap_content" 126 android:layout_height="wrap_content"
112 - android:layout_marginHorizontal="8dp" 127 + android:orientation="vertical">
113 - android:orientation="vertical"
114 - android:overScrollMode="never" />
115 128
116 - <LinearLayout 129 + <androidx.recyclerview.widget.RecyclerView
117 - android:id="@+id/ll_show_more_expired" 130 + android:id="@+id/rv_expired_coupons"
118 - android:layout_width="wrap_content" 131 + android:layout_width="match_parent"
119 - android:layout_height="wrap_content" 132 + android:layout_height="wrap_content"
120 - android:layout_gravity="center" 133 + android:orientation="vertical"
121 - android:layout_marginTop="20dp" 134 + android:overScrollMode="never" />
122 - android:gravity="center"
123 - android:orientation="horizontal"
124 - android:paddingBottom="56dp"
125 - android:visibility="gone"
126 - tools:visibility="visible">
127 135
128 - <TextView 136 + <LinearLayout
129 - android:id="@+id/tv_expired_more" 137 + android:id="@+id/ll_show_more_expired"
130 - fontPath="fonts/pf_square_sans_pro_medium.ttf"
131 android:layout_width="wrap_content" 138 android:layout_width="wrap_content"
132 android:layout_height="wrap_content" 139 android:layout_height="wrap_content"
133 - android:text="@string/cos_see_more" 140 + android:layout_gravity="center"
134 - android:textColor="@color/grey" 141 + android:layout_marginTop="20dp"
135 - android:textSize="16sp" /> 142 + android:gravity="center"
143 + android:orientation="horizontal"
144 + android:paddingBottom="56dp"
145 + android:visibility="gone"
146 + tools:visibility="visible">
136 147
137 - <ImageView 148 + <TextView
138 - android:id="@+id/iv_expired_more_arrow" 149 + android:id="@+id/tv_expired_more"
139 - android:layout_width="14dp" 150 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
140 - android:layout_height="14dp" 151 + android:layout_width="wrap_content"
141 - android:layout_marginStart="6dp" 152 + android:layout_height="wrap_content"
142 - android:src="@drawable/ic_down_dark" /> 153 + android:text="@string/cos_see_more"
154 + android:textColor="@color/grey"
155 + android:textSize="16sp" />
156 +
157 + <ImageView
158 + android:id="@+id/iv_expired_more_arrow"
159 + android:layout_width="14dp"
160 + android:layout_height="14dp"
161 + android:layout_marginStart="6dp"
162 + android:src="@drawable/ic_down_dark" />
163 + </LinearLayout>
143 </LinearLayout> 164 </LinearLayout>
144 - </LinearLayout> 165 + </ScrollView>
145 - </ScrollView> 166 + </RelativeLayout>
146 167
147 <TextView 168 <TextView
148 android:id="@+id/tv_expired_empty" 169 android:id="@+id/tv_expired_empty"
......
...@@ -3,32 +3,32 @@ ...@@ -3,32 +3,32 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - android:background="@color/cos_grey5"> 6 + android:background="@color/cos_light_grey3">
7 7
8 <androidx.constraintlayout.widget.ConstraintLayout 8 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_loyalty_wallet_header" 9 android:id="@+id/cl_loyalty_wallet_header"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="48dp" 11 android:layout_height="48dp"
12 - android:background="@android:color/white"> 12 + android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_back" 15 android:id="@+id/iv_back"
16 android:layout_width="48dp" 16 android:layout_width="48dp"
17 android:layout_height="48dp" 17 android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 - android:src="@drawable/ic_back"
20 android:scaleType="centerInside" 19 android:scaleType="centerInside"
20 + android:src="@drawable/ic_back"
21 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
22 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 26 + fontPath="fonts/BTCosmo-Bold.ttf"
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_profile_title" 29 android:text="@string/cos_profile_title"
30 - android:textColor="@color/grey" 30 + android:textColor="@color/cos_light_black"
31 - android:textSize="17sp" 31 + android:textSize="21sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -52,70 +52,71 @@ ...@@ -52,70 +52,71 @@
52 android:id="@+id/ll_first_view" 52 android:id="@+id/ll_first_view"
53 android:layout_width="match_parent" 53 android:layout_width="match_parent"
54 android:layout_height="wrap_content" 54 android:layout_height="wrap_content"
55 - android:background="@drawable/ic_background_circle" 55 + android:background="@drawable/ic_background_line"
56 - android:elevation="1dp"
57 android:gravity="center_horizontal" 56 android:gravity="center_horizontal"
58 android:orientation="vertical" 57 android:orientation="vertical"
59 - android:paddingVertical="32dp"> 58 + android:paddingVertical="24dp">
60 59
61 - <de.hdodenhof.circleimageview.CircleImageView 60 + <com.google.android.material.imageview.ShapeableImageView
62 android:id="@+id/iv_profile_photo" 61 android:id="@+id/iv_profile_photo"
63 android:layout_width="70dp" 62 android:layout_width="70dp"
64 android:layout_height="70dp" 63 android:layout_height="70dp"
64 + tools:background="@color/cos_cyan3"
65 android:src="@drawable/ic_default_photo" 65 android:src="@drawable/ic_default_photo"
66 app:layout_constraintBottom_toBottomOf="parent" 66 app:layout_constraintBottom_toBottomOf="parent"
67 app:layout_constraintLeft_toLeftOf="parent" 67 app:layout_constraintLeft_toLeftOf="parent"
68 - app:layout_constraintTop_toTopOf="parent" /> 68 + app:layout_constraintTop_toTopOf="parent"
69 + app:shapeAppearanceOverlay="@style/ShapeAppearanceProfileImage" />
69 70
70 <TextView 71 <TextView
71 android:id="@+id/tv_profile_name" 72 android:id="@+id/tv_profile_name"
72 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 73 + fontPath="fonts/PeridotPE-Bold.ttf"
73 android:layout_width="wrap_content" 74 android:layout_width="wrap_content"
74 android:layout_height="wrap_content" 75 android:layout_height="wrap_content"
75 android:layout_marginVertical="6dp" 76 android:layout_marginVertical="6dp"
76 android:maxLines="1" 77 android:maxLines="1"
77 - android:textColor="@color/grey" 78 + android:textColor="@color/cos_light_black"
78 android:textSize="15sp" 79 android:textSize="15sp"
79 tools:text="Test Name" /> 80 tools:text="Test Name" />
80 81
81 <LinearLayout 82 <LinearLayout
82 android:id="@+id/ll_user_badge" 83 android:id="@+id/ll_user_badge"
83 - android:layout_width="wrap_content" 84 + android:layout_width="180dp"
84 - android:layout_height="wrap_content" 85 + android:layout_height="42dp"
85 - android:background="@drawable/shape_cos_gradient6_shahow" 86 + android:background="@drawable/selector_button_green_border"
86 android:gravity="center" 87 android:gravity="center"
87 - android:paddingHorizontal="10dp"
88 - android:paddingVertical="3dp"
89 android:visibility="gone" 88 android:visibility="gone"
90 tools:visibility="visible"> 89 tools:visibility="visible">
91 90
92 <TextView 91 <TextView
93 android:id="@+id/tv_type" 92 android:id="@+id/tv_type"
94 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 93 + fontPath="fonts/PeridotPE-Bold.ttf"
95 android:layout_width="wrap_content" 94 android:layout_width="wrap_content"
96 android:layout_height="wrap_content" 95 android:layout_height="wrap_content"
97 - android:textColor="@android:color/white" 96 + android:includeFontPadding="false"
97 + android:textColor="@color/cos_green12"
98 + android:textSize="16sp"
98 tools:text="@string/cos_profile_type" /> 99 tools:text="@string/cos_profile_type" />
99 </LinearLayout> 100 </LinearLayout>
100 101
101 <LinearLayout 102 <LinearLayout
102 android:id="@+id/ll_user_questionnaire" 103 android:id="@+id/ll_user_questionnaire"
103 - android:layout_width="wrap_content" 104 + android:layout_width="160dp"
104 - android:layout_height="wrap_content" 105 + android:layout_height="42dp"
105 - android:background="@drawable/shape_cos_grey5" 106 + android:background="@drawable/selector_button_green_border"
106 android:gravity="center" 107 android:gravity="center"
107 - android:paddingHorizontal="8dp"
108 - android:paddingVertical="4dp"
109 android:visibility="gone" 108 android:visibility="gone"
110 tools:visibility="gone"> 109 tools:visibility="gone">
111 110
112 <TextView 111 <TextView
113 android:id="@+id/tv_questionnaire" 112 android:id="@+id/tv_questionnaire"
114 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 113 + fontPath="fonts/PeridotPE-Bold.ttf"
115 android:layout_width="wrap_content" 114 android:layout_width="wrap_content"
116 android:layout_height="wrap_content" 115 android:layout_height="wrap_content"
116 + android:includeFontPadding="false"
117 android:text="@string/cos_profile_preferences" 117 android:text="@string/cos_profile_preferences"
118 - android:textColor="@color/cos_green6" /> 118 + android:textColor="@color/cos_green12"
119 + android:textSize="16sp" />
119 </LinearLayout> 120 </LinearLayout>
120 </LinearLayout> 121 </LinearLayout>
121 122
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
155 android:id="@+id/cl_deals_win_inner_cos" 156 android:id="@+id/cl_deals_win_inner_cos"
156 android:layout_width="0dp" 157 android:layout_width="0dp"
157 android:layout_height="0dp" 158 android:layout_height="0dp"
158 - android:background="@drawable/shape_cos_grey4" 159 + android:background="@drawable/shape_cos_white_border"
159 app:layout_constraintBottom_toBottomOf="parent" 160 app:layout_constraintBottom_toBottomOf="parent"
160 app:layout_constraintEnd_toEndOf="parent" 161 app:layout_constraintEnd_toEndOf="parent"
161 app:layout_constraintStart_toEndOf="@+id/gl_vertical_06_cos" 162 app:layout_constraintStart_toEndOf="@+id/gl_vertical_06_cos"
...@@ -170,12 +171,13 @@ ...@@ -170,12 +171,13 @@
170 171
171 <TextView 172 <TextView
172 android:id="@+id/tv_deals_value_all" 173 android:id="@+id/tv_deals_value_all"
173 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 174 + fontPath="fonts/PeridotPE-Regular.ttf"
175 + android:includeFontPadding="false"
174 android:layout_width="0dp" 176 android:layout_width="0dp"
175 android:layout_height="wrap_content" 177 android:layout_height="wrap_content"
176 android:layout_marginEnd="16dp" 178 android:layout_marginEnd="16dp"
177 android:text="@string/cos_deals_win_title_cos" 179 android:text="@string/cos_deals_win_title_cos"
178 - android:textColor="@android:color/white" 180 + android:textColor="@color/cos_light_black"
179 android:textSize="16sp" 181 android:textSize="16sp"
180 app:layout_constraintBottom_toBottomOf="parent" 182 app:layout_constraintBottom_toBottomOf="parent"
181 app:layout_constraintEnd_toEndOf="parent" 183 app:layout_constraintEnd_toEndOf="parent"
...@@ -196,10 +198,10 @@ ...@@ -196,10 +198,10 @@
196 198
197 <TextView 199 <TextView
198 android:id="@+id/tv_deals_value" 200 android:id="@+id/tv_deals_value"
199 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 201 + fontPath="fonts/PeridotPE-Bold.ttf"
200 android:layout_width="wrap_content" 202 android:layout_width="wrap_content"
201 android:layout_height="wrap_content" 203 android:layout_height="wrap_content"
202 - android:textColor="@color/cos_grey" 204 + android:textColor="@color/cos_light_black"
203 android:textSize="12sp" 205 android:textSize="12sp"
204 app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo" 206 app:layout_constraintEnd_toEndOf="@+id/iv_deals_logo"
205 app:layout_constraintStart_toStartOf="@+id/iv_deals_logo" 207 app:layout_constraintStart_toStartOf="@+id/iv_deals_logo"
...@@ -233,7 +235,7 @@ ...@@ -233,7 +235,7 @@
233 android:id="@+id/cl_deals_win_inner" 235 android:id="@+id/cl_deals_win_inner"
234 android:layout_width="0dp" 236 android:layout_width="0dp"
235 android:layout_height="0dp" 237 android:layout_height="0dp"
236 - android:background="@drawable/shape_cos_grey4" 238 + android:background="@drawable/shape_cos_white_border"
237 app:layout_constraintBottom_toBottomOf="parent" 239 app:layout_constraintBottom_toBottomOf="parent"
238 app:layout_constraintEnd_toEndOf="parent" 240 app:layout_constraintEnd_toEndOf="parent"
239 app:layout_constraintStart_toEndOf="@+id/gl_vertical_06" 241 app:layout_constraintStart_toEndOf="@+id/gl_vertical_06"
...@@ -248,12 +250,13 @@ ...@@ -248,12 +250,13 @@
248 250
249 <TextView 251 <TextView
250 android:id="@+id/tv_gifts_value_all" 252 android:id="@+id/tv_gifts_value_all"
251 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 253 + fontPath="fonts/PeridotPE-Regular.ttf"
254 + android:includeFontPadding="false"
252 android:layout_width="0dp" 255 android:layout_width="0dp"
253 android:layout_height="wrap_content" 256 android:layout_height="wrap_content"
254 android:layout_marginEnd="16dp" 257 android:layout_marginEnd="16dp"
255 android:text="@string/cos_deals_win_title" 258 android:text="@string/cos_deals_win_title"
256 - android:textColor="@android:color/white" 259 + android:textColor="@color/cos_light_black"
257 android:textSize="16sp" 260 android:textSize="16sp"
258 app:layout_constraintBottom_toBottomOf="parent" 261 app:layout_constraintBottom_toBottomOf="parent"
259 app:layout_constraintEnd_toEndOf="parent" 262 app:layout_constraintEnd_toEndOf="parent"
...@@ -274,10 +277,10 @@ ...@@ -274,10 +277,10 @@
274 277
275 <TextView 278 <TextView
276 android:id="@+id/tv_gifts_value" 279 android:id="@+id/tv_gifts_value"
277 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 280 + fontPath="fonts/PeridotPE-Bold.ttf"
278 android:layout_width="wrap_content" 281 android:layout_width="wrap_content"
279 android:layout_height="wrap_content" 282 android:layout_height="wrap_content"
280 - android:textColor="@color/cos_grey" 283 + android:textColor="@color/cos_light_black"
281 android:textSize="12sp" 284 android:textSize="12sp"
282 app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo" 285 app:layout_constraintEnd_toEndOf="@+id/iv_gifts_logo"
283 app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo" 286 app:layout_constraintStart_toStartOf="@+id/iv_gifts_logo"
...@@ -288,8 +291,8 @@ ...@@ -288,8 +291,8 @@
288 291
289 <ImageView 292 <ImageView
290 android:id="@+id/dfy_logo" 293 android:id="@+id/dfy_logo"
291 - android:layout_width="110dp" 294 + android:layout_width="220dp"
292 - android:layout_height="40dp" 295 + android:layout_height="30dp"
293 android:layout_gravity="start" 296 android:layout_gravity="start"
294 android:layout_marginHorizontal="16dp" 297 android:layout_marginHorizontal="16dp"
295 android:layout_marginTop="48dp" 298 android:layout_marginTop="48dp"
...@@ -300,8 +303,8 @@ ...@@ -300,8 +303,8 @@
300 android:layout_width="match_parent" 303 android:layout_width="match_parent"
301 android:layout_height="wrap_content" 304 android:layout_height="wrap_content"
302 android:layout_marginHorizontal="8dp" 305 android:layout_marginHorizontal="8dp"
303 - android:layout_marginTop="12dp" 306 + android:layout_marginTop="8dp"
304 - android:background="@drawable/shape_cos_white2" 307 + android:background="@drawable/shape_cos_white_border"
305 android:paddingVertical="10dp"> 308 android:paddingVertical="10dp">
306 309
307 <LinearLayout 310 <LinearLayout
...@@ -316,21 +319,21 @@ ...@@ -316,21 +319,21 @@
316 319
317 <TextView 320 <TextView
318 android:id="@+id/tv_active_gifts" 321 android:id="@+id/tv_active_gifts"
319 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 322 + fontPath="fonts/PeridotPE-Regular.ttf"
320 android:layout_width="wrap_content" 323 android:layout_width="wrap_content"
321 android:layout_height="wrap_content" 324 android:layout_height="wrap_content"
322 - android:textColor="@color/blue_dark" 325 + android:textColor="@color/cos_light_black"
323 android:textSize="18sp" 326 android:textSize="18sp"
324 tools:text="@string/cos_active_deals" /> 327 tools:text="@string/cos_active_deals" />
325 328
326 <TextView 329 <TextView
327 android:id="@+id/tv_active_deals_text" 330 android:id="@+id/tv_active_deals_text"
328 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 331 + fontPath="fonts/PeridotPE-Bold.ttf"
329 android:layout_width="wrap_content" 332 android:layout_width="wrap_content"
330 android:layout_height="wrap_content" 333 android:layout_height="wrap_content"
331 android:ellipsize="end" 334 android:ellipsize="end"
332 android:maxLines="2" 335 android:maxLines="2"
333 - android:textColor="@color/blue_dark" 336 + android:textColor="@color/cos_light_black"
334 android:textIsSelectable="true" 337 android:textIsSelectable="true"
335 android:textSize="18sp" 338 android:textSize="18sp"
336 tools:text="961544809" 339 tools:text="961544809"
...@@ -354,9 +357,10 @@ ...@@ -354,9 +357,10 @@
354 357
355 <TextView 358 <TextView
356 android:id="@+id/tv_active_deals_date_text" 359 android:id="@+id/tv_active_deals_date_text"
360 + fontPath="fonts/PeridotPE-Regular.ttf"
357 android:layout_width="wrap_content" 361 android:layout_width="wrap_content"
358 android:layout_height="wrap_content" 362 android:layout_height="wrap_content"
359 - android:textColor="@color/blue_dark" 363 + android:textColor="@color/cos_light_black"
360 android:visibility="gone" 364 android:visibility="gone"
361 tools:text="@string/cos_active_coupon_date" /> 365 tools:text="@string/cos_active_coupon_date" />
362 </LinearLayout> 366 </LinearLayout>
...@@ -375,15 +379,15 @@ ...@@ -375,15 +379,15 @@
375 379
376 <TextView 380 <TextView
377 android:id="@+id/tv_active_coupons_header" 381 android:id="@+id/tv_active_coupons_header"
378 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 382 + fontPath="fonts/BTCosmo-Bold.ttf"
379 android:layout_width="wrap_content" 383 android:layout_width="wrap_content"
380 android:layout_height="wrap_content" 384 android:layout_height="wrap_content"
381 android:layout_gravity="start" 385 android:layout_gravity="start"
382 android:layout_marginHorizontal="16dp" 386 android:layout_marginHorizontal="16dp"
383 android:layout_marginTop="48dp" 387 android:layout_marginTop="48dp"
384 android:layout_marginBottom="10dp" 388 android:layout_marginBottom="10dp"
385 - android:text="@string/cos_mygifts" 389 + android:text="@string/cos_gifts_title"
386 - android:textColor="@android:color/white" 390 + android:textColor="@color/cos_light_black"
387 android:textSize="20sp" /> 391 android:textSize="20sp" />
388 392
389 <androidx.recyclerview.widget.RecyclerView 393 <androidx.recyclerview.widget.RecyclerView
...@@ -391,8 +395,8 @@ ...@@ -391,8 +395,8 @@
391 android:layout_width="match_parent" 395 android:layout_width="match_parent"
392 android:layout_height="wrap_content" 396 android:layout_height="wrap_content"
393 android:layout_marginHorizontal="2dp" 397 android:layout_marginHorizontal="2dp"
394 - android:paddingBottom="40dp" 398 + android:overScrollMode="never"
395 - android:overScrollMode="never"/> 399 + android:paddingBottom="40dp" />
396 400
397 <LinearLayout 401 <LinearLayout
398 android:id="@+id/ll_empty_wallet" 402 android:id="@+id/ll_empty_wallet"
...@@ -410,13 +414,13 @@ ...@@ -410,13 +414,13 @@
410 android:src="@drawable/ic_empty_wallet" /> 414 android:src="@drawable/ic_empty_wallet" />
411 415
412 <TextView 416 <TextView
413 - fontPath="fonts/pf_square_sans_pro_regular.ttf" 417 + fontPath="fonts/PeridotPE-Regular.ttf"
414 android:layout_width="wrap_content" 418 android:layout_width="wrap_content"
415 android:layout_height="wrap_content" 419 android:layout_height="wrap_content"
416 android:layout_marginTop="8dp" 420 android:layout_marginTop="8dp"
417 android:gravity="center" 421 android:gravity="center"
418 android:text="@string/cos_empty_wallet" 422 android:text="@string/cos_empty_wallet"
419 - android:textColor="@color/cos_white_tr" 423 + android:textColor="@color/cos_light_black"
420 android:textSize="16sp" /> 424 android:textSize="16sp" />
421 </LinearLayout> 425 </LinearLayout>
422 </LinearLayout> 426 </LinearLayout>
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
26 android:layout_width="wrap_content" 26 android:layout_width="wrap_content"
27 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
28 android:text="@string/cos_coupon_shops_title" 28 android:text="@string/cos_coupon_shops_title"
29 - android:textColor="@color/grey" 29 + android:textColor="@color/cos_light_black"
30 - android:textSize="17sp" 30 + android:textSize="21sp"
31 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 31 + fontPath="fonts/BTCosmo-Bold.ttf"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
24 24
25 <TextView 25 <TextView
26 - fontPath="fonts/pf_square_sans_pro_medium.ttf" 26 + fontPath="fonts/BTCosmo-Bold.ttf"
27 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:text="@string/cos_coupon_shops_title" 29 android:text="@string/cos_coupon_shops_title"
30 - android:textColor="@color/grey" 30 + android:textColor="@color/cos_light_black"
31 - android:textSize="17sp" 31 + android:textSize="21sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
29 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
30 android:textColor="@color/cos_light_black" 30 android:textColor="@color/cos_light_black"
31 - android:textSize="17sp" 31 + android:textSize="21sp"
32 app:layout_constraintBottom_toBottomOf="parent" 32 app:layout_constraintBottom_toBottomOf="parent"
33 app:layout_constraintEnd_toEndOf="parent" 33 app:layout_constraintEnd_toEndOf="parent"
34 app:layout_constraintStart_toStartOf="parent" 34 app:layout_constraintStart_toStartOf="parent"
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 <LinearLayout 150 <LinearLayout
151 android:id="@+id/ll_activate_button" 151 android:id="@+id/ll_activate_button"
152 android:layout_width="160dp" 152 android:layout_width="160dp"
153 - android:layout_height="50dp" 153 + android:layout_height="42dp"
154 android:layout_below="@+id/textView13" 154 android:layout_below="@+id/textView13"
155 android:layout_centerHorizontal="true" 155 android:layout_centerHorizontal="true"
156 android:layout_marginTop="44dp" 156 android:layout_marginTop="44dp"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 7
8 <TextView 8 <TextView
9 android:id="@+id/tv_code_copy" 9 android:id="@+id/tv_code_copy"
10 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 10 + fontPath="fonts/PeridotPE-Bold.ttf"
11 android:layout_width="wrap_content" 11 android:layout_width="wrap_content"
12 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
13 android:background="@android:color/transparent" 13 android:background="@android:color/transparent"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 17
18 <TextView 18 <TextView
19 android:id="@+id/tv_code_comma" 19 android:id="@+id/tv_code_comma"
20 - fontPath="fonts/pf_square_sans_pro_bold.ttf" 20 + fontPath="fonts/PeridotPE-Bold.ttf"
21 android:layout_width="wrap_content" 21 android:layout_width="wrap_content"
22 android:layout_height="wrap_content" 22 android:layout_height="wrap_content"
23 android:background="@android:color/transparent" 23 android:background="@android:color/transparent"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="wrap_content" 4 android:layout_height="wrap_content"
5 + android:gravity="center_horizontal"
5 android:orientation="horizontal" 6 android:orientation="horizontal"
6 android:weightSum="1"> 7 android:weightSum="1">
7 8
...@@ -10,18 +11,23 @@ ...@@ -10,18 +11,23 @@
10 android:layout_width="wrap_content" 11 android:layout_width="wrap_content"
11 android:layout_height="32dp" 12 android:layout_height="32dp"
12 android:layout_weight="0.2" 13 android:layout_weight="0.2"
13 - android:background="@drawable/bottom_border_gradient2" 14 + android:background="@drawable/bottom_border_light_blue"
14 android:gravity="center_horizontal"> 15 android:gravity="center_horizontal">
15 16
16 <TextView 17 <TextView
17 android:id="@+id/tv_expired_tab" 18 android:id="@+id/tv_expired_tab"
19 + fontPath="fonts/PeridotPE-Bold.ttf"
18 android:layout_width="wrap_content" 20 android:layout_width="wrap_content"
19 android:layout_height="wrap_content" 21 android:layout_height="wrap_content"
20 android:text="@string/cos_redeemed_coupons_tab" 22 android:text="@string/cos_redeemed_coupons_tab"
21 - android:textColor="@color/cos_cyan4" 23 + android:textColor="@color/cos_light_black"
22 - android:textSize="14sp" /> 24 + android:textSize="16sp" />
23 </LinearLayout> 25 </LinearLayout>
24 26
27 + <View
28 + android:layout_width="16dp"
29 + android:layout_height="32dp" />
30 +
25 <LinearLayout 31 <LinearLayout
26 android:id="@+id/ll_tab_shared" 32 android:id="@+id/ll_tab_shared"
27 android:layout_width="wrap_content" 33 android:layout_width="wrap_content"
...@@ -32,10 +38,11 @@ ...@@ -32,10 +38,11 @@
32 38
33 <TextView 39 <TextView
34 android:id="@+id/tv_shared_tab" 40 android:id="@+id/tv_shared_tab"
41 + fontPath="fonts/PeridotPE-SemiBold.ttf"
35 android:layout_width="wrap_content" 42 android:layout_width="wrap_content"
36 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
37 android:text="@string/cos_shared_gifts_tab" 44 android:text="@string/cos_shared_gifts_tab"
38 - android:textColor="@color/cos_dark_grey" 45 + android:textColor="@color/cos_gray2"
39 - android:textSize="14sp" /> 46 + android:textSize="16sp" />
40 </LinearLayout> 47 </LinearLayout>
41 </LinearLayout> 48 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -70,4 +70,5 @@ ...@@ -70,4 +70,5 @@
70 <color name="cos_green6_tr">#660EA600</color> 70 <color name="cos_green6_tr">#660EA600</color>
71 <color name="cos_gray">#9D9D9C</color> 71 <color name="cos_gray">#9D9D9C</color>
72 <color name="cos_gray2">#848484</color> 72 <color name="cos_gray2">#848484</color>
73 + <color name="cos_light_blue">#00A5E3</color>
73 </resources> 74 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <string name="cos_monthly">Μηνιαία</string> 56 <string name="cos_monthly">Μηνιαία</string>
57 <string name="cos_six_months">6Μηνο</string> 57 <string name="cos_six_months">6Μηνο</string>
58 <string name="cos_annual">12Μηνο</string> 58 <string name="cos_annual">12Μηνο</string>
59 - <string name="cos_analysis2">Αναλυτικά:</string> 59 + <string name="cos_analysis2">Αναλυτικά</string>
60 <string name="euro">€</string> 60 <string name="euro">€</string>
61 <string name="percentage">%</string> 61 <string name="percentage">%</string>
62 <string name="plus_one">1+1</string> 62 <string name="plus_one">1+1</string>
......
...@@ -38,5 +38,12 @@ ...@@ -38,5 +38,12 @@
38 <item name="windowActionBar">false</item> 38 <item name="windowActionBar">false</item>
39 <item name="windowNoTitle">true</item> 39 <item name="windowNoTitle">true</item>
40 </style> 40 </style>
41 +
42 + <style name="ShapeAppearanceProfileImage" parent="">
43 + <item name="cornerFamilyTopLeft">rounded</item>
44 + <item name="cornerFamilyBottomRight">rounded</item>
45 + <item name="cornerSizeTopLeft">19dp</item>
46 + <item name="cornerSizeBottomRight">19dp</item>
47 + </style>
41 48
42 </resources> 49 </resources>
...\ No newline at end of file ...\ No newline at end of file
......