diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt index c7eacc2cb..0c5df6a12 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt @@ -258,7 +258,7 @@ class CallNotificationActivity : CallBaseActivity() { notificationHandler.post(object : Runnable { override fun run() { if (NotificationUtils.isNotificationVisible(context, notificationTimestamp!!.toInt())) { - notificationHandler.postDelayed(this, 1000) + notificationHandler.postDelayed(this, ONE_SECOND) } else { finish() } @@ -320,5 +320,6 @@ class CallNotificationActivity : CallBaseActivity() { companion object { const val TAG = "CallNotificationActivity" const val GET_ROOM_RETRY_COUNT: Long = 3 + const val ONE_SECOND: Long = 1000 } } diff --git a/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt b/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt index 3c9c263e0..746644b8c 100644 --- a/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt +++ b/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt @@ -124,7 +124,7 @@ class ReactionAnimator( val emojiView = EmojiTextView(context) emojiView.text = callReaction.emoji - emojiView.textSize = 20f + emojiView.textSize = TEXT_SIZE val nameView = getNameView(callReaction) reactionWrapper.addView(emojiView) @@ -141,7 +141,7 @@ class ReactionAnimator( ViewGroup.LayoutParams.WRAP_CONTENT ) - nameViewParams.setMargins(20, 0, 20, 5) + nameViewParams.setMargins(HORIZONTAL_MARGIN, 0, HORIZONTAL_MARGIN, BOTTOM_MARGIN) nameView.layoutParams = nameViewParams nameView.text = " " + callReaction.userName + " " @@ -176,6 +176,10 @@ class ReactionAnimator( private const val ZERO_ALPHA = 0f private const val ALPHA_PROPERTY = "alpha" + + private const val TEXT_SIZE = 20f + private const val HORIZONTAL_MARGIN: Int = 20 + private const val BOTTOM_MARGIN: Int = 5 } } data class CallReaction( diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt index f21543272..8e81d3c7e 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt @@ -118,7 +118,7 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee availableReactions.forEach { val emojiView = EmojiTextView(context) emojiView.text = it.toString() - emojiView.textSize = 20f + emojiView.textSize = TEXT_SIZE emojiView.layoutParams = param emojiView.setOnClickListener { view -> @@ -198,5 +198,6 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee companion object { private const val TAG = "MoreCallActionsDialog" + private const val TEXT_SIZE = 20f } }