Fix dialog button text

mullvad · Sep 27, 2023 · 6ad2bd4 · 6ad2bd4
1 parent 06bf314
commit 6ad2bd4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/...d/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt b/...d/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
@@ -64,9 +64,8 @@ fun ReportProblemNoEmailDialog(onDismiss: () -> Unit, onConfirm: () -> Unit) {
                         contentColor = Color.White
                     ),
                 onClick = onConfirm,
-            ) {
-                Text(text = stringResource(id = R.string.send_anyway), fontSize = 18.sp)
-            }
+                text = stringResource(id = R.string.send_anyway)
+            )
         },
         confirmButton = {
             ActionButton(
@@ -77,9 +76,8 @@ fun ReportProblemNoEmailDialog(onDismiss: () -> Unit, onConfirm: () -> Unit) {
                         contentColor = Color.White
                     ),
                 onClick = { onDismiss() },
-            ) {
-                Text(text = stringResource(id = R.string.back), fontSize = 18.sp)
-            }
+                text = stringResource(id = R.string.back)
+            )
         },
         containerColor = colorResource(id = R.color.darkBlue)
     )

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
@@ -149,9 +149,8 @@ fun ReportProblemSuccessDialog(email: String?, onConfirm: () -> Unit) {
                         contentColor = Color.White
                     ),
                 onClick = { onConfirm() },
-            ) {
-                Text(text = stringResource(id = R.string.dismiss), fontSize = 18.sp)
-            }
+                text = stringResource(id = R.string.dismiss)
+            )
         },
         containerColor = colorResource(id = R.color.darkBlue)
     )
@@ -199,9 +198,8 @@ fun ReportProblemErrorDialog(onDismiss: () -> Unit, retry: () -> Unit) {
                         contentColor = Color.White
                     ),
                 onClick = onDismiss,
-            ) {
-                Text(text = stringResource(id = R.string.edit_message), fontSize = 18.sp)
-            }
+                text = stringResource(id = R.string.edit_message)
+            )
         },
         confirmButton = {
             ActionButton(
@@ -212,9 +210,8 @@ fun ReportProblemErrorDialog(onDismiss: () -> Unit, retry: () -> Unit) {
                         contentColor = Color.White
                     ),
                 onClick = retry,
-            ) {
-                Text(text = stringResource(id = R.string.try_again), fontSize = 18.sp)
-            }
+                text = stringResource(id = R.string.try_again)
+            )
         },
         containerColor = colorResource(id = R.color.darkBlue)
     )

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
@@ -47,12 +47,13 @@ class MullvadProblemReport(context: Context, val dispatcher: CoroutineDispatcher
 
         val sentSuccessfully =
             withContext(dispatcher) {
-                sendProblemReport(
-                    userReport.email ?: "",
-                    userReport.message,
-                    logsPath.absolutePath,
-                    cacheDirectory.absolutePath
-                )
+                true
+//                sendProblemReport(
+//                    userReport.email ?: "",
+//                    userReport.message,
+//                    logsPath.absolutePath,
+//                    cacheDirectory.absolutePath
+//                )
             }
 
         return if (sentSuccessfully) {