Abstracting away media player functionality to MediaPlayerManager

- Most code removed from ChatActivity - Most work in MediaPlayerManager - Added BackgroundVoiceMessageCard Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
nextcloud · Feb 7, 2025 · d6e6030 · d6e6030
1 parent 40bcf74
commit d6e6030
Show file tree

Hide file tree

Showing 14 changed files with 695 additions and 470 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
@@ -36,7 +36,9 @@ import com.nextcloud.talk.utils.preferences.AppPreferences
 import com.stfalcon.chatkit.messages.MessageHolders
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.concurrent.ExecutionException
@@ -61,9 +63,8 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
     @Inject
     lateinit var dateUtils: DateUtils
 
-    @JvmField
     @Inject
-    var appPreferences: AppPreferences? = null
+    lateinit var appPreferences: AppPreferences
 
     lateinit var message: ChatMessage
 
@@ -83,7 +84,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
         sharedApplication!!.componentApplication.inject(this)
 
         val filename = message.selectedIndividualHashMap!!["name"]
-        val retrieved = appPreferences!!.getWaveFormFromFile(filename)
+        val retrieved = appPreferences.getWaveFormFromFile(filename)
         if (retrieved.isNotEmpty() &&
             message.voiceMessageFloatArray == null ||
             message.voiceMessageFloatArray?.isEmpty() == true
@@ -103,7 +104,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
         setParentMessageDataOnMessageItem(message)
 
         updateDownloadState(message)
-        binding.seekbar.max = message.voiceMessageDuration * ONE_SEC
+        binding.seekbar.max = MAX
         viewThemeUtils.talk.themeWaveFormSeekBar(binding.seekbar)
         viewThemeUtils.platform.colorCircularProgressBar(binding.progressBar, ColorRole.ON_SURFACE_VARIANT)
 
@@ -139,10 +140,16 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
             }
         })
 
-        voiceMessageInterface.registerMessageToObservePlaybackSpeedPreferences(message.user.id) { speed ->
-            binding.playbackSpeedControlBtn.setSpeed(speed)
+        CoroutineScope(Dispatchers.Default).launch {
+            (voiceMessageInterface as ChatActivity).chatViewModel.voiceMessagePlayBackUIFlow.onEach { speed ->
+                withContext(Dispatchers.Main) {
+                    binding.playbackSpeedControlBtn.setSpeed(speed)
+                }
+            }.collect()
         }
 
+        binding.playbackSpeedControlBtn.setSpeed(appPreferences.getPreferredPlayback(message.actorId))
+
         Reaction().showReactions(
             message,
             ::clickOnReaction,
@@ -158,9 +165,6 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
 
     private fun showVoiceMessageDuration(message: ChatMessage) {
         if (message.voiceMessageDuration > 0) {
-            binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime(
-                message.voiceMessageDuration.toLong()
-            )
             binding.voiceMessageDuration.visibility = View.VISIBLE
         } else {
             binding.voiceMessageDuration.visibility = View.INVISIBLE
@@ -200,7 +204,6 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
             val t = message.voiceMessagePlayedSeconds.toLong()
             binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime(d - t)
             binding.voiceMessageDuration.visibility = View.VISIBLE
-            binding.seekbar.max = message.voiceMessageDuration * ONE_SEC
             binding.seekbar.progress = message.voiceMessageSeekbarProgress
         } else {
             showVoiceMessageDuration(message)
@@ -372,6 +375,6 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
     companion object {
         private const val TAG = "VoiceInMessageView"
         private const val SEEKBAR_START: Int = 0
-        private const val ONE_SEC: Int = 1000
+        private const val MAX: Int = 100
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
@@ -38,7 +38,9 @@ import com.nextcloud.talk.utils.preferences.AppPreferences
 import com.stfalcon.chatkit.messages.MessageHolders
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.concurrent.ExecutionException
@@ -65,9 +67,8 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
     @Inject
     lateinit var dateUtils: DateUtils
 
-    @JvmField
     @Inject
-    var appPreferences: AppPreferences? = null
+    lateinit var appPreferences: AppPreferences
 
     lateinit var message: ChatMessage
 
@@ -90,7 +91,7 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
         viewThemeUtils.platform.colorTextView(binding.messageTime, ColorRole.ON_SURFACE_VARIANT)
 
         val filename = message.selectedIndividualHashMap!!["name"]
-        val retrieved = appPreferences!!.getWaveFormFromFile(filename)
+        val retrieved = appPreferences.getWaveFormFromFile(filename)
         if (retrieved.isNotEmpty() &&
             message.voiceMessageFloatArray == null ||
             message.voiceMessageFloatArray?.isEmpty() == true
@@ -99,6 +100,7 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
             binding.seekbar.setWaveData(message.voiceMessageFloatArray!!)
         }
 
+        binding.seekbar.max = MAX
         binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
 
         colorizeMessageBubble(message)
@@ -136,10 +138,16 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
 
         setReadStatus(message.readStatus)
 
-        voiceMessageInterface.registerMessageToObservePlaybackSpeedPreferences(message.user.id) { speed ->
-            binding.playbackSpeedControlBtn.setSpeed(speed)
+        CoroutineScope(Dispatchers.Default).launch {
+            (voiceMessageInterface as ChatActivity).chatViewModel.voiceMessagePlayBackUIFlow.onEach { speed ->
+                withContext(Dispatchers.Main) {
+                    binding.playbackSpeedControlBtn.setSpeed(speed)
+                }
+            }.collect()
         }
 
+        binding.playbackSpeedControlBtn.setSpeed(appPreferences.getPreferredPlayback(message.actorId))
+
         Reaction().showReactions(
             message,
             ::clickOnReaction,
@@ -199,9 +207,6 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
 
     private fun showVoiceMessageDuration(message: ChatMessage) {
         if (message.voiceMessageDuration > 0) {
-            binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime(
-                message.voiceMessageDuration.toLong()
-            )
             binding.voiceMessageDuration.visibility = View.VISIBLE
         } else {
             binding.voiceMessageDuration.visibility = View.INVISIBLE
@@ -234,7 +239,6 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
             val t = message.voiceMessagePlayedSeconds.toLong()
             binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime(d - t)
             binding.voiceMessageDuration.visibility = View.VISIBLE
-            binding.seekbar.max = message.voiceMessageDuration * ONE_SEC
             binding.seekbar.progress = message.voiceMessageSeekbarProgress
         } else {
             showVoiceMessageDuration(message)
@@ -377,6 +381,6 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
     companion object {
         private const val TAG = "VoiceOutMessageView"
         private const val SEEKBAR_START: Int = 0
-        private const val ONE_SEC: Int = 1000
+        private const val MAX = 100
     }
 }