v5.0.2

Author: jitvarpatil

examples/SampleApp/.prettierrc.js

@@ -1,7 +1,5 @@
 module.exports = {
   arrowParens: 'avoid',
-  bracketSameLine: true,
-  bracketSpacing: false,
   singleQuote: true,
   trailingComma: 'all',
 };

examples/SampleApp/.vscode/settings.json

@@ -0,0 +1,22 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.activeBackground": "#fa1b49",
+        "activityBar.background": "#fa1b49",
+        "activityBar.foreground": "#e7e7e7",
+        "activityBar.inactiveForeground": "#e7e7e799",
+        "activityBarBadge.background": "#155e02",
+        "activityBarBadge.foreground": "#e7e7e7",
+        "commandCenter.border": "#e7e7e799",
+        "sash.hoverBorder": "#fa1b49",
+        "statusBar.background": "#dd0531",
+        "statusBar.foreground": "#e7e7e7",
+        "statusBarItem.hoverBackground": "#fa1b49",
+        "statusBarItem.remoteBackground": "#dd0531",
+        "statusBarItem.remoteForeground": "#e7e7e7",
+        "titleBar.activeBackground": "#dd0531",
+        "titleBar.activeForeground": "#e7e7e7",
+        "titleBar.inactiveBackground": "#dd053199",
+        "titleBar.inactiveForeground": "#e7e7e799"
+    },
+    "peacock.color": "#dd0531"
+}

examples/SampleApp/App.tsx

@@ -1,12 +1,15 @@
+import { StatusBar, useColorScheme } from 'react-native';
 import './gesture-handler';
-import React, {useState, useEffect, useRef} from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import {
   Platform,
   View,
   PlatformColor,
   AppState,
   AppStateStatus,
 } from 'react-native';
+import { enableScreens } from 'react-native-screens';
+enableScreens();
 import {
   CometChatIncomingCall,
   CometChatThemeProvider,
@@ -16,19 +19,25 @@ import {
   UIKitSettings,
 } from '@cometchat/chat-uikit-react-native';
 
-import {SafeAreaProvider, SafeAreaView} from 'react-native-safe-area-context';
-import {CometChat} from '@cometchat/chat-sdk-react-native';
+import { SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';
+import { CometChat } from '@cometchat/chat-sdk-react-native';
 import RootStackNavigator from './src/navigation/RootStackNavigator';
-import {AppConstants} from './src/utils/AppConstants';
-import {
-  requestAndroidPermissions,
-} from './src/utils/helper';
+import { AppConstants } from './src/utils/AppConstants';
+import { requestAndroidPermissions } from './src/utils/helper';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 
-// Listener ID for registering and removing CometChat listeners.
-const listenerId = 'app';
+function App() {
+  const isDarkMode = useColorScheme() === 'dark';
+
+  return (
+    <SafeAreaProvider>
+      <StatusBar barStyle={isDarkMode ? 'light-content' : 'dark-content'} />
+      <AppContent />
+    </SafeAreaProvider>
+  );
+}
 
-const App = (): React.ReactElement => {
+const AppContent = (): React.ReactElement => {
   const [callReceived, setCallReceived] = useState(false);
   const incomingCall = useRef<CometChat.Call | CometChat.CustomMessage | null>(
     null,
@@ -37,9 +46,11 @@ const App = (): React.ReactElement => {
   const [isLoggedIn, setIsLoggedIn] = useState(false);
   const [userLoggedIn, setUserLoggedIn] = useState(false);
   const [hasValidAppCredentials, setHasValidAppCredentials] = useState(false);
+  // Listener ID for registering and removing CometChat listeners.
+  const listenerId = 'app';
 
   /**
-   * Initialize CometChat UIKit.
+   * Initialize CometChat UIKit and configure Google Sign-In.
    * Retrieves credentials from AsyncStorage and uses fallback constants if needed.
    */
   useEffect(() => {
@@ -74,7 +85,6 @@ const App = (): React.ReactElement => {
         if (loggedInUser) {
           setIsLoggedIn(true);
         }
-
       } catch (error) {
         console.log('Error during initialization', error);
       } finally {
@@ -242,28 +252,31 @@ const App = (): React.ReactElement => {
 
   // Once initialization is complete, render the main app UI.
   return (
-    <SafeAreaProvider>
-      <SafeAreaView edges={['top']} style={{flex: 1}}>
-        <CometChatThemeProvider>
-          {/* Render the incoming call UI if the user is logged in and a call is received */}
-          {isLoggedIn && callReceived && incomingCall.current ? (
-            <CometChatIncomingCall
-              call={incomingCall.current}
-              onDecline={() => {
-                // Handle call decline by clearing the incoming call state.
-                incomingCall.current = null;
-                setCallReceived(false);
-              }}
-            />
-          ) : null}
-          {/* Render the main navigation stack, passing the login status as a prop */}
-          <RootStackNavigator
-            isLoggedIn={isLoggedIn}
-            hasValidAppCredentials={hasValidAppCredentials}
+    <SafeAreaView edges={['top', 'bottom']} style={{ flex: 1 }}>
+      <CometChatThemeProvider>
+        {/* Render the incoming call UI if the user is logged in and a call is received */}
+        {isLoggedIn && callReceived && incomingCall.current ? (
+          <CometChatIncomingCall
+            call={incomingCall.current}
+            onDecline={() => {
+              // Handle call decline by clearing the incoming call state.
+              incomingCall.current = null;
+              setCallReceived(false);
+            }}
+            style={{
+              containerStyle: {
+                marginTop: Platform.OS === 'android' ? 40 : 0,
+              },
+            }}
           />
-        </CometChatThemeProvider>
-      </SafeAreaView>
-    </SafeAreaProvider>
+        ) : null}
+        {/* Render the main navigation stack, passing the login status as a prop */}
+        <RootStackNavigator
+          isLoggedIn={isLoggedIn}
+          hasValidAppCredentials={hasValidAppCredentials}
+        />
+      </CometChatThemeProvider>
+    </SafeAreaView>
   );
 };
 

examples/SampleApp/Gemfile.lock

@@ -5,19 +5,27 @@ GEM
       base64
       nkf
       rexml
-    activesupport (6.1.7.10)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    base64 (0.2.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
     claide (1.1.0)
     cocoapods (1.15.2)
       addressable (~> 2.8)
@@ -58,28 +66,34 @@ GEM
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
     concurrent-ruby (1.3.3)
+    connection_pool (2.5.4)
+    drb (2.2.3)
     escape (0.0.4)
-    ethon (0.16.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
-    ffi (1.17.1)
+    ffi (1.17.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.6)
-    minitest (5.25.4)
+    json (2.15.0)
+    logger (1.7.0)
+    minitest (5.25.5)
     molinillo (0.8.0)
+    mutex_m (0.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.4.0)
+    rexml (3.4.4)
     ruby-macho (2.5.1)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
+    securerandom (0.4.1)
+    typhoeus (1.5.0)
+      ethon (>= 0.9.0, < 0.16.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     xcodeproj (1.25.1)
@@ -89,19 +103,22 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (>= 3.3.6, < 4.0)
-    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (>= 6.1.7.5, != 7.1.0)
+  benchmark
+  bigdecimal
   cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
   concurrent-ruby (< 1.3.4)
+  logger
+  mutex_m
   xcodeproj (< 1.26.0)
 
 RUBY VERSION
-   ruby 2.6.10p210
+   ruby 3.2.0p0
 
 BUNDLED WITH
    2.6.3

examples/SampleApp/README.md

@@ -37,12 +37,11 @@ Sign up for a [CometChat](https://app.cometchat.com/) account to obtain your app
    git clone https://github.com/cometchat/cometchat-uikit-react-native.git
    ```
 
-1. Run `npm install` to install the dependencies.
-
 1. Change into the specific app's directory (e.g., SampleApp).
    ```sh
      cd examples/SampleApp
    ```
+1. Run `npm install` to install the dependencies.
 
 1. `[Optional]` Configure CometChat credentials:
     - Open the `AppConstants.tsx` file located at `examples/SampleApp/src/utils/AppConstants.tsx` and enter your CometChat _`appId`_, _`region`_, and _`authKey`_:

examples/SampleApp/android/app/build.gradle

@@ -11,11 +11,11 @@ react {
     //   The root of your project, i.e. where "package.json" lives. Default is '../..'
     // root = file("../../")
     //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
-    reactNativeDir = file("../../../../node_modules/react-native")
+    // reactNativeDir = file("../../node_modules/react-native")
     //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
-    codegenDir = file("../../../../node_modules/@react-native/codegen")
+    // codegenDir = file("../../node_modules/@react-native/codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
-    cliFile = file("../../../../node_modules/react-native/cli.js")
+    // cliFile = file("../../node_modules/react-native/cli.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -46,7 +46,6 @@ react {
     /* Hermes Commands */
     //   The hermes compiler command to run. By default it is 'hermesc'
     // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    hermesCommand = file("../../../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc").absolutePath
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
@@ -84,7 +83,15 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName rootProject.ext.version
+        versionName "1.0"
+    }
+    signingConfigs {
+        debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
     }
     buildTypes {
         debug {
@@ -100,17 +107,6 @@ android {
     }
 }
 
-dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
-    if (hermesEnabled.toBoolean()) {
-        implementation("com.facebook.react:hermes-android")
-    } else {
-        implementation jscFlavor
-    }
-}
-
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")

examples/SampleApp/android/app/src/debug/AndroidManifest.xml

@@ -1,13 +1,13 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools">
-<!-- package='com.cometchat.sampleapp.reactnative.android'> -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package='com.cometchat.sampleapp.reactnative.android'> 
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
     <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -22,9 +22,8 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme"
+      android:usesCleartextTraffic="${usesCleartextTraffic}"
       android:supportsRtl="true">
-      
-            
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
@@ -37,6 +36,5 @@
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
       </activity>
-
     </application>
 </manifest>