Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-communication-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {
androidx_activity_ktx_version = '1.4.0'
androidx_appcompat_version = '1.4.1'
androidx_constraint_layout_version = '2.1.4'
androidx_core_ktx_version = '1.7.0'
androidx_core_ktx_version = '1.16.0'
androidx_core_testing_version = '2.1.0'
androidx_espresso_contrib_version = '3.4.0'
androidx_espresso_core_version = '3.4.0'
Expand Down
5 changes: 3 additions & 2 deletions azure-communication-ui/calling/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ apply from: file('jacoco.gradle')

android {
resourcePrefix 'azure_communication_ui_calling_'
compileSdk 34
compileSdk 35

defaultConfig {
minSdkVersion 26
targetSdkVersion 34
targetSdkVersion 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
buildConfigField "String", "UI_SDK_VERSION", "\"" + call_library_version_name + "\""
Expand Down Expand Up @@ -102,6 +102,7 @@ dependencies {
implementation "com.microsoft.fluentui:fluentui_drawer:$microsoft_fluent_ui_version"
implementation "com.microsoft.fluentui:fluentui_persona:$microsoft_fluent_ui_version"
implementation "com.microsoft.fluentui:fluentui_transients:$microsoft_fluent_ui_version"
implementation "androidx.activity:activity-ktx:$androidx_activity_ktx_version"

api 'com.jakewharton.threetenabp:threetenabp:1.4.4'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,18 @@ import android.util.LayoutDirection
import android.util.Rational
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
import android.view.WindowManager
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.fragment.app.FragmentTransaction
import androidx.lifecycle.lifecycleScope
import com.azure.android.communication.ui.calling.CallCompositeException
Expand Down Expand Up @@ -94,6 +99,10 @@ internal open class CallCompositeActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
// Before super, we'll set up the DI injector and check the PiP state
if (Build.VERSION.SDK_INT >= 35) {
// Turn OFF edge-to-edge behavior
WindowCompat.setDecorFitsSystemWindows(window, true)
}
try {
diContainerHolder.instanceId = instanceId
diContainerHolder.container.callCompositeActivityWeakReference = WeakReference(this)
Expand Down Expand Up @@ -132,7 +141,18 @@ internal open class CallCompositeActivity : AppCompatActivity() {
}
updatableOptionsManager.start()
setContentView(R.layout.azure_communication_ui_calling_activity_call_composite)
if (Build.VERSION.SDK_INT >= 35) {
val rootView = findViewById<ViewGroup>(R.id.azure_communication_ui_fragment_container_view)

ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
val statusBarHeight = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
val navBarHeight = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom

view.updatePadding(top = statusBarHeight, bottom = navBarHeight)

insets
}
}
permissionManager.start(
this,
getAudioPermissionLauncher(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package com.azure.android.communication.ui.calling.presentation.fragment.calling

import android.annotation.SuppressLint
import android.content.Context
import android.os.Build
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.View
Expand All @@ -17,8 +18,11 @@ import android.widget.FrameLayout
import android.widget.ImageButton
import android.widget.LinearLayout
import android.widget.TextView
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isVisible
import androidx.core.view.marginTop
import androidx.core.view.updatePadding
import androidx.core.widget.addTextChangedListener
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
Expand All @@ -28,7 +32,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator
import com.azure.android.communication.ui.calling.implementation.R
import com.azure.android.communication.ui.calling.utilities.isTablet
import com.azure.android.communication.ui.calling.utilities.launchAll
import kotlinx.coroutines.flow.collect
import kotlin.math.abs
import kotlin.math.max
import kotlin.math.min
Expand Down Expand Up @@ -83,6 +86,11 @@ internal class CaptionsRttView : FrameLayout {

(recyclerView.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false

// Handle window insets for edge-to-edge support
if (Build.VERSION.SDK_INT >= 35) {
setupWindowInsetsHandling()
}

rttInputText.addTextChangedListener {
// Ignore initial text restoration
if (isInitialized) {
Expand All @@ -100,6 +108,54 @@ internal class CaptionsRttView : FrameLayout {
post { isInitialized = true }
}

private fun setupWindowInsetsHandling() {
// Apply window insets handling for API 35+ edge-to-edge support
// Apply to the root view (this) instead of just captionsLinearLayout
ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
val imeInsets = windowInsets.getInsets(WindowInsetsCompat.Type.ime())

// Apply system bar insets to the root view
view.updatePadding(
left = insets.left,
right = insets.right
)

// Apply IME insets to the captions layout to push it above keyboard
captionsLinearLayout.updatePadding(
bottom = if (imeInsets.bottom > 0) {
// When keyboard is visible, add padding to push content above it
imeInsets.bottom - 100
} else {
// When keyboard is hidden, use system bar bottom inset
insets.bottom - 100
}
)

// Ensure the recycler view adjusts its size
if (imeInsets.bottom > 0) {
// Adjust the recycler view height when keyboard is shown
val layoutParams = recyclerView.layoutParams
val availableHeight = height - imeInsets.bottom - captionsLinearLayout.paddingTop

// Ensure minimum height for recycler view
if (availableHeight > minHeight) {
post {
scrollToBottom()
// Force layout to recalculate
captionsLinearLayout.requestLayout()
}
}
}

// Return the insets so they can be consumed by child views if needed
windowInsets
}

// Request that insets be dispatched to this view
ViewCompat.requestApplyInsets(this)
}

@SuppressLint("NotifyDataSetChanged", "ClickableViewAccessibility")
fun start(
viewLifecycleOwner: LifecycleOwner,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ package com.azure.android.communication.ui.calling.presentation.fragment.calling

import android.annotation.SuppressLint
import android.content.Context
import android.content.res.Configuration
import android.os.Build
import android.view.View
import android.widget.RelativeLayout
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import androidx.core.view.updatePadding
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
Expand All @@ -18,7 +23,6 @@ import com.azure.android.communication.ui.calling.utilities.BottomCellAdapter
import com.azure.android.communication.ui.calling.utilities.BottomCellItem
import com.azure.android.communication.ui.calling.utilities.BottomCellItemType
import com.microsoft.fluentui.drawer.DrawerDialog
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import kotlin.math.max

Expand Down Expand Up @@ -74,6 +78,21 @@ internal class LeaveConfirmView(
private fun initializeLeaveConfirmMenuDrawer() {
leaveConfirmMenuDrawer = DrawerDialog(context, DrawerDialog.BehaviorType.BOTTOM)
leaveConfirmMenuDrawer.setContentView(this)
if (Build.VERSION.SDK_INT >= 35) {
ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
val orientation = resources.configuration.orientation
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures())

// Apply padding only in portrait orientation
if (orientation == Configuration.ORIENTATION_PORTRAIT) {
view.updatePadding(0, 0, 0, insets.bottom + 76)
} else {
view.updatePadding(0, 0, 0, 0)
}
WindowInsetsCompat.CONSUMED
}
}

leaveConfirmMenuDrawer.setOnDismissListener {
viewModel.cancel()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import com.azure.android.communication.ui.calling.models.CallCompositeParticipan
import com.azure.android.communication.ui.calling.presentation.VideoViewManager
import com.azure.android.communication.ui.calling.presentation.manager.AvatarViewManager
import com.azure.android.communication.ui.calling.service.sdk.VideoStreamRenderer
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch

internal class ParticipantGridView : GridLayout {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ package com.azure.android.communication.ui.calling.presentation.fragment.calling

import android.app.AlertDialog
import android.content.Context
import android.os.Build
import android.view.accessibility.AccessibilityManager
import android.widget.RelativeLayout
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
Expand All @@ -21,7 +25,6 @@ import com.azure.android.communication.ui.calling.utilities.BottomCellItem
import com.azure.android.communication.ui.calling.utilities.BottomCellItemType
import com.azure.android.communication.ui.calling.utilities.implementation.CompositeDrawerDialog
import com.microsoft.fluentui.drawer.DrawerDialog
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch

internal class ParticipantListView(
Expand Down Expand Up @@ -78,6 +81,14 @@ internal class ParticipantListView(
}
}
}
if (Build.VERSION.SDK_INT >= 35) {
ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures())
view.updatePadding(0, 0, 0, insets.bottom + 106)

WindowInsetsCompat.CONSUMED
}
}
}

fun stop() {
Expand Down Expand Up @@ -131,22 +142,37 @@ internal class ParticipantListView(
}

private fun updateTableHeight(listSize: Int) {

// title for in call participants
var titles = 1

// title for in lobby participants
if (viewModel.participantListContentStateFlow.value.remoteParticipantList.any { it.status == ParticipantStatus.IN_LOBBY }) {
titles += 1
}

// set the height of the list to be half of the screen height or 50dp per item, whichever is smaller
participantTable.layoutParams.height =
(((listSize - titles) * 50 * context.resources.displayMetrics.density + titles * 30 * context.resources.displayMetrics.density).toInt()).coerceAtMost(
context.resources.displayMetrics.heightPixels / 2
)
}
val density = context.resources.displayMetrics.density

if (Build.VERSION.SDK_INT >= 35) {
// On Android 15+, calculate available height using WindowInsets
participantTable.post {
val windowInsets = ViewCompat.getRootWindowInsets(this)
val insets = windowInsets?.getInsets(WindowInsetsCompat.Type.systemBars())
val availableHeight = context.resources.displayMetrics.heightPixels - (insets?.top ?: 0) - (insets?.bottom ?: 0)

val desiredHeight = (((listSize - titles) * 50 * density + titles * 30 * density).toInt())
val finalHeight = desiredHeight.coerceAtMost(availableHeight / 2)

participantTable.layoutParams = participantTable.layoutParams.apply {
height = finalHeight
}
}
} else {
// For Android 13 and below: keep existing logic
val desiredHeight = (((listSize - titles) * 50 * density + titles * 30 * density).toInt())
val finalHeight = desiredHeight.coerceAtMost(context.resources.displayMetrics.heightPixels / 2)

participantTable.layoutParams = participantTable.layoutParams.apply {
height = finalHeight
}
}
}
private fun generateBottomCellItems(
participantListContent: ParticipantListContent,
): MutableList<BottomCellItem> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,23 @@ import android.content.Context
import android.content.Intent
import android.content.Intent.ACTION_VIEW
import android.net.Uri
import android.os.Build
import android.util.AttributeSet
import android.widget.EditText
import androidx.appcompat.widget.AppCompatTextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.core.widget.addTextChangedListener
import androidx.lifecycle.LifecycleOwner

import androidx.lifecycle.lifecycleScope
import com.azure.android.communication.ui.calling.implementation.R
import com.azure.android.communication.ui.calling.utilities.implementation.CompositeDrawerDialog
import com.microsoft.fluentui.drawer.DrawerDialog
import com.microsoft.fluentui.widget.Button
import kotlinx.coroutines.InternalCoroutinesApi
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch

/**
Expand Down Expand Up @@ -61,11 +65,50 @@ internal class SupportView : ConstraintLayout {
fun start(viewModel: SupportViewModel, viewLifecycleOwner: LifecycleOwner) {
// Text Changed, Submit, Cancel Buttons
bindViewInputs(viewModel)
if (Build.VERSION.SDK_INT >= 35) {
// Setup window insets handling for edge-to-edge support
setupWindowInsetsHandling()
}

// Send Button stat
bindViewOutputs(viewLifecycleOwner, viewModel)
}

private fun setupWindowInsetsHandling() {
// Only apply window insets handling for API 35+ edge-to-edge support
if (android.os.Build.VERSION.SDK_INT >= 35) {
ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
val imeInsets = windowInsets.getInsets(WindowInsetsCompat.Type.ime())

// Apply system bar insets
view.updatePadding(
left = insets.left,
right = insets.right
)

// Adjust the entire view's bottom margin to push it above the keyboard
val layoutParams = view.layoutParams as? MarginLayoutParams
layoutParams?.let {
it.bottomMargin = if (imeInsets.bottom > 0) {
// When keyboard is visible, add margin to push content above it
imeInsets.bottom
} else {
// When keyboard is hidden, use system bar bottom inset
insets.bottom
}
view.layoutParams = it
}

// Return the insets
windowInsets
}

// Request that insets be dispatched to this view
ViewCompat.requestApplyInsets(this)
}
}

private fun bindViewInputs(viewModel: SupportViewModel) {
menuDrawer.setOnDismissListener {
viewModel.dismissForm()
Expand Down
Loading