Showing
9 changed files
with
22 additions
and
11 deletions
This diff is collapsed. Click to expand it.
... | @@ -3,8 +3,6 @@ package ly.warp.sdk.services; | ... | @@ -3,8 +3,6 @@ package ly.warp.sdk.services; |
3 | import android.content.Context; | 3 | import android.content.Context; |
4 | 4 | ||
5 | import androidx.annotation.NonNull; | 5 | import androidx.annotation.NonNull; |
6 | -import androidx.work.OneTimeWorkRequest; | ||
7 | -import androidx.work.WorkManager; | ||
8 | import androidx.work.Worker; | 6 | import androidx.work.Worker; |
9 | import androidx.work.WorkerParameters; | 7 | import androidx.work.WorkerParameters; |
10 | 8 | ||
... | @@ -12,17 +10,11 @@ import org.greenrobot.eventbus.EventBus; | ... | @@ -12,17 +10,11 @@ import org.greenrobot.eventbus.EventBus; |
12 | 10 | ||
13 | import java.util.ArrayList; | 11 | import java.util.ArrayList; |
14 | 12 | ||
15 | -import ly.warp.sdk.Warply; | ||
16 | -import ly.warp.sdk.activities.CouponsetInfoActivity; | ||
17 | import ly.warp.sdk.io.callbacks.CallbackReceiver; | 13 | import ly.warp.sdk.io.callbacks.CallbackReceiver; |
18 | import ly.warp.sdk.io.models.Campaign; | 14 | import ly.warp.sdk.io.models.Campaign; |
19 | -import ly.warp.sdk.io.models.CampaignList; | ||
20 | import ly.warp.sdk.io.models.CouponList; | 15 | import ly.warp.sdk.io.models.CouponList; |
21 | -import ly.warp.sdk.io.models.CouponsEventModel; | ||
22 | import ly.warp.sdk.io.models.LoyaltyEventModel; | 16 | import ly.warp.sdk.io.models.LoyaltyEventModel; |
23 | import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; | 17 | import ly.warp.sdk.io.models.WarplyCouponsChangedEventModel; |
24 | -import ly.warp.sdk.io.request.WarplyGetCampaignsRequest; | ||
25 | -import ly.warp.sdk.io.request.WarplyUserCouponsRequest; | ||
26 | import ly.warp.sdk.utils.managers.WarplyEventBusManager; | 18 | import ly.warp.sdk.utils.managers.WarplyEventBusManager; |
27 | import ly.warp.sdk.utils.managers.WarplyManager; | 19 | import ly.warp.sdk.utils.managers.WarplyManager; |
28 | 20 | ... | ... |
1.78 KB
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="1dp" android:color="@color/cos_green12" /> | ||
5 | + <corners android:radius="12dp" /> | ||
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="1dp" android:color="@color/cos_green6_tr" /> | ||
5 | + <corners android:radius="12dp" /> | ||
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_green3_tr" android:state_pressed="true" /> | ||
4 | + <item android:drawable="@drawable/round_border_green3" android:state_pressed="false" /> | ||
5 | +</selector> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -85,9 +85,10 @@ | ... | @@ -85,9 +85,10 @@ |
85 | 85 | ||
86 | <LinearLayout | 86 | <LinearLayout |
87 | android:id="@+id/ll_get_gift" | 87 | android:id="@+id/ll_get_gift" |
88 | - android:layout_width="140dp" | 88 | + android:layout_width="match_parent" |
89 | android:layout_height="45dp" | 89 | android:layout_height="45dp" |
90 | android:layout_marginTop="27dp" | 90 | android:layout_marginTop="27dp" |
91 | + android:layout_marginHorizontal="12dp" | ||
91 | android:background="@drawable/selector_button_green" | 92 | android:background="@drawable/selector_button_green" |
92 | android:gravity="center" | 93 | android:gravity="center" |
93 | android:orientation="horizontal"> | 94 | android:orientation="horizontal"> |
... | @@ -98,7 +99,7 @@ | ... | @@ -98,7 +99,7 @@ |
98 | android:layout_height="wrap_content" | 99 | android:layout_height="wrap_content" |
99 | android:gravity="center" | 100 | android:gravity="center" |
100 | android:includeFontPadding="false" | 101 | android:includeFontPadding="false" |
101 | - android:text="@string/cos_redeem_coupon" | 102 | + android:text="@string/cos_redeem_coupon2" |
102 | android:textColor="@color/white" | 103 | android:textColor="@color/white" |
103 | android:textSize="16sp" /> | 104 | android:textSize="16sp" /> |
104 | </LinearLayout> | 105 | </LinearLayout> | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -39,6 +39,7 @@ | ... | @@ -39,6 +39,7 @@ |
39 | <string name="cos_coupons_title">ΚΟΥΠΟΝΙΑ</string> | 39 | <string name="cos_coupons_title">ΚΟΥΠΟΝΙΑ</string> |
40 | <string name="cos_coupon_terms_title">Όροι χρήσης</string> | 40 | <string name="cos_coupon_terms_title">Όροι χρήσης</string> |
41 | <string name="cos_redeem_coupon">Απόκτησέ το</string> | 41 | <string name="cos_redeem_coupon">Απόκτησέ το</string> |
42 | + <string name="cos_redeem_coupon2">Απόκτησέ το δωρεάν</string> | ||
42 | <string name="cos_dlg_success_subtitle">Το κουπόνι εξαργυρώθηκε με επιτυχία</string> | 43 | <string name="cos_dlg_success_subtitle">Το κουπόνι εξαργυρώθηκε με επιτυχία</string> |
43 | <string name="cos_dlg_error_title">Αποτυχία</string> | 44 | <string name="cos_dlg_error_title">Αποτυχία</string> |
44 | <string name="cos_dlg_error_title2">Αποτυχία αποστολής</string> | 45 | <string name="cos_dlg_error_title2">Αποτυχία αποστολής</string> |
... | @@ -113,7 +114,7 @@ | ... | @@ -113,7 +114,7 @@ |
113 | <string name="cos_dlg_negative_button3">Αποστολή</string> | 114 | <string name="cos_dlg_negative_button3">Αποστολή</string> |
114 | <string name="cos_dlg_error_subtitle2">Παρακαλούμε συμπλήρωσε σωστά τα πεδία.</string> | 115 | <string name="cos_dlg_error_subtitle2">Παρακαλούμε συμπλήρωσε σωστά τα πεδία.</string> |
115 | <string name="cos_dlg_success_couponset_title">Επιτυχής ενεργοποίηση</string> | 116 | <string name="cos_dlg_success_couponset_title">Επιτυχής ενεργοποίηση</string> |
116 | - <string name="cos_dlg_success_couponset_subtitle">Το κουπόνι σου έχει ενεργοποιηθεί στην ενότητα My Rewards.</string> | 117 | + <string name="cos_dlg_success_couponset_subtitle">Το κουπόνι σου έχει ενεργοποιηθεί και βρίσκεται στην ενότητα My Rewards.</string> |
117 | <string name="cos_dlg_activate_telco_title">Ενεργοποίηση υπηρεσίας</string> | 118 | <string name="cos_dlg_activate_telco_title">Ενεργοποίηση υπηρεσίας</string> |
118 | <string name="cos_dlg_activate_telco_subtitle">Θέλετε να γίνει ενεργοποίηση στο Κινητό μου;</string> | 119 | <string name="cos_dlg_activate_telco_subtitle">Θέλετε να γίνει ενεργοποίηση στο Κινητό μου;</string> |
119 | <string name="cos_dlg_activate_success_title">Το αίτημά σου ολοκληρώθηκε επιτυχώς!</string> | 120 | <string name="cos_dlg_activate_success_title">Το αίτημά σου ολοκληρώθηκε επιτυχώς!</string> | ... | ... |
-
Please register or login to post a comment