|
@@ -31,7 +31,7 @@ public class TitleOptions {
|
31
|
31
|
options.fontSize = FractionParser.parse(json, "fontSize");
|
32
|
32
|
options.fontFamily = typefaceManager.getTypeFace(json.optString("fontFamily", ""));
|
33
|
33
|
options.component = TextParser.parse(json, "component");
|
34
|
|
- options.alignment = Alignment.fromString(TextParser.parse(json, "alignment").get(""));
|
|
34
|
+ options.componentAlignment = Alignment.fromString(TextParser.parse(json, "componentAlignment").get(""));
|
35
|
35
|
|
36
|
36
|
validate(options);
|
37
|
37
|
|
|
@@ -43,7 +43,7 @@ public class TitleOptions {
|
43
|
43
|
public Fraction fontSize = new NullFraction();
|
44
|
44
|
@Nullable public Typeface fontFamily;
|
45
|
45
|
public Text component = new NullText();
|
46
|
|
- public Alignment alignment = Alignment.Default;
|
|
46
|
+ public Alignment componentAlignment = Alignment.Default;
|
47
|
47
|
|
48
|
48
|
void mergeWith(final TitleOptions other) {
|
49
|
49
|
if (other.text.hasValue()) text = other.text;
|
|
@@ -51,7 +51,7 @@ public class TitleOptions {
|
51
|
51
|
if (other.fontSize.hasValue()) fontSize = other.fontSize;
|
52
|
52
|
if (other.fontFamily != null) fontFamily = other.fontFamily;
|
53
|
53
|
if (other.component.hasValue()) component = other.component;
|
54
|
|
- if (other.alignment != Alignment.Default) alignment = other.alignment;
|
|
54
|
+ if (other.componentAlignment != Alignment.Default) componentAlignment = other.componentAlignment;
|
55
|
55
|
validate(this);
|
56
|
56
|
}
|
57
|
57
|
|
|
@@ -61,7 +61,7 @@ public class TitleOptions {
|
61
|
61
|
if (!fontSize.hasValue()) fontSize = defaultOptions.fontSize;
|
62
|
62
|
if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
|
63
|
63
|
if (!component.hasValue()) component = defaultOptions.component;
|
64
|
|
- if (alignment == Alignment.Default) alignment = defaultOptions.alignment;
|
|
64
|
+ if (componentAlignment == Alignment.Default) componentAlignment = defaultOptions.componentAlignment;
|
65
|
65
|
validate(this);
|
66
|
66
|
}
|
67
|
67
|
|