craft-native 0.0.233 → 0.0.235

package/dist/android/templates/MainActivityNative.kt.template

@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.database.ContentObserver
 import android.content.Intent
 import android.app.PictureInPictureParams
@@ -3631,6 +3632,34 @@ private class CraftNativeSideBorderDrawable(
     override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
 }
 
+/** Protects only the native three-button region; content keeps its authored background. */
+private class CraftNativeNavigationBarProtection : Drawable() {
+    private val paint = Paint()
+    private var left = 0
+    private var right = 0
+    private var bottom = 0
+
+    fun update(color: Int, left: Int, right: Int, bottom: Int) {
+        if (paint.color == color && this.left == left && this.right == right && this.bottom == bottom) return
+        paint.color = color
+        this.left = left
+        this.right = right
+        this.bottom = bottom
+        invalidateSelf()
+    }
+
+    override fun draw(canvas: Canvas) {
+        if (left > 0) canvas.drawRect(bounds.left.toFloat(), bounds.top.toFloat(), (bounds.left + left).toFloat(), bounds.bottom.toFloat(), paint)
+        if (right > 0) canvas.drawRect((bounds.right - right).toFloat(), bounds.top.toFloat(), bounds.right.toFloat(), bounds.bottom.toFloat(), paint)
+        if (bottom > 0) canvas.drawRect(bounds.left.toFloat(), (bounds.bottom - bottom).toFloat(), bounds.right.toFloat(), bounds.bottom.toFloat(), paint)
+    }
+
+    override fun setAlpha(alpha: Int) { paint.alpha = alpha; invalidateSelf() }
+    override fun setColorFilter(filter: ColorFilter?) { paint.colorFilter = filter; invalidateSelf() }
+    @Suppress("DEPRECATION")
+    override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
+}
+
 /** WebView-free host for a route bundle compiled by `stx native compile`. */
 class MainActivity : AppCompatActivity() {
     private class Screen(
@@ -3805,6 +3834,8 @@ class MainActivity : AppCompatActivity() {
     private var initialDeepLinkClaimed = false
     private var defaultTextColor = Color.WHITE
     private var windowSafeInsets = intArrayOf(0, 0, 0, 0)
+    private var navigationButtonInsets = intArrayOf(0, 0, 0)
+    private val navigationBarProtection = CraftNativeNavigationBarProtection()
     private var useMessagePorts = false
     private val imageExecutor = Executors.newFixedThreadPool(2)
     private val imageCache by lazy { CraftNativeImageCache(File(cacheDir, "craft-native-images")) }
@@ -3844,10 +3875,17 @@ class MainActivity : AppCompatActivity() {
         if (savedInstanceState == null) pendingNotificationTap = notificationTap(intent)
         setContentView(R.layout.activity_main)
         root = findViewById(R.id.native_root)
+        root.foreground = navigationBarProtection
         ViewCompat.setOnApplyWindowInsetsListener(root) { view, insets ->
             val safe = insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout())
             val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
             windowSafeInsets = intArrayOf(safe.left, safe.top, safe.right, safe.bottom)
+            val tappable = insets.getInsets(WindowInsetsCompat.Type.tappableElement())
+            val buttons = intArrayOf(tappable.left, tappable.right, tappable.bottom)
+            if (!navigationButtonInsets.contentEquals(buttons)) {
+                navigationButtonInsets = buttons
+                visibleScreen?.let(::applyScreenBackground)
+            }
             keyboardInset = max(0, ime.bottom - safe.bottom)
             updateSafeAreaViews()
             updateKeyboardAvoidingViews()
@@ -4576,13 +4614,33 @@ class MainActivity : AppCompatActivity() {
         // only the visible one may change the colour behind system bars.
         if (visibleScreen === screen) {
             root.setBackgroundColor(background)
+            // Android 15's launcher taskbar can retain system-themed button
+            // colours even when the app requests another icon appearance.
+            // Match that palette only behind tappable navigation buttons.
+            // Gesture navigation and authored screen/status backgrounds stay
+            // edge-to-edge; no global theme or system setting is changed.
+            val protectButtons = Build.VERSION.SDK_INT >= 35 && navigationButtonInsets.any { it > 0 }
+            val systemNight = Resources.getSystem().configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+            val navigationBackground = if (protectButtons) {
+                getColor(if (systemNight) android.R.color.system_neutral1_900 else android.R.color.system_neutral1_50)
+            } else background
+            navigationBarProtection.update(navigationBackground,
+                if (protectButtons) navigationButtonInsets[0] else 0,
+                if (protectButtons) navigationButtonInsets[1] else 0,
+                if (protectButtons) navigationButtonInsets[2] else 0)
             WindowCompat.getInsetsController(window, window.decorView)
-                .isAppearanceLightNavigationBars = Color.luminance(background) >= 0.5f
+                .isAppearanceLightNavigationBars = Color.luminance(navigationBackground) >= 0.5f
             // Android 15+ draws the root behind transparent system bars.
             // Older releases still paint separate window bar surfaces.
             if (Build.VERSION.SDK_INT < 35) {
                 window.statusBarColor = background
                 window.navigationBarColor = background
+            } else {
+                // Android 15 still overlays a three-button scrim by
+                // default. The root already paints this inset and the
+                // glyph appearance above follows its actual luminance.
+                window.navigationBarColor = Color.TRANSPARENT
+                window.isNavigationBarContrastEnforced = false
             }
         }
     }

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.233";
+var version = "0.0.235";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -309,7 +309,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.233";
+var version = "0.0.235";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -57,7 +57,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.233";
+var version = "0.0.235";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/src/index.d.ts

@@ -503,7 +503,10 @@ export declare function installRuntime(output: string, runtimeDir: string): Prom
  * valid Swift type.
  */
 export declare function productName(name: string): string;
-/** Restore package-owned Swift into an existing project, without changing its Xcode metadata or bundled screens. */
+/** Restore package-owned Swift, retaining Xcode metadata and bundled screens.
+ * Xcode Cloud assigns the distributed build number independently of the source
+ * config; keep the packaged runtime identity in step with Apple's build.
+ */
 export declare function restoreShell(output: string): void;
 export { assertNoApplicationSwiftSources, findApplicationSwiftSources } from './source-audit.js';
 export declare function init(options: InitOptions): Promise<void>;

package/dist/ios/src/index.js

@@ -1057,8 +1057,17 @@ function productName(name) {
   return /^\d/.test(joined) ? `App${joined}` : joined;
 }
 function restoreShell(output) {
-  const config = JSON.parse(readFileSync2(join3(output, "craft.config.json"), "utf8"));
+  const file = join3(output, "craft.config.json");
+  const config = JSON.parse(readFileSync2(file, "utf8"));
+  const cloudBuild = process.env.CI_BUILD_NUMBER;
+  if (cloudBuild !== undefined) {
+    if (!/^[1-9]\d*$/.test(cloudBuild) || cloudBuild.trim() !== cloudBuild)
+      throw new Error("CI_BUILD_NUMBER must be a positive integer");
+    config.buildNumber = cloudBuild;
+  }
   writeShell(output, config);
+  if (cloudBuild !== undefined)
+    writeFileSync2(file, JSON.stringify(config, null, 2));
 }
 function writeShell(output, config) {
   if (!config.appName || !/^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/.test(config.bundleId))

package/dist/ios/templates/CraftNativeScreen.swift

@@ -7454,7 +7454,6 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         var traits: UIAccessibilityTraits = []
         switch type {
         case "Slider", "Picker", "DatePicker": traits.insert(.adjustable)
-        case "Switch": traits.insert(.button)
         default: break
         }
         switch role ?? type.lowercased() {
@@ -7496,7 +7495,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // that is what UI tests and VoiceOver read focus from. Setting them
         // froze them, so it read as static text that never had focus ("neither
         // element nor any descendant has keyboard focus"); it keeps its own.
-        if view is UITextView { return }
+        // UISwitch also owns its native identity and enabled/on state.
+        // Assigning .button changes its legacy AX type into a button while
+        // modern XCTest still identifies its UIKit class as a switch.
+        if view is UITextView || view is UISwitch { return }
         view.accessibilityTraits = traits
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.233",
+  "version": "0.0.235",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",