[Calling][Release] Calling UI SDK Release 1.4.0 (#30)

Author: iaulakh

AzureCommunicationUIDemoApp/android/app/build.gradle

@@ -200,20 +200,20 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
-    implementation 'com.azure.android:azure-communication-ui-calling:1.2.0'
+    implementation 'com.azure.android:azure-communication-ui-calling:1.4.0'
 
-    implementation "com.microsoft.fluentui:fluentui_others:0.0.20"
-    implementation "com.microsoft.fluentui:fluentui_drawer:0.0.20"
-    implementation "com.microsoft.fluentui:fluentui_persona:0.0.20"
-    implementation "com.microsoft.fluentui:fluentui_transients:0.0.20"
+    implementation "com.microsoft.fluentui:fluentui_others:0.0.21"
+    implementation "com.microsoft.fluentui:fluentui_drawer:0.0.21"
+    implementation "com.microsoft.fluentui:fluentui_persona:0.0.21"
+    implementation "com.microsoft.fluentui:fluentui_transients:0.0.21"
 
     implementation ("androidx.appcompat:appcompat:1.4.2") {
         version {
             strictly '1.4.2'
         }
     }
 
-    implementation 'com.azure.android:azure-communication-calling:2.2.1'
+    implementation 'com.azure.android:azure-communication-calling:2.5.0'
 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10'
     implementation 'androidx.core:core-ktx:1.7.0'

AzureCommunicationUIDemoApp/android/app/src/main/java/com/azurecommunicationuidemoapp/RNAzureCommunicationUICalling.java

@@ -52,6 +52,7 @@ public class RNAzureCommunicationUICalling extends ReactContextBaseJavaModule {
 
     private static final String TAG = "RNAzureCallingUI";
     String mToken = "";
+    CallComposite callComposite = null;
 
     RNAzureCommunicationUICalling(ReactApplicationContext context) {
         super(context);
@@ -62,6 +63,13 @@ public String getName() {
         return "RNAzureCommunicationUICalling";
     }
 
+    @ReactMethod
+    public void dismiss() {
+        if (callComposite != null) {
+            callComposite.dismiss();
+        }
+    }
+
     @ReactMethod
     public void startCallComposite(ReadableMap localOptions, 
                                    ReadableMap localAvatarImageResource, 
@@ -98,14 +106,16 @@ public void getSupportedLocales(Promise promise) {
         }
         promise.resolve(wArr);
     }
-     
+
     @ReactMethod
     public void addListener(String eventName) {}
 
     @ReactMethod()
     public void getDebugInfo(Promise promise) {
         WritableArray wArr = Arguments.createArray();
-        CallComposite callComposite = new CallCompositeBuilder().build();
+        if (callComposite == null) {
+            callComposite = new CallCompositeBuilder().build();
+        }
         CallCompositeDebugInfo debugInfo = callComposite.getDebugInfo(getCurrentActivity());
         for (CallCompositeCallHistoryRecord record : debugInfo.getCallHistoryRecords()) {
             WritableMap recordMap = Arguments.createMap();
@@ -132,7 +142,7 @@ public void launchComposite(String displayName, String meetingInput, ReadableMap
 
         int layoutDirection = isRightToLeft ? LayoutDirection.RTL : LayoutDirection.LTR;
 
-        CallComposite callComposite = new CallCompositeBuilder()
+        callComposite = new CallCompositeBuilder()
                 .localization(new CallCompositeLocalizationOptions(Locale.forLanguageTag(selectedLanguage), layoutDirection)).build();
 
 
@@ -167,6 +177,15 @@ public void launchComposite(String displayName, String meetingInput, ReadableMap
                 });
             }
 
+            callComposite.addOnCallStateChangedEventHandler((callStateChangedEvent) -> {
+                Log.d(TAG, "================= application is logging call state change =================");
+                Log.d(TAG, callStateChangedEvent.getCode().toString());
+                Log.d(TAG, callComposite.getCallState().toString());
+            });
+
+            callComposite.addOnDismissedEventHandler((dismissedEvent) -> {
+                Log.d(TAG, "================= application is logging call composite dismissed =================");
+            });   
 
             if (URLUtil.isValidUrl(meetingInput.trim())) {
                 CallCompositeJoinLocator locator = new CallCompositeTeamsMeetingLinkLocator(meetingInput);
@@ -186,10 +205,7 @@ public void launchComposite(String displayName, String meetingInput, ReadableMap
                     CallCompositeParticipantViewData participantViewData = new CallCompositeParticipantViewData()
                             .setDisplayName(displayName)
                             .setAvatarBitmap(avatarImageBitmap);
-                    
-                    
                     localOptions.setParticipantViewData(participantViewData);
-
                 }
 
                 if (title != null) {

AzureCommunicationUIDemoApp/android/build.gradle

@@ -4,16 +4,16 @@ buildscript {
     ext {
         buildToolsVersion = "30.0.2"
         minSdkVersion = 23
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        compileSdkVersion = 33
+        targetSdkVersion = 33
         ndkVersion = "21.4.7075529"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("com.android.tools.build:gradle:7.0.0")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -31,7 +31,9 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
-
+        maven {
+            url 'file:///Users/inderpalsinghaulakh/.m2/repository'
+        }
         maven { url "https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1" }
 
         google()

AzureCommunicationUIDemoApp/android/gradle.properties

@@ -25,6 +25,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 org.gradle.jvmargs=-Xmx4608m
-org.gradle.java.home=/Applications/Android Studio.app/Contents/jre/Contents/Home
+org.gradle.java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.99.0

AzureCommunicationUIDemoApp/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

AzureCommunicationUIDemoApp/ios/.xcode.env

@@ -0,0 +1 @@
+export NODE_BINARY=$(command -v node)

AzureCommunicationUIDemoApp/ios/AzureCommunicationUIDemoApp.xcodeproj/project.pbxproj

@@ -506,7 +506,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -535,14 +535,15 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -551,6 +552,14 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
@@ -563,6 +572,13 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "$(inherited)";
+				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -573,7 +589,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -602,15 +618,27 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
+					"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
+					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
@@ -622,6 +650,13 @@
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_CFLAGS = "$(inherited)";
+				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;

AzureCommunicationUIDemoApp/ios/Podfile

@@ -1,20 +1,57 @@
-require_relative '../node_modules/react-native/scripts/react_native_pods'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
-source 'https://github.com/CocoaPods/Specs.git'
+#require_relative '../node_modules/react-native/scripts/react_native_pods'
+#require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+#source 'https://github.com/CocoaPods/Specs.git'
+
+# Resolve react_native_pods.rb with node to allow for hoisting
+require Pod::Executable.execute_command('node', ['-p',
+  'require.resolve(
+    "react-native/scripts/react_native_pods.rb",
+    {paths: [process.argv[1]]},
+  )', __dir__]).strip
 
 platform :ios, '14.0'
 
+prepare_react_native_project!
+
+# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
+# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
+#
+# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
+# ```js
+# module.exports = {
+#   dependencies: {
+#     ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
+# ```
+flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
+
+linkage = ENV['USE_FRAMEWORKS']
+if linkage != nil
+  Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
+  use_frameworks! :linkage => linkage.to_sym
+end
+
 target 'AzureCommunicationUIDemoApp' do
   use_frameworks!
-  pod 'AzureCommunicationUICalling', '1.3.0'
+  pod 'AzureCommunicationUICalling', '1.4.0'
 
 
   config = use_native_modules!
 
+  # Flags change depending on the env values.
+  flags = get_default_flags()
+
   use_react_native!(
     :path => config[:reactNativePath],
-    # to enable hermes on iOS, change `false` to `true` and then install pods
-    :hermes_enabled => false
+    # Hermes is now enabled by default. Disable by setting this flag to false.
+    :hermes_enabled => flags[:hermes_enabled],
+    :fabric_enabled => flags[:fabric_enabled],
+    # Enables Flipper.
+    #
+    # Note that if you have use_frameworks! enabled, Flipper will not work and
+    # you should disable the next line.
+    # :flipper_configuration => flipper_config,
+    # An absolute path to your application root.
+    :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
   target 'AzureCommunicationUIDemoAppTests' do
@@ -28,14 +65,23 @@ target 'AzureCommunicationUIDemoApp' do
   # you should disable the next line.
   # use_flipper!()
 
+  pre_install do |installer|
+    installer.pod_targets.each do |pod|
+      if pod.name.eql?('RNScreens')
+        def pod.build_type
+          Pod::BuildType.static_library
+        end
+      end
+    end
+  end
+
   post_install do |installer|
-    react_native_post_install(installer)
-    # __apply_Xcode_12_5_M1_post_install_workaround(installer)
-    installer.pods_project.targets.each do |target|
-       # Fix up using the simulator on M1 macs due to the calling library.
-       target.build_configurations.each do |config|
-         config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
-       end
-     end
+    # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
+    react_native_post_install(
+      installer,
+      config[:reactNativePath],
+      :mac_catalyst_enabled => false
+    )
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end