Rebuild native themes via CSS compiler (phase 2: module split)

.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

@@ -94,6 +94,13 @@
 public class Tabs extends Container {
     private final Container contentPane = new Container(new TabsLayout());
     private final Container tabsContainer;
+    /// Optional wrapper around `tabsContainer` whose only job is to absorb the
+    /// safe-area inset when the theme opts out of internal safe-area padding
+    /// via the `tabsSafeAreaBool` constant. With the wrapper present, the
+    /// pill (`tabsContainer`) draws tightly while the wrapper's padding keeps
+    /// the pill clear of the home indicator. `null` for legacy themes that
+    /// keep the safe-area inset on the pill itself.
+    private Container tabsContainerHost;
     private final ButtonGroup radioGroup = new ButtonGroup();
     private final ActionListener press;
     private final ActionListener drag;
@@ -151,11 +158,37 @@ public Tabs(int tabP) {
         contentPane.setUIID("TabbedPane");
         super.addComponent(BorderLayout.CENTER, contentPane);
         tabsContainer = new Container();
-        tabsContainer.setSafeArea(true);
+        // tabsSafeAreaBool=true (default): legacy / flush-bar themes keep the
+        // safe-area inset as PADDING on the pill itself - the bar's
+        // background reaches the screen edge with tabs sitting above the
+        // home indicator.
+        //
+        // tabsSafeAreaBool=false (modern floating pill): the safe-area inset
+        // moves to a wrapper container so the pill draws tightly and is
+        // pushed up away from the indicator without extending its own
+        // background into the indicator zone.
+        boolean tabsSafeAreaOnPill = getUIManager().isThemeConstant("tabsSafeAreaBool", true);
+        tabsContainer.setSafeArea(tabsSafeAreaOnPill);
         tabsContainer.setUIID("TabsContainer");
         tabsContainer.setScrollVisible(false);
         tabsContainer.getStyle().setMargin(0, 0, 0, 0);
+        if (!tabsSafeAreaOnPill) {
+            tabsContainerHost = new Container(new BorderLayout());
+            tabsContainerHost.setUIID("Container");
+            tabsContainerHost.setSafeArea(true);
+            tabsContainerHost.add(BorderLayout.CENTER, tabsContainer);
+        }
         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 +249,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);
+            }
         }
     }
 
@@ -588,11 +633,28 @@ protected Component createTab(String title, Font font, char icon, float size) {
         if (tabUIID != null) {
             b.setUIID(tabUIID);
         }
+        applyTabIconUIID(b);
         b.setFontIcon(font, icon, size);
         createTabImpl(b);
         return b;
     }
 
+    /// Detaches the tab's icon style from the Button's selection-state styles.
+    /// FontImage.setIcon copies the Button's unselected/selected/pressed styles
+    /// to render four icon variants - which means the icon image carries the
+    /// Button's bgColor and bgTransparency. With a `cn1-pill-border` selected
+    /// background, that produces a visible square fill behind the glyph that
+    /// doesn't follow the pill's rounded shape. Reading `tabIconUIID` from the
+    /// theme lets a theme route the icon styling to a separate UIID
+    /// (typically `TabIcon`) where it can be declared transparent. Themes that
+    /// don't define the constant get the legacy behavior unchanged.
+    private void applyTabIconUIID(Component b) {
+        String iconUiid = getUIManager().getThemeConstant("tabIconUIID", null);
+        if (iconUiid != null && iconUiid.length() > 0 && b instanceof Label) {
+            ((Label) b).setIconUIID(iconUiid);
+        }
+    }
+
     /// Creates a tab component by default this is a RadioButton but subclasses can use this to return anything
     ///
     /// #### Parameters
@@ -606,6 +668,7 @@ protected Component createTab(String title, Font font, char icon, float size) {
     /// component instance
     protected Component createTab(String title, Image icon) {
         RadioButton b = new RadioButton(title != null ? title : "", icon);
+        applyTabIconUIID(b);
         createTabImpl(b);
         return b;
     }
@@ -1135,22 +1198,23 @@ public void setTabPlacement(int tabPlacement) {
                 tabPlacement != BOTTOM && tabPlacement != RIGHT) {
             throw new IllegalArgumentException("illegal tab placement: must be TOP, BOTTOM, LEFT, or RIGHT");
         }
-        if (this.tabPlacement == tabPlacement && tabsContainer.getParent() == null && isInitialized()) {
+        Container slotComponent = tabsContainerHost != null ? tabsContainerHost : tabsContainer;
+        if (this.tabPlacement == tabPlacement && slotComponent.getParent() == null && isInitialized()) {
             return;
         }
         this.tabPlacement = tabPlacement;
-        removeComponent(tabsContainer);
+        removeComponent(slotComponent);
 
         setTabsLayout(tabPlacement);
 
         if (tabPlacement == TOP) {
-            super.addComponent(BorderLayout.NORTH, tabsContainer);
+            super.addComponent(BorderLayout.NORTH, slotComponent);
         } else if (tabPlacement == BOTTOM) {
-            super.addComponent(BorderLayout.SOUTH, tabsContainer);
+            super.addComponent(BorderLayout.SOUTH, slotComponent);
         } else if (tabPlacement == LEFT) {
-            super.addComponent(BorderLayout.WEST, tabsContainer);
+            super.addComponent(BorderLayout.WEST, slotComponent);
         } else { // RIGHT
-            super.addComponent(BorderLayout.EAST, tabsContainer);
+            super.addComponent(BorderLayout.EAST, slotComponent);
         }
 
         initTabsFocus();
@@ -1238,7 +1302,7 @@ protected void selectTab(Component tab) {
 
     /// Hide the tabs bar
     public void hideTabs() {
-        removeComponent(tabsContainer);
+        removeComponent(tabsContainerHost != null ? tabsContainerHost : tabsContainer);
         revalidateLater();
     }
 

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);
             }
         }