mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-10 14:24:05 +01:00
show 1h call duration info when screen is reopenend
+ make call duration bold for >= 1hour Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
8e93a1936b
commit
8dd8f745cb
@ -36,6 +36,7 @@ import android.content.Intent
|
|||||||
import android.content.IntentFilter
|
import android.content.IntentFilter
|
||||||
import android.content.res.Configuration
|
import android.content.res.Configuration
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
|
import android.graphics.Typeface
|
||||||
import android.graphics.drawable.Icon
|
import android.graphics.drawable.Icon
|
||||||
import android.media.AudioAttributes
|
import android.media.AudioAttributes
|
||||||
import android.media.MediaPlayer
|
import android.media.MediaPlayer
|
||||||
@ -306,6 +307,7 @@ class CallActivity : CallBaseActivity() {
|
|||||||
private var binding: CallActivityBinding? = null
|
private var binding: CallActivityBinding? = null
|
||||||
private var audioOutputDialog: AudioOutputDialog? = null
|
private var audioOutputDialog: AudioOutputDialog? = null
|
||||||
private var moreCallActionsDialog: MoreCallActionsDialog? = null
|
private var moreCallActionsDialog: MoreCallActionsDialog? = null
|
||||||
|
private var elapsedSeconds: Long = 0
|
||||||
|
|
||||||
private var requestPermissionLauncher = registerForActivityResult(
|
private var requestPermissionLauncher = registerForActivityResult(
|
||||||
ActivityResultContracts.RequestMultiplePermissions()
|
ActivityResultContracts.RequestMultiplePermissions()
|
||||||
@ -485,6 +487,16 @@ class CallActivity : CallBaseActivity() {
|
|||||||
reactionAnimator = ReactionAnimator(context, binding!!.reactionAnimationWrapper, viewThemeUtils)
|
reactionAnimator = ReactionAnimator(context, binding!!.reactionAnimationWrapper, viewThemeUtils)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onResume() {
|
||||||
|
super.onResume()
|
||||||
|
if (hasSpreedFeatureCapability(conversationUser, "recording-v1") &&
|
||||||
|
othersInCall &&
|
||||||
|
elapsedSeconds.toInt() >= CALL_TIME_ONE_HOUR
|
||||||
|
) {
|
||||||
|
showCallRunningSinceOneHourOrMoreInfo()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun sendReaction(emoji: String?) {
|
fun sendReaction(emoji: String?) {
|
||||||
addReactionForAnimation(emoji, conversationUser!!.displayName)
|
addReactionForAnimation(emoji, conversationUser!!.displayName)
|
||||||
if (isConnectionEstablished) {
|
if (isConnectionEstablished) {
|
||||||
@ -1596,19 +1608,14 @@ class CallActivity : CallBaseActivity() {
|
|||||||
if (callStartTime != null && hasSpreedFeatureCapability(conversationUser, "recording-v1")) {
|
if (callStartTime != null && hasSpreedFeatureCapability(conversationUser, "recording-v1")) {
|
||||||
binding!!.callDuration.visibility = View.VISIBLE
|
binding!!.callDuration.visibility = View.VISIBLE
|
||||||
val currentTimeInSec = System.currentTimeMillis() / SECOND_IN_MILLIES
|
val currentTimeInSec = System.currentTimeMillis() / SECOND_IN_MILLIES
|
||||||
var elapsedSeconds: Long = currentTimeInSec - callStartTime
|
elapsedSeconds = currentTimeInSec - callStartTime
|
||||||
|
|
||||||
val callTimeTask: Runnable = object : Runnable {
|
val callTimeTask: Runnable = object : Runnable {
|
||||||
override fun run() {
|
override fun run() {
|
||||||
if (othersInCall) {
|
if (othersInCall) {
|
||||||
binding!!.callDuration.text = DateUtils.formatElapsedTime(elapsedSeconds)
|
binding!!.callDuration.text = DateUtils.formatElapsedTime(elapsedSeconds)
|
||||||
if (elapsedSeconds.toInt() == CALL_TIME_ONE_HOUR) {
|
if (elapsedSeconds.toInt() == CALL_TIME_ONE_HOUR) {
|
||||||
vibrateShort(context)
|
showCallRunningSinceOneHourOrMoreInfo()
|
||||||
Toast.makeText(
|
|
||||||
context,
|
|
||||||
context.resources.getString(R.string.call_running_since_one_hour),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding!!.callDuration.text = CALL_DURATION_EMPTY
|
binding!!.callDuration.text = CALL_DURATION_EMPTY
|
||||||
@ -1624,6 +1631,16 @@ class CallActivity : CallBaseActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun showCallRunningSinceOneHourOrMoreInfo() {
|
||||||
|
binding!!.callDuration.setTypeface(null, Typeface.BOLD)
|
||||||
|
vibrateShort(context)
|
||||||
|
Toast.makeText(
|
||||||
|
context,
|
||||||
|
context.resources.getString(R.string.call_running_since_one_hour),
|
||||||
|
Toast.LENGTH_LONG
|
||||||
|
).show()
|
||||||
|
}
|
||||||
|
|
||||||
private fun pullSignalingMessages() {
|
private fun pullSignalingMessages() {
|
||||||
val signalingApiVersion = ApiUtils.getSignalingApiVersion(conversationUser, intArrayOf(ApiUtils.APIv3, 2, 1))
|
val signalingApiVersion = ApiUtils.getSignalingApiVersion(conversationUser, intArrayOf(ApiUtils.APIv3, 2, 1))
|
||||||
val delayOnError = AtomicInteger(0)
|
val delayOnError = AtomicInteger(0)
|
||||||
|
Loading…
Reference in New Issue
Block a user