From fd248f098d5136a9877240cd3c45b768d4a0aaea Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 5 Sep 2023 15:54:25 +0200 Subject: [PATCH] solve ktlint + detekt warnings Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/activities/CallActivity.kt | 17 ++++++++++++----- .../adapters/SharedItemsViewHolder.kt | 2 +- .../com/nextcloud/talk/utils/FileViewerUtils.kt | 8 +++++--- app/src/main/res/layout/item_system_message.xml | 3 ++- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index ecfe0d43cc..268e42eae2 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -1069,6 +1069,7 @@ class CallActivity : CallBaseActivity() { } } + @Suppress("Detekt.NestedBlockDepth") private fun sendIsSpeakingMessage(isSpeaking: Boolean) { val isSpeakingMessage: String = if (isSpeaking) SIGNALING_MESSAGE_SPEAKING_STARTED else SIGNALING_MESSAGE_SPEAKING_STOPPED @@ -1234,10 +1235,10 @@ class CallActivity : CallBaseActivity() { private fun toggleMedia(enable: Boolean, video: Boolean) { var message: String if (video) { - message = "videoOff" + message = SIGNALING_MESSAGE_VIDEO_OFF if (enable) { binding!!.cameraButton.alpha = OPACITY_ENABLED - message = "videoOn" + message = SIGNALING_MESSAGE_VIDEO_ON startVideoCapture() } else { binding!!.cameraButton.alpha = OPACITY_DISABLED @@ -1258,9 +1259,9 @@ class CallActivity : CallBaseActivity() { binding!!.selfVideoRenderer.visibility = View.INVISIBLE } } else { - message = "audioOff" + message = SIGNALING_MESSAGE_AUDIO_OFF if (enable) { - message = "audioOn" + message = SIGNALING_MESSAGE_AUDIO_ON binding!!.microphoneButton.alpha = OPACITY_ENABLED } else { binding!!.microphoneButton.alpha = OPACITY_DISABLED @@ -3050,7 +3051,7 @@ class CallActivity : CallBaseActivity() { val newX = event.rawX - binding!!.selfVideoViewWrapper.width / 2f binding!!.selfVideoViewWrapper.y = newY binding!!.selfVideoViewWrapper.x = newX - } else if (event.actionMasked == MotionEvent.ACTION_UP && duration < 100) { + } else if (event.actionMasked == MotionEvent.ACTION_UP && duration < SWITCH_CAMERA_THRESHOLD_DURATION) { switchCamera() } return true @@ -3084,11 +3085,17 @@ class CallActivity : CallBaseActivity() { const val CALL_DURATION_EMPTY = "--:--" const val API_RETRIES: Long = 3 + const val SWITCH_CAMERA_THRESHOLD_DURATION = 100 + private const val SAMPLE_RATE = 8000 private const val MICROPHONE_VALUE_THRESHOLD = 20 private const val MICROPHONE_VALUE_SLEEP: Long = 1000 private const val SIGNALING_MESSAGE_SPEAKING_STARTED = "speaking" private const val SIGNALING_MESSAGE_SPEAKING_STOPPED = "stoppedSpeaking" + private const val SIGNALING_MESSAGE_VIDEO_ON = "videoOn" + private const val SIGNALING_MESSAGE_VIDEO_OFF = "videoOff" + private const val SIGNALING_MESSAGE_AUDIO_ON = "audioOn" + private const val SIGNALING_MESSAGE_AUDIO_OFF = "audioOff" } } diff --git a/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsViewHolder.kt b/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsViewHolder.kt index fb4d97947d..bf75ea984d 100644 --- a/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsViewHolder.kt @@ -93,7 +93,7 @@ abstract class SharedItemsViewHolder( item.id, item.mimeType, true, - FileViewerUtils.ProgressUi(progressBar, null, image), + FileViewerUtils.ProgressUi(progressBar, null, image) ) } diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt index 29712b59a7..af5f636ac2 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt @@ -358,9 +358,11 @@ class FileViewerUtils(private val context: Context, private val user: User) { if (progressUi.previewImage.isShown && openWhenDownloaded) { openFileByMimetype(fileName, mimetype) } else { - Log.d(TAG, "file " + fileName + - " was downloaded but it's not opened because view is not shown on screen or " + - "openWhenDownloaded is false" + Log.d( + TAG, + "file " + fileName + + " was downloaded but it's not opened because view is not shown on screen or " + + "openWhenDownloaded is false" ) } progressUi.messageText?.text = fileName diff --git a/app/src/main/res/layout/item_system_message.xml b/app/src/main/res/layout/item_system_message.xml index 4448611b1a..abdc531862 100644 --- a/app/src/main/res/layout/item_system_message.xml +++ b/app/src/main/res/layout/item_system_message.xml @@ -33,7 +33,8 @@ android:layout_marginStart="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_eighth_margin" android:layout_marginEnd="@dimen/standard_margin" - android:layout_marginBottom="@dimen/standard_eighth_margin"> + android:layout_marginBottom="@dimen/standard_eighth_margin" + tools:ignore="UselessParent">