Merge branch 'Philipinho:master' into master

Author: rvullriede

src/main/java/com/litesoftwares/coingecko/CoinGeckoApiClient.java

@@ -37,6 +37,8 @@ Map<String, Map<String, Double>> getTokenPrice(String id, String contractAddress
 
     List<CoinMarkets> getCoinMarkets(String vsCurrency,  String ids, String order,  Integer perPage, Integer page,  boolean sparkline, String priceChangePercentage);
 
+    List<CoinMarkets> getCoinMarkets(String vsCurrency,  String ids, String category, String order,  Integer perPage, Integer page,  boolean sparkline, String priceChangePercentage);
+
     CoinFullData getCoinById(String id);
 
     CoinFullData getCoinById(String id, boolean localization, boolean tickers, boolean marketData, boolean communityData, boolean developerData, boolean sparkline);

src/main/java/com/litesoftwares/coingecko/CoinGeckoApiService.java

@@ -46,6 +46,7 @@ Call<Map<String,Map<String, Double>>> getTokenPrice(@Path("id") String id, @Quer
 
     @GET("coins/markets")
     Call<List<CoinMarkets>> getCoinMarkets(@Query("vs_currency") String vsCurrency, @Query("ids") String ids,
+                                           @Query("category") String category,
                                            @Query("order") String order, @Query("per_page") Integer perPage,
                                            @Query("page") Integer page, @Query("sparkline") boolean sparkline,
                                            @Query("price_change_percentage") String priceChangePercentage);

src/main/java/com/litesoftwares/coingecko/domain/Coins/CoinMarkets.java

@@ -44,12 +44,20 @@ public class CoinMarkets {
     private BigDecimal circulatingSupply;
     @JsonProperty("total_supply")
     private BigDecimal totalSupply;
+    @JsonProperty("max_supply")
+    private BigDecimal maxSupply;
     @JsonProperty("ath")
     private BigDecimal ath;
     @JsonProperty("ath_change_percentage")
     private BigDecimal athChangePercentage;
     @JsonProperty("ath_date")
     private String athDate;
+    @JsonProperty("atl")
+    private BigDecimal atl;
+    @JsonProperty("atl_change_percentage")
+    private BigDecimal atlChangePercentage;
+    @JsonProperty("atl_date")
+    private String atlDate;
     @JsonProperty("roi")
     private Roi roi;
     @JsonProperty("last_updated")
@@ -58,6 +66,17 @@ public class CoinMarkets {
     private SparklineIn7d sparklineIn7d;
     @JsonProperty("price_change_percentage_1h_in_currency")
     private BigDecimal priceChangePercentage1hInCurrency;
-
+    @JsonProperty("price_change_percentage_24h_in_currency")
+    private BigDecimal priceChangePercentage24hInCurrency;
+    @JsonProperty("price_change_percentage_7d_in_currency")
+    private BigDecimal priceChangePercentage7dInCurrency;
+    @JsonProperty("price_change_percentage_14d_in_currency")
+    private BigDecimal priceChangePercentage14dInCurrency;
+    @JsonProperty("price_change_percentage_30d_in_currency")
+    private BigDecimal priceChangePercentage30dInCurrency;
+    @JsonProperty("price_change_percentage_200d_in_currency")
+    private BigDecimal priceChangePercentage200dInCurrency;
+    @JsonProperty("price_change_percentage_1y_in_currency")
+    private BigDecimal priceChangePercentage1yInCurrency;
 }
 

src/main/java/com/litesoftwares/coingecko/impl/CoinGeckoApiClientImpl.java

@@ -83,7 +83,12 @@ public List<CoinMarkets> getCoinMarkets(String vsCurrency) {
 
     @Override
     public List<CoinMarkets> getCoinMarkets(String vsCurrency, String ids, String order, Integer perPage, Integer page, boolean sparkline, String priceChangePercentage) {
-        return coinGeckoApi.executeSync(coinGeckoApiService.getCoinMarkets(vsCurrency,ids,order,perPage,page,sparkline,priceChangePercentage));
+        return getCoinMarkets(vsCurrency,ids,null,order,perPage,page,sparkline,priceChangePercentage);
+    }
+
+    @Override
+    public List<CoinMarkets> getCoinMarkets(String vsCurrency, String ids, String category,  String order, Integer perPage, Integer page, boolean sparkline, String priceChangePercentage) {
+        return coinGeckoApi.executeSync(coinGeckoApiService.getCoinMarkets(vsCurrency,ids,category,order,perPage,page,sparkline,priceChangePercentage));
     }
 
     @Override