Fixed bug when searching api

Updated readme
Updated demo app

Author: KeenenCharles

README.md

@@ -3,9 +3,14 @@ An unofficial Unsplash API library for Android
 
 ## Usage
 
-### Get A List of Photos
+### Initialize Unsplash Client
 ~~~~~
 Unsplash unsplash = new Unsplash(YOUR_CLIENT_ID);
+~~~~~
+You can sign up for a client id at <https://unsplash.com/developers>
+
+### Get A List of Photos
+~~~~~
 unsplash.getPhotos(1, 10, Order.LATEST, new Unsplash.OnPhotosLoadedListener() {
     @Override
     public void onComplete(List<Photo> photos) {
@@ -21,7 +26,6 @@ unsplash.getPhotos(1, 10, Order.LATEST, new Unsplash.OnPhotosLoadedListener() {
 
 ### Get A Photo By Id
 ~~~~~
-Unsplash unsplash = new Unsplash(YOUR_CLIENT_ID);
 unsplash.getPhoto(PHOTO_ID, new Unsplash.OnPhotoLoadedListener() {
     @Override
     public void onComplete(Photo photo) {
@@ -35,6 +39,40 @@ unsplash.getPhoto(PHOTO_ID, new Unsplash.OnPhotoLoadedListener() {
 });
 ~~~~~
 
+### Search
+~~~~~
+unsplash.searchPhotos(query, new Unsplash.OnSearchCompleteListener() {
+    @Override
+    public void onComplete(SearchResults results) {
+        Log.d("Photos", "Total Results Found " + results.getTotal());
+        List<Photo> photos = results.getResults();
+    }
+
+    @Override
+    public void onError(String error) {
+        Log.d("Unsplash", error);
+    }
+});
+~~~~~
+
+## Other Features
+~~~~~
+getCuratedPhotos()
+getRandomPhoto()
+getRandomPhotos()
+getPhotoDownloadLink
+getCollections()
+getFeaturedCollections()
+getCuratedCollections()
+getRelatedCollections()
+getCollection()
+getCuratedCollection()
+getCollectionPhotos()
+getCuratedCollectionPhotos()
+getStats()
+~~~~~
+
+Take a look at the API documentation for what each call does in detail <https://unsplash.com/documentation>
+
 ## To-Do
-+ Statistics
-+ Actions that require user authentication
++ User Authentication

androidunsplash/build.gradle

@@ -28,3 +28,30 @@ dependencies {
     compile 'com.squareup.retrofit2:converter-gson:2.2.0'
     compile 'com.android.support:appcompat-v7:25.3.1'
 }
+
+ext {
+    bintrayRepo = 'android-unsplash'
+    bintrayName = 'android-unsplash'
+
+    publishedGroupId = 'com.kc.androidunsplash'
+    libraryName = 'androidunsplash'
+    artifact = 'androidunsplash'
+
+    libraryDescription = 'An unofficial library to access the Unsplash API'
+
+    siteUrl = 'https://github.com/KeenenCharles/AndroidUnplash'
+    gitUrl = 'https://github.com/KeenenCharles/AndroidUnplash.git'
+
+    libraryVersion = '0.1.0'
+
+    developerId = 'keenencharles'
+    developerName = 'Keenen Charles'
+    developerEmail = 'keenencharles@gmail.com'
+
+    licenseName = 'MIT License'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["MIT"]
+}
+
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

androidunsplash/src/main/java/com/kc/unsplash/Unsplash.java

@@ -11,6 +11,7 @@
 import com.kc.unsplash.api.HeaderInterceptor;
 import com.kc.unsplash.api.Order;
 import com.kc.unsplash.api.endpoints.PhotosEndpointInterface;
+import com.kc.unsplash.models.SearchResults;
 import com.kc.unsplash.models.Stats;
 
 import java.util.List;
@@ -30,6 +31,7 @@ public class Unsplash {
     private PhotosEndpointInterface photosApiService;
     private CollectionsEndpointInterface collectionsApiService;
     private StatsEndpointInterface statsApiService;
+    private String TAG = "Unsplash";
 
     public Unsplash(String clientId) {
         this.clientId = clientId;
@@ -79,9 +81,13 @@ public void getRandomPhotos(@Nullable String collections,
         call.enqueue(getMultiplePhotoCallback(listener));
     }
 
-    public void searchPhotos(@NonNull String query, @Nullable Integer page, @Nullable Integer perPage, OnPhotosLoadedListener listener){
-        Call<List<Photo>> call = photosApiService.searchPhotos(query, page, perPage);
-        call.enqueue(getMultiplePhotoCallback(listener));
+    public void searchPhotos(@NonNull String query, OnSearchCompleteListener listener){
+        searchPhotos(query, null, null, listener);
+    }
+
+    public void searchPhotos(@NonNull String query, @Nullable Integer page, @Nullable Integer perPage, OnSearchCompleteListener listener){
+        Call<SearchResults> call = photosApiService.searchPhotos(query, page, perPage);
+        call.enqueue(getSearchResultsCallback(listener));
     }
 
     public void getPhotoDownloadLink(@NonNull String id, final OnLinkLoadedListener listener){
@@ -94,7 +100,7 @@ public void onResponse(Call<String> call, Response<String> response) {
                         listener.onComplete(response.body());
                     }
                     else if(statusCode == 401) {
-                        Log.d("Unsplash", "Unauthorized, Check your client Id");
+                        Log.d(TAG, "Unauthorized, Check your client Id");
                     }
                 }
 
@@ -157,11 +163,12 @@ public void getStats(final OnStatsLoadedListener listener){
              @Override
              public void onResponse(Call<Stats> call, Response<Stats> response) {
                  int statusCode = response.code();
+                 Log.d(TAG, "Status Code = " + statusCode);
                  if(statusCode == 200) {
                      listener.onComplete(response.body());
                  }
                  else if(statusCode == 401) {
-                     Log.d("Unsplash", "Unauthorized, Check your client Id");
+                     Log.d(TAG, "Unauthorized, Check your client Id");
                  }
              }
 
@@ -180,12 +187,13 @@ private Callback<Photo> getSinglePhotoCallback(final OnPhotoLoadedListener liste
             @Override
             public void onResponse(Call<Photo> call, Response<Photo> response) {
                 int statusCode = response.code();
+                Log.d(TAG, "Status Code = " + statusCode);
                 if(statusCode == 200) {
                     Photo photo = response.body();
                     listener.onComplete(photo);
                 }
                 else if(statusCode == 401) {
-                    Log.d("Unsplash", "Unauthorized, Check your client Id");
+                    Log.d(TAG, "Unauthorized, Check your client Id");
                 }
             }
 
@@ -201,17 +209,20 @@ private Callback<List<Photo>> getMultiplePhotoCallback(final OnPhotosLoadedListe
             @Override
             public void onResponse(Call<List<Photo>> call, Response<List<Photo>> response) {
                 int statusCode = response.code();
+                Log.d(TAG, "Url = " + call.request().url());
+                Log.d(TAG, "Status Code = " + statusCode);
                 if(statusCode == 200) {
                     List<Photo> photos = response.body();
                     listener.onComplete(photos);
                 }
                 else if(statusCode == 401) {
-                    Log.d("Unsplash", "Unauthorized, Check your client Id");
+                    Log.d(TAG, "Unauthorized, Check your client Id");
                 }
             }
 
             @Override
             public void onFailure(Call<List<Photo>> call, Throwable t) {
+                Log.d(TAG, "Url = " + call.request().url());
                 listener.onError(t.getMessage());
             }
         };
@@ -222,12 +233,13 @@ private Callback<Collection> getSingleCollectionCallback(final OnCollectionLoade
             @Override
             public void onResponse(Call<Collection> call, Response<Collection> response) {
                 int statusCode = response.code();
+                Log.d(TAG, "Status Code = " + statusCode);
                 if(statusCode == 200) {
                     Collection collections = response.body();
                     listener.onComplete(collections);
                 }
                 else if(statusCode == 401) {
-                    Log.d("Unsplash", "Unauthorized, Check your client Id");
+                    Log.d(TAG, "Unauthorized, Check your client Id");
                 }
             }
 
@@ -238,17 +250,40 @@ public void onFailure(Call<Collection> call, Throwable t) {
         };
     }
 
+    private Callback<SearchResults> getSearchResultsCallback(final OnSearchCompleteListener listener){
+        return new Callback<SearchResults>() {
+            @Override
+            public void onResponse(Call<SearchResults> call, Response<SearchResults> response) {
+                int statusCode = response.code();
+                Log.d(TAG, "Status Code = " + statusCode);
+                if(statusCode == 200) {
+                    SearchResults results = response.body();
+                    listener.onComplete(results);
+                }
+                else if(statusCode == 401) {
+                    Log.d(TAG, "Unauthorized, Check your client Id");
+                }
+            }
+
+            @Override
+            public void onFailure(Call<SearchResults> call, Throwable t) {
+                listener.onError(t.getMessage());
+            }
+        };
+    }
+
     private Callback<List<Collection>> getMultipleCollectionsCallback(final OnCollectionsLoadedListener listener){
         return new Callback<List<Collection>>() {
             @Override
             public void onResponse(Call<List<Collection>> call, Response<List<Collection>> response) {
                 int statusCode = response.code();
+                Log.d(TAG, "Status Code = " + statusCode);
                 if(statusCode == 200) {
                     List<Collection> collections = response.body();
                     listener.onComplete(collections);
                 }
                 else if(statusCode == 401) {
-                    Log.d("Unsplash", "Unauthorized, Check your client Id");
+                    Log.d(TAG, "Unauthorized, Check your client Id");
                 }
             }
 
@@ -260,15 +295,21 @@ public void onFailure(Call<List<Collection>> call, Throwable t) {
     }
 
     public interface OnPhotosLoadedListener {
-        public void onComplete(List<Photo> photos);
+        void onComplete(List<Photo> photos);
 
-        public void onError(String error);
+        void onError(String error);
+    }
+
+    public interface OnSearchCompleteListener {
+        void onComplete(SearchResults results);
+
+        void onError(String error);
     }
 
     public interface OnPhotoLoadedListener {
-        public void onComplete(Photo photo);
+        void onComplete(Photo photo);
 
-        public void onError(String error);
+        void onError(String error);
     }
 
     public interface OnLinkLoadedListener {

androidunsplash/src/main/java/com/kc/unsplash/api/endpoints/PhotosEndpointInterface.java

@@ -1,6 +1,7 @@
 package com.kc.unsplash.api.endpoints;
 
 import com.kc.unsplash.models.Photo;
+import com.kc.unsplash.models.SearchResults;
 
 import java.util.List;
 
@@ -39,5 +40,5 @@ Call<List<Photo>> getRandomPhotos(@Query("collections") String collections,
     Call<String> getPhotoDownloadLink(@Path("id") String id);
 
     @GET("search/photos")
-    Call<List<Photo>> searchPhotos(@Query("query") String query, @Query("page") Integer page, @Query("per_page") Integer perPage);
+    Call<SearchResults> searchPhotos(@Query("query") String query, @Query("page") Integer page, @Query("per_page") Integer perPage);
 }