open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
9adad86c 1 parent a1e644b7

vouchers part5

Expand all
Inline Side-by-side
Showing 9 changed files with 82 additions and 17 deletions
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.4.6rc80' 5 + PUBLISH_VERSION = '4.5.5.4r1'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
1 +/*
2 + * Copyright 2010-2013 Warply Ltd. All rights reserved.
3 + *
4 + * Redistribution and use in source and binary forms, without modification, are
5 + * permitted provided that the following conditions are met:
6 + *
7 + * 1. Redistributions of source code must retain the above copyright notice,
8 + * this list of conditions and the following disclaimer.
9 + *
10 + * 2. Redistributions in binary form must reproduce the above copyright notice,
11 + * this list of conditions and the following disclaimer in the documentation
12 + * and/or other materials provided with the distribution.
13 + *
14 + * THIS SOFTWARE IS PROVIDED BY THE WARPLY LTD ``AS IS'' AND ANY EXPRESS OR
15 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
16 + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
17 + * EVENT SHALL WARPLY LTD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
18 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
19 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
20 + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
21 + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
22 + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
23 + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 + */
25 +
26 +package ly.warp.sdk.io.models;
27 +
28 +
29 +/**
30 + * Created by Panagiotis Triantafyllou on 25-Oct-23.
31 + */
32 +
33 +public class VouchersServiceUnavailableEventModel {
34 + private boolean serviceUnavailable;
35 +
36 + public VouchersServiceUnavailableEventModel() {
37 + this.serviceUnavailable = true;
38 + }
39 +
40 + public boolean isServiceUnavailable() {
41 + return serviceUnavailable;
42 + }
43 +
44 + public void setServiceUnavailable(boolean serviceUnavailable) {
45 + this.serviceUnavailable = serviceUnavailable;
46 + }
47 +}
...@@ -33,7 +33,7 @@ public class WarpConstants { ...@@ -33,7 +33,7 @@ public class WarpConstants {
33 /** 33 /**
34 * The version of the SDK installed in the device 34 * The version of the SDK installed in the device
35 */ 35 */
36 - public static final String SDK_VERSION = "4.5.4.6"; 36 + public static final String SDK_VERSION = "4.5.5.4";
37 37
38 /** 38 /**
39 * The URL of the server where it should ping 39 * The URL of the server where it should ping
......
...@@ -18,6 +18,7 @@ import ly.warp.sdk.io.models.RefreshUnifiedCouponsEventModel; ...@@ -18,6 +18,7 @@ import ly.warp.sdk.io.models.RefreshUnifiedCouponsEventModel;
18 import ly.warp.sdk.io.models.UnifiedCouponsEventModel; 18 import ly.warp.sdk.io.models.UnifiedCouponsEventModel;
19 import ly.warp.sdk.io.models.VouchersActivityEventModel; 19 import ly.warp.sdk.io.models.VouchersActivityEventModel;
20 import ly.warp.sdk.io.models.VouchersFetchedEventModel; 20 import ly.warp.sdk.io.models.VouchersFetchedEventModel;
21 +import ly.warp.sdk.io.models.VouchersServiceUnavailableEventModel;
21 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel; 22 import ly.warp.sdk.io.models.WarplyCCMSEnabledModel;
22 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; 23 import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel;
23 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel; 24 import ly.warp.sdk.io.models.WarplyDealsAnalysisEventModel;
...@@ -61,6 +62,7 @@ public class WarplyEventBusManager { ...@@ -61,6 +62,7 @@ public class WarplyEventBusManager {
61 private WarplyWebviewCallbackEventModel webviewCallback; 62 private WarplyWebviewCallbackEventModel webviewCallback;
62 private WarplyWebviewActivityCallbackEventModel webviewActivityCallback; 63 private WarplyWebviewActivityCallbackEventModel webviewActivityCallback;
63 private WarplyUnifiedActivatedEventModel unifiedActivated; 64 private WarplyUnifiedActivatedEventModel unifiedActivated;
65 + private VouchersServiceUnavailableEventModel serviceUnavailable;
64 66
65 public WarplyEventBusManager() { 67 public WarplyEventBusManager() {
66 68
...@@ -158,6 +160,10 @@ public class WarplyEventBusManager { ...@@ -158,6 +160,10 @@ public class WarplyEventBusManager {
158 this.dealsAnalysis = dealsAnalysis; 160 this.dealsAnalysis = dealsAnalysis;
159 } 161 }
160 162
163 + public WarplyEventBusManager(VouchersServiceUnavailableEventModel serviceUnavailable) {
164 + this.serviceUnavailable = serviceUnavailable;
165 + }
166 +
161 public WarplyEventBusManager(WarplyCCMSEnabledModel ccmsActivated) { 167 public WarplyEventBusManager(WarplyCCMSEnabledModel ccmsActivated) {
162 this.ccmsActivated = ccmsActivated; 168 this.ccmsActivated = ccmsActivated;
163 } 169 }
...@@ -299,4 +305,8 @@ public class WarplyEventBusManager { ...@@ -299,4 +305,8 @@ public class WarplyEventBusManager {
299 public WarplyUnifiedActivatedEventModel getWarplyUnifiedActivatedEventModel() { 305 public WarplyUnifiedActivatedEventModel getWarplyUnifiedActivatedEventModel() {
300 return unifiedActivated; 306 return unifiedActivated;
301 } 307 }
308 +
309 + public VouchersServiceUnavailableEventModel getVouchersServiceUnavailableEventModel() {
310 + return serviceUnavailable;
311 + }
302 } 312 }
......
...@@ -205,7 +205,8 @@ ...@@ -205,7 +205,8 @@
205 android:layout_width="match_parent" 205 android:layout_width="match_parent"
206 android:layout_height="wrap_content" 206 android:layout_height="wrap_content"
207 android:layout_below="@+id/rl_first_banner" 207 android:layout_below="@+id/rl_first_banner"
208 - android:layout_marginHorizontal="16dp"> 208 + android:layout_marginHorizontal="16dp"
209 + android:layout_marginTop="16dp">
209 210
210 <RelativeLayout 211 <RelativeLayout
211 android:layout_width="wrap_content" 212 android:layout_width="wrap_content"
...@@ -259,7 +260,7 @@ ...@@ -259,7 +260,7 @@
259 <LinearLayout 260 <LinearLayout
260 android:layout_width="match_parent" 261 android:layout_width="match_parent"
261 android:layout_height="match_parent" 262 android:layout_height="match_parent"
262 - android:background="@color/cos_green_tr" 263 + android:background="@color/cos_creme"
263 android:gravity="center" 264 android:gravity="center"
264 android:orientation="vertical"> 265 android:orientation="vertical">
265 266
...@@ -285,7 +286,8 @@ ...@@ -285,7 +286,8 @@
285 android:layout_width="match_parent" 286 android:layout_width="match_parent"
286 android:layout_height="wrap_content" 287 android:layout_height="wrap_content"
287 android:layout_below="@+id/rl_second_banner" 288 android:layout_below="@+id/rl_second_banner"
288 - android:layout_marginHorizontal="16dp"> 289 + android:layout_marginHorizontal="16dp"
290 + android:layout_marginTop="16dp">
289 291
290 <RelativeLayout 292 <RelativeLayout
291 android:layout_width="wrap_content" 293 android:layout_width="wrap_content"
...@@ -339,7 +341,7 @@ ...@@ -339,7 +341,7 @@
339 <LinearLayout 341 <LinearLayout
340 android:layout_width="match_parent" 342 android:layout_width="match_parent"
341 android:layout_height="match_parent" 343 android:layout_height="match_parent"
342 - android:background="@color/cos_green_tr" 344 + android:background="@color/cos_skyblue5"
343 android:gravity="center" 345 android:gravity="center"
344 android:orientation="vertical"> 346 android:orientation="vertical">
345 347
......
...@@ -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="@color/white"> 12 android:background="@color/white">
13 13
14 <ImageView 14 <ImageView
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 android:layout_height="48dp" 17 android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:scaleType="centerInside" 19 android:scaleType="centerInside"
20 - android:src="@drawable/ic_back" 20 + android:src="@drawable/ic_close"
21 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
22 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
23 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
266 android:layout_width="16dp" 266 android:layout_width="16dp"
267 android:layout_height="16dp" 267 android:layout_height="16dp"
268 android:layout_alignParentEnd="true" 268 android:layout_alignParentEnd="true"
269 - android:layout_marginTop="1dp" 269 + android:layout_marginTop="4dp"
270 android:layout_marginEnd="1dp" 270 android:layout_marginEnd="1dp"
271 android:background="@drawable/shape_cos_counter_orange" 271 android:background="@drawable/shape_cos_counter_orange"
272 android:gravity="center" 272 android:gravity="center"
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
355 android:layout_width="16dp" 355 android:layout_width="16dp"
356 android:layout_height="16dp" 356 android:layout_height="16dp"
357 android:layout_alignParentEnd="true" 357 android:layout_alignParentEnd="true"
358 - android:layout_marginTop="1dp" 358 + android:layout_marginTop="4dp"
359 android:layout_marginEnd="1dp" 359 android:layout_marginEnd="1dp"
360 android:background="@drawable/shape_cos_counter_orange" 360 android:background="@drawable/shape_cos_counter_orange"
361 android:gravity="center" 361 android:gravity="center"
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
443 android:layout_width="16dp" 443 android:layout_width="16dp"
444 android:layout_height="16dp" 444 android:layout_height="16dp"
445 android:layout_alignParentEnd="true" 445 android:layout_alignParentEnd="true"
446 - android:layout_marginTop="1dp" 446 + android:layout_marginTop="4dp"
447 android:layout_marginEnd="1dp" 447 android:layout_marginEnd="1dp"
448 android:background="@drawable/shape_cos_counter_orange" 448 android:background="@drawable/shape_cos_counter_orange"
449 android:gravity="center" 449 android:gravity="center"
...@@ -465,27 +465,31 @@ ...@@ -465,27 +465,31 @@
465 </LinearLayout> 465 </LinearLayout>
466 </RelativeLayout> 466 </RelativeLayout>
467 </androidx.constraintlayout.widget.ConstraintLayout> 467 </androidx.constraintlayout.widget.ConstraintLayout>
468 + </LinearLayout>
468 469
469 <LinearLayout 470 <LinearLayout
470 android:id="@+id/ll_vouchers_spinner" 471 android:id="@+id/ll_vouchers_spinner"
471 android:layout_width="match_parent" 472 android:layout_width="match_parent"
472 android:layout_height="wrap_content" 473 android:layout_height="wrap_content"
474 + android:layout_marginHorizontal="14dp"
473 android:layout_marginTop="32dp" 475 android:layout_marginTop="32dp"
474 - android:orientation="vertical"
475 android:gravity="center_horizontal" 476 android:gravity="center_horizontal"
477 + android:orientation="vertical"
476 android:visibility="gone" 478 android:visibility="gone"
477 tools:visibility="visible"> 479 tools:visibility="visible">
480 +
478 <ProgressBar 481 <ProgressBar
479 android:id="@+id/pb_vouchers" 482 android:id="@+id/pb_vouchers"
480 android:layout_width="48dp" 483 android:layout_width="48dp"
481 android:layout_height="48dp" 484 android:layout_height="48dp"
482 - android:theme="@style/progressBarGreen"/> 485 + android:theme="@style/progressBarGreen" />
483 </LinearLayout> 486 </LinearLayout>
484 487
485 <LinearLayout 488 <LinearLayout
486 android:id="@+id/ll_vouchers" 489 android:id="@+id/ll_vouchers"
487 android:layout_width="match_parent" 490 android:layout_width="match_parent"
488 android:layout_height="wrap_content" 491 android:layout_height="wrap_content"
492 + android:layout_marginHorizontal="14dp"
489 android:layout_marginTop="32dp" 493 android:layout_marginTop="32dp"
490 android:orientation="vertical" 494 android:orientation="vertical"
491 android:visibility="gone" 495 android:visibility="gone"
...@@ -563,7 +567,6 @@ ...@@ -563,7 +567,6 @@
563 </androidx.constraintlayout.widget.ConstraintLayout> 567 </androidx.constraintlayout.widget.ConstraintLayout>
564 </androidx.cardview.widget.CardView> 568 </androidx.cardview.widget.CardView>
565 </LinearLayout> 569 </LinearLayout>
566 - </LinearLayout>
567 570
568 <LinearLayout 571 <LinearLayout
569 android:id="@+id/ll_empty_wallet" 572 android:id="@+id/ll_empty_wallet"
......
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
75 <string name="cos_gift_it">Δώρισέ το</string> 75 <string name="cos_gift_it">Δώρισέ το</string>
76 <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string> 76 <string name="cos_popup_more_title">COSMOTE MORE FOR YOU</string>
77 <string name="cos_popup_more_subtitle">Σε αυτή την ενότητα βρες έρευνες, παιχνίδια, διαγωνισμούς και επιβραβεύσεις για τις αθλητικές σου δραστηριότητες!</string> 77 <string name="cos_popup_more_subtitle">Σε αυτή την ενότητα βρες έρευνες, παιχνίδια, διαγωνισμούς και επιβραβεύσεις για τις αθλητικές σου δραστηριότητες!</string>
78 - <string name="cos_deals_win_title">Έχεις κερδίσει&#160;%1$s€&#160;με το\nGIFTS FOR YOU!</string> 78 + <string name="cos_deals_win_title">Μέχρι τώρα έχεις όφελος %1$s€ από τα GIFTS FOR YOU</string>
79 - <string name="cos_deals_win_title_cos">Έχεις κερδίσει&#160;%1$s€&#160;με το\nDEALS FOR YOU!</string> 79 + <string name="cos_deals_win_title_cos">Μέχρι τώρα έχεις όφελος %1$s€ από τα DEALS FOR YOU</string>
80 <string name="cos_mygifts">Τα δώρα μου</string> 80 <string name="cos_mygifts">Τα δώρα μου</string>
81 <string name="cos_gifts_banner_title">Δώρα:</string> 81 <string name="cos_gifts_banner_title">Δώρα:</string>
82 <string name="cos_see_more">Δες περισσότερα</string> 82 <string name="cos_see_more">Δες περισσότερα</string>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
174 <string name="cos_coupon_date_limit">Ισχύει έως&#160;</string> 174 <string name="cos_coupon_date_limit">Ισχύει έως&#160;</string>
175 <string name="cos_coupon_date_limit2">%1$s</string> 175 <string name="cos_coupon_date_limit2">%1$s</string>
176 <string name="cos_for_you_all">Μέχρι τώρα έχεις κερδίσει&#160;%1$s€&#160;στο For You!</string> 176 <string name="cos_for_you_all">Μέχρι τώρα έχεις κερδίσει&#160;%1$s€&#160;στο For You!</string>
177 - <string name="cos_supermarket_win">Έχεις κερδίσει&#160;%1$s€&#160;με τα\nSUPERMARKET DEALS!</string> 177 + <string name="cos_supermarket_win">Μέχρι τώρα έχεις όφελος %1$s€ από τα SUPERMARKET DEALS</string>
178 <string name="cos_supermarket_history">Μέχρι τώρα έχεις κερδίσει %1$s€ σε προσφορές από %2$s κουπόνια!</string> 178 <string name="cos_supermarket_history">Μέχρι τώρα έχεις κερδίσει %1$s€ σε προσφορές από %2$s κουπόνια!</string>
179 <string name="lbl_cosmote_webview_permission_title">COSMOTE</string> 179 <string name="lbl_cosmote_webview_permission_title">COSMOTE</string>
180 <string name="lbl_cosmote_webview_permission_message">Το COSMOTE ζητάει πρόσβαση στην τοποθεσία σας.</string> 180 <string name="lbl_cosmote_webview_permission_message">Το COSMOTE ζητάει πρόσβαση στην τοποθεσία σας.</string>
...@@ -205,6 +205,9 @@ ...@@ -205,6 +205,9 @@
205 <string name="cos_loyalty_history">Ιστορικό</string> 205 <string name="cos_loyalty_history">Ιστορικό</string>
206 <string name="cos_redeemed_coupons_loyalty_title">Εξαργυρωμένα κουπόνια</string> 206 <string name="cos_redeemed_coupons_loyalty_title">Εξαργυρωμένα κουπόνια</string>
207 <string name="cos_history_info_text">Δες αναλυτικά το συνολικό όφελός σου έως τώρα από κουπόνια</string> 207 <string name="cos_history_info_text">Δες αναλυτικά το συνολικό όφελός σου έως τώρα από κουπόνια</string>
208 + <string name="cos_dlg_try_again">Προσπάθησε ξανά αργότερα</string>
209 + <string name="cos_dlg_service_unavailable">Προσωρινά μη διαθέσιμη πληροφορία.\nΠαρακαλούμε δοκίμασε ξανά σε λίγο.</string>
210 + <string name="cos_dlg_return">Επιστροφή</string>
208 211
209 <string-array name="coupons_array"> 212 <string-array name="coupons_array">
210 <item>Κουπόνια</item> 213 <item>Κουπόνια</item>
......