craft-native 0.0.204 → 0.0.206

package/dist/android/src/index.js

@@ -380,6 +380,94 @@ function validateAndroidConfig(config) {
     throw new Error("Android targetSdk must not exceed compileSdk");
   }
 }
+function normalizeNativeRoutePath(raw) {
+  if (typeof raw !== "string")
+    return null;
+  let path = raw;
+  const cut = path.search(/[?#]/);
+  if (cut >= 0)
+    path = path.slice(0, cut);
+  if (!path.startsWith("/"))
+    return null;
+  path = path.replace(/\/{2,}/g, "/");
+  if (path.length > 1 && path.endsWith("/"))
+    path = path.slice(0, -1);
+  return path;
+}
+function nativeRouteSegments(path) {
+  return path === "/" ? [] : path.slice(1).split("/");
+}
+function matchesNativeRoute(nativeScreens, raw) {
+  const path = normalizeNativeRoutePath(raw);
+  if (path === null)
+    return false;
+  const parts = nativeRouteSegments(path);
+  return Object.entries(nativeScreens ?? {}).some(([pattern, screen]) => {
+    if (!screen)
+      return false;
+    const normalized = normalizeNativeRoutePath(pattern);
+    if (normalized === null)
+      return false;
+    const route = nativeRouteSegments(normalized);
+    for (let index = 0;index < route.length; index++) {
+      const segment = route[index];
+      if (segment === "*")
+        return index === route.length - 1;
+      if (index >= parts.length)
+        return false;
+      if (segment.startsWith(":")) {
+        if (!parts[index])
+          return false;
+      } else if (segment !== parts[index])
+        return false;
+    }
+    return route.length === parts.length;
+  });
+}
+function nativeStartPath(config) {
+  if (!config.devServerURL)
+    return "/";
+  try {
+    const url = new URL(config.devServerURL);
+    return `${url.pathname || "/"}${url.search}`;
+  } catch {
+    return "/";
+  }
+}
+function validateNativeRouteConfig(config) {
+  const screens = Object.entries(config.nativeScreens ?? {});
+  for (const [pattern, screen] of screens) {
+    if (normalizeNativeRoutePath(pattern) !== pattern || /[?#]/.test(pattern))
+      throw new Error(`nativeScreens path "${pattern}" must be an absolute path with no query, hash or trailing slash.`);
+    if (nativeRouteSegments(normalizeNativeRoutePath(pattern) ?? "/").slice(0, -1).includes("*"))
+      throw new Error(`nativeScreens path "${pattern}" may only end in *.`);
+    if (typeof screen !== "string" || !/^[A-Za-z_$][\w$-]*$/.test(screen))
+      throw new Error(`nativeScreens screen "${String(screen)}" for "${pattern}" must be a screen name from the native bundle.`);
+  }
+  const ids = new Set;
+  for (const tab of config.tabs ?? []) {
+    if (!tab || typeof tab.id !== "string" || !tab.id || typeof tab.title !== "string" || !tab.title)
+      throw new Error("Each tab needs an id (its root path) and a title.");
+    if (ids.has(tab.id))
+      throw new Error(`Tab "${tab.id}" is listed twice.`);
+    ids.add(tab.id);
+  }
+  if (config.renderer === "native" && screens.length > 0) {
+    for (const id of ids) {
+      if (!matchesNativeRoute(config.nativeScreens, id))
+        throw new Error(`Tab "${id}" is not a nativeScreens path; with renderer: "native" every tab must be a native screen.`);
+    }
+    const start = nativeStartPath(config);
+    if (!matchesNativeRoute(config.nativeScreens, start))
+      throw new Error(`The start path "${start}" (from devServerURL) is not a nativeScreens path; with renderer: "native" the app must start on a native screen.`);
+  }
+  if (config.nativeApp !== undefined) {
+    if (typeof config.nativeApp !== "string" || !/^[A-Za-z_$][\w$-]*$/.test(config.nativeApp))
+      throw new Error(`nativeApp "${String(config.nativeApp)}" must be a route name from the native bundle.`);
+    if (config.renderer !== "native" && screens.length === 0)
+      throw new Error('nativeApp runs in the native bundle; it needs nativeScreens or renderer: "native".');
+  }
+}
 function writeAndroidConfig(output, config) {
   writeFileSync(join2(output, "craft.config.json"), JSON.stringify(config, null, 2));
   const runtimeConfig = { ...config };
@@ -601,6 +689,7 @@ async function init(options) {
   }
   normalizeAndroidNetworkConfig(config);
   validateAndroidConfig(config);
+  validateNativeRouteConfig(config);
   if (config.enablePushNotifications && !config.googleServicesFile) {
     throw new Error("Android push notifications require a googleServicesFile");
   }
@@ -861,6 +950,7 @@ async function build(options) {
   }
   const config = JSON.parse(readFileSync2(configPath, "utf-8"));
   validateAndroidConfig(config);
+  validateNativeRouteConfig(config);
   if (config.renderer === "native") {
     if (htmlPath || devServer)
       throw new Error("A native Android screen cannot use --html-path or --dev-server.");

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

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import org.json.JSONObject
 import kotlin.math.ceil
@@ -101,6 +102,14 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     private var dataContentSignature = ""
     private var horizontal = false
     private var columns = 1
+    private var bounces = true
+    private var alwaysBounceVertical = true
+    private var alwaysBounceHorizontal = true
+    private var scrollEnabled = true
+    private var pagingEnabled = false
+    private val pagerSnapHelper = PagerSnapHelper()
+    private var scrollTargetKey: String? = null
+    private var pendingScrollTarget: Pair<String, Boolean>? = null
     private var keyboardShouldPersistTaps = "never"
     private var submissionGeneration = 0
     private var isSubmittingList = false
@@ -117,6 +126,53 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         LayoutParams.WRAP_CONTENT,
     )
 
+    fun setScrollIndicators(vertical: Boolean, horizontal: Boolean) {
+        isVerticalScrollBarEnabled = vertical
+        isHorizontalScrollBarEnabled = horizontal
+    }
+
+    fun setScrollEnabled(enabled: Boolean) {
+        scrollEnabled = enabled
+    }
+
+    val isScrollEnabledForTest: Boolean
+        get() = scrollEnabled
+
+    fun setPagingEnabled(enabled: Boolean) {
+        if (pagingEnabled == enabled) return
+        pagingEnabled = enabled
+        if (enabled) pagerSnapHelper.attachToRecyclerView(this)
+        else pagerSnapHelper.attachToRecyclerView(null)
+    }
+
+    val isPagingEnabledForTest: Boolean
+        get() = pagingEnabled
+
+    val isScrollTargetPendingForTest: Boolean
+        get() = pendingScrollTarget != null
+
+    override fun onInterceptTouchEvent(event: android.view.MotionEvent): Boolean {
+        if (!scrollEnabled) return false
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: android.view.MotionEvent): Boolean {
+        if (!scrollEnabled) return false
+        return super.onTouchEvent(event)
+    }
+
+    fun setBounceOptions(enabled: Boolean, vertical: Boolean, horizontal: Boolean) {
+        bounces = enabled
+        alwaysBounceVertical = vertical
+        alwaysBounceHorizontal = horizontal
+        applyBounceMode()
+    }
+
+    private fun applyBounceMode() {
+        val axisEnabled = if (this.horizontal) alwaysBounceHorizontal else alwaysBounceVertical
+        overScrollMode = if (bounces && axisEnabled) View.OVER_SCROLL_ALWAYS else View.OVER_SCROLL_NEVER
+    }
+
     private fun updateVisibleHolderLayoutParams() {
         for (index in 0 until childCount) {
             (getChildViewHolder(getChildAt(index)) as? Holder)?.host?.layoutParams = holderLayoutParams()
@@ -125,6 +181,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
 
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
+        scrollToPendingTarget(0)
         onLayoutChanged?.invoke()
     }
 
@@ -246,6 +303,7 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         val retainedState = if (layoutChanged) null else layoutManager?.onSaveInstanceState()
         this.horizontal = horizontal
         this.columns = nextColumns
+        applyBounceMode()
         if (layoutChanged || layoutManager == null) {
             configureLayoutManager()
             updateVisibleHolderLayoutParams()
@@ -280,10 +338,44 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
                 pendingThemeRefresh = false
                 refreshThemeDefaults()
             }
+            scrollToPendingTarget(0)
             evaluateEndReached()
         }
     }
 
+    /** Scroll to a virtualized row identified by its native testID, id, or key. */
+    fun setScrollTarget(value: Any?) {
+        val target: String
+        val animated: Boolean
+        val key: String
+        when (value) {
+            is String -> {
+                target = value.trim()
+                animated = true
+                key = target
+            }
+            is JSONObject -> {
+                target = craftNativeOptionalString(value.opt("id")).orEmpty().trim()
+                animated = value.optBoolean("animated", true)
+                key = value.toString()
+            }
+            else -> {
+                scrollTargetKey = null
+                pendingScrollTarget = null
+                return
+            }
+        }
+        if (target.isBlank()) {
+            scrollTargetKey = null
+            pendingScrollTarget = null
+            return
+        }
+        if (key == scrollTargetKey) return
+        scrollTargetKey = key
+        pendingScrollTarget = target to animated
+        post { scrollToPendingTarget(0) }
+    }
+
     fun discardAll() {
         listAdapter.currentList.forEach { recycleItem?.invoke(it.identity) }
         val generation = ++submissionGeneration
@@ -295,6 +387,9 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         renderItem = null
         recycleItem = null
         endReached = null
+        setPagingEnabled(false)
+        scrollTargetKey = null
+        pendingScrollTarget = null
         dataContentSignature = ""
         onScrollEvent = null
         onScrollBeginDrag = null
@@ -325,6 +420,28 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
         }
     }
 
+    private fun targetPosition(id: String): Int? = listAdapter.currentList.indexOfFirst { item ->
+        val props = item.node.optJSONObject("props")
+        listOf(
+            props?.optString("testID"),
+            props?.optString("id"),
+            item.node.optString("id"),
+            item.identity,
+        ).any { it == id }
+    }.takeIf { it >= 0 }
+
+    private fun scrollToPendingTarget(attempt: Int) {
+        val target = pendingScrollTarget ?: return
+        val position = targetPosition(target.first)
+        if (position == null || layoutManager == null || width <= 0 || height <= 0) {
+            if (attempt < 4) postDelayed({ scrollToPendingTarget(attempt + 1) }, 16L)
+            else if (!isSubmittingList) pendingScrollTarget = null
+            return
+        }
+        pendingScrollTarget = null
+        if (target.second) smoothScrollToPosition(position) else scrollToPosition(position)
+    }
+
     private fun evaluateEndReached() {
         if (isSubmittingList) return
         val manager = layoutManager as? LinearLayoutManager ?: return

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

@@ -1,6 +1,7 @@
 package {{PACKAGE_NAME}}
 
 import android.content.Context
+import org.json.JSONObject
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 
 /** Swipe-to-refresh host for a native FlatList. */
@@ -21,6 +22,12 @@ internal class CraftNativeRefreshableFlatList(context: Context) : SwipeRefreshLa
         if (handler == null) isRefreshing = false
     }
 
+    fun setRefreshAppearance(props: JSONObject, fallback: Int) {
+        val tint = props.optString("tintColor").takeIf { it.isNotBlank() }
+        val resolved = tint?.let { runCatching { craftNativeColor(it) }.getOrNull() } ?: fallback
+        setColorSchemeColors(resolved)
+    }
+
     override fun onDetachedFromWindow() {
         refreshHandler = null
         isRefreshing = false

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

@@ -115,13 +115,15 @@ internal class CraftNativeRoutes(config: JSONObject) {
     val site: Uri? = config.optString("devServerURL").takeIf { it.isNotBlank() }?.let(Uri::parse)
     val siteOrigin: String? = site?.let { uri ->
         val port = if (uri.port > 0) ":${uri.port}" else ""
-        "${uri.scheme}://${uri.host}$port"
+        "${uri.scheme?.lowercase()}://${uri.host?.lowercase()}$port"
     }
 
     /** Where the app opens: the site's path when a screen draws it, else the first tab. */
-    val initialPath: String = site?.path?.takeIf { it.isNotBlank() && match(it) != null }
-        ?: tabs.firstOrNull()?.id
-        ?: "/"
+    val initialPath: String = site?.let { uri ->
+        val path = uri.encodedPath?.takeIf { it.isNotBlank() } ?: "/"
+        val query = uri.encodedQuery?.takeIf { it.isNotBlank() }?.let { "?$it" } ?: ""
+        (path + query).takeIf { match(it) != null }
+    } ?: tabs.firstOrNull()?.id ?: "/"
 
     val isEmpty: Boolean get() = routes.isEmpty()
 
@@ -148,7 +150,7 @@ internal class CraftNativeRoutes(config: JSONObject) {
         }
         val origin = siteOrigin ?: return null
         val port = if (uri.port > 0) ":${uri.port}" else ""
-        if ("${uri.scheme}://${uri.host}$port" != origin) return null
+        if ("${scheme}://${uri.host?.lowercase()}$port" != origin) return null
         return (uri.encodedPath ?: "/") + (uri.encodedQuery?.let { "?$it" } ?: "")
     }
 
@@ -161,7 +163,7 @@ internal class CraftNativeRoutes(config: JSONObject) {
             val params = bind(route.segments, parts) ?: continue
             if (query.isNotBlank()) {
                 query.split('&').filter { it.isNotBlank() }.forEach { pair ->
-                    val key = decode(pair.substringBefore('='))
+                    val key = Uri.decode(pair.substringBefore('='))
                     if (key.isNotBlank() && !params.has(key)) params.put(key, decode(pair.substringAfter('=', "").replace('+', ' ')))
                 }
             }
@@ -181,7 +183,7 @@ internal class CraftNativeRoutes(config: JSONObject) {
             if (index >= parts.size) return null
             if (expected.startsWith(":")) {
                 if (parts[index].isBlank()) return null
-                params.put(expected.removePrefix(":"), decode(parts[index]))
+                params.put(expected.removePrefix(":"), Uri.decode(parts[index]))
             } else if (expected != parts[index]) return null
         }
         return if (pattern.size == parts.size) params else null
@@ -580,7 +582,9 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val tabIconText = mutableMapOf<String, String>()
     private val tabImageURLs = mutableMapOf<String, String>()
     private val tabImages = mutableMapOf<String, android.graphics.drawable.Drawable>()
+    private val navButtonSpecs = mutableMapOf<TextView, JSONObject>()
     private val density = resources.displayMetrics.density
+    private var screenBackgroundColor: Int? = null
     private var selectedTab = 0
     private var swipeTracking = false
     private var swipeIntercepted = false
@@ -710,6 +714,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
 
     /** Draws `options` (a screen's `setOptions`) for a screen `depth` deep in its stack. */
     fun apply(options: JSONObject, depth: Int, fallbackTitle: String?) {
+        screenBackgroundColor = options.opt("backgroundColor")
+            ?.takeUnless { it == JSONObject.NULL }
+            ?.let { craftNativeOptionalString(it) }
+            ?.let { runCatching { craftNativeColor(it) }.getOrNull() }
         options.optJSONObject("tabItem")?.let(::updateTab)
         val hidden = options.optBoolean("hidden", false)
         val large = options.optBoolean("largeTitle", false) && depth == 0
@@ -722,6 +730,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         largeTitleView.visibility = if (!hidden && large && title.isNotBlank()) View.VISIBLE else View.GONE
         buttons.removeAllViews()
         leadingButtons.removeAllViews()
+        navButtonSpecs.clear()
         val leading = options.optJSONArray("leftButtons") ?: JSONArray()
         for (index in 0 until leading.length()) {
             val button = leading.optJSONObject(index) ?: continue
@@ -735,6 +744,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         val tabBarHidden = options.optBoolean("tabBarHidden", false) || depth > 0 && options.optBoolean("tabBarHiddenWhenPushed", false)
         tabBar.visibility = if (tabs.isEmpty() || tabBarHidden) View.GONE else View.VISIBLE
         tabSwipeEnabled = options.optBoolean("tabSwipeEnabled", true)
+        refreshColors()
     }
 
     fun selectTab(index: Int) {
@@ -780,13 +790,14 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
 
     /** Light or dark changed: the bars follow the screen's background. */
     fun refreshColors() {
-        val background = ContextCompat.getColor(context, R.color.background)
+        val background = screenBackgroundColor ?: ContextCompat.getColor(context, R.color.background)
         val dark = Color.luminance(background) < 0.5
         val text = if (dark) Color.WHITE else Color.BLACK
         val muted = if (dark) Color.parseColor("#8E8E93") else Color.parseColor("#6C6C70")
         val accent = accentColor(dark)
         setBackgroundColor(background)
         bar.setBackgroundColor(background)
+        largeTitleView.setBackgroundColor(background)
         titleView.setTextColor(text)
         largeTitleView.setTextColor(text)
         backButton.imageTintList = ColorStateList.valueOf(accent)
@@ -806,6 +817,7 @@ 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)
         }
+        navButtonSpecs.forEach { (view, spec) -> applyNavButtonTint(view, spec, dark) }
     }
 
     private fun navButton(button: JSONObject): View {
@@ -814,8 +826,7 @@ 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 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 tint = navButtonTint(button, dark)
         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
@@ -829,6 +840,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         view.background = rippleBackground()
         view.contentDescription = button.optString("accessibilityLabel").ifBlank { title.ifBlank { symbol } }
         view.setTextColor(tint)
+        navButtonSpecs[view] = button
         val badge = button.optInt("badge", 0)
         if (badge > 0) {
             view.text = "${view.text}${if (button.optString("badgeStyle") == "dot") " •" else " $badge"}"
@@ -838,6 +850,26 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         return view
     }
 
+    private fun navButtonTint(button: JSONObject, dark: Boolean): Int {
+        val defaultTint = if (button.optString("variant") == "neutral") {
+            if (dark) Color.WHITE else Color.parseColor("#1C1C1E")
+        } else accentColor(dark)
+        return button.optString("color").takeIf { it.isNotBlank() }?.let {
+            runCatching { craftNativeColor(it) }.getOrNull()
+        } ?: defaultTint
+    }
+
+    private fun applyNavButtonTint(view: TextView, button: JSONObject, dark: Boolean) {
+        val tint = navButtonTint(button, dark)
+        view.setTextColor(tint)
+        val symbol = button.optString("symbol")
+        if (symbol.isNotBlank()) {
+            CraftNativeIcons.drawable(context, null, symbol, tint)?.let {
+                view.foreground = android.graphics.drawable.InsetDrawable(it, dp(10), dp(15), dp(10), dp(15))
+            }
+        }
+    }
+
     private fun accentColor(dark: Boolean): Int = if (dark) Color.parseColor("#0A84FF") else Color.parseColor("#007AFF")
 
     private fun rippleBackground(): android.graphics.drawable.Drawable? {