Fixed CSS when setting accents or modes

Author: shai-almog

scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java

@@ -19,6 +19,22 @@
 
 public class GeneratorModel {
     private static final String CN1_PLUGIN_VERSION = "7.0.227";
+    private static final String PREVIEW_BUTTON_SELECTOR =
+            "Button, InitializrLiveButtonDarkClean, "
+                    + "InitializrLiveButtonLightTealRound, InitializrLiveButtonLightTealSquare, "
+                    + "InitializrLiveButtonDarkTealRound, InitializrLiveButtonDarkTealSquare, "
+                    + "InitializrLiveButtonLightBlueRound, InitializrLiveButtonLightBlueSquare, "
+                    + "InitializrLiveButtonDarkBlueRound, InitializrLiveButtonDarkBlueSquare, "
+                    + "InitializrLiveButtonLightOrangeRound, InitializrLiveButtonLightOrangeSquare, "
+                    + "InitializrLiveButtonDarkOrangeRound, InitializrLiveButtonDarkOrangeSquare";
+    private static final String PREVIEW_BUTTON_PRESSED_SELECTOR =
+            "Button.pressed, InitializrLiveButtonDarkClean.pressed, "
+                    + "InitializrLiveButtonLightTealRound.pressed, InitializrLiveButtonLightTealSquare.pressed, "
+                    + "InitializrLiveButtonDarkTealRound.pressed, InitializrLiveButtonDarkTealSquare.pressed, "
+                    + "InitializrLiveButtonLightBlueRound.pressed, InitializrLiveButtonLightBlueSquare.pressed, "
+                    + "InitializrLiveButtonDarkBlueRound.pressed, InitializrLiveButtonDarkBlueSquare.pressed, "
+                    + "InitializrLiveButtonLightOrangeRound.pressed, InitializrLiveButtonLightOrangeSquare.pressed, "
+                    + "InitializrLiveButtonDarkOrangeRound.pressed, InitializrLiveButtonDarkOrangeSquare.pressed";
     private static final String GENERATED_GITIGNORE =
             "**/target/\n" +
             ".idea/\n" +
@@ -550,11 +566,21 @@ private static String normalizeCustomCss(String css) {
 
     public static String normalizeCustomCssForCompiler(String css) {
         String out = css;
+        out = expandPreviewButtonAliases(out);
         out = replaceKnownNamedColors(out);
         out = addAlignFallback(out);
         return out;
     }
 
+    private static String expandPreviewButtonAliases(String css) {
+        String out = css;
+        out = StringUtil.replaceAll(out, "Button.pressed {", PREVIEW_BUTTON_PRESSED_SELECTOR + " {");
+        out = StringUtil.replaceAll(out, "Button.pressed{", PREVIEW_BUTTON_PRESSED_SELECTOR + "{");
+        out = StringUtil.replaceAll(out, "Button {", PREVIEW_BUTTON_SELECTOR + " {");
+        out = StringUtil.replaceAll(out, "Button{", PREVIEW_BUTTON_SELECTOR + "{");
+        return out;
+    }
+
     private static String replaceKnownNamedColors(String css) {
         String out = css;
         out = replaceCssColorValue(out, "pink", "#ffc0cb");

scripts/initializr/common/src/test/java/com/codename1/initializr/InitializrThemeInteractionTest.java

@@ -80,6 +80,22 @@ public boolean runTest() throws Exception {
                 "Named color 'pink' should normalize and apply in preview");
         assertEqual(Component.CENTER, pinkCenteredHello.getUnselectedStyle().getAlignment(),
                 "text-align: center should apply in preview");
+
+        clickByLabel("DARK");
+        clickByLabel("TEAL");
+        Button pinkDarkTealHello = getPreviewHelloButton();
+        assertEqual("InitializrLiveButtonDarkTealRound", pinkDarkTealHello.getUIID(),
+                "Mode/accent toggles should still update UIID after pink custom CSS");
+        assertEqual(0xffc0cb, pinkDarkTealHello.getUnselectedStyle().getFgColor(),
+                "Button selector custom color should apply even in dark/teal mode");
+        assertEqual(Component.CENTER, pinkDarkTealHello.getUnselectedStyle().getAlignment(),
+                "Button selector custom alignment should apply even in dark/teal mode");
+
+        clickByLabel("LIGHT");
+        clickByLabel("CLEAN");
+        Button pinkBackToCleanHello = getPreviewHelloButton();
+        assertEqual(0xffc0cb, pinkBackToCleanHello.getUnselectedStyle().getFgColor(),
+                "Button selector custom color should still apply after returning to clean mode");
         return true;
     }