From 449a3f541ea56c2f6d5182196eaa287e926f4d77 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 29 Aug 2025 09:36:33 -0400 Subject: [PATCH] Improves the design of the Crash Report permission screen with a cancel button. Deleted copy stack to clipboard --- .../crashreports/DisplayCrashMessages.kt | 68 +++++++------------ .../vitorpamplona/amethyst/ui/theme/Type.kt | 1 + 2 files changed, 27 insertions(+), 42 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/crashreports/DisplayCrashMessages.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/crashreports/DisplayCrashMessages.kt index c80fed1f3..a94be1353 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/crashreports/DisplayCrashMessages.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/crashreports/DisplayCrashMessages.kt @@ -20,12 +20,9 @@ */ package com.vitorpamplona.amethyst.service.crashreports -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Done @@ -40,11 +37,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.AnnotatedString -import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.Amethyst import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.model.LocalCache @@ -79,44 +72,35 @@ fun DisplayCrashMessages( Text(stringResource(R.string.would_you_like_to_send_the_recent_crash_report_to_amethyst_in_a_dm_no_personal_information_will_be_shared)) } }, + dismissButton = { + TextButton(onClick = { stackTrace.value = null }) { + Text(stringRes(R.string.cancel)) + } + }, confirmButton = { - Row( - modifier = - Modifier - .padding(all = 8.dp) - .fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - ) { - val clipboardManager = LocalClipboardManager.current - TextButton(onClick = { - clipboardManager.setText(AnnotatedString(stack)) - }) { - Text(stringRes(R.string.copy_stack_to_clipboard)) - } - - Button( - onClick = { - nav.nav { - routeToMessage( - user = LocalCache.getOrCreateUser("aa9047325603dacd4f8142093567973566de3b1e20a89557b728c3be4c6a844b"), - draftMessage = stack, - accountViewModel = accountViewModel, - ) - } - stackTrace.value = null - }, - contentPadding = PaddingValues(horizontal = Size16dp), - ) { - Row( - verticalAlignment = Alignment.CenterVertically, - ) { - Icon( - imageVector = Icons.Outlined.Done, - contentDescription = stringRes(R.string.crashreport_found_send), + Button( + onClick = { + nav.nav { + routeToMessage( + user = LocalCache.getOrCreateUser("aa9047325603dacd4f8142093567973566de3b1e20a89557b728c3be4c6a844b"), + draftMessage = stack, + accountViewModel = accountViewModel, + expiresDays = 30, ) - Spacer(StdHorzSpacer) - Text(stringRes(R.string.crashreport_found_send)) } + stackTrace.value = null + }, + contentPadding = PaddingValues(horizontal = Size16dp), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + imageVector = Icons.Outlined.Done, + contentDescription = stringRes(R.string.crashreport_found_send), + ) + Spacer(StdHorzSpacer) + Text(stringRes(R.string.crashreport_found_send)) } } }, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt index 7c347bbe4..c566aa94c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt @@ -52,6 +52,7 @@ val Typography = */ ) +val Font10SP = 10.sp val Font12SP = 12.sp val Font14SP = 14.sp val Font17SP = 17.sp