Merge branch 'develop'

* develop:
  make use of icon object in account model

Author: Martin Domke

src/main/java/me/figo/models/Account.java

@@ -110,7 +110,7 @@ public class Account {
      * Account icon URL
      */
     @Expose(serialize = false)
-    private String icon;
+    private Icon icon;
 
     /**
      * Account balance details
@@ -255,9 +255,9 @@ public AccountBalance getBalance() {
     }
 
     /**
-     * @return the account icon URL
+     * @return the account icon 
      */
-    public String getIconUrl() {
+    public Icon getIcon() {
         return icon;
     }
 

src/main/java/me/figo/models/CatalogBank.java

@@ -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
 	 */

src/main/java/me/figo/models/Icon.java

@@ -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;
+	}
+}