Reworked how lifecyle owner is set on view stubs after being inflated, fixes voice messages UI not being updated when playing

app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt

@@ -33,7 +33,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.view.doOnPreDraw
 import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -678,18 +677,6 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                 sharedViewModel.isPendingMessageForward.value = false
             }
         }
-
-        binding.stubbedMessageToReplyTo.setOnInflateListener { _, inflated ->
-            Log.i("[Chat Room] Replying to message layout inflated")
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedVoiceRecording.setOnInflateListener { _, inflated ->
-            Log.i("[Chat Room] Voice recording layout inflated")
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
     }
 
     override fun deleteItems(indexesOfItemToDelete: ArrayList<Int>) {

app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt

@@ -30,8 +30,6 @@ import android.widget.Chronometer
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
 import androidx.navigation.navGraphViewModels
 import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
@@ -252,49 +250,6 @@ class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding
                 startActivity(intent)
             }
         }
-
-        binding.stubbedConferenceActiveSpeakerLayout.setOnInflateListener { _, inflated ->
-            Log.i("[Conference Call] Active speaker conference layout inflated")
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-            startTimer(R.id.active_conference_timer)
-
-            adjustActiveSpeakerLayout()
-        }
-
-        binding.stubbedConferenceGridLayout.setOnInflateListener { _, inflated ->
-            Log.i("[Conference Call] Mosaic conference layout inflated")
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-            startTimer(R.id.active_conference_timer)
-        }
-
-        binding.stubbedConferenceAudioOnlyLayout.setOnInflateListener { _, inflated ->
-            Log.i("[Conference Call] Audio only conference layout inflated")
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-            startTimer(R.id.active_conference_timer)
-        }
-
-        binding.stubbedAudioRoutes.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedNumpad.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedCallStats.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedPausedConference.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
     }
 
     override fun onPause() {

app/src/main/java/org/linphone/activities/voip/fragments/OutgoingCallFragment.kt

@@ -23,8 +23,6 @@ import android.os.Bundle
 import android.os.SystemClock
 import android.view.View
 import android.widget.Chronometer
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
 import androidx.navigation.navGraphViewModels
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
@@ -84,10 +82,5 @@ class OutgoingCallFragment : GenericVideoPreviewFragment<VoipCallOutgoingFragmen
                 coreContext.core.nativePreviewWindowId = binding.localPreviewVideoSurface
             }
         }
-
-        binding.stubNumpad.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
     }
 }

app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt

@@ -26,8 +26,6 @@ import android.os.SystemClock
 import android.view.View
 import android.widget.Chronometer
 import androidx.constraintlayout.widget.ConstraintSet
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
 import androidx.navigation.navGraphViewModels
 import androidx.window.layout.FoldingFeature
 import org.linphone.LinphoneApplication.Companion.coreContext
@@ -162,31 +160,6 @@ class SingleCallFragment : GenericVideoPreviewFragment<VoipSingleCallFragmentBin
 
         coreContext.core.nativeVideoWindowId = binding.remoteVideoSurface
         coreContext.core.nativePreviewWindowId = binding.localPreviewVideoSurface
-
-        binding.stubbedAudioRoutes.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedNumpad.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedCallStats.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedPausedCall.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
-
-        binding.stubbedRemotelyPausedCall.setOnInflateListener { _, inflated ->
-            val binding = DataBindingUtil.bind<ViewDataBinding>(inflated)
-            binding?.lifecycleOwner = viewLifecycleOwner
-        }
     }
 
     override fun onPause() {

app/src/main/java/org/linphone/utils/DataBindingUtils.kt

@@ -25,10 +25,7 @@ import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Patterns
-import android.view.LayoutInflater
+import android.view.*
-import android.view.TextureView
-import android.view.View
-import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.*
@@ -228,6 +225,13 @@ fun setListener(view: SeekBar, lambda: (Any) -> Unit) {
     })
 }
 
+@BindingAdapter("inflatedLifecycleOwner")
+fun setInflatedViewStubLifecycleOwner(view: View, enable: Boolean) {
+    val binding = DataBindingUtil.bind<ViewDataBinding>(view)
+    // This is a bit hacky...
+    binding?.lifecycleOwner = view.context as GenericActivity
+}
+
 @BindingAdapter("entries")
 fun setEntries(
     viewGroup: ViewGroup,

app/src/main/res/layout-land/voip_conference_active_speaker.xml

@@ -25,7 +25,8 @@
         android:layout_height="match_parent"
         android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
         android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/top_barrier"

app/src/main/res/layout-land/voip_conference_grid.xml

@@ -25,7 +25,8 @@
         android:layout_height="match_parent"
         android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
         android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/top_barrier"

app/src/main/res/layout-land/voip_numpad.xml

@@ -18,7 +18,8 @@
         android:layout_height="match_parent"
         android:background="@color/voip_translucent_popup_background"
         android:clickable="true"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/background"

app/src/main/res/layout/chat_message_conference_invitation_content_cell.xml

@@ -23,7 +23,8 @@
         android:orientation="vertical"
         android:padding="10dp"
         android:background="@drawable/shape_conference_invite_background"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <TextView
             android:layout_width="match_parent"

app/src/main/res/layout/chat_message_downloadable_file_content_cell.xml

@@ -21,7 +21,8 @@
         android:orientation="vertical"
         android:gravity="center"
         android:background="?attr/backgroundColor"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <TextView
             style="@style/chat_file_attachment_font"

app/src/main/res/layout/chat_message_generic_file_content_cell.xml

@@ -21,7 +21,8 @@
         android:orientation="vertical"
         android:gravity="center"
         android:background="?attr/backgroundColor"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <TextView
             style="@style/chat_file_attachment_font"

app/src/main/res/layout/chat_message_image_content_cell.xml

@@ -20,7 +20,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <ImageView
             android:onClick="@{() -> data.openFile()}"

app/src/main/res/layout/chat_message_reply.xml

@@ -19,7 +19,8 @@
         android:background="@{data.chatMessage.isOutgoing ? @color/chat_bubble_outgoing_color : @color/chat_bubble_incoming_color, default=@color/chat_bubble_incoming_color}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <LinearLayout
             android:id="@+id/reply_layout"

app/src/main/res/layout/chat_message_video_content_cell.xml

@@ -18,7 +18,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <ImageView
             android:onClick="@{() -> data.openFile()}"

app/src/main/res/layout/chat_message_voice_record_content_cell.xml

@@ -20,7 +20,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:onLongClick="@{longClickListener}"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <org.linphone.views.VoiceRecordProgressBar
             style="@style/Widget.AppCompat.ProgressBar.Horizontal"

app/src/main/res/layout/chat_message_voice_recording.xml

@@ -18,7 +18,8 @@
         android:layout_height="wrap_content"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <ImageView
             android:id="@+id/cancel_recording"

app/src/main/res/layout/voip_call_paused.xml

@@ -19,7 +19,8 @@
         android:background="@color/voip_translucent_popup_background"
         android:clickable="true"
         android:focusable="true"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <ImageView
             android:id="@+id/resume_call"

app/src/main/res/layout/voip_call_paused_by_remote.xml

@@ -16,7 +16,8 @@
         android:background="@color/voip_translucent_popup_background"
         android:clickable="true"
         android:focusable="true"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <ImageView
             android:id="@+id/paused_call"

app/src/main/res/layout/voip_call_stats.xml

@@ -21,7 +21,8 @@
         android:layout_height="match_parent"
         android:background="@color/voip_translucent_popup_background"
         android:clickable="true"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/background"

app/src/main/res/layout/voip_conference_active_speaker.xml

@@ -25,7 +25,8 @@
         android:layout_height="match_parent"
         android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
         android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/top_barrier"

app/src/main/res/layout/voip_conference_audio_only.xml

@@ -25,7 +25,8 @@
         android:layout_height="match_parent"
         android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
         android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/top_barrier"

app/src/main/res/layout/voip_conference_grid.xml

@@ -25,7 +25,8 @@
         android:layout_height="match_parent"
         android:layout_margin="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_remote_margin, default=@dimen/voip_remote_margin}"
         android:paddingBottom="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? @dimen/margin_0dp : @dimen/voip_buttons_fragment_margin_size}"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/top_barrier"

app/src/main/res/layout/voip_conference_paused.xml

@@ -18,7 +18,8 @@
         android:background="@color/voip_translucent_popup_background"
         android:clickable="true"
         android:focusable="true"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <ImageView
             android:id="@+id/resume_conference"

app/src/main/res/layout/voip_numpad.xml

@@ -18,7 +18,8 @@
         android:layout_height="match_parent"
         android:background="@color/voip_translucent_popup_background"
         android:clickable="true"
-        android:visibility="@{inflatedVisibility}">
+        android:visibility="@{inflatedVisibility}"
+        inflatedLifecycleOwner="@{true}">
 
         <View
             android:id="@+id/background"