From b322ce7bf8c0f21b50b391e8724d89110115a623 Mon Sep 17 00:00:00 2001
From: Kyle Bennett <kylebennett@pixleeteam.com>
Date: Thu, 16 May 2019 18:53:29 -0400
Subject: [PATCH 1/2] add product album class

---
 .idea/gradle.xml                              |   3 +
 .idea/misc.xml                                |  30 +++--
 README.md                                     |  15 ++-
 app/build.gradle                              |   1 -
 .../pixleeandroidsdk/SampleActivity.java      |   9 +-
 build.gradle                                  |   6 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 pixleesdk/build.gradle                        |   3 +-
 .../java/com/pixlee/pixleesdk/PXLAlbum.java   |  23 ++--
 .../java/com/pixlee/pixleesdk/PXLClient.java  |   1 +
 .../com/pixlee/pixleesdk/PXLPdpAlbum.java     | 107 ++++++++++++++++++
 11 files changed, 162 insertions(+), 40 deletions(-)
 create mode 100644 pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLPdpAlbum.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index accfcc9e..c9a398d4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d199810..e8ee3d97 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,43 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index 66c7f520..3b07c1b1 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,15 @@ To load the photos in an album, you'll want to use the `PXLAlbum` class. Instant
 PXLAlbum pxlAlbum = new PXLAlbum(<ALBUM ID>, context);
 ```
 
+To load the photos in an Product album, you'll want to use the `PXLPdpAlbum` class. Instantiate one with your desired sku and context:
+
+
+```
+#!java
+
+PXLPdpAlbum pxlPdpAlbum = new PXLPdpAlbum(<SKU>, context);
+```
+
 
 You can then set sort and filter options if desired and use `loadNextPageOfPhotos` to kick off the async request.
 
@@ -61,11 +70,11 @@ Each successive call of `loadNextPageOfPhotos` will load the next page of photos
 
 Once an album has loaded photos from the server, it will instantiate `PXLPhoto` objects that can be consumed by your UI. `PXLPhoto` exposes all of the data for a photo available through the Pixlee API and offers several image url sizes depending on your needs.
 
-###Analytics
-####Opened Widget
+### Analytics
+#### Opened Widget
 On the first load of an album, an "Opened Widget" analytics event will be fired automatically
 
-####Opened Lightbox
+#### Opened Lightbox
 To fire an opened ligtbox event, simply call the `openedLightbox` method of the PXLPhoto that is being opened, and an "Opened Lightbox" event will be fired containing all of the necessary analytics information.
 
 ```
diff --git a/app/build.gradle b/app/build.gradle
index d1d05518..48544782 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.pixlee.pixleeandroidsdk"
         minSdkVersion 15
diff --git a/app/src/main/java/com/pixlee/pixleeandroidsdk/SampleActivity.java b/app/src/main/java/com/pixlee/pixleeandroidsdk/SampleActivity.java
index a278f09e..2c5aa885 100644
--- a/app/src/main/java/com/pixlee/pixleeandroidsdk/SampleActivity.java
+++ b/app/src/main/java/com/pixlee/pixleeandroidsdk/SampleActivity.java
@@ -18,6 +18,7 @@
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.NetworkImageView;
 import com.pixlee.pixleesdk.PXLAlbum;
+import com.pixlee.pixleesdk.PXLPdpAlbum;
 import com.pixlee.pixleesdk.PXLAlbumFilterOptions;
 import com.pixlee.pixleesdk.PXLAlbumSortOptions;
 import com.pixlee.pixleesdk.PXLAlbumSortType;
@@ -168,12 +169,12 @@ public void onLoadMore(int page, int totalItemsCount, RecyclerView view) {
     private void createAlbum() {
         Context c = this.getApplicationContext();
         PXLClient.initialize("196i8ZzIAhKU8dO2kDe");
-        album = new PXLAlbum("2696111", c);
+        album = new PXLPdpAlbum("rr", c);
         PXLAlbumFilterOptions fo = new PXLAlbumFilterOptions();
         fo.minTwitterFollowers = 0;
-        fo.minInstagramFollowers = 1;
+        fo.minInstagramFollowers = 0;
         PXLAlbumSortOptions so = new PXLAlbumSortOptions();
-        so.sortType = PXLAlbumSortType.PHOTORANK;
+        so.sortType = PXLAlbumSortType.RECENCY;
         so.descending = true;
         album.setPerPage(20);
         album.setFilterOptions(fo);
@@ -234,7 +235,7 @@ private void populateDetailActions(PXLPhoto photo) {
     }
 
     private void samplePhotoLoad() {
-        String identifier = "170008554";
+        String identifier = "282742015";
         PXLPhoto.getPhotoWithId(getApplicationContext(), identifier, new PXLPhoto.PhotoLoadHandlers() {
             @Override
             public void photoLoaded(PXLPhoto photo) {
diff --git a/build.gradle b/build.gradle
index c2eea8e2..a6877bcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eeca056c..4edf950d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 05 16:06:26 PDT 2017
+#Thu May 16 17:06:08 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/pixleesdk/build.gradle b/pixleesdk/build.gradle
index 042ba253..fa05f3a8 100644
--- a/pixleesdk/build.gradle
+++ b/pixleesdk/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 15
@@ -31,7 +30,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.volley:volley:1.0.0'
+    compile 'com.android.volley:volley:1.1.0'
     testCompile 'junit:junit:4.12'
     testCompile 'org.json:json:20160810'
 }
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java
index cb98d9df..d8f71cf8 100644
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java
@@ -23,16 +23,17 @@ public class PXLAlbum implements RequestCallbacks {
     public static final int DefaultPerPage = 20;
 
     public String id = null;
-    private int page;
-    private int perPage;
-    private boolean hasMore;
-    private int lastPageLoaded;
-    private ArrayList<PXLPhoto> photos;
-    private PXLAlbumFilterOptions filterOptions;
-    private PXLAlbumSortOptions sortOptions;
-    private HashMap<Integer, Boolean> pagesLoading;
-    private RequestHandlers handlers;
-    private Context context;
+    protected int page;
+    protected int perPage;
+    protected boolean hasMore;
+    protected int lastPageLoaded;
+    protected ArrayList<PXLPhoto> photos;
+    protected PXLAlbumFilterOptions filterOptions;
+    protected PXLAlbumSortOptions sortOptions;
+    protected HashMap<Integer, Boolean> pagesLoading;
+    protected RequestHandlers handlers;
+    protected Context context;
+
 
     /***
      * Callback for a successful call to the api.  Parses the response and converts the json data
@@ -169,7 +170,7 @@ private void resetState() {
         this.pagesLoading.clear();
     }
 
-    private HashMap<String, Object> getRequestParams(int desiredPage) {
+    protected HashMap<String, Object> getRequestParams(int desiredPage) {
         HashMap<String, Object> paramMap = new HashMap<>();
         if (filterOptions != null) {
             paramMap.put(PXLClient.KeyFilters, filterOptions.toParamString());
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLClient.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLClient.java
index bebb392f..b0026e82 100644
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLClient.java
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLClient.java
@@ -38,6 +38,7 @@ public class PXLClient {
     public static final String KeyApiKey = "api_key";
     public static final String KeyPage = "page";
     public static final String KeyPerPage = "per_page";
+    public static final String KeySku = "sku";
 
     public static final String ACTION_MEDIA = "media";
 
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLPdpAlbum.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLPdpAlbum.java
new file mode 100644
index 00000000..44ab7b9f
--- /dev/null
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLPdpAlbum.java
@@ -0,0 +1,107 @@
+package com.pixlee.pixleesdk;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class PXLPdpAlbum extends PXLAlbum {
+    private static final String TAG = "PXLPdpAlbum";
+    private final String sku;
+
+    /***
+     * Constructor requires the product sku and context, which will be passed along to the PXLClient
+     * for volley configuration.
+     * @param sku - product sku
+     * @param context - context which will be used for volley configuration
+     */
+    public PXLPdpAlbum(String sku, Context context) {
+        super(sku, context);
+        this.sku = sku;
+        this.page = 0;
+        this.perPage = DefaultPerPage;
+        this.hasMore = true;
+        this.lastPageLoaded = 0;
+        this.photos = new ArrayList<>();
+        this.pagesLoading = new HashMap<>();
+        this.context = context;
+    }
+
+    
+    /***
+     * Requests the next page of photos from the Pixlee album. Make sure to set perPage,
+     * sort order, and filter options before calling.
+     * @param handlers - called upon success/failure of the request
+     * @return true if the request was attempted, false if aborted before the attempt was made
+     */
+    @Override
+    public boolean loadNextPageOfPhotos(final RequestHandlers handlers) {
+        if (sku == null) {
+            Log.w(TAG, "No sku specified");
+            return false;
+        }
+        if (this.hasMore) {
+            int desiredPage = this.lastPageLoaded + 1;
+            if (pagesLoading.get(desiredPage) != null && pagesLoading.get(desiredPage)) {
+                Log.d(TAG, String.format("page %s already loading", desiredPage));
+                return false;
+            }
+            PXLClient pxlClient = PXLClient.getInstance(context);
+            String requestPath = "albums/from_sku";
+            this.pagesLoading.put(desiredPage, true);
+            this.handlers = handlers;
+            pxlClient.makeCall(requestPath, getRequestParams(desiredPage), this);
+        }
+
+        return true;
+    }
+
+     @Override
+     protected HashMap<String, Object> getRequestParams(int desiredPage) {
+         HashMap<String, Object> paramMap = new HashMap<>();
+         if (filterOptions != null) {
+             paramMap.put(PXLClient.KeyFilters, filterOptions.toParamString());
+         }
+         if (sortOptions != null) {
+             paramMap.put(PXLClient.KeySort, sortOptions.toParamString());
+         }
+         paramMap.put(PXLClient.KeyPerPage, perPage);
+         paramMap.put(PXLClient.KeyPage, desiredPage);
+         paramMap.put(PXLClient.KeySku, sku);
+         return paramMap;
+     }
+
+    @Override
+    public boolean openedWidget() {
+        PXLClient pxlClient = PXLClient.getInstance(context);
+        JSONObject body = new JSONObject();
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < this.photos.size(); i++) {
+            try {
+                stringBuilder.append(this.photos.get(i).id);
+                if(i != this.photos.size() - 1){
+                    stringBuilder.append(",");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        try{
+            body.put("sku", this.sku);
+            body.put("per_page", this.perPage);
+            body.put("page", this.page);
+            body.put("photos", stringBuilder.toString());
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        pxlClient.makeAnalyticsCall("events/openedWidget", body);
+        return true;
+    }
+}

From 42faef40ae18542345ec7e309616e88c11d915de Mon Sep 17 00:00:00 2001
From: Kyle Bennett <kylebennett@pixleeteam.com>
Date: Thu, 16 May 2019 18:55:45 -0400
Subject: [PATCH 2/2] protect this too I guess

---
 pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java
index d8f71cf8..4df86c50 100644
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/PXLAlbum.java
@@ -163,7 +163,7 @@ public void setSortOptions(PXLAlbumSortOptions sortOptions) {
         this.resetState();
     }
 
-    private void resetState() {
+    protected void resetState() {
         this.photos.clear();
         this.lastPageLoaded = 0;
         this.hasMore = true;