From 169dac4045ca9117fa89a0d5ef2fd65c0db719c1 Mon Sep 17 00:00:00 2001 From: Giacomo Pacini Date: Thu, 19 Dec 2024 12:20:30 +0100 Subject: [PATCH] spacing Signed-off-by: Giacomo Pacini --- .../adapters/messages/IncomingVoiceMessageViewHolder.kt | 8 +++++--- .../adapters/messages/OutcomingVoiceMessageViewHolder.kt | 8 +++++--- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 6 ++++-- .../com/nextcloud/talk/chat/data/model/ChatMessage.kt | 2 +- .../nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt | 6 +++--- 5 files changed, 18 insertions(+), 12 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 index 3ea329720..b646acd4c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt @@ -155,9 +155,10 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : isBound = true } - private fun showVoiceMessageDuration(message: ChatMessage){ + private fun showVoiceMessageDuration(message: ChatMessage) { if (message.voiceMessageDuration > 0) { - binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime(message.voiceMessageDuration.toLong()) + binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime( + message.voiceMessageDuration.toLong()) binding.voiceMessageDuration.visibility = View.VISIBLE } else { binding.voiceMessageDuration.visibility = View.INVISIBLE @@ -290,7 +291,8 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : } private fun colorizeMessageBubble(message: ChatMessage) { - viewThemeUtils.talk.themeIncomingMessageBubble(bubble, message.isGrouped, message.isDeleted, message.wasPlayedVoiceMessage) + viewThemeUtils.talk.themeIncomingMessageBubble(bubble, message.isGrouped, + message.isDeleted, message.wasPlayedVoiceMessage) } @Suppress("Detekt.TooGenericExceptionCaught") 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 index 6b8d36f4b..1f0a4bcbf 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt @@ -196,9 +196,10 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) : } } - private fun showVoiceMessageDuration(message: ChatMessage){ + private fun showVoiceMessageDuration(message: ChatMessage) { if (message.voiceMessageDuration > 0) { - binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime(message.voiceMessageDuration.toLong()) + binding.voiceMessageDuration.text = android.text.format.DateUtils.formatElapsedTime( + message.voiceMessageDuration.toLong()) binding.voiceMessageDuration.visibility = View.VISIBLE } else { binding.voiceMessageDuration.visibility = View.INVISIBLE @@ -355,7 +356,8 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) : } private fun colorizeMessageBubble(message: ChatMessage) { - viewThemeUtils.talk.themeOutgoingMessageBubble(bubble, message.isGrouped, message.isDeleted, message.wasPlayedVoiceMessage) + viewThemeUtils.talk.themeOutgoingMessageBubble(bubble, message.isGrouped, + message.isDeleted, message.wasPlayedVoiceMessage) } fun assignVoiceMessageInterface(voiceMessageInterface: VoiceMessageInterface) { diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index c1a895b05..b2a51bf61 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -1205,7 +1205,8 @@ class ChatActivity : } } - private fun setUpWaveform(message: ChatMessage, thenPlay: Boolean = true, backgroundPlayAllowed : Boolean = false) { + private fun setUpWaveform(message: ChatMessage, thenPlay: Boolean = true, + backgroundPlayAllowed: Boolean = false) { val filename = message.selectedIndividualHashMap!!["name"] val file = File(context.cacheDir, filename!!) if (file.exists() && message.voiceMessageFloatArray == null) { @@ -1614,7 +1615,8 @@ class ChatActivity : } } - private fun startPlayback(message: ChatMessage, doPlay: Boolean = true, backgroundPlayAllowed : Boolean = false) { + private fun startPlayback(message: ChatMessage, doPlay: Boolean = true, + backgroundPlayAllowed: Boolean = false) { if (!active && !backgroundPlayAllowed) { // don't begin to play voice message if screen is not visible anymore. // this situation might happen if file is downloading but user already left the chatview. diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt index f071f9849..ae8394af9 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt @@ -91,7 +91,7 @@ data class ChatMessage( var isPlayingVoiceMessage: Boolean = false, - var wasPlayedVoiceMessage : Boolean = false, + var wasPlayedVoiceMessage: Boolean = false, var voiceMessageDuration: Int = 0, diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt index ad85b6c9f..179d87126 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt @@ -81,7 +81,7 @@ class TalkSpecificViewThemeUtils @Inject constructor( val bgBubbleColor = if (deleted) { resources.getColor(R.color.bg_message_list_incoming_bubble_deleted, null) - } else if(isPlayed){ + } else if (isPlayed){ resources.getColor(R.color.bg_message_list_incoming_bubble_audio_played, null) } else { resources.getColor(R.color.bg_message_list_incoming_bubble, null) @@ -95,13 +95,13 @@ class TalkSpecificViewThemeUtils @Inject constructor( ViewCompat.setBackground(bubble, bubbleDrawable) } - fun themeOutgoingMessageBubble(bubble: View, grouped: Boolean, deleted: Boolean, isPlayed : Boolean = false) { + fun themeOutgoingMessageBubble(bubble: View, grouped: Boolean, deleted: Boolean, isPlayed: Boolean = false) { withScheme(bubble) { scheme -> val bgBubbleColor = if (deleted) { ColorUtils.setAlphaComponent(dynamicColor.surfaceVariant().getArgb(scheme), HALF_ALPHA_INT) } else if(isPlayed){ ContextCompat.getColor(bubble.context, R.color.bg_message_list_outgoing_bubble_audio_played) - }else { + } else { dynamicColor.surfaceVariant().getArgb(scheme) }