Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ private byte[] applyDataReplacements(String targetPath, byte[] sourceData) throw
content = injectLocalizationBootstrap(targetPath, content);
}
if (isBareTemplate() && "common/src/main/css/theme.css".equals(targetPath)) {
content = ensureDefaultLargeTextScale(content);
content += buildThemeCss();
}
if ("common/pom.xml".equals(targetPath)) {
Expand Down Expand Up @@ -431,6 +432,27 @@ private boolean isBareTemplate() {
return template == Template.BAREBONES || template == Template.KOTLIN;
}

private static String ensureDefaultLargeTextScale(String css) {
if (css.indexOf("useLargerTextScaleBool") >= 0) {
return css;
}
int constantsStart = css.indexOf("#Constants");
if (constantsStart < 0) {
return css + "\n\n#Constants {\n useLargerTextScaleBool: true;\n}\n";
}
int blockStart = css.indexOf('{', constantsStart);
if (blockStart < 0) {
return css;
}
int blockEnd = css.indexOf('}', blockStart);
if (blockEnd < 0) {
return css;
}
return css.substring(0, blockEnd)
+ " useLargerTextScaleBool: true;\n"
+ css.substring(blockEnd);
}

private String buildReadmeMarkdown() {
StringBuilder out = new StringBuilder();
out.append("# Codename One Project\n\n")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,19 @@ private void validateCombination(Template template, IDE ide) throws Exception {
assertCommonPom(entries, template, packageName, mainClassName, false);
assertSettings(entries, template, packageName, mainClassName, false);
assertMainSourceFile(entries, template, packageName, mainClassName, false);
assertThemeDefaults(entries, template);
assertLocalizationBundles(entries, template, false);
assertNoTemplatePlaceholders(entries, template);
}

private void assertThemeDefaults(Map<String, byte[]> entries, Template template) {
if (template != Template.BAREBONES && template != Template.KOTLIN) {
return;
}
String themeCss = getText(entries, "common/src/main/css/theme.css");
assertContains(themeCss, "useLargerTextScaleBool: true;", "Barebones templates should default useLargerTextScaleBool to true");
}

private static byte[] createProjectZip(IDE ide, Template template, String appName, String packageName) throws IOException {
ByteArrayOutputStream output = new ByteArrayOutputStream();
GeneratorModel.create(ide, template, appName, packageName).writeProjectZip(output);
Expand Down
Loading