From b87f96d336ba7169a907584df0c08514f0eaee42 Mon Sep 17 00:00:00 2001 From: Gilbert Kimutai Date: Wed, 17 Apr 2019 04:58:55 +0300 Subject: [PATCH] updated the callback classes --- app/build.gradle | 3 +++ .../java/me/gilo/woodroid/callback/WooCall.java | 3 --- .../java/me/gilo/woodroid/data/api/CartAPI.java | 4 +--- .../java/me/gilo/woodroid/data/api/CouponAPI.java | 2 -- .../me/gilo/woodroid/data/api/CustomerAPI.java | 2 -- .../java/me/gilo/woodroid/data/api/OrderAPI.java | 2 -- .../me/gilo/woodroid/data/api/OrderNoteAPI.java | 3 --- .../gilo/woodroid/data/api/PaymentGatewayAPI.java | 8 ++++---- .../woodroid/data/api/ProductAttributeAPI.java | 2 -- .../woodroid/data/api/ProductAttributeTermAPI.java | 1 - .../gilo/woodroid/data/api/ProductCategoryAPI.java | 2 -- .../gilo/woodroid/data/api/ProductReviewAPI.java | 4 ---- .../me/gilo/woodroid/data/api/ProductTagAPI.java | 2 -- .../woodroid/data/api/ProductVariationAPI.java | 3 --- .../java/me/gilo/woodroid/data/api/RefundAPI.java | 3 --- .../java/me/gilo/woodroid/data/api/ReportAPI.java | 3 ++- .../me/gilo/woodroid/data/api/SettingsAPI.java | 14 ++++++-------- .../gilo/woodroid/data/api/ShippingClassAPI.java | 2 -- .../gilo/woodroid/data/api/ShippingMethodAPI.java | 12 +++++------- .../me/gilo/woodroid/data/api/ShippingZoneAPI.java | 1 - .../me/gilo/woodroid/data/api/TaxClassAPI.java | 1 - .../java/me/gilo/woodroid/data/api/TaxRateAPI.java | 1 - .../java/me/gilo/woodroid/data/api/WebhookAPI.java | 3 ++- .../main/java/me/gilo/woodroid/repo/APIMethod.java | 3 ++- .../java/me/gilo/woodroid/repo/CartRepository.java | 3 +-- .../me/gilo/woodroid/repo/OrderRepository.java | 2 -- .../woodroid/repo/PaymentGatewayRepository.java | 9 +++++---- .../me/gilo/woodroid/repo/SettingsRepository.java | 12 +++++------- .../woodroid/repo/ShippingMethodRepository.java | 8 +++----- 29 files changed, 39 insertions(+), 79 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d1a77e5..f1bd7c5 100644 --- a/app/build.gradle +++ b/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' diff --git a/woodroid/src/main/java/me/gilo/woodroid/callback/WooCall.java b/woodroid/src/main/java/me/gilo/woodroid/callback/WooCall.java index 59323b7..ae1c2f9 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/callback/WooCall.java +++ b/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 extends Call { diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/CartAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/CartAPI.java index ca4772a..f040349 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/CartAPI.java +++ b/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 { diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/CouponAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/CouponAPI.java index a278f44..e7f6dbf 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/CouponAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/CustomerAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/CustomerAPI.java index ffd2ec3..150721a 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/CustomerAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/OrderAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/OrderAPI.java index 9d4c836..128ed11 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/OrderAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/OrderNoteAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/OrderNoteAPI.java index 8e22156..d9e82df 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/OrderNoteAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/PaymentGatewayAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/PaymentGatewayAPI.java index 4d1a607..16306cc 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/PaymentGatewayAPI.java +++ b/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 view(@Path("id") int id); + Call view(@Path("id") int id); @GET("payment_gateways") - WooCall> list(); + Call> list(); @Headers("Content-Type: application/json") @PUT("payment_gateways") - WooCall update(@Path("id") String id, @Body PaymentGateway body); + Call update(@Path("id") String id, @Body PaymentGateway body); } \ No newline at end of file diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeAPI.java index 849c391..878d2cb 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeTermAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeTermAPI.java index bcfef17..1060e25 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductAttributeTermAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductCategoryAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductCategoryAPI.java index ba3ddf5..3b35a22 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductCategoryAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductReviewAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductReviewAPI.java index e0b87d9..7a25a68 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductReviewAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductTagAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductTagAPI.java index acdbb83..4310e51 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductTagAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductVariationAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductVariationAPI.java index ff356b2..13b9ae5 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ProductVariationAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/RefundAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/RefundAPI.java index 2d93fe7..f54730e 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/RefundAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ReportAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ReportAPI.java index dd0d268..32fa2a9 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ReportAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/SettingsAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/SettingsAPI.java index 3f2b584..049e743 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/SettingsAPI.java +++ b/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> settings(); + Call> settings(); @GET("settings/{group_id}/{id}") - WooCall option(@Path("group_id") String group_id, @Path("id") String option_id); + Call option(@Path("group_id") String group_id, @Path("id") String option_id); @GET("settings/{id}") - WooCall> options(@Path("id") String group_id); + Call> options(@Path("id") String group_id); @Headers("Content-Type: application/json") @PUT("settings/{group_id}/{id}") - WooCall update( + Call update( @Path("group_id") String group_id, @Path("id") String option_id, @Body SettingOption body diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingClassAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingClassAPI.java index 52b728c..aceb6ce 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingClassAPI.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingMethodAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingMethodAPI.java index 79058b4..06713be 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingMethodAPI.java +++ b/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 view(@Path("id") String id); + Call view(@Path("id") String id); @GET("shipping_methods") - WooCall> list(); + Call> list(); } \ No newline at end of file diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingZoneAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingZoneAPI.java index eaa3e47..89aa173 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/ShippingZoneAPI.java +++ b/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.*; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/TaxClassAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/TaxClassAPI.java index e945438..91d23d2 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/TaxClassAPI.java +++ b/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.*; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/TaxRateAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/TaxRateAPI.java index 1ca3b87..34d385e 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/TaxRateAPI.java +++ b/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.*; diff --git a/woodroid/src/main/java/me/gilo/woodroid/data/api/WebhookAPI.java b/woodroid/src/main/java/me/gilo/woodroid/data/api/WebhookAPI.java index 19530f5..c92f1b7 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/data/api/WebhookAPI.java +++ b/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.*; diff --git a/woodroid/src/main/java/me/gilo/woodroid/repo/APIMethod.java b/woodroid/src/main/java/me/gilo/woodroid/repo/APIMethod.java index 76bff2d..e77a07d 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/repo/APIMethod.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/repo/CartRepository.java b/woodroid/src/main/java/me/gilo/woodroid/repo/CartRepository.java index 8cd59fa..5defb95 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/repo/CartRepository.java +++ b/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; diff --git a/woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java b/woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java index 7eefe86..e6e2951 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java +++ b/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 { diff --git a/woodroid/src/main/java/me/gilo/woodroid/repo/PaymentGatewayRepository.java b/woodroid/src/main/java/me/gilo/woodroid/repo/PaymentGatewayRepository.java index 8155908..b3e15f5 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/repo/PaymentGatewayRepository.java +++ b/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(int id) { + public Call paymentGateway(int id) { return apiService.view(id); } - public WooCall> paymentGateways() { + public Call> paymentGateways() { return apiService.list(); } - public WooCall update(String id, PaymentGateway paymentGateway) { + public Call update(String id, PaymentGateway paymentGateway) { return apiService.update(id, paymentGateway); } diff --git a/woodroid/src/main/java/me/gilo/woodroid/repo/SettingsRepository.java b/woodroid/src/main/java/me/gilo/woodroid/repo/SettingsRepository.java index dcbad44..f436a04 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/repo/SettingsRepository.java +++ b/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> settings() { + public Call> settings() { return apiService.settings(); } - public WooCall option(String group_id, String option_id) { + public Call option(String group_id, String option_id) { return apiService.option(group_id, option_id); } - public WooCall> options(String group_id) { + public Call> options(String group_id) { return apiService.options(group_id); } - public WooCall updateOption(String group_id, String option_id, SettingOption option) { + public Call updateOption(String group_id, String option_id, SettingOption option) { return apiService.update(group_id, option_id, option); } diff --git a/woodroid/src/main/java/me/gilo/woodroid/repo/ShippingMethodRepository.java b/woodroid/src/main/java/me/gilo/woodroid/repo/ShippingMethodRepository.java index adac752..ebbca4f 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/repo/ShippingMethodRepository.java +++ b/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 me.gilo.woodroid.data.api.PaymentGatewayAPI; +import retrofit2.Call; 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(String id) { + public Call shippingMethod(String id) { return apiService.view(id); } - public WooCall> shippingMethods() { + public Call> shippingMethods() { return apiService.list(); }