gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-11 18:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

solve ktlint + detekt warnings

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-09-05 15:54:25 +02:00
parent a58a5df3ec
commit fd248f098d
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View File

@ -1069,6 +1069,7 @@ class CallActivity : CallBaseActivity() {
} }
} }
@Suppress("Detekt.NestedBlockDepth")
private fun sendIsSpeakingMessage(isSpeaking: Boolean) { private fun sendIsSpeakingMessage(isSpeaking: Boolean) {
val isSpeakingMessage: String = val isSpeakingMessage: String =
if (isSpeaking) SIGNALING_MESSAGE_SPEAKING_STARTED else SIGNALING_MESSAGE_SPEAKING_STOPPED 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) { private fun toggleMedia(enable: Boolean, video: Boolean) {
var message: String var message: String
if (video) { if (video) {
message = "videoOff" message = SIGNALING_MESSAGE_VIDEO_OFF
if (enable) { if (enable) {
binding!!.cameraButton.alpha = OPACITY_ENABLED binding!!.cameraButton.alpha = OPACITY_ENABLED
message = "videoOn" message = SIGNALING_MESSAGE_VIDEO_ON
startVideoCapture() startVideoCapture()
} else { } else {
binding!!.cameraButton.alpha = OPACITY_DISABLED binding!!.cameraButton.alpha = OPACITY_DISABLED
@ -1258,9 +1259,9 @@ class CallActivity : CallBaseActivity() {
binding!!.selfVideoRenderer.visibility = View.INVISIBLE binding!!.selfVideoRenderer.visibility = View.INVISIBLE
} }
} else { } else {
message = "audioOff" message = SIGNALING_MESSAGE_AUDIO_OFF
if (enable) { if (enable) {
message = "audioOn" message = SIGNALING_MESSAGE_AUDIO_ON
binding!!.microphoneButton.alpha = OPACITY_ENABLED binding!!.microphoneButton.alpha = OPACITY_ENABLED
} else { } else {
binding!!.microphoneButton.alpha = OPACITY_DISABLED binding!!.microphoneButton.alpha = OPACITY_DISABLED
@ -3050,7 +3051,7 @@ class CallActivity : CallBaseActivity() {
val newX = event.rawX - binding!!.selfVideoViewWrapper.width / 2f val newX = event.rawX - binding!!.selfVideoViewWrapper.width / 2f
binding!!.selfVideoViewWrapper.y = newY binding!!.selfVideoViewWrapper.y = newY
binding!!.selfVideoViewWrapper.x = newX 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() switchCamera()
} }
return true return true
@ -3084,11 +3085,17 @@ class CallActivity : CallBaseActivity() {
const val CALL_DURATION_EMPTY = "--:--" const val CALL_DURATION_EMPTY = "--:--"
const val API_RETRIES: Long = 3 const val API_RETRIES: Long = 3
const val SWITCH_CAMERA_THRESHOLD_DURATION = 100
private const val SAMPLE_RATE = 8000 private const val SAMPLE_RATE = 8000
private const val MICROPHONE_VALUE_THRESHOLD = 20 private const val MICROPHONE_VALUE_THRESHOLD = 20
private const val MICROPHONE_VALUE_SLEEP: Long = 1000 private const val MICROPHONE_VALUE_SLEEP: Long = 1000
private const val SIGNALING_MESSAGE_SPEAKING_STARTED = "speaking" private const val SIGNALING_MESSAGE_SPEAKING_STARTED = "speaking"
private const val SIGNALING_MESSAGE_SPEAKING_STOPPED = "stoppedSpeaking" 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"
} }
} }

2
app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsViewHolder.kt
View File

@ -93,7 +93,7 @@ abstract class SharedItemsViewHolder(
item.id, item.id,
item.mimeType, item.mimeType,
true, true,
FileViewerUtils.ProgressUi(progressBar, null, image), FileViewerUtils.ProgressUi(progressBar, null, image)
) )
} }

8
app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
View File

@ -358,9 +358,11 @@ class FileViewerUtils(private val context: Context, private val user: User) {
if (progressUi.previewImage.isShown && openWhenDownloaded) { if (progressUi.previewImage.isShown && openWhenDownloaded) {
openFileByMimetype(fileName, mimetype) openFileByMimetype(fileName, mimetype)
} else { } else {
Log.d(TAG, "file " + fileName + Log.d(
" was downloaded but it's not opened because view is not shown on screen or " + TAG,
"openWhenDownloaded is false" "file " + fileName +
" was downloaded but it's not opened because view is not shown on screen or " +
"openWhenDownloaded is false"
) )
} }
progressUi.messageText?.text = fileName progressUi.messageText?.text = fileName

3
app/src/main/res/layout/item_system_message.xml
View File

@ -33,7 +33,8 @@
android:layout_marginStart="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_eighth_margin" android:layout_marginTop="@dimen/standard_eighth_margin"
android:layout_marginEnd="@dimen/standard_margin" android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_eighth_margin"> android:layout_marginBottom="@dimen/standard_eighth_margin"
tools:ignore="UselessParent">
<ImageView <ImageView
android:id="@+id/expandCollapseIcon" android:id="@+id/expandCollapseIcon"