@reactvision/react-viro 2.41.4 → 2.41.6

package/components/Telemetry/ViroTelemetry.ts

@@ -4,9 +4,7 @@ import { Platform } from "react-native";
 export class ViroTelemetry {
   private static _isDisabled = false;
   private static _isDebugging = false;
-  // TODO: use custom domain
-  // private static _telemetryUrl = "https://telemetry.nativevision.xyz";
-  private static _telemetryUrl = "https://native-vision-telemetry.onrender.com";
+  private static _telemetryUrl = "https://telemetry.reactvision.org";
   private static _timeout = 8000;
 
   /**

package/components/Utilities/ViroVersion.ts

@@ -1 +1 @@
-export const VIRO_VERSION = "2.41.4";
+export const VIRO_VERSION = "2.41.6";

package/dist/components/Telemetry/ViroTelemetry.js

@@ -6,9 +6,7 @@ const react_native_1 = require("react-native");
 class ViroTelemetry {
     static _isDisabled = false;
     static _isDebugging = false;
-    // TODO: use custom domain
-    // private static _telemetryUrl = "https://telemetry.nativevision.xyz";
-    static _telemetryUrl = "https://native-vision-telemetry.onrender.com";
+    static _telemetryUrl = "https://telemetry.reactvision.org";
     static _timeout = 8000;
     /**
      * Allow a user to start debugging the telemetry to see what is sent.

package/dist/components/Telemetry/index.js

@@ -4,94 +4,94 @@ exports.ViroTelemetry = void 0;
 const ViroVersion_1 = require("../Utilities/ViroVersion");
 const react_native_1 = require("react-native");
 class ViroTelemetry {
-    static _isDisabled = false;
-    static _isDebugging = false;
-    // TODO: use custom domain
-    // private static _telemetryUrl = "https://telemetry.nativevision.xyz";
-    static _telemetryUrl = "https://native-vision-telemetry.onrender.com";
-    static _timeout = 8000;
-    /**
-     * Allow a user to start debugging the telemetry to see what is sent.
-     */
-    static setDebugging() {
-        this._isDebugging = true;
+  static _isDisabled = false;
+  static _isDebugging = false;
+  // TODO: use custom domain
+  // private static _telemetryUrl = "https://telemetry.reactvision.org";
+  static _telemetryUrl = "https://telemetry.reactvision.org";
+  static _timeout = 8000;
+  /**
+   * Allow a user to start debugging the telemetry to see what is sent.
+   */
+  static setDebugging() {
+    this._isDebugging = true;
+  }
+  /**
+   * Allow a user to opt out of telemetry.
+   */
+  static optOutTelemetry() {
+    this._isDisabled = true;
+  }
+  static recordTelemetry(eventName, payload = {}) {
+    // Skip recording telemetry if the feature is disabled
+    if (this._isDisabled) return;
+    // Do not send the telemetry data if debugging. Users may use this feature
+    // to preview what data would be sent.
+    if (this._isDebugging) {
+      console.log(
+        `[telemetry] ` + JSON.stringify({ eventName, payload }, null, 2)
+      );
+      return;
     }
-    /**
-     * Allow a user to opt out of telemetry.
-     */
-    static optOutTelemetry() {
-        this._isDisabled = true;
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), this._timeout);
+    payload = { ...payload, ...this.getAnonymousMeta() };
+    fetch(`${this._telemetryUrl}/api/v1/record`, {
+      method: "PUT",
+      body: JSON.stringify({ eventName, payload }),
+      headers: { "content-type": "application/json" },
+      signal: controller.signal,
+    })
+      .catch((e) => console.error(e))
+      .finally(() => clearTimeout(timeoutId));
+  }
+  static getAnonymousMeta() {
+    let isExpo = false;
+    try {
+      const myModule = require("expo");
+      isExpo = true;
+    } catch (err) {
+      // send error to log file
     }
-    static recordTelemetry(eventName, payload = {}) {
-        // Skip recording telemetry if the feature is disabled
-        if (this._isDisabled)
-            return;
-        // Do not send the telemetry data if debugging. Users may use this feature
-        // to preview what data would be sent.
-        if (this._isDebugging) {
-            console.log(`[telemetry] ` + JSON.stringify({ eventName, payload }, null, 2));
-            return;
-        }
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), this._timeout);
-        payload = { ...payload, ...this.getAnonymousMeta() };
-        fetch(`${this._telemetryUrl}/api/v1/record`, {
-            method: "PUT",
-            body: JSON.stringify({ eventName, payload }),
-            headers: { "content-type": "application/json" },
-            signal: controller.signal,
-        })
-            .catch((e) => console.error(e))
-            .finally(() => clearTimeout(timeoutId));
-    }
-    static getAnonymousMeta() {
-        let isExpo = false;
-        try {
-            const myModule = require("expo");
-            isExpo = true;
-        }
-        catch (err) {
-            // send error to log file
-        }
-        try {
-            const traits = {
-                // expo
-                isExpo: 
-                // @ts-ignore
-                Boolean(window?.expo) || false,
-                sdkVersion: 
-                // @ts-ignore
-                window?.expo?.modules?.ExponentConstants?.sdkVersion || undefined,
-                androidPackage: 
-                // @ts-ignore
-                window?.expo?.modules?.ExponentConstants?.android?.package ||
-                    undefined,
-                iosBundleIdentifier: 
-                // @ts-ignore
-                window?.expo?.modules?.ExponentConstants?.ios?.bundleIdentifier ||
-                    undefined,
-                expoDebugMode: 
-                // @ts-ignore
-                window?.expo?.modules?.ExponentConstants?.debugMode || undefined,
-                isDevice: 
-                // @ts-ignore
-                window?.expo?.modules?.ExponentConstants?.isDevice || undefined,
-                // library version
-                viroVersion: ViroVersion_1.VIRO_VERSION,
-                platform: react_native_1.Platform.OS,
-                deviceOsVersion: react_native_1.Platform.Version,
-                reactNativeVersion: react_native_1.Platform.constants.reactNativeVersion.major +
-                    "." +
-                    react_native_1.Platform.constants.reactNativeVersion.minor +
-                    "." +
-                    react_native_1.Platform.constants.reactNativeVersion.patch,
-            };
-            return traits;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        return {};
+    try {
+      const traits = {
+        // expo
+        isExpo:
+          // @ts-ignore
+          Boolean(window?.expo) || false,
+        sdkVersion:
+          // @ts-ignore
+          window?.expo?.modules?.ExponentConstants?.sdkVersion || undefined,
+        androidPackage:
+          // @ts-ignore
+          window?.expo?.modules?.ExponentConstants?.android?.package ||
+          undefined,
+        iosBundleIdentifier:
+          // @ts-ignore
+          window?.expo?.modules?.ExponentConstants?.ios?.bundleIdentifier ||
+          undefined,
+        expoDebugMode:
+          // @ts-ignore
+          window?.expo?.modules?.ExponentConstants?.debugMode || undefined,
+        isDevice:
+          // @ts-ignore
+          window?.expo?.modules?.ExponentConstants?.isDevice || undefined,
+        // library version
+        viroVersion: ViroVersion_1.VIRO_VERSION,
+        platform: react_native_1.Platform.OS,
+        deviceOsVersion: react_native_1.Platform.Version,
+        reactNativeVersion:
+          react_native_1.Platform.constants.reactNativeVersion.major +
+          "." +
+          react_native_1.Platform.constants.reactNativeVersion.minor +
+          "." +
+          react_native_1.Platform.constants.reactNativeVersion.patch,
+      };
+      return traits;
+    } catch (e) {
+      console.error(e);
     }
+    return {};
+  }
 }
 exports.ViroTelemetry = ViroTelemetry;

package/dist/components/Utilities/ViroVersion.d.ts

@@ -1 +1 @@
-export declare const VIRO_VERSION = "2.41.4";
+export declare const VIRO_VERSION = "2.41.6";

package/dist/components/Utilities/ViroVersion.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VIRO_VERSION = void 0;
-exports.VIRO_VERSION = "2.41.4";
+exports.VIRO_VERSION = "2.41.6";

package/dist/plugins/withViroAndroid.js

@@ -140,7 +140,10 @@ 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.19.1'
+    implementation 'androidx.media3:media3-exoplayer:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.1'
     implementation 'com.google.protobuf.nano:protobuf-javanano:3.1.0'
     // ========================================================================`);
     config.modResults.contents = config.modResults.contents.replace(/implementation\("com.facebook.react:react-android"\)/, `implementation("com.facebook.react:react-android")
@@ -151,7 +154,10 @@ 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.19.1'
+    implementation 'androidx.media3:media3-exoplayer:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.1'
     implementation 'com.google.protobuf.nano:protobuf-javanano:3.1.0'
     // ========================================================================
     `);

package/package.json

@@ -3,7 +3,7 @@
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "version": "2.41.4",
+  "version": "2.41.6",
   "license": "MIT",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/android/gvr_common/build/.transforms/1f305c8102b4f1e133a87e936f1e9964/results.bin

@@ -1 +0,0 @@
-o/com.google.vr.cardboard

package/android/gvr_common/build/.transforms/671af4785a8109ab1e811c3e952ce8a0/results.bin

@@ -1 +0,0 @@
-o/jetified-sdk-common-1.180.0-api.jar

package/android/gvr_common/build/.transforms/7ef00283b562187d9050275ffa4b0660/results.bin

@@ -1 +0,0 @@
-i/res

package/android/gvr_common/build/.transforms/f19cf8825806cdc4e4891f0b3948f623/results.bin

@@ -1 +0,0 @@
-o/jetified-sdk-common-1.180.0.aar

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/results.bin

@@ -1 +0,0 @@
-o/jetified-sdk-common-1.180.0

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/AndroidManifest.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.vr.cardboard" >
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="19" />
-
-</manifest>

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/R.txt

@@ -1,55 +0,0 @@
-int color alignment_marker_color 0x1
-int color white_transparent 0x1
-int dimen alignment_marker_height 0x1
-int dimen alignment_marker_thickness 0x1
-int dimen transition_bottom_bar_height 0x1
-int drawable quantum_ic_close_white_24 0x1
-int drawable quantum_ic_settings_white_24 0x1
-int drawable rippleable 0x1
-int drawable transition 0x1
-int id back_button 0x1
-int id divider 0x1
-int id transition_bottom_frame 0x1
-int id transition_frame 0x1
-int id transition_icon 0x1
-int id transition_question_text 0x1
-int id transition_switch_action 0x1
-int id transition_text 0x1
-int id transition_top_frame 0x1
-int id ui_alignment_marker 0x1
-int id ui_back_button 0x1
-int id ui_back_button_holder 0x1
-int id ui_settings_button 0x1
-int id ui_settings_button_holder 0x1
-int layout back_button 0x1
-int layout settings_button 0x1
-int layout transition_view 0x1
-int layout ui_layer 0x1
-int layout ui_layer_with_portrait_support 0x1
-int string back_button_content_description 0x1
-int string cancel_button 0x1
-int string dialog_button_got_it 0x1
-int string dialog_button_open_help_center 0x1
-int string dialog_message_incompatible_phone 0x1
-int string dialog_message_no_cardboard 0x1
-int string dialog_title 0x1
-int string dialog_title_incompatible_phone 0x1
-int string dialog_title_vr_core_not_enabled 0x1
-int string dialog_title_vr_core_not_installed 0x1
-int string dialog_title_warning 0x1
-int string dialog_vr_core_not_enabled 0x1
-int string dialog_vr_core_not_installed 0x1
-int string go_to_playstore_button 0x1
-int string go_to_vr_listeners_settings_button 0x1
-int string gvr_vr_mode_component 0x1
-int string no_browser_text 0x1
-int string place_your_phone_into_cardboard 0x1
-int string place_your_viewer_into_viewer_format 0x1
-int string settings_button_content_description 0x1
-int string setup_button 0x1
-int string switch_viewer_action 0x1
-int string switch_viewer_prompt 0x1
-int style GvrDialogTheme 0x1
-int style NoSystemUI 0x1
-int style UiButton 0x1
-int style VrActivityTheme 0x1

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/proguard.txt

@@ -1,19 +0,0 @@
-# Proguard rules for commonly-shared libraries in gvr.
-
-# Note: this comes from //jcg/android/apps/common/proguard/annotations.flags
-# but cannot be used directly because it would require including a google3
-# Java dependency in VR Toolkit, which would break the gradle build.
--keepattributes *Annotation*
-# Keep natively accessed methods used by Cardboard.
-# TODO(b/28564144): remove when the old UsedByNative annotation is removed.
--keep class com.google.vr.cardboard.UsedByNative
--keep @com.google.vr.cardboard.UsedByNative class *
--keepclassmembers class * {
-    @com.google.vr.cardboard.UsedByNative *;
-}
-
-# These are part of the Java <-> native interfaces for GVR.
--keepclasseswithmembernames,includedescriptorclasses class com.google.vr.** {
-    native <methods>;
-}
-

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/drawable/rippleable.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Background that displays a white transparent color when touched.
-  This does no actual rippling pre-21, but is overridden on 21 to use a RippleDrawable.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@color/white_transparent"
-        android:state_pressed="true"/>
-    <item android:drawable="@android:color/transparent"/>
-</selector>

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/drawable-v21/rippleable.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Background that ripples with a white transparent color when touched.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/white_transparent">
-</ripple>

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/layout/back_button.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Back button for portrait orientation with left-to-right locale -->
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/UiButton"
-  android:src="@drawable/quantum_ic_close_white_24"
-  android:layout_alignParentRight="true"
-  android:layout_alignParentTop="true"/>
-

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/layout/settings_button.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Settings button for portrait orientation with left-to-right locale -->
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/UiButton"
-  android:src="@drawable/quantum_ic_settings_white_24"
-  android:contentDescription="@string/settings_button_content_description"
-  android:layout_alignParentRight="true"
-  android:layout_alignParentBottom="true"/>
-

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/layout/transition_view.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/transition_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/back_button"
-        style="@style/UiButton"
-        android:src="@drawable/quantum_ic_close_white_24"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"/>
-
-    <RelativeLayout
-        android:id="@+id/transition_top_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:paddingBottom="48dp">
-
-        <ImageView
-            android:id="@+id/transition_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:layout_centerHorizontal="true"
-            android:scaleType="center"
-            android:src="@drawable/transition" />
-        <TextView
-            android:id="@+id/transition_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:gravity="center"
-            android:textColor="#ffffff"
-            android:textSize="16sp"
-            android:layout_below="@id/transition_icon"
-            android:text="@string/place_your_phone_into_cardboard" />
-    </RelativeLayout>
-
-    <!-- Note that the transition_bottom_frame element may be programmatically
-         hidden when the device or view layout is landscape. -->
-    <LinearLayout
-        android:id="@+id/transition_bottom_frame"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/transition_bottom_bar_height"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:background="#FF546E7A">
-        <TextView
-            android:id="@+id/transition_question_text"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_below="@id/transition_icon"
-            android:layout_marginStart="24dp"
-            android:paddingEnd="20dp"
-            android:gravity="start|center_vertical"
-            android:textColor="#ffffff"
-            android:textSize="16sp"
-            android:text="@string/switch_viewer_prompt"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:id="@+id/divider"
-            android:background="#1F000000"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
-        <TextView
-            android:id="@+id/transition_switch_action"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingStart="20dp"
-            android:paddingEnd="24dp"
-            android:gravity="end|center_vertical"
-            android:textColor="#ffffff"
-            android:textSize="16sp"
-            android:text="@string/switch_viewer_action"
-            android:textAllCaps="true"
-            android:background="?android:attr/selectableItemBackground"/>
-    </LinearLayout>
-
-</RelativeLayout>