Merge pull request #696 from 100mslive/dev

dev

Author: PratimMallick

app/build.gradle

@@ -62,7 +62,7 @@ dependencies {
     implementation "live.100ms:room-kit:$HMS_ROOM_KIT_VERSION"
 
     //100ms noise cancellation dep
-    def hmsVersion = "2.9.53"
+    def hmsVersion = "2.9.54"
     implementation "live.100ms:hms-noise-cancellation-android:$hmsVersion"
 
     // Navigation

app/src/main/AndroidManifest.xml

@@ -5,16 +5,9 @@
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission
         android:name="android.permission.BLUETOOTH"
         android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
     <!--Permissions needed for Android 14 -->

app/src/main/java/live/hms/app2/ui/home/HomeFragment.kt

@@ -127,17 +127,17 @@ class HomeFragment : Fragment() {
         return when {
             REGEX_MEETING_URL_CODE.matches(url) -> {
                 val groups = REGEX_MEETING_URL_CODE.findAll(url).toList()[0].groupValues
-                groups[2]
+                groups[groups.size - 1]
             }
             REGEX_STREAMING_MEETING_URL_ROOM_CODE.matches(url) -> {
                 val groups =
                     REGEX_STREAMING_MEETING_URL_ROOM_CODE.findAll(url).toList()[0].groupValues
-                groups[2]
+                groups[groups.size - 1]
 
             }
             REGEX_PREVIEW_URL_CODE.matches(url) -> {
                 val groups = REGEX_PREVIEW_URL_CODE.findAll(url).toList()[0].groupValues
-                groups[2]
+                groups[groups.size - 1]
             }
             else -> null
         }

app/src/main/java/live/hms/app2/util/Constants.kt

@@ -5,8 +5,8 @@ const val ENV_QA = "qa-init"
 
 val REGEX_MEETING_URL_CODE = Regex("https?://(.*.100ms.live)/meeting/([a-zA-Z0-9]+-[a-zA-Z0-9]+-[a-zA-Z0-9]+)/?")
 val REGEX_PREVIEW_URL_CODE = Regex("https?://(.*.100ms.live)/preview/([a-zA-Z0-9]+-[a-zA-Z0-9]+-[a-zA-Z0-9]+)/?")
-val REGEX_STREAMING_MEETING_URL_ROOM_CODE = Regex("https?://(.*.100ms.live)/streaming/meeting/([a-zA-Z0-9]+-[a-zA-Z0-9]+-[a-zA-Z0-9]+)/?")
-val REGEX_MEETING_URL_ROOM_ID = Regex("https?://(.*.100ms.live)/meeting/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)/?")
+val REGEX_STREAMING_MEETING_URL_ROOM_CODE = Regex("https?://(.*.100ms.live)/streaming/((meeting)|(preview))/([a-zA-Z0-9]+-[a-zA-Z0-9]+-[a-zA-Z0-9]+)/?")
+val REGEX_MEETING_URL_ROOM_ID = Regex("https?://(.*.100ms.live)/((meeting)|(preview))/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)/?")
 val REGEX_TOKEN_ENDPOINT = Regex("https?://.*.100ms.live/hmsapi/([a-zA-Z0-9-.]+.100ms.live)/?")
 
 val REGEX_MEETING_CODE = Regex("^[a-zA-Z0-9]+-[a-zA-Z0-9]+-[a-zA-Z0-9]+$")

app/src/main/java/live/hms/app2/util/MeetingUrlUtils.kt

@@ -16,20 +16,6 @@ fun String.getInitEndpointEnvironment(): String = when {
   else -> ENV_QA
 }
 
-fun String.toUniqueRoomSpecifier(): String {
-  require(this.isValidMeetingUrl()) {
-    "$this is not a valid meeting-url"
-  }
-
-  return if (REGEX_MEETING_URL_CODE.matches(this)) {
-    val groups = REGEX_MEETING_URL_CODE.findAll(this).toList()[0].groupValues
-    groups[2]
-  } else /* if (REGEX_MEETING_URL_ROOM_ID.matches(this)) */ {
-    val groups = REGEX_MEETING_URL_ROOM_ID.findAll(this).toList()[0].groupValues
-    groups[2]
-  }
-}
-
 fun getBeamBotJoiningUrl(meetingUrl: String, roomId: String, beamBotUser: String): String {
   return "https://${meetingUrl.toSubdomain()}/preview/$roomId/$beamBotUser?token=beam_recording"
 }

app/src/test/java/live/hms/app2/ui/meeting/CustomPeerMetadataTest.kt

@@ -1,5 +1,6 @@
 package live.hms.app2.ui.meeting
 
+import live.hms.roomkit.ui.meeting.CustomPeerMetadata
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
@@ -9,7 +10,7 @@ class CustomPeerMetadataTest{
     @Test
     fun correct_json_values_are_parsed() {
         val result = CustomPeerMetadata.fromJson("{\"isHandRaised\":true, \"name\":\"Aniket\"}")
-        assertThat(result, equalTo(CustomPeerMetadata(true, "Aniket")))
+        assertThat(result, equalTo(CustomPeerMetadata(true, false, "Aniket")))
     }
 
     @Test

app/src/test/java/live/hms/app2/util/MeetingUrlUtilsKtTest.kt

@@ -0,0 +1,32 @@
+package live.hms.app2.util
+
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Test
+
+class MeetingUrlUtilsKtTest {
+    @Test
+    fun `meeting streaming works`() {
+        assertThat("https://masterclass.app.100ms.live/streaming/meeting/amp-pat-cat".isValidMeetingUrl(), equalTo(true))
+    }
+
+    @Test
+    fun `streaming preview links work`() {
+        assertThat("https://masterclass.app.100ms.live/streaming/preview/amp-pat-cat".isValidMeetingUrl(), equalTo(true))
+    }
+
+    @Test
+    fun `regular meeting links work`() {
+        assertThat("https://aniket.app.100ms.live/meeting/amp-pat-cat".isValidMeetingUrl(), equalTo(true))
+    }
+
+    @Test
+    fun `regular preview links work`() {
+        assertThat("https://aniket.app.100ms.live/preview/amp-pat-cat".isValidMeetingUrl(), equalTo(true))
+    }
+
+    @Test
+    fun `broken links do not work`() {
+        assertThat("https://aniket.app.100ms.live/preview/milk/amp-pat-cat".isValidMeetingUrl(), equalTo(false))
+    }
+}

gradle.properties

@@ -19,8 +19,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-100MS_APP_VERSION_CODE=370
-100MS_APP_VERSION_NAME=5.0.4
+100MS_APP_VERSION_CODE=371
+100MS_APP_VERSION_NAME=5.0.5
 hmsRoomKitGroup=live.100ms
-HMS_ROOM_KIT_VERSION=1.2.0
+HMS_ROOM_KIT_VERSION=1.2.1
 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.53"
+    def hmsVersion = "2.9.54"
     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/MeetingFragment.kt

@@ -25,6 +25,30 @@ import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeightIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.core.os.bundleOf
 import androidx.core.view.*
 import androidx.fragment.app.Fragment
@@ -64,6 +88,8 @@ import live.hms.roomkit.ui.meeting.chat.combined.OPEN_TO_PARTICIPANTS
 import live.hms.roomkit.ui.meeting.chat.combined.PinnedMessageUiUseCase
 import live.hms.roomkit.ui.meeting.chat.rbac.RoleBasedChatBottomSheet
 import live.hms.roomkit.ui.meeting.commons.VideoGridBaseFragment
+import live.hms.roomkit.ui.meeting.compose.Variables
+import live.hms.roomkit.ui.meeting.participants.DIRECTLY_OPENED
 import live.hms.roomkit.ui.meeting.participants.ParticipantsFragment
 import live.hms.roomkit.ui.meeting.pinnedvideo.PinnedVideoFragment
 import live.hms.roomkit.ui.meeting.videogrid.VideoGridFragment
@@ -260,6 +286,7 @@ class MeetingFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.applyTheme()
+        addComposable(binding.composeView)
 
         if (savedInstanceState != null) {
             // Recreated Fragment
@@ -303,6 +330,21 @@ class MeetingFragment : Fragment() {
         }
     }
 
+    private fun addComposable(composeView: ComposeView) = composeView.apply {
+        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+        setContent {
+            val captionsEnabled by meetingViewModel.areCaptionsEnabledByUser.observeAsState(false)
+            val subtitles by meetingViewModel.captions.observeAsState()
+            val topBottom by meetingViewModel.transcriptionsPosition.observeAsState()
+            if( !subtitles.isNullOrEmpty() && captionsEnabled) {
+                Column(modifier = Modifier.padding(start = 8.dp, top = 8.dp, end = 8.dp, bottom = 16.dp),
+                    verticalArrangement = if(topBottom == MeetingViewModel.TranscriptionsPosition.TOP) Arrangement.Top else Arrangement.Bottom) {
+                    Captions(subtitles)
+                }
+            }
+        }
+    }
+
     private fun initializeUI() {
         initButtons()
         initObservers()
@@ -348,10 +390,16 @@ class MeetingFragment : Fragment() {
         meetingViewModel.peerLeaveUpdate.observe(viewLifecycleOwner) {
             chatViewModel.updatePeerLeave(it)
         }
-        if(meetingViewModel.prebuiltInfoContainer.chatInitialStateOpen()) {
+        chatButtonEnabled(meetingViewModel.prebuiltInfoContainer.chatInitialStateOpen())
+    }
+
+    private fun chatButtonEnabled(enable : Boolean) {
+        if(enable) {
             binding.buttonOpenChat.setIconDisabled(R.drawable.ic_chat_message)
+            meetingViewModel.transcriptionsPosition.postValue(MeetingViewModel.TranscriptionsPosition.TOP)
         } else {
             binding.buttonOpenChat.setIconEnabled(R.drawable.ic_chat_message)
+            meetingViewModel.transcriptionsPosition.postValue(MeetingViewModel.TranscriptionsPosition.BOTTOM)
         }
     }
 
@@ -865,11 +913,7 @@ class MeetingFragment : Fragment() {
         } else {
             binding.messageMenu.visibility = View.GONE
         }
-        if(meetingViewModel.prebuiltInfoContainer.chatInitialStateOpen()) {
-            binding.buttonOpenChat.setIconDisabled(R.drawable.ic_chat_message)
-        } else {
-            binding.buttonOpenChat.setIconEnabled(R.drawable.ic_chat_message)
-        }
+        chatButtonEnabled(meetingViewModel.prebuiltInfoContainer.chatInitialStateOpen())
     }
     var controlBarsVisible = true
     private fun setupConfiguration(mode: MeetingViewMode) {
@@ -981,6 +1025,8 @@ class MeetingFragment : Fragment() {
 
     private fun showControlBars(shouldHideAfterDelay : Boolean) {
         controlBarsVisible = true
+        binding.bottomControls.maxHeight = Int.MAX_VALUE
+
         binding.topMenu.animate()
             ?.translationY(0f)?.setDuration(300)?.setListener(object : AnimatorListener {
                 override fun onAnimationStart(animation: Animator) {
@@ -1089,7 +1135,8 @@ class MeetingFragment : Fragment() {
                 }
 
                 override fun onAnimationEnd(animation: Animator) {
-                    bottomMenu.visibility = View.GONE
+                    bottomMenu.visibility = View.INVISIBLE
+                    bottomMenu.maxHeight = 0
                     controlBarsVisible = false
                 }
 
@@ -1155,15 +1202,21 @@ class MeetingFragment : Fragment() {
                         onScreenShareClicked = { startOrStopScreenShare() },
                         onBRBClicked = { meetingViewModel.toggleBRB() },
                         onPeerListClicked = {
+                            meetingViewModel.tempHideCaptions()
                             if( meetingViewModel.prebuiltInfoContainer.isChatOverlay() ||
                                     !meetingViewModel.prebuiltInfoContainer.isChatEnabled()
                             ) {
                                 if(isOverlayChatVisible()){
                                     toggleChatVisibility()
                                 }
+                                val args = Bundle()
+                                    .apply {
+                                        putBoolean(DIRECTLY_OPENED, true)
+                                    }
+
                                 childFragmentManager
                                     .beginTransaction()
-                                    .add(R.id.fragment_container, ParticipantsFragment())
+                                    .add(R.id.fragment_container, ParticipantsFragment().apply { arguments = args })
                                     .commit()
                             } else {
                                 val args = Bundle()
@@ -1220,6 +1273,7 @@ class MeetingFragment : Fragment() {
                         {
                             findNavController().navigate(MeetingFragmentDirections.actionMeetingFragmentToPollsCreationFragment())
                         })
+                    meetingViewModel.tempHideCaptions()
                     settingsBottomSheet.show(
                         requireActivity().supportFragmentManager,
                         "settingsBottomSheet"
@@ -1360,12 +1414,7 @@ class MeetingFragment : Fragment() {
             }
         }
 
-        if(binding.chatView.visibility == View.VISIBLE) {
-
-            binding.buttonOpenChat.setIconDisabled(R.drawable.ic_chat_message)
-        } else {
-            binding.buttonOpenChat.setIconEnabled(R.drawable.ic_chat_message)
-        }
+        chatButtonEnabled(binding.chatView.visibility == View.VISIBLE)
     }
 
     private fun startOrStopScreenShare() {
@@ -1439,4 +1488,51 @@ class MeetingFragment : Fragment() {
             LeaveCallBottomSheet().show(parentFragmentManager, null)
         }
     }
+}
+
+@Preview
+@Composable
+fun DisplayCaptions() {
+    Captions(subtitles = listOf(TranscriptViewHolder("Cat", "Dinner time", peerId = "a"),
+        TranscriptViewHolder("Dog","Time for a walk", peerId = "b")))
+}
+
+@Composable
+fun Captions(subtitles: List<TranscriptViewHolder>?) {
+    val scrollState = rememberScrollState()
+    LaunchedEffect(subtitles) {
+        scrollState.scrollTo(scrollState.maxValue)
+    }
+
+    Column(
+        Modifier
+            .background(color = androidx.compose.ui.graphics.Color(Variables.BackgroundDim.toArgb()))
+            .fillMaxWidth()
+            .requiredHeightIn(
+                min = 27.dp,
+                max = 110.dp
+            )
+            .verticalScroll(scrollState)
+            .padding(12.dp),
+        ) {
+        subtitles?.forEach {
+            Caption(it.getSubtitle())
+        }
+    }
+
+}
+@Composable
+fun Caption(subtitles : AnnotatedString) {
+    Box(modifier = Modifier) {
+            Text(
+                text = subtitles,
+//                modifier = Modifier.padding(Variables.Spacing1),
+                style = TextStyle(
+                    fontSize = 14.sp,
+                    lineHeight = 20.sp,
+                    color = androidx.compose.ui.graphics.Color.White,
+                    letterSpacing = 0.25.sp,
+                )
+            )
+    }
 }