@iternio/react-native-auto-play 0.0.2 → 0.0.4

package/ios/utils/RootModule.swift

@@ -8,7 +8,9 @@
 import CarPlay
 
 class RootModule {
-    static func withScene(perform action: @escaping (AutoPlayScene) throws -> Void) throws {
+    static func withScene(
+        perform action: @escaping (AutoPlayScene) throws -> Void
+    ) throws {
         guard
             let scene = SceneStore.getScene(
                 moduleName: SceneStore.rootModuleName
@@ -18,33 +20,49 @@ class RootModule {
                 "operation failed, \(SceneStore.rootModuleName) scene not found"
             )
         }
-        
+
         try action(scene)
     }
-    
-    static func withTemplate(templateId: String, perform action: @escaping (AutoPlayTemplate) throws -> Void) throws {
+
+    static func withAutoPlayTemplate<T>(
+        templateId: String,
+        perform action: @escaping (T) throws -> Void
+    ) throws {
         try withScene { scene in
             guard
-                let template = scene.templateStore.getTemplate(templateId: templateId)
+                let template = scene.templateStore.getTemplate(
+                    templateId: templateId
+                )
             else {
                 throw AutoPlayError.templateNotFound(templateId)
             }
-            
+
+            guard let template = template as? T else {
+                throw AutoPlayError.invalidTemplateType(
+                    "\(template) is not a \(T.self) template"
+                )
+            }
+
             try action(template)
         }
     }
-    
-    static func withMapTemplate(templateId: String, perform action: @escaping (MapTemplate) throws -> Void) throws {
-        try withTemplate(templateId: templateId) { template in
-            guard let template = template as? MapTemplate else {
-                throw AutoPlayError.invalidTemplateError(
-                    "showNavigationAlert failed, \(templateId) not of instance MapTemplate"
+
+    static func withTemplate<T: CPTemplate>(
+        templateId: String,
+        perform action: @escaping (T) throws -> Void
+    ) throws {
+        try withAutoPlayTemplate(templateId: templateId) {
+            (autoPlayTemplate: AutoPlayTemplate) in
+            if let template = autoPlayTemplate.getTemplate() as? T {
+                try! action(template)
+            } else {
+                throw AutoPlayError.invalidTemplateType(
+                    "\(autoPlayTemplate) is not a \(T.self) template"
                 )
             }
-            try action(template)
         }
     }
-    
+
     @MainActor
     static func withScene<T>(
         perform action:
@@ -66,7 +84,8 @@ class RootModule {
     @MainActor
     static func withSceneAndInterfaceController<T>(
         perform action:
-            @escaping (AutoPlayScene, AutoPlayInterfaceController) async throws -> T
+            @escaping (AutoPlayScene, AutoPlayInterfaceController) async throws
+            -> T
     ) async throws -> T {
         return try await withScene { scene in
             guard let interfaceController = scene.interfaceController else {
@@ -81,35 +100,14 @@ class RootModule {
 
     @MainActor
     static func withInterfaceController<T>(
-        perform action: @escaping (AutoPlayInterfaceController) async throws -> T
+        perform action:
+            @escaping (AutoPlayInterfaceController) async throws -> T
     ) async throws -> T {
         try await withSceneAndInterfaceController { _, interfaceController in
             try await action(interfaceController)
         }
     }
 
-    @MainActor
-    static func withTemplateAndInterfaceController<T>(
-        templateId: String,
-        perform action:
-            @escaping (CPTemplate, AutoPlayInterfaceController) async throws -> T
-    ) async throws -> T {
-        return try await withSceneAndInterfaceController {
-            scene,
-            interfaceController in
-            guard
-                let template = scene.templateStore.getCPTemplate(
-                    templateId: templateId
-                )
-            else {
-                throw AutoPlayError.templateNotFound(
-                    "operation failed, \(templateId) template not found"
-                )
-            }
-            return try await action(template, interfaceController)
-        }
-    }
-
     @MainActor
     static func withSceneTemplateAndInterfaceController<T>(
         templateId: String,

package/lib/templates/MapTemplate.d.ts

@@ -13,7 +13,9 @@ export type Point = {
     y: number;
 };
 export type VisibleTravelEstimate = 'first' | 'last';
-export type HeaderActionsAndroidMap<T> = [ActionButtonAndroid<T>, ActionButtonAndroid<T>, ActionButtonAndroid<T>, ActionButtonAndroid<T>] | [ActionButtonAndroid<T>, ActionButtonAndroid<T>, ActionButtonAndroid<T>] | [ActionButtonAndroid<T>, ActionButtonAndroid<T>] | [ActionButtonAndroid<T>];
+export type HeaderActionsAndroidMap<T> = Array<ActionButtonAndroid<T>> & {
+    length: 1 | 2 | 3 | 4;
+};
 export interface NavigationAlertCallbacks {
     dismiss: CleanupCallback;
     update: (title: AutoText, subtitle?: AutoText) => void;
@@ -28,7 +30,7 @@ export interface NitroMapTemplateConfig extends TemplateConfig, NitroBaseMapTemp
      * @param translation distance in pixels along the x & y axis that has been scrolled since the last touch position during the scroll event
      * @param velocity the velocity of the pan gesture, iOS only
      */
-    onDidUpdatePanGestureWithTranslation?: (translation: Point, velocity?: Point) => void;
+    onDidPan?: (translation: Point, velocity?: Point) => void;
     /**
      * callback for pinch to zoom gesture
      * @param center x & y coordinate of the focal point in pixels
@@ -55,8 +57,15 @@ export interface NitroMapTemplateConfig extends TemplateConfig, NitroBaseMapTemp
     onAutoDriveEnabled?: () => void;
     mapButtons?: Array<NitroMapButton>;
     headerActions?: Array<NitroAction>;
+    /**
+     * specify the percentage of screen height/width the pan button should scroll
+     * @namespace iOS
+     */
+    panButtonScrollPercentage?: 0 | 0.05 | 0.1 | 0.15 | 0.2 | 0.25 | 0.3 | 0.35 | 0.4 | 0.45 | 0.5 | 0.55 | 0.6 | 0.65 | 0.7 | 0.75 | 0.8 | 0.85 | 0.9 | 0.95 | 1;
 }
-export type MapButtons<T> = [MapButton<T>, MapButton<T>, MapButton<T>, MapButton<T> | MapPanButton<T>] | [MapButton<T>, MapButton<T>, MapButton<T> | MapPanButton<T>] | [MapButton<T>, MapButton<T> | MapPanButton<T>] | [MapButton<T> | MapPanButton<T>];
+export type MapButtons<T> = Array<MapButton<T> | MapPanButton> & {
+    length: 1 | 2 | 3 | 4;
+};
 export type MapHeaderActions<T> = {
     android?: HeaderActionsAndroidMap<T>;
     ios?: HeaderActionsIos<T>;
@@ -64,6 +73,8 @@ export type MapHeaderActions<T> = {
 export type BaseMapTemplateConfig<T> = {
     /**
      * buttons that represent actions on the map template, usually on the bottom right corner
+     * @namespace Android - adding a pan button will always make the pan button the first one
+     * @namespace iOS - the pan button can be on any position
      */
     mapButtons?: MapButtons<T>;
     /**

package/lib/templates/Template.d.ts

@@ -56,6 +56,7 @@ export interface TemplateConfig {
 export interface NitroBaseMapTemplateConfig extends TemplateConfig {
     mapButtons?: Array<NitroMapButton>;
     headerActions?: Array<NitroAction>;
+    onDidChangePanningInterface?: (isPanningInterfaceVisible: boolean) => void;
 }
 export declare class Template<TemplateConfigType, ActionsType> {
     id: string;

package/lib/types/Button.d.ts

@@ -6,12 +6,13 @@ export type MapButton<T = unknown> = {
 };
 export type ButtonStyle = 'normal' | 'confirm' | 'cancel';
 /**
- * this is a special button only visible on devices that have no touch support
- * @namespace Android
+ * pressing this button will bring up the system default pan interface
+ * @namespace Android - this button might not be shown, usually when the device has a touch screen
+ * @namespace iOS - this button will always be shown, no matter if the device has a touch screen or not
  */
-export type MapPanButton<T = unknown> = {
+export type MapPanButton = {
     type: 'pan';
-    onPress: (template: T) => void;
+    image: AutoImage;
 };
 type BaseButton<T = unknown> = {
     style?: ButtonStyle;

package/lib/types/Maneuver.d.ts

@@ -196,5 +196,7 @@ export type MessageManeuver = {
     cardBackgroundColor: ThemedColor | string;
     type: 'message';
 };
-export type AutoManeuver = [RoutingManeuver, RoutingManeuver | undefined] | MessageManeuver;
+export type AutoManeuver = (Array<RoutingManeuver> & {
+    length: 1 | 2;
+}) | MessageManeuver;
 export {};

package/lib/utils/NitroMapButton.d.ts

@@ -3,8 +3,8 @@ import { type NitroImage } from './NitroImage';
 type NitroMapButtonType = 'pan' | 'custom';
 export type NitroMapButton = {
     type: NitroMapButtonType;
-    image?: NitroImage;
-    onPress: () => void;
+    image: NitroImage;
+    onPress?: () => void;
 };
 export declare const NitroMapButton: {
     convert: <T>(template: T, mapButtons?: MapButtons<T>) => Array<NitroMapButton> | undefined;

package/lib/utils/NitroMapButton.js

@@ -5,13 +5,8 @@ const convert = (template, mapButtons) => {
         return undefined;
     }
     return mapButtons?.map((button) => {
-        const { onPress, type } = button;
-        if (button.type === 'pan') {
-            if (Platform.OS === 'android') {
-                return { type: 'pan', onPress: () => onPress(template) };
-            }
-            throw new Error('unsupported platform, pan button can be used on Android only! Use a custom button instead.');
-        }
+        const { type } = button;
+        const onPress = button.type === 'custom' ? () => button.onPress(template) : undefined;
         if (button.image.type === 'glyph') {
             const backgroundColor = Platform.OS === 'android'
                 ? 'transparent'
@@ -21,13 +16,13 @@ const convert = (template, mapButtons) => {
             const fontScale = (button.image.fontScale ?? Platform.OS === 'android') ? 1.0 : 0.65;
             return {
                 type,
-                onPress: () => onPress(template),
+                onPress,
                 image: NitroImageUtil.convert({ ...button.image, backgroundColor, fontScale }),
             };
         }
         return {
             type,
-            onPress: () => onPress(template),
+            onPress,
             image: NitroImageUtil.convert(button.image),
         };
     });

package/nitrogen/generated/android/ReactNativeAutoPlayOnLoad.cpp

@@ -28,6 +28,7 @@
 #include "JFunc_void_std__string_bool.hpp"
 #include "JHybridGridTemplateSpec.hpp"
 #include "JFunc_void_std__optional_bool_.hpp"
+#include "JFunc_void_bool.hpp"
 #include "JHybridInformationTemplateSpec.hpp"
 #include "JHybridListTemplateSpec.hpp"
 #include "JHybridMapTemplateSpec.hpp"
@@ -64,6 +65,7 @@ int initialize(JavaVM* vm) {
     margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_bool_cxx::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JHybridGridTemplateSpec::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_bool__cxx::registerNatives();
+    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_bool_cxx::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JHybridInformationTemplateSpec::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JHybridListTemplateSpec::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JHybridMapTemplateSpec::registerNatives();

package/nitrogen/generated/android/c++/JFunc_void_bool.hpp

@@ -0,0 +1,74 @@
+///
+/// JFunc_void_bool.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <functional>
+
+#include <functional>
+
+namespace margelo::nitro::swe::iternio::reactnativeautoplay {
+
+  using namespace facebook;
+
+  /**
+   * Represents the Java/Kotlin callback `(isPanningInterfaceVisible: Boolean) -> Unit`.
+   * This can be passed around between C++ and Java/Kotlin.
+   */
+  struct JFunc_void_bool: public jni::JavaClass<JFunc_void_bool> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/Func_void_bool;";
+
+  public:
+    /**
+     * Invokes the function this `JFunc_void_bool` instance holds through JNI.
+     */
+    void invoke(bool isPanningInterfaceVisible) const {
+      static const auto method = javaClassStatic()->getMethod<void(jboolean /* isPanningInterfaceVisible */)>("invoke");
+      method(self(), isPanningInterfaceVisible);
+    }
+  };
+
+  /**
+   * An implementation of Func_void_bool that is backed by a C++ implementation (using `std::function<...>`)
+   */
+  struct JFunc_void_bool_cxx final: public jni::HybridClass<JFunc_void_bool_cxx, JFunc_void_bool> {
+  public:
+    static jni::local_ref<JFunc_void_bool::javaobject> fromCpp(const std::function<void(bool /* isPanningInterfaceVisible */)>& func) {
+      return JFunc_void_bool_cxx::newObjectCxxArgs(func);
+    }
+
+  public:
+    /**
+     * Invokes the C++ `std::function<...>` this `JFunc_void_bool_cxx` instance holds.
+     */
+    void invoke_cxx(jboolean isPanningInterfaceVisible) {
+      _func(static_cast<bool>(isPanningInterfaceVisible));
+    }
+
+  public:
+    [[nodiscard]]
+    inline const std::function<void(bool /* isPanningInterfaceVisible */)>& getFunction() const {
+      return _func;
+    }
+
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/Func_void_bool_cxx;";
+    static void registerNatives() {
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_bool_cxx::invoke_cxx)});
+    }
+
+  private:
+    explicit JFunc_void_bool_cxx(const std::function<void(bool /* isPanningInterfaceVisible */)>& func): _func(func) { }
+
+  private:
+    friend HybridBase;
+    std::function<void(bool /* isPanningInterfaceVisible */)> _func;
+  };
+
+} // namespace margelo::nitro::swe::iternio::reactnativeautoplay

package/nitrogen/generated/android/c++/JGridTemplateConfig.hpp

@@ -20,6 +20,7 @@
 #include "JDistance.hpp"
 #include "JDistanceUnits.hpp"
 #include "JFunc_void.hpp"
+#include "JFunc_void_bool.hpp"
 #include "JFunc_void_std__optional_bool_.hpp"
 #include "JGlyphImage.hpp"
 #include "JNitroAction.hpp"

package/nitrogen/generated/android/c++/JHybridGridTemplateSpec.cpp

@@ -77,6 +77,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class NitroMa
 #include "JNitroMapButton.hpp"
 #include "NitroMapButtonType.hpp"
 #include "JNitroMapButtonType.hpp"
+#include "JFunc_void_bool.hpp"
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {
 

package/nitrogen/generated/android/c++/JHybridInformationTemplateSpec.cpp

@@ -84,6 +84,8 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class NitroMa
 #include "JNitroMapButton.hpp"
 #include "NitroMapButtonType.hpp"
 #include "JNitroMapButtonType.hpp"
+#include "JNitroImage.hpp"
+#include "JFunc_void_bool.hpp"
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {
 

package/nitrogen/generated/android/c++/JHybridListTemplateSpec.cpp

@@ -84,6 +84,8 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class NitroMa
 #include "JNitroMapButton.hpp"
 #include "NitroMapButtonType.hpp"
 #include "JNitroMapButtonType.hpp"
+#include "JNitroImage.hpp"
+#include "JFunc_void_bool.hpp"
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {
 

package/nitrogen/generated/android/c++/JHybridMapTemplateSpec.cpp

@@ -131,19 +131,21 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct TripConfig;
 #include "GlyphImage.hpp"
 #include "AssetImage.hpp"
 #include <variant>
-#include "JVariant_GlyphImage_AssetImage.hpp"
+#include "JNitroImage.hpp"
 #include "JGlyphImage.hpp"
 #include "NitroColor.hpp"
 #include "JNitroColor.hpp"
 #include "JAssetImage.hpp"
 #include "NitroAction.hpp"
 #include "JNitroAction.hpp"
+#include "JVariant_GlyphImage_AssetImage.hpp"
 #include "NitroActionType.hpp"
 #include "JNitroActionType.hpp"
 #include "NitroAlignment.hpp"
 #include "JNitroAlignment.hpp"
 #include "NitroButtonStyle.hpp"
 #include "JNitroButtonStyle.hpp"
+#include "JFunc_void_bool.hpp"
 #include "NitroNavigationAlert.hpp"
 #include "JNitroNavigationAlert.hpp"
 #include "NavigationAlertAction.hpp"
@@ -174,7 +176,6 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct TripConfig;
 #include "JNitroAttributedString.hpp"
 #include "NitroAttributedStringImage.hpp"
 #include "JNitroAttributedStringImage.hpp"
-#include "JNitroImage.hpp"
 #include "TurnType.hpp"
 #include "JTurnType.hpp"
 #include "OffRampType.hpp"

package/nitrogen/generated/android/c++/JHybridMessageTemplateSpec.cpp

@@ -72,6 +72,8 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class NitroMa
 #include "JNitroMapButton.hpp"
 #include "NitroMapButtonType.hpp"
 #include "JNitroMapButtonType.hpp"
+#include "JNitroImage.hpp"
+#include "JFunc_void_bool.hpp"
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {
 

package/nitrogen/generated/android/c++/JInformationTemplateConfig.hpp

@@ -20,6 +20,7 @@
 #include "JDistance.hpp"
 #include "JDistanceUnits.hpp"
 #include "JFunc_void.hpp"
+#include "JFunc_void_bool.hpp"
 #include "JFunc_void_std__optional_bool_.hpp"
 #include "JGlyphImage.hpp"
 #include "JNitroAction.hpp"
@@ -28,6 +29,7 @@
 #include "JNitroBaseMapTemplateConfig.hpp"
 #include "JNitroButtonStyle.hpp"
 #include "JNitroColor.hpp"
+#include "JNitroImage.hpp"
 #include "JNitroMapButton.hpp"
 #include "JNitroMapButtonType.hpp"
 #include "JNitroRow.hpp"

package/nitrogen/generated/android/c++/JListTemplateConfig.hpp

@@ -20,6 +20,7 @@
 #include "JDistance.hpp"
 #include "JDistanceUnits.hpp"
 #include "JFunc_void.hpp"
+#include "JFunc_void_bool.hpp"
 #include "JFunc_void_std__optional_bool_.hpp"
 #include "JGlyphImage.hpp"
 #include "JNitroAction.hpp"
@@ -28,6 +29,7 @@
 #include "JNitroBaseMapTemplateConfig.hpp"
 #include "JNitroButtonStyle.hpp"
 #include "JNitroColor.hpp"
+#include "JNitroImage.hpp"
 #include "JNitroMapButton.hpp"
 #include "JNitroMapButtonType.hpp"
 #include "JNitroRow.hpp"

package/nitrogen/generated/android/c++/JMapTemplateConfig.hpp

@@ -20,6 +20,7 @@
 #include "JFunc_void_Point.hpp"
 #include "JFunc_void_Point_double.hpp"
 #include "JFunc_void_Point_std__optional_Point_.hpp"
+#include "JFunc_void_bool.hpp"
 #include "JFunc_void_std__optional_bool_.hpp"
 #include "JGlyphImage.hpp"
 #include "JNitroAction.hpp"
@@ -27,6 +28,7 @@
 #include "JNitroAlignment.hpp"
 #include "JNitroButtonStyle.hpp"
 #include "JNitroColor.hpp"
+#include "JNitroImage.hpp"
 #include "JNitroMapButton.hpp"
 #include "JNitroMapButtonType.hpp"
 #include "JPoint.hpp"
@@ -82,8 +84,8 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       jni::local_ref<jni::JDouble> autoDismissMs = this->getFieldValue(fieldAutoDismissMs);
       static const auto fieldVisibleTravelEstimate = clazz->getField<JVisibleTravelEstimate>("visibleTravelEstimate");
       jni::local_ref<JVisibleTravelEstimate> visibleTravelEstimate = this->getFieldValue(fieldVisibleTravelEstimate);
-      static const auto fieldOnDidUpdatePanGestureWithTranslation = clazz->getField<JFunc_void_Point_std__optional_Point_::javaobject>("onDidUpdatePanGestureWithTranslation");
-      jni::local_ref<JFunc_void_Point_std__optional_Point_::javaobject> onDidUpdatePanGestureWithTranslation = this->getFieldValue(fieldOnDidUpdatePanGestureWithTranslation);
+      static const auto fieldOnDidPan = clazz->getField<JFunc_void_Point_std__optional_Point_::javaobject>("onDidPan");
+      jni::local_ref<JFunc_void_Point_std__optional_Point_::javaobject> onDidPan = this->getFieldValue(fieldOnDidPan);
       static const auto fieldOnDidUpdateZoomGestureWithCenter = clazz->getField<JFunc_void_Point_double::javaobject>("onDidUpdateZoomGestureWithCenter");
       jni::local_ref<JFunc_void_Point_double::javaobject> onDidUpdateZoomGestureWithCenter = this->getFieldValue(fieldOnDidUpdateZoomGestureWithCenter);
       static const auto fieldOnClick = clazz->getField<JFunc_void_Point::javaobject>("onClick");
@@ -100,6 +102,10 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       jni::local_ref<jni::JArrayClass<JNitroMapButton>> mapButtons = this->getFieldValue(fieldMapButtons);
       static const auto fieldHeaderActions = clazz->getField<jni::JArrayClass<JNitroAction>>("headerActions");
       jni::local_ref<jni::JArrayClass<JNitroAction>> headerActions = this->getFieldValue(fieldHeaderActions);
+      static const auto fieldPanButtonScrollPercentage = clazz->getField<jni::JDouble>("panButtonScrollPercentage");
+      jni::local_ref<jni::JDouble> panButtonScrollPercentage = this->getFieldValue(fieldPanButtonScrollPercentage);
+      static const auto fieldOnDidChangePanningInterface = clazz->getField<JFunc_void_bool::javaobject>("onDidChangePanningInterface");
+      jni::local_ref<JFunc_void_bool::javaobject> onDidChangePanningInterface = this->getFieldValue(fieldOnDidChangePanningInterface);
       return MapTemplateConfig(
         id->toStdString(),
         onWillAppear != nullptr ? std::make_optional([&]() -> std::function<void(std::optional<bool> /* animated */)> {
@@ -159,14 +165,14 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
         }()) : std::nullopt,
         autoDismissMs != nullptr ? std::make_optional(autoDismissMs->value()) : std::nullopt,
         visibleTravelEstimate != nullptr ? std::make_optional(visibleTravelEstimate->toCpp()) : std::nullopt,
-        onDidUpdatePanGestureWithTranslation != nullptr ? std::make_optional([&]() -> std::function<void(const Point& /* translation */, const std::optional<Point>& /* velocity */)> {
-          if (onDidUpdatePanGestureWithTranslation->isInstanceOf(JFunc_void_Point_std__optional_Point__cxx::javaClassStatic())) [[likely]] {
-            auto downcast = jni::static_ref_cast<JFunc_void_Point_std__optional_Point__cxx::javaobject>(onDidUpdatePanGestureWithTranslation);
+        onDidPan != nullptr ? std::make_optional([&]() -> std::function<void(const Point& /* translation */, const std::optional<Point>& /* velocity */)> {
+          if (onDidPan->isInstanceOf(JFunc_void_Point_std__optional_Point__cxx::javaClassStatic())) [[likely]] {
+            auto downcast = jni::static_ref_cast<JFunc_void_Point_std__optional_Point__cxx::javaobject>(onDidPan);
             return downcast->cthis()->getFunction();
           } else {
-            auto onDidUpdatePanGestureWithTranslationRef = jni::make_global(onDidUpdatePanGestureWithTranslation);
-            return [onDidUpdatePanGestureWithTranslationRef](Point translation, std::optional<Point> velocity) -> void {
-              return onDidUpdatePanGestureWithTranslationRef->invoke(translation,velocity);
+            auto onDidPanRef = jni::make_global(onDidPan);
+            return [onDidPanRef](Point translation, std::optional<Point> velocity) -> void {
+              return onDidPanRef->invoke(translation,velocity);
             };
           }
         }()) : std::nullopt,
@@ -255,6 +261,18 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
             __vector.push_back(__element->toCpp());
           }
           return __vector;
+        }()) : std::nullopt,
+        panButtonScrollPercentage != nullptr ? std::make_optional(panButtonScrollPercentage->value()) : std::nullopt,
+        onDidChangePanningInterface != nullptr ? std::make_optional([&]() -> std::function<void(bool /* isPanningInterfaceVisible */)> {
+          if (onDidChangePanningInterface->isInstanceOf(JFunc_void_bool_cxx::javaClassStatic())) [[likely]] {
+            auto downcast = jni::static_ref_cast<JFunc_void_bool_cxx::javaobject>(onDidChangePanningInterface);
+            return downcast->cthis()->getFunction();
+          } else {
+            auto onDidChangePanningInterfaceRef = jni::make_global(onDidChangePanningInterface);
+            return [onDidChangePanningInterfaceRef](bool isPanningInterfaceVisible) -> void {
+              return onDidChangePanningInterfaceRef->invoke(isPanningInterfaceVisible);
+            };
+          }
         }()) : std::nullopt
       );
     }
@@ -265,7 +283,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
      */
     [[maybe_unused]]
     static jni::local_ref<JMapTemplateConfig::javaobject> fromCpp(const MapTemplateConfig& value) {
-      using JSignature = JMapTemplateConfig(jni::alias_ref<jni::JString>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JVisibleTravelEstimate>, jni::alias_ref<JFunc_void_Point_std__optional_Point_::javaobject>, jni::alias_ref<JFunc_void_Point_double::javaobject>, jni::alias_ref<JFunc_void_Point::javaobject>, jni::alias_ref<JFunc_void_Point::javaobject>, jni::alias_ref<JFunc_void_ColorScheme::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<jni::JArrayClass<JNitroMapButton>>, jni::alias_ref<jni::JArrayClass<JNitroAction>>);
+      using JSignature = JMapTemplateConfig(jni::alias_ref<jni::JString>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JVisibleTravelEstimate>, jni::alias_ref<JFunc_void_Point_std__optional_Point_::javaobject>, jni::alias_ref<JFunc_void_Point_double::javaobject>, jni::alias_ref<JFunc_void_Point::javaobject>, jni::alias_ref<JFunc_void_Point::javaobject>, jni::alias_ref<JFunc_void_ColorScheme::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<jni::JArrayClass<JNitroMapButton>>, jni::alias_ref<jni::JArrayClass<JNitroAction>>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JFunc_void_bool::javaobject>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -278,7 +296,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
         value.onPopped.has_value() ? JFunc_void_cxx::fromCpp(value.onPopped.value()) : nullptr,
         value.autoDismissMs.has_value() ? jni::JDouble::valueOf(value.autoDismissMs.value()) : nullptr,
         value.visibleTravelEstimate.has_value() ? JVisibleTravelEstimate::fromCpp(value.visibleTravelEstimate.value()) : nullptr,
-        value.onDidUpdatePanGestureWithTranslation.has_value() ? JFunc_void_Point_std__optional_Point__cxx::fromCpp(value.onDidUpdatePanGestureWithTranslation.value()) : nullptr,
+        value.onDidPan.has_value() ? JFunc_void_Point_std__optional_Point__cxx::fromCpp(value.onDidPan.value()) : nullptr,
         value.onDidUpdateZoomGestureWithCenter.has_value() ? JFunc_void_Point_double_cxx::fromCpp(value.onDidUpdateZoomGestureWithCenter.value()) : nullptr,
         value.onClick.has_value() ? JFunc_void_Point_cxx::fromCpp(value.onClick.value()) : nullptr,
         value.onDoubleClick.has_value() ? JFunc_void_Point_cxx::fromCpp(value.onDoubleClick.value()) : nullptr,
@@ -304,7 +322,9 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
             __array->setElement(__i, *__elementJni);
           }
           return __array;
-        }() : nullptr
+        }() : nullptr,
+        value.panButtonScrollPercentage.has_value() ? jni::JDouble::valueOf(value.panButtonScrollPercentage.value()) : nullptr,
+        value.onDidChangePanningInterface.has_value() ? JFunc_void_bool_cxx::fromCpp(value.onDidChangePanningInterface.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/c++/JMessageTemplateConfig.hpp

@@ -20,6 +20,7 @@
 #include "JDistance.hpp"
 #include "JDistanceUnits.hpp"
 #include "JFunc_void.hpp"
+#include "JFunc_void_bool.hpp"
 #include "JFunc_void_std__optional_bool_.hpp"
 #include "JGlyphImage.hpp"
 #include "JNitroAction.hpp"
@@ -28,6 +29,7 @@
 #include "JNitroBaseMapTemplateConfig.hpp"
 #include "JNitroButtonStyle.hpp"
 #include "JNitroColor.hpp"
+#include "JNitroImage.hpp"
 #include "JNitroMapButton.hpp"
 #include "JNitroMapButtonType.hpp"
 #include "JVariant_GlyphImage_AssetImage.hpp"

package/nitrogen/generated/android/c++/JNitroBaseMapTemplateConfig.hpp

@@ -14,6 +14,7 @@
 #include "GlyphImage.hpp"
 #include "JAssetImage.hpp"
 #include "JFunc_void.hpp"
+#include "JFunc_void_bool.hpp"
 #include "JFunc_void_std__optional_bool_.hpp"
 #include "JGlyphImage.hpp"
 #include "JNitroAction.hpp"
@@ -21,6 +22,7 @@
 #include "JNitroAlignment.hpp"
 #include "JNitroButtonStyle.hpp"
 #include "JNitroColor.hpp"
+#include "JNitroImage.hpp"
 #include "JNitroMapButton.hpp"
 #include "JNitroMapButtonType.hpp"
 #include "JVariant_GlyphImage_AssetImage.hpp"
@@ -60,6 +62,8 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       jni::local_ref<jni::JArrayClass<JNitroMapButton>> mapButtons = this->getFieldValue(fieldMapButtons);
       static const auto fieldHeaderActions = clazz->getField<jni::JArrayClass<JNitroAction>>("headerActions");
       jni::local_ref<jni::JArrayClass<JNitroAction>> headerActions = this->getFieldValue(fieldHeaderActions);
+      static const auto fieldOnDidChangePanningInterface = clazz->getField<JFunc_void_bool::javaobject>("onDidChangePanningInterface");
+      jni::local_ref<JFunc_void_bool::javaobject> onDidChangePanningInterface = this->getFieldValue(fieldOnDidChangePanningInterface);
       static const auto fieldOnWillAppear = clazz->getField<JFunc_void_std__optional_bool_::javaobject>("onWillAppear");
       jni::local_ref<JFunc_void_std__optional_bool_::javaobject> onWillAppear = this->getFieldValue(fieldOnWillAppear);
       static const auto fieldOnWillDisappear = clazz->getField<JFunc_void_std__optional_bool_::javaobject>("onWillDisappear");
@@ -93,6 +97,17 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
           }
           return __vector;
         }()) : std::nullopt,
+        onDidChangePanningInterface != nullptr ? std::make_optional([&]() -> std::function<void(bool /* isPanningInterfaceVisible */)> {
+          if (onDidChangePanningInterface->isInstanceOf(JFunc_void_bool_cxx::javaClassStatic())) [[likely]] {
+            auto downcast = jni::static_ref_cast<JFunc_void_bool_cxx::javaobject>(onDidChangePanningInterface);
+            return downcast->cthis()->getFunction();
+          } else {
+            auto onDidChangePanningInterfaceRef = jni::make_global(onDidChangePanningInterface);
+            return [onDidChangePanningInterfaceRef](bool isPanningInterfaceVisible) -> void {
+              return onDidChangePanningInterfaceRef->invoke(isPanningInterfaceVisible);
+            };
+          }
+        }()) : std::nullopt,
         onWillAppear != nullptr ? std::make_optional([&]() -> std::function<void(std::optional<bool> /* animated */)> {
           if (onWillAppear->isInstanceOf(JFunc_void_std__optional_bool__cxx::javaClassStatic())) [[likely]] {
             auto downcast = jni::static_ref_cast<JFunc_void_std__optional_bool__cxx::javaobject>(onWillAppear);
@@ -158,7 +173,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
      */
     [[maybe_unused]]
     static jni::local_ref<JNitroBaseMapTemplateConfig::javaobject> fromCpp(const NitroBaseMapTemplateConfig& value) {
-      using JSignature = JNitroBaseMapTemplateConfig(jni::alias_ref<jni::JArrayClass<JNitroMapButton>>, jni::alias_ref<jni::JArrayClass<JNitroAction>>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<jni::JDouble>);
+      using JSignature = JNitroBaseMapTemplateConfig(jni::alias_ref<jni::JArrayClass<JNitroMapButton>>, jni::alias_ref<jni::JArrayClass<JNitroAction>>, jni::alias_ref<JFunc_void_bool::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void_std__optional_bool_::javaobject>, jni::alias_ref<JFunc_void::javaobject>, jni::alias_ref<jni::JDouble>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -183,6 +198,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
           }
           return __array;
         }() : nullptr,
+        value.onDidChangePanningInterface.has_value() ? JFunc_void_bool_cxx::fromCpp(value.onDidChangePanningInterface.value()) : nullptr,
         value.onWillAppear.has_value() ? JFunc_void_std__optional_bool__cxx::fromCpp(value.onWillAppear.value()) : nullptr,
         value.onWillDisappear.has_value() ? JFunc_void_std__optional_bool__cxx::fromCpp(value.onWillDisappear.value()) : nullptr,
         value.onDidAppear.has_value() ? JFunc_void_std__optional_bool__cxx::fromCpp(value.onDidAppear.value()) : nullptr,