|
@@ -30,6 +30,7 @@ public class FabOptions {
|
30
|
30
|
if (json.has("icon")) {
|
31
|
31
|
options.icon = TextParser.parse(json.optJSONObject("icon"), "uri");
|
32
|
32
|
}
|
|
33
|
+ options.iconColor = ColorParser.parse(json, "iconColor");
|
33
|
34
|
if (json.has("actions")) {
|
34
|
35
|
JSONArray fabsArray = json.optJSONArray("actions");
|
35
|
36
|
for (int i = 0; i < fabsArray.length(); i++) {
|
|
@@ -49,6 +50,7 @@ public class FabOptions {
|
49
|
50
|
public Colour clickColor = new NullColor();
|
50
|
51
|
public Colour rippleColor = new NullColor();
|
51
|
52
|
public Text icon = new NullText();
|
|
53
|
+ public Colour iconColor = new NullColor();
|
52
|
54
|
public Bool visible = new NullBool();
|
53
|
55
|
public ArrayList<FabOptions> actionsArray = new ArrayList<>();
|
54
|
56
|
public Text alignHorizontally = new NullText();
|
|
@@ -75,6 +77,9 @@ public class FabOptions {
|
75
|
77
|
if (other.icon.hasValue()) {
|
76
|
78
|
icon = other.icon;
|
77
|
79
|
}
|
|
80
|
+ if (other.iconColor.hasValue()) {
|
|
81
|
+ iconColor = other.iconColor;
|
|
82
|
+ }
|
78
|
83
|
if (other.actionsArray.size() > 0) {
|
79
|
84
|
actionsArray = other.actionsArray;
|
80
|
85
|
}
|
|
@@ -111,6 +116,9 @@ public class FabOptions {
|
111
|
116
|
if (!icon.hasValue()) {
|
112
|
117
|
icon = defaultOptions.icon;
|
113
|
118
|
}
|
|
119
|
+ if (!iconColor.hasValue()) {
|
|
120
|
+ iconColor = defaultOptions.iconColor;
|
|
121
|
+ }
|
114
|
122
|
if (actionsArray.size() == 0) {
|
115
|
123
|
actionsArray = defaultOptions.actionsArray;
|
116
|
124
|
}
|