open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
3f167525 1 parent c3ad9604

redesign part1

Inline Side-by-side
Showing 9 changed files with 128 additions and 135 deletions
...@@ -59,8 +59,7 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis ...@@ -59,8 +59,7 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis
59 private ImageView mIvTermsArrow; 59 private ImageView mIvTermsArrow;
60 private TextView mTvTermsText; 60 private TextView mTvTermsText;
61 private boolean mIsTermsExpanded = false; 61 private boolean mIsTermsExpanded = false;
62 - 62 + private TextView mTvTermsTitle, mTvRedeemTitle, mTvMerchantName;
63 - private TextView mTvHeaderTitle, mTvTermsTitle, mTvRedeemTitle, mTVMoreTitle;
64 63
65 64
66 // =========================================================== 65 // ===========================================================
...@@ -122,6 +121,7 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis ...@@ -122,6 +121,7 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis
122 mTvValue = findViewById(R.id.tv_coupon_value); 121 mTvValue = findViewById(R.id.tv_coupon_value);
123 mIvImage = findViewById(R.id.iv_coupon_image); 122 mIvImage = findViewById(R.id.iv_coupon_image);
124 mTvMoreButton = findViewById(R.id.tv_more_button); 123 mTvMoreButton = findViewById(R.id.tv_more_button);
124 + mTvMerchantName = findViewById(R.id.tv_merchant_value);
125 125
126 // Initialize Terms of Use section 126 // Initialize Terms of Use section
127 mTermsContainer = findViewById(R.id.terms_container); 127 mTermsContainer = findViewById(R.id.terms_container);
...@@ -130,17 +130,15 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis ...@@ -130,17 +130,15 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis
130 mIvTermsArrow = findViewById(R.id.iv_terms_arrow); 130 mIvTermsArrow = findViewById(R.id.iv_terms_arrow);
131 mTvTermsText = findViewById(R.id.tv_terms_text); 131 mTvTermsText = findViewById(R.id.tv_terms_text);
132 132
133 - mTvHeaderTitle = findViewById(R.id.tv_header_title);
134 mTvTermsTitle = findViewById(R.id.tv_terms_title); 133 mTvTermsTitle = findViewById(R.id.tv_terms_title);
135 mTvRedeemTitle = findViewById(R.id.tv_redeem_title); 134 mTvRedeemTitle = findViewById(R.id.tv_redeem_title);
136 - mTVMoreTitle = findViewById(R.id.tv_more_title);
137 135
138 - WarpUtils.renderCustomFont(this, R.font.ping_lcg_bold, mTvHeaderTitle, mTvValue, 136 + WarpUtils.renderCustomFont(this, R.font.ping_lcg_bold, mTvValue,
139 - mTvTermsTitle, mTvRedeemTitle); 137 + mTvTermsTitle, mTvMoreButton, mTvMerchantName,
138 + mTvEndDate);
140 139
141 WarpUtils.renderCustomFont(this, R.font.ping_lcg_regular, mTvSmallDescription, 140 WarpUtils.renderCustomFont(this, R.font.ping_lcg_regular, mTvSmallDescription,
142 - mTvEndDate, mTvFullDescription, mTvTermsText, 141 + mTvFullDescription, mTvTermsText, mTvRedeemTitle);
143 - mTVMoreTitle, mTvMoreButton);
144 142
145 if (mOfferItem != null) { 143 if (mOfferItem != null) {
146 if (mOfferItem.getEndDate() != null && !mOfferItem.getEndDate().isEmpty()) { 144 if (mOfferItem.getEndDate() != null && !mOfferItem.getEndDate().isEmpty()) {
...@@ -162,6 +160,8 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis ...@@ -162,6 +160,8 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis
162 .into(mIvImage); 160 .into(mIvImage);
163 } 161 }
164 162
163 + if (!TextUtils.isEmpty(mOfferItem.getAdmin_name()))
164 + mTvMerchantName.setText(mOfferItem.getAdmin_name());
165 if (!TextUtils.isEmpty(mOfferItem.getName())) 165 if (!TextUtils.isEmpty(mOfferItem.getName()))
166 mTvValue.setText(mOfferItem.getName()); 166 mTvValue.setText(mOfferItem.getName());
167 if (!TextUtils.isEmpty(mOfferItem.getShort_description())) 167 if (!TextUtils.isEmpty(mOfferItem.getShort_description()))
...@@ -252,13 +252,13 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis ...@@ -252,13 +252,13 @@ public class SingleCouponsetActivity extends Activity implements View.OnClickLis
252 SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()); 252 SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
253 Date date = inputFormat.parse(endDate); 253 Date date = inputFormat.parse(endDate);
254 SimpleDateFormat outputFormat = new SimpleDateFormat("dd-MM", Locale.getDefault()); 254 SimpleDateFormat outputFormat = new SimpleDateFormat("dd-MM", Locale.getDefault());
255 - return "έως " + outputFormat.format(date); 255 + return outputFormat.format(date);
256 } catch (ParseException e) { 256 } catch (ParseException e) {
257 try { 257 try {
258 SimpleDateFormat inputFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()); 258 SimpleDateFormat inputFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault());
259 Date date = inputFormat2.parse(endDate); 259 Date date = inputFormat2.parse(endDate);
260 SimpleDateFormat outputFormat = new SimpleDateFormat("dd-MM", Locale.getDefault()); 260 SimpleDateFormat outputFormat = new SimpleDateFormat("dd-MM", Locale.getDefault());
261 - return "έως " + outputFormat.format(date); 261 + return outputFormat.format(date);
262 } catch (ParseException e2) { 262 } catch (ParseException e2) {
263 return endDate; 263 return endDate;
264 } 264 }
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="rectangle">
4 + <corners android:radius="6dp" />
5 +
6 + <solid android:color="@color/custom_skyblue4" />
7 + <stroke
8 + android:width="1dp"
9 + android:color="@color/custom_skyblue5" />
10 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:shape="oval">
4 + <corners android:radius="1000dp" />
5 +
6 + <solid android:color="@android:color/white" />
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="16dp" /> 4 + <corners android:radius="1000dp" />
5 5
6 <solid 6 <solid
7 android:width="2dp" 7 android:width="2dp"
......
...@@ -17,43 +17,10 @@ ...@@ -17,43 +17,10 @@
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 android:orientation="vertical"> 18 android:orientation="vertical">
19 19
20 - <LinearLayout
21 - android:id="@+id/header_layout"
22 - android:layout_width="match_parent"
23 - android:layout_height="wrap_content"
24 - android:layout_gravity="center"
25 - android:background="@color/white"
26 - android:orientation="horizontal"
27 - android:padding="16dp">
28 -
29 - <LinearLayout
30 - android:layout_width="0dp"
31 - android:layout_height="wrap_content"
32 - android:gravity="center_vertical"
33 - android:layout_weight="1"
34 - android:orientation="horizontal">
35 -
36 - <ImageView
37 - android:id="@+id/iv_back"
38 - android:layout_width="16dp"
39 - android:layout_height="16dp"
40 - android:layout_marginEnd="24dp"
41 - android:src="@drawable/ic_back" />
42 -
43 - <TextView
44 - android:id="@+id/tv_header_title"
45 - android:layout_width="wrap_content"
46 - android:layout_height="wrap_content"
47 - android:includeFontPadding="false"
48 - android:text="@string/demo_offer"
49 - android:textColor="@color/custom_black4"
50 - android:textSize="16sp" />
51 - </LinearLayout>
52 - </LinearLayout>
53 -
54 <androidx.constraintlayout.widget.ConstraintLayout 20 <androidx.constraintlayout.widget.ConstraintLayout
55 android:layout_width="match_parent" 21 android:layout_width="match_parent"
56 - android:layout_height="210dp"> 22 + android:layout_height="260dp"
23 + android:background="@color/custom_skyblue3">
57 24
58 <ImageView 25 <ImageView
59 android:id="@+id/iv_coupon_image" 26 android:id="@+id/iv_coupon_image"
...@@ -66,31 +33,21 @@ ...@@ -66,31 +33,21 @@
66 app:layout_constraintTop_toTopOf="parent" /> 33 app:layout_constraintTop_toTopOf="parent" />
67 34
68 <LinearLayout 35 <LinearLayout
36 + android:id="@+id/header_layout"
69 android:layout_width="wrap_content" 37 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 38 android:layout_height="wrap_content"
71 - android:layout_marginTop="8dp" 39 + android:layout_marginStart="16dp"
72 - android:layout_marginEnd="8dp" 40 + android:layout_marginTop="16dp"
73 - android:background="@drawable/demo_shape_white_border_grey" 41 + app:layout_constraintStart_toStartOf="parent"
74 - android:orientation="horizontal"
75 - android:paddingHorizontal="8dp"
76 - android:paddingVertical="3dp"
77 - app:layout_constraintEnd_toEndOf="parent"
78 app:layout_constraintTop_toTopOf="parent"> 42 app:layout_constraintTop_toTopOf="parent">
79 43
80 <ImageView 44 <ImageView
81 - android:layout_width="12dp" 45 + android:id="@+id/iv_back"
82 - android:layout_height="12dp" 46 + android:layout_width="38dp"
83 - android:layout_marginEnd="4dp" 47 + android:layout_height="38dp"
84 - android:src="@drawable/ic_info" /> 48 + android:background="@drawable/demo_shape_white"
85 - 49 + android:padding="13dp"
86 - <TextView 50 + android:src="@drawable/ic_back" />
87 - android:id="@+id/tv_more_title"
88 - android:layout_width="wrap_content"
89 - android:layout_height="wrap_content"
90 - android:includeFontPadding="false"
91 - android:text="@string/demo_more"
92 - android:textColor="@color/custom_black4"
93 - android:textSize="11sp" />
94 </LinearLayout> 51 </LinearLayout>
95 </androidx.constraintlayout.widget.ConstraintLayout> 52 </androidx.constraintlayout.widget.ConstraintLayout>
96 53
...@@ -98,10 +55,10 @@ ...@@ -98,10 +55,10 @@
98 android:id="@+id/ll_coupon_info" 55 android:id="@+id/ll_coupon_info"
99 android:layout_width="match_parent" 56 android:layout_width="match_parent"
100 android:layout_height="wrap_content" 57 android:layout_height="wrap_content"
58 + android:layout_marginBottom="48dp"
101 android:orientation="vertical" 59 android:orientation="vertical"
102 android:paddingHorizontal="16dp" 60 android:paddingHorizontal="16dp"
103 - android:paddingVertical="16dp" 61 + android:paddingVertical="16dp">
104 - android:layout_marginBottom="48dp">
105 62
106 <androidx.constraintlayout.widget.ConstraintLayout 63 <androidx.constraintlayout.widget.ConstraintLayout
107 android:layout_width="match_parent" 64 android:layout_width="match_parent"
...@@ -116,17 +73,28 @@ ...@@ -116,17 +73,28 @@
116 android:orientation="vertical" 73 android:orientation="vertical"
117 android:paddingEnd="16dp" 74 android:paddingEnd="16dp"
118 app:layout_constraintBottom_toBottomOf="parent" 75 app:layout_constraintBottom_toBottomOf="parent"
119 - app:layout_constraintEnd_toStartOf="@+id/ll_buttons" 76 + app:layout_constraintEnd_toEndOf="parent"
120 app:layout_constraintStart_toStartOf="parent" 77 app:layout_constraintStart_toStartOf="parent"
121 app:layout_constraintTop_toTopOf="parent"> 78 app:layout_constraintTop_toTopOf="parent">
122 79
123 <TextView 80 <TextView
81 + android:id="@+id/tv_merchant_value"
82 + android:layout_width="wrap_content"
83 + android:layout_height="wrap_content"
84 + android:includeFontPadding="false"
85 + android:maxLines="1"
86 + android:textColor="@color/custom_grey4"
87 + android:textSize="16sp"
88 + tools:text="@string/demo_more" />
89 +
90 + <TextView
124 android:id="@+id/tv_coupon_value" 91 android:id="@+id/tv_coupon_value"
125 android:layout_width="wrap_content" 92 android:layout_width="wrap_content"
126 android:layout_height="wrap_content" 93 android:layout_height="wrap_content"
94 + android:layout_marginTop="16dp"
127 android:includeFontPadding="false" 95 android:includeFontPadding="false"
128 android:maxLines="1" 96 android:maxLines="1"
129 - android:textColor="@color/custom_pink2" 97 + android:textColor="@color/custom_black2"
130 android:textSize="23sp" 98 android:textSize="23sp"
131 tools:text="@string/demo_more" /> 99 tools:text="@string/demo_more" />
132 100
...@@ -134,57 +102,55 @@ ...@@ -134,57 +102,55 @@
134 android:id="@+id/tv_coupon_small_description" 102 android:id="@+id/tv_coupon_small_description"
135 android:layout_width="wrap_content" 103 android:layout_width="wrap_content"
136 android:layout_height="wrap_content" 104 android:layout_height="wrap_content"
137 - android:layout_marginTop="2dp" 105 + android:layout_marginTop="8dp"
138 android:ellipsize="end" 106 android:ellipsize="end"
139 android:includeFontPadding="false" 107 android:includeFontPadding="false"
140 android:maxLines="1" 108 android:maxLines="1"
141 android:text="@string/demo_purchases" 109 android:text="@string/demo_purchases"
142 - android:textColor="@color/custom_black5" 110 + android:textColor="@color/custom_black2"
143 android:textSize="17sp" /> 111 android:textSize="17sp" />
144 </LinearLayout> 112 </LinearLayout>
145 -
146 - <LinearLayout
147 - android:id="@+id/ll_buttons"
148 - android:layout_width="wrap_content"
149 - android:layout_height="wrap_content"
150 - android:orientation="horizontal"
151 - app:layout_constraintBottom_toBottomOf="parent"
152 - app:layout_constraintEnd_toEndOf="parent"
153 - app:layout_constraintTop_toTopOf="parent">
154 -
155 - <ImageView
156 - android:layout_width="40dp"
157 - android:layout_height="40dp"
158 - android:layout_marginEnd="8dp"
159 - android:src="@drawable/demo_heart_border" />
160 -
161 - <ImageView
162 - android:layout_width="40dp"
163 - android:layout_height="40dp"
164 - android:src="@drawable/demo_folder" />
165 - </LinearLayout>
166 </androidx.constraintlayout.widget.ConstraintLayout> 113 </androidx.constraintlayout.widget.ConstraintLayout>
167 114
168 - <TextView 115 + <LinearLayout
169 - android:id="@+id/tv_coupon_end_date"
170 android:layout_width="wrap_content" 116 android:layout_width="wrap_content"
171 android:layout_height="wrap_content" 117 android:layout_height="wrap_content"
172 - android:layout_marginTop="14dp" 118 + android:layout_marginTop="22dp"
173 - android:includeFontPadding="false" 119 + android:background="@drawable/demo_shape_skyblue_border_blue"
174 - android:textColor="@color/custom_black5" 120 + android:gravity="center"
175 - android:textSize="13sp" 121 + android:orientation="horizontal"
176 - tools:text="@string/demo_purchases" /> 122 + android:paddingHorizontal="8dp"
123 + android:paddingVertical="6dp">
124 +
125 + <ImageView
126 + android:layout_width="14dp"
127 + android:layout_height="14dp"
128 + android:src="@drawable/demo_time" />
129 +
130 + <View
131 + android:layout_width="4dp"
132 + android:layout_height="match_parent" />
133 +
134 + <TextView
135 + android:id="@+id/tv_coupon_end_date"
136 + android:layout_width="wrap_content"
137 + android:layout_height="wrap_content"
138 + android:includeFontPadding="false"
139 + android:textColor="@color/custom_black7"
140 + android:textSize="12sp"
141 + tools:text="@string/demo_purchases" />
142 + </LinearLayout>
177 143
178 <TextView 144 <TextView
179 android:id="@+id/tv_coupon_full_description" 145 android:id="@+id/tv_coupon_full_description"
180 android:layout_width="match_parent" 146 android:layout_width="match_parent"
181 android:layout_height="wrap_content" 147 android:layout_height="wrap_content"
182 - android:layout_marginTop="16dp" 148 + android:layout_marginTop="24dp"
183 android:ellipsize="end" 149 android:ellipsize="end"
184 android:lineSpacingExtra="2dp" 150 android:lineSpacingExtra="2dp"
185 android:maxLines="4" 151 android:maxLines="4"
186 - android:textColor="@color/custom_black5" 152 + android:textColor="@color/custom_grey3"
187 - android:textSize="17sp" 153 + android:textSize="15sp"
188 tools:text="Πάρτε τα πακέτα κινητής στη μισή τιμή μόνο αυτό το μήνα. Απεριόριστα λεπτά προς όλα τα δίκτυα, SMS και 50GB δεδομένα υψηλής ταχύτητας. Ισχύει για νέους συνδρομητές και ανανεώσεις συμβολαίων. Δωρεάν ενεργοποίηση και τεχνική υποστήριξη." /> 154 tools:text="Πάρτε τα πακέτα κινητής στη μισή τιμή μόνο αυτό το μήνα. Απεριόριστα λεπτά προς όλα τα δίκτυα, SMS και 50GB δεδομένα υψηλής ταχύτητας. Ισχύει για νέους συνδρομητές και ανανεώσεις συμβολαίων. Δωρεάν ενεργοποίηση και τεχνική υποστήριξη." />
189 155
190 <TextView 156 <TextView
...@@ -194,23 +160,44 @@ ...@@ -194,23 +160,44 @@
194 android:layout_gravity="end" 160 android:layout_gravity="end"
195 android:layout_marginTop="2dp" 161 android:layout_marginTop="2dp"
196 android:text="@string/demo_more" 162 android:text="@string/demo_more"
197 - android:textColor="@color/custom_skyblue" 163 + android:textColor="@color/custom_black6"
198 android:textSize="15sp" 164 android:textSize="15sp"
199 android:visibility="gone" /> 165 android:visibility="gone" />
200 166
201 <LinearLayout 167 <LinearLayout
168 + android:id="@+id/ll_redeem_coupon"
169 + android:layout_width="match_parent"
170 + android:layout_height="55dp"
171 + android:layout_marginTop="20dp"
172 + android:background="@drawable/shape_rectangle_rounded_light_blue_tr"
173 + android:gravity="center"
174 + android:orientation="horizontal">
175 +
176 + <TextView
177 + android:id="@+id/tv_redeem_title"
178 + android:layout_width="wrap_content"
179 + android:layout_height="wrap_content"
180 + android:text="@string/demo_redeem"
181 + android:includeFontPadding="false"
182 + android:textColor="@color/white"
183 + android:textSize="16sp"
184 + android:textStyle="bold" />
185 + </LinearLayout>
186 +
187 + <LinearLayout
202 android:id="@+id/terms_container" 188 android:id="@+id/terms_container"
203 android:layout_width="match_parent" 189 android:layout_width="match_parent"
204 android:layout_height="wrap_content" 190 android:layout_height="wrap_content"
205 - android:layout_marginTop="48dp" 191 + android:layout_marginTop="32dp"
206 android:orientation="vertical" 192 android:orientation="vertical"
207 android:paddingHorizontal="2dp"> 193 android:paddingHorizontal="2dp">
208 194
209 <LinearLayout 195 <LinearLayout
210 android:id="@+id/terms_header" 196 android:id="@+id/terms_header"
211 - android:layout_width="match_parent" 197 + android:layout_width="wrap_content"
212 android:layout_height="wrap_content" 198 android:layout_height="wrap_content"
213 android:gravity="center_vertical" 199 android:gravity="center_vertical"
200 + android:layout_gravity="center"
214 android:orientation="horizontal"> 201 android:orientation="horizontal">
215 202
216 <TextView 203 <TextView
...@@ -218,13 +205,13 @@ ...@@ -218,13 +205,13 @@
218 android:layout_width="wrap_content" 205 android:layout_width="wrap_content"
219 android:layout_height="wrap_content" 206 android:layout_height="wrap_content"
220 android:text="@string/demo_terms" 207 android:text="@string/demo_terms"
221 - android:textColor="@color/custom_black2" 208 + android:textColor="@color/custom_grey3"
222 - android:textSize="15sp"/> 209 + android:textSize="15sp" />
223 210
224 <ImageView 211 <ImageView
225 android:id="@+id/iv_terms_arrow" 212 android:id="@+id/iv_terms_arrow"
226 - android:layout_width="8dp" 213 + android:layout_width="10dp"
227 - android:layout_height="8dp" 214 + android:layout_height="10dp"
228 android:layout_marginStart="4dp" 215 android:layout_marginStart="4dp"
229 android:layout_marginTop="2dp" 216 android:layout_marginTop="2dp"
230 android:src="@drawable/ic_arrow_down" /> 217 android:src="@drawable/ic_arrow_down" />
...@@ -249,25 +236,6 @@ ...@@ -249,25 +236,6 @@
249 android:textSize="15sp" /> 236 android:textSize="15sp" />
250 </LinearLayout> 237 </LinearLayout>
251 </LinearLayout> 238 </LinearLayout>
252 -
253 - <LinearLayout
254 - android:id="@+id/ll_redeem_coupon"
255 - android:layout_width="match_parent"
256 - android:layout_height="55dp"
257 - android:layout_marginTop="20dp"
258 - android:background="@drawable/selector_button_transparent_black_border"
259 - android:gravity="center"
260 - android:orientation="horizontal">
261 -
262 - <TextView
263 - android:id="@+id/tv_redeem_title"
264 - android:layout_width="wrap_content"
265 - android:layout_height="wrap_content"
266 - android:text="@string/demo_redeem"
267 - android:textColor="@color/custom_black2"
268 - android:textSize="15sp"
269 - android:textStyle="bold" />
270 - </LinearLayout>
271 </LinearLayout> 239 </LinearLayout>
272 </LinearLayout> 240 </LinearLayout>
273 </ScrollView> 241 </ScrollView>
...@@ -276,11 +244,12 @@ ...@@ -276,11 +244,12 @@
276 android:id="@+id/pb_loading" 244 android:id="@+id/pb_loading"
277 android:layout_width="match_parent" 245 android:layout_width="match_parent"
278 android:layout_height="wrap_content" 246 android:layout_height="wrap_content"
247 + android:layout_centerInParent="true"
279 android:background="@android:color/transparent" 248 android:background="@android:color/transparent"
280 android:translationZ="100dp" 249 android:translationZ="100dp"
281 android:visibility="gone" 250 android:visibility="gone"
282 - android:layout_centerInParent="true"
283 tools:visibility="visible"> 251 tools:visibility="visible">
252 +
284 <ProgressBar 253 <ProgressBar
285 android:layout_width="48dp" 254 android:layout_width="48dp"
286 android:layout_height="48dp" 255 android:layout_height="48dp"
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
131 android:layout_width="match_parent" 131 android:layout_width="match_parent"
132 android:layout_height="45dp" 132 android:layout_height="45dp"
133 android:layout_marginTop="16dp" 133 android:layout_marginTop="16dp"
134 - android:background="@drawable/selector_button_light_blue" 134 + android:background="@drawable/shape_rectangle_rounded_light_blue_tr"
135 android:gravity="center" 135 android:gravity="center"
136 android:orientation="horizontal"> 136 android:orientation="horizontal">
137 137
......
...@@ -23,4 +23,11 @@ ...@@ -23,4 +23,11 @@
23 <color name="custom_grey2">#D8D8D8</color> 23 <color name="custom_grey2">#D8D8D8</color>
24 <color name="custom_pink3">#EE437E</color> 24 <color name="custom_pink3">#EE437E</color>
25 <color name="custom_light_blue">#00A5E3</color> 25 <color name="custom_light_blue">#00A5E3</color>
26 + <color name="custom_skyblue3">#00A3E01A</color>
27 + <color name="custom_grey3">#5C6369</color>
28 + <color name="custom_black6">#1D2023</color>
29 + <color name="custom_grey4">#9BA1A6</color>
30 + <color name="custom_black7">#002430</color>
31 + <color name="custom_skyblue4">#DDEFFB</color>
32 + <color name="custom_skyblue5">#CCE9FB</color>
26 </resources> 33 </resources>
......
...@@ -9,19 +9,19 @@ ...@@ -9,19 +9,19 @@
9 <string name="demo_login">Σύνδεση</string> 9 <string name="demo_login">Σύνδεση</string>
10 <string name="demo_all">Όλα</string> 10 <string name="demo_all">Όλα</string>
11 <string name="demo_offer">Προσφορά</string> 11 <string name="demo_offer">Προσφορά</string>
12 - <string name="demo_more">Περισσότερα</string> 12 + <string name="demo_more">View more</string>
13 <string name="demo_less">Λιγότερα</string> 13 <string name="demo_less">Λιγότερα</string>
14 <string name="demo_purchases">για αγορές</string> 14 <string name="demo_purchases">για αγορές</string>
15 - <string name="demo_valid_until">Η προσφορά ισχύει έως %1$s</string> 15 + <string name="demo_valid_until">Valid until %1$s</string>
16 <string name="demo_coupon_code">Κωδικός Κουπονιού</string> 16 <string name="demo_coupon_code">Κωδικός Κουπονιού</string>
17 <string name="demo_qr_code">QR Κουπονιού</string> 17 <string name="demo_qr_code">QR Κουπονιού</string>
18 <string name="demo_barcode_code">Barcode Κουπονιού</string> 18 <string name="demo_barcode_code">Barcode Κουπονιού</string>
19 - <string name="demo_terms">Όροι Χρήσης</string> 19 + <string name="demo_terms">Offer terms of use</string>
20 <string name="demo_copy_success">Ο κωδικός αντιγράφηκε στο πρόχειρο</string> 20 <string name="demo_copy_success">Ο κωδικός αντιγράφηκε στο πρόχειρο</string>
21 <string name="demo_lorem_ipsum">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</string> 21 <string name="demo_lorem_ipsum">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</string>
22 <string name="demo_shops">Καταστήματα κοντά μου</string> 22 <string name="demo_shops">Καταστήματα κοντά μου</string>
23 <string name="demo_website">Δες το website</string> 23 <string name="demo_website">Δες το website</string>
24 - <string name="demo_redeem">Απόκτησε το κουπόνι</string> 24 + <string name="demo_redeem">Get coupon</string>
25 <string name="demo_profile">Το προφίλ μου</string> 25 <string name="demo_profile">Το προφίλ μου</string>
26 <string name="demo_my_coupons">Τα κουπόνια μου</string> 26 <string name="demo_my_coupons">Τα κουπόνια μου</string>
27 <string name="demo_active">Ενεργά</string> 27 <string name="demo_active">Ενεργά</string>
......