craft-native 0.0.226 → 0.0.227

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

@@ -643,6 +643,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private var accessorySpec: JSONObject? = null
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
     private val tabIconText = mutableMapOf<String, String>()
+    private val tabTitles = mutableMapOf<String, String>()
+    private val tabAccessibilityLabels = mutableMapOf<String, String>()
+    private val tabIconTints = mutableMapOf<String, Int>()
+    private val tabIconPulses = mutableSetOf<String>()
     private val tabImageURLs = mutableMapOf<String, String>()
     private val tabImages = mutableMapOf<String, android.graphics.drawable.Drawable>()
     private val navButtonSpecs = mutableMapOf<TextView, JSONObject>()
@@ -706,6 +710,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             cell.gravity = Gravity.CENTER
             cell.background = rippleBackground()
             cell.contentDescription = tab.title
+            cell.tag = "craft-tab-${tab.id}"
             val icon = TextView(context)
             icon.text = CraftNativeSymbols.glyph(tab.symbol)
             icon.textSize = 22f
@@ -716,6 +721,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             val label = TextView(context)
             label.text = tab.title
             label.textSize = 12f
+            label.fontFeatureSettings = "tnum"
             label.gravity = Gravity.CENTER
             label.isSingleLine = true
             cell.addView(icon, LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT))
@@ -844,12 +850,25 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         val id = item.optString("id")
         val index = tabs.indexOfFirst { it.id == id }
         if (index < 0) return
-        val cell = tabBar.getChildAt(index)
-        if (item.has("accessibilityLabel")) cell.contentDescription = item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() } ?: tabs[index].title
+        if (item.has("accessibilityLabel")) {
+            tabAccessibilityLabels.remove(id)
+            item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() }?.let { tabAccessibilityLabels[id] = it.take(160) }
+        }
         if (item.has("iconText")) {
             tabIconText.remove(id)
             item.optString("iconText").takeUnless { item.isNull("iconText") || it.isBlank() }?.let { tabIconText[id] = it.take(8) }
         }
+        if (item.has("title")) {
+            tabTitles.remove(id)
+            item.optString("title").takeUnless { item.isNull("title") || it.isBlank() }?.let { tabTitles[id] = it.take(40) }
+        }
+        if (item.has("iconTint")) {
+            tabIconTints.remove(id)
+            if (!item.isNull("iconTint")) runCatching { Color.parseColor(item.optString("iconTint")) }.getOrNull()?.let { tabIconTints[id] = it }
+        }
+        if (item.has("iconPulse")) {
+            if (item.optBoolean("iconPulse", false)) tabIconPulses.add(id) else tabIconPulses.remove(id)
+        }
         if (item.has("image")) {
             val address = item.optString("image").takeIf { !item.isNull("image") && it.startsWith("https://") }
             if (address != tabImageURLs[id]) {
@@ -896,16 +915,41 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         tabViews.forEachIndexed { index, (icon, label) ->
             tabBar.getChildAt(index).isSelected = index == selectedTab
             val color = if (index == selectedTab) accent else muted
-            val number = tabIconText[tabs[index].id]
-            icon.setTextColor(if (number != null) Color.parseColor("#FF2D55") else color)
+            val id = tabs[index].id
+            val number = tabIconText[id]
+            val iconColor = tabIconTints[id] ?: if (number != null) Color.parseColor("#FF2D55") else color
+            icon.setTextColor(iconColor)
+            label.text = tabTitles[id] ?: tabs[index].title
+            tabBar.getChildAt(index).contentDescription = tabAccessibilityLabels[id] ?: label.text
             label.setTextColor(color)
-            val vector = tabImages[tabs[index].id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, color) else null
+            val vector = tabImages[id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, iconColor) else null
+            val pulse = tabIconPulses.contains(id) && number == null && tabImages[id] == null && hasWindowFocus() && android.animation.ValueAnimator.areAnimatorsEnabled()
+            if (pulse && icon.animation == null) {
+                icon.startAnimation(android.view.animation.AlphaAnimation(1f, 0.55f).apply {
+                    duration = 700
+                    repeatCount = android.view.animation.Animation.INFINITE
+                    repeatMode = android.view.animation.Animation.REVERSE
+                })
+            } else if (!pulse) {
+                icon.clearAnimation()
+                icon.alpha = 1f
+            }
             icon.foreground = vector
             icon.text = if (vector != null) "" else number ?: CraftNativeSymbols.glyph(tabs[index].symbol)
         }
         navButtonSpecs.forEach { (view, spec) -> applyNavButtonTint(view, spec, dark) }
     }
 
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        super.onWindowFocusChanged(hasWindowFocus)
+        if (hasWindowFocus) refreshColors() else tabViews.forEach { (icon, _) -> icon.clearAnimation() }
+    }
+
+    override fun onDetachedFromWindow() {
+        tabViews.forEach { (icon, _) -> icon.clearAnimation() }
+        super.onDetachedFromWindow()
+    }
+
     private fun navButton(button: JSONObject): View {
         val id = button.optString("id")
         val title = button.optString("title")

package/dist/cli.js

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

package/dist/ios/templates/CraftApp.swift

@@ -616,6 +616,10 @@ final class CraftChrome: ObservableObject {
         let symbol: String
         var badge: String?
         var iconText: String? = nil
+        var titleOverride: String? = nil
+        var iconTint: String? = nil
+        var iconPulse = false
+        var displayTitle: String { titleOverride ?? title }
         var accessibilityLabel: String? = nil
         var image: String? = nil
     }
@@ -673,12 +677,21 @@ final class CraftChrome: ObservableObject {
     /// the next screen shown says again. The page's own hideTabBar is apart.
     private(set) var hiddenByScreen = false
 
-    /// Change one tab's icon without replacing tabs, navigation stacks or selection.
+    /// Change one tab's caption or icon without replacing stacks or selection.
     func updateTab(_ item: [String: Any]) {
         guard let id = item["id"] as? String, let index = tabs.firstIndex(where: { $0.id == id }) else { return }
         if item.keys.contains("iconText") {
             tabs[index].iconText = (item["iconText"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) }
         }
+        if item.keys.contains("title") {
+            tabs[index].titleOverride = (item["title"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(40)) }
+        }
+        if item.keys.contains("iconTint") {
+            tabs[index].iconTint = (item["iconTint"] as? String).flatMap { UIColor(hex: $0) == nil ? nil : $0 }
+        }
+        if item.keys.contains("iconPulse") {
+            tabs[index].iconPulse = item["iconPulse"] as? Bool ?? false
+        }
         if item.keys.contains("accessibilityLabel") {
             tabs[index].accessibilityLabel = (item["accessibilityLabel"] as? String).map { String($0.prefix(160)) }
         }
@@ -923,6 +936,7 @@ struct CraftTabBarView: View {
     @ObservedObject private var chrome = CraftChrome.shared
     @Namespace private var selection
     @Environment(\.accessibilityReduceMotion) private var reduceMotion
+    @Environment(\.scenePhase) private var scenePhase
     // Dynamic Type, relative to the styles UIKit's own bar uses. The bar is
     // capped at the largest standard size (below), as UITabBar is; past that
     // a long press shows the large content viewer instead.
@@ -1030,9 +1044,7 @@ struct CraftTabBarView: View {
                                     .minimumScaleFactor(0.7)
                                     .frame(height: iconSize + 6)
                             } else {
-                                Image(systemName: symbol(tab.symbol, selected: isSelected))
-                                    .font(.system(size: iconSize, weight: isSelected ? .semibold : .regular))
-                                    .frame(height: iconSize + 6)
+                                tabSymbol(tab, selected: isSelected)
                             }
                             if let badge = tab.badge {
                                 Text(badge)
@@ -1044,8 +1056,9 @@ struct CraftTabBarView: View {
                                     .offset(x: 10, y: -4)
                             }
                         }
-                        Text(tab.title)
+                        Text(tab.displayTitle)
                             .font(.system(size: labelSize, weight: isSelected ? .semibold : .medium))
+                            .monospacedDigit()
                             .lineLimit(1)
                             .minimumScaleFactor(0.8)
                     }
@@ -1063,9 +1076,10 @@ struct CraftTabBarView: View {
                 .buttonStyle(.plain)
                 .accessibilityShowsLargeContentViewer {
                     Image(systemName: symbol(tab.symbol, selected: isSelected))
-                    Text(tab.title)
+                    Text(tab.displayTitle)
                 }
-                .accessibilityLabel(tab.accessibilityLabel ?? tab.badge.map { "\(tab.title), \($0)" } ?? tab.title)
+                .accessibilityIdentifier("craft-tab-\(tab.id)")
+                .accessibilityLabel(tab.accessibilityLabel ?? tab.badge.map { "\(tab.displayTitle), \($0)" } ?? tab.displayTitle)
                 .accessibilityAddTraits(isSelected ? [.isSelected, .isButton] : .isButton)
             }
         }
@@ -1075,6 +1089,20 @@ struct CraftTabBarView: View {
         chrome.tint.map { Color($0) } ?? Color.primary
     }
 
+    /// Live styling belongs to the icon, leaving selection and the caption clear.
+    @ViewBuilder private func tabSymbol(_ tab: CraftChrome.Tab, selected: Bool) -> some View {
+        let color = tab.iconTint.flatMap { UIColor(hex: $0) }.map { Color($0) } ?? (selected ? selectedColor : Color.primary)
+        let icon = Image(systemName: symbol(tab.symbol, selected: selected))
+            .font(.system(size: iconSize, weight: selected ? .semibold : .regular))
+            .foregroundStyle(color)
+            .frame(height: iconSize + 6)
+        if #available(iOS 17.0, *) {
+            icon.symbolEffect(.pulse, options: .repeating, isActive: tab.iconPulse && !reduceMotion && scenePhase == .active)
+        } else {
+            icon
+        }
+    }
+
     /// The filled variant for the current tab, when the symbol has one.
     private func symbol(_ name: String, selected: Bool) -> String {
         guard selected, !name.hasSuffix(".fill"), UIImage(systemName: "\(name).fill") != nil else { return name }

package/package.json

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