open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
54ab2d1b 1 parent 048a4307

new keys

Inline Side-by-side
Showing 10 changed files with 45 additions and 35 deletions
...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { ...@@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity {
36 public void onWarplyReady() { 36 public void onWarplyReady() {
37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { 37 if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) {
38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() 38 WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest()
39 - .setGuid("7000000831"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons 39 + .setGuid("7000000900"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons
40 mLoginReceiver); 40 mLoginReceiver);
41 } else { 41 } else {
42 startNextActivity(); 42 startNextActivity();
......
...@@ -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-cosbeta66' 5 + PUBLISH_VERSION = '4.5.4-cosbeta69'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
...@@ -55,7 +55,6 @@ dependencies { ...@@ -55,7 +55,6 @@ dependencies {
55 api group: 'com.google.zxing', name: 'javase', version: '3.4.1' 55 api group: 'com.google.zxing', name: 'javase', version: '3.4.1'
56 api 'com.github.siyamed:android-shape-imageview:0.9.3' 56 api 'com.github.siyamed:android-shape-imageview:0.9.3'
57 implementation 'org.greenrobot:eventbus:3.3.1' 57 implementation 'org.greenrobot:eventbus:3.3.1'
58 - api 'com.google.android.flexbox:flexbox:3.0.0'
59 api 'org.apmem.tools:layouts:1.10' 58 api 'org.apmem.tools:layouts:1.10'
60 59
61 //------------------------------ Firebase -----------------------------// 60 //------------------------------ Firebase -----------------------------//
......
...@@ -85,6 +85,8 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -85,6 +85,8 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
85 mSeasonalList.clear(); 85 mSeasonalList.clear();
86 mSeasonalList.addAll(mHashSetSeasonalList); 86 mSeasonalList.addAll(mHashSetSeasonalList);
87 } 87 }
88 + WarpUtils.log("GFY_SEASONAL_LIST_COUNT: " + String.valueOf(mSeasonalList.size()));
89 + WarpUtils.log("GFY_SEASONAL_LIST_JSON: " + String.valueOf(mSeasonalList.toString()));
88 90
89 if (WarplyManagerHelper.getCCMSLoyaltyCampaigns() != null && WarplyManagerHelper.getCCMSLoyaltyCampaigns().size() > 0) { 91 if (WarplyManagerHelper.getCCMSLoyaltyCampaigns() != null && WarplyManagerHelper.getCCMSLoyaltyCampaigns().size() > 0) {
90 mContextualList.clear(); 92 mContextualList.clear();
...@@ -94,6 +96,8 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -94,6 +96,8 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
94 mContextualList.add(ccmsItem); 96 mContextualList.add(ccmsItem);
95 } 97 }
96 } 98 }
99 + WarpUtils.log("GFY_CCMS_LIST_COUNT: " + String.valueOf(mContextualList.size()));
100 + WarpUtils.log("GFY_CCMS_LIST_JSON: " + String.valueOf(mContextualList.toString()));
97 101
98 mergeDatasets( 102 mergeDatasets(
99 mSeasonalList, 103 mSeasonalList,
...@@ -472,9 +476,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -472,9 +476,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
472 mValuesList.clear(); 476 mValuesList.clear();
473 ArrayList<Campaign> gfyList = new ArrayList<>(); 477 ArrayList<Campaign> gfyList = new ArrayList<>();
474 if (WarplyManagerHelper.getCampaignListAll() != null && WarplyManagerHelper.getCampaignListAll().size() > 0) { 478 if (WarplyManagerHelper.getCampaignListAll() != null && WarplyManagerHelper.getCampaignListAll().size() > 0) {
475 - Log.v("Got L:{" + String.valueOf(WarplyManagerHelper.getCampaignListAll().size()) + "}", " LOYALTY campaigns");
476 if (WarplyManagerHelper.getCCMSLoyaltyCampaigns() == null || WarplyManagerHelper.getCCMSLoyaltyCampaigns().size() == 0) { 479 if (WarplyManagerHelper.getCCMSLoyaltyCampaigns() == null || WarplyManagerHelper.getCCMSLoyaltyCampaigns().size() == 0) {
477 - Log.v("Got C:{0}", " CCMS campaigns");
478 for (Campaign camp : WarplyManagerHelper.getCampaignListAll()) { 480 for (Campaign camp : WarplyManagerHelper.getCampaignListAll()) {
479 if (camp.getOfferCategory().equals("gifts_for_you")) { 481 if (camp.getOfferCategory().equals("gifts_for_you")) {
480 try { 482 try {
...@@ -490,8 +492,6 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -490,8 +492,6 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
490 } 492 }
491 } 493 }
492 } else { 494 } else {
493 - int ccmsCount = 0;
494 - Log.v("Got C:{" + String.valueOf(WarplyManagerHelper.getCCMSLoyaltyCampaigns().size()) + "}", " CCMS campaigns");
495 for (Campaign camp : WarplyManagerHelper.getCampaignListAll()) { 495 for (Campaign camp : WarplyManagerHelper.getCampaignListAll()) {
496 if (camp.getOfferCategory().equals("gifts_for_you")) { 496 if (camp.getOfferCategory().equals("gifts_for_you")) {
497 try { 497 try {
...@@ -501,7 +501,6 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -501,7 +501,6 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
501 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) { 501 for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
502 if (ccms.getLoyaltyCampaignId().equals(camp.getSessionUUID())) { 502 if (ccms.getLoyaltyCampaignId().equals(camp.getSessionUUID())) {
503 gfyList.add(camp); 503 gfyList.add(camp);
504 - ccmsCount++;
505 break; 504 break;
506 } 505 }
507 } 506 }
...@@ -514,14 +513,13 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene ...@@ -514,14 +513,13 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
514 } 513 }
515 } 514 }
516 } 515 }
517 - Log.v("Got M:{" + String.valueOf(ccmsCount) + "}", " Matched campaigns");
518 } 516 }
519 517
518 + WarpUtils.log("GFY_FILTER_LIST_COUNT: " + String.valueOf(gfyList.size()));
519 + WarpUtils.log("GFY_FILTER_LIST_JSON: " + String.valueOf(gfyList.toString()));
520 mValuesList.addAll(gfyList); 520 mValuesList.addAll(gfyList);
521 -// HashSet hs = new HashSet(); 521 + WarpUtils.log("GFY_VAR_LIST_COUNT: " + String.valueOf(mValuesList.size()));
522 -// hs.addAll(mValuesList); 522 + WarpUtils.log("GFY_VAR_LIST_JSON: " + String.valueOf(mValuesList.toString()));
523 -// mValuesList.clear();
524 -// mValuesList.addAll(hs);
525 } 523 }
526 } 524 }
527 525
......
...@@ -411,9 +411,14 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener { ...@@ -411,9 +411,14 @@ public class LoyaltyWallet extends Activity implements View.OnClickListener {
411 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_selectable, null); 411 LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_selectable, null);
412 TextView textView = (TextView) v.findViewById(R.id.tv_code_copy); 412 TextView textView = (TextView) v.findViewById(R.id.tv_code_copy);
413 TextView textViewComma = (TextView) v.findViewById(R.id.tv_code_comma); 413 TextView textViewComma = (TextView) v.findViewById(R.id.tv_code_comma);
414 - textView.setText(WarplyManagerHelper.getActiveDFYCoupons().get(i).getCode()); 414 + CalligraphyTypefaceSpan typefaceBoldSpan = new CalligraphyTypefaceSpan(TypefaceUtils.load(getAssets(), "fonts/pf_square_sans_pro_bold.ttf"));
415 + SpannableStringBuilder sBuilder = new SpannableStringBuilder(WarplyManagerHelper.getActiveDFYCoupons().get(i).getCode());
416 + SpannableStringBuilder sBuilderComma = new SpannableStringBuilder(getString(R.string.cos_comma));
417 + sBuilder.setSpan(typefaceBoldSpan, 0, sBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
418 + sBuilderComma.setSpan(typefaceBoldSpan, 0, sBuilderComma.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
419 + textView.setText(sBuilder, TextView.BufferType.SPANNABLE);
415 textView.setTextIsSelectable(true); 420 textView.setTextIsSelectable(true);
416 - textViewComma.setText(getString(R.string.cos_comma)); 421 + textViewComma.setText(sBuilderComma, TextView.BufferType.SPANNABLE);
417 mLlActiveCodesView.addView(v, 0, new ViewGroup.LayoutParams( 422 mLlActiveCodesView.addView(v, 0, new ViewGroup.LayoutParams(
418 ViewGroup.LayoutParams.WRAP_CONTENT, 423 ViewGroup.LayoutParams.WRAP_CONTENT,
419 ViewGroup.LayoutParams.WRAP_CONTENT)); 424 ViewGroup.LayoutParams.WRAP_CONTENT));
......
...@@ -110,8 +110,8 @@ public class NewCampaign implements Parcelable, Serializable { ...@@ -110,8 +110,8 @@ public class NewCampaign implements Parcelable, Serializable {
110 this.indexUrl = json.optString(INDEX_URL); 110 this.indexUrl = json.optString(INDEX_URL);
111 this.logoUrl = json.optString(LOGO_URL); 111 this.logoUrl = json.optString(LOGO_URL);
112 this.communicationUUID = json.optString(COMMUNICATION_UUID); 112 this.communicationUUID = json.optString(COMMUNICATION_UUID);
113 - this.subtitle = json.optString(SUBTITLE); 113 + this.subtitle = json.isNull(SUBTITLE) ? null : json.optString(SUBTITLE);
114 - this.message = json.optString(MESSAGE); 114 + this.message = json.isNull(MESSAGE) ? null : json.optString(MESSAGE);
115 this.category = json.optString(CATEGORY); 115 this.category = json.optString(CATEGORY);
116 this.title = json.optString(TITLE); 116 this.title = json.optString(TITLE);
117 this.sorting = json.optInt(SORTING); 117 this.sorting = json.optInt(SORTING);
......
...@@ -56,7 +56,7 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -56,7 +56,7 @@ public class WarplyHealthService extends Service implements SensorEventListener
56 private SensorManager mSensorManager; 56 private SensorManager mSensorManager;
57 private Sensor mSensor; 57 private Sensor mSensor;
58 // private int mSteps = 0; 58 // private int mSteps = 0;
59 - private double mStepsAll = 0.0d; 59 +// private double mStepsAll = 0.0d;
60 private final int ACCEL_RING_SIZE = 50; 60 private final int ACCEL_RING_SIZE = 50;
61 private final int VEL_RING_SIZE = 10; 61 private final int VEL_RING_SIZE = 10;
62 // change this threshold according to your sensitivity preferences 62 // change this threshold according to your sensitivity preferences
...@@ -138,8 +138,8 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -138,8 +138,8 @@ public class WarplyHealthService extends Service implements SensorEventListener
138 super.onDestroy(); 138 super.onDestroy();
139 139
140 unregisterStepSensor(); 140 unregisterStepSensor();
141 - mStepsAll = 0.0d; 141 +// mStepsAll = 0.0d;
142 - WarpUtils.setStepsMetersCounter(this, 0.0d); 142 +// WarpUtils.setStepsMetersCounter(this, 0.0d);
143 WarplyManagerHelper.mStepsWebview = 0; 143 WarplyManagerHelper.mStepsWebview = 0;
144 WarplyManagerHelper.mMetersWebview = 0.0d; 144 WarplyManagerHelper.mMetersWebview = 0.0d;
145 sendSteps(); 145 sendSteps();
...@@ -212,14 +212,15 @@ public class WarplyHealthService extends Service implements SensorEventListener ...@@ -212,14 +212,15 @@ public class WarplyHealthService extends Service implements SensorEventListener
212 && oldVelocityEstimate <= STEP_THRESHOLD 212 && oldVelocityEstimate <= STEP_THRESHOLD
213 && (timeNs - lastStepTimeNs > STEP_DELAY_NS)) { 213 && (timeNs - lastStepTimeNs > STEP_DELAY_NS)) {
214 WarplyManagerHelper.mSteps++; 214 WarplyManagerHelper.mSteps++;
215 - mStepsAll++; 215 + WarpUtils.setStepsCounter(this, WarplyManagerHelper.mSteps);
216 +// mStepsAll++;
216 WarplyManagerHelper.mStepsWebview++; 217 WarplyManagerHelper.mStepsWebview++;
217 WarplyManagerHelper.mMetersWebview = (WarplyManagerHelper.mStepsWebview * 0.762); 218 WarplyManagerHelper.mMetersWebview = (WarplyManagerHelper.mStepsWebview * 0.762);
218 HealthEventModel healthSteps = new HealthEventModel(); 219 HealthEventModel healthSteps = new HealthEventModel();
219 - healthSteps.setMeters((mStepsAll * 0.762)); 220 +// healthSteps.setMeters((mStepsAll * 0.762));
221 + healthSteps.setMeters(WarplyManagerHelper.mMetersWebview);
220 EventBus.getDefault().post(new WarplyEventBusManager(healthSteps)); 222 EventBus.getDefault().post(new WarplyEventBusManager(healthSteps));
221 - WarpUtils.setStepsMetersCounter(this, (mStepsAll * 0.762)); 223 +// WarpUtils.setStepsMetersCounter(this, (mStepsAll * 0.762));
222 - WarpUtils.setStepsCounter(this, WarplyManagerHelper.mSteps);
223 224
224 lastStepTimeNs = timeNs; 225 lastStepTimeNs = timeNs;
225 } 226 }
......
...@@ -98,7 +98,7 @@ public class WarplyManagerHelper { ...@@ -98,7 +98,7 @@ public class WarplyManagerHelper {
98 private static CustomerStateModel mCustomerStateModel = new CustomerStateModel(); 98 private static CustomerStateModel mCustomerStateModel = new CustomerStateModel();
99 private static CampaignList mCampaignList = new CampaignList(); 99 private static CampaignList mCampaignList = new CampaignList();
100 private static CampaignList mCampaignListAll = new CampaignList(); 100 private static CampaignList mCampaignListAll = new CampaignList();
101 - private static CampaignList mCarouselList = new CampaignList(); 101 + private static ArrayList<Campaign> mCarouselList = new ArrayList<Campaign>();
102 private static ArrayList<ActiveDFYCouponModel> mDfyCoupons = new ArrayList(); 102 private static ArrayList<ActiveDFYCouponModel> mDfyCoupons = new ArrayList();
103 private static ArrayList<LoyaltyGiftsForYouPackage> mSeasonalList = new ArrayList<>(); 103 private static ArrayList<LoyaltyGiftsForYouPackage> mSeasonalList = new ArrayList<>();
104 private static ArrayList<LoyaltyContextualOfferModel> mCCMSList = new ArrayList<>(); 104 private static ArrayList<LoyaltyContextualOfferModel> mCCMSList = new ArrayList<>();
...@@ -1052,16 +1052,16 @@ public class WarplyManagerHelper { ...@@ -1052,16 +1052,16 @@ public class WarplyManagerHelper {
1052 } 1052 }
1053 } 1053 }
1054 1054
1055 - public static void setCarouselList(CampaignList carouselList) { 1055 + public static void setCarouselList(ArrayList<Campaign> carouselList) {
1056 + WarpUtils.log("SET_CAROUSEL_LIST_PARAM_COUNT: " + String.valueOf(carouselList.size()));
1057 + WarpUtils.log("SET_CAROUSEL_LIST_PARAM_JSON: " + String.valueOf(carouselList.toString()));
1056 mCarouselList.clear(); 1058 mCarouselList.clear();
1057 - mCarouselList = carouselList; 1059 + mCarouselList.addAll(carouselList);
1058 - HashSet hs = new HashSet(); 1060 + WarpUtils.log("SET_CAROUSEL_LIST_VAR_COUNT: " + String.valueOf(mCarouselList.size()));
1059 - hs.addAll(mCarouselList); 1061 + WarpUtils.log("SET_CAROUSEL_LIST_VAR_JSON: " + String.valueOf(mCarouselList.toString()));
1060 - mCarouselList.clear();
1061 - mCarouselList.addAll(hs);
1062 } 1062 }
1063 1063
1064 - public static CampaignList getCarouselList() { 1064 + public static ArrayList<Campaign> getCarouselList() {
1065 return mCarouselList; 1065 return mCarouselList;
1066 } 1066 }
1067 1067
......
...@@ -1403,7 +1403,7 @@ public class WarplyManager { ...@@ -1403,7 +1403,7 @@ public class WarplyManager {
1403 Collections.sort(mNewCampaignList, (obj1, obj2) -> Integer.compare(obj1.getSorting(), obj2.getSorting())); 1403 Collections.sort(mNewCampaignList, (obj1, obj2) -> Integer.compare(obj1.getSorting(), obj2.getSorting()));
1404 CampaignList campaignLoyaltyList = new CampaignList(); 1404 CampaignList campaignLoyaltyList = new CampaignList();
1405 campaignLoyaltyList.clear(); 1405 campaignLoyaltyList.clear();
1406 - CampaignList campaignCarouselList = new CampaignList(); 1406 + ArrayList<Campaign> campaignCarouselList = new ArrayList<>();
1407 campaignCarouselList.clear(); 1407 campaignCarouselList.clear();
1408 for (Campaign camp : mNewCampaignList) { 1408 for (Campaign camp : mNewCampaignList) {
1409 JSONObject campMetadata = WarpJSONParser.getJSONFromString(camp.getExtraFields()); 1409 JSONObject campMetadata = WarpJSONParser.getJSONFromString(camp.getExtraFields());
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 android:orientation="vertical" 55 android:orientation="vertical"
56 android:paddingVertical="16dp" 56 android:paddingVertical="16dp"
57 android:visibility="gone" 57 android:visibility="gone"
58 - tools:visibility="visible"> 58 + tools:visibility="gone">
59 59
60 <ImageView 60 <ImageView
61 android:id="@+id/iv_popup_gifts_close" 61 android:id="@+id/iv_popup_gifts_close"
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
101 android:layout_marginTop="4dp" 101 android:layout_marginTop="4dp"
102 android:clipToPadding="false" 102 android:clipToPadding="false"
103 android:orientation="vertical" 103 android:orientation="vertical"
104 + android:overScrollMode="never"
104 android:paddingTop="44dp" /> 105 android:paddingTop="44dp" />
105 106
106 <!-- <androidx.constraintlayout.widget.ConstraintLayout--> 107 <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
......
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
49 <ScrollView 49 <ScrollView
50 android:layout_width="match_parent" 50 android:layout_width="match_parent"
51 android:layout_height="match_parent" 51 android:layout_height="match_parent"
52 - android:fillViewport="true"> 52 + android:fillViewport="true"
53 + android:overScrollMode="never">
53 54
54 <RelativeLayout 55 <RelativeLayout
55 android:layout_width="match_parent" 56 android:layout_width="match_parent"
...@@ -113,6 +114,7 @@ ...@@ -113,6 +114,7 @@
113 android:orientation="vertical" 114 android:orientation="vertical"
114 android:paddingTop="44dp" 115 android:paddingTop="44dp"
115 android:paddingBottom="24dp" 116 android:paddingBottom="24dp"
117 + android:overScrollMode="never"
116 android:visibility="gone" /> 118 android:visibility="gone" />
117 119
118 <LinearLayout 120 <LinearLayout
...@@ -141,6 +143,7 @@ ...@@ -141,6 +143,7 @@
141 android:layout_marginTop="4dp" 143 android:layout_marginTop="4dp"
142 android:clipToPadding="false" 144 android:clipToPadding="false"
143 android:orientation="vertical" 145 android:orientation="vertical"
146 + android:overScrollMode="never"
144 android:paddingBottom="4dp" /> 147 android:paddingBottom="4dp" />
145 </LinearLayout> 148 </LinearLayout>
146 149
...@@ -169,6 +172,7 @@ ...@@ -169,6 +172,7 @@
169 android:layout_marginTop="4dp" 172 android:layout_marginTop="4dp"
170 android:clipToPadding="false" 173 android:clipToPadding="false"
171 android:orientation="vertical" 174 android:orientation="vertical"
175 + android:overScrollMode="never"
172 android:paddingBottom="4dp" /> 176 android:paddingBottom="4dp" />
173 </LinearLayout> 177 </LinearLayout>
174 178
...@@ -197,6 +201,7 @@ ...@@ -197,6 +201,7 @@
197 android:layout_marginTop="4dp" 201 android:layout_marginTop="4dp"
198 android:clipToPadding="false" 202 android:clipToPadding="false"
199 android:orientation="vertical" 203 android:orientation="vertical"
204 + android:overScrollMode="never"
200 android:paddingBottom="4dp" /> 205 android:paddingBottom="4dp" />
201 </LinearLayout> 206 </LinearLayout>
202 207
...@@ -225,6 +230,7 @@ ...@@ -225,6 +230,7 @@
225 android:layout_marginTop="4dp" 230 android:layout_marginTop="4dp"
226 android:clipToPadding="false" 231 android:clipToPadding="false"
227 android:orientation="vertical" 232 android:orientation="vertical"
233 + android:overScrollMode="never"
228 android:paddingBottom="4dp" /> 234 android:paddingBottom="4dp" />
229 </LinearLayout> 235 </LinearLayout>
230 </RelativeLayout> 236 </RelativeLayout>
......