Merge pull request #742 from 100mslive/dev

Dev to release

Author: PratimMallick

app/build.gradle

@@ -84,7 +84,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
 
     // Get Permissions easily
-    implementation 'pub.devrel:easypermissions:1.1.3'
+    implementation 'pub.devrel:easypermissions:3.0.0'
 
     // Firebase Crashlytics
     // Import the BoM for the Firebase platform

gradle.properties

@@ -15,12 +15,10 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 100MS_APP_VERSION_CODE=376
 100MS_APP_VERSION_NAME=5.0.10
 hmsRoomKitGroup=live.100ms
-HMS_ROOM_KIT_VERSION=1.2.15
+HMS_ROOM_KIT_VERSION=1.2.16
 android.suppressUnsupportedCompileSdk=33

room-kit/src/main/java/live/hms/roomkit/ui/meeting/ClosedCaptionsForEveryone.kt

@@ -1,6 +1,5 @@
 package live.hms.roomkit.ui.meeting
 
-import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -45,7 +44,7 @@ import live.hms.video.sdk.models.TranscriptionsMode
 class ClosedCaptionsForEveryone : BottomSheetDialogFragment() {
 
     companion object {
-        val TAG = "ClosedCaptionsForEveryoneBottomFragment"
+        const val TAG = "ClosedCaptionsForEveryoneBottomFragment"
     }
 
 
@@ -153,7 +152,7 @@ fun EnableCaptionsDisplay(onEnableForEveryoneClicked : () -> Unit,
                 text = screen.title, style = TextStyle(
                     fontSize = 20.sp,
                     lineHeight = 24.sp,
-                    fontFamily = FontFamily(Font(live.hms.roomkit.R.font.inter_bold)),
+                    fontFamily = FontFamily(Font(R.font.inter_bold)),
                     fontWeight = FontWeight(600),
                     color = Variables.OnSecondaryHigh,
                     letterSpacing = 0.15.sp,
@@ -164,7 +163,7 @@ fun EnableCaptionsDisplay(onEnableForEveryoneClicked : () -> Unit,
                     .padding(1.dp)
                     .size(24.dp)
                     .clickable { close() },
-                painter = painterResource(id = live.hms.roomkit.R.drawable.outline_cross),
+                painter = painterResource(id = R.drawable.outline_cross),
                 contentDescription = "Close",
                 contentScale = ContentScale.None
             )
@@ -203,11 +202,11 @@ fun EnableButton(
         Text(
             modifier = Modifier.clickable { onEnableClicked.invoke() },
             text = text,
-            // Desktop/Button-Semibold-16px
+
             style = TextStyle(
                 fontSize = 16.sp,
                 lineHeight = 24.sp,
-                fontFamily = FontFamily(Font(live.hms.roomkit.R.font.inter_bold)),
+                fontFamily = FontFamily(Font(R.font.inter_bold)),
                 fontWeight = FontWeight(600),
                 color = Variables.OnPrimaryHigh,
                 textAlign = TextAlign.Center,
@@ -226,7 +225,7 @@ fun DescriptionText(text : String) {
         style = TextStyle(
             fontSize = 14.sp,
             lineHeight = 20.sp,
-            fontFamily = FontFamily(Font(live.hms.roomkit.R.font.inter_regular)),
+            fontFamily = FontFamily(Font(R.font.inter_regular)),
             fontWeight = FontWeight(400),
             color = Variables.OnSurfaceMedium,
             letterSpacing = 0.25.sp,

room-kit/src/main/java/live/hms/roomkit/ui/meeting/MeetingViewModel.kt

@@ -2808,5 +2808,6 @@ class MeetingViewModel(
     val hlsStreamEndedFlow : Flow<StreamState> = _hlsStreamEndedFlow
 
     fun ncPreviewNoiseCancellationInLayout() = prebuiltInfoContainer.ncInPreviewState()
+    fun getAllWhitelistedRolesForChangeRole() = prebuiltInfoContainer.getAllWhitelistedRolesForChangeRole()
 }
 

room-kit/src/main/java/live/hms/roomkit/ui/meeting/MessageOptionsBottomSheet.kt

@@ -46,7 +46,6 @@ class MessageOptionsBottomSheet(private val chatMessage: ChatMessage,
     }
 
     private var binding by viewLifecycle<BottomSheetMessageOptionsBinding>()
-//    private val chatMessage: ChatMessage? = arguments?.getParcelable(CHAT_MESSAGE_OPTIONS_EXTRA) as ChatMessage?
 
     private val meetingViewModel: MeetingViewModel by activityViewModels {
         MeetingViewModelFactory(

room-kit/src/main/java/live/hms/roomkit/ui/meeting/PrebuiltInfoContainer.kt

@@ -180,6 +180,9 @@ class PrebuiltInfoContainer(private val hmssdk: HMSSDK) {
         return available
     }
 
+    fun getAllWhitelistedRolesForChangeRole() = roleMap[localPeer.hmsRole.name]?.screens?.conferencing
+            ?.default?.elements?.chat?.rolesWhiteList ?: emptyList()
+
 }
 
 data class AllowedToMessageParticipants(