craft-native 0.0.192 → 0.0.194

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

@@ -571,6 +571,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     val content = FrameLayout(context)
     private val bar = LinearLayout(context)
     private val backButton = ImageView(context)
+    private val leadingButtons = LinearLayout(context)
     private val titleView = TextView(context)
     private val largeTitleView = TextView(context)
     private val buttons = LinearLayout(context)
@@ -609,6 +610,9 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         backButton.background = rippleBackground()
         backButton.setOnClickListener { onBack?.invoke() }
         bar.addView(backButton, LayoutParams(dp(48), dp(48)))
+        leadingButtons.orientation = HORIZONTAL
+        leadingButtons.gravity = Gravity.CENTER_VERTICAL
+        bar.addView(leadingButtons, LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, dp(56)))
         titleView.textSize = 20f
         titleView.typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
         titleView.isSingleLine = true
@@ -717,6 +721,12 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         largeTitleView.text = title
         largeTitleView.visibility = if (!hidden && large && title.isNotBlank()) View.VISIBLE else View.GONE
         buttons.removeAllViews()
+        leadingButtons.removeAllViews()
+        val leading = options.optJSONArray("leftButtons") ?: JSONArray()
+        for (index in 0 until leading.length()) {
+            val button = leading.optJSONObject(index) ?: continue
+            leadingButtons.addView(navButton(button))
+        }
         val list = options.optJSONArray("rightButtons") ?: JSONArray()
         for (index in 0 until list.length()) {
             val button = list.optJSONObject(index) ?: continue
@@ -796,7 +806,6 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             icon.foreground = vector
             icon.text = if (vector != null) "" else number ?: CraftNativeSymbols.glyph(tabs[index].symbol)
         }
-        for (index in 0 until buttons.childCount) (buttons.getChildAt(index) as? TextView)?.setTextColor(accent)
     }
 
     private fun navButton(button: JSONObject): View {
@@ -805,7 +814,8 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         val symbol = button.optString("symbol")
         val view = TextView(context)
         val dark = Color.luminance(ContextCompat.getColor(context, R.color.background)) < 0.5
-        val tint = button.optString("color").takeIf { it.isNotBlank() }?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: accentColor(dark)
+        val defaultTint = if (button.optString("variant") == "neutral") { if (dark) Color.WHITE else Color.parseColor("#1C1C1E") } else accentColor(dark)
+        val tint = button.optString("color").takeIf { it.isNotBlank() }?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: defaultTint
         val vector = if (symbol.isNotBlank()) CraftNativeIcons.drawable(context, null, symbol, tint) else null
         view.text = if (vector != null) "" else if (symbol.isNotBlank()) CraftNativeSymbols.glyph(symbol) else title
         view.textSize = if (symbol.isNotBlank()) 22f else 16f

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

@@ -2458,6 +2458,8 @@ private data class LayoutBounds(
  */
 private class CraftNativeActivityIndicator(context: Context) :
     android.widget.ProgressBar(context, null, android.R.attr.progressBarStyleHorizontal) {
+    var indicatorScale = 1f
+
     init {
         val spinner = android.widget.ProgressBar(context).indeterminateDrawable
         indeterminateDrawable = spinner
@@ -4903,8 +4905,7 @@ class MainActivity : AppCompatActivity() {
                     is Number -> (requestedSize.toDouble() / 24.0).takeIf { it.isFinite() }?.toFloat()?.coerceAtLeast(0.5f) ?: 1f
                     else -> 1f
                 }
-                scaleX = scale
-                scaleY = scale
+                indicatorScale = scale
                 val animating = props.optBoolean("animating", true)
                 isIndeterminate = animating
                 visibility = if (!animating && props.optBoolean("hidesWhenStopped", true)) View.GONE else View.VISIBLE
@@ -5546,8 +5547,11 @@ class MainActivity : AppCompatActivity() {
     private fun applyTransform(view: View, transforms: JSONArray?) {
         view.translationX = 0f
         view.translationY = 0f
-        view.scaleX = 1f
-        view.scaleY = 1f
+        // Reconciliation reapplies transforms; start from the control's
+        // intrinsic scale rather than erasing its authored indicator size.
+        val intrinsicScale = (view as? CraftNativeActivityIndicator)?.indicatorScale ?: 1f
+        view.scaleX = intrinsicScale
+        view.scaleY = intrinsicScale
         view.rotation = 0f
         view.rotationX = 0f
         view.rotationY = 0f

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.192";
+var version = "0.0.194";
 
 // 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.192";
+var version = "0.0.194";
 
 // 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.192";
+var version = "0.0.194";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftNativeScreen.swift

@@ -726,6 +726,11 @@ private func craftNativeAlignContentCode(_ value: String) -> UInt32 {
     }
 }
 
+/// Keep the indicator's intrinsic size separate from authored style transforms.
+private final class CraftNativeActivityIndicatorView: UIActivityIndicatorView {
+    var indicatorScale: CGFloat = 1
+}
+
 /// A native screen's `<Video>`: AVPlayerViewController in place.
 ///
 /// With sound, a video takes the audio session as a playing sound does
@@ -4401,6 +4406,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 navigationController?.setNavigationBarHidden(hidden, animated: view.window != nil)
             }
         }
+        if options.keys.contains("leftButtons") {
+            let buttons = (options["leftButtons"] as? [[String: Any]]) ?? []
+            navigationItem.leftItemsSupplementBackButton = true
+            navigationItem.leftBarButtonItems = buttons.compactMap(navigationButton)
+        }
         if options.keys.contains("rightButtons") {
             let buttons = (options["rightButtons"] as? [[String: Any]]) ?? []
             navigationItem.rightBarButtonItems = buttons.compactMap(navigationButton).reversed()
@@ -4475,6 +4485,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         } else {
             item.accessibilityLabel = id
         }
+        if spec["variant"] as? String == "neutral" { item.tintColor = .label }
         if let tint = (spec["color"] as? String).flatMap({ UIColor(hex: $0) }) { item.tintColor = tint }
         // `image`: a picture (an https URL, the account's own photo), drawn
         // round as iOS draws an account button. The symbol or title shows
@@ -5510,7 +5521,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             updateHandler(nonEmptyHandler(events["onValueChange"]) ?? nonEmptyHandler(events["onChange"]), for: slider)
             updateAuxiliaryHandler(events["onSlidingComplete"], in: &sliderCompleteHandlers, for: slider)
         case "ActivityIndicator":
-            let indicator = result as! UIActivityIndicatorView
+            let indicator = result as! CraftNativeActivityIndicatorView
             let requestedSize = props["size"]
             indicator.style = (requestedSize as? String) == "large" ? .large : .medium
             let scale: CGFloat
@@ -5522,7 +5533,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             } else {
                 scale = 1
             }
-            indicator.transform = CGAffineTransform(scaleX: scale, y: scale)
+            indicator.indicatorScale = scale
             indicator.color = color(props["color"]) ?? .tintColor
             indicator.hidesWhenStopped = props["hidesWhenStopped"] as? Bool ?? true
             if props["animating"] as? Bool == false {
@@ -5728,7 +5739,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             slider.addTarget(self, action: #selector(sliderFinished(_:)), for: [.touchUpInside, .touchUpOutside, .touchCancel])
             return slider
         case "ActivityIndicator":
-            return UIActivityIndicatorView(style: .medium)
+            return CraftNativeActivityIndicatorView(style: .medium)
         case "StatusBar", "RefreshControl":
             return CraftNativeFlowView()
         case "Image":
@@ -6437,8 +6448,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     }
 
     private func applyTransform(_ raw: Any?, to view: UIView) {
-        view.transform = .identity
+        let intrinsicScale = (view as? CraftNativeActivityIndicatorView)?.indicatorScale ?? 1
         view.layer.transform = CATransform3DIdentity
+        view.transform = CGAffineTransform(scaleX: intrinsicScale, y: intrinsicScale)
         guard let transforms = raw as? [[String: Any]] else { return }
         var affine = CGAffineTransform.identity
         var threeDimensional = CATransform3DIdentity
@@ -6461,6 +6473,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 hasThreeDimensionalRotation = true
             }
         }
+        affine = affine.scaledBy(x: intrinsicScale, y: intrinsicScale)
         if hasThreeDimensionalRotation {
             view.layer.transform = CATransform3DConcat(CATransform3DMakeAffineTransform(affine), threeDimensional)
         } else {

package/package.json

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