Panagiotis Triantafyllou

deh minor changes

...@@ -5,7 +5,7 @@ android.buildFeatures.buildConfig = true ...@@ -5,7 +5,7 @@ android.buildFeatures.buildConfig = true
5 5
6 ext { 6 ext {
7 PUBLISH_GROUP_ID = 'ly.warp' 7 PUBLISH_GROUP_ID = 'ly.warp'
8 - PUBLISH_VERSION = '4.5.5.4deh1' 8 + PUBLISH_VERSION = '4.5.5.4deh2'
9 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 9 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
10 } 10 }
11 11
......
...@@ -413,10 +413,10 @@ public class HomeActivity extends Activity implements View.OnClickListener, Offe ...@@ -413,10 +413,10 @@ public class HomeActivity extends Activity implements View.OnClickListener, Offe
413 413
414 // Setup adapter with 5 banner images 414 // Setup adapter with 5 banner images
415 List<Integer> bannerImages = getBannerImages(); 415 List<Integer> bannerImages = getBannerImages();
416 + List<String> bannerUrls = getBannerUrls();
416 mBannerAdapter = new BannerAdapter(this, bannerImages); 417 mBannerAdapter = new BannerAdapter(this, bannerImages);
417 mBannerAdapter.setOnBannerClickListener(position -> { 418 mBannerAdapter.setOnBannerClickListener(position -> {
418 - // Handle banner click (same as the original banner click) 419 + startActivity(WarpViewActivity.createIntentFromURL(this, WarplyManagerHelper.constructCampaignUrl(bannerUrls.get(position))));
419 - WarplyManagerHelper.openContest(this);
420 }); 420 });
421 421
422 mBannerViewPager.setAdapter(mBannerAdapter); 422 mBannerViewPager.setAdapter(mBannerAdapter);
...@@ -438,11 +438,19 @@ public class HomeActivity extends Activity implements View.OnClickListener, Offe ...@@ -438,11 +438,19 @@ public class HomeActivity extends Activity implements View.OnClickListener, Offe
438 */ 438 */
439 private List<Integer> getBannerImages() { 439 private List<Integer> getBannerImages() {
440 return Arrays.asList( 440 return Arrays.asList(
441 - R.drawable.demo_home_banner1,
442 R.drawable.demo_home_banner2, 441 R.drawable.demo_home_banner2,
443 - R.drawable.demo_home_banner3,
444 R.drawable.demo_home_banner4, 442 R.drawable.demo_home_banner4,
445 - R.drawable.demo_home_banner5 443 + R.drawable.demo_home_banner3,
444 + R.drawable.demo_home_banner1
445 + );
446 + }
447 +
448 + private List<String> getBannerUrls() {
449 + return Arrays.asList(
450 + "https://warply.s3.amazonaws.com/dei/campaigns/match_dev/index.html",
451 + "https://warply.s3.amazonaws.com/dei/campaigns/questionnaire_dev/index.html",
452 + "https://warply.s3.amazonaws.com/dei/campaigns/tesla_dev/index.html",
453 + "https://warply.s3.amazonaws.com/dei/campaigns/EnergySaverContest_dev/index.html"
446 ); 454 );
447 } 455 }
448 456
......
...@@ -118,6 +118,28 @@ public class WarplyManagerHelper { ...@@ -118,6 +118,28 @@ public class WarplyManagerHelper {
118 return url; 118 return url;
119 } 119 }
120 120
121 + public static String constructCampaignUrl(String url) {
122 + JSONObject params = new JSONObject();
123 + try {
124 + params.putOpt("web_id", WarpUtils.getWebId(Warply.getWarplyContext()));
125 + params.putOpt("app_uuid", WarplyProperty.getAppUuid(Warply.getWarplyContext()));
126 + params.putOpt("api_key", WarpUtils.getApiKey(Warply.getWarplyContext()));
127 + params.putOpt("session_uuid", "");
128 + params.putOpt("access_token", WarplyDBHelper.getInstance(Warply.getWarplyContext()).getAuthValue("access_token"));
129 + params.putOpt("refresh_token", WarplyDBHelper.getInstance(Warply.getWarplyContext()).getAuthValue("refresh_token"));
130 + params.putOpt("client_id", WarplyDBHelper.getInstance(Warply.getWarplyContext()).getClientValue("client_id"));
131 + params.putOpt("client_secret", WarplyDBHelper.getInstance(Warply.getWarplyContext()).getClientValue("client_secret"));
132 + params.putOpt("lan", WarpUtils.getApplicationLocale(Warply.getWarplyContext()));
133 + params.putOpt("dark", String.valueOf(WarpUtils.getIsDarkModeEnabled(Warply.getWarplyContext())));
134 + } catch (JSONException e) {
135 + e.printStackTrace();
136 + }
137 +
138 + WarpUtils.setWebviewParams(Warply.getWarplyContext(), params);
139 +
140 + return url;
141 + }
142 +
121 public static void openSupermarketsFlow(Context context) { 143 public static void openSupermarketsFlow(Context context) {
122 if (mSupermarketCampaigns == null || mSupermarketCampaigns.isEmpty()) { 144 if (mSupermarketCampaigns == null || mSupermarketCampaigns.isEmpty()) {
123 return; 145 return;
......