Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  make use of icon object in account model
  • Loading branch information
Martin Domke committed Sep 11, 2019
2 parents 143483f + 5c7e7fa commit 1c3c92d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 28 deletions.
6 changes: 3 additions & 3 deletions src/main/java/me/figo/models/Account.java
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public class Account {
* Account icon URL
*/
@Expose(serialize = false)
private String icon;
private Icon icon;

/**
* Account balance details
Expand Down Expand Up @@ -255,9 +255,9 @@ public AccountBalance getBalance() {
}

/**
* @return the account icon URL
* @return the account icon
*/
public String getIconUrl() {
public Icon getIcon() {
return icon;
}

Expand Down
25 changes: 0 additions & 25 deletions src/main/java/me/figo/models/CatalogBank.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,31 +78,6 @@ public List<CatalogBank> getBanks() {

}

public static class Icon {

@Expose
private Map<String,String> resolutions;

@Expose
private String url;

public Map<String, String> getResolutions() {
return resolutions;
}

public void setResolutions(Map<String, String> resolutions) {
this.resolutions = resolutions;
}

public String getUrl() {
return url;
}

public void setUrl(String url) {
this.url = url;
}
}

/**
* @return bank icon URL
*/
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/me/figo/models/Icon.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package me.figo.models;

import java.util.Map;

import com.google.gson.annotations.Expose;

public class Icon {

@Expose
private Map<String,String> resolutions;

@Expose
private String url;

public Map<String, String> getResolutions() {
return resolutions;
}

public void setResolutions(Map<String, String> resolutions) {
this.resolutions = resolutions;
}

public String getUrl() {
return url;
}

public void setUrl(String url) {
this.url = url;
}
}

0 comments on commit 1c3c92d

Please sign in to comment.