|
@@ -58,6 +58,7 @@ public class StyleParamsParser {
|
58
|
58
|
result.titleBarSubtitleFontSize = getInt("titleBarSubtitleFontSize", getDefaultSubtitleTextFontSize());
|
59
|
59
|
result.titleBarSubtitleFontFamily = getFont("titleBarSubtitleFontFamily", getDefaultSubtitleFontFamily());
|
60
|
60
|
result.titleBarButtonColor = getColor("titleBarButtonColor", getTitleBarButtonColor());
|
|
61
|
+ result.titleBarButtonFontFamily = getFont("titleBarButtonFontFamily", getDefaultTitleBarButtonFont());
|
61
|
62
|
result.titleBarDisabledButtonColor = getColor("titleBarDisabledButtonColor", getTitleBarDisabledButtonColor());
|
62
|
63
|
result.titleBarTitleFont = getFont("titleBarTitleFontFamily", getDefaultTitleTextFontFamily());
|
63
|
64
|
result.titleBarTitleFontSize = getInt("titleBarTitleFontSize", getDefaultTitleTextFontSize());
|
|
@@ -118,6 +119,7 @@ public class StyleParamsParser {
|
118
|
119
|
result.bottomTabFontFamily = new StyleParams.Font();
|
119
|
120
|
result.titleBarTitleFont = new StyleParams.Font();
|
120
|
121
|
result.titleBarSubtitleFontFamily = new StyleParams.Font();
|
|
122
|
+ result.titleBarButtonFontFamily = new StyleParams.Font();
|
121
|
123
|
result.titleBarHeight = -1;
|
122
|
124
|
return result;
|
123
|
125
|
}
|
|
@@ -294,6 +296,10 @@ public class StyleParamsParser {
|
294
|
296
|
return AppStyle.appStyle == null ? new StyleParams.Font() : AppStyle.appStyle.titleBarSubtitleFontFamily;
|
295
|
297
|
}
|
296
|
298
|
|
|
299
|
+ private StyleParams.Font getDefaultTitleBarButtonFont() {
|
|
300
|
+ return AppStyle.appStyle == null ? new StyleParams.Font() : AppStyle.appStyle.titleBarButtonFontFamily;
|
|
301
|
+ }
|
|
302
|
+
|
297
|
303
|
private boolean getDefaultTitleTextFontBold() {
|
298
|
304
|
return AppStyle.appStyle != null && AppStyle.appStyle.titleBarTitleFontBold;
|
299
|
305
|
}
|