react-native-srschat 0.1.42 → 0.1.44

package/src/layout/welcome.js

@@ -1,13 +1,11 @@
 // Welcome.js
 import React, { useContext } from 'react';
-import { View, Text, Image, TouchableOpacity, ScrollView, StyleSheet } from 'react-native';
+import { View, Text, TouchableOpacity, ScrollView, StyleSheet } from 'react-native';
 import Ionicons from 'react-native-vector-icons/Ionicons';
 import { AppContext } from '../contexts/AppContext';
 import { WelcomeInput } from '../components/welcomeInput';
 import ButtonComponent from '../components/welcomeButton';
-import { Testing } from '../components/testing';
 import CloudinaryImage from '../utils/cloudinary';
-// import { PoseidonLogo } from '../components/PoseidonLogo';
 
 export const Welcome = ({ panHandlers }) => {
   const { setShowModal, uiConfig, onProductCardClick, onAddToCartClick } = useContext(AppContext);
@@ -19,30 +17,25 @@ export const Welcome = ({ panHandlers }) => {
       setShowModal("Icon");
     }
     
-    // Reset toggleChat in the parent component
     if (typeof uiConfig.setToggleChat === 'function') {
       uiConfig.setToggleChat(false);
     }
   };
 
   return (
-    <View contentContainerStyle={styles.container}>
+    <View style={styles.container}>
       <View style={styles.parentContainer}>
-        
         {/* Top section */}
         <View style={styles.topContainer}>
           <View style={styles.topHeader}>
-            {/* <PoseidonLogo width={150} height={35} color="white" /> */}
-            {/* <SvgCssUri
-              uri="https://media.heritageplus.com/image/upload/v1743632330/MobileApp/posiden.svg"
-              width={150}
-              height={35}
-            /> */}
-            <CloudinaryImage
-              cldImg="posiden"
-              imageStyle={{ width: 150, height: 35 }}
-            />
-            <TouchableOpacity onPress={() => handleClick()} style={styles.collapseButton}>
+            {/* Logo container with absolute positioning */}
+            <View style={styles.logoContainer}>
+              <CloudinaryImage
+                cldImg="posiden"
+                imageStyle={{ width: 150, height: 35 }}
+              />
+            </View>
+            <TouchableOpacity onPress={handleClick} style={styles.collapseButton}>
               <Ionicons name="close" size={26} color="white" />
             </TouchableOpacity>
           </View>
@@ -50,8 +43,7 @@ export const Welcome = ({ panHandlers }) => {
           <View style={styles.blueContainer}>
             <Text style={styles.welcomeHeader}>Hi 👋</Text>
             <Text style={styles.welcomeBody2}>
-              I'm Poseidon, your Heritage Pool+ AI Agent. I can help you during your online
-              visit with Product and Account information.
+              I'm Poseidon, your Heritage Pool+ AI Agent. I can help you during your online visit with Product and Account information.
             </Text>
             <WelcomeInput />
             <Text style={styles.textBeta}>Beta version. Poseidon is learning!</Text>
@@ -75,7 +67,7 @@ const styles = StyleSheet.create({
   parentContainer: {
     flexGrow: 1,
     backgroundColor: '#004687',
-    paddingTop: 60
+    paddingTop: 60,
   },
   topContainer: {
     backgroundColor: '#004687',
@@ -83,14 +75,19 @@ const styles = StyleSheet.create({
   },
   topHeader: {
     flexDirection: 'row',
-    justifyContent: 'flex-end',
     alignItems: 'center',
     paddingHorizontal: 15,
     paddingTop: 10,
+    justifyContent: 'flex-end',
+    position: 'relative', 
   },
-  logo: {
-    width: 120,
-    height: 50,
+  logoContainer: {
+    position: 'absolute',
+    left: 15,  
+    top: 10,
+    // left: '50%',
+    // transform: [{ translateX: -65 }],
+    // top: 10,  
   },
   collapseButton: {
     paddingHorizontal: 15,
@@ -121,12 +118,12 @@ const styles = StyleSheet.create({
     fontSize: 11,
     color: '#f6f6f6',
     fontWeight: '400',
-    marginTop: 5
+    marginTop: 5,
   },
   bottomContainer: {
     paddingHorizontal: 25,
     backgroundColor: "#f6f6f6",
-    paddingTop: 30
+    paddingTop: 30,
   },
   welcomeBody: {
     fontSize: 13,
@@ -137,3 +134,4 @@ const styles = StyleSheet.create({
   },
 });
 
+export default Welcome;

package/src/utils/audioRecorder.js

@@ -1,7 +1,7 @@
 // audioRecorder.js
 
-import { Platform, PermissionsAndroid } from 'react-native';
-import Voice from '@react-native-community/voice';
+import { Platform } from 'react-native';
+import Voice from '@react-native-voice/voice';
 import { check, PERMISSIONS, request, RESULTS } from 'react-native-permissions';
 import useAsyncStorage from '../hooks/useAsyncStorage';
 
@@ -30,6 +30,12 @@ export async function initVoice(onResult) {
     resultCallback = onResult;
     finalResult = '';
 
+    // Check if Voice module is available
+    if (!Voice) {
+      console.error('Voice module is not available');
+      return false;
+    }
+
     // First check if speech recognition is available
     const isAvailable = await Voice.isAvailable();
     if (!isAvailable) {
@@ -72,7 +78,7 @@ export async function initVoice(onResult) {
     };
 
     Voice.onSpeechError = async (e) => {
-      console.error('onSpeechError: ', e);
+      // console.error('onSpeechError: ', e);
       
       if (silenceTimer) {
         clearTimeout(silenceTimer);
@@ -86,13 +92,13 @@ export async function initVoice(onResult) {
       await cleanupVoiceSession();
       
       // Only send error to callback if it's not a "No speech detected" error
-      if (!isNoSpeechError) {
-        resultCallback(null, e.error?.message || 'Speech recognition error');
-      } else {
-        console.log('No speech detected, ignoring error');
-        // Optionally, call the callback with null parameters or a special indicator
-        resultCallback(null, null); // This won't trigger an error alert in the component
-      }
+      // if (!isNoSpeechError) {
+      //   resultCallback(null, e.error?.message || 'Speech recognition error');
+      // } else {
+      //   console.log('No speech detected, ignoring error');
+      //   // Optionally, call the callback with null parameters or a special indicator
+      //   resultCallback(null, null); // This won't trigger an error alert in the component
+      // }
     };
 
     Voice.onSpeechResults = (e) => {
@@ -164,6 +170,12 @@ const cleanupVoiceSession = async () => {
   }
 
   try {
+    // Check if Voice module is available
+    if (!Voice) {
+      console.log('Voice module not available during cleanup');
+      return;
+    }
+
     // First try to stop if still recognizing
     const isRecognizing = await Voice.isRecognizing();
     if (isRecognizing) {
@@ -189,7 +201,9 @@ const cleanupVoiceSession = async () => {
     console.error('Error in cleanupVoiceSession:', error);
     // Final attempt to destroy on error
     try {
-      await Voice.destroy();
+      if (Voice) {
+        await Voice.destroy();
+      }
     } catch (e) {
       console.error('Final destroy attempt failed:', e);
     }
@@ -200,6 +214,12 @@ const cleanupVoiceSession = async () => {
 
 export async function startRecording() {
   try {
+    // Check if Voice module is available
+    if (!Voice) {
+      console.error('Voice module is not available');
+      return false;
+    }
+
     // Ensure cleanup of any existing session
     await cleanupVoiceSession();
     
@@ -221,7 +241,7 @@ export async function startRecording() {
 
 export async function stopRecording() {
   try {
-    if (!isCurrentlyRecording) return;
+    if (!isCurrentlyRecording || !Voice) return;
 
     // Set this first to prevent race conditions
     isCurrentlyRecording = false;
@@ -259,13 +279,13 @@ export async function stopRecording() {
 
 export async function cancelRecording() {
   try {
+    if (!Voice) return;
     await Voice.cancel();
     await cleanupVoiceSession();
   } catch (error) {
     console.error('Error canceling voice recognition:', error);
     await cleanupVoiceSession();
   }
-
 }
 
 export async function requestAudioPermission() {
@@ -299,24 +319,22 @@ export async function requestAudioPermission() {
 
 async function requestAndroidPermission() {
   try {
-    // Check available speech recognition services on Android
+
+
+    // Request microphone permission
+    const micPermission = await request(PERMISSIONS.ANDROID.RECORD_AUDIO);
+    if (micPermission !== RESULTS.GRANTED) {
+      console.log('Microphone permission denied');
+      return false;
+    }
+
+        // Skip checking speech recognition services which is causing errors
     const services = await Voice.getSpeechRecognitionServices();
     if (!services || services.length === 0) {
       console.error('No speech recognition services available');
       return false;
     }
-
-    const granted = await PermissionsAndroid.request(
-      PermissionsAndroid.PERMISSIONS.RECORD_AUDIO,
-      {
-        title: 'Microphone Permission',
-        message: 'This app needs access to your microphone for voice recognition.',
-        buttonPositive: 'OK',
-        buttonNegative: 'Cancel',
-      }
-    );
-    
-    return granted === PermissionsAndroid.RESULTS.GRANTED;
+    return true;
   } catch (error) {
     console.error('Error requesting Android permission:', error);
     return false;
@@ -355,13 +373,20 @@ export function resetStoredPermission() {
 }
 
 export function cleanup() {
+  if (!Voice) {
+    console.log('Voice module not available during cleanup');
+    return;
+  }
+  
   Voice.destroy().then(() => {
     Voice.removeAllListeners();
     cleanupVoiceSession();
   }).catch(error => {
     console.error('Error in cleanup:', error);
     // Try one more time
-    Voice.destroy().catch(e => console.error('Final cleanup attempt failed:', e));
+    if (Voice) {
+      Voice.destroy().catch(e => console.error('Final cleanup attempt failed:', e));
+    }
   });
 }