Showing
34 changed files
with
194 additions
and
203 deletions
... | @@ -29,15 +29,21 @@ | ... | @@ -29,15 +29,21 @@ |
29 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border.xml" value="0.2705" /> | 29 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border.xml" value="0.2705" /> |
30 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border_gradient.xml" value="0.2705" /> | 30 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/bottom_border_gradient.xml" value="0.2705" /> |
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" /> | ||
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" /> | ||
32 | <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" /> | 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/button_border_dark_blue.xml" value="0.2965" /> | ||
33 | <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" /> | 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" /> |
34 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/divider.xml" value="0.2965" /> | 37 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/divider.xml" value="0.2965" /> |
35 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/divider2.xml" value="0.2965" /> | 38 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/divider2.xml" value="0.2965" /> |
36 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border.xml" value="0.2705" /> | 39 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border.xml" value="0.2705" /> |
37 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_green.xml" value="0.2705" /> | 40 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_green.xml" value="0.2705" /> |
41 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_green2.xml" value="0.2965" /> | ||
42 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_green2_tr.xml" value="0.2965" /> | ||
38 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_tr.xml" value="0.2705" /> | 43 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_tr.xml" value="0.2705" /> |
39 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_with_border_radius.xml" value="0.2705" /> | 44 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/round_border_with_border_radius.xml" value="0.2705" /> |
40 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_button_green.xml" value="0.2705" /> | 45 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_button_green.xml" value="0.2705" /> |
46 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_button_green_border.xml" value="0.2965" /> | ||
41 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_button_grey.xml" value="0.2705" /> | 47 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_button_grey.xml" value="0.2705" /> |
42 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_cos_campaign.xml" value="0.2705" /> | 48 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_cos_campaign.xml" value="0.2705" /> |
43 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_cos_white.xml" value="0.2705" /> | 49 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/selector_cos_white.xml" value="0.2705" /> |
... | @@ -88,6 +94,7 @@ | ... | @@ -88,6 +94,7 @@ |
88 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_dashed.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_dashed.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_dashed_vertical.xml" value="0.2705" /> | 95 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_dashed_vertical.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_line_gradient.xml" value="0.2965" /> | 96 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_line_gradient.xml" value="0.2965" /> |
97 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_market_limit.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_round_border_gradient.xml" value="0.2965" /> | 98 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_round_border_gradient.xml" value="0.2965" /> |
92 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_round_border_gradient2.xml" value="0.2965" /> | 99 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_round_border_gradient2.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_top_left_rounded.xml" value="0.2705" /> | 100 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/drawable/shape_top_left_rounded.xml" value="0.2705" /> |
... | @@ -104,21 +111,23 @@ | ... | @@ -104,21 +111,23 @@ |
104 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_bill_payment.xml" value="0.358695652173913" /> | 111 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_bill_payment.xml" value="0.358695652173913" /> |
105 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_contextual.xml" value="0.22" /> | 112 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_contextual.xml" value="0.22" /> |
106 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupon_gift.xml" value="0.36666666666666664" /> | 113 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupon_gift.xml" value="0.36666666666666664" /> |
107 | - <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupon_info.xml" value="0.33" /> | 114 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupon_info.xml" value="0.2" /> |
108 | - <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupon_share.xml" value="0.36666666666666664" /> | 115 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupon_share.xml" value="0.22" /> |
109 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupons_history.xml" value="0.358695652173913" /> | 116 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_coupons_history.xml" value="0.358695652173913" /> |
110 | - <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_couponset_info.xml" value="0.18681693989071038" /> | 117 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_couponset_info.xml" value="0.22" /> |
111 | - <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_gifts_for_you.xml" value="0.358695652173913" /> | 118 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_gifts_for_you.xml" value="0.22" /> |
112 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_list_for_you.xml" value="0.358695652173913" /> | 119 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_list_for_you.xml" value="0.358695652173913" /> |
113 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_loyalty.xml" value="0.3226397800183318" /> | 120 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_loyalty.xml" value="0.3226397800183318" /> |
114 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_loyalty_analysis.xml" value="0.33" /> | 121 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_loyalty_analysis.xml" value="0.33" /> |
122 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_loyalty_market_analysis.xml" value="0.23157894736842105" /> | ||
115 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_loyalty_wallet.xml" value="0.30782684739833843" /> | 123 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_loyalty_wallet.xml" value="0.30782684739833843" /> |
116 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_more_for_you.xml" value="0.22" /> | 124 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_more_for_you.xml" value="0.22" /> |
117 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_past_coupons.xml" value="0.358695652173913" /> | 125 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_past_coupons.xml" value="0.358695652173913" /> |
118 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_shops.xml" value="0.36666666666666664" /> | 126 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_shops.xml" value="0.36666666666666664" /> |
119 | - <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_shops_huawei.xml" value="0.23157894736842105" /> | 127 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_shops_huawei.xml" value="0.18618618618618618" /> |
120 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_steps.xml" value="0.358695652173913" /> | 128 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_steps.xml" value="0.358695652173913" /> |
121 | - <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_telco.xml" value="0.36666666666666664" /> | 129 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_telco.xml" value="0.2" /> |
130 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_unified_coupon_info.xml" value="0.23157894736842105" /> | ||
122 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_webview.xml" value="0.4282238442822384" /> | 131 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_webview.xml" value="0.4282238442822384" /> |
123 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/burnt_coupon_layout.xml" value="0.358695652173913" /> | 132 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/burnt_coupon_layout.xml" value="0.358695652173913" /> |
124 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/button_with_image.xml" value="0.358695652173913" /> | 133 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/button_with_image.xml" value="0.358695652173913" /> |
... | @@ -129,6 +138,7 @@ | ... | @@ -129,6 +138,7 @@ |
129 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/cos_piechart_conditional_render.xml" value="0.358695652173913" /> | 138 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/cos_piechart_conditional_render.xml" value="0.358695652173913" /> |
130 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/coupon_layout.xml" value="0.358695652173913" /> | 139 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/coupon_layout.xml" value="0.358695652173913" /> |
131 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/coupon_transaction.xml" value="0.358695652173913" /> | 140 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/coupon_transaction.xml" value="0.358695652173913" /> |
141 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/custom_coupon_layout.xml" value="0.30085470085470084" /> | ||
132 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/dl_dialog.xml" value="0.358695652173913" /> | 142 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/dl_dialog.xml" value="0.358695652173913" /> |
133 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/dl_map_pin.xml" value="0.36666666666666664" /> | 143 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/dl_map_pin.xml" value="0.36666666666666664" /> |
134 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/dl_share.xml" value="0.36666666666666664" /> | 144 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/dl_share.xml" value="0.36666666666666664" /> |
... | @@ -152,6 +162,7 @@ | ... | @@ -152,6 +162,7 @@ |
152 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/loyalty_coupons.xml" value="0.358695652173913" /> | 162 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/loyalty_coupons.xml" value="0.358695652173913" /> |
153 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/loyalty_gifts.xml" value="0.358695652173913" /> | 163 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/loyalty_gifts.xml" value="0.358695652173913" /> |
154 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/loyalty_redeemed_gifts.xml" value="0.358695652173913" /> | 164 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/loyalty_redeemed_gifts.xml" value="0.358695652173913" /> |
165 | + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/market_coupon_layout.xml" value="0.23157894736842105" /> | ||
155 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/past_coupon_layout.xml" value="0.358695652173913" /> | 166 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/past_coupon_layout.xml" value="0.358695652173913" /> |
156 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/payment_success_dialog.xml" value="0.358695652173913" /> | 167 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/payment_success_dialog.xml" value="0.358695652173913" /> |
157 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/redeemed_gift_layout.xml" value="0.358695652173913" /> | 168 | <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/redeemed_gift_layout.xml" value="0.358695652173913" /> | ... | ... |
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <shape xmlns:android="http://schemas.android.com/apk/res/android"> | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android"> |
3 | - <solid android:color="@color/cos_light_grey"/> | 3 | + <solid android:color="@color/cos_light_grey3"/> |
4 | - <corners android:radius="10dp"/> | 4 | + <corners android:radius="16dp"/> |
5 | <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" /> | 5 | <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" /> |
6 | </shape> | 6 | </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 | + <solid android:color="@color/white"/> | ||
4 | + <stroke android:width="2dp" android:color="@color/cos_green12" /> | ||
5 | + <corners android:radius="16dp" /> | ||
6 | +</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 | + <solid android:color="@color/white"/> | ||
4 | + <stroke android:width="2dp" android:color="@color/cos_green6_tr" /> | ||
5 | + <corners android:radius="16dp" /> | ||
6 | +</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <item android:drawable="@drawable/round_border_green2_tr" android:state_pressed="true" /> | ||
4 | + <item android:drawable="@drawable/round_border_green2" android:state_pressed="false" /> | ||
5 | +</selector> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" |
3 | android:shape="rectangle"> | 3 | android:shape="rectangle"> |
4 | - <corners android:radius="4dp" /> | 4 | + <corners android:radius="16dp" /> |
5 | 5 | ||
6 | <solid android:color="@android:color/white" /> | 6 | <solid android:color="@android:color/white" /> |
7 | </shape> | 7 | </shape> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" |
3 | android:shape="rectangle"> | 3 | android:shape="rectangle"> |
4 | - <corners android:radius="4dp" /> | 4 | + <corners android:radius="16dp" /> |
5 | 5 | ||
6 | <solid android:color="@color/white_tr" /> | 6 | <solid android:color="@color/white_tr" /> |
7 | </shape> | 7 | </shape> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" |
3 | android:shape="rectangle"> | 3 | android:shape="rectangle"> |
4 | - <corners android:radius="12dp" /> | 4 | + <corners android:radius="16dp" /> |
5 | 5 | ||
6 | <solid | 6 | <solid |
7 | android:width="2dp" | 7 | android:width="2dp" |
8 | - android:color="@color/cos_green5" /> | 8 | + android:color="@color/cos_green12" /> |
9 | </shape> | 9 | </shape> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" |
3 | android:shape="rectangle"> | 3 | android:shape="rectangle"> |
4 | - <corners android:radius="12dp" /> | 4 | + <corners android:radius="16dp" /> |
5 | 5 | ||
6 | <solid | 6 | <solid |
7 | android:width="2dp" | 7 | android:width="2dp" |
8 | - android:color="@color/cos_green5_tr" /> | 8 | + android:color="@color/cos_green6_tr" /> |
9 | </shape> | 9 | </shape> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -2,8 +2,8 @@ | ... | @@ -2,8 +2,8 @@ |
2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" |
3 | android:shape="rectangle"> | 3 | android:shape="rectangle"> |
4 | <corners | 4 | <corners |
5 | - android:topLeftRadius="12dp" | 5 | + android:topLeftRadius="16dp" |
6 | - android:topRightRadius="12dp" /> | 6 | + android:topRightRadius="16dp" /> |
7 | 7 | ||
8 | - <solid android:color="@android:color/white" /> | 8 | + <solid android:color="@color/white" /> |
9 | </shape> | 9 | </shape> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -3,13 +3,13 @@ | ... | @@ -3,13 +3,13 @@ |
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="@android:color/white"> | 6 | + android:background="@color/white"> |
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="64dp" |
12 | - android:background="@android:color/white"> | 12 | + android:background="@color/white"> |
13 | 13 | ||
14 | <ImageView | 14 | <ImageView |
15 | android:id="@+id/iv_contextual_back" | 15 | android:id="@+id/iv_contextual_back" |
... | @@ -23,9 +23,10 @@ | ... | @@ -23,9 +23,10 @@ |
23 | app:layout_constraintTop_toTopOf="parent" /> | 23 | app:layout_constraintTop_toTopOf="parent" /> |
24 | 24 | ||
25 | <TextView | 25 | <TextView |
26 | + fontPath="fonts/BTCosmo-Bold.ttf" | ||
26 | android:layout_width="wrap_content" | 27 | android:layout_width="wrap_content" |
27 | android:layout_height="wrap_content" | 28 | android:layout_height="wrap_content" |
28 | - android:textColor="@color/grey" | 29 | + android:textColor="@color/cos_light_black" |
29 | android:textSize="17sp" | 30 | android:textSize="17sp" |
30 | android:textStyle="bold" | 31 | android:textStyle="bold" |
31 | app:layout_constraintBottom_toBottomOf="parent" | 32 | app:layout_constraintBottom_toBottomOf="parent" |
... | @@ -43,7 +44,7 @@ | ... | @@ -43,7 +44,7 @@ |
43 | <androidx.constraintlayout.widget.ConstraintLayout | 44 | <androidx.constraintlayout.widget.ConstraintLayout |
44 | android:layout_width="match_parent" | 45 | android:layout_width="match_parent" |
45 | android:layout_height="match_parent" | 46 | android:layout_height="match_parent" |
46 | - android:background="@android:color/white"> | 47 | + android:background="@color/white"> |
47 | 48 | ||
48 | <!-- android:background="@drawable/shape_cos_loyalty_white"--> | 49 | <!-- android:background="@drawable/shape_cos_loyalty_white"--> |
49 | <androidx.constraintlayout.widget.ConstraintLayout | 50 | <androidx.constraintlayout.widget.ConstraintLayout |
... | @@ -59,30 +60,20 @@ | ... | @@ -59,30 +60,20 @@ |
59 | android:id="@+id/imageView6" | 60 | android:id="@+id/imageView6" |
60 | android:layout_width="match_parent" | 61 | android:layout_width="match_parent" |
61 | android:layout_height="253dp" | 62 | android:layout_height="253dp" |
62 | - android:layout_marginTop="0.5dp" | ||
63 | android:scaleType="centerCrop" | 63 | android:scaleType="centerCrop" |
64 | app:layout_constraintStart_toStartOf="parent" | 64 | app:layout_constraintStart_toStartOf="parent" |
65 | app:layout_constraintTop_toTopOf="parent" | 65 | app:layout_constraintTop_toTopOf="parent" |
66 | tools:src="@drawable/carousel_banner" /> | 66 | tools:src="@drawable/carousel_banner" /> |
67 | 67 | ||
68 | - <LinearLayout | ||
69 | - android:layout_width="match_parent" | ||
70 | - android:layout_height="wrap_content" | ||
71 | - android:background="@drawable/ic_line" | ||
72 | - app:layout_constraintStart_toStartOf="parent" | ||
73 | - app:layout_constraintEnd_toEndOf="parent" | ||
74 | - app:layout_constraintTop_toTopOf="@+id/imageView6"> | ||
75 | - | ||
76 | - </LinearLayout> | ||
77 | - | ||
78 | <TextView | 68 | <TextView |
69 | + fontPath="fonts/BTCosmo-Bold.ttf" | ||
79 | android:id="@+id/textView13" | 70 | android:id="@+id/textView13" |
80 | android:layout_width="match_parent" | 71 | android:layout_width="match_parent" |
81 | android:layout_height="wrap_content" | 72 | android:layout_height="wrap_content" |
82 | android:layout_marginTop="32dp" | 73 | android:layout_marginTop="32dp" |
83 | android:gravity="center" | 74 | android:gravity="center" |
84 | android:paddingHorizontal="32dp" | 75 | android:paddingHorizontal="32dp" |
85 | - android:textColor="#415564" | 76 | + android:textColor="@color/cos_light_black" |
86 | android:textSize="18sp" | 77 | android:textSize="18sp" |
87 | android:textStyle="bold" | 78 | android:textStyle="bold" |
88 | app:layout_constraintEnd_toEndOf="parent" | 79 | app:layout_constraintEnd_toEndOf="parent" |
... | @@ -92,13 +83,14 @@ | ... | @@ -92,13 +83,14 @@ |
92 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> | 83 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> |
93 | 84 | ||
94 | <TextView | 85 | <TextView |
86 | + fontPath="fonts/PeridotPE-Regular.ttf" | ||
95 | android:id="@+id/textView14" | 87 | android:id="@+id/textView14" |
96 | android:layout_width="match_parent" | 88 | android:layout_width="match_parent" |
97 | android:layout_height="wrap_content" | 89 | android:layout_height="wrap_content" |
98 | android:layout_marginTop="16dp" | 90 | android:layout_marginTop="16dp" |
99 | android:gravity="center" | 91 | android:gravity="center" |
100 | android:paddingHorizontal="32dp" | 92 | android:paddingHorizontal="32dp" |
101 | - android:textColor="#415564" | 93 | + android:textColor="@color/cos_light_black" |
102 | android:textSize="16sp" | 94 | android:textSize="16sp" |
103 | tools:text="test test" | 95 | tools:text="test test" |
104 | app:layout_constraintEnd_toEndOf="parent" | 96 | app:layout_constraintEnd_toEndOf="parent" |
... | @@ -107,26 +99,24 @@ | ... | @@ -107,26 +99,24 @@ |
107 | 99 | ||
108 | <LinearLayout | 100 | <LinearLayout |
109 | android:id="@+id/ll_activate_button" | 101 | android:id="@+id/ll_activate_button" |
110 | - android:layout_width="wrap_content" | 102 | + android:layout_width="160dp" |
111 | - android:layout_height="wrap_content" | 103 | + android:layout_height="50dp" |
112 | - android:layout_marginHorizontal="32dp" | ||
113 | android:background="@drawable/selector_button_green" | 104 | android:background="@drawable/selector_button_green" |
114 | android:gravity="center" | 105 | android:gravity="center" |
115 | android:orientation="horizontal" | 106 | android:orientation="horizontal" |
116 | - android:paddingHorizontal="16dp" | ||
117 | - android:paddingVertical="8dp" | ||
118 | app:layout_constraintBottom_toBottomOf="parent" | 107 | app:layout_constraintBottom_toBottomOf="parent" |
119 | app:layout_constraintEnd_toEndOf="parent" | 108 | app:layout_constraintEnd_toEndOf="parent" |
120 | app:layout_constraintStart_toStartOf="parent"> | 109 | app:layout_constraintStart_toStartOf="parent"> |
121 | 110 | ||
122 | <TextView | 111 | <TextView |
112 | + fontPath="fonts/PeridotPE-SemiBold.ttf" | ||
123 | android:layout_width="wrap_content" | 113 | android:layout_width="wrap_content" |
124 | android:layout_height="wrap_content" | 114 | android:layout_height="wrap_content" |
125 | android:gravity="center" | 115 | android:gravity="center" |
116 | + android:includeFontPadding="false" | ||
126 | android:text="@string/cos_dlg_positive_button" | 117 | android:text="@string/cos_dlg_positive_button" |
127 | android:textColor="@color/white" | 118 | android:textColor="@color/white" |
128 | - android:textFontWeight="600" | 119 | + android:textSize="16sp" /> |
129 | - android:textSize="17dp" /> | ||
130 | </LinearLayout> | 120 | </LinearLayout> |
131 | 121 | ||
132 | </androidx.constraintlayout.widget.ConstraintLayout> | 122 | </androidx.constraintlayout.widget.ConstraintLayout> | ... | ... |
... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,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="64dp" |
12 | android:background="@android:color/white"> | 12 | android:background="@android:color/white"> |
13 | 13 | ||
14 | <ImageView | 14 | <ImageView |
... | @@ -23,11 +23,11 @@ | ... | @@ -23,11 +23,11 @@ |
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_info_title" | 29 | android:text="@string/cos_coupon_info_title" |
30 | - android:textColor="@color/grey" | 30 | + android:textColor="@color/cos_light_black" |
31 | android:textSize="17sp" | 31 | android:textSize="17sp" |
32 | app:layout_constraintBottom_toBottomOf="parent" | 32 | app:layout_constraintBottom_toBottomOf="parent" |
33 | app:layout_constraintEnd_toEndOf="parent" | 33 | app:layout_constraintEnd_toEndOf="parent" |
... | @@ -49,7 +49,7 @@ | ... | @@ -49,7 +49,7 @@ |
49 | android:id="@+id/cl_loyalty_info_view_inner" | 49 | android:id="@+id/cl_loyalty_info_view_inner" |
50 | android:layout_width="match_parent" | 50 | android:layout_width="match_parent" |
51 | android:layout_height="wrap_content" | 51 | android:layout_height="wrap_content" |
52 | - android:background="@android:color/white" | 52 | + android:background="@color/white" |
53 | android:orientation="vertical" | 53 | android:orientation="vertical" |
54 | android:paddingBottom="48dp"> | 54 | android:paddingBottom="48dp"> |
55 | 55 | ||
... | @@ -57,67 +57,66 @@ | ... | @@ -57,67 +57,66 @@ |
57 | android:id="@+id/imageView6" | 57 | android:id="@+id/imageView6" |
58 | android:layout_width="match_parent" | 58 | android:layout_width="match_parent" |
59 | android:layout_height="253dp" | 59 | android:layout_height="253dp" |
60 | - android:layout_marginTop="0.5dp" | ||
61 | android:scaleType="centerCrop" | 60 | android:scaleType="centerCrop" |
62 | tools:src="@drawable/carousel_banner" /> | 61 | tools:src="@drawable/carousel_banner" /> |
63 | 62 | ||
64 | <TextView | 63 | <TextView |
65 | android:id="@+id/textView13" | 64 | android:id="@+id/textView13" |
66 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 65 | + fontPath="fonts/BTCosmo-Bold.ttf" |
67 | android:layout_width="match_parent" | 66 | android:layout_width="match_parent" |
68 | android:layout_height="wrap_content" | 67 | android:layout_height="wrap_content" |
69 | android:layout_marginTop="32dp" | 68 | android:layout_marginTop="32dp" |
70 | android:gravity="center" | 69 | android:gravity="center" |
71 | android:paddingHorizontal="32dp" | 70 | android:paddingHorizontal="32dp" |
72 | - android:textColor="#415564" | 71 | + android:textColor="@color/cos_light_black" |
73 | android:textSize="18sp" | 72 | android:textSize="18sp" |
74 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> | 73 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> |
75 | 74 | ||
76 | <TextView | 75 | <TextView |
77 | android:id="@+id/textView14" | 76 | android:id="@+id/textView14" |
78 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 77 | + fontPath="fonts/PeridotPE-Regular.ttf" |
79 | android:layout_width="match_parent" | 78 | android:layout_width="match_parent" |
80 | android:layout_height="wrap_content" | 79 | android:layout_height="wrap_content" |
81 | android:layout_marginTop="16dp" | 80 | android:layout_marginTop="16dp" |
82 | android:gravity="center" | 81 | android:gravity="center" |
83 | android:paddingHorizontal="32dp" | 82 | android:paddingHorizontal="32dp" |
84 | - android:textColor="#415564" | 83 | + android:textColor="@color/cos_light_black" |
85 | android:textSize="16sp" | 84 | android:textSize="16sp" |
86 | tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" /> | 85 | tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" /> |
87 | 86 | ||
88 | <TextView | 87 | <TextView |
89 | android:id="@+id/tv_clickable_link" | 88 | android:id="@+id/tv_clickable_link" |
90 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 89 | + fontPath="fonts/PeridotPE-Regular.ttf" |
91 | android:layout_width="match_parent" | 90 | android:layout_width="match_parent" |
92 | android:layout_height="wrap_content" | 91 | android:layout_height="wrap_content" |
93 | android:layout_marginTop="16dp" | 92 | android:layout_marginTop="16dp" |
94 | android:gravity="center" | 93 | android:gravity="center" |
95 | android:paddingHorizontal="32dp" | 94 | android:paddingHorizontal="32dp" |
96 | - android:textColor="#415564" | 95 | + android:textColor="@color/cos_light_black" |
97 | android:textSize="16sp" | 96 | android:textSize="16sp" |
98 | tools:text="Χρησιμοποίησε" /> | 97 | tools:text="Χρησιμοποίησε" /> |
99 | 98 | ||
100 | <TextView | 99 | <TextView |
101 | android:id="@+id/textView15" | 100 | android:id="@+id/textView15" |
102 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 101 | + fontPath="fonts/PeridotPE-Bold.ttf" |
103 | android:layout_width="wrap_content" | 102 | android:layout_width="wrap_content" |
104 | android:layout_height="wrap_content" | 103 | android:layout_height="wrap_content" |
105 | android:layout_gravity="center" | 104 | android:layout_gravity="center" |
106 | android:layout_marginTop="48dp" | 105 | android:layout_marginTop="48dp" |
107 | android:text="Κωδικός Κουπονιού" | 106 | android:text="Κωδικός Κουπονιού" |
108 | - android:textColor="#415564" | 107 | + android:textColor="@color/cos_light_black" |
109 | android:textSize="18sp" /> | 108 | android:textSize="18sp" /> |
110 | 109 | ||
111 | <TextView | 110 | <TextView |
112 | android:id="@+id/textView16" | 111 | android:id="@+id/textView16" |
113 | - fontPath="fonts/pf_square_sans_pro_bold.ttf" | 112 | + fontPath="fonts/PeridotPE-Bold.ttf" |
114 | android:layout_width="match_parent" | 113 | android:layout_width="match_parent" |
115 | android:layout_height="50dp" | 114 | android:layout_height="50dp" |
116 | android:layout_marginHorizontal="32dp" | 115 | android:layout_marginHorizontal="32dp" |
117 | android:layout_marginTop="12dp" | 116 | android:layout_marginTop="12dp" |
118 | android:background="@drawable/banner_border_light_grey" | 117 | android:background="@drawable/banner_border_light_grey" |
119 | android:gravity="center" | 118 | android:gravity="center" |
120 | - android:textColor="@color/grey" | 119 | + android:textColor="@color/cos_light_black" |
121 | android:textIsSelectable="true" | 120 | android:textIsSelectable="true" |
122 | android:textSize="25dp" | 121 | android:textSize="25dp" |
123 | tools:text="1A2C378" /> | 122 | tools:text="1A2C378" /> |
... | @@ -156,11 +155,11 @@ | ... | @@ -156,11 +155,11 @@ |
156 | 155 | ||
157 | <TextView | 156 | <TextView |
158 | android:id="@+id/tv_full_barcode" | 157 | android:id="@+id/tv_full_barcode" |
159 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 158 | + fontPath="fonts/PeridotPE-Regular.ttf" |
160 | android:layout_width="wrap_content" | 159 | android:layout_width="wrap_content" |
161 | android:layout_height="wrap_content" | 160 | android:layout_height="wrap_content" |
162 | android:layout_marginTop="12dp" | 161 | android:layout_marginTop="12dp" |
163 | - android:textColor="@color/grey" | 162 | + android:textColor="@color/cos_light_black" |
164 | android:textSize="20sp" | 163 | android:textSize="20sp" |
165 | tools:text="@string/cos_show_barcode" /> | 164 | tools:text="@string/cos_show_barcode" /> |
166 | 165 | ||
... | @@ -184,11 +183,11 @@ | ... | @@ -184,11 +183,11 @@ |
184 | 183 | ||
185 | <TextView | 184 | <TextView |
186 | android:id="@+id/tv_barcode" | 185 | android:id="@+id/tv_barcode" |
187 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 186 | + fontPath="fonts/PeridotPE-SemiBold.ttf" |
188 | android:layout_width="wrap_content" | 187 | android:layout_width="wrap_content" |
189 | android:layout_height="wrap_content" | 188 | android:layout_height="wrap_content" |
190 | android:text="@string/cos_show_barcode" | 189 | android:text="@string/cos_show_barcode" |
191 | - android:textColor="@color/grey" | 190 | + android:textColor="@color/cos_light_black" |
192 | android:textSize="16sp" /> | 191 | android:textSize="16sp" /> |
193 | 192 | ||
194 | <ImageView | 193 | <ImageView |
... | @@ -196,24 +195,25 @@ | ... | @@ -196,24 +195,25 @@ |
196 | android:layout_width="14dp" | 195 | android:layout_width="14dp" |
197 | android:layout_height="14dp" | 196 | android:layout_height="14dp" |
198 | android:layout_marginStart="6dp" | 197 | android:layout_marginStart="6dp" |
198 | + android:layout_marginTop="3dp" | ||
199 | android:src="@drawable/ic_down_dark_new" /> | 199 | android:src="@drawable/ic_down_dark_new" /> |
200 | </LinearLayout> | 200 | </LinearLayout> |
201 | </LinearLayout> | 201 | </LinearLayout> |
202 | 202 | ||
203 | <TextView | 203 | <TextView |
204 | android:id="@+id/textView17" | 204 | android:id="@+id/textView17" |
205 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 205 | + fontPath="fonts/PeridotPE-Regular.ttf" |
206 | android:layout_width="wrap_content" | 206 | android:layout_width="wrap_content" |
207 | android:layout_height="wrap_content" | 207 | android:layout_height="wrap_content" |
208 | android:layout_gravity="center" | 208 | android:layout_gravity="center" |
209 | android:layout_marginTop="40dp" | 209 | android:layout_marginTop="40dp" |
210 | - android:textColor="#415564" | 210 | + android:textColor="@color/cos_gray" |
211 | tools:text="@string/cos_coupon_date" /> | 211 | tools:text="@string/cos_coupon_date" /> |
212 | 212 | ||
213 | <LinearLayout | 213 | <LinearLayout |
214 | android:id="@+id/ll_gift_it" | 214 | android:id="@+id/ll_gift_it" |
215 | - android:layout_width="220dp" | 215 | + android:layout_width="160dp" |
216 | - android:layout_height="wrap_content" | 216 | + android:layout_height="50dp" |
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" |
... | @@ -223,23 +223,24 @@ | ... | @@ -223,23 +223,24 @@ |
223 | android:paddingVertical="8dp"> | 223 | android:paddingVertical="8dp"> |
224 | 224 | ||
225 | <TextView | 225 | <TextView |
226 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 226 | + fontPath="fonts/PeridotPE-SemiBold.ttf" |
227 | android:layout_width="wrap_content" | 227 | android:layout_width="wrap_content" |
228 | android:layout_height="wrap_content" | 228 | android:layout_height="wrap_content" |
229 | android:gravity="center" | 229 | android:gravity="center" |
230 | + android:includeFontPadding="false" | ||
230 | android:text="@string/cos_gift_it" | 231 | android:text="@string/cos_gift_it" |
231 | android:textColor="@color/white" | 232 | android:textColor="@color/white" |
232 | - android:textSize="17dp" /> | 233 | + android:textSize="16sp" /> |
233 | </LinearLayout> | 234 | </LinearLayout> |
234 | 235 | ||
235 | <LinearLayout | 236 | <LinearLayout |
236 | android:id="@+id/ll_shops" | 237 | android:id="@+id/ll_shops" |
237 | android:layout_width="220dp" | 238 | android:layout_width="220dp" |
238 | - android:layout_height="wrap_content" | 239 | + android:layout_height="50dp" |
239 | android:layout_gravity="center" | 240 | android:layout_gravity="center" |
240 | android:layout_marginHorizontal="32dp" | 241 | android:layout_marginHorizontal="32dp" |
241 | android:layout_marginTop="24dp" | 242 | android:layout_marginTop="24dp" |
242 | - android:background="@drawable/selector_button_grey" | 243 | + android:background="@drawable/selector_button_green_border" |
243 | android:gravity="center" | 244 | android:gravity="center" |
244 | android:orientation="horizontal" | 245 | android:orientation="horizontal" |
245 | android:paddingVertical="8dp" | 246 | android:paddingVertical="8dp" |
... | @@ -247,23 +248,24 @@ | ... | @@ -247,23 +248,24 @@ |
247 | tools:visibility="visible"> | 248 | tools:visibility="visible"> |
248 | 249 | ||
249 | <TextView | 250 | <TextView |
250 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 251 | + fontPath="fonts/PeridotPE-Bold.ttf" |
251 | android:layout_width="wrap_content" | 252 | android:layout_width="wrap_content" |
252 | android:layout_height="wrap_content" | 253 | android:layout_height="wrap_content" |
253 | android:gravity="center" | 254 | android:gravity="center" |
255 | + android:includeFontPadding="false" | ||
254 | android:text="@string/cos_shops" | 256 | android:text="@string/cos_shops" |
255 | - android:textColor="@color/cos_green6" | 257 | + android:textColor="@color/cos_green12" |
256 | - android:textSize="17dp" /> | 258 | + android:textSize="16sp" /> |
257 | </LinearLayout> | 259 | </LinearLayout> |
258 | 260 | ||
259 | <LinearLayout | 261 | <LinearLayout |
260 | android:id="@+id/ll_website" | 262 | android:id="@+id/ll_website" |
261 | android:layout_width="220dp" | 263 | android:layout_width="220dp" |
262 | - android:layout_height="wrap_content" | 264 | + android:layout_height="50dp" |
263 | android:layout_gravity="center" | 265 | android:layout_gravity="center" |
264 | android:layout_marginHorizontal="32dp" | 266 | android:layout_marginHorizontal="32dp" |
265 | android:layout_marginTop="24dp" | 267 | android:layout_marginTop="24dp" |
266 | - android:background="@drawable/selector_button_grey" | 268 | + android:background="@drawable/selector_button_green_border" |
267 | android:gravity="center" | 269 | android:gravity="center" |
268 | android:orientation="horizontal" | 270 | android:orientation="horizontal" |
269 | android:paddingVertical="8dp" | 271 | android:paddingVertical="8dp" |
... | @@ -271,13 +273,14 @@ | ... | @@ -271,13 +273,14 @@ |
271 | tools:visibility="visible"> | 273 | tools:visibility="visible"> |
272 | 274 | ||
273 | <TextView | 275 | <TextView |
274 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 276 | + fontPath="fonts/PeridotPE-Bold.ttf" |
275 | android:layout_width="wrap_content" | 277 | android:layout_width="wrap_content" |
276 | android:layout_height="wrap_content" | 278 | android:layout_height="wrap_content" |
277 | android:gravity="center" | 279 | android:gravity="center" |
280 | + android:includeFontPadding="false" | ||
278 | android:text="@string/cos_website" | 281 | android:text="@string/cos_website" |
279 | - android:textColor="@color/cos_green6" | 282 | + android:textColor="@color/cos_green12" |
280 | - android:textSize="17dp" /> | 283 | + android:textSize="16sp" /> |
281 | </LinearLayout> | 284 | </LinearLayout> |
282 | 285 | ||
283 | <RelativeLayout | 286 | <RelativeLayout |
... | @@ -298,40 +301,35 @@ | ... | @@ -298,40 +301,35 @@ |
298 | 301 | ||
299 | <TextView | 302 | <TextView |
300 | android:id="@+id/tv_terms" | 303 | android:id="@+id/tv_terms" |
301 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 304 | + fontPath="fonts/PeridotPE-Bold.ttf" |
302 | android:layout_width="wrap_content" | 305 | android:layout_width="wrap_content" |
303 | android:layout_height="wrap_content" | 306 | android:layout_height="wrap_content" |
304 | android:text="@string/cos_coupon_terms_title" | 307 | android:text="@string/cos_coupon_terms_title" |
305 | - android:textColor="@color/grey" | 308 | + android:textColor="@color/cos_light_black" |
306 | android:textSize="16sp" /> | 309 | android:textSize="16sp" /> |
307 | 310 | ||
308 | <ImageView | 311 | <ImageView |
309 | android:id="@+id/iv_terms_arrow" | 312 | android:id="@+id/iv_terms_arrow" |
310 | android:layout_width="14dp" | 313 | android:layout_width="14dp" |
311 | android:layout_height="14dp" | 314 | android:layout_height="14dp" |
315 | + android:layout_marginTop="3dp" | ||
312 | android:layout_marginStart="6dp" | 316 | android:layout_marginStart="6dp" |
313 | android:src="@drawable/ic_down_dark_new" /> | 317 | android:src="@drawable/ic_down_dark_new" /> |
314 | </LinearLayout> | 318 | </LinearLayout> |
315 | 319 | ||
316 | <TextView | 320 | <TextView |
317 | android:id="@+id/tv_terms_value" | 321 | android:id="@+id/tv_terms_value" |
318 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 322 | + fontPath="fonts/PeridotPE-Regular.ttf" |
319 | android:layout_width="wrap_content" | 323 | android:layout_width="wrap_content" |
320 | android:layout_height="wrap_content" | 324 | android:layout_height="wrap_content" |
321 | android:layout_below="@+id/ll_terms_inner" | 325 | android:layout_below="@+id/ll_terms_inner" |
322 | android:layout_marginHorizontal="32dp" | 326 | android:layout_marginHorizontal="32dp" |
323 | android:layout_marginTop="16dp" | 327 | android:layout_marginTop="16dp" |
324 | - android:textColor="#415564" | 328 | + android:textSize="16sp" |
329 | + android:textColor="@color/cos_gray" | ||
325 | android:visibility="gone" /> | 330 | android:visibility="gone" /> |
326 | </RelativeLayout> | 331 | </RelativeLayout> |
327 | </LinearLayout> | 332 | </LinearLayout> |
328 | </ScrollView> | 333 | </ScrollView> |
329 | - | ||
330 | - <LinearLayout | ||
331 | - android:layout_width="match_parent" | ||
332 | - android:layout_height="wrap_content" | ||
333 | - android:background="@drawable/ic_line"> | ||
334 | - | ||
335 | - </LinearLayout> | ||
336 | </RelativeLayout> | 334 | </RelativeLayout> |
337 | </RelativeLayout> | 335 | </RelativeLayout> | ... | ... |
... | @@ -3,13 +3,13 @@ | ... | @@ -3,13 +3,13 @@ |
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="@android:color/white"> | 6 | + android:background="@color/white"> |
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="64dp" |
12 | - android:background="@android:color/white"> | 12 | + android:background="@color/white"> |
13 | 13 | ||
14 | <ImageView | 14 | <ImageView |
15 | android:id="@+id/iv_coupon_share_back" | 15 | android:id="@+id/iv_coupon_share_back" |
... | @@ -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_gift" | 28 | android:text="@string/cos_coupon_gift" |
29 | - android:textColor="@color/grey" | 29 | + android:textColor="@color/cos_light_black" |
30 | android:textSize="17sp" | 30 | android:textSize="17sp" |
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" |
... | @@ -43,7 +43,7 @@ | ... | @@ -43,7 +43,7 @@ |
43 | <androidx.constraintlayout.widget.ConstraintLayout | 43 | <androidx.constraintlayout.widget.ConstraintLayout |
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:background="@android:color/white"> | 46 | + android:background="@color/white"> |
47 | 47 | ||
48 | <!-- android:background="@drawable/shape_cos_loyalty_white"--> | 48 | <!-- android:background="@drawable/shape_cos_loyalty_white"--> |
49 | <androidx.constraintlayout.widget.ConstraintLayout | 49 | <androidx.constraintlayout.widget.ConstraintLayout |
... | @@ -59,22 +59,11 @@ | ... | @@ -59,22 +59,11 @@ |
59 | android:id="@+id/imageView6" | 59 | android:id="@+id/imageView6" |
60 | android:layout_width="match_parent" | 60 | android:layout_width="match_parent" |
61 | android:layout_height="253dp" | 61 | android:layout_height="253dp" |
62 | - android:layout_marginTop="0.5dp" | ||
63 | android:scaleType="centerCrop" | 62 | android:scaleType="centerCrop" |
64 | app:layout_constraintStart_toStartOf="parent" | 63 | app:layout_constraintStart_toStartOf="parent" |
65 | app:layout_constraintTop_toTopOf="parent" | 64 | app:layout_constraintTop_toTopOf="parent" |
66 | tools:src="@drawable/carousel_banner" /> | 65 | tools:src="@drawable/carousel_banner" /> |
67 | 66 | ||
68 | - <LinearLayout | ||
69 | - android:layout_width="match_parent" | ||
70 | - android:layout_height="wrap_content" | ||
71 | - android:background="@drawable/ic_line" | ||
72 | - app:layout_constraintStart_toStartOf="parent" | ||
73 | - app:layout_constraintEnd_toEndOf="parent" | ||
74 | - app:layout_constraintTop_toTopOf="@+id/imageView6"> | ||
75 | - | ||
76 | - </LinearLayout> | ||
77 | - | ||
78 | <TextView | 67 | <TextView |
79 | android:id="@+id/textView13" | 68 | android:id="@+id/textView13" |
80 | android:layout_width="match_parent" | 69 | android:layout_width="match_parent" |
... | @@ -82,11 +71,10 @@ | ... | @@ -82,11 +71,10 @@ |
82 | android:layout_marginTop="32dp" | 71 | android:layout_marginTop="32dp" |
83 | android:gravity="center" | 72 | android:gravity="center" |
84 | android:paddingHorizontal="32dp" | 73 | android:paddingHorizontal="32dp" |
85 | - android:textColor="#415564" | 74 | + android:textColor="@color/cos_light_black" |
86 | android:textSize="18sp" | 75 | android:textSize="18sp" |
87 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 76 | + fontPath="fonts/BTCosmo-Bold.ttf" |
88 | app:layout_constraintEnd_toEndOf="parent" | 77 | app:layout_constraintEnd_toEndOf="parent" |
89 | - app:layout_constraintHorizontal_bias="0.509" | ||
90 | app:layout_constraintStart_toStartOf="parent" | 78 | app:layout_constraintStart_toStartOf="parent" |
91 | app:layout_constraintTop_toBottomOf="@+id/imageView6" | 79 | app:layout_constraintTop_toBottomOf="@+id/imageView6" |
92 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> | 80 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> |
... | @@ -99,9 +87,9 @@ | ... | @@ -99,9 +87,9 @@ |
99 | android:gravity="center" | 87 | android:gravity="center" |
100 | android:paddingHorizontal="32dp" | 88 | android:paddingHorizontal="32dp" |
101 | android:text="@string/cos_coupon_share_gift_title" | 89 | android:text="@string/cos_coupon_share_gift_title" |
102 | - android:textColor="#415564" | 90 | + android:textColor="@color/cos_light_black" |
103 | android:textSize="16sp" | 91 | android:textSize="16sp" |
104 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 92 | + fontPath="fonts/PeridotPE-Regular.ttf" |
105 | app:layout_constraintEnd_toEndOf="parent" | 93 | app:layout_constraintEnd_toEndOf="parent" |
106 | app:layout_constraintStart_toStartOf="parent" | 94 | app:layout_constraintStart_toStartOf="parent" |
107 | app:layout_constraintTop_toBottomOf="@+id/textView13" /> | 95 | app:layout_constraintTop_toBottomOf="@+id/textView13" /> |
... | @@ -123,8 +111,8 @@ | ... | @@ -123,8 +111,8 @@ |
123 | android:layout_alignParentStart="true" | 111 | android:layout_alignParentStart="true" |
124 | android:layout_centerVertical="true" | 112 | android:layout_centerVertical="true" |
125 | android:text="@string/cos_coupon_share_sender" | 113 | android:text="@string/cos_coupon_share_sender" |
126 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 114 | + fontPath="fonts/PeridotPE-Regular.ttf" |
127 | - android:textColor="@color/grey" | 115 | + android:textColor="@color/cos_gray2" |
128 | android:textSize="16sp" /> | 116 | android:textSize="16sp" /> |
129 | 117 | ||
130 | <ImageView | 118 | <ImageView |
... | @@ -165,9 +153,9 @@ | ... | @@ -165,9 +153,9 @@ |
165 | android:background="@android:color/transparent" | 153 | android:background="@android:color/transparent" |
166 | android:hint="@string/cos_coupon_share_hint" | 154 | android:hint="@string/cos_coupon_share_hint" |
167 | android:inputType="phone" | 155 | android:inputType="phone" |
168 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 156 | + fontPath="fonts/PeridotPE-Regular.ttf" |
169 | - android:textColor="@color/grey" | 157 | + android:textColor="@color/cos_gray2" |
170 | - android:textColorHint="@color/cos_grey8" | 158 | + android:textColorHint="@color/cos_gray2" |
171 | android:textSize="16sp" /> | 159 | android:textSize="16sp" /> |
172 | </RelativeLayout> | 160 | </RelativeLayout> |
173 | 161 | ||
... | @@ -183,15 +171,13 @@ | ... | @@ -183,15 +171,13 @@ |
183 | 171 | ||
184 | <LinearLayout | 172 | <LinearLayout |
185 | android:id="@+id/ll_share_button" | 173 | android:id="@+id/ll_share_button" |
186 | - android:layout_width="wrap_content" | 174 | + android:layout_width="190dp" |
187 | - android:layout_height="wrap_content" | 175 | + android:layout_height="50dp" |
188 | android:layout_marginHorizontal="32dp" | 176 | android:layout_marginHorizontal="32dp" |
189 | android:layout_marginTop="64dp" | 177 | android:layout_marginTop="64dp" |
190 | android:background="@drawable/selector_button_green" | 178 | android:background="@drawable/selector_button_green" |
191 | android:gravity="center" | 179 | android:gravity="center" |
192 | android:orientation="horizontal" | 180 | android:orientation="horizontal" |
193 | - android:paddingHorizontal="16dp" | ||
194 | - android:paddingVertical="8dp" | ||
195 | app:layout_constraintEnd_toEndOf="parent" | 181 | app:layout_constraintEnd_toEndOf="parent" |
196 | app:layout_constraintStart_toStartOf="parent" | 182 | app:layout_constraintStart_toStartOf="parent" |
197 | app:layout_constraintTop_toBottomOf="@+id/v_separator2"> | 183 | app:layout_constraintTop_toBottomOf="@+id/v_separator2"> |
... | @@ -200,10 +186,11 @@ | ... | @@ -200,10 +186,11 @@ |
200 | android:layout_width="wrap_content" | 186 | android:layout_width="wrap_content" |
201 | android:layout_height="wrap_content" | 187 | android:layout_height="wrap_content" |
202 | android:gravity="center" | 188 | android:gravity="center" |
189 | + android:includeFontPadding="false" | ||
203 | android:text="@string/cos_coupon_share_button" | 190 | android:text="@string/cos_coupon_share_button" |
204 | android:textColor="@color/white" | 191 | android:textColor="@color/white" |
205 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 192 | + fontPath="fonts/PeridotPE-SemiBold.ttf" |
206 | - android:textSize="17dp" /> | 193 | + android:textSize="16sp" /> |
207 | </LinearLayout> | 194 | </LinearLayout> |
208 | </androidx.constraintlayout.widget.ConstraintLayout> | 195 | </androidx.constraintlayout.widget.ConstraintLayout> |
209 | </androidx.constraintlayout.widget.ConstraintLayout> | 196 | </androidx.constraintlayout.widget.ConstraintLayout> | ... | ... |
... | @@ -3,13 +3,13 @@ | ... | @@ -3,13 +3,13 @@ |
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="@android:color/white"> | 6 | + android:background="@color/white"> |
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="64dp" |
12 | - android:background="@android:color/white"> | 12 | + android:background="@color/white"> |
13 | 13 | ||
14 | <ImageView | 14 | <ImageView |
15 | android:id="@+id/iv_couponset_info_back" | 15 | android:id="@+id/iv_couponset_info_back" |
... | @@ -23,11 +23,11 @@ | ... | @@ -23,11 +23,11 @@ |
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_info_title" | 29 | android:text="@string/cos_coupon_info_title" |
30 | - android:textColor="@color/grey" | 30 | + android:textColor="@color/cos_light_black" |
31 | android:textSize="17sp" | 31 | android:textSize="17sp" |
32 | app:layout_constraintBottom_toBottomOf="parent" | 32 | app:layout_constraintBottom_toBottomOf="parent" |
33 | app:layout_constraintEnd_toEndOf="parent" | 33 | app:layout_constraintEnd_toEndOf="parent" |
... | @@ -39,14 +39,14 @@ | ... | @@ -39,14 +39,14 @@ |
39 | android:layout_width="match_parent" | 39 | android:layout_width="match_parent" |
40 | android:layout_height="match_parent" | 40 | android:layout_height="match_parent" |
41 | android:layout_below="@+id/cl_loyalty_wallet_header" | 41 | android:layout_below="@+id/cl_loyalty_wallet_header" |
42 | - android:background="@android:color/white" | 42 | + android:background="@color/white" |
43 | android:fillViewport="true"> | 43 | android:fillViewport="true"> |
44 | 44 | ||
45 | <LinearLayout | 45 | <LinearLayout |
46 | android:id="@+id/cl_loyalty_info_view_inner" | 46 | android:id="@+id/cl_loyalty_info_view_inner" |
47 | android:layout_width="match_parent" | 47 | android:layout_width="match_parent" |
48 | android:layout_height="wrap_content" | 48 | android:layout_height="wrap_content" |
49 | - android:background="@android:color/white" | 49 | + android:background="@color/white" |
50 | android:gravity="center_horizontal" | 50 | android:gravity="center_horizontal" |
51 | android:orientation="vertical" | 51 | android:orientation="vertical" |
52 | android:paddingBottom="48dp"> | 52 | android:paddingBottom="48dp"> |
... | @@ -55,52 +55,51 @@ | ... | @@ -55,52 +55,51 @@ |
55 | android:id="@+id/imageView6" | 55 | android:id="@+id/imageView6" |
56 | android:layout_width="match_parent" | 56 | android:layout_width="match_parent" |
57 | android:layout_height="253dp" | 57 | android:layout_height="253dp" |
58 | - android:layout_marginTop="0.5dp" | ||
59 | android:scaleType="centerCrop" | 58 | android:scaleType="centerCrop" |
60 | tools:src="@drawable/carousel_banner" /> | 59 | tools:src="@drawable/carousel_banner" /> |
61 | 60 | ||
62 | <TextView | 61 | <TextView |
63 | android:id="@+id/textView13" | 62 | android:id="@+id/textView13" |
64 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 63 | + fontPath="fonts/BTCosmo-Bold.ttf" |
65 | android:layout_width="match_parent" | 64 | android:layout_width="match_parent" |
66 | android:layout_height="wrap_content" | 65 | android:layout_height="wrap_content" |
67 | android:layout_marginTop="32dp" | 66 | android:layout_marginTop="32dp" |
68 | android:gravity="center" | 67 | android:gravity="center" |
69 | android:paddingHorizontal="32dp" | 68 | android:paddingHorizontal="32dp" |
70 | - android:textColor="#415564" | 69 | + android:textColor="@color/cos_light_black" |
71 | android:textSize="18sp" | 70 | android:textSize="18sp" |
72 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> | 71 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> |
73 | 72 | ||
74 | <TextView | 73 | <TextView |
75 | android:id="@+id/textView14" | 74 | android:id="@+id/textView14" |
76 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 75 | + fontPath="fonts/PeridotPE-Regular.ttf" |
77 | android:layout_width="match_parent" | 76 | android:layout_width="match_parent" |
78 | android:layout_height="wrap_content" | 77 | android:layout_height="wrap_content" |
79 | android:layout_marginTop="16dp" | 78 | android:layout_marginTop="16dp" |
80 | android:gravity="center" | 79 | android:gravity="center" |
81 | android:paddingHorizontal="32dp" | 80 | android:paddingHorizontal="32dp" |
82 | - android:textColor="#415564" | 81 | + android:textColor="@color/cos_light_black" |
83 | android:textSize="16sp" | 82 | android:textSize="16sp" |
84 | tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" /> | 83 | tools:text="Χρησιμοποίησε τον παρακάτω κωδικό και πάρε δωρεάν πακέτο πάνες Pampers αποκλειστικά στα Supermarket Σκλαβενίτης" /> |
85 | 84 | ||
86 | <LinearLayout | 85 | <LinearLayout |
87 | android:id="@+id/ll_get_gift" | 86 | android:id="@+id/ll_get_gift" |
88 | - android:layout_width="240dp" | 87 | + android:layout_width="160dp" |
89 | android:layout_height="50dp" | 88 | android:layout_height="50dp" |
90 | - android:layout_marginHorizontal="32dp" | ||
91 | android:layout_marginTop="27dp" | 89 | android:layout_marginTop="27dp" |
92 | android:background="@drawable/selector_button_green" | 90 | android:background="@drawable/selector_button_green" |
93 | android:gravity="center" | 91 | android:gravity="center" |
94 | android:orientation="horizontal"> | 92 | android:orientation="horizontal"> |
95 | 93 | ||
96 | <TextView | 94 | <TextView |
97 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 95 | + fontPath="fonts/PeridotPE-SemiBold.ttf" |
98 | android:layout_width="wrap_content" | 96 | android:layout_width="wrap_content" |
99 | android:layout_height="wrap_content" | 97 | android:layout_height="wrap_content" |
100 | android:gravity="center" | 98 | android:gravity="center" |
99 | + android:includeFontPadding="false" | ||
101 | android:text="@string/cos_redeem_coupon" | 100 | android:text="@string/cos_redeem_coupon" |
102 | android:textColor="@color/white" | 101 | android:textColor="@color/white" |
103 | - android:textSize="17dp" /> | 102 | + android:textSize="16sp" /> |
104 | </LinearLayout> | 103 | </LinearLayout> |
105 | 104 | ||
106 | <RelativeLayout | 105 | <RelativeLayout |
... | @@ -120,45 +119,39 @@ | ... | @@ -120,45 +119,39 @@ |
120 | 119 | ||
121 | <TextView | 120 | <TextView |
122 | android:id="@+id/tv_terms" | 121 | android:id="@+id/tv_terms" |
123 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 122 | + fontPath="fonts/PeridotPE-Bold.ttf" |
124 | android:layout_width="wrap_content" | 123 | android:layout_width="wrap_content" |
125 | android:layout_height="wrap_content" | 124 | android:layout_height="wrap_content" |
126 | android:text="@string/cos_coupon_terms_title" | 125 | android:text="@string/cos_coupon_terms_title" |
127 | - android:textColor="@color/grey" | 126 | + android:textColor="@color/cos_light_black" |
128 | android:textSize="16sp" /> | 127 | android:textSize="16sp" /> |
129 | 128 | ||
130 | <ImageView | 129 | <ImageView |
131 | android:id="@+id/iv_terms_arrow" | 130 | android:id="@+id/iv_terms_arrow" |
132 | android:layout_width="14dp" | 131 | android:layout_width="14dp" |
133 | android:layout_height="14dp" | 132 | android:layout_height="14dp" |
133 | + android:layout_marginTop="3dp" | ||
134 | android:layout_marginStart="6dp" | 134 | android:layout_marginStart="6dp" |
135 | android:src="@drawable/ic_down_dark_new" /> | 135 | android:src="@drawable/ic_down_dark_new" /> |
136 | </LinearLayout> | 136 | </LinearLayout> |
137 | 137 | ||
138 | <TextView | 138 | <TextView |
139 | android:id="@+id/tv_terms_value" | 139 | android:id="@+id/tv_terms_value" |
140 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 140 | + fontPath="fonts/PeridotPE-Regular.ttf" |
141 | android:layout_width="wrap_content" | 141 | android:layout_width="wrap_content" |
142 | android:layout_height="wrap_content" | 142 | android:layout_height="wrap_content" |
143 | android:layout_below="@+id/ll_terms_inner" | 143 | android:layout_below="@+id/ll_terms_inner" |
144 | android:layout_marginHorizontal="64dp" | 144 | android:layout_marginHorizontal="64dp" |
145 | android:layout_marginTop="16dp" | 145 | android:layout_marginTop="16dp" |
146 | - android:textColor="@color/grey" | 146 | + android:textColor="@color/cos_gray" |
147 | android:visibility="gone" | 147 | android:visibility="gone" |
148 | + android:textSize="16sp" | ||
148 | tools:text="@string/cos_coupon_date" | 149 | tools:text="@string/cos_coupon_date" |
149 | - tools:visibility="gone" /> | 150 | + tools:visibility="visible" /> |
150 | </RelativeLayout> | 151 | </RelativeLayout> |
151 | </LinearLayout> | 152 | </LinearLayout> |
152 | </ScrollView> | 153 | </ScrollView> |
153 | 154 | ||
154 | - <LinearLayout | ||
155 | - android:layout_width="match_parent" | ||
156 | - android:layout_height="wrap_content" | ||
157 | - android:layout_marginTop="48dp" | ||
158 | - android:background="@drawable/ic_line"> | ||
159 | - | ||
160 | - </LinearLayout> | ||
161 | - | ||
162 | <ProgressBar | 155 | <ProgressBar |
163 | android:id="@+id/pb_loading" | 156 | android:id="@+id/pb_loading" |
164 | android:layout_width="48dp" | 157 | android:layout_width="48dp" | ... | ... |
... | @@ -5,22 +5,20 @@ | ... | @@ -5,22 +5,20 @@ |
5 | android:id="@+id/cl_bill_payment" | 5 | android:id="@+id/cl_bill_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="@color/cos_grey5" | 8 | + android:background="@color/cos_light_grey3" |
9 | android:orientation="vertical"> | 9 | android:orientation="vertical"> |
10 | 10 | ||
11 | <androidx.constraintlayout.widget.ConstraintLayout | 11 | <androidx.constraintlayout.widget.ConstraintLayout |
12 | android:id="@+id/cl_bill_header" | 12 | android:id="@+id/cl_bill_header" |
13 | android:layout_width="match_parent" | 13 | android:layout_width="match_parent" |
14 | android:layout_height="64dp" | 14 | android:layout_height="64dp" |
15 | - android:translationZ="10dp" | 15 | + android:background="@color/white"> |
16 | - android:background="@drawable/ic_background_transparent_shadow"> | ||
17 | 16 | ||
18 | <ImageView | 17 | <ImageView |
19 | android:id="@+id/iv_list_close" | 18 | android:id="@+id/iv_list_close" |
20 | android:layout_width="48dp" | 19 | android:layout_width="48dp" |
21 | android:layout_height="48dp" | 20 | android:layout_height="48dp" |
22 | android:layout_marginStart="16dp" | 21 | android:layout_marginStart="16dp" |
23 | - android:layout_marginBottom="16dp" | ||
24 | android:scaleType="centerInside" | 22 | android:scaleType="centerInside" |
25 | android:src="@drawable/ic_back" | 23 | android:src="@drawable/ic_back" |
26 | app:layout_constraintBottom_toBottomOf="parent" | 24 | app:layout_constraintBottom_toBottomOf="parent" |
... | @@ -32,10 +30,9 @@ | ... | @@ -32,10 +30,9 @@ |
32 | android:layout_width="wrap_content" | 30 | android:layout_width="wrap_content" |
33 | android:layout_height="wrap_content" | 31 | android:layout_height="wrap_content" |
34 | android:gravity="center" | 32 | android:gravity="center" |
35 | - android:textColor="@color/grey" | 33 | + android:textColor="@color/cos_light_black" |
36 | android:textSize="17sp" | 34 | android:textSize="17sp" |
37 | - android:layout_marginBottom="16dp" | 35 | + fontPath="fonts/BTCosmo-Bold.ttf" |
38 | - fontPath="fonts/pf_square_sans_pro_bold.ttf" | ||
39 | android:text="@string/cos_gifts_title" | 36 | android:text="@string/cos_gifts_title" |
40 | app:layout_constraintBottom_toBottomOf="parent" | 37 | app:layout_constraintBottom_toBottomOf="parent" |
41 | app:layout_constraintEnd_toEndOf="parent" | 38 | app:layout_constraintEnd_toEndOf="parent" |
... | @@ -46,7 +43,6 @@ | ... | @@ -46,7 +43,6 @@ |
46 | <LinearLayout | 43 | <LinearLayout |
47 | android:layout_width="match_parent" | 44 | android:layout_width="match_parent" |
48 | android:layout_height="match_parent" | 45 | android:layout_height="match_parent" |
49 | - android:layout_marginTop="-18dp" | ||
50 | android:orientation="vertical"> | 46 | android:orientation="vertical"> |
51 | 47 | ||
52 | <LinearLayout | 48 | <LinearLayout |
... | @@ -103,7 +99,7 @@ | ... | @@ -103,7 +99,7 @@ |
103 | android:clipToPadding="false" | 99 | android:clipToPadding="false" |
104 | android:orientation="vertical" | 100 | android:orientation="vertical" |
105 | android:overScrollMode="never" | 101 | android:overScrollMode="never" |
106 | - android:paddingTop="44dp" /> | 102 | + android:paddingVertical="24dp" /> |
107 | 103 | ||
108 | <!-- <androidx.constraintlayout.widget.ConstraintLayout--> | 104 | <!-- <androidx.constraintlayout.widget.ConstraintLayout--> |
109 | <!-- android:id="@+id/cl_recycler_inner"--> | 105 | <!-- android:id="@+id/cl_recycler_inner"--> | ... | ... |
... | @@ -3,13 +3,13 @@ | ... | @@ -3,13 +3,13 @@ |
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="@android:color/white"> | 6 | + android:background="@color/white"> |
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="64dp" |
12 | - android:background="@android:color/white"> | 12 | + android:background="@color/white"> |
13 | 13 | ||
14 | <ImageView | 14 | <ImageView |
15 | android:id="@+id/iv_telco_back" | 15 | android:id="@+id/iv_telco_back" |
... | @@ -24,11 +24,11 @@ | ... | @@ -24,11 +24,11 @@ |
24 | 24 | ||
25 | <TextView | 25 | <TextView |
26 | android:id="@+id/tv_telco_header_title" | 26 | android:id="@+id/tv_telco_header_title" |
27 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 27 | + fontPath="fonts/BTCosmo-Bold.ttf" |
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_dark_blue" | 30 | + android:textColor="@color/cos_light_black" |
31 | - android:textSize="16sp" | 31 | + android:textSize="17sp" |
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" |
... | @@ -40,12 +40,13 @@ | ... | @@ -40,12 +40,13 @@ |
40 | android:layout_width="match_parent" | 40 | android:layout_width="match_parent" |
41 | android:layout_height="match_parent" | 41 | android:layout_height="match_parent" |
42 | android:layout_below="@+id/cl_loyalty_wallet_header" | 42 | android:layout_below="@+id/cl_loyalty_wallet_header" |
43 | + android:background="@color/white" | ||
43 | android:fillViewport="true"> | 44 | android:fillViewport="true"> |
44 | 45 | ||
45 | <androidx.constraintlayout.widget.ConstraintLayout | 46 | <androidx.constraintlayout.widget.ConstraintLayout |
46 | android:layout_width="match_parent" | 47 | android:layout_width="match_parent" |
47 | android:layout_height="match_parent" | 48 | android:layout_height="match_parent" |
48 | - android:background="@android:color/white"> | 49 | + android:background="@color/white"> |
49 | 50 | ||
50 | <!-- android:background="@drawable/shape_cos_loyalty_white"--> | 51 | <!-- android:background="@drawable/shape_cos_loyalty_white"--> |
51 | <RelativeLayout | 52 | <RelativeLayout |
... | @@ -63,18 +64,10 @@ | ... | @@ -63,18 +64,10 @@ |
63 | android:layout_width="match_parent" | 64 | android:layout_width="match_parent" |
64 | android:layout_height="253dp" | 65 | android:layout_height="253dp" |
65 | android:layout_centerHorizontal="true" | 66 | android:layout_centerHorizontal="true" |
66 | - android:layout_marginTop="0.5dp" | ||
67 | android:scaleType="centerCrop" | 67 | android:scaleType="centerCrop" |
68 | tools:src="@drawable/carousel_banner" /> | 68 | tools:src="@drawable/carousel_banner" /> |
69 | 69 | ||
70 | <LinearLayout | 70 | <LinearLayout |
71 | - android:layout_width="match_parent" | ||
72 | - android:layout_height="wrap_content" | ||
73 | - android:background="@drawable/ic_line"> | ||
74 | - | ||
75 | - </LinearLayout> | ||
76 | - | ||
77 | - <LinearLayout | ||
78 | android:id="@+id/ll_telco_gift_view" | 71 | android:id="@+id/ll_telco_gift_view" |
79 | android:layout_width="wrap_content" | 72 | android:layout_width="wrap_content" |
80 | android:layout_height="wrap_content" | 73 | android:layout_height="wrap_content" |
... | @@ -86,7 +79,7 @@ | ... | @@ -86,7 +79,7 @@ |
86 | 79 | ||
87 | <TextView | 80 | <TextView |
88 | android:id="@+id/tv_telco_gift_value" | 81 | android:id="@+id/tv_telco_gift_value" |
89 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 82 | + fontPath="fonts/PeridotPE-SemiBold.ttf" |
90 | android:layout_width="64dp" | 83 | android:layout_width="64dp" |
91 | android:layout_height="64dp" | 84 | android:layout_height="64dp" |
92 | android:background="@drawable/shape_round_border_gradient" | 85 | android:background="@drawable/shape_round_border_gradient" |
... | @@ -97,11 +90,11 @@ | ... | @@ -97,11 +90,11 @@ |
97 | 90 | ||
98 | <TextView | 91 | <TextView |
99 | android:id="@+id/tv_telco_gift_type" | 92 | android:id="@+id/tv_telco_gift_type" |
100 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 93 | + fontPath="fonts/PeridotPE-Regular.ttf" |
101 | android:layout_width="wrap_content" | 94 | android:layout_width="wrap_content" |
102 | android:layout_height="wrap_content" | 95 | android:layout_height="wrap_content" |
103 | android:layout_marginStart="8dp" | 96 | android:layout_marginStart="8dp" |
104 | - android:textColor="@color/grey" | 97 | + android:textColor="@color/cos_light_black" |
105 | android:textSize="15sp" | 98 | android:textSize="15sp" |
106 | tools:text="Internet" /> | 99 | tools:text="Internet" /> |
107 | </LinearLayout> | 100 | </LinearLayout> |
... | @@ -125,14 +118,14 @@ | ... | @@ -125,14 +118,14 @@ |
125 | 118 | ||
126 | <TextView | 119 | <TextView |
127 | android:id="@+id/tv_telco_gift_duration" | 120 | android:id="@+id/tv_telco_gift_duration" |
128 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 121 | + fontPath="fonts/PeridotPE-Regular.ttf" |
129 | android:layout_width="wrap_content" | 122 | android:layout_width="wrap_content" |
130 | android:layout_height="wrap_content" | 123 | android:layout_height="wrap_content" |
131 | android:background="@drawable/shape_round_border_gradient2" | 124 | android:background="@drawable/shape_round_border_gradient2" |
132 | android:gravity="center" | 125 | android:gravity="center" |
133 | android:paddingHorizontal="12dp" | 126 | android:paddingHorizontal="12dp" |
134 | android:paddingVertical="5dp" | 127 | android:paddingVertical="5dp" |
135 | - android:textColor="@color/grey" | 128 | + android:textColor="@color/cos_light_black" |
136 | android:textSize="16sp" | 129 | android:textSize="16sp" |
137 | app:layout_constraintBottom_toBottomOf="@+id/cl_telco_duration_view_inner" | 130 | app:layout_constraintBottom_toBottomOf="@+id/cl_telco_duration_view_inner" |
138 | app:layout_constraintEnd_toEndOf="parent" | 131 | app:layout_constraintEnd_toEndOf="parent" |
... | @@ -143,37 +136,37 @@ | ... | @@ -143,37 +136,37 @@ |
143 | 136 | ||
144 | <TextView | 137 | <TextView |
145 | android:id="@+id/textView13" | 138 | android:id="@+id/textView13" |
146 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 139 | + fontPath="fonts/PeridotPE-Regular.ttf" |
147 | android:layout_width="match_parent" | 140 | android:layout_width="match_parent" |
148 | android:layout_height="wrap_content" | 141 | android:layout_height="wrap_content" |
149 | android:layout_below="@+id/cl_telco_duration_view" | 142 | android:layout_below="@+id/cl_telco_duration_view" |
150 | android:layout_marginTop="24dp" | 143 | android:layout_marginTop="24dp" |
151 | android:gravity="center" | 144 | android:gravity="center" |
152 | android:paddingHorizontal="32dp" | 145 | android:paddingHorizontal="32dp" |
153 | - android:textColor="#415564" | 146 | + android:textColor="@color/cos_light_black" |
154 | android:textSize="17sp" | 147 | android:textSize="17sp" |
155 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> | 148 | tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> |
156 | 149 | ||
157 | <LinearLayout | 150 | <LinearLayout |
158 | android:id="@+id/ll_activate_button" | 151 | android:id="@+id/ll_activate_button" |
159 | - android:layout_width="wrap_content" | 152 | + android:layout_width="160dp" |
160 | - android:layout_height="wrap_content" | 153 | + android:layout_height="50dp" |
161 | android:layout_below="@+id/textView13" | 154 | android:layout_below="@+id/textView13" |
162 | android:layout_centerHorizontal="true" | 155 | android:layout_centerHorizontal="true" |
163 | android:layout_marginTop="44dp" | 156 | android:layout_marginTop="44dp" |
164 | android:background="@drawable/selector_button_green" | 157 | android:background="@drawable/selector_button_green" |
165 | - android:orientation="horizontal" | 158 | + android:gravity="center" |
166 | - android:paddingHorizontal="36dp" | 159 | + android:orientation="horizontal"> |
167 | - android:paddingVertical="8dp"> | ||
168 | 160 | ||
169 | <TextView | 161 | <TextView |
170 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | 162 | + fontPath="fonts/PeridotPE-SemiBold.ttf" |
171 | android:layout_width="wrap_content" | 163 | android:layout_width="wrap_content" |
172 | android:layout_height="wrap_content" | 164 | android:layout_height="wrap_content" |
173 | android:gravity="center" | 165 | android:gravity="center" |
166 | + android:includeFontPadding="false" | ||
174 | android:text="@string/cos_dlg_positive_button" | 167 | android:text="@string/cos_dlg_positive_button" |
175 | android:textColor="@color/white" | 168 | android:textColor="@color/white" |
176 | - android:textSize="16dp" /> | 169 | + android:textSize="16sp" /> |
177 | </LinearLayout> | 170 | </LinearLayout> |
178 | 171 | ||
179 | <RelativeLayout | 172 | <RelativeLayout |
... | @@ -195,32 +188,34 @@ | ... | @@ -195,32 +188,34 @@ |
195 | 188 | ||
196 | <TextView | 189 | <TextView |
197 | android:id="@+id/tv_see_more" | 190 | android:id="@+id/tv_see_more" |
198 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 191 | + fontPath="fonts/PeridotPE-Bold.ttf" |
199 | android:layout_width="wrap_content" | 192 | android:layout_width="wrap_content" |
200 | android:layout_height="wrap_content" | 193 | android:layout_height="wrap_content" |
201 | android:text="@string/cos_see_more2" | 194 | android:text="@string/cos_see_more2" |
202 | - android:textColor="@color/grey" | 195 | + android:textColor="@color/cos_light_black" |
203 | android:textSize="16sp" /> | 196 | android:textSize="16sp" /> |
204 | 197 | ||
205 | <ImageView | 198 | <ImageView |
206 | android:id="@+id/iv_see_more_arrow" | 199 | android:id="@+id/iv_see_more_arrow" |
207 | android:layout_width="14dp" | 200 | android:layout_width="14dp" |
208 | android:layout_height="14dp" | 201 | android:layout_height="14dp" |
202 | + android:layout_marginTop="3dp" | ||
209 | android:layout_marginStart="6dp" | 203 | android:layout_marginStart="6dp" |
210 | android:src="@drawable/ic_down_dark_new" /> | 204 | android:src="@drawable/ic_down_dark_new" /> |
211 | </LinearLayout> | 205 | </LinearLayout> |
212 | 206 | ||
213 | <TextView | 207 | <TextView |
214 | android:id="@+id/tv_see_more_value" | 208 | android:id="@+id/tv_see_more_value" |
215 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 209 | + fontPath="fonts/PeridotPE-Regular.ttf" |
216 | android:layout_width="wrap_content" | 210 | android:layout_width="wrap_content" |
217 | android:layout_height="wrap_content" | 211 | android:layout_height="wrap_content" |
218 | android:layout_below="@+id/ll_see_more" | 212 | android:layout_below="@+id/ll_see_more" |
219 | android:layout_marginHorizontal="32dp" | 213 | android:layout_marginHorizontal="32dp" |
220 | android:layout_marginTop="16dp" | 214 | android:layout_marginTop="16dp" |
221 | - android:textColor="@color/grey" | 215 | + android:textColor="@color/cos_gray" |
222 | - android:textSize="14sp" | 216 | + android:textSize="16sp" |
223 | android:visibility="gone" | 217 | android:visibility="gone" |
218 | + tools:visibility="visible" | ||
224 | tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " /> | 219 | tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " /> |
225 | </RelativeLayout> | 220 | </RelativeLayout> |
226 | 221 | ... | ... |
... | @@ -15,13 +15,13 @@ | ... | @@ -15,13 +15,13 @@ |
15 | 15 | ||
16 | <TextView | 16 | <TextView |
17 | android:id="@+id/tv_sender_value" | 17 | android:id="@+id/tv_sender_value" |
18 | - fontPath="fonts/pf_square_sans_pro_bold.ttf" | 18 | + fontPath="fonts/BTCosmo-Bold.ttf" |
19 | android:layout_width="wrap_content" | 19 | android:layout_width="wrap_content" |
20 | android:layout_height="wrap_content" | 20 | android:layout_height="wrap_content" |
21 | android:layout_alignParentStart="true" | 21 | android:layout_alignParentStart="true" |
22 | android:layout_marginStart="24dp" | 22 | android:layout_marginStart="24dp" |
23 | android:text="@string/cos_coupon_share_sender" | 23 | android:text="@string/cos_coupon_share_sender" |
24 | - android:textColor="@color/grey" | 24 | + android:textColor="@color/cos_light_black" |
25 | android:textSize="16sp" /> | 25 | android:textSize="16sp" /> |
26 | 26 | ||
27 | <ImageView | 27 | <ImageView | ... | ... |
... | @@ -9,9 +9,9 @@ | ... | @@ -9,9 +9,9 @@ |
9 | <androidx.cardview.widget.CardView | 9 | <androidx.cardview.widget.CardView |
10 | android:layout_width="match_parent" | 10 | android:layout_width="match_parent" |
11 | android:layout_height="match_parent" | 11 | android:layout_height="match_parent" |
12 | - | ||
13 | android:layout_marginHorizontal="16dp" | 12 | android:layout_marginHorizontal="16dp" |
14 | - app:cardCornerRadius="4dp"> | 13 | + app:cardElevation="0dp" |
14 | + app:cardCornerRadius="16dp"> | ||
15 | 15 | ||
16 | <androidx.constraintlayout.widget.ConstraintLayout | 16 | <androidx.constraintlayout.widget.ConstraintLayout |
17 | android:layout_width="match_parent" | 17 | android:layout_width="match_parent" |
... | @@ -31,11 +31,9 @@ | ... | @@ -31,11 +31,9 @@ |
31 | android:layout_height="0dp" | 31 | android:layout_height="0dp" |
32 | android:scaleType="centerCrop" | 32 | android:scaleType="centerCrop" |
33 | app:layout_constraintBottom_toBottomOf="parent" | 33 | app:layout_constraintBottom_toBottomOf="parent" |
34 | - app:layout_constraintHorizontal_bias="0.0" | ||
35 | app:layout_constraintLeft_toLeftOf="parent" | 34 | app:layout_constraintLeft_toLeftOf="parent" |
36 | app:layout_constraintRight_toLeftOf="@+id/gl_vertical_60_percent" | 35 | app:layout_constraintRight_toLeftOf="@+id/gl_vertical_60_percent" |
37 | app:layout_constraintTop_toTopOf="parent" | 36 | app:layout_constraintTop_toTopOf="parent" |
38 | - app:layout_constraintVertical_bias="0.0" | ||
39 | tools:src="@drawable/ic_cosmote_logo_horizontal_grey" /> | 37 | tools:src="@drawable/ic_cosmote_logo_horizontal_grey" /> |
40 | 38 | ||
41 | <TextView | 39 | <TextView |
... | @@ -46,7 +44,7 @@ | ... | @@ -46,7 +44,7 @@ |
46 | android:gravity="center" | 44 | android:gravity="center" |
47 | android:maxLines="4" | 45 | android:maxLines="4" |
48 | android:textColor="@color/grey" | 46 | android:textColor="@color/grey" |
49 | - fontPath="fonts/pf_square_sans_pro_regular.ttf" | 47 | + fontPath="fonts/PeridotPE-Regular.ttf" |
50 | app:layout_constraintBottom_toBottomOf="parent" | 48 | app:layout_constraintBottom_toBottomOf="parent" |
51 | app:layout_constraintLeft_toRightOf="@+id/gl_vertical_60_percent" | 49 | app:layout_constraintLeft_toRightOf="@+id/gl_vertical_60_percent" |
52 | app:layout_constraintRight_toRightOf="parent" | 50 | app:layout_constraintRight_toRightOf="parent" | ... | ... |
... | @@ -10,18 +10,18 @@ | ... | @@ -10,18 +10,18 @@ |
10 | android:id="@+id/ll_share_view2" | 10 | android:id="@+id/ll_share_view2" |
11 | android:layout_width="match_parent" | 11 | android:layout_width="match_parent" |
12 | android:layout_height="wrap_content" | 12 | android:layout_height="wrap_content" |
13 | - android:layout_marginHorizontal="24dp" | 13 | + android:layout_marginHorizontal="12dp" |
14 | android:layout_marginTop="16dp"> | 14 | android:layout_marginTop="16dp"> |
15 | 15 | ||
16 | <TextView | 16 | <TextView |
17 | android:id="@+id/tv_phone_share" | 17 | android:id="@+id/tv_phone_share" |
18 | + fontPath="fonts/PeridotPE-Regular.ttf" | ||
18 | android:layout_width="match_parent" | 19 | android:layout_width="match_parent" |
19 | android:layout_height="wrap_content" | 20 | android:layout_height="wrap_content" |
20 | android:layout_alignParentStart="true" | 21 | android:layout_alignParentStart="true" |
21 | android:layout_centerVertical="true" | 22 | android:layout_centerVertical="true" |
22 | android:background="@android:color/transparent" | 23 | android:background="@android:color/transparent" |
23 | - android:textColor="@color/grey" | 24 | + android:textColor="@color/cos_light_black" |
24 | - fontPath="fonts/pf_square_sans_pro_medium.ttf" | ||
25 | android:textSize="16sp" | 25 | android:textSize="16sp" |
26 | tools:text="6987654322" /> | 26 | tools:text="6987654322" /> |
27 | </RelativeLayout> | 27 | </RelativeLayout> | ... | ... |
... | @@ -64,4 +64,10 @@ | ... | @@ -64,4 +64,10 @@ |
64 | <color name="cos_grey10">#53626E</color> | 64 | <color name="cos_grey10">#53626E</color> |
65 | <color name="cos_green11">#78BE6D</color> | 65 | <color name="cos_green11">#78BE6D</color> |
66 | <color name="cos_skyblue3">#0FABD6</color> | 66 | <color name="cos_skyblue3">#0FABD6</color> |
67 | + <color name="cos_light_grey3">#F2F2F3</color> | ||
68 | + <color name="cos_light_black">#212121</color> | ||
69 | + <color name="cos_green12">#0EA600</color> | ||
70 | + <color name="cos_green6_tr">#660EA600</color> | ||
71 | + <color name="cos_gray">#9D9D9C</color> | ||
72 | + <color name="cos_gray2">#848484</color> | ||
67 | </resources> | 73 | </resources> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or login to post a comment