Skip to content

Fixes to install viro with expo #193

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Fixes to install viro with expo #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c626cb9
fix version and name
francescovenica Jan 28, 2023
68a94c6
Merge pull request #1 from francescovenica/fix-exoplayer-VRTQuad
francescovenica Jan 28, 2023
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
2 changes: 1 addition & 1 deletion components/ViroSurface.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class ViroSurface extends ViroBase<Props> {
}

var VRTSurface = requireNativeComponent(
"VRTQuad",
"ViroSurface",
// @ts-ignore
ViroSurface,
{
Expand Down
1 change: 0 additions & 1 deletion dist/components/Viro3DObject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class Viro3DObject extends ViroBase_1.ViroBase {
(0, ViroProps_1.checkMisnamedProps)("Viro3DObject", this.props);
const modelsrc = resolveAssetSource(this.props.source);
const resources = this.props.resources?.map((resource) => resolveAssetSource(resource));
console.log("RESOURCES", resources);
// Since materials and transformBehaviors can be either a string or an array, convert the string to a 1-element array.
const materials = typeof this.props.materials === "string"
? [this.props.materials]
Expand Down
2 changes: 1 addition & 1 deletion dist/components/ViroSurface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class ViroSurface extends ViroBase_1.ViroBase {
}
}
exports.ViroSurface = ViroSurface;
var VRTSurface = (0, react_native_1.requireNativeComponent)("VRTQuad",
var VRTSurface = (0, react_native_1.requireNativeComponent)("ViroSurface",
// @ts-ignore
ViroSurface, {
nativeOnly: {
Expand Down
6 changes: 1 addition & 5 deletions dist/plugins/withViroAndroid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const withViroAppBuildGradle = (config) => (0, config_plugins_1.withAppBuildGrad
implementation project(':arcore_client')
implementation project(path: ':react_viro')
implementation project(path: ':viro_renderer')
implementation 'com.google.android.exoplayer:exoplayer:2.7.1'
implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'`);
return config;
});
Expand All @@ -117,8 +117,6 @@ const withViroManifest = (config) => (0, config_plugins_1.withAndroidManifest)(c
});
if (viroPluginConfig.includes("GVR") ||
viroPluginConfig.includes("OVR_MOBILE")) {
console.log(contents?.manifest?.application?.[0]?.activity[0]["intent-filter"][0]
.category);
// <!-- Add the following line for cardboard -->
// <category android:name="com.google.intent.category.CARDBOARD" />
contents?.manifest?.application?.[0]?.activity[0]["intent-filter"][0].category.push({
Expand All @@ -133,8 +131,6 @@ const withViroManifest = (config) => (0, config_plugins_1.withAndroidManifest)(c
"android:name": "com.google.intent.category.DAYDREAM",
},
});
console.log(contents?.manifest?.application?.[0]?.activity[0]["intent-filter"][0]
.category);
}
contents.manifest.queries = [
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/withViroAndroid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const withViroAppBuildGradle = (config: ExpoConfig) =>
implementation project(':arcore_client')
implementation project(path: ':react_viro')
implementation project(path: ':viro_renderer')
implementation 'com.google.android.exoplayer:exoplayer:2.7.1'
implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'`
);
return config;
Expand Down