open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
f3ccaca2 1 parent cc4e0c14

unified screen basket part4

Inline Side-by-side
Showing 7 changed files with 251 additions and 24 deletions
...@@ -49,15 +49,18 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -49,15 +49,18 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
49 // Fields 49 // Fields
50 // =========================================================== 50 // ===========================================================
51 51
52 - private ImageView mIvBack, mIvCouponPhoto, mIvBarcode; 52 + private ImageView mIvBack, mIvCouponPhoto, mIvBarcode, mIvActiveBarcode;
53 private TextView mTvTerms, mTvCouponCode, mTvCouponTitle, mTvCouponSubtitle, mTvCouponDate, 53 private TextView mTvTerms, mTvCouponCode, mTvCouponTitle, mTvCouponSubtitle, mTvCouponDate,
54 mTvTermsValue, mTvFullBarcode, mTvDescription, mTvCouponCodeTitle, mFontHeader, 54 mTvTermsValue, mTvFullBarcode, mTvDescription, mTvCouponCodeTitle, mFontHeader,
55 - mFontButtonGiftIt, mFontButtonShops, mFontButtonSite; 55 + mFontButtonGiftIt, mFontButtonShops, mFontButtonSite, mTvActiveSmCouponValue,
56 - private LinearLayout mLlGiftIt, mLlShops, mLlBarcodeShown, mLlBarcodeContainer, mLlTerms, mLlWebsite; 56 + mTvActiveSmExpirationValue, mTvBarcodeTitle, mFontButtonActiveGiftIt, mTvFindIt;
57 + private LinearLayout mLlGiftIt, mLlShops, mLlBarcodeShown, mLlBarcodeContainer, mLlTerms,
58 + mLlWebsite, mLlActiveSmCouponValue, mLlBarcodeActiveContainer, mLlActiveGiftIt,
59 + mLlSMFindIt;
57 private Coupon mCoupon; 60 private Coupon mCoupon;
58 private boolean mIsBarcodeShown = false, mIsTermsShown = false, mIsFromWallet = false, 61 private boolean mIsBarcodeShown = false, mIsTermsShown = false, mIsFromWallet = false,
59 mShopsPressed = false, mGiftPressed = false, mEshopPressed = false, mIsUnified = false, 62 mShopsPressed = false, mGiftPressed = false, mEshopPressed = false, mIsUnified = false,
60 - mIsActiveUnified = false; 63 + mIsActiveUnified = false, mIsFindItPressed = false;
61 64
62 // =========================================================== 65 // ===========================================================
63 // Methods for/from SuperClass/Interfaces 66 // Methods for/from SuperClass/Interfaces
...@@ -107,6 +110,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -107,6 +110,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
107 mIvBack = findViewById(R.id.iv_coupon_info_back); 110 mIvBack = findViewById(R.id.iv_coupon_info_back);
108 mTvTerms = findViewById(R.id.tv_terms); 111 mTvTerms = findViewById(R.id.tv_terms);
109 mLlGiftIt = findViewById(R.id.ll_gift_it); 112 mLlGiftIt = findViewById(R.id.ll_gift_it);
113 + mLlActiveGiftIt = findViewById(R.id.ll_active_shops);
110 mTvCouponCode = findViewById(R.id.textView16); 114 mTvCouponCode = findViewById(R.id.textView16);
111 mTvCouponTitle = findViewById(R.id.textView13); 115 mTvCouponTitle = findViewById(R.id.textView13);
112 mTvCouponSubtitle = findViewById(R.id.textView14); 116 mTvCouponSubtitle = findViewById(R.id.textView14);
...@@ -124,14 +128,25 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -124,14 +128,25 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
124 mTvCouponCodeTitle = findViewById(R.id.textView15); 128 mTvCouponCodeTitle = findViewById(R.id.textView15);
125 mFontHeader = findViewById(R.id.textView3); 129 mFontHeader = findViewById(R.id.textView3);
126 mFontButtonGiftIt = findViewById(R.id.button_gift_it); 130 mFontButtonGiftIt = findViewById(R.id.button_gift_it);
131 + mFontButtonActiveGiftIt = findViewById(R.id.button_active_shops);
127 mFontButtonShops = findViewById(R.id.button_shops); 132 mFontButtonShops = findViewById(R.id.button_shops);
128 mFontButtonSite = findViewById(R.id.button_site); 133 mFontButtonSite = findViewById(R.id.button_site);
129 - WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader, mTvCouponTitle); 134 + mLlActiveSmCouponValue = findViewById(R.id.ll_active_sm_coupon_value);
135 + mTvActiveSmCouponValue = mLlActiveSmCouponValue.findViewById(R.id.tv_active_sm_coupon_value);
136 + mTvActiveSmExpirationValue = findViewById(R.id.tv_active_sm_coupon_expiration_value);
137 + mLlBarcodeActiveContainer = findViewById(R.id.ll_barcode_active_container);
138 + mIvActiveBarcode = findViewById(R.id.iv_barcode_active);
139 + mTvBarcodeTitle = findViewById(R.id.tv_barcode_title);
140 + mLlSMFindIt = findViewById(R.id.ll_find_shops);
141 + mTvFindIt = mLlSMFindIt.findViewById(R.id.button_find_shops);
142 + WarpUtils.renderCustomFont(this, R.font.bt_cosmo_bold, mFontHeader,
143 + mTvCouponTitle, mTvActiveSmCouponValue);
130 WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponSubtitle, mTvDescription, 144 WarpUtils.renderCustomFont(this, R.font.peridot_regular, mTvCouponSubtitle, mTvDescription,
131 mTvFullBarcode, mTvCouponDate, mTvTermsValue); 145 mTvFullBarcode, mTvCouponDate, mTvTermsValue);
132 WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvCouponCodeTitle, mTvCouponCode, 146 WarpUtils.renderCustomFont(this, R.font.peridot_bold, mTvCouponCodeTitle, mTvCouponCode,
133 - mFontButtonShops, mFontButtonSite, mTvTerms); 147 + mFontButtonShops, mFontButtonSite, mTvTerms, mTvActiveSmExpirationValue,
134 - WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonGiftIt); 148 + mTvBarcodeTitle, mFontButtonActiveGiftIt);
149 + WarpUtils.renderCustomFont(this, R.font.peridot_semi_bold, mFontButtonGiftIt, mTvFindIt);
135 150
136 initViews(); 151 initViews();
137 } 152 }
...@@ -143,6 +158,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -143,6 +158,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
143 mShopsPressed = false; 158 mShopsPressed = false;
144 mGiftPressed = false; 159 mGiftPressed = false;
145 mEshopPressed = false; 160 mEshopPressed = false;
161 + mIsFindItPressed = false;
146 } 162 }
147 163
148 @Override 164 @Override
...@@ -166,7 +182,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -166,7 +182,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
166 onBackPressed(); 182 onBackPressed();
167 return; 183 return;
168 } 184 }
169 - if (view.getId() == R.id.ll_gift_it) { 185 + if (view.getId() == R.id.ll_gift_it || view.getId() == R.id.ll_active_shops) {
170 if (!mGiftPressed) { 186 if (!mGiftPressed) {
171 mGiftPressed = true; 187 mGiftPressed = true;
172 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShareCoupon") 188 WarplyAnalyticsManager.logTrackersEvent(this, "click", ("ShareCoupon")
...@@ -176,6 +192,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -176,6 +192,7 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
176 Intent intent = new Intent(CouponInfoActivity.this, CouponShareActivity.class); 192 Intent intent = new Intent(CouponInfoActivity.this, CouponShareActivity.class);
177 intent.putExtra("coupon", mCoupon != null ? mCoupon.getCoupon() : ""); 193 intent.putExtra("coupon", mCoupon != null ? mCoupon.getCoupon() : "");
178 intent.putExtra("isFromWallet", mIsFromWallet); 194 intent.putExtra("isFromWallet", mIsFromWallet);
195 + intent.putExtra("isActiveUnified", mIsActiveUnified);
179 if (!mIsFromWallet) 196 if (!mIsFromWallet)
180 startActivity(intent); 197 startActivity(intent);
181 else 198 else
...@@ -246,6 +263,12 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -246,6 +263,12 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
246 termsButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_up_dark_new)); 263 termsButtonArrow.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_up_dark_new));
247 mIsTermsShown = true; 264 mIsTermsShown = true;
248 } 265 }
266 + return;
267 + }
268 + if (view.getId() == R.id.ll_find_shops) {
269 + if (!mIsFindItPressed) {
270 + mIsFindItPressed = true;
271 + }
249 } 272 }
250 } 273 }
251 274
...@@ -286,6 +309,27 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -286,6 +309,27 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
286 } 309 }
287 mTvTermsValue.setText(HtmlCompat.fromHtml(mCoupon.getCouponsetDetails().getTerms(), HtmlCompat.FROM_HTML_MODE_COMPACT)); 310 mTvTermsValue.setText(HtmlCompat.fromHtml(mCoupon.getCouponsetDetails().getTerms(), HtmlCompat.FROM_HTML_MODE_COMPACT));
288 mTvTermsValue.setMovementMethod(LinkMovementMethod.getInstance()); 311 mTvTermsValue.setMovementMethod(LinkMovementMethod.getInstance());
312 +
313 + if (mIsActiveUnified) {
314 + if (TextUtils.isEmpty(mCoupon.getDiscount_type())) {
315 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount().replace(".", ",") + getString(R.string.euro));
316 + } else {
317 + if (mCoupon.getDiscount_type().equals("value")) {
318 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount().replace(".", ",") + getString(R.string.euro));
319 + } else if (mCoupon.getDiscount_type().equals("percentage")) {
320 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount() + getString(R.string.percentage));
321 + } else if (mCoupon.getDiscount_type().equals("plus_one")) {
322 + mTvActiveSmCouponValue.setText(mCoupon.getDiscount() + getString(R.string.plus_one));
323 + } else {
324 + mTvActiveSmCouponValue.setText("-" + mCoupon.getDiscount().replace(".", ",") + getString(R.string.euro));
325 + }
326 + }
327 + mLlActiveSmCouponValue.setVisibility(View.VISIBLE);
328 + mLlGiftIt.setVisibility(View.GONE);
329 + mLlActiveGiftIt.setVisibility(View.VISIBLE);
330 + mLlShops.setVisibility(View.GONE);
331 + mLlSMFindIt.setVisibility(View.VISIBLE);
332 + }
289 } else { 333 } else {
290 if (mCoupon.getMerchantDetails() != null) { 334 if (mCoupon.getMerchantDetails() != null) {
291 if (mCoupon.getMerchantDetails() != null && !TextUtils.isEmpty(mCoupon.getMerchantDetails().getBody()) && !mCoupon.getMerchantDetails().getBody().equals("null")) { 335 if (mCoupon.getMerchantDetails() != null && !TextUtils.isEmpty(mCoupon.getMerchantDetails().getBody()) && !mCoupon.getMerchantDetails().getBody().equals("null")) {
...@@ -311,7 +355,14 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -311,7 +355,14 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
311 e.printStackTrace(); 355 e.printStackTrace();
312 } 356 }
313 simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); 357 simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
314 - mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_mycoupon_date), simpleDateFormat.format(newDate != null ? newDate : ""))); 358 +
359 + if (mIsActiveUnified) {
360 + mTvCouponDate.setVisibility(View.GONE);
361 + mTvActiveSmExpirationValue.setText(String.format(getResources().getString(R.string.cos_coupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
362 + mTvActiveSmExpirationValue.setVisibility(View.VISIBLE);
363 + } else {
364 + mTvCouponDate.setText(String.format(getResources().getString(R.string.cos_mycoupon_date), simpleDateFormat.format(newDate != null ? newDate : "")));
365 + }
315 } 366 }
316 367
317 if (mIsUnified) { 368 if (mIsUnified) {
...@@ -368,6 +419,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -368,6 +419,8 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
368 mLlWebsite.setOnClickListener(this); 419 mLlWebsite.setOnClickListener(this);
369 mLlBarcodeShown.setOnClickListener(this); 420 mLlBarcodeShown.setOnClickListener(this);
370 mLlTerms.setOnClickListener(this); 421 mLlTerms.setOnClickListener(this);
422 + mLlActiveGiftIt.setOnClickListener(this);
423 + mLlSMFindIt.setOnClickListener(this);
371 424
372 String tempCoupon = ""; 425 String tempCoupon = "";
373 int result = 0; 426 int result = 0;
...@@ -407,11 +460,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -407,11 +460,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
407 mIvBarcode.setImageBitmap(bmp); 460 mIvBarcode.setImageBitmap(bmp);
408 mTvFullBarcode.setText(barcodeString); 461 mTvFullBarcode.setText(barcodeString);
409 462
463 + if (mIsActiveUnified) {
464 + mLlBarcodeActiveContainer.setVisibility(View.VISIBLE);
465 + mIvActiveBarcode.setImageBitmap(bmp);
466 + }
410 } catch (Exception e) { 467 } catch (Exception e) {
411 e.printStackTrace(); 468 e.printStackTrace();
412 mLlBarcodeShown.setVisibility(View.GONE); 469 mLlBarcodeShown.setVisibility(View.GONE);
413 mLlBarcodeContainer.setVisibility(View.GONE); 470 mLlBarcodeContainer.setVisibility(View.GONE);
414 mIvBarcode.setVisibility(View.GONE); 471 mIvBarcode.setVisibility(View.GONE);
472 + mLlBarcodeActiveContainer.setVisibility(View.GONE);
415 } 473 }
416 } 474 }
417 475
......
...@@ -65,7 +65,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -65,7 +65,7 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
65 private EditText mEdtReceiver; 65 private EditText mEdtReceiver;
66 private AlertDialog mAlertDialogSuccessSharing, mAlertDialogErrorSharing, 66 private AlertDialog mAlertDialogSuccessSharing, mAlertDialogErrorSharing,
67 mAlertDialogCouponAskSharing, mAlertDialogWrongNumberSharing, mAlertDialogNoAssets; 67 mAlertDialogCouponAskSharing, mAlertDialogWrongNumberSharing, mAlertDialogNoAssets;
68 - private boolean mIsFromWallet = false; 68 + private boolean mIsFromWallet = false, mIsActiveUnified = false;
69 69
70 // =========================================================== 70 // ===========================================================
71 // Methods for/from SuperClass/Interfaces 71 // Methods for/from SuperClass/Interfaces
...@@ -78,11 +78,21 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -78,11 +78,21 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
78 78
79 String couponCode = getIntent().getStringExtra("coupon"); 79 String couponCode = getIntent().getStringExtra("coupon");
80 mIsFromWallet = getIntent().getBooleanExtra("isFromWallet", false); 80 mIsFromWallet = getIntent().getBooleanExtra("isFromWallet", false);
81 + mIsActiveUnified = getIntent().getBooleanExtra("isActiveUnified", false);
81 82
82 - for (Coupon cpn : WarplyManagerHelper.getCouponList()) { 83 + if (mIsActiveUnified) {
83 - if (cpn.getCoupon().equals(couponCode)) { 84 + for (Coupon cpn : WarplyManagerHelper.getSmCouponsList()) {
84 - mCoupon = cpn; 85 + if (cpn.getCoupon().equals(couponCode)) {
85 - break; 86 + mCoupon = cpn;
87 + break;
88 + }
89 + }
90 + } else {
91 + for (Coupon cpn : WarplyManagerHelper.getCouponList()) {
92 + if (cpn.getCoupon().equals(couponCode)) {
93 + mCoupon = cpn;
94 + break;
95 + }
86 } 96 }
87 } 97 }
88 98
......
1 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:shape="rectangle">
3 + <corners android:radius="13dp" />
4 + <solid android:color="@color/cos_skyblue4" />
5 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
2 + android:shape="rectangle">
3 + <corners android:topLeftRadius="16dp" android:bottomRightRadius="16dp" />
4 + <solid android:color="@color/cos_skyblue4" />
5 +</shape>
...\ No newline at end of file ...\ No newline at end of file
...@@ -54,12 +54,40 @@ ...@@ -54,12 +54,40 @@
54 android:orientation="vertical" 54 android:orientation="vertical"
55 android:paddingBottom="48dp"> 55 android:paddingBottom="48dp">
56 56
57 - <ImageView 57 + <RelativeLayout
58 - android:id="@+id/imageView6"
59 android:layout_width="match_parent" 58 android:layout_width="match_parent"
60 - android:layout_height="222dp" 59 + android:layout_height="wrap_content">
61 - android:scaleType="centerCrop" 60 +
62 - tools:src="@drawable/carousel_banner" /> 61 + <ImageView
62 + android:id="@+id/imageView6"
63 + android:layout_width="match_parent"
64 + android:layout_height="222dp"
65 + android:scaleType="centerCrop"
66 + tools:src="@drawable/carousel_banner" />
67 +
68 + <LinearLayout
69 + android:id="@+id/ll_active_sm_coupon_value"
70 + android:layout_width="wrap_content"
71 + android:layout_height="wrap_content"
72 + android:layout_marginStart="16dp"
73 + android:layout_marginTop="16dp"
74 + android:background="@drawable/shape_top_left_bottom_right_rounded_blue"
75 + android:orientation="vertical"
76 + android:paddingHorizontal="8dp"
77 + android:paddingVertical="26dp"
78 + android:visibility="gone"
79 + tools:visibility="visible">
80 +
81 + <TextView
82 + android:id="@+id/tv_active_sm_coupon_value"
83 + android:layout_width="wrap_content"
84 + android:layout_height="wrap_content"
85 + android:layout_below="@+id/ll_terms_inner"
86 + android:textColor="@color/cos_blue6"
87 + android:textSize="28sp"
88 + tools:text="@string/temp_value" />
89 + </LinearLayout>
90 + </RelativeLayout>
63 91
64 <TextView 92 <TextView
65 android:id="@+id/textView13" 93 android:id="@+id/textView13"
...@@ -73,6 +101,22 @@ ...@@ -73,6 +101,22 @@
73 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" /> 101 tools:text="Πάρε δωρεάν μηνιαία πακέτα με πάνες στα supermarket Σκλαβενίτης!" />
74 102
75 <TextView 103 <TextView
104 + android:id="@+id/tv_active_sm_coupon_expiration_value"
105 + android:layout_width="wrap_content"
106 + android:layout_height="wrap_content"
107 + android:layout_gravity="center"
108 + android:layout_marginTop="8dp"
109 + android:background="@drawable/shape_rounded_blue"
110 + android:includeFontPadding="false"
111 + android:paddingHorizontal="14dp"
112 + android:paddingVertical="3dp"
113 + android:textColor="@color/cos_blue6"
114 + android:textSize="14sp"
115 + android:visibility="gone"
116 + tools:text="@string/cos_coupon_date"
117 + tools:visibility="visible" />
118 +
119 + <TextView
76 android:id="@+id/textView14" 120 android:id="@+id/textView14"
77 android:layout_width="match_parent" 121 android:layout_width="match_parent"
78 android:layout_height="wrap_content" 122 android:layout_height="wrap_content"
...@@ -197,6 +241,58 @@ ...@@ -197,6 +241,58 @@
197 </LinearLayout> 241 </LinearLayout>
198 </LinearLayout> 242 </LinearLayout>
199 243
244 + <LinearLayout
245 + android:id="@+id/ll_barcode_active_container"
246 + android:layout_width="match_parent"
247 + android:layout_height="wrap_content"
248 + android:layout_marginTop="16dp"
249 + android:gravity="center"
250 + android:orientation="vertical"
251 + android:visibility="gone">
252 +
253 + <LinearLayout
254 + android:id="@+id/ll_barcode_active_container_items"
255 + android:layout_width="match_parent"
256 + android:layout_height="wrap_content"
257 + android:gravity="center"
258 + android:orientation="vertical">
259 +
260 + <TextView
261 + android:id="@+id/tv_barcode_title"
262 + android:layout_width="wrap_content"
263 + android:layout_height="wrap_content"
264 + android:layout_gravity="center"
265 + android:text="@string/cos_barcode_coupon_title"
266 + android:textColor="@color/cos_light_black"
267 + android:textSize="16sp" />
268 +
269 + <View
270 + android:id="@+id/view_active_5"
271 + android:layout_width="match_parent"
272 + android:layout_height="0.8dp"
273 + android:layout_marginHorizontal="32dp"
274 + android:layout_marginTop="16dp"
275 + android:background="#E6E6E6" />
276 +
277 + <ImageView
278 + android:id="@+id/iv_barcode_active"
279 + android:layout_width="match_parent"
280 + android:layout_height="86dp"
281 + android:layout_marginHorizontal="48dp"
282 + android:layout_marginTop="16dp"
283 + android:scaleType="fitXY"
284 + tools:srcCompat="@tools:sample/avatars" />
285 +
286 + <View
287 + android:id="@+id/view_active_4"
288 + android:layout_width="match_parent"
289 + android:layout_height="0.8dp"
290 + android:layout_marginHorizontal="32dp"
291 + android:layout_marginTop="16dp"
292 + android:background="#E6E6E6" />
293 + </LinearLayout>
294 + </LinearLayout>
295 +
200 <TextView 296 <TextView
201 android:id="@+id/textView17" 297 android:id="@+id/textView17"
202 android:layout_width="wrap_content" 298 android:layout_width="wrap_content"
...@@ -209,8 +305,8 @@ ...@@ -209,8 +305,8 @@
209 305
210 <LinearLayout 306 <LinearLayout
211 android:id="@+id/ll_gift_it" 307 android:id="@+id/ll_gift_it"
212 - android:layout_width="140dp" 308 + android:layout_width="260dp"
213 - android:layout_height="45dp" 309 + android:layout_height="55dp"
214 android:layout_gravity="center" 310 android:layout_gravity="center"
215 android:layout_marginHorizontal="32dp" 311 android:layout_marginHorizontal="32dp"
216 android:layout_marginTop="32dp" 312 android:layout_marginTop="32dp"
...@@ -231,8 +327,58 @@ ...@@ -231,8 +327,58 @@
231 </LinearLayout> 327 </LinearLayout>
232 328
233 <LinearLayout 329 <LinearLayout
330 + android:id="@+id/ll_find_shops"
331 + android:layout_width="260dp"
332 + android:layout_height="55dp"
333 + android:layout_gravity="center"
334 + android:layout_marginHorizontal="32dp"
335 + android:layout_marginTop="32dp"
336 + android:background="@drawable/selector_button_green"
337 + android:gravity="center"
338 + android:orientation="horizontal"
339 + android:paddingVertical="8dp"
340 + android:visibility="gone"
341 + tools:visibility="visible">
342 +
343 + <TextView
344 + android:id="@+id/button_find_shops"
345 + android:layout_width="wrap_content"
346 + android:layout_height="wrap_content"
347 + android:gravity="center"
348 + android:includeFontPadding="false"
349 + android:text="@string/cos_sm_find_it"
350 + android:textColor="@color/white"
351 + android:textSize="16sp" />
352 + </LinearLayout>
353 +
354 + <LinearLayout
355 + android:id="@+id/ll_active_shops"
356 + android:layout_width="260dp"
357 + android:layout_height="55dp"
358 + android:layout_gravity="center"
359 + android:layout_marginHorizontal="32dp"
360 + android:layout_marginTop="12dp"
361 + android:background="@drawable/selector_button_green_border"
362 + android:gravity="center"
363 + android:orientation="horizontal"
364 + android:paddingVertical="8dp"
365 + android:visibility="gone"
366 + tools:visibility="visible">
367 +
368 + <TextView
369 + android:id="@+id/button_active_shops"
370 + android:layout_width="wrap_content"
371 + android:layout_height="wrap_content"
372 + android:gravity="center"
373 + android:includeFontPadding="false"
374 + android:text="@string/cos_gift_it"
375 + android:textColor="@color/cos_green12"
376 + android:textSize="16sp" />
377 + </LinearLayout>
378 +
379 + <LinearLayout
234 android:id="@+id/ll_shops" 380 android:id="@+id/ll_shops"
235 - android:layout_width="220dp" 381 + android:layout_width="260dp"
236 android:layout_height="55dp" 382 android:layout_height="55dp"
237 android:layout_gravity="center" 383 android:layout_gravity="center"
238 android:layout_marginHorizontal="32dp" 384 android:layout_marginHorizontal="32dp"
...@@ -257,7 +403,7 @@ ...@@ -257,7 +403,7 @@
257 403
258 <LinearLayout 404 <LinearLayout
259 android:id="@+id/ll_website" 405 android:id="@+id/ll_website"
260 - android:layout_width="220dp" 406 + android:layout_width="260dp"
261 android:layout_height="55dp" 407 android:layout_height="55dp"
262 android:layout_gravity="center" 408 android:layout_gravity="center"
263 android:layout_marginHorizontal="32dp" 409 android:layout_marginHorizontal="32dp"
......
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 168
169 <LinearLayout 169 <LinearLayout
170 android:id="@+id/ll_share_button" 170 android:id="@+id/ll_share_button"
171 - android:layout_width="190dp" 171 + android:layout_width="260dp"
172 android:layout_height="55dp" 172 android:layout_height="55dp"
173 android:layout_marginHorizontal="32dp" 173 android:layout_marginHorizontal="32dp"
174 android:layout_marginTop="64dp" 174 android:layout_marginTop="64dp"
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
35 <string name="cos_coupons_loyalty_title">Ενεργά κουπόνια</string> 35 <string name="cos_coupons_loyalty_title">Ενεργά κουπόνια</string>
36 <string name="cos_coupon_info_title">Εκπτωτικό κουπόνι</string> 36 <string name="cos_coupon_info_title">Εκπτωτικό κουπόνι</string>
37 <string name="cos_coupon_date">Ισχύει έως %1$s</string> 37 <string name="cos_coupon_date">Ισχύει έως %1$s</string>
38 + <string name="temp_value">-0,30$</string>
38 <string name="cos_dl_title">Μόλις έλαβες δώρο %1$s συμμετοχές στο My Lucky Day Draw!</string> 39 <string name="cos_dl_title">Μόλις έλαβες δώρο %1$s συμμετοχές στο My Lucky Day Draw!</string>
39 <string name="cos_active_coupons">Έχεις %1$s ενεργά\nκουπόνια</string> 40 <string name="cos_active_coupons">Έχεις %1$s ενεργά\nκουπόνια</string>
40 <string name="cos_active_coupon_date">Λήγει σε %1$s ημέρες</string> 41 <string name="cos_active_coupon_date">Λήγει σε %1$s ημέρες</string>
...@@ -59,6 +60,7 @@ ...@@ -59,6 +60,7 @@
59 <string name="cos_loyalty_rewards">My rewards</string> 60 <string name="cos_loyalty_rewards">My rewards</string>
60 <string name="cos_loyalty_old_rewards">Παλαιότερα δώρα</string> 61 <string name="cos_loyalty_old_rewards">Παλαιότερα δώρα</string>
61 <string name="cos_see_all">Δες τα όλα -></string> 62 <string name="cos_see_all">Δες τα όλα -></string>
63 + <string name="cos_barcode_coupon_title">barcode κουπονιού</string>
62 <string name="cos_active_rewards">Έχεις %1$s ενεργά δώρα</string> 64 <string name="cos_active_rewards">Έχεις %1$s ενεργά δώρα</string>
63 <string name="cos_analysis">Ανάλυση</string> 65 <string name="cos_analysis">Ανάλυση</string>
64 <string name="cos_active_deals">%1$s Ενεργός κωδικός:</string> 66 <string name="cos_active_deals">%1$s Ενεργός κωδικός:</string>
...@@ -85,6 +87,7 @@ ...@@ -85,6 +87,7 @@
85 <string name="cos_popup_gifts_subtitle">Σε αυτή την ενότητα βρίσκεις τα διαθέσιμα δώρα και επιβραβεύσεις αποκλειστικά για σένα!</string> 87 <string name="cos_popup_gifts_subtitle">Σε αυτή την ενότητα βρίσκεις τα διαθέσιμα δώρα και επιβραβεύσεις αποκλειστικά για σένα!</string>
86 <string name="cos_mycoupon_date">Το κουπόνι ισχύει έως %1$s</string> 88 <string name="cos_mycoupon_date">Το κουπόνι ισχύει έως %1$s</string>
87 <string name="cos_gift_it">Δώρισέ το</string> 89 <string name="cos_gift_it">Δώρισέ το</string>
90 + <string name="cos_sm_find_it">Βρες το στα supermarket</string>
88 <string name="cos_activate_unified">Συνδύασε τις προσφορές σε ένα κουπόνι</string> 91 <string name="cos_activate_unified">Συνδύασε τις προσφορές σε ένα κουπόνι</string>
89 <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string> 92 <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string>
90 <string name="cos_popup_more_subtitle">Σε αυτή την ενότητα βρες έρευνες, παιχνίδια, διαγωνισμούς και επιβραβεύσεις για τις αθλητικές σου δραστηριότητες!</string> 93 <string name="cos_popup_more_subtitle">Σε αυτή την ενότητα βρες έρευνες, παιχνίδια, διαγωνισμούς και επιβραβεύσεις για τις αθλητικές σου δραστηριότητες!</string>
......