react-native-acoustic-connect-beta 18.0.14 → 18.0.15

package/Examples/SampleUI/.detoxrc.js

@@ -0,0 +1,83 @@
+/** @type {Detox.DetoxConfig} */
+module.exports = {
+  testRunner: {
+    args: {
+      '$0': 'jest',
+      config: 'e2e/jest.config.js'
+    },
+    jest: {
+      setupTimeout: 120000
+    }
+  },
+  apps: {
+    'ios.debug': {
+      type: 'ios.app',
+      binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/SampleUI.app',
+      build: 'xcodebuild -workspace ios/SampleUI.xcworkspace -scheme SampleUI -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build'
+    },
+    'ios.release': {
+      type: 'ios.app',
+      binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/SampleUI.app',
+      build: 'xcodebuild -workspace ios/SampleUI.xcworkspace -scheme SampleUI -configuration Release -sdk iphonesimulator -derivedDataPath ios/build'
+    },
+    'android.debug': {
+      type: 'android.apk',
+      binaryPath: 'android/app/build/outputs/apk/debug/app-debug.apk',
+      build: 'cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
+      reversePorts: [
+        8081
+      ]
+    },
+    'android.release': {
+      type: 'android.apk',
+      binaryPath: 'android/app/build/outputs/apk/release/app-release.apk',
+      build: 'cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release'
+    }
+  },
+  devices: {
+    simulator: {
+      type: 'ios.simulator',
+      device: {
+        type: 'iPhone 15'
+      }
+    },
+    attached: {
+      type: 'android.attached',
+      device: {
+        adbName: '.*'
+      }
+    },
+    emulator: {
+      type: 'android.emulator',
+      device: {
+        avdName: 'Pixel_3a_API_30_x86'
+      }
+    }
+  },
+  configurations: {
+    'ios.sim.debug': {
+      device: 'simulator',
+      app: 'ios.debug'
+    },
+    'ios.sim.release': {
+      device: 'simulator',
+      app: 'ios.release'
+    },
+    'android.att.debug': {
+      device: 'attached',
+      app: 'android.debug'
+    },
+    'android.att.release': {
+      device: 'attached',
+      app: 'android.release'
+    },
+    'android.emu.debug': {
+      device: 'emulator',
+      app: 'android.debug'
+    },
+    'android.emu.release': {
+      device: 'emulator',
+      app: 'android.release'
+    }
+  }
+};

package/Examples/SampleUI/ConnectConfig.json

@@ -1,7 +1,7 @@
 {
     "Connect": {
-        "AndroidVersion": "10.4.30",
-        "AppKey": "b6c3709b7a4c479bb4b5a9fb8fec324c",
+        "AndroidVersion": "10.4.48",
+        "AppKey": "fa47722a7fef4bcd8677fd8d6d113a0d",
         "KillSwitchUrl": "https://lib-us-2.brilliantcollector.com/collector/switch/b6c3709b7a4c479bb4b5a9fb8fec324c",
         "PostMessageUrl": "https://lib-us-2.brilliantcollector.com/collector/collectorPost",
         "iOSVersion": "",

package/Examples/SampleUI/android/app/build.gradle

@@ -116,6 +116,9 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
+    // Connect SDK libraries
+    implementation 'io.github.go-acoustic:connect:10.4.48'
+  
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {

package/Examples/SampleUI/android/app/src/main/java/com/sampleui/MainActivity.kt

@@ -26,40 +26,5 @@ class MainActivity : ReactActivity() {
         Connect.dispatchTouchEvent(this, e)
         return super.dispatchTouchEvent(e)
     }
-
-    override fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-        Connect.dispatchTouchEvent(this, e)
-        return super.dispatchTouchEvent(e)
-    }
-
-    override fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-        Connect.dispatchTouchEvent(this, e)
-        return super.dispatchTouchEvent(e)
-    }
-
-    override fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-        Connect.dispatchTouchEvent(this, e)
-        return super.dispatchTouchEvent(e)
-    }
-
-    override fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-        Connect.dispatchTouchEvent(this, e)
-        return super.dispatchTouchEvent(e)
-    }
-
-    override fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-        Connect.dispatchTouchEvent(this, e)
-        return super.dispatchTouchEvent(e)
-    }
-
-    override fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-        Connect.dispatchTouchEvent(this, e)
-        return super.dispatchTouchEvent(e)
-    }
-
-    override fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-        Connect.dispatchTouchEvent(this, e)
-        return super.dispatchTouchEvent(e)
-    }
 }
 

package/Examples/SampleUI/android/settings.gradle

@@ -18,4 +18,4 @@ include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
+useExpoModules()

package/Examples/SampleUI/package.json

@@ -8,12 +8,12 @@
     "lint": "eslint .",
     "start": "react-native start",
     "test": "jest",
-    "updateYalc": "yalc update react-native-acoustic-connect-beta && cd ios && pod install && cd .."
+    "updateYalc": "yalc update react-native-acoustic-connect-beta && cd ios && pod install && cd ..",
+    "test:integration:android": "bash scripts/integration-test-android.sh"
   },
   "dependencies": {
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-    "@expo/vector-icons": "^14.1.0",
-    "@expo/webpack-config": "^19.0.1",
+    "@expo/vector-icons": "~14.0.4",
     "@pchmn/expo-material3-theme": "^1.3.2",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-masked-view/masked-view": "^0.3.2",
@@ -22,8 +22,8 @@
     "@react-navigation/native": "^7.1.6",
     "@react-navigation/stack": "^7.2.10",
     "expo": "~52.0.0",
-    "expo-font": "^13.0.4",
-    "expo-status-bar": "^2.0.1",
+    "expo-font": "~13.0.4",
+    "expo-status-bar": "~2.0.1",
     "react": "18.3.1",
     "react-native": "0.76.9",
     "react-native-acoustic-connect-beta": "file:.yalc/react-native-acoustic-connect-beta",
@@ -51,10 +51,12 @@
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.6.3",
     "babel-plugin-module-resolver": "^5.0.2",
+    "detox": "^20.40.2",
     "eslint": "^8.19.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react-test-renderer": "18.3.1",
+    "react-devtools": "^6.1.2",
+    "react-test-renderer": "^18.2.0",
     "typescript": "^5.3.3"
   },
   "engines": {

package/Examples/SampleUI/scripts/integration-test-android.sh

@@ -0,0 +1,292 @@
+#!/bin/bash
+set -euo pipefail
+
+APP_ID="com.sampleui" # <-- Update if your appId is different
+APK_PATH="android/app/build/outputs/apk/debug/app-debug.apk"
+
+# Function to find and tap element by text
+find_and_tap_by_text() {
+    local text="$1"
+    local max_attempts="${2:-3}"
+    local attempt=1
+    
+    echo "Looking for element with text: '$text'"
+    
+    while [ $attempt -le $max_attempts ]; do
+        # Dump UI hierarchy
+        adb shell uiautomator dump /sdcard/window_dump.xml
+        
+        # Extract coordinates for the text
+        local coords=$(adb shell "cat /sdcard/window_dump.xml | grep -A 5 -B 5 '$text' | grep 'bounds=' | head -1 | sed 's/.*bounds=\"\[\([0-9]*\),\([0-9]*\)\]\[\([0-9]*\),\([0-9]*\)\].*/\1 \2 \3 \4/'")
+        
+        if [ -n "$coords" ]; then
+            # Parse coordinates
+            local x1=$(echo $coords | awk '{print $1}')
+            local y1=$(echo $coords | awk '{print $2}')
+            local x2=$(echo $coords | awk '{print $3}')
+            local y2=$(echo $coords | awk '{print $4}')
+            
+            # Calculate center point
+            local center_x=$(( (x1 + x2) / 2 ))
+            local center_y=$(( (y1 + y2) / 2 ))
+            
+            echo "Found '$text' at coordinates: ($center_x, $center_y)"
+            adb shell input tap $center_x $center_y
+            return 0
+        else
+            echo "Attempt $attempt: Element '$text' not found, retrying..."
+            sleep 2
+            attempt=$((attempt + 1))
+        fi
+    done
+    
+    echo "ERROR: Could not find element with text '$text' after $max_attempts attempts"
+    return 1
+}
+
+# Function to find and tap one of multiple possible button texts
+find_and_tap_button() {
+    local button_texts=("$@")
+    
+    for text in "${button_texts[@]}"; do
+        if find_and_tap_by_text "$text" 1; then
+            echo "Successfully tapped button: '$text'"
+            return 0
+        fi
+    done
+    
+    echo "ERROR: Could not find any of the button texts: ${button_texts[*]}"
+    return 1
+}
+
+# Function to scroll and find element
+scroll_and_find_element() {
+    local text="$1"
+    local max_scrolls="${2:-5}"
+    local scroll_count=0
+    
+    while [ $scroll_count -lt $max_scrolls ]; do
+        if find_and_tap_by_text "$text" 1; then
+            return 0
+        fi
+        
+        echo "Scrolling to find '$text'..."
+        adb shell input swipe 500 800 500 200  # Scroll down
+        sleep 2
+        scroll_count=$((scroll_count + 1))
+    done
+    
+    echo "ERROR: Could not find '$text' after scrolling $max_scrolls times"
+    return 1
+}
+
+# Function to debug current screen content
+debug_screen_content() {
+    echo "=== DEBUG: Current screen content ==="
+    adb shell uiautomator dump /sdcard/window_dump.xml
+    adb shell "cat /sdcard/window_dump.xml | grep -E 'text=|content-desc=' | head -20"
+    echo "=== END DEBUG ==="
+}
+
+# 1. Start emulator if not running
+if ! adb devices | grep -w emulator >/dev/null; then
+  echo "No emulator running. Attempting to start the first available AVD..."
+  EMULATOR_NAME=$(emulator -list-avds | head -n 1)
+  if [ -z "$EMULATOR_NAME" ]; then
+    echo "No Android emulators found. Please create one via AVD Manager."
+    exit 1
+  fi
+  nohup emulator -avd "$EMULATOR_NAME" -no-snapshot-save -no-window > /dev/null 2>&1 &
+  echo "Waiting for emulator to boot..."
+  adb wait-for-device
+  sleep 30 # Give extra time for boot
+fi
+
+# 2. Build the app
+cd android
+./gradlew assembleDebug
+cd ..
+
+# 3. Install the APK
+adb install -r "$APK_PATH"
+
+# 4. Launch the app
+adb shell monkey -p "$APP_ID" -c android.intent.category.LAUNCHER 1
+
+# Wait for the app to start
+sleep 10
+
+# 5. Verify the app process is running
+if adb shell pidof "$APP_ID" | grep -q '[0-9]'; then
+  echo "App launched successfully!"
+else
+  echo "App did not launch."
+  exit 1
+fi
+
+# 6. Test Dialog functionality
+echo "Testing Dialog functionality..."
+
+# Wait for app to fully load
+sleep 5
+
+# Navigate to Dialog example
+echo "Navigating to Dialog example..."
+if ! scroll_and_find_element "Dialog"; then
+    echo "ERROR: Could not find Dialog example"
+    exit 1
+fi
+
+# Wait for Dialog screen to load and verify we're on the right screen
+echo "Waiting for Dialog screen to load..."
+sleep 5
+
+# Debug current screen
+debug_screen_content
+
+# Verify we're on the Dialog screen by checking for the header
+echo "Verifying we're on the Dialog screen..."
+if ! find_and_tap_by_text "Dialog" 1; then
+    echo "ERROR: Not on Dialog screen - Dialog header not found"
+    exit 1
+fi
+
+# Wait a bit more for the screen to fully load
+sleep 2
+
+# Debug screen again to see what's available
+echo "Final screen content before testing dialogs:"
+debug_screen_content
+
+# Test each dialog button
+echo "Testing dialog buttons..."
+
+# Test "Long text" dialog
+echo "Testing 'Long text' dialog..."
+if find_and_tap_by_text "Long text"; then
+    echo "Tapped 'Long text' button, waiting for dialog to appear..."
+    sleep 3  # Wait longer for dialog to appear
+    
+    # Debug screen after tapping
+    debug_screen_content
+    
+    if find_and_tap_button "Ok" "OK"; then
+        echo "✓ Long text dialog test passed"
+    else
+        echo "✗ Failed to close Long text dialog"
+        exit 1
+    fi
+else
+    echo "✗ Failed to open Long text dialog"
+    exit 1
+fi
+sleep 1
+
+# Test "Radio buttons" dialog
+echo "Testing 'Radio buttons' dialog..."
+if find_and_tap_by_text "Radio buttons"; then
+    echo "Tapped 'Radio buttons' button, waiting for dialog to appear..."
+    sleep 3  # Wait longer for dialog to appear
+    
+    if find_and_tap_button "Ok" "OK" "Cancel"; then
+        echo "✓ Radio buttons dialog test passed"
+    else
+        echo "✗ Failed to close Radio buttons dialog"
+        exit 1
+    fi
+else
+    echo "✗ Failed to open Radio buttons dialog"
+    exit 1
+fi
+sleep 1
+
+# Test "Progress indicator" dialog
+echo "Testing 'Progress indicator' dialog..."
+if find_and_tap_by_text "Progress indicator"; then
+    sleep 3  # Progress dialogs usually auto-dismiss
+    echo "✓ Progress indicator dialog test passed"
+else
+    echo "✗ Failed to open Progress indicator dialog"
+    exit 1
+fi
+sleep 1
+
+# Test "Undismissable Dialog"
+echo "Testing 'Undismissable Dialog'..."
+if find_and_tap_by_text "Undismissable Dialog"; then
+    sleep 3  # Wait longer for dialog to appear
+    if find_and_tap_button "Agree" "OK" "Ok"; then
+        echo "✓ Undismissable Dialog test passed"
+    else
+        echo "✗ Failed to close Undismissable Dialog"
+        exit 1
+    fi
+else
+    echo "✗ Failed to open Undismissable Dialog"
+    exit 1
+fi
+sleep 1
+
+# Test "Custom colors" dialog
+echo "Testing 'Custom colors' dialog..."
+if find_and_tap_by_text "Custom colors"; then
+    sleep 3  # Wait longer for dialog to appear
+    if find_and_tap_button "Ok" "OK"; then
+        echo "✓ Custom colors dialog test passed"
+    else
+        echo "✗ Failed to close Custom colors dialog"
+        exit 1
+    fi
+else
+    echo "✗ Failed to open Custom colors dialog"
+    exit 1
+fi
+sleep 1
+
+# Test "Dialog Tracking Test" (most important for Acoustic Connect)
+echo "Testing 'Dialog Tracking Test'..."
+if find_and_tap_by_text "Dialog Tracking Test"; then
+    sleep 3  # Wait longer for dialog to appear
+    if find_and_tap_button "Close" "OK" "Ok"; then
+        echo "✓ Dialog Tracking Test passed"
+    else
+        echo "✗ Failed to close Dialog Tracking Test"
+        exit 1
+    fi
+else
+    echo "✗ Failed to open Dialog Tracking Test"
+    exit 1
+fi
+sleep 1
+
+# Test "With icon" dialog (if available in MD3)
+echo "Testing 'With icon' dialog..."
+if find_and_tap_by_text "With icon"; then
+    sleep 3  # Wait longer for dialog to appear
+    if find_and_tap_button "Agree" "Disagree" "OK" "Ok"; then
+        echo "✓ With icon dialog test passed"
+    else
+        echo "✗ Failed to close With icon dialog"
+        exit 1
+    fi
+else
+    echo "⚠ With icon dialog not available (V3 theme not enabled)"
+fi
+sleep 1
+
+# Test "Dismissable back button" dialog (Android specific)
+echo "Testing 'Dismissable back button' dialog..."
+if find_and_tap_by_text "Dismissable back button"; then
+    sleep 3  # Wait longer for dialog to appear
+    # Try to dismiss with back button
+    adb shell input keyevent 4  # KEYCODE_BACK
+    sleep 1
+    echo "✓ Dismissable back button dialog test passed"
+else
+    echo "⚠ Dismissable back button dialog not available (iOS)"
+fi
+sleep 1
+
+echo "All dialog tests completed successfully!"
+echo "Integration test passed!"
+exit 0 

package/Examples/SampleUI/src/Examples/DialogExample.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Platform, StyleSheet } from 'react-native';
+import { Platform, StyleSheet, Alert } from 'react-native';
 
 import { Button } from 'react-native-paper';
 
@@ -11,9 +11,11 @@ import {
   DialogWithLongText,
   DialogWithRadioBtns,
   UndismissableDialog,
+  DialogTrackingTest,
 } from './Dialogs';
 import { useExampleTheme } from '..';
 import ScreenWrapper from '../ScreenWrapper';
+import { useDialogTracking } from 'react-native-acoustic-connect-beta';
 
 type ButtonVisibility = {
   [key: string]: boolean | undefined;
@@ -22,9 +24,54 @@ type ButtonVisibility = {
 const DialogExample = () => {
   const [visible, setVisible] = React.useState<ButtonVisibility>({});
   const { isV3 } = useExampleTheme();
+  
+  // Add dialog tracking
+  const { generateDialogId, trackDialogShow, trackDialogDismiss } = useDialogTracking();
+  const [dialogIds, setDialogIds] = React.useState<Record<string, string>>({});
 
-  const _toggleDialog = (name: string) => () =>
+  const _toggleDialog = (name: string) => () => {
+    const isCurrentlyVisible = !!visible[name];
+    
+    if (!isCurrentlyVisible) {
+      // Dialog is being shown - track it
+      const dialogId = generateDialogId();
+      setDialogIds(prev => ({ ...prev, [name]: dialogId }));
+      
+      // Get dialog title based on the dialog type
+      const getDialogTitle = (dialogName: string): string => {
+        switch (dialogName) {
+          case 'dialog1': return 'Long Text Dialog';
+          case 'dialog2': return 'Radio Buttons Dialog';
+          case 'dialog3': return 'Progress Indicator Dialog';
+          case 'dialog4': return 'Undismissable Dialog';
+          case 'dialog5': return 'Custom Colors Dialog';
+          case 'dialog6': return 'Dialog with Icon';
+          case 'dialog7': return 'Dismissable Back Button Dialog';
+          case 'dialogTracking': return 'Dialog Tracking Test';
+          default: return 'Dialog';
+        }
+      };
+      
+      const title = getDialogTitle(name);
+      trackDialogShow(dialogId, title, []);
+      
+      console.log(`🔍 DialogExample: Showing dialog - ${title} (${dialogId})`);
+    } else {
+      // Dialog is being hidden - track dismiss
+      const dialogId = dialogIds[name];
+      if (dialogId) {
+        trackDialogDismiss(dialogId, 'user_action');
+        console.log(`🔍 DialogExample: Dismissing dialog - ${dialogIds[name]} (${dialogId})`);
+        setDialogIds(prev => {
+          const newIds = { ...prev };
+          delete newIds[name];
+          return newIds;
+        });
+      }
+    }
+    
     setVisible({ ...visible, [name]: !visible[name] });
+  };
 
   const _getVisible = (name: string) => !!visible[name];
 
@@ -34,6 +81,7 @@ const DialogExample = () => {
         mode="outlined"
         onPress={_toggleDialog('dialog1')}
         style={styles.button}
+        testID="dialog-long-text-button"
       >
         Long text
       </Button>
@@ -41,6 +89,7 @@ const DialogExample = () => {
         mode="outlined"
         onPress={_toggleDialog('dialog2')}
         style={styles.button}
+        testID="dialog-radio-buttons-button"
       >
         Radio buttons
       </Button>
@@ -48,6 +97,7 @@ const DialogExample = () => {
         mode="outlined"
         onPress={_toggleDialog('dialog3')}
         style={styles.button}
+        testID="dialog-progress-indicator-button"
       >
         Progress indicator
       </Button>
@@ -55,6 +105,7 @@ const DialogExample = () => {
         mode="outlined"
         onPress={_toggleDialog('dialog4')}
         style={styles.button}
+        testID="dialog-undismissable-button"
       >
         Undismissable Dialog
       </Button>
@@ -62,6 +113,7 @@ const DialogExample = () => {
         mode="outlined"
         onPress={_toggleDialog('dialog5')}
         style={styles.button}
+        testID="dialog-custom-colors-button"
       >
         Custom colors
       </Button>
@@ -70,6 +122,7 @@ const DialogExample = () => {
           mode="outlined"
           onPress={_toggleDialog('dialog6')}
           style={styles.button}
+          testID="dialog-with-icon-button"
         >
           With icon
         </Button>
@@ -79,10 +132,37 @@ const DialogExample = () => {
           mode="outlined"
           onPress={_toggleDialog('dialog7')}
           style={styles.button}
+          testID="dialog-dismissable-back-button"
         >
           Dismissable back button
         </Button>
       )}
+      <Button
+        mode="outlined"
+        onPress={_toggleDialog('dialogTracking')}
+        style={styles.button}
+        testID="dialog-tracking-test-button"
+      >
+        Dialog Tracking Test
+      </Button>
+      <Button
+        mode="outlined"
+        onPress={() => {
+          console.log('🧪 Testing Alert.alert tracking...');
+          Alert.alert(
+            'Test Alert',
+            'This is a test alert for dialog tracking',
+            [
+              { text: 'Cancel', style: 'cancel' },
+              { text: 'OK', onPress: () => console.log('✅ OK pressed') }
+            ]
+          );
+        }}
+        style={styles.button}
+        testID="test-alert-button"
+      >
+        Test Alert
+      </Button>
       <DialogWithLongText
         visible={_getVisible('dialog1')}
         close={_toggleDialog('dialog1')}
@@ -113,6 +193,12 @@ const DialogExample = () => {
         visible={_getVisible('dialog7')}
         close={_toggleDialog('dialog7')}
       />
+      
+      {/* Dialog Tracking Test Component */}
+      <DialogTrackingTest
+        visible={_getVisible('dialogTracking')}
+        close={_toggleDialog('dialogTracking')}
+      />
     </ScreenWrapper>
   );
 };