[DIAGNOSTIC] Investigate iOS cn1-derive hang

.github/workflows/designer.yml

@@ -6,13 +6,15 @@ on:
       - master
     paths:
       - 'CodenameOneDesigner/**'
+      - 'maven/css-compiler/**'
       - 'maven/designer/**'
       - '.github/workflows/designer.yml'
   pull_request:
     branches:
       - master
     paths:
       - 'CodenameOneDesigner/**'
+      - 'maven/css-compiler/**'
       - 'maven/designer/**'
       - '.github/workflows/designer.yml'
 
@@ -38,30 +40,47 @@ jobs:
           wget https://github.com/codenameone/cn1-binaries/archive/refs/heads/master.zip
           unzip master.zip -d ..
           mv ../cn1-binaries-master ../cn1-binaries
+          mkdir -p maven/target
+          rm -rf maven/target/cn1-binaries
+          cp -R ../cn1-binaries maven/target/cn1-binaries
 
-      - name: Build core dependencies
+      - name: Build Designer (pulls in codenameone-css-compiler as dep)
+        env:
+          CN1_BINARIES: ${{ github.workspace }}/maven/target/cn1-binaries
         run: |
-          xvfb-run -a ant -noinput -buildfile Ports/CLDC11/build.xml jar
-          xvfb-run -a ant -noinput -buildfile Ports/JavaSE/build.xml jar
-          xvfb-run -a ant -noinput -buildfile Ports/JavaSEWithSVGSupport/build.xml jar
-          xvfb-run -a ant -noinput -buildfile CodenameOne/build.xml jar
-
-      - name: Run designer CSS localization tests
-        run: xvfb-run -a ant -noinput -buildfile CodenameOneDesigner/build.xml test-css-localization
+          cd maven
+          mvn -B -pl designer -am -DskipTests -Plocal-dev-javase \
+              -Dmaven.javadoc.skip=true -Dcn1.binaries="${CN1_BINARIES}" install
 
       - name: Run designer XML parser unit tests (Maven)
+        env:
+          CN1_BINARIES: ${{ github.workspace }}/maven/target/cn1-binaries
         run: |
-          mkdir -p maven/target
-          rm -rf maven/target/cn1-binaries
-          cp -R ../cn1-binaries maven/target/cn1-binaries
           cd maven
-          mvn -B -pl designer -am -DunitTests=true -Dcodename1.platform=javase -Plocal-dev-javase -Dmaven.javadoc.skip=true -Dmaven.antrun.skip=true -Dtest=SimpleXmlParserTest -DfailIfNoTests=false test
-
-      - name: Build designer release jar
-        run: xvfb-run -a ant -noinput -buildfile CodenameOneDesigner/build.xml release
+          mvn -B -pl designer -am -DunitTests=true -Dcodename1.platform=javase \
+              -Plocal-dev-javase -Dmaven.javadoc.skip=true -Dmaven.antrun.skip=true \
+              -Dcn1.binaries="${CN1_BINARIES}" \
+              -Dtest=SimpleXmlParserTest -DfailIfNoTests=false test
 
       - name: Verify designer CLI CSS compilation
         run: |
+          # The Maven-built jar-with-dependencies is a ZIP wrapper around the
+          # actual runnable designer_1.jar (see the antrun
+          # add-designer-jar-with-dependencies execution in maven/designer/pom.xml).
+          # Unpack and run the inner jar directly.
+          wrapped=$(ls maven/designer/target/codenameone-designer-*-jar-with-dependencies.jar | head -n1)
+          if [ -z "${wrapped}" ] || [ ! -f "${wrapped}" ]; then
+            echo "designer jar-with-dependencies not found" >&2
+            exit 1
+          fi
+          extract_dir="$(mktemp -d)"
+          unzip -q "${wrapped}" -d "${extract_dir}"
+          designer_jar="${extract_dir}/designer_1.jar"
+          if [ ! -f "${designer_jar}" ]; then
+            echo "designer_1.jar not found inside ${wrapped}" >&2
+            ls -la "${extract_dir}"
+            exit 1
+          fi
           tmp_dir="CodenameOneDesigner/tmp-cli-test"
           css_file="$tmp_dir/test.css"
           l10n_dir="$tmp_dir/localization"
@@ -75,12 +94,21 @@ jobs:
           cat <<'EOF' > "$l10n_dir/Strings.properties"
           greeting=Hello from CLI
           EOF
-          xvfb-run -a java -Dcli=true -jar CodenameOneDesigner/dist/designer.jar \
+          xvfb-run -a java -Dcli=true -jar "${designer_jar}" \
             -css -stateless -input "$css_file" -output "$output_file" -localization "$l10n_dir"
           test -s "$output_file"
 
+      - name: Verify native-themes CEF-free build
+        run: |
+          cd maven
+          mvn -B -pl css-compiler -am install -DskipTests -Dmaven.javadoc.skip=true -Plocal-dev-javase
+          cd ..
+          ./scripts/build-native-themes.sh
+          test -f Themes/iOSModernTheme.res || { echo "missing Themes/iOSModernTheme.res"; exit 1; }
+          test -f Themes/AndroidMaterialTheme.res || { echo "missing Themes/AndroidMaterialTheme.res"; exit 1; }
+
       - name: Upload designer jar artifact
         uses: actions/upload-artifact@v4
         with:
           name: designer-jar
-          path: CodenameOneDesigner/dist/designer.jar
+          path: maven/designer/target/codenameone-designer-*-jar-with-dependencies.jar

.github/workflows/pr.yml

@@ -89,6 +89,14 @@ jobs:
           cd maven
           mvn clean verify -DunitTests=true -pl core-unittests -am -Dmaven.javadoc.skip=true -Plocal-dev-javase $MVN_ARGS
           cd ..
+      - name: Build CSS compiler and smoke native-themes
+        run: |
+          cd maven
+          mvn -B -pl css-compiler -am install -DskipTests -Dmaven.javadoc.skip=true -Plocal-dev-javase
+          cd ..
+          ./scripts/build-native-themes.sh
+          test -f Themes/iOSModernTheme.res || { echo "missing Themes/iOSModernTheme.res"; exit 1; }
+          test -f Themes/AndroidMaterialTheme.res || { echo "missing Themes/AndroidMaterialTheme.res"; exit 1; }
       - name: Prepare Codename One binaries for Maven plugin tests
         run: |
           set -euo pipefail

.gitignore

@@ -67,6 +67,7 @@ node_modules
 **/genfiles.properties
 **/private/private.properties
 .idea/
+.claude/
 target
 pom.xml.versionsBackup
 pom.xml.releaseBackup

CodenameOne/src/com/codename1/io/Util.java

@@ -213,7 +213,7 @@ public static void copy(InputStream i, OutputStream o, int bufferSize) throws IO
         }
     }
 
-    /// Closes the object (connection, stream etc.) without throwing any exception, even if the
+/// Closes the object (connection, stream etc.) without throwing any exception, even if the
     /// object is null
     ///
     /// #### Parameters

CodenameOne/src/com/codename1/ui/Font.java

@@ -23,7 +23,6 @@
  */
 package com.codename1.ui;
 
-import com.codename1.impl.CodenameOneImplementation;
 
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -171,9 +170,7 @@ public class Font extends CN {
     }
 
     Font(int face, int style, int size) {
-        Display d = Display.getInstance();
-        CodenameOneImplementation i = d.getImplementation();
-        font = i.createFont(face, style, size);
+        font = Display.getInstance().getImplementation().createFont(face, style, size);
     }
 
     /// Returns a previously loaded bitmap font from cache

CodenameOne/src/com/codename1/ui/Tabs.java

@@ -156,6 +156,16 @@ public Tabs(int tabP) {
         tabsContainer.setScrollVisible(false);
         tabsContainer.getStyle().setMargin(0, 0, 0, 0);
         if (tabP == -1) {
+            // Honor the tabPlacementInt theme constant when no explicit
+            // placement was requested. Reading the constant here (rather
+            // than only in initLaf) guarantees the value is seen even
+            // when initLaf runs polymorphically from Component()'s super
+            // ctor - at that point the Tabs subclass fields haven't been
+            // initialised yet and writes to them are brittle.
+            int themePlacement = getUIManager().getThemeConstant("tabPlacementInt", -1);
+            if (themePlacement != -1) {
+                tabPlacement = themePlacement;
+            }
             setTabPlacement(tabPlacement);
         } else {
             setTabPlacement(tabP);
@@ -216,8 +226,20 @@ protected void initLaf(UIManager manager) {
             }
         }
         changeTabContainerStyleOnFocus = manager.isThemeConstant("changeTabContainerStyleOnFocusBool", false);
+        // tabPlacementInt lets a theme dictate whether tabs live at TOP /
+        // BOTTOM / LEFT / RIGHT. initLaf is called both during the
+        // Component() super() chain (before the Tabs ctor body has
+        // allocated tabsContainer) and again later when styles refresh.
+        // First call: tabsContainer is null, so just stash the value in
+        // the field; the ctor's setTabPlacement call at the end will
+        // pick it up and move the (then-allocated) container.
+        // Second call and beyond: container exists, so reparent it.
         if (tabPlace != -1) {
-            tabPlacement = tabPlace;
+            if (tabsContainer == null) {
+                tabPlacement = tabPlace;
+            } else if (tabPlace != tabPlacement) {
+                setTabPlacement(tabPlace);
+            }
         }
     }
 

CodenameOne/src/com/codename1/ui/plaf/DefaultLookAndFeel.java

@@ -2443,15 +2443,24 @@ private void updateCheckBoxConstants(UIManager m, boolean focus, String append)
             Style unsel = uim.createStyle("CheckBox.", "", false);
             Style sel = uim.createStyle("CheckBox.", "sel#", true);
             Style dis = uim.createStyle("CheckBox.", "dis#", false);
-            FontImage checkedDis = FontImage.createMaterial(FontImage.MATERIAL_CHECK_BOX, dis);
-            FontImage uncheckedDis = FontImage.createMaterial(FontImage.MATERIAL_CHECK_BOX_OUTLINE_BLANK, sel);
+            // Optional theme constants to swap the default Material
+            // check-box icons. Useful for platform-native looks (e.g.
+            // iOS modern uses CHECK_CIRCLE / RADIO_BUTTON_UNCHECKED
+            // for a rounded-circle aesthetic). Defaults to the legacy
+            // square check-box glyphs so existing themes are unaffected.
+            char checkedIcon = (char) uim.getThemeConstant(
+                    "checkBoxCheckedIconInt", FontImage.MATERIAL_CHECK_BOX);
+            char uncheckedIcon = (char) uim.getThemeConstant(
+                    "checkBoxUncheckedIconInt", FontImage.MATERIAL_CHECK_BOX_OUTLINE_BLANK);
+            FontImage checkedDis = FontImage.createMaterial(checkedIcon, dis);
+            FontImage uncheckedDis = FontImage.createMaterial(uncheckedIcon, sel);
             if (focus) {
-                FontImage checkedSelected = FontImage.createMaterial(FontImage.MATERIAL_CHECK_BOX, sel);
-                FontImage uncheckedSelected = FontImage.createMaterial(FontImage.MATERIAL_CHECK_BOX_OUTLINE_BLANK, sel);
+                FontImage checkedSelected = FontImage.createMaterial(checkedIcon, sel);
+                FontImage uncheckedSelected = FontImage.createMaterial(uncheckedIcon, sel);
                 setCheckBoxFocusImages(checkedSelected, uncheckedSelected, checkedDis, uncheckedDis);
             } else {
-                FontImage checkedUnselected = FontImage.createMaterial(FontImage.MATERIAL_CHECK_BOX, unsel);
-                FontImage uncheckedUnselected = FontImage.createMaterial(FontImage.MATERIAL_CHECK_BOX_OUTLINE_BLANK, unsel);
+                FontImage checkedUnselected = FontImage.createMaterial(checkedIcon, unsel);
+                FontImage uncheckedUnselected = FontImage.createMaterial(uncheckedIcon, unsel);
                 setCheckBoxImages(checkedUnselected, uncheckedUnselected, checkedDis, uncheckedDis);
             }
         }
@@ -2484,15 +2493,21 @@ private void updateRadioButtonConstants(UIManager m, boolean focus, String appen
             Style unsel = uim.createStyle("RadioButton.", "", false);
             Style sel = uim.createStyle("RadioButton.", "sel#", true);
             Style dis = uim.createStyle("RadioButton.", "dis#", false);
-            FontImage checkedDis = FontImage.createMaterial(FontImage.MATERIAL_RADIO_BUTTON_CHECKED, dis);
-            FontImage uncheckedDis = FontImage.createMaterial(FontImage.MATERIAL_RADIO_BUTTON_UNCHECKED, sel);
+            // Same override pattern as the check-box icons above -
+            // theme constants can swap the default circle glyphs.
+            char checkedIcon = (char) uim.getThemeConstant(
+                    "radioCheckedIconInt", FontImage.MATERIAL_RADIO_BUTTON_CHECKED);
+            char uncheckedIcon = (char) uim.getThemeConstant(
+                    "radioUncheckedIconInt", FontImage.MATERIAL_RADIO_BUTTON_UNCHECKED);
+            FontImage checkedDis = FontImage.createMaterial(checkedIcon, dis);
+            FontImage uncheckedDis = FontImage.createMaterial(uncheckedIcon, sel);
             if (focus) {
-                FontImage checkedSelected = FontImage.createMaterial(FontImage.MATERIAL_RADIO_BUTTON_CHECKED, sel);
-                FontImage uncheckedSelected = FontImage.createMaterial(FontImage.MATERIAL_RADIO_BUTTON_UNCHECKED, sel);
+                FontImage checkedSelected = FontImage.createMaterial(checkedIcon, sel);
+                FontImage uncheckedSelected = FontImage.createMaterial(uncheckedIcon, sel);
                 setRadioButtonFocusImages(checkedSelected, uncheckedSelected, checkedDis, uncheckedDis);
             } else {
-                FontImage checkedUnselected = FontImage.createMaterial(FontImage.MATERIAL_RADIO_BUTTON_CHECKED, unsel);
-                FontImage uncheckedUnselected = FontImage.createMaterial(FontImage.MATERIAL_RADIO_BUTTON_UNCHECKED, unsel);
+                FontImage checkedUnselected = FontImage.createMaterial(checkedIcon, unsel);
+                FontImage uncheckedUnselected = FontImage.createMaterial(uncheckedIcon, unsel);
                 setRadioButtonImages(checkedUnselected, uncheckedUnselected, checkedDis, uncheckedDis);
             }
         }

CodenameOne/src/com/codename1/ui/plaf/UIManager.java

@@ -551,6 +551,7 @@ public Style parseComponentCustomStyle(Resources theme, String baseStyle, String
     private Style getComponentStyleImpl(String id, boolean selected, String prefix) {
         try {
             Style style = null;
+            Log.p("CN1SS:DIAG:getComponentStyleImpl.enter id=" + id + " selected=" + selected + " prefix=" + prefix);
 
             if (id == null || id.length() == 0) {
                 //if no id return the default style
@@ -1587,6 +1588,35 @@ private Font scaleFontByFactor(Font font, float factor) {
         }
     }
 
+    /// Invalidates the cached Style instances and re-runs the theme build pass
+    /// against the currently installed theme properties. Callers use this after
+    /// state changes that affect style resolution (notably `Display.setDarkMode`,
+    /// which makes `$Dark<UIID>` entries eligible) without reloading the theme
+    /// from a resource file. Components styled after this call resolve against
+    /// the refreshed theme; already-resolved Style references on existing
+    /// components keep their old values until those components re-fetch their
+    /// styles.
+    public void refreshTheme() {
+        if (!accessible || themeProps == null) {
+            return;
+        }
+        Hashtable props = new Hashtable();
+        for (String key : themeProps.keySet()) {
+            props.put(key, themeProps.get(key));
+        }
+        // buildTheme strips `@`-prefixed constants into themeConstants and
+        // drops them from the main themeProps map. Round-tripping through
+        // setThemePropsImpl would therefore lose every constant - so
+        // re-add them from themeConstants with the `@` restored, matching
+        // the shape buildTheme expects on input.
+        if (themeConstants != null) {
+            for (String key : themeConstants.keySet()) {
+                props.put("@" + key, themeConstants.get(key));
+            }
+        }
+        setThemePropsImpl(props);
+    }
+
     /// Returns a theme constant defined in the resource editor
     ///
     /// #### Parameters
@@ -2040,9 +2070,12 @@ private Style createStyle(String id, String prefix, boolean selected, boolean al
         if (useDarkStyle) {
             id = "$Dark" + id;
         }
+        Log.p("CN1SS:DIAG:createStyle.enter id=" + id + " selected=" + selected + " allowDark=" + allowDarkStyle);
 
         String baseStyle = (String) themeProps.get(id + "derive");
+        Log.p("CN1SS:DIAG:createStyle.derive id=" + id + " baseStyle=" + baseStyle);
         if (baseStyle == null && useDarkStyle) {
+            Log.p("CN1SS:DIAG:createStyle.darkRecurse id=" + id);
             style = new Style(createStyle(originalId, prefix, selected, false));
         } else {
             style = null;
@@ -2057,9 +2090,13 @@ private Style createStyle(String id, String prefix, boolean selected, boolean al
                 if (pos > -1) {
                     String baseId = baseStyle.substring(0, pos);
                     String basePrefix = baseStyle.substring(pos + 1);
+                    Log.p("CN1SS:DIAG:createStyle.deriveImpl id=" + id + " -> " + baseId + " prefix=" + basePrefix);
                     style = new Style(getComponentStyleImpl(baseId, basePrefix.indexOf("sel") > -1, basePrefix));
+                    Log.p("CN1SS:DIAG:createStyle.deriveImpl.done id=" + id);
                 } else {
+                    Log.p("CN1SS:DIAG:createStyle.deriveBase id=" + id + " -> getComponentStyle(" + baseStyle + ")");
                     style = new Style(getComponentStyle(baseStyle));
+                    Log.p("CN1SS:DIAG:createStyle.deriveBase.done id=" + id);
                 }
             } else {
                 if (selected) {
@@ -2075,6 +2112,7 @@ private Style createStyle(String id, String prefix, boolean selected, boolean al
                 style = new Style(defaultStyle);
             }
         }
+        Log.p("CN1SS:DIAG:createStyle.props id=" + id);
         if (themeProps != null) {
             String bgColor;
             String fgColor;

CodenameOneDesigner/src/com/codename1/designer/AddThemeResource.java

@@ -26,6 +26,7 @@
 package com.codename1.designer;
 
 import com.codename1.ui.util.EditableResources;
+import com.codename1.ui.util.EditableResourcesEditor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Hashtable;
@@ -198,7 +199,7 @@ public String addResource(EditableResources res, ResourceEditorView view) {
         InputStream is = getClass().getResourceAsStream("/templates/" + template.getSelectedItem().toString() + ".res");
         if(is != null) {
             try {
-                EditableResources r = new EditableResources();
+                EditableResources r = new EditableResourcesEditor();
                 r.openFile(is);
                 is.close();
                 theme = r.getTheme(r.getThemeResourceNames()[0]);

CodenameOneDesigner/src/com/codename1/designer/AddUIResource.java

@@ -26,6 +26,7 @@
 package com.codename1.designer;
 
 import com.codename1.ui.util.EditableResources;
+import com.codename1.ui.util.EditableResourcesEditor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Hashtable;
@@ -199,7 +200,7 @@ public String addResource(EditableResources res, ResourceEditorView view) {
         InputStream is = getClass().getResourceAsStream("/templates/" + template.getSelectedItem().toString() + ".res");
         if(is != null) {
             try {
-                EditableResources r = new EditableResources();
+                EditableResources r = new EditableResourcesEditor();
                 r.openFile(is);
                 is.close();
                 ui = r.getResourceObject("Main");