@javascriptcommon/react-native-carplay 2.3.11 → 2.4.2

package/android/src/main/java/org/birkir/carplay/utils/VirtualRenderer.kt

@@ -0,0 +1,75 @@
+package org.birkir.carplay.utils
+
+import android.app.Presentation
+import android.content.Context
+import android.hardware.display.DisplayManager
+import android.os.Bundle
+import android.util.Log
+import android.view.Display
+import android.view.ViewGroup
+import androidx.car.app.AppManager
+import androidx.car.app.CarContext
+import androidx.car.app.SurfaceCallback
+import androidx.car.app.SurfaceContainer
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactRootView
+
+/**
+ * Renders the view tree into a surface using VirtualDisplay. It runs the ReactNative component registered
+ */
+class VirtualRenderer(private val context: CarContext, private val moduleName: String) {
+
+  private var rootView: ReactRootView? = null
+
+  init {
+    context.getCarService(AppManager::class.java).setSurfaceCallback(object : SurfaceCallback {
+      override fun onSurfaceAvailable(surfaceContainer: SurfaceContainer) {
+        val surface = surfaceContainer.surface
+        if (surface == null) {
+          Log.w(TAG, "surface is null")
+        } else {
+          renderPresentation(surfaceContainer)
+        }
+      }
+    })
+  }
+
+  private fun renderPresentation(container: SurfaceContainer) {
+    val manager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
+    val display = manager.createVirtualDisplay(
+      "AndroidAutoMapTemplate",
+      container.width,
+      container.height,
+      container.dpi,
+      container.surface,
+      DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION,
+    )
+    val presentation = MapPresentation(context, display.display, moduleName)
+    presentation.show()
+  }
+
+  inner class MapPresentation(context: Context, display: Display, private val moduleName: String) :
+    Presentation(context, display) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+      super.onCreate(savedInstanceState)
+      val instanceManager =
+        (context.applicationContext as ReactApplication).reactNativeHost.reactInstanceManager
+      if (rootView == null) {
+        Log.d(TAG, "onCreate: rootView is null, initializing rootView")
+        rootView = ReactRootView(context).apply {
+          startReactApplication(instanceManager, moduleName)
+          runApplication()
+        }
+      } else {
+        (rootView?.parent as? ViewGroup)?.removeView(rootView)
+      }
+      rootView?.let {
+        setContentView(it)
+      }
+    }
+  }
+
+  companion object {
+    const val TAG = "VirtualRenderer"
+  }
+}

package/ios/RCTConvert+RNCarPlay.h

@@ -3,17 +3,16 @@
 #import <CarPlay/CarPlay.h>
 #import <React/RCTConvert.h>
 
-API_AVAILABLE(ios(12.0))
 @interface RCTConvert (RNCarPlay)
 
 + (CPTripEstimateStyle)CPTripEstimateStyle:(id)json;
 + (CPPanDirection)CPPanDirection:(id)json;
-+ (CPAssistantCellPosition)CPAssistantCellPosition:(id)json API_AVAILABLE(ios(15.0));
-+ (CPAssistantCellVisibility)CPAssistantCellVisibility:(id)json API_AVAILABLE(ios(15.0));
-+ (CPAssistantCellActionType)CPAssistantCellActionType:(id)json API_AVAILABLE(ios(15.0));
-+ (CPMapButton *)CPMapButton:(id)json withHandler:(void (^)(CPMapButton *_Nonnull mapButton))handler;
-+ (CPRouteChoice *)CPRouteChoice:(id)json;
-+ (MKMapItem *)MKMapItem:(id)json;
-+ (CPPointOfInterest *)CPPointOfInterest:(id)json API_AVAILABLE(ios(14.0));
++ (CPAssistantCellPosition)CPAssistantCellPosition:(id)json;
++ (CPAssistantCellVisibility)CPAssistantCellVisibility:(id)json;
++ (CPAssistantCellActionType)CPAssistantCellActionType:(id)json;
++ (CPMapButton*)CPMapButton:(id)json withHandler:(void (^)(CPMapButton * _Nonnull mapButton))handler;
++ (CPRouteChoice*)CPRouteChoice:(id)json;
++ (MKMapItem*)MKMapItem:(id)json;
++ (CPPointOfInterest*)CPPointOfInterest:(id)json;
 + (CPAlertActionStyle)CPAlertActionStyle:(id)json;
 @end

package/ios/RCTConvert+RNCarPlay.m

@@ -33,7 +33,8 @@ RCT_ENUM_CONVERTER(CPAssistantCellVisibility, (@{
 RCT_ENUM_CONVERTER(CPAssistantCellActionType, (@{
                                       @"playMedia": @(CPAssistantCellActionTypePlayMedia),
                                       @"startCall": @(CPAssistantCellActionTypeStartCall)
-                                      }), CPAssistantCellActionTypeStartCall, integerValue)
+                                      }), CPAssistantCellActionTypePlayMedia, integerValue)
+
 
 + (CPMapButton*)CPMapButton:(id)json withHandler:(void (^)(CPMapButton * _Nonnull mapButton))handler {
     CPMapButton *mapButton = [[CPMapButton alloc] initWithHandler:handler];
@@ -43,7 +44,7 @@ RCT_ENUM_CONVERTER(CPAssistantCellActionType, (@{
     }
 
     if ([json objectForKey:@"focusedImage"]) {
-        [mapButton setImage:[RCTConvert UIImage:json[@"focusedImage"]]];
+        [mapButton setFocusedImage:[RCTConvert UIImage:json[@"focusedImage"]]];
     }
 
     if ([json objectForKey:@"disabled"]) {
@@ -70,7 +71,7 @@ RCT_ENUM_CONVERTER(CPAssistantCellActionType, (@{
     return [[CPRouteChoice alloc] initWithSummaryVariants:[RCTConvert NSStringArray:json[@"additionalInformationVariants"]] additionalInformationVariants:[RCTConvert NSStringArray:json[@"selectionSummaryVariants"]] selectionSummaryVariants:[RCTConvert NSStringArray:json[@"summaryVariants"]]];
 }
 
-+ (CPPointOfInterest*)CPPointOfInterest:(id)json  API_AVAILABLE(ios(14.0)){
++ (CPPointOfInterest*)CPPointOfInterest:(id)json {
     MKMapItem *location = [RCTConvert MKMapItem:json[@"location"]];
     NSString *title = [RCTConvert NSString:json[@"title"]];
     NSString *subtitle = [RCTConvert NSString:json[@"subtitle"]];

package/ios/RNCarPlay.h

@@ -5,13 +5,10 @@
 #import "RCTConvert+RNCarPlay.h"
 #import "RNCPStore.h"
 
-API_AVAILABLE(ios(12.0))
-typedef void (^SearchResultUpdateBlock)(NSArray<CPListItem *> *_Nonnull);
-typedef void (^SelectedResultBlock)(void);
+typedef void(^SearchResultUpdateBlock)(NSArray<CPListItem *> * _Nonnull);
+typedef void(^SelectedResultBlock)(void);
 
-API_AVAILABLE(ios(12.0))
-@interface RNCarPlay : RCTEventEmitter <RCTBridgeModule, CPInterfaceControllerDelegate, CPSearchTemplateDelegate, CPListTemplateDelegate, CPMapTemplateDelegate, CPTabBarTemplateDelegate, CPPointOfInterestTemplateDelegate, CPNowPlayingTemplateObserver>
-{
+@interface RNCarPlay : RCTEventEmitter<RCTBridgeModule, CPInterfaceControllerDelegate, CPSearchTemplateDelegate, CPListTemplateDelegate, CPMapTemplateDelegate,  CPTabBarTemplateDelegate, CPPointOfInterestTemplateDelegate, CPNowPlayingTemplateObserver> {
     CPInterfaceController *interfaceController;
     CPWindow *window;
     SearchResultUpdateBlock searchResultBlock;
@@ -19,14 +16,14 @@ API_AVAILABLE(ios(12.0))
     BOOL isNowPlayingActive;
 }
 
-@property(nonatomic, retain) CPInterfaceController * _Nonnull interfaceController;
-@property(nonatomic, retain) CPWindow * _Nonnull window;
-@property(nonatomic, copy) SearchResultUpdateBlock _Nullable searchResultBlock;
-@property(nonatomic, copy) SelectedResultBlock _Nullable selectedResultBlock;
-@property(nonatomic) BOOL isNowPlayingActive;
-@property(nullable, nonatomic, copy) void (^listImageRowHandler)(CPListImageRowItem * _Nonnull item, NSInteger index, dispatch_block_t _Nonnull completionBlock) API_AVAILABLE(ios(14.0));
+@property (nonatomic, retain) CPInterfaceController *interfaceController;
+@property (nonatomic, retain) CPWindow *window;
+@property (nonatomic, copy) SearchResultUpdateBlock searchResultBlock;
+@property (nonatomic, copy) SelectedResultBlock selectedResultBlock;
+@property (nonatomic) BOOL isNowPlayingActive;
 
-+ (void)connectWithInterfaceController:(CPInterfaceController *_Nonnull)interfaceController window:(CPWindow *_Nonnull)window;
-+ (void)disconnect;
++ (void) connectWithInterfaceController:(CPInterfaceController*)interfaceController window:(CPWindow*)window;
++ (void) disconnect;
+- (NSArray<CPListSection*>*) parseSections:(NSArray*)sections templateId:(NSString *)templateId;
 
 @end