open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
2012f83d 1 parent 694576d9

new keys

Inline Side-by-side
Showing 17 changed files with 206 additions and 163 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-cosbeta76' 5 + PUBLISH_VERSION = '4.5.4-cosbeta77'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -24,6 +24,10 @@ import java.io.Serializable; ...@@ -24,6 +24,10 @@ import java.io.Serializable;
24 import java.util.ArrayList; 24 import java.util.ArrayList;
25 import java.util.HashMap; 25 import java.util.HashMap;
26 import java.util.HashSet; 26 import java.util.HashSet;
27 +import java.util.LinkedHashSet;
28 +import java.util.Map;
29 +import java.util.Set;
30 +import java.util.TreeMap;
27 31
28 import io.github.inflationx.viewpump.ViewPumpContextWrapper; 32 import io.github.inflationx.viewpump.ViewPumpContextWrapper;
29 import ly.warp.sdk.R; 33 import ly.warp.sdk.R;
...@@ -188,55 +192,42 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -188,55 +192,42 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
188 mValuesList 192 mValuesList
189 ); 193 );
190 194
191 - runOnUiThread(() -> { 195 + runOnUiThread(this::initViews2);
192 - if (mData != null && mData.size() > 0) { 196 + }
193 - mAdapterMergedGifts = new MergedGiftsAdapter(GiftsForYouActivity.this, mData); 197 + }
194 - mRecyclerMergedGifts.setAdapter(mAdapterMergedGifts);
195 - mAdapterMergedGifts.getPositionClicks()
196 - .doOnNext(dataItem -> {
197 - if (dataItem.getDataType() == 1) {
198 - WarpUtils.log("GFY_CLICK " + dataItem.getCampaign().toString());
199 - EventBus.getDefault().post(new WarplyEventBusManager(new LoyaltyGiftsForYouOfferClickEvent()));
200 -
201 - if (dataItem.getCampaign().getType().equals("coupon")) {
202 - if (WarplyManagerHelper.getCCMSLoyaltyCampaigns() != null && WarplyManagerHelper.getCCMSLoyaltyCampaigns().size() > 0) {
203 - LoyaltyContextualOfferModel ccmsItem = null;
204 - for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
205 - if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
206 - ccmsItem = ccms;
207 - break;
208 - }
209 - }
210 198
211 - if (ccmsItem != null) { 199 + // ===========================================================
212 - try { 200 + // Methods
213 - JSONObject campaignSettings = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getCampaignTypeSettings()); 201 + // ===========================================================
214 - if (campaignSettings != null) {
215 - if (campaignSettings.has("couponset")) {
216 - String cpnUuid = campaignSettings.optString("couponset");
217 - for (Couponset cpns : WarplyManagerHelper.getCouponsets()) {
218 - if (cpns.getUuid().equals(cpnUuid)) {
219 - WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
220 - Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class);
221 - intent.putExtra("couponset", (Serializable) cpns);
222 - intent.putExtra("loyalty", (Serializable) dataItem.getCampaign());
223 - intent.putExtra("ccms", ccmsItem);
224 - startActivityForResult(intent, 1004);
225 - break;
226 - }
227 - }
228 - } else {
229 - startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
230 - }
231 - }
232 - } catch (Exception exception) {
233 - exception.printStackTrace();
234 - }
235 202
236 - return; 203 + private void initViews() {
237 - } 204 + mIvBack.setOnClickListener(this);
205 + mIvPopupClose.setOnClickListener(this);
206 +
207 +// if (WarpUtils.getGiftsPopup(this))
208 +// mLlGiftsPopup.setVisibility(View.VISIBLE);
209 +
210 + if (mData != null && mData.size() > 0) {
211 + mRecyclerMergedGifts.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
212 + mAdapterMergedGifts = new MergedGiftsAdapter(this, mData);
213 + mRecyclerMergedGifts.setAdapter(mAdapterMergedGifts);
214 + mAdapterMergedGifts.getPositionClicks()
215 + .doOnNext(dataItem -> {
216 + if (dataItem.getDataType() == 1) {
217 + WarpUtils.log("GFY_CLICK " + dataItem.getCampaign().toString());
218 + EventBus.getDefault().post(new WarplyEventBusManager(new LoyaltyGiftsForYouOfferClickEvent()));
219 +
220 + if (dataItem.getCampaign().getType().equals("coupon")) {
221 + if (WarplyManagerHelper.getCCMSLoyaltyCampaigns() != null && WarplyManagerHelper.getCCMSLoyaltyCampaigns().size() > 0) {
222 + LoyaltyContextualOfferModel ccmsItem = null;
223 + for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
224 + if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
225 + ccmsItem = ccms;
226 + break;
238 } 227 }
228 + }
239 229
230 + if (ccmsItem != null) {
240 try { 231 try {
241 JSONObject campaignSettings = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getCampaignTypeSettings()); 232 JSONObject campaignSettings = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getCampaignTypeSettings());
242 if (campaignSettings != null) { 233 if (campaignSettings != null) {
...@@ -248,6 +239,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -248,6 +239,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
248 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class); 239 Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class);
249 intent.putExtra("couponset", (Serializable) cpns); 240 intent.putExtra("couponset", (Serializable) cpns);
250 intent.putExtra("loyalty", (Serializable) dataItem.getCampaign()); 241 intent.putExtra("loyalty", (Serializable) dataItem.getCampaign());
242 + intent.putExtra("ccms", ccmsItem);
251 startActivityForResult(intent, 1004); 243 startActivityForResult(intent, 1004);
252 break; 244 break;
253 } 245 }
...@@ -262,74 +254,90 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -262,74 +254,90 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
262 254
263 return; 255 return;
264 } 256 }
257 + }
265 258
266 - try { 259 + try {
267 - JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields()); 260 + JSONObject campaignSettings = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getCampaignTypeSettings());
268 - if (extraFields != null) { 261 + if (campaignSettings != null) {
269 - if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { 262 + if (campaignSettings.has("couponset")) {
270 - for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 263 + String cpnUuid = campaignSettings.optString("couponset");
271 - if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { 264 + for (Couponset cpns : WarplyManagerHelper.getCouponsets()) {
272 - WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID()); 265 + if (cpns.getUuid().equals(cpnUuid)) {
273 - Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class); 266 + WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
274 - intent.putExtra("ccms", ccms); 267 + Intent intent = new Intent(GiftsForYouActivity.this, CouponsetInfoActivity.class);
275 - intent.putExtra("loyalty", (Serializable) dataItem.getCampaign()); 268 + intent.putExtra("couponset", (Serializable) cpns);
276 - startActivityForResult(intent, 1004); 269 + intent.putExtra("loyalty", (Serializable) dataItem.getCampaign());
277 - break; 270 + startActivityForResult(intent, 1004);
278 - } 271 + break;
279 } 272 }
280 - return;
281 } 273 }
282 - if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { 274 + } else {
283 - for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 275 + startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
284 - if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { 276 + }
285 - WarpUtils.log("CCMS_CLICK " + ccms.toString()); 277 + }
286 - startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004); 278 + } catch (Exception exception) {
287 - break; 279 + exception.printStackTrace();
288 - } 280 + }
289 - } 281 +
290 - } else { 282 + return;
291 - startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 283 + }
284 +
285 + try {
286 + JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields());
287 + if (extraFields != null) {
288 + if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
289 + for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
290 + if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
291 + WarplyManager.getSingleCampaign(dataItem.getCampaign().getSessionUUID());
292 + Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class);
293 + intent.putExtra("ccms", ccms);
294 + intent.putExtra("loyalty", (Serializable) dataItem.getCampaign());
295 + startActivityForResult(intent, 1004);
296 + break;
292 } 297 }
293 } 298 }
294 - } catch (Exception exception) { 299 + return;
300 + }
301 + if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
302 + for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
303 + if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
304 + startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004);
305 + break;
306 + }
307 + }
308 + } else {
295 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004); 309 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
296 } 310 }
297 - } else if (dataItem.getDataType() == 2) {
298 - LoyaltyGiftsForYouOfferClickEvent seasonalCLick = new LoyaltyGiftsForYouOfferClickEvent();
299 - seasonalCLick.setTitle(dataItem.getSeasonalList().getTitle());
300 - seasonalCLick.setLoyaltyPackageId(dataItem.getSeasonalList().getLoyaltyPackageId());
301 - seasonalCLick.setImageUrl(dataItem.getSeasonalList().getImageUrl());
302 - seasonalCLick.setContext(GiftsForYouActivity.this);
303 - EventBus.getDefault().post(new WarplyEventBusManager(seasonalCLick));
304 - } else if (dataItem.getDataType() == 3) {
305 - Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class);
306 - intent.putExtra("ccms", dataItem.getCCMS());
307 - startActivity(intent);
308 } 311 }
309 - }) 312 + } catch (Exception exception) {
310 - .doOnError(error -> { 313 + startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(dataItem.getCampaign())), 1004);
311 - }) 314 + }
312 - .subscribe(); 315 + } else if (dataItem.getDataType() == 2) {
313 - mAdapterMergedGifts.notifyDataSetChanged(); 316 + LoyaltyGiftsForYouOfferClickEvent seasonalCLick = new LoyaltyGiftsForYouOfferClickEvent();
314 - } 317 + seasonalCLick.setTitle(dataItem.getSeasonalList().getTitle());
315 - }); 318 + seasonalCLick.setLoyaltyPackageId(dataItem.getSeasonalList().getLoyaltyPackageId());
319 + seasonalCLick.setImageUrl(dataItem.getSeasonalList().getImageUrl());
320 + seasonalCLick.setContext(GiftsForYouActivity.this);
321 + EventBus.getDefault().post(new WarplyEventBusManager(seasonalCLick));
322 + } else if (dataItem.getDataType() == 3) {
323 + Intent intent = new Intent(GiftsForYouActivity.this, ContextualActivity.class);
324 + intent.putExtra("ccms", dataItem.getCCMS());
325 + startActivity(intent);
326 + }
327 + })
328 + .doOnError(error -> {
329 + })
330 + .subscribe();
331 + mAdapterMergedGifts.notifyDataSetChanged();
316 } 332 }
317 } 333 }
318 334
319 - // =========================================================== 335 + private void initViews2() {
320 - // Methods
321 - // ===========================================================
322 -
323 - private void initViews() {
324 mIvBack.setOnClickListener(this); 336 mIvBack.setOnClickListener(this);
325 mIvPopupClose.setOnClickListener(this); 337 mIvPopupClose.setOnClickListener(this);
326 338
327 -// if (WarpUtils.getGiftsPopup(this))
328 -// mLlGiftsPopup.setVisibility(View.VISIBLE);
329 -
330 if (mData != null && mData.size() > 0) { 339 if (mData != null && mData.size() > 0) {
331 - mRecyclerMergedGifts.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); 340 + mAdapterMergedGifts = new MergedGiftsAdapter(GiftsForYouActivity.this, mData);
332 - mAdapterMergedGifts = new MergedGiftsAdapter(this, mData);
333 mRecyclerMergedGifts.setAdapter(mAdapterMergedGifts); 341 mRecyclerMergedGifts.setAdapter(mAdapterMergedGifts);
334 mAdapterMergedGifts.getPositionClicks() 342 mAdapterMergedGifts.getPositionClicks()
335 .doOnNext(dataItem -> { 343 .doOnNext(dataItem -> {
...@@ -421,6 +429,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -421,6 +429,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
421 if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) { 429 if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
422 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 430 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
423 if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) { 431 if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
432 + WarpUtils.log("CCMS_CLICK " + ccms.toString());
424 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004); 433 startActivityForResult(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCcmsUrl(dataItem.getCampaign(), ccms)), 1004);
425 break; 434 break;
426 } 435 }
...@@ -448,6 +457,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -448,6 +457,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
448 .doOnError(error -> { 457 .doOnError(error -> {
449 }) 458 })
450 .subscribe(); 459 .subscribe();
460 + mAdapterMergedGifts.notifyDataSetChanged();
451 } 461 }
452 } 462 }
453 463
...@@ -488,6 +498,10 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -488,6 +498,10 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
488 mData.add(data); 498 mData.add(data);
489 } 499 }
490 } 500 }
501 +
502 + Set<MergedGifts> set = new LinkedHashSet<>(mData);
503 + mData.clear();
504 + mData.addAll(set);
491 } 505 }
492 506
493 private void filterItems() { 507 private void filterItems() {
......
...@@ -38,6 +38,7 @@ import ly.warp.sdk.utils.WarpJSONParser; ...@@ -38,6 +38,7 @@ import ly.warp.sdk.utils.WarpJSONParser;
38 import ly.warp.sdk.utils.WarpUtils; 38 import ly.warp.sdk.utils.WarpUtils;
39 import ly.warp.sdk.utils.WarplyManagerHelper; 39 import ly.warp.sdk.utils.WarplyManagerHelper;
40 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 40 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
41 +import ly.warp.sdk.utils.managers.WarplyManager;
41 import ly.warp.sdk.views.adapters.MergedMoreAdapter; 42 import ly.warp.sdk.views.adapters.MergedMoreAdapter;
42 import ly.warp.sdk.views.adapters.MoreCampaignAdapter; 43 import ly.warp.sdk.views.adapters.MoreCampaignAdapter;
43 import ly.warp.sdk.views.adapters.MoreContextualAdapter; 44 import ly.warp.sdk.views.adapters.MoreContextualAdapter;
...@@ -211,7 +212,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -211,7 +212,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
211 // initViews2(); 212 // initViews2();
212 213
213 /** New Implementation */ 214 /** New Implementation */
214 - initViewsNew2(); 215 + runOnUiThread(this::initViewsNew2);
215 /** New Implementation */ 216 /** New Implementation */
216 } 217 }
217 } 218 }
...@@ -518,10 +519,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener ...@@ -518,10 +519,11 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
518 if (extraFields.has("type") && extraFields.optString("type").equals("telco")) { 519 if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
519 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 520 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
520 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) { 521 if (ccms.getLoyaltyCampaignId().equals(moreItem.getSessionUUID())) {
522 + WarplyManager.getSingleCampaign(moreItem.getSessionUUID());
521 Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class); 523 Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class);
522 intent.putExtra("ccms", ccms); 524 intent.putExtra("ccms", ccms);
523 intent.putExtra("loyalty", (Serializable) moreItem); 525 intent.putExtra("loyalty", (Serializable) moreItem);
524 - startActivity(intent); 526 + startActivityForResult(intent, 1003);
525 break; 527 break;
526 } 528 }
527 } 529 }
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
25 25
26 package ly.warp.sdk.utils; 26 package ly.warp.sdk.utils;
27 27
28 +import android.app.ActivityManager;
28 import android.content.Context; 29 import android.content.Context;
29 import android.content.Intent; 30 import android.content.Intent;
30 import android.content.pm.PackageManager; 31 import android.content.pm.PackageManager;
...@@ -79,6 +80,7 @@ import ly.warp.sdk.io.request.WarplyIntegrationRequest; ...@@ -79,6 +80,7 @@ import ly.warp.sdk.io.request.WarplyIntegrationRequest;
79 import ly.warp.sdk.io.request.WarplyUserCouponsRequest; 80 import ly.warp.sdk.io.request.WarplyUserCouponsRequest;
80 import ly.warp.sdk.services.EventService; 81 import ly.warp.sdk.services.EventService;
81 import ly.warp.sdk.services.FCMBaseMessagingService; 82 import ly.warp.sdk.services.FCMBaseMessagingService;
83 +import ly.warp.sdk.services.WarplyHealthService;
82 import ly.warp.sdk.utils.managers.WarplyEventBusManager; 84 import ly.warp.sdk.utils.managers.WarplyEventBusManager;
83 import ly.warp.sdk.utils.managers.WarplyManager; 85 import ly.warp.sdk.utils.managers.WarplyManager;
84 86
...@@ -1230,6 +1232,23 @@ public class WarplyManagerHelper { ...@@ -1230,6 +1232,23 @@ public class WarplyManagerHelper {
1230 1232
1231 } 1233 }
1232 1234
1235 + public static void logoutUser() {
1236 + if (isMyServiceRunning(WarplyHealthService.class)) {
1237 + Intent stepsServiceIntent = new Intent(Warply.getWarplyContext(), WarplyHealthService.class);
1238 + Warply.getWarplyContext().stopService(stepsServiceIntent);
1239 + }
1240 + }
1241 +
1242 + private static boolean isMyServiceRunning(Class<?> serviceClass) {
1243 + ActivityManager manager = (ActivityManager) Warply.getWarplyContext().getSystemService(Context.ACTIVITY_SERVICE);
1244 + for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
1245 + if (serviceClass.getName().equals(service.service.getClassName())) {
1246 + return true;
1247 + }
1248 + }
1249 + return false;
1250 + }
1251 +
1233 // =========================================================== 1252 // ===========================================================
1234 // Inner and Anonymous Classes 1253 // Inner and Anonymous Classes
1235 // =========================================================== 1254 // ===========================================================
......
...@@ -532,7 +532,7 @@ public class WarpView extends WebView { ...@@ -532,7 +532,7 @@ public class WarpView extends WebView {
532 WarplyManagerHelper.mMetersWebview = 0.0d; 532 WarplyManagerHelper.mMetersWebview = 0.0d;
533 WarpViewActivity.getMetersHandler().postDelayed(this, 300); 533 WarpViewActivity.getMetersHandler().postDelayed(this, 300);
534 } 534 }
535 - }, 1000); 535 + }, 3000); //TODO: change it back to 1000
536 536
537 if (url.contains("about:blank")) { 537 if (url.contains("about:blank")) {
538 WarpView.this.clearHistory(); 538 WarpView.this.clearHistory();
......
...@@ -10,24 +10,24 @@ ...@@ -10,24 +10,24 @@
10 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
11 android:id="@+id/cl_bill_header" 11 android:id="@+id/cl_bill_header"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 - android:layout_height="50dp" 13 + android:layout_height="48dp"
14 android:background="@android:color/white"> 14 android:background="@android:color/white">
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_coupons_close" 17 android:id="@+id/iv_coupons_close"
18 - android:layout_width="26dp" 18 + android:layout_width="48dp"
19 - android:layout_height="25dp" 19 + android:layout_height="48dp"
20 - android:layout_marginStart="24dp" 20 + android:layout_marginStart="16dp"
21 - android:layout_marginTop="4dp"
22 android:src="@drawable/ic_back" 21 android:src="@drawable/ic_back"
22 + android:scaleType="centerInside"
23 app:layout_constraintBottom_toBottomOf="parent" 23 app:layout_constraintBottom_toBottomOf="parent"
24 app:layout_constraintStart_toStartOf="parent" 24 app:layout_constraintStart_toStartOf="parent"
25 app:layout_constraintTop_toTopOf="parent" /> 25 app:layout_constraintTop_toTopOf="parent" />
26 26
27 <TextView 27 <TextView
28 android:id="@+id/textView3" 28 android:id="@+id/textView3"
29 - android:layout_width="206dp" 29 + android:layout_width="wrap_content"
30 - android:layout_height="32dp" 30 + android:layout_height="wrap_content"
31 android:gravity="center" 31 android:gravity="center"
32 android:text="@string/cos_active_all_coupons" 32 android:text="@string/cos_active_all_coupons"
33 android:textColor="@color/grey" 33 android:textColor="@color/grey"
......
...@@ -10,23 +10,24 @@ ...@@ -10,23 +10,24 @@
10 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
11 android:id="@+id/cl_bill_header" 11 android:id="@+id/cl_bill_header"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 - android:layout_height="80dp" 13 + android:layout_height="48dp"
14 android:background="@android:color/white"> 14 android:background="@android:color/white">
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_list_close" 17 android:id="@+id/iv_list_close"
18 - android:layout_width="26dp" 18 + android:layout_width="48dp"
19 - android:layout_height="25dp" 19 + android:layout_height="48dp"
20 - android:layout_marginStart="24dp" 20 + android:layout_marginStart="16dp"
21 - android:layout_marginTop="4dp" 21 + android:scaleType="centerInside"
22 android:src="@drawable/ic_back" 22 android:src="@drawable/ic_back"
23 + app:layout_constraintBottom_toBottomOf="parent"
23 app:layout_constraintStart_toStartOf="parent" 24 app:layout_constraintStart_toStartOf="parent"
24 - app:layout_constraintTop_toTopOf="@+id/textView3" /> 25 + app:layout_constraintTop_toTopOf="parent" />
25 26
26 <TextView 27 <TextView
27 android:id="@+id/textView3" 28 android:id="@+id/textView3"
28 - android:layout_width="206dp" 29 + android:layout_width="wrap_content"
29 - android:layout_height="32dp" 30 + android:layout_height="wrap_content"
30 android:gravity="center" 31 android:gravity="center"
31 android:textColor="@color/grey" 32 android:textColor="@color/grey"
32 android:textSize="17sp" 33 android:textSize="17sp"
...@@ -34,8 +35,7 @@ ...@@ -34,8 +35,7 @@
34 android:text="@string/cos_active_gifts_title" 35 android:text="@string/cos_active_gifts_title"
35 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
36 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
37 - app:layout_constraintHorizontal_bias="0.356" 38 + app:layout_constraintStart_toStartOf="parent"
38 - app:layout_constraintStart_toEndOf="@+id/iv_list_close"
39 app:layout_constraintTop_toTopOf="parent" /> 39 app:layout_constraintTop_toTopOf="parent" />
40 </androidx.constraintlayout.widget.ConstraintLayout> 40 </androidx.constraintlayout.widget.ConstraintLayout>
41 41
......
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
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="50dp" 11 + android:layout_height="48dp"
12 android:background="@android:color/white"> 12 android:background="@android:color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_contextual_back" 15 android:id="@+id/iv_contextual_back"
16 - android:layout_width="26dp" 16 + android:layout_width="48dp"
17 - android:layout_height="25dp" 17 + android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 + android:scaleType="centerInside"
20 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
21 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
22 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
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="50dp" 11 + android:layout_height="48dp"
12 android:background="@android:color/white"> 12 android:background="@android:color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_coupon_info_back" 15 android:id="@+id/iv_coupon_info_back"
16 - android:layout_width="26dp" 16 + android:layout_width="48dp"
17 - android:layout_height="25dp" 17 + android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 + android:scaleType="centerInside"
20 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
21 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
22 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
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="50dp" 11 + android:layout_height="48dp"
12 android:background="@android:color/white"> 12 android:background="@android:color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_coupon_share_back" 15 android:id="@+id/iv_coupon_share_back"
16 - android:layout_width="26dp" 16 + android:layout_width="48dp"
17 - android:layout_height="25dp" 17 + android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 + android:scaleType="centerInside"
20 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
21 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
22 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
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="50dp" 11 + android:layout_height="48dp"
12 android:background="@android:color/white"> 12 android:background="@android:color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_couponset_info_back" 15 android:id="@+id/iv_couponset_info_back"
16 - android:layout_width="26dp" 16 + android:layout_width="48dp"
17 - android:layout_height="25dp" 17 + android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 + android:scaleType="centerInside"
20 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
21 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
22 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -11,23 +11,24 @@ ...@@ -11,23 +11,24 @@
11 <androidx.constraintlayout.widget.ConstraintLayout 11 <androidx.constraintlayout.widget.ConstraintLayout
12 android:id="@+id/cl_bill_header" 12 android:id="@+id/cl_bill_header"
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 - android:layout_height="80dp" 14 + android:layout_height="48dp"
15 android:background="@android:color/white"> 15 android:background="@android:color/white">
16 16
17 <ImageView 17 <ImageView
18 android:id="@+id/iv_list_close" 18 android:id="@+id/iv_list_close"
19 - android:layout_width="26dp" 19 + android:layout_width="48dp"
20 - android:layout_height="25dp" 20 + android:layout_height="48dp"
21 - android:layout_marginStart="24dp" 21 + android:layout_marginStart="16dp"
22 - android:layout_marginTop="4dp" 22 + android:scaleType="centerInside"
23 android:src="@drawable/ic_back" 23 android:src="@drawable/ic_back"
24 + app:layout_constraintBottom_toBottomOf="parent"
24 app:layout_constraintStart_toStartOf="parent" 25 app:layout_constraintStart_toStartOf="parent"
25 - app:layout_constraintTop_toTopOf="@+id/textView3" /> 26 + app:layout_constraintTop_toTopOf="parent" />
26 27
27 <TextView 28 <TextView
28 android:id="@+id/textView3" 29 android:id="@+id/textView3"
29 - android:layout_width="206dp" 30 + android:layout_width="wrap_content"
30 - android:layout_height="32dp" 31 + android:layout_height="wrap_content"
31 android:gravity="center" 32 android:gravity="center"
32 android:textColor="@color/grey" 33 android:textColor="@color/grey"
33 android:textSize="17sp" 34 android:textSize="17sp"
...@@ -35,8 +36,7 @@ ...@@ -35,8 +36,7 @@
35 android:text="@string/cos_gifts_title" 36 android:text="@string/cos_gifts_title"
36 app:layout_constraintBottom_toBottomOf="parent" 37 app:layout_constraintBottom_toBottomOf="parent"
37 app:layout_constraintEnd_toEndOf="parent" 38 app:layout_constraintEnd_toEndOf="parent"
38 - app:layout_constraintHorizontal_bias="0.356" 39 + app:layout_constraintStart_toStartOf="parent"
39 - app:layout_constraintStart_toEndOf="@+id/iv_list_close"
40 app:layout_constraintTop_toTopOf="parent" /> 40 app:layout_constraintTop_toTopOf="parent" />
41 </androidx.constraintlayout.widget.ConstraintLayout> 41 </androidx.constraintlayout.widget.ConstraintLayout>
42 42
......
...@@ -10,15 +10,16 @@ ...@@ -10,15 +10,16 @@
10 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
11 android:id="@+id/cl_loyalty_analysis_header" 11 android:id="@+id/cl_loyalty_analysis_header"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 - android:layout_height="50dp" 13 + android:layout_height="48dp"
14 android:background="@android:color/white"> 14 android:background="@android:color/white">
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_loyalty_analysis_close" 17 android:id="@+id/iv_loyalty_analysis_close"
18 - android:layout_width="26dp" 18 + android:layout_width="48dp"
19 - android:layout_height="25dp" 19 + android:layout_height="48dp"
20 android:layout_marginStart="16dp" 20 android:layout_marginStart="16dp"
21 android:src="@drawable/ic_back" 21 android:src="@drawable/ic_back"
22 + android:scaleType="centerInside"
22 app:layout_constraintBottom_toBottomOf="parent" 23 app:layout_constraintBottom_toBottomOf="parent"
23 app:layout_constraintStart_toStartOf="parent" 24 app:layout_constraintStart_toStartOf="parent"
24 app:layout_constraintTop_toTopOf="parent" /> 25 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
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="50dp" 11 + android:layout_height="48dp"
12 android:background="@android:color/white"> 12 android:background="@android:color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_back" 15 android:id="@+id/iv_back"
16 - android:layout_width="26dp" 16 + android:layout_width="48dp"
17 - android:layout_height="25dp" 17 + android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 + android:scaleType="centerInside"
20 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
21 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
22 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -10,32 +10,32 @@ ...@@ -10,32 +10,32 @@
10 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
11 android:id="@+id/cl_more_header" 11 android:id="@+id/cl_more_header"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 - android:layout_height="80dp" 13 + android:layout_height="48dp"
14 app:layout_constraintTop_toTopOf="parent"> 14 app:layout_constraintTop_toTopOf="parent">
15 15
16 <ImageView 16 <ImageView
17 android:id="@+id/iv_list_close" 17 android:id="@+id/iv_list_close"
18 - android:layout_width="26dp" 18 + android:layout_width="48dp"
19 - android:layout_height="25dp" 19 + android:layout_height="48dp"
20 - android:layout_marginStart="24dp" 20 + android:layout_marginStart="16dp"
21 - android:layout_marginTop="4dp" 21 + android:scaleType="centerInside"
22 android:src="@drawable/ic_back" 22 android:src="@drawable/ic_back"
23 + app:layout_constraintBottom_toBottomOf="parent"
23 app:layout_constraintStart_toStartOf="parent" 24 app:layout_constraintStart_toStartOf="parent"
24 - app:layout_constraintTop_toTopOf="@+id/textView3" /> 25 + app:layout_constraintTop_toTopOf="parent" />
25 26
26 <TextView 27 <TextView
27 android:id="@+id/textView3" 28 android:id="@+id/textView3"
28 fontPath="fonts/pf_square_sans_pro_bold.ttf" 29 fontPath="fonts/pf_square_sans_pro_bold.ttf"
29 - android:layout_width="206dp" 30 + android:layout_width="wrap_content"
30 - android:layout_height="32dp" 31 + android:layout_height="wrap_content"
31 android:gravity="center" 32 android:gravity="center"
32 android:text="@string/cos_more_title" 33 android:text="@string/cos_more_title"
33 android:textColor="@color/grey" 34 android:textColor="@color/grey"
34 android:textSize="17sp" 35 android:textSize="17sp"
35 app:layout_constraintBottom_toBottomOf="parent" 36 app:layout_constraintBottom_toBottomOf="parent"
36 app:layout_constraintEnd_toEndOf="parent" 37 app:layout_constraintEnd_toEndOf="parent"
37 - app:layout_constraintHorizontal_bias="0.356" 38 + app:layout_constraintStart_toStartOf="parent"
38 - app:layout_constraintStart_toEndOf="@+id/iv_list_close"
39 app:layout_constraintTop_toTopOf="parent" /> 39 app:layout_constraintTop_toTopOf="parent" />
40 </androidx.constraintlayout.widget.ConstraintLayout> 40 </androidx.constraintlayout.widget.ConstraintLayout>
41 41
......
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
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="50dp" 11 + android:layout_height="48dp"
12 android:background="@android:color/white"> 12 android:background="@android:color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_shops_back" 15 android:id="@+id/iv_shops_back"
16 - android:layout_width="26dp" 16 + android:layout_width="48dp"
17 - android:layout_height="25dp" 17 + android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_back" 19 android:src="@drawable/ic_back"
20 + android:scaleType="centerInside"
20 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
21 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
22 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
......
...@@ -8,15 +8,16 @@ ...@@ -8,15 +8,16 @@
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="50dp" 11 + android:layout_height="48dp"
12 android:background="@android:color/white"> 12 android:background="@android:color/white">
13 13
14 <ImageView 14 <ImageView
15 android:id="@+id/iv_telco_back" 15 android:id="@+id/iv_telco_back"
16 - android:layout_width="22dp" 16 + android:layout_width="48dp"
17 - android:layout_height="22dp" 17 + android:layout_height="48dp"
18 android:layout_marginStart="16dp" 18 android:layout_marginStart="16dp"
19 android:src="@drawable/ic_close" 19 android:src="@drawable/ic_close"
20 + android:scaleType="centerInside"
20 app:layout_constraintBottom_toBottomOf="parent" 21 app:layout_constraintBottom_toBottomOf="parent"
21 app:layout_constraintStart_toStartOf="parent" 22 app:layout_constraintStart_toStartOf="parent"
22 app:layout_constraintTop_toTopOf="parent" /> 23 app:layout_constraintTop_toTopOf="parent" />
......