Merge pull request #531 from 100mslive/dev

Dev to release
100mslive · Nov 16, 2023 · c8a6454 · c8a6454
2 parents ba7d0c3 + 923a6eb
commit c8a6454
Show file tree

Hide file tree

Showing 21 changed files with 332 additions and 357 deletions.
diff --git a/gradle.properties b/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.3
+HMS_ROOM_KIT_VERSION=1.1.4
 android.suppressUnsupportedCompileSdk=33
diff --git a/room-kit/build.gradle b/room-kit/build.gradle
@@ -69,7 +69,7 @@ dependencies {
  implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
  implementation 'androidx.percentlayout:percentlayout:1.0.0'
 
- def hmsVersion = "2.8.0"
+ def hmsVersion = "2.8.1"
  // To add dependencies of specific module
  implementation "live.100ms:android-sdk:$hmsVersion"
  implementation "live.100ms:video-view:$hmsVersion"
@@ -158,4 +158,4 @@ afterEvaluate {
  }
  }
  }
-}
+}
diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/AudioOutputSwitchBottomSheet.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/AudioOutputSwitchBottomSheet.kt
@@ -6,6 +6,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 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
 import live.hms.roomkit.R
 import live.hms.roomkit.databinding.BottomSheetAudioSwitchBinding
@@ -47,7 +49,10 @@ class AudioOutputSwitchBottomSheet(
 
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)
-
+ dialog?.let {
+ val sheet = it as BottomSheetDialog
+ sheet.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+ }
 
  binding.root.background = resources.getDrawable(R.drawable.gray_shape_round_dialog)
  .apply {

diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/ChangeNameDialogFragment.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/ChangeNameDialogFragment.kt
@@ -7,6 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 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
 import live.hms.roomkit.R
 import live.hms.roomkit.databinding.ChangeNameFragmentBinding
@@ -41,6 +43,11 @@ class ChangeNameDialogFragment : BottomSheetDialogFragment() {
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)
  binding.applyTheme()
+
+ dialog?.let {
+ val sheet = it as BottomSheetDialog
+ sheet.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+ }
  val newName = binding.newName
  val submitButton = binding.changeName
  val cancelButton = binding.closeBtn

diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/HlsStreamingToggleBottomSheet.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/HlsStreamingToggleBottomSheet.kt
diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/HlsVideoQualitySelectorBottomSheet.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/HlsVideoQualitySelectorBottomSheet.kt
@@ -7,6 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
 import android.widget.TextView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import live.hms.roomkit.R
 import live.hms.roomkit.databinding.DialogTrackSelectionBinding
@@ -32,7 +34,10 @@ class HlsVideoQualitySelectorBottomSheet(
 
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)
-
+ dialog?.let {
+ val sheet = it as BottomSheetDialog
+ sheet.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+ }
  binding.closeBtn.setOnClickListener {
  dismiss()
  }

diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/meeting/MeetingActivity.kt b/room-kit/src/main/java/live/hms/roomkit/ui/meeting/MeetingActivity.kt
@@ -134,7 +134,10 @@ class MeetingActivity : AppCompatActivity() {
  }
 
  private fun initViewModels() {
- meetingViewModel.isRecording.observe(this) {
+ meetingViewModel.recordingState.observe(this) {
+ invalidateOptionsMenu()
+ }
+ meetingViewModel.streamingState.observe(this) {
  invalidateOptionsMenu()
  }
  meetingViewModel.pinnedTrack.observe(this) {