updated the callback classes

app/build.gradle

@@ -73,8 +73,11 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
     implementation project(path: ':woodroid')
 
+//    implementation 'com.github.gilokimu:woodroid:0.2.0'
+
     implementation 'de.hdodenhof:circleimageview:2.1.0'
 
     implementation 'com.romandanylyk:pageindicatorview:0.2.0@aar'

woodroid/src/main/java/me/gilo/woodroid/callback/WooCall.java

@@ -1,9 +1,6 @@
 package me.gilo.woodroid.callback;
 
-import android.arch.lifecycle.LiveData;
 import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 
 public interface WooCall<T> extends Call<T> {
 

woodroid/src/main/java/me/gilo/woodroid/data/api/CartAPI.java

@@ -1,13 +1,11 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
+import retrofit2.Call;
 import me.gilo.woodroid.models.LineItem;
 import me.gilo.woodroid.models.filters.CartFilter;
-import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.List;
 import java.util.Map;
 
 public interface CartAPI {

woodroid/src/main/java/me/gilo/woodroid/data/api/CouponAPI.java

@@ -2,11 +2,9 @@ package me.gilo.woodroid.data.api;
 
 
 import me.gilo.woodroid.models.Coupon;
-import me.gilo.woodroid.models.Product;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/CustomerAPI.java

@@ -1,13 +1,11 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
 import me.gilo.woodroid.models.Customer;
 import me.gilo.woodroid.models.Download;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/OrderAPI.java

@@ -1,12 +1,10 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
 import me.gilo.woodroid.models.Order;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/OrderNoteAPI.java

@@ -1,13 +1,10 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
-import me.gilo.woodroid.models.Order;
 import me.gilo.woodroid.models.OrderNote;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/PaymentGatewayAPI.java

@@ -1,7 +1,7 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.callback.WooCall;
+import retrofit2.Call;
 import me.gilo.woodroid.models.PaymentGateway;
 import retrofit2.http.*;
 
@@ -11,13 +11,13 @@ public interface PaymentGatewayAPI {
 
 
     @GET("payment_gateways/{id}")
-    WooCall<PaymentGateway> view(@Path("id") int id);
+    Call<PaymentGateway> view(@Path("id") int id);
 
     @GET("payment_gateways")
-    WooCall<List<PaymentGateway>> list();
+    Call<List<PaymentGateway>> list();
 
     @Headers("Content-Type: application/json")
     @PUT("payment_gateways")
-    WooCall<PaymentGateway> update(@Path("id") String id, @Body PaymentGateway body);
+    Call<PaymentGateway> update(@Path("id") String id, @Body PaymentGateway body);
 
 }

woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeAPI.java

@@ -2,11 +2,9 @@ package me.gilo.woodroid.data.api;
 
 
 import me.gilo.woodroid.models.Attribute;
-import me.gilo.woodroid.models.Coupon;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeTermAPI.java

@@ -5,7 +5,6 @@ import me.gilo.woodroid.models.AttributeTerm;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/ProductCategoryAPI.java

@@ -2,11 +2,9 @@ package me.gilo.woodroid.data.api;
 
 
 import me.gilo.woodroid.models.Category;
-import me.gilo.woodroid.models.Coupon;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/ProductReviewAPI.java

@@ -1,14 +1,10 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.data.callbacks.ReviewsData;
-import me.gilo.woodroid.models.Coupon;
-import me.gilo.woodroid.models.Product;
 import me.gilo.woodroid.models.ProductReview;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/ProductTagAPI.java

@@ -1,12 +1,10 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
 import me.gilo.woodroid.models.Tag;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/ProductVariationAPI.java

@@ -1,14 +1,11 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
-import me.gilo.woodroid.models.OrderNote;
 import me.gilo.woodroid.models.Product;
 import me.gilo.woodroid.models.Variation;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/RefundAPI.java

@@ -1,13 +1,10 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
-import me.gilo.woodroid.models.OrderNote;
 import me.gilo.woodroid.models.Refund;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/ReportAPI.java

@@ -3,7 +3,8 @@ package me.gilo.woodroid.data.api;
 
 import me.gilo.woodroid.models.report.*;
 import retrofit2.Call;
-import retrofit2.http.*;
+import retrofit2.http.GET;
+import retrofit2.http.QueryMap;
 
 import java.util.List;
 import java.util.Map;

woodroid/src/main/java/me/gilo/woodroid/data/api/SettingsAPI.java

@@ -1,29 +1,27 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.callback.WooCall;
-import me.gilo.woodroid.models.*;
 import retrofit2.Call;
+import me.gilo.woodroid.models.SettingGroup;
+import me.gilo.woodroid.models.SettingOption;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public interface SettingsAPI {
 
     @GET("settings")
-    WooCall<List<SettingGroup>> settings();
+    Call<List<SettingGroup>> settings();
 
     @GET("settings/{group_id}/{id}")
-    WooCall<SettingOption> option(@Path("group_id") String group_id, @Path("id") String option_id);
+    Call<SettingOption> option(@Path("group_id") String group_id, @Path("id") String option_id);
 
     @GET("settings/{id}")
-    WooCall<List<SettingOption>> options(@Path("id") String group_id);
+    Call<List<SettingOption>> options(@Path("id") String group_id);
 
     @Headers("Content-Type: application/json")
     @PUT("settings/{group_id}/{id}")
-    WooCall<SettingOption> update(
+    Call<SettingOption> update(
             @Path("group_id") String group_id,
             @Path("id") String option_id,
             @Body SettingOption body

woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingClassAPI.java

@@ -1,12 +1,10 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
 import me.gilo.woodroid.models.ShippingClass;
 import retrofit2.Call;
 import retrofit2.http.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingMethodAPI.java

@@ -1,21 +1,19 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.callback.WooCall;
-import me.gilo.woodroid.models.Coupon;
-import me.gilo.woodroid.models.ShippingMethod;
 import retrofit2.Call;
-import retrofit2.http.*;
+import me.gilo.woodroid.models.ShippingMethod;
+import retrofit2.http.GET;
+import retrofit2.http.Path;
 
 import java.util.List;
-import java.util.Map;
 
 public interface ShippingMethodAPI {
 
     @GET("shipping_methods/{id}")
-    WooCall<ShippingMethod> view(@Path("id") String id);
+    Call<ShippingMethod> view(@Path("id") String id);
 
     @GET("shipping_methods")
-    WooCall<List<ShippingMethod>> list();
+    Call<List<ShippingMethod>> list();
 
 }

woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingZoneAPI.java

@@ -1,7 +1,6 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
 import me.gilo.woodroid.models.ShippingZone;
 import retrofit2.Call;
 import retrofit2.http.*;

woodroid/src/main/java/me/gilo/woodroid/data/api/TaxClassAPI.java

@@ -1,7 +1,6 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
 import me.gilo.woodroid.models.TaxClass;
 import retrofit2.Call;
 import retrofit2.http.*;

woodroid/src/main/java/me/gilo/woodroid/data/api/TaxRateAPI.java

@@ -1,7 +1,6 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.Coupon;
 import me.gilo.woodroid.models.TaxRate;
 import retrofit2.Call;
 import retrofit2.http.*;

woodroid/src/main/java/me/gilo/woodroid/data/api/WebhookAPI.java

@@ -1,7 +1,8 @@
 package me.gilo.woodroid.data.api;
 
 
-import me.gilo.woodroid.models.*;
+import me.gilo.woodroid.models.Webhook;
+import me.gilo.woodroid.models.WebhookDelivery;
 import retrofit2.Call;
 import retrofit2.http.*;
 

woodroid/src/main/java/me/gilo/woodroid/repo/APIMethod.java

@@ -1,6 +1,7 @@
 package me.gilo.woodroid.repo;
 
-import me.gilo.woodroid.models.Coupon;
+
+
 import retrofit2.Call;
 
 import java.util.List;

woodroid/src/main/java/me/gilo/woodroid/repo/CartRepository.java

@@ -3,14 +3,13 @@ package me.gilo.woodroid.repo;
 import android.content.Context;
 import me.gilo.woodroid.data.api.CartAPI;
 import me.gilo.woodroid.data.cookie.AddCookiesInterceptor;
-import me.gilo.woodroid.data.cookie.DemoCookieInterceptor;
 import me.gilo.woodroid.data.cookie.ReceivedCookiesInterceptor;
 import me.gilo.woodroid.models.LineItem;
 import me.gilo.woodroid.models.filters.CartFilter;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
-import retrofit2.Call;
 import retrofit2.Retrofit;
+import retrofit2.Call;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 import java.util.Map;

woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java

@@ -9,8 +9,6 @@ import me.gilo.woodroid.repo.order.OrderNoteRepository;
 import me.gilo.woodroid.repo.order.RefundRepository;
 import retrofit2.Call;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
 import java.util.List;
 
 public class OrderRepository extends WooRepository {

woodroid/src/main/java/me/gilo/woodroid/repo/PaymentGatewayRepository.java

@@ -1,6 +1,7 @@
 package me.gilo.woodroid.repo;
 
-import me.gilo.woodroid.callback.WooCall;
+import retrofit2.Call;
+
 import me.gilo.woodroid.data.api.PaymentGatewayAPI;
 import me.gilo.woodroid.models.PaymentGateway;
 
@@ -15,15 +16,15 @@ public class PaymentGatewayRepository extends WooRepository{
        apiService = retrofit.create(PaymentGatewayAPI.class);
     }
 
-    public WooCall<PaymentGateway> paymentGateway(int id) {
+    public Call<PaymentGateway> paymentGateway(int id) {
         return apiService.view(id);
     }
 
-    public WooCall<List<PaymentGateway>> paymentGateways() {
+    public Call<List<PaymentGateway>> paymentGateways() {
         return apiService.list();
     }
 
-    public WooCall<PaymentGateway> update(String id, PaymentGateway paymentGateway) {
+    public Call<PaymentGateway> update(String id, PaymentGateway paymentGateway) {
         return apiService.update(id, paymentGateway);
     }
 

woodroid/src/main/java/me/gilo/woodroid/repo/SettingsRepository.java

@@ -1,11 +1,9 @@
 package me.gilo.woodroid.repo;
 
-import me.gilo.woodroid.callback.WooCall;
+import retrofit2.Call;
 import me.gilo.woodroid.data.api.SettingsAPI;
-import me.gilo.woodroid.data.api.ShippingMethodAPI;
 import me.gilo.woodroid.models.SettingGroup;
 import me.gilo.woodroid.models.SettingOption;
-import me.gilo.woodroid.models.ShippingMethod;
 
 import java.util.List;
 
@@ -18,19 +16,19 @@ public class SettingsRepository extends WooRepository{
        apiService = retrofit.create(SettingsAPI.class);
     }
 
-    public WooCall<List<SettingGroup>> settings() {
+    public Call<List<SettingGroup>> settings() {
         return apiService.settings();
     }
 
-    public WooCall<SettingOption> option(String group_id, String option_id) {
+    public Call<SettingOption> option(String group_id, String option_id) {
         return apiService.option(group_id, option_id);
     }
 
-    public WooCall<List<SettingOption>> options(String group_id) {
+    public Call<List<SettingOption>> options(String group_id) {
         return apiService.options(group_id);
     }
 
-    public WooCall<SettingOption> updateOption(String group_id, String option_id, SettingOption option) {
+    public Call<SettingOption> updateOption(String group_id, String option_id, SettingOption option) {
         return apiService.update(group_id, option_id, option);
     }
 

woodroid/src/main/java/me/gilo/woodroid/repo/ShippingMethodRepository.java

@@ -1,9 +1,7 @@
 package me.gilo.woodroid.repo;
 
-import me.gilo.woodroid.callback.WooCall;
+import retrofit2.Call;
-import me.gilo.woodroid.data.api.PaymentGatewayAPI;
 import me.gilo.woodroid.data.api.ShippingMethodAPI;
-import me.gilo.woodroid.models.PaymentGateway;
 import me.gilo.woodroid.models.ShippingMethod;
 
 import java.util.List;
@@ -17,11 +15,11 @@ public class ShippingMethodRepository extends WooRepository{
        apiService = retrofit.create(ShippingMethodAPI.class);
     }
 
-    public WooCall<ShippingMethod> shippingMethod(String id) {
+    public Call<ShippingMethod> shippingMethod(String id) {
         return apiService.view(id);
     }
 
-    public WooCall<List<ShippingMethod>> shippingMethods() {
+    public Call<List<ShippingMethod>> shippingMethods() {
         return apiService.list();
     }