@craft-native/android 0.0.209 → 0.0.211

package/README.md

@@ -102,7 +102,8 @@ stx native compile --config ../screens/native.config.json --format bundle --outp
 craft android build --native-bundle ../native-screen.js
 ```
 
-Native mode maps STX `View`, `SafeAreaView`, `Text`, `Button`, `Link`, `Icon`,
+Native mode maps STX `View`, `SafeAreaView`, `KeyboardAvoidingView`, `StatusBar`,
+`RefreshControl`, `Text`, `Button`, `Link`, `Icon`,
 `Pressable`, `TouchableOpacity`, `TouchableHighlight`, `Checkbox`, `TextInput`, `Picker`, `DatePicker`, `Modal`, `Switch`, `Slider`, `ActivityIndicator`, `Image`, `ImageBackground`, `Video`, `Svg`, `G`, `SvgText`, `ScrollView`,
 `Map`, `SectionList`, and `FlatList` to Android views. `Map` uses the Google
 Maps SDK for trail polylines and marker taps; its overlays carry flat
@@ -199,7 +200,12 @@ JavaScriptSandbox process. Enable `enableLocalDatabase`,
 `enableLocalNotifications`, and `enableDeepLinks` explicitly. Disabled or
 malformed calls reject with stable capability/error codes, and in-flight calls
 have a deadline and cancellation path. The broader browser bridge remains
-specific to WebView mode. Native `TextInput` applies `placeholderTextColor`,
+specific to WebView mode. JavaScriptSandbox has no DOM `window`; Craft aliases
+`globalThis.window` to `globalThis` before installing the native bridge so
+browser-safe SDK calls such as `window.craft.dialog.actionSheet()` reach the
+native capability host. This does not add `document` or DOM rendering; routes
+that do not opt into `native` continue using the WebView renderer. Native
+`TextInput` applies `placeholderTextColor`,
 `selectionColor`, positive `maxLength`, `multiline`, and `numberOfLines` values.
 Native views include
 `ActivityIndicator` and expose
@@ -248,7 +254,7 @@ configured start path against `nativeScreens`; invalid native route tables are
 rejected before a project is generated.
 
 - a tab bar and a navigation bar (`craft.navigation.setOptions`: title, large
-  title, right buttons with badges, `tabBarHidden`), a stack per tab, Android's
+  title, right buttons with badges, `tabAccessory`, `tabBarHidden`), a stack per tab, Android's
   Back key popping it; completed left/right swipes switch between tab roots
   interactively, yield to a horizontal scroll view, and can be disabled per
   screen with `craft.navigation.setOptions({ tabSwipeEnabled: false })`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/android",
-  "version": "0.0.209",
+  "version": "0.0.211",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/android#readme",
   "repository": {
     "type": "git",

package/templates/CraftNativeShell.kt.template

@@ -389,6 +389,10 @@ internal object CraftNativePrelude {
         routePrelude: String,
     ): String = """
         $routePrelude
+        // JavaScriptSandbox has no DOM window, but browser-safe SDK bridges
+        // address the host through `window.craft`. Keep native screens
+        // compatible without pretending a document exists.
+        if (typeof globalThis.window === 'undefined') globalThis.window = globalThis;
         (function() {
           var forward = null;
           var queued = [];
@@ -567,7 +571,7 @@ internal object CraftNativePrelude {
  * The bar above a screen (back, title, the screen's buttons) and the tab bar
  * below it, in plain Android views. A screen sets its bar with
  * `craft.navigation.setOptions` (title, largeTitle, hidden, rightButtons,
- * tabBarHidden); the tabs come from the app's `tabs`.
+ * tabAccessory, tabBarHidden); the tabs come from the app's `tabs`.
  */
 internal class CraftNativeChrome(context: Context, private val tabs: List<CraftNativeTab>) : LinearLayout(context) {
     val content = FrameLayout(context)

package/templates/MainActivityNative.kt.template

@@ -142,7 +142,7 @@ import kotlin.math.pow
 
 private const val CRAFT_NATIVE_CAPABILITY_TIMEOUT_MS = 30_000L
 
-private fun craftNativeOptionalString(value: Any?): String? = value
+internal fun craftNativeOptionalString(value: Any?): String? = value
     ?.takeUnless { it == JSONObject.NULL }
     ?.toString()
     ?.takeUnless { it == "null" || it == "undefined" }
@@ -718,12 +718,15 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         val explicitRegion = region(pendingProps.optJSONObject("region"))
         val initialRegion = region(pendingProps.optJSONObject("initialRegion"))
         if (explicitRegion != null) {
-            moveCamera(explicitRegion)
+            // A controlled region is an exact camera request. The padding
+            // used for fitToBounds is framing chrome, not part of the region
+            // contract, and would otherwise zoom every Android screen out.
+            moveCamera(explicitRegion, padding = 0)
             initialCameraKey = null
         } else if (initialRegion != null) {
             val key = "region:${pendingProps.optJSONObject("initialRegion")}"
             if (initialCameraKey != key) {
-                moveCamera(initialRegion)
+                moveCamera(initialRegion, padding = 0)
                 initialCameraKey = key
             }
         } else if (craftNativeBoolean(pendingProps.opt("fitToBounds"))) {
@@ -745,9 +748,9 @@ private class CraftNativeMapView(context: Context) : FrameLayout(context), OnMap
         }
     }
 
-    private fun moveCamera(bounds: LatLngBounds) {
+    private fun moveCamera(bounds: LatLngBounds, padding: Int = 24) {
         post {
-            if (width > 0 && height > 0) googleMap?.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 24))
+            if (width > 0 && height > 0) googleMap?.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, padding))
         }
     }
 
@@ -2512,7 +2515,7 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
             }
 
             scroller.setOnScrollChangeListener { _, x, y, _, _ ->
-                if (!horizontal) updateStickyHeaders()
+                if (horizontalMode != true) updateStickyHeaders()
                 onScroll?.invoke(x, y)
             }
             scroller.setOnTouchListener { _, event ->
@@ -6219,7 +6222,7 @@ class MainActivity : AppCompatActivity() {
             else -> 400
         }
         view.typeface = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            Typeface.create("sans-serif", weight, false)
+            Typeface.create(Typeface.create("sans-serif", Typeface.NORMAL), weight, false)
         } else {
             Typeface.create("sans-serif", if (weight >= 600) Typeface.BOLD else Typeface.NORMAL)
         }
@@ -6275,7 +6278,7 @@ class MainActivity : AppCompatActivity() {
     private fun configureTextStyle(view: TextView, style: JSONObject) {
         view.setTextColor(color(craftNativeOptionalString(style.opt("color")).orEmpty(), defaultTextColor))
         view.setTextSize(TypedValue.COMPLEX_UNIT_SP, craftNativeFiniteFloat(style, "fontSize", 16f))
-        val fontWeight = style.opt("fontWeight") as? String
+        val fontWeight = craftNativeFontWeight(style.opt("fontWeight"))
         val weight = when (fontWeight) {
             "bold" -> 700
             "100", "200", "300", "400", "500", "600", "700", "800", "900" -> style.optInt("fontWeight")