mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-10 22:34:15 +01:00
fix detekt
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
parent
a7997abf57
commit
ce385556a3
@ -10,7 +10,6 @@ import android.annotation.SuppressLint
|
|||||||
import android.content.ClipData
|
import android.content.ClipData
|
||||||
import android.content.ClipboardManager
|
import android.content.ClipboardManager
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Build.MANUFACTURER
|
import android.os.Build.MANUFACTURER
|
||||||
import android.os.Build.MODEL
|
import android.os.Build.MODEL
|
||||||
|
@ -47,6 +47,7 @@ import androidx.compose.ui.window.Dialog
|
|||||||
import androidx.compose.ui.window.DialogProperties
|
import androidx.compose.ui.window.DialogProperties
|
||||||
import com.nextcloud.talk.R
|
import com.nextcloud.talk.R
|
||||||
|
|
||||||
|
@Suppress("LongMethod")
|
||||||
@Composable
|
@Composable
|
||||||
fun DiagnoseContentComposable(
|
fun DiagnoseContentComposable(
|
||||||
data: State<List<DiagnoseActivity.DiagnoseElement>>,
|
data: State<List<DiagnoseActivity.DiagnoseElement>>,
|
||||||
@ -114,68 +115,80 @@ fun DiagnoseContentComposable(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isLoading.value) {
|
ShowNotificationData(isLoading.value, showDialog.value, context, message.value, diagnoseViewModel)
|
||||||
Box(
|
}
|
||||||
modifier = Modifier.fillMaxSize(),
|
}
|
||||||
contentAlignment = Alignment.Center
|
|
||||||
) {
|
@Composable
|
||||||
CircularProgressIndicator()
|
@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(
|
if (showDialog) {
|
||||||
onDismissRequest = { diagnoseViewModel.dismissDialog() },
|
Dialog(
|
||||||
properties = DialogProperties(
|
onDismissRequest = { diagnoseViewModel.dismissDialog() },
|
||||||
dismissOnClickOutside = true,
|
properties = DialogProperties(
|
||||||
usePlatformDefaultWidth = false
|
dismissOnClickOutside = true,
|
||||||
)
|
usePlatformDefaultWidth = false
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Surface(
|
||||||
|
shape = MaterialTheme.shapes.medium,
|
||||||
|
tonalElevation = 8.dp,
|
||||||
|
modifier = Modifier
|
||||||
|
.wrapContentSize()
|
||||||
|
.padding(16.dp)
|
||||||
) {
|
) {
|
||||||
Surface(
|
Column(modifier = Modifier.padding(16.dp)) {
|
||||||
shape = MaterialTheme.shapes.medium,
|
Text(
|
||||||
tonalElevation = 8.dp,
|
text = stringResource(R.string.nc_test_results),
|
||||||
modifier = Modifier
|
style = MaterialTheme.typography
|
||||||
.wrapContentSize()
|
.titleMedium
|
||||||
.padding(16.dp)
|
)
|
||||||
) {
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
Column(modifier = Modifier.padding(16.dp)) {
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.weight(1f, fill = false)
|
||||||
|
.verticalScroll(rememberScrollState())
|
||||||
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(R.string.nc_test_results),
|
modifier = Modifier.padding(top = 8.dp),
|
||||||
style = MaterialTheme.typography
|
text = message
|
||||||
.titleMedium
|
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(12.dp))
|
}
|
||||||
Box(
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
modifier = Modifier
|
Row(
|
||||||
.fillMaxWidth()
|
horizontalArrangement = Arrangement.SpaceEvenly,
|
||||||
.weight(1f, fill = false)
|
modifier = Modifier.fillMaxWidth()
|
||||||
.verticalScroll(rememberScrollState())
|
) {
|
||||||
) {
|
TextButton(onClick = { diagnoseViewModel.dismissDialog() }) {
|
||||||
Text(
|
Text(text = stringResource(R.string.nc_cancel))
|
||||||
modifier = Modifier.padding(top = 8.dp),
|
|
||||||
text = message.value
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.width(8.dp))
|
||||||
Row(
|
TextButton(onClick = {
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
val clipboard =
|
||||||
modifier = Modifier.fillMaxWidth()
|
context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
|
||||||
) {
|
val clip = ClipData.newPlainText("Push Message", message)
|
||||||
TextButton(onClick = { diagnoseViewModel.dismissDialog() }) {
|
clipboard.setPrimaryClip(clip)
|
||||||
Text(text = stringResource(R.string.nc_cancel))
|
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
|
||||||
}
|
Toast.makeText(context, R.string.message_copied, Toast.LENGTH_SHORT).show()
|
||||||
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))
|
|
||||||
}
|
}
|
||||||
|
diagnoseViewModel.dismissDialog()
|
||||||
|
}) {
|
||||||
|
Text(text = stringResource(R.string.nc_common_copy))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@ import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
@Suppress("TooGenericExceptionCaught")
|
||||||
class DiagnoseViewModel @Inject constructor(
|
class DiagnoseViewModel @Inject constructor(
|
||||||
private val ncApiCoroutines: NcApiCoroutines,
|
private val ncApiCoroutines: NcApiCoroutines,
|
||||||
private val currentUserProvider: CurrentUserProviderNew
|
private val currentUserProvider: CurrentUserProviderNew
|
||||||
|
Loading…
Reference in New Issue
Block a user