Merge branch 'release/1.0' into chore/e2e-finalisation

# Conflicts:
#	packages/app-harness/src/app/index.tsx

packages/app-harness/appConfigs/base/renative.json

@@ -29,9 +29,6 @@
         "backgroundColor": "#111111",
         "fontSources": [
             "{{resolvePackage(react-native-vector-icons)}}/Fonts"
-        ],
-        "assetSources": [
-            "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
         ]
     },
     "platforms": {
@@ -93,6 +90,9 @@
             "includedPermissions": [
                 "*"
             ],
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "runScheme": "Debug",
@@ -116,6 +116,9 @@
             "includedPermissions": [
                 "*"
             ],
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "runScheme": "Debug",
@@ -138,6 +141,7 @@
             "includedPermissions": [
                 "INTERNET"
             ],
+
             "buildSchemes": {
                 "debug": {
                     "signingConfig": "Debug",
@@ -173,6 +177,9 @@
             "includedPermissions": [
                 "*"
             ],
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "signingConfig": "Debug",
@@ -197,6 +204,9 @@
             "includedPermissions": [
                 "*"
             ],
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "signingConfig": "Debug",
@@ -221,6 +231,9 @@
             "includedPermissions": [
                 "*"
             ],
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "signingConfig": "Debug",
@@ -243,6 +256,9 @@
             "certificateProfile": "RNVanillaCert",
             "package": "NkVRhWHJST",
             "id": "NkVRhWHJST.RNVanillaTV",
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false
@@ -259,6 +275,9 @@
             "certificateProfile": "RNVanillaCert",
             "package": "cHIP2fIRQZ",
             "id": "cHIP2fIRQZ.RNVanillaWatch",
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false
@@ -275,6 +294,9 @@
             "certificateProfile": "RNVanillaCert",
             "package": "PauodvCU2r",
             "id": "PauodvCU2r.RNVanillaMobile",
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false
@@ -289,6 +311,9 @@
             "entryFile": "index",
             "pagesDir": "src/pages",
             "devServerHost": "0.0.0.0",
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false,
@@ -319,6 +344,9 @@
             "entryFile": "index",
             "pagesDir": "src/pages",
             "devServerHost": "0.0.0.0",
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false,
@@ -338,6 +366,9 @@
         },
         "webos": {
             "entryFile": "index",
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false
@@ -353,6 +384,9 @@
             "templateVSProject": {
                 "language": "cpp"
             },
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false
@@ -366,6 +400,9 @@
         },
         "linux": {
             "entryFile": "index",
+            "assetSources": [
+                "{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
+            ],
             "buildSchemes": {
                 "debug": {
                     "bundleAssets": false

packages/app-harness/appConfigs/harness/assets/android/res/layout/launch_screen.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView android:layout_width="match_parent" android:layout_height="match_parent"
+        android:src="@drawable/splash_icon" android:scaleType="centerCrop" />
+</RelativeLayout>

packages/app-harness/appConfigs/harness/assets/android/res/values-v28/styles.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowBackground">@color/bg</item>
+        <item name="android:windowIsTranslucent">true</item> 
+    </style>
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@color/bg</item>
+    </style>
+</resources>

packages/app-harness/appConfigs/harness/assets/android/res/values/styles.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
+        <item name="android:windowBackground">@color/bg</item>
+        <item name="android:windowIsTranslucent">true</item> 
+    </style>
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@color/bg</item>
+    </style>
+</resources>

packages/app-harness/appConfigs/harness/assets/ios/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"idiom":"watch","filename":"172.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"86x86","expected-size":"172","role":"quickLook"},{"idiom":"watch","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"40x40","expected-size":"80","role":"appLauncher"},{"idiom":"watch","filename":"88.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"40mm","scale":"2x","size":"44x44","expected-size":"88","role":"appLauncher"},{"idiom":"watch","filename":"102.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"45x45","expected-size":"102","role":"appLauncher"},{"idiom":"watch","filename":"92.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"46x46","expected-size":"92","role":"appLauncher"},{"idiom":"watch","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"50x50","expected-size":"100","role":"appLauncher"},{"idiom":"watch","filename":"196.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"98x98","expected-size":"196","role":"quickLook"},{"idiom":"watch","filename":"216.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"108x108","expected-size":"216","role":"quickLook"},{"idiom":"watch","filename":"48.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"24x24","expected-size":"48","role":"notificationCenter"},{"idiom":"watch","filename":"55.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"27.5x27.5","expected-size":"55","role":"notificationCenter"},{"idiom":"watch","filename":"66.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"33x33","expected-size":"66","role":"notificationCenter"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"3x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"2x"},{"size":"1024x1024","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch-marketing","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]}

packages/app-harness/appConfigs/harness/assets/ios/Assets.xcassets/launch-image.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "launch-image.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "launch-image@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "launch-image@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

packages/app-harness/package.json

@@ -50,7 +50,9 @@
         "react-native-gesture-handler": "2.13.1",
         "react-native-permissions": "3.10.1",
         "react-native-tvos": "0.72.4-0",
-        "react-native-web": "0.19.9"
+        "react-native-web": "0.19.9",
+        "react-native-splash-screen": "3.3.0",
+        "react-native-carplay": "2.3.0"
     },
     "devDependencies": {
         "@flexn/assets-renative-outline": "0.3.3",

packages/app-harness/renative.json

@@ -6,6 +6,54 @@
         "path": "./secrets/privateConfigs.enc"
     },
     "plugins": {
+        "react-native-splash-screen": {
+            "android": {
+                "templateAndroid": {
+                    "MainActivity_java": {
+                        "createMethods": ["SplashScreen.show(this)"],
+                        "imports": ["android.os.Bundle", "org.devio.rn.splashscreen.SplashScreen"]
+                    }
+                },
+                "package": "org.devio.rn.splashscreen.SplashScreenReactPackage"
+            },
+            "ios": {
+                "templateXcode": {
+                    "AppDelegate_mm": {
+                        "appDelegateImports": ["RNSplashScreen.h"],
+                        "appDelegateMethods": {
+                            "application": {
+                                "didFinishLaunchingWithOptions": ["[RNSplashScreen show]"]
+                            }
+                        }
+                    }
+                },
+                "podName": "react-native-splash-screen"
+            },
+            "version": "3.3.0"
+        },
+        "react-native-carplay": {
+            "ios": {
+                "templateXcode": {
+                    "AppDelegate_h": {
+                        "appDelegateImports": ["CarPlay/CarPlay.h"],
+                        "appDelegateExtensions": ["UIApplicationDelegate", "CPApplicationDelegate"]
+                    },
+                    "AppDelegate_mm": {
+                        "appDelegateImports": ["RNCarPlay.h"],
+                        "appDelegateMethods": {
+                            "application": {
+                                "didConnectCarInterfaceController": [
+                                    "[RNCarPlay connectWithInterfaceController:interfaceController window:window]"
+                                ],
+                                "didDisconnectCarInterfaceController": ["[RNCarPlay disconnect]"]
+                            }
+                        }
+                    }
+                },
+                "podName": "react-native-carplay"
+            },
+            "version": "2.3.0"
+        },
         "react-native-permissions": "3.10.1",
         "react-native": {
             "android": {

packages/app-harness/src/app/index.tsx

@@ -1,8 +1,12 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Text, View } from 'react-native';
 import { testProps } from '../config';
+import SplashScreen from 'react-native-splash-screen';
 
 const App = () => {
+    useEffect(() => {
+        SplashScreen.hide();
+    }, []);
     return (
         <View>
             <Text {...testProps('app-harness-home-screen-intro-text')}>ReNative Harness</Text>