From ce385556a3aeba824862e7e2b760e56a5dda0973 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 31 Mar 2025 13:46:50 +0200 Subject: [PATCH] fix detekt Signed-off-by: sowjanyakch --- .../talk/diagnose/DiagnoseActivity.kt | 1 - .../diagnose/DiagnoseContentComposable.kt | 125 ++++++++++-------- .../talk/diagnose/DiagnoseViewModel.kt | 1 + 3 files changed, 70 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt index 5fe38b5e8..f51bd942f 100644 --- a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt @@ -10,7 +10,6 @@ import android.annotation.SuppressLint import android.content.ClipData import android.content.ClipboardManager import android.content.Intent -import android.net.Uri import android.os.Build import android.os.Build.MANUFACTURER import android.os.Build.MODEL diff --git a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseContentComposable.kt b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseContentComposable.kt index 093d94fad..509d76bc4 100644 --- a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseContentComposable.kt +++ b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseContentComposable.kt @@ -47,6 +47,7 @@ import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import com.nextcloud.talk.R +@Suppress("LongMethod") @Composable fun DiagnoseContentComposable( data: State>, @@ -114,68 +115,80 @@ fun DiagnoseContentComposable( } } } - if (isLoading.value) { - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center - ) { - CircularProgressIndicator() - } + ShowNotificationData(isLoading.value, showDialog.value, context, message.value, diagnoseViewModel) + } +} + +@Composable +@Suppress("LongMethod") +fun ShowNotificationData( + isLoading: Boolean, + showDialog: Boolean, + context: Context, + message: String, + diagnoseViewModel: DiagnoseViewModel +) { + if (isLoading) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator() } - if (showDialog.value) { - Dialog( - onDismissRequest = { diagnoseViewModel.dismissDialog() }, - properties = DialogProperties( - dismissOnClickOutside = true, - usePlatformDefaultWidth = false - ) + } + if (showDialog) { + Dialog( + onDismissRequest = { diagnoseViewModel.dismissDialog() }, + properties = DialogProperties( + dismissOnClickOutside = true, + usePlatformDefaultWidth = false + ) + ) { + Surface( + shape = MaterialTheme.shapes.medium, + tonalElevation = 8.dp, + modifier = Modifier + .wrapContentSize() + .padding(16.dp) ) { - Surface( - shape = MaterialTheme.shapes.medium, - tonalElevation = 8.dp, - modifier = Modifier - .wrapContentSize() - .padding(16.dp) - ) { - Column(modifier = Modifier.padding(16.dp)) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = stringResource(R.string.nc_test_results), + style = MaterialTheme.typography + .titleMedium + ) + Spacer(modifier = Modifier.height(12.dp)) + Box( + modifier = Modifier + .fillMaxWidth() + .weight(1f, fill = false) + .verticalScroll(rememberScrollState()) + ) { Text( - text = stringResource(R.string.nc_test_results), - style = MaterialTheme.typography - .titleMedium + modifier = Modifier.padding(top = 8.dp), + text = message ) - Spacer(modifier = Modifier.height(12.dp)) - Box( - modifier = Modifier - .fillMaxWidth() - .weight(1f, fill = false) - .verticalScroll(rememberScrollState()) - ) { - Text( - modifier = Modifier.padding(top = 8.dp), - text = message.value - ) + } + Spacer(modifier = Modifier.height(16.dp)) + Row( + horizontalArrangement = Arrangement.SpaceEvenly, + modifier = Modifier.fillMaxWidth() + ) { + TextButton(onClick = { diagnoseViewModel.dismissDialog() }) { + Text(text = stringResource(R.string.nc_cancel)) } - Spacer(modifier = Modifier.height(16.dp)) - Row( - horizontalArrangement = Arrangement.SpaceEvenly, - modifier = Modifier.fillMaxWidth() - ) { - TextButton(onClick = { diagnoseViewModel.dismissDialog() }) { - Text(text = stringResource(R.string.nc_cancel)) - } - Spacer(modifier = Modifier.width(8.dp)) - TextButton(onClick = { - val clipboard = - context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - val clip = ClipData.newPlainText("Push Message", message.value) - clipboard.setPrimaryClip(clip) - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) { - Toast.makeText(context, R.string.message_copied, Toast.LENGTH_SHORT).show() - } - diagnoseViewModel.dismissDialog() - }) { - Text(text = stringResource(R.string.nc_common_copy)) + Spacer(modifier = Modifier.width(8.dp)) + TextButton(onClick = { + val clipboard = + context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val clip = ClipData.newPlainText("Push Message", message) + clipboard.setPrimaryClip(clip) + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) { + Toast.makeText(context, R.string.message_copied, Toast.LENGTH_SHORT).show() } + diagnoseViewModel.dismissDialog() + }) { + Text(text = stringResource(R.string.nc_common_copy)) } } } diff --git a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseViewModel.kt b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseViewModel.kt index 5d96af91a..e0b10d06a 100644 --- a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseViewModel.kt @@ -17,6 +17,7 @@ import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import kotlinx.coroutines.launch import javax.inject.Inject +@Suppress("TooGenericExceptionCaught") class DiagnoseViewModel @Inject constructor( private val ncApiCoroutines: NcApiCoroutines, private val currentUserProvider: CurrentUserProviderNew