Remove report problem state dialog

mullvad · Oct 4, 2023 · 1a980f4 · 1a980f4
1 parent d14923c
commit 1a980f4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 234 deletions.
diff --git a/...oid/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemStateDialog.kt b/...oid/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemStateDialog.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
@@ -49,27 +49,27 @@ import net.mullvad.mullvadvpn.viewmodel.SendingReportUiState
 
 @Preview
 @Composable
-private fun ReportProblemScreenPreview() {
+private fun PreviewReportProblemScreen() {
     AppTheme { ReportProblemScreen(uiState = ReportProblemUiState()) }
 }
 
 @Preview
 @Composable
-private fun ReportProblemSendingScreenPreview() {
+private fun PreviewReportProblemSendingScreen() {
     AppTheme {
         ReportProblemScreen(uiState = ReportProblemUiState(false, SendingReportUiState.Sending))
     }
 }
 
 @Preview
 @Composable
-private fun ReportProblemConfirmNoEmailScreenPreview() {
+private fun PreviewReportProblemConfirmNoEmailScreen() {
     AppTheme { ReportProblemScreen(uiState = ReportProblemUiState(true)) }
 }
 
 @Preview
 @Composable
-private fun ReportProblemSuccessScreenPreview() {
+private fun PreviewReportProblemSuccessScreen() {
     AppTheme {
         ReportProblemScreen(
             uiState = ReportProblemUiState(false, SendingReportUiState.Success("email@mail.com"))
@@ -79,7 +79,7 @@ private fun ReportProblemSuccessScreenPreview() {
 
 @Preview
 @Composable
-private fun ReportProblemErrorScreenPreview() {
+private fun PreviewReportProblemErrorScreen() {
     AppTheme {
         ReportProblemScreen(
             uiState =
@@ -127,7 +127,7 @@ fun ReportProblemScreen(
         var email by rememberSaveable { mutableStateOf("") }
         var description by rememberSaveable { mutableStateOf("") }
 
-        // Dialog to show sending states
+        // Show sending states
         if (uiState.sendingState != null) {
             Column(
                 modifier =
@@ -140,15 +140,6 @@ fun ReportProblemScreen(
                         ErrorContent({ onSendReport(email, description) }, onClearSendResult)
                     is SendingReportUiState.Success -> SentContent(uiState.sendingState)
                 }
-                //            ShowReportProblemState(
-                //                uiState.sendingState,
-                //                onDismiss = onClearSendResult,
-                //                onClearForm = {
-                //                    email = ""
-                //                    description = ""
-                //                },
-                //                retry = { onSendReport(email, description) }
-                //            )
                 return@CollapsingToolbarScaffold
             }
         }

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
@@ -29,13 +29,13 @@ import net.mullvad.mullvadvpn.viewmodel.ViewLogsUiState
 
 @Preview
 @Composable
-private fun ViewLogsScreenPreview() {
+private fun PreviewViewLogsScreen() {
     AppTheme { ViewLogsScreen(uiState = ViewLogsUiState("Lorem ipsum")) }
 }
 
 @Preview
 @Composable
-private fun ViewLogsLoadingScreenPreview() {
+private fun PreviewViewLogsLoadingScreen() {
     AppTheme { ViewLogsScreen(uiState = ViewLogsUiState()) }
 }
 

diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
@@ -20,6 +20,7 @@ data class Dimensions(
     val countryRowPadding: Dp = 18.dp,
     val customPortBoxMinWidth: Dp = 80.dp,
     val dialogIconHeight: Dp = 44.dp,
+    val dialogIconSize: Dp = 48.dp,
     val expandableCellChevronSize: Dp = 30.dp,
     val iconFailSuccessSize: Dp = 60.dp,
     val iconFailSuccessTopMargin: Dp = 30.dp,
@@ -58,7 +59,6 @@ data class Dimensions(
     val topBarHeight: Dp = 64.dp,
     val verticalSpace: Dp = 20.dp,
     val verticalSpacer: Dp = 1.dp,
-    val dialogIconSize: Dp = 48.dp
 )
 
 val defaultDimensions = Dimensions()