Merge pull request #650 from 100mslive/dev

release 1.1.94

Author: PratimMallick

gradle.properties

@@ -22,5 +22,5 @@ kotlin.code.style=official
 100MS_APP_VERSION_CODE=643
 100MS_APP_VERSION_NAME=5.8.872
 hmsRoomKitGroup=live.100ms
-HMS_ROOM_KIT_VERSION=1.1.94
+HMS_ROOM_KIT_VERSION=1.1.95
 android.suppressUnsupportedCompileSdk=33

room-kit/build.gradle

@@ -72,7 +72,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
-    def hmsVersion = "2.9.1"
+    def hmsVersion = "2.9.4"
     implementation "com.otaliastudios:zoomlayout:1.9.0"
     // To add dependencies of specific module
     implementation "live.100ms:android-sdk:$hmsVersion"

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

@@ -8,6 +8,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
 import android.widget.TextView
+import androidx.core.os.bundleOf
+import androidx.fragment.app.activityViewModels
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -16,17 +18,27 @@ import live.hms.roomkit.databinding.DialogTrackSelectionBinding
 import live.hms.roomkit.util.viewLifecycle
 import live.hms.hls_player.HmsHlsPlayer
 import live.hms.hls_player.HmsHlsLayer
+import live.hms.roomkit.ui.meeting.videogrid.VideoGridPageFragment
 import live.hms.roomkit.ui.theme.HMSPrebuiltTheme
 import live.hms.roomkit.ui.theme.getColorOrDefault
 import live.hms.roomkit.ui.theme.trackTintList
 
 
 class HlsVideoQualitySelectorBottomSheet(
-    private val hlsPlayer: HmsHlsPlayer
 ) : BottomSheetDialogFragment() {
 
     private var binding by viewLifecycle<DialogTrackSelectionBinding>()
 
+    val viewModel by  activityViewModels<MeetingViewModel>()
+    companion object {
+        fun newInstance(): HlsVideoQualitySelectorBottomSheet {
+            return HlsVideoQualitySelectorBottomSheet().apply {
+            }
+        }
+
+    }
+
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -68,19 +80,22 @@ class HlsVideoQualitySelectorBottomSheet(
             val sheet = it as BottomSheetDialog
             sheet.behavior.state = BottomSheetBehavior.STATE_EXPANDED
         }
+
+        if (viewModel.getHLSPLayer() == null)
+            dismissAllowingStateLoss()
         binding.closeBtn.setOnClickListener {
             dismiss()
         }
-        val currentLayer = hlsPlayer.getCurrentHmsHlsLayer()
-        val allLayers = hlsPlayer.getHmsHlsLayers()
+        val currentLayer = viewModel.getHLSPLayer()?.getCurrentHmsHlsLayer()
+        val allLayers = viewModel.getHLSPLayer()?.getHmsHlsLayers()
 
         addAutoView(currentLayer == HmsHlsLayer.AUTO)
-        allLayers.forEachIndexed { index, layer ->
+        allLayers?.forEachIndexed { index, layer ->
             when(layer) {
                 is HmsHlsLayer.AUTO -> {}
                 is HmsHlsLayer.LayerInfo -> {
                     addTrackView("${layer.resolution.height}", index, currentLayer == layer) {
-                        hlsPlayer.setHmsHlsLayer(layer)
+                        viewModel.getHLSPLayer()?.setHmsHlsLayer(layer)
                         dismissAllowingStateLoss()
                     }
                 }
@@ -90,7 +105,7 @@ class HlsVideoQualitySelectorBottomSheet(
 
     private fun addAutoView(isSelected : Boolean) {
         addTrackView("Auto",-1,isSelected) {
-            hlsPlayer.setHmsHlsLayer(HmsHlsLayer.AUTO)
+            viewModel.getHLSPLayer()?.setHmsHlsLayer(HmsHlsLayer.AUTO)
             dismissAllowingStateLoss()
         }
     }

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

@@ -198,6 +198,10 @@ class MeetingFragment : Fragment() {
     private fun updateActionVolumeMenuIcon(
         audioOutputType: HMSAudioManager.AudioDevice? = null
     ) {
+        if (meetingViewModel.isPeerAudioEnabled().not()) {
+            binding.iconOutputDevice.setIconEnabled(R.drawable.ic_volume_off_24)
+            return
+        }
         binding.iconOutputDevice.apply {
             when (audioOutputType) {
                 HMSAudioManager.AudioDevice.EARPIECE -> {
@@ -996,7 +1000,6 @@ class MeetingFragment : Fragment() {
 
             })?.start()
 
-        val screenHeight = requireActivity().window.decorView.height
         binding.bottomControls.animate()
             ?.translationY(0f)?.setDuration(300)?.setListener(object : AnimatorListener {
                 override fun onAnimationStart(animation: Animator) {
@@ -1027,15 +1030,15 @@ class MeetingFragment : Fragment() {
         with(binding.chatView!!){
             if(up) {
                 (layoutParams as RelativeLayout.LayoutParams).apply {
-                    removeRule(RelativeLayout.ALIGN_BOTTOM)
-                    addRule(RelativeLayout.ABOVE, R.id.bottom_controls)
-                    updateMargins(bottom = bottomMenuHeight.toInt() + 8.dp())
+//                    removeRule(RelativeLayout.ALIGN_BOTTOM)
+//                    addRule(RelativeLayout.ABOVE, R.id.bottom_controls)
+//                    updateMargins(bottom = bottomMenuHeight.toInt().let { if(it == 0) 130 else it } + 8.dp())
                 }
             } else {
                 (layoutParams as RelativeLayout.LayoutParams).apply {
-                    removeRule(RelativeLayout.ABOVE)
-                    addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, R.id.meeting_container)
-                    updateMargins(bottom = 8.dp())
+//                    removeRule(RelativeLayout.ABOVE)
+//                    addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, R.id.meeting_container)
+//                    updateMargins(bottom = 8.dp())
                 }
             }
         }

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

@@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
+import live.hms.hls_player.HmsHlsPlayer
 import live.hms.roomkit.R
 import live.hms.roomkit.ui.HMSPrebuiltOptions
 import live.hms.roomkit.ui.meeting.activespeaker.ActiveSpeakerHandler
@@ -698,9 +699,7 @@ class MeetingViewModel(
             addRTCStatsObserver()
         }
 
-        if (!(state.value is MeetingState.Disconnected || state.value is MeetingState.Failure || state.value is MeetingState.NonFatalFailure)) {
-            error("Cannot start meeting in ${state.value} state")
-        }
+        
 
         cleanup()
 
@@ -1243,6 +1242,7 @@ class MeetingViewModel(
         }
     }
 
+    val showDvrControls = MutableLiveData<Boolean>()
     val showAudioIcon : MutableLiveData<Boolean> = MutableLiveData(false)
     val showHlsStreamYetToStartError = MutableLiveData<Boolean>(false)
     private fun switchToHlsViewIfRequired(role: HMSRole?, streamUrl: String?) {
@@ -1282,6 +1282,7 @@ class MeetingViewModel(
     fun switchToHlsViewIfRequired() {
         // get the hls URL from the Room, if it exists
         val hlsUrl = hmsSDK.getRoom()?.hlsStreamingState?.variants?.get(0)?.hlsStreamUrl
+        showDvrControls.postValue(hmsSDK.getRoom()?.hlsStreamingState?.variants?.get(0)?.playlistType == HMSHLSPlaylistType.dvr)
         switchToHlsViewIfRequired(hmsSDK.getLocalPeer()?.hmsRole, hlsUrl)
     }
 
@@ -2407,6 +2408,17 @@ class MeetingViewModel(
     val getQuestionStartTime = questionTimingUseCase::getQuestionStartTime
 
     fun getLogo() = getHmsRoomLayout()?.data?.getOrNull(0)?.logo?.url
+
+    var hmsPlayer : HmsHlsPlayer? = null
+    fun setHLSPlayer(player: HmsHlsPlayer) {
+        hmsPlayer = player
+    }
+
+    fun getHLSPLayer() = hmsPlayer
+
+    fun getLiveStreamingHeaderTitle(): String?{
+        return prebuiltInfoContainer.getLiveStreamingHeaderTitle()
+    }
     //fun getHeader() = getHmsRoomLayout()?.data?.getOrNull(0)?.screens?.conferencing?.hlsLiveStreaming?.elements?.participantList
 }
 

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

@@ -128,6 +128,18 @@ class PrebuiltInfoContainer(private val hmssdk: HMSSDK) {
     fun shouldSkipPreview(): Boolean {
         return hmsRoomLayout?.data?.get(0)?.screens?.preview?.skipPreview == true
     }
+
+    fun getLiveStreamingHeaderTitle() : String? {
+        val localPeer = hmssdk.getLocalPeer()
+
+        return if (localPeer == null) {
+            hmsRoomLayout?.data?.get(0)?.screens?.conferencing?.hlsLiveStreaming?.elements
+                ?.hlsLiveStreamingHeader?.title
+        } else {
+            roleMap[localPeer.hmsRole.name]?.screens?.conferencing?.hlsLiveStreaming?.elements
+                ?.hlsLiveStreamingHeader?.title
+        }
+    }
 }
 
 data class AllowedToMessageParticipants(