Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abstracting away media player #4579

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
+646 −480
Draft

Abstracting away media player #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7fd8aa7
WIP
rapterjet2004 Dec 24, 2024
adda21e
MediaPlayerManager should be finished now, next up in working with Ch…
rapterjet2004 Dec 26, 2024
c9982cb
WIP got business logic down - next up is UI and debugging
rapterjet2004 Dec 27, 2024
deb0f5d
WIP Some UI in place - committing to work on some other bugs
rapterjet2004 Jan 6, 2025
3af5d03
WIP working on UI, now need to refactor chat activity to use media pl…
rapterjet2004 Jan 7, 2025
6014b82
Got the barebones MediaPlayerManager set up in ChatActivity. Now need…
rapterjet2004 Jan 10, 2025
afc0678
Got pausing down, background plays but UI not showing up
rapterjet2004 Jan 13, 2025
aefdc06
Got the background play working
rapterjet2004 Jan 15, 2025
1687436
Got avatars working
rapterjet2004 Jan 15, 2025
b1dd20a
WIP playback speed controls
rapterjet2004 Jan 15, 2025
9a56e49
Got play back speed working
rapterjet2004 Jan 16, 2025
667eeca
Fixed some bugs with the seek bar
rapterjet2004 Jan 16, 2025
cf024be
WIP Got auto play working
rapterjet2004 Jan 24, 2025
57787cf
Added conversation avatar to the card, to keep track of where it's co…
rapterjet2004 Jan 24, 2025
8f462aa
Adding durations + Deleting unused code
rapterjet2004 Jan 24, 2025
1a713a3
latest fixe - pausing UI is still buggy with preview player. Need to …
rapterjet2004 Jan 27, 2025
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
1 change: 1 addition & 0 deletions .idea/inspectionProfiles/ktlint.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 14 additions & 7 deletions app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -103,7 +104,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
setParentMessageDataOnMessageItem(message)

updateDownloadState(message)
binding.seekbar.max = message.voiceMessageDuration * ONE_SEC
binding.seekbar.max = 100
viewThemeUtils.talk.themeWaveFormSeekBar(binding.seekbar)
viewThemeUtils.platform.colorCircularProgressBar(binding.progressBar, ColorRole.ON_SURFACE_VARIANT)

Expand Down Expand Up @@ -139,10 +140,17 @@ 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,
Expand Down Expand Up @@ -200,7 +208,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)
Expand Down
19 changes: 13 additions & 6 deletions app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -99,6 +100,7 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
binding.seekbar.setWaveData(message.voiceMessageFloatArray!!)
}

binding.seekbar.max = 100
binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)

colorizeMessageBubble(message)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -234,7 +242,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)
Expand Down
Loading