open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
92e0d0cf 1 parent b797d2fc

new version

Inline Side-by-side
Showing 9 changed files with 146 additions and 38 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-cosbeta22' 5 + PUBLISH_VERSION = '4.5.4-cosbeta23'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
...@@ -40,7 +40,6 @@ dependencies { ...@@ -40,7 +40,6 @@ dependencies {
40 api "androidx.security:security-crypto:1.1.0-alpha03" // For minSDK 23 use 1.0.0, for minSDK 21 use 1.1.0 that is currently in alpha 40 api "androidx.security:security-crypto:1.1.0-alpha03" // For minSDK 23 use 1.0.0, for minSDK 21 use 1.1.0 that is currently in alpha
41 api 'org.altbeacon:android-beacon-library:2.19.3' 41 api 'org.altbeacon:android-beacon-library:2.19.3'
42 api 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' 42 api 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
43 - api "commons-logging:commons-logging:1.2"
44 api 'de.hdodenhof:circleimageview:3.1.0' 43 api 'de.hdodenhof:circleimageview:3.1.0'
45 api group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.21' 44 api group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.21'
46 api 'com.google.android.material:material:1.5.0' 45 api 'com.google.android.material:material:1.5.0'
......
...@@ -27,9 +27,7 @@ import ly.warp.sdk.io.callbacks.CallbackReceiver; ...@@ -27,9 +27,7 @@ import ly.warp.sdk.io.callbacks.CallbackReceiver;
27 import ly.warp.sdk.io.models.Campaign; 27 import ly.warp.sdk.io.models.Campaign;
28 import ly.warp.sdk.io.models.CampaignList; 28 import ly.warp.sdk.io.models.CampaignList;
29 import ly.warp.sdk.io.models.Consumer; 29 import ly.warp.sdk.io.models.Consumer;
30 -import ly.warp.sdk.io.models.Coupon;
31 import ly.warp.sdk.io.models.CouponList; 30 import ly.warp.sdk.io.models.CouponList;
32 -import ly.warp.sdk.io.models.Couponset;
33 import ly.warp.sdk.io.models.CouponsetsList; 31 import ly.warp.sdk.io.models.CouponsetsList;
34 import ly.warp.sdk.io.request.WarplyConsumerRequest; 32 import ly.warp.sdk.io.request.WarplyConsumerRequest;
35 import ly.warp.sdk.io.request.WarplyGetCouponsetsRequest; 33 import ly.warp.sdk.io.request.WarplyGetCouponsetsRequest;
...@@ -54,7 +52,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -54,7 +52,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
54 private Fragment mFragmentToSet = null; 52 private Fragment mFragmentToSet = null;
55 private static Consumer mConsumer; 53 private static Consumer mConsumer;
56 private static HashMap<String, CampaignList> mUniqueCampaignList = new HashMap<String, CampaignList>(); 54 private static HashMap<String, CampaignList> mUniqueCampaignList = new HashMap<String, CampaignList>();
57 - private CouponsetsList mCouponsetsList;
58 55
59 // =========================================================== 56 // ===========================================================
60 // Methods for/from SuperClass/Interfaces 57 // Methods for/from SuperClass/Interfaces
...@@ -210,8 +207,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -210,8 +207,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
210 private CallbackReceiver<CouponsetsList> mCouponsetsReceiver = new CallbackReceiver<CouponsetsList>() { 207 private CallbackReceiver<CouponsetsList> mCouponsetsReceiver = new CallbackReceiver<CouponsetsList>() {
211 @Override 208 @Override
212 public void onSuccess(CouponsetsList result) { 209 public void onSuccess(CouponsetsList result) {
213 - mCouponsetsList = result;
214 - WarplyManagerHelper.setCouponsets(result);
215 WarplyManager.getUserCoupons(new WarplyUserCouponsRequest(), mUserCouponsReceiver); 210 WarplyManager.getUserCoupons(new WarplyUserCouponsRequest(), mUserCouponsReceiver);
216 } 211 }
217 212
...@@ -225,20 +220,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -225,20 +220,6 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
225 private final CallbackReceiver<CouponList> mUserCouponsReceiver = new CallbackReceiver<CouponList>() { 220 private final CallbackReceiver<CouponList> mUserCouponsReceiver = new CallbackReceiver<CouponList>() {
226 @Override 221 @Override
227 public void onSuccess(CouponList result) { 222 public void onSuccess(CouponList result) {
228 - CouponList mCouponList = new CouponList();
229 - for (Coupon coupon : result) {
230 - for (Couponset couponset : mCouponsetsList) {
231 - if (coupon.getCouponsetUuid().equals(couponset.getUuid())) {
232 - coupon.setDescription(couponset.getShortDescription());
233 - coupon.setImage(couponset.getImgPreview());
234 - coupon.setName(couponset.getName());
235 - mCouponList.add(coupon);
236 - }
237 - }
238 - }
239 -
240 - WarplyManagerHelper.setCouponList(mCouponList);
241 -
242 Thread.currentThread().interrupt(); 223 Thread.currentThread().interrupt();
243 new Handler(Looper.getMainLooper()).post(() -> { 224 new Handler(Looper.getMainLooper()).post(() -> {
244 initViews(); 225 initViews();
......
...@@ -8,6 +8,7 @@ import android.util.Log; ...@@ -8,6 +8,7 @@ import android.util.Log;
8 import android.view.View; 8 import android.view.View;
9 import android.widget.ImageView; 9 import android.widget.ImageView;
10 import android.widget.LinearLayout; 10 import android.widget.LinearLayout;
11 +import android.widget.RelativeLayout;
11 import android.widget.TextView; 12 import android.widget.TextView;
12 13
13 import com.bumptech.glide.Glide; 14 import com.bumptech.glide.Glide;
...@@ -35,6 +36,8 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -35,6 +36,8 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
35 private TextView mTvCouponTitle; 36 private TextView mTvCouponTitle;
36 private Coupon mCoupon; 37 private Coupon mCoupon;
37 private Consumer mConsumer; 38 private Consumer mConsumer;
39 + private RelativeLayout mRlSenderView;
40 + private LinearLayout mLlShareButton;
38 41
39 // =========================================================== 42 // ===========================================================
40 // Methods for/from SuperClass/Interfaces 43 // Methods for/from SuperClass/Interfaces
...@@ -50,6 +53,8 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -50,6 +53,8 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
50 mIvBack = findViewById(R.id.iv_coupon_share_back); 53 mIvBack = findViewById(R.id.iv_coupon_share_back);
51 mTvCouponTitle = findViewById(R.id.textView13); 54 mTvCouponTitle = findViewById(R.id.textView13);
52 mIvCouponPhoto = findViewById(R.id.imageView6); 55 mIvCouponPhoto = findViewById(R.id.imageView6);
56 + mRlSenderView = findViewById(R.id.ll_share_view);
57 + mLlShareButton = findViewById(R.id.ll_share_button);
53 58
54 initViews(); 59 initViews();
55 } 60 }
...@@ -73,10 +78,13 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -73,10 +78,13 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
73 onBackPressed(); 78 onBackPressed();
74 return; 79 return;
75 } 80 }
76 -// if (view.getId() == R.id.ll_gift_it) { 81 + if (view.getId() == R.id.ll_share_view) {
77 -// showSharingDialog(); 82 + showSharingDialog();
78 -// return; 83 + return;
79 -// } 84 + }
85 + if (view.getId() == R.id.ll_share_button) {
86 +
87 + }
80 } 88 }
81 89
82 // =========================================================== 90 // ===========================================================
...@@ -101,6 +109,8 @@ public class CouponShareActivity extends Activity implements View.OnClickListene ...@@ -101,6 +109,8 @@ public class CouponShareActivity extends Activity implements View.OnClickListene
101 .into(mIvCouponPhoto); 109 .into(mIvCouponPhoto);
102 } 110 }
103 mIvBack.setOnClickListener(this); 111 mIvBack.setOnClickListener(this);
112 + mRlSenderView.setOnClickListener(this);
113 + mLlShareButton.setOnClickListener(this);
104 } 114 }
105 115
106 private void showSharingDialog() { 116 private void showSharingDialog() {
......
...@@ -209,6 +209,10 @@ public class WarplyManagerHelper { ...@@ -209,6 +209,10 @@ public class WarplyManagerHelper {
209 @Override 209 @Override
210 public void onSuccess(JSONObject result) { 210 public void onSuccess(JSONObject result) {
211 int status = result.optInt("status", 2); 211 int status = result.optInt("status", 2);
212 + if (status == 1)
213 + returnSharingSuccessDialog(context);
214 + else
215 + errorSharingDialog(context);
212 } 216 }
213 217
214 @Override 218 @Override
...@@ -237,6 +241,19 @@ public class WarplyManagerHelper { ...@@ -237,6 +241,19 @@ public class WarplyManagerHelper {
237 } 241 }
238 242
239 /** 243 /**
244 + * Dialog when the gift gets successfully returned
245 + */
246 + private static void returnSharingSuccessDialog(Context context) {
247 + mAlertDialogReturnSharing = new AlertDialog.Builder(context)
248 + .setTitle(R.string.cod_dlg_reject_title)
249 + .setMessage(R.string.cod_dlg_reject_subtitle)
250 + .setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
251 + dialogPositive.dismiss();
252 + })
253 + .show();
254 + }
255 +
256 + /**
240 * Error dialog 257 * Error dialog
241 */ 258 */
242 private static void errorSharingDialog(Context context) { 259 private static void errorSharingDialog(Context context) {
...@@ -569,12 +586,18 @@ public class WarplyManagerHelper { ...@@ -569,12 +586,18 @@ public class WarplyManagerHelper {
569 for (Coupon coupon : couponList) { 586 for (Coupon coupon : couponList) {
570 if (coupon.getStatus() == 1) { 587 if (coupon.getStatus() == 1) {
571 try { 588 try {
589 + float tempCouponValue = Float.parseFloat(coupon.getDiscount());
572 cpnlist.add(coupon); 590 cpnlist.add(coupon);
591 + } catch (NumberFormatException e) {
592 + cpnlist.remove(coupon);
593 + }
594 + } else if (coupon.getStatus() == 0) {
595 + try {
573 couponCount += 1; 596 couponCount += 1;
574 couponValue += Float.parseFloat(coupon.getDiscount()); 597 couponValue += Float.parseFloat(coupon.getDiscount());
575 } catch (NumberFormatException e) { 598 } catch (NumberFormatException e) {
576 - cpnlist.remove(coupon);
577 couponCount -= 1; 599 couponCount -= 1;
600 + cpnlist.remove(coupon);
578 } 601 }
579 } 602 }
580 } 603 }
......
...@@ -51,7 +51,9 @@ import ly.warp.sdk.io.models.Card; ...@@ -51,7 +51,9 @@ import ly.warp.sdk.io.models.Card;
51 import ly.warp.sdk.io.models.CardList; 51 import ly.warp.sdk.io.models.CardList;
52 import ly.warp.sdk.io.models.Consumer; 52 import ly.warp.sdk.io.models.Consumer;
53 import ly.warp.sdk.io.models.ContentList; 53 import ly.warp.sdk.io.models.ContentList;
54 +import ly.warp.sdk.io.models.Coupon;
54 import ly.warp.sdk.io.models.CouponList; 55 import ly.warp.sdk.io.models.CouponList;
56 +import ly.warp.sdk.io.models.Couponset;
55 import ly.warp.sdk.io.models.CouponsetsList; 57 import ly.warp.sdk.io.models.CouponsetsList;
56 import ly.warp.sdk.io.models.MerchantCategoriesList; 58 import ly.warp.sdk.io.models.MerchantCategoriesList;
57 import ly.warp.sdk.io.models.MerchantList; 59 import ly.warp.sdk.io.models.MerchantList;
...@@ -103,6 +105,7 @@ import ly.warp.sdk.io.request.WarplyValidateCouponRequest; ...@@ -103,6 +105,7 @@ import ly.warp.sdk.io.request.WarplyValidateCouponRequest;
103 import ly.warp.sdk.io.request.WarplyVerifyOTPRequest; 105 import ly.warp.sdk.io.request.WarplyVerifyOTPRequest;
104 import ly.warp.sdk.io.request.WarplyVerifyTicketRequest; 106 import ly.warp.sdk.io.request.WarplyVerifyTicketRequest;
105 import ly.warp.sdk.utils.WarpUtils; 107 import ly.warp.sdk.utils.WarpUtils;
108 +import ly.warp.sdk.utils.WarplyManagerHelper;
106 import ly.warp.sdk.utils.constants.WarpConstants; 109 import ly.warp.sdk.utils.constants.WarpConstants;
107 110
108 /** 111 /**
...@@ -792,7 +795,19 @@ public class WarplyManager { ...@@ -792,7 +795,19 @@ public class WarplyManager {
792 Warply.postReceiveMicroappData(WarpConstants.MICROAPP_COUPONS, true, "context", request.toJson(), new CouponsHook(new CallbackReceiver<CouponList>() { 795 Warply.postReceiveMicroappData(WarpConstants.MICROAPP_COUPONS, true, "context", request.toJson(), new CouponsHook(new CallbackReceiver<CouponList>() {
793 @Override 796 @Override
794 public void onSuccess(CouponList result) { 797 public void onSuccess(CouponList result) {
795 - receiver.onSuccess(result); 798 + CouponList mCouponList = new CouponList();
799 + for (Coupon coupon : result) {
800 + for (Couponset couponset : WarplyManagerHelper.getCouponsets()) {
801 + if (coupon.getCouponsetUuid().equals(couponset.getUuid())) {
802 + coupon.setDescription(couponset.getShortDescription());
803 + coupon.setImage(couponset.getImgPreview());
804 + coupon.setName(couponset.getName());
805 + mCouponList.add(coupon);
806 + }
807 + }
808 + }
809 + WarplyManagerHelper.setCouponList(mCouponList);
810 + receiver.onSuccess(mCouponList);
796 } 811 }
797 812
798 @Override 813 @Override
...@@ -1196,6 +1211,7 @@ public class WarplyManager { ...@@ -1196,6 +1211,7 @@ public class WarplyManager {
1196 Warply.postReceiveMicroappData(WarpConstants.MICROAPP_COUPONS, request.toJson(), new CouponsetsHook(new CallbackReceiver<CouponsetsList>() { 1211 Warply.postReceiveMicroappData(WarpConstants.MICROAPP_COUPONS, request.toJson(), new CouponsetsHook(new CallbackReceiver<CouponsetsList>() {
1197 @Override 1212 @Override
1198 public void onSuccess(CouponsetsList result) { 1213 public void onSuccess(CouponsetsList result) {
1214 + WarplyManagerHelper.setCouponsets(result);
1199 receiver.onSuccess(result); 1215 receiver.onSuccess(result);
1200 } 1216 }
1201 1217
......
...@@ -159,14 +159,15 @@ ...@@ -159,14 +159,15 @@
159 159
160 <LinearLayout 160 <LinearLayout
161 android:id="@+id/ll_gift_it" 161 android:id="@+id/ll_gift_it"
162 - android:layout_width="240dp" 162 + android:layout_width="220dp"
163 - android:layout_height="50dp" 163 + android:layout_height="wrap_content"
164 android:layout_marginHorizontal="32dp" 164 android:layout_marginHorizontal="32dp"
165 android:layout_marginTop="64dp" 165 android:layout_marginTop="64dp"
166 android:background="@drawable/selector_button_green" 166 android:background="@drawable/selector_button_green"
167 android:gravity="center" 167 android:gravity="center"
168 - android:visibility="gone" 168 + android:visibility="invisible"
169 android:orientation="horizontal" 169 android:orientation="horizontal"
170 + android:paddingVertical="8dp"
170 app:layout_constraintEnd_toEndOf="parent" 171 app:layout_constraintEnd_toEndOf="parent"
171 app:layout_constraintStart_toStartOf="parent" 172 app:layout_constraintStart_toStartOf="parent"
172 app:layout_constraintTop_toBottomOf="@+id/textView17"> 173 app:layout_constraintTop_toBottomOf="@+id/textView17">
...@@ -177,19 +178,20 @@ ...@@ -177,19 +178,20 @@
177 android:gravity="center" 178 android:gravity="center"
178 android:text="@string/cos_gift_it" 179 android:text="@string/cos_gift_it"
179 android:textColor="@color/white" 180 android:textColor="@color/white"
180 - android:textSize="17dp" 181 + android:textFontWeight="600"
181 - android:textFontWeight="600" /> 182 + android:textSize="17dp" />
182 </LinearLayout> 183 </LinearLayout>
183 184
184 <LinearLayout 185 <LinearLayout
185 android:id="@+id/ll_shops" 186 android:id="@+id/ll_shops"
186 - android:layout_width="240dp" 187 + android:layout_width="220dp"
187 - android:layout_height="50dp" 188 + android:layout_height="wrap_content"
188 android:layout_marginHorizontal="32dp" 189 android:layout_marginHorizontal="32dp"
189 android:layout_marginTop="24dp" 190 android:layout_marginTop="24dp"
190 android:background="@drawable/selector_button_grey" 191 android:background="@drawable/selector_button_grey"
191 android:gravity="center" 192 android:gravity="center"
192 android:orientation="horizontal" 193 android:orientation="horizontal"
194 + android:paddingVertical="8dp"
193 app:layout_constraintEnd_toEndOf="parent" 195 app:layout_constraintEnd_toEndOf="parent"
194 app:layout_constraintStart_toStartOf="parent" 196 app:layout_constraintStart_toStartOf="parent"
195 app:layout_constraintTop_toBottomOf="@+id/ll_gift_it"> 197 app:layout_constraintTop_toBottomOf="@+id/ll_gift_it">
...@@ -200,8 +202,8 @@ ...@@ -200,8 +202,8 @@
200 android:gravity="center" 202 android:gravity="center"
201 android:text="@string/cos_shops" 203 android:text="@string/cos_shops"
202 android:textColor="@color/cos_green6" 204 android:textColor="@color/cos_green6"
203 - android:textSize="17dp" 205 + android:textFontWeight="600"
204 - android:textFontWeight="600" /> 206 + android:textSize="17dp" />
205 </LinearLayout> 207 </LinearLayout>
206 208
207 <RelativeLayout 209 <RelativeLayout
......
...@@ -99,6 +99,8 @@ ...@@ -99,6 +99,8 @@
99 android:id="@+id/ll_share_view" 99 android:id="@+id/ll_share_view"
100 android:layout_width="match_parent" 100 android:layout_width="match_parent"
101 android:layout_height="wrap_content" 101 android:layout_height="wrap_content"
102 + android:layout_marginHorizontal="24dp"
103 + android:layout_marginTop="64dp"
102 app:layout_constraintEnd_toEndOf="parent" 104 app:layout_constraintEnd_toEndOf="parent"
103 app:layout_constraintStart_toStartOf="parent" 105 app:layout_constraintStart_toStartOf="parent"
104 app:layout_constraintTop_toBottomOf="@+id/textView14"> 106 app:layout_constraintTop_toBottomOf="@+id/textView14">
...@@ -119,10 +121,79 @@ ...@@ -119,10 +121,79 @@
119 android:layout_height="wrap_content" 121 android:layout_height="wrap_content"
120 android:layout_alignParentEnd="true" 122 android:layout_alignParentEnd="true"
121 android:layout_centerVertical="true" 123 android:layout_centerVertical="true"
122 - android:tint="@color/blue_dark"
123 android:rotation="90" 124 android:rotation="90"
124 - android:src="@drawable/ic_arrow_right_white"/> 125 + android:src="@drawable/ic_arrow_right_white"
126 + android:tint="@color/blue_dark" />
125 </RelativeLayout> 127 </RelativeLayout>
128 +
129 + <View
130 + android:id="@+id/v_separator"
131 + android:layout_width="0dp"
132 + android:layout_height="1dp"
133 + android:layout_marginTop="20dp"
134 + android:background="@color/cos_grey7"
135 + app:layout_constraintEnd_toEndOf="@+id/ll_share_view"
136 + app:layout_constraintStart_toStartOf="@+id/ll_share_view"
137 + app:layout_constraintTop_toBottomOf="@+id/ll_share_view" />
138 +
139 + <RelativeLayout
140 + android:id="@+id/ll_share_view2"
141 + android:layout_width="match_parent"
142 + android:layout_height="wrap_content"
143 + android:layout_marginHorizontal="24dp"
144 + android:layout_marginTop="48dp"
145 + app:layout_constraintEnd_toEndOf="parent"
146 + app:layout_constraintStart_toStartOf="parent"
147 + app:layout_constraintTop_toBottomOf="@+id/v_separator">
148 +
149 + <EditText
150 + android:id="@+id/et_phone"
151 + android:layout_width="match_parent"
152 + android:layout_height="wrap_content"
153 + android:layout_alignParentStart="true"
154 + android:layout_centerVertical="true"
155 + android:background="@android:color/transparent"
156 + android:hint="@string/cos_coupon_share_hint"
157 + android:textColor="@color/grey"
158 + android:inputType="phone"
159 + android:textColorHint="@color/cos_grey8"
160 + android:textSize="16sp" />
161 + </RelativeLayout>
162 +
163 + <View
164 + android:id="@+id/v_separator2"
165 + android:layout_width="0dp"
166 + android:layout_height="1dp"
167 + android:layout_marginTop="20dp"
168 + android:background="@color/cos_grey7"
169 + app:layout_constraintEnd_toEndOf="@+id/ll_share_view2"
170 + app:layout_constraintStart_toStartOf="@+id/ll_share_view2"
171 + app:layout_constraintTop_toBottomOf="@+id/ll_share_view2" />
172 +
173 + <LinearLayout
174 + android:id="@+id/ll_share_button"
175 + android:layout_width="wrap_content"
176 + android:layout_height="wrap_content"
177 + android:layout_marginHorizontal="32dp"
178 + android:layout_marginTop="64dp"
179 + android:paddingVertical="8dp"
180 + android:paddingHorizontal="16dp"
181 + android:background="@drawable/selector_button_green"
182 + android:gravity="center"
183 + android:orientation="horizontal"
184 + app:layout_constraintEnd_toEndOf="parent"
185 + app:layout_constraintStart_toStartOf="parent"
186 + app:layout_constraintTop_toBottomOf="@+id/v_separator2">
187 +
188 + <TextView
189 + android:layout_width="wrap_content"
190 + android:layout_height="wrap_content"
191 + android:gravity="center"
192 + android:text="@string/cos_coupon_share_button"
193 + android:textColor="@color/white"
194 + android:textSize="17dp"
195 + android:textFontWeight="600" />
196 + </LinearLayout>
126 </androidx.constraintlayout.widget.ConstraintLayout> 197 </androidx.constraintlayout.widget.ConstraintLayout>
127 </androidx.constraintlayout.widget.ConstraintLayout> 198 </androidx.constraintlayout.widget.ConstraintLayout>
128 </ScrollView> 199 </ScrollView>
......
...@@ -48,4 +48,6 @@ ...@@ -48,4 +48,6 @@
48 <color name="cos_skyblue">#13ACD4</color> 48 <color name="cos_skyblue">#13ACD4</color>
49 <color name="cos_grey6">#536C79</color> 49 <color name="cos_grey6">#536C79</color>
50 <color name="cos_grey_tr">#00000029</color> 50 <color name="cos_grey_tr">#00000029</color>
51 + <color name="cos_grey7">#C0C7CD</color>
52 + <color name="cos_grey8">#AEAEAE</color>
51 </resources> 53 </resources>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
93 <string name="cos_coupon_gift">Κάντο δώρο!</string> 93 <string name="cos_coupon_gift">Κάντο δώρο!</string>
94 <string name="cos_coupon_share_gift_title">Επίλεξε τον αριθμό από τον οποίο θα στείλεις το δώρο και καταχώρησε το COSMOTE τηλέφωνο του φίλου σου.</string> 94 <string name="cos_coupon_share_gift_title">Επίλεξε τον αριθμό από τον οποίο θα στείλεις το δώρο και καταχώρησε το COSMOTE τηλέφωνο του φίλου σου.</string>
95 <string name="cos_coupon_share_sender">Αποστολέας</string> 95 <string name="cos_coupon_share_sender">Αποστολέας</string>
96 + <string name="cos_coupon_share_hint">Καταχώρηση τηλεφώνου</string>
97 + <string name="cos_coupon_share_button">Αποστολή με SMS</string>
98 + <string name="cod_dlg_reject_title">Απόρριψη δώρου</string>
99 + <string name="cod_dlg_reject_subtitle">To δώρο αππορίφθηκε</string>
96 100
97 <string-array name="coupons_array"> 101 <string-array name="coupons_array">
98 <item>Κουπόνια</item> 102 <item>Κουπόνια</item>
......