Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/bring back objc and java injections and add splashScreen example #1331

Merged
merged 14 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions packages/app-harness/appConfigs/base/renative.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
"backgroundColor": "#111111",
"fontSources": [
"{{resolvePackage(react-native-vector-icons)}}/Fonts"
],
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
]
},
"platforms": {
Expand Down Expand Up @@ -93,6 +90,9 @@
"includedPermissions": [
"*"
],
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"runScheme": "Debug",
Expand All @@ -116,6 +116,9 @@
"includedPermissions": [
"*"
],
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"runScheme": "Debug",
Expand All @@ -138,6 +141,7 @@
"includedPermissions": [
"INTERNET"
],

"buildSchemes": {
"debug": {
"signingConfig": "Debug",
Expand Down Expand Up @@ -173,6 +177,9 @@
"includedPermissions": [
"*"
],
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"signingConfig": "Debug",
Expand All @@ -197,6 +204,9 @@
"includedPermissions": [
"*"
],
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"signingConfig": "Debug",
Expand All @@ -221,6 +231,9 @@
"includedPermissions": [
"*"
],
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"signingConfig": "Debug",
Expand All @@ -243,6 +256,9 @@
"certificateProfile": "RNVanillaCert",
"package": "NkVRhWHJST",
"id": "NkVRhWHJST.RNVanillaTV",
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"bundleAssets": false
Expand All @@ -259,6 +275,9 @@
"certificateProfile": "RNVanillaCert",
"package": "cHIP2fIRQZ",
"id": "cHIP2fIRQZ.RNVanillaWatch",
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"bundleAssets": false
Expand All @@ -275,6 +294,9 @@
"certificateProfile": "RNVanillaCert",
"package": "PauodvCU2r",
"id": "PauodvCU2r.RNVanillaMobile",
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"bundleAssets": false
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -338,6 +366,9 @@
},
"webos": {
"entryFile": "index",
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"bundleAssets": false
Expand All @@ -353,6 +384,9 @@
"templateVSProject": {
"language": "cpp"
},
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"bundleAssets": false
Expand All @@ -366,6 +400,9 @@
},
"linux": {
"entryFile": "index",
"assetSources": [
"{{resolvePackage(@flexn/assets-renative-outline)}}/assets"
],
"buildSchemes": {
"debug": {
"bundleAssets": false
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"}]}
Original file line number Diff line number Diff line change
@@ -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
}
}
4 changes: 3 additions & 1 deletion packages/app-harness/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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",
Expand Down
48 changes: 48 additions & 0 deletions packages/app-harness/renative.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 5 additions & 1 deletion packages/app-harness/src/app/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import React from 'react';
import React, { useEffect } from 'react';
import { Text, View } from 'react-native';
import SplashScreen from 'react-native-splash-screen';

const App = () => {
useEffect(() => {
SplashScreen.hide();
}, []);
return (
<View>
<Text>ReNative Harness</Text>
Expand Down
Loading