6 files changed, 42 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
index fa389517ea..33b2c36e6b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
@@ -38,6 +38,7 @@ class ProblemReportFragment : Fragment() {
     private lateinit var responseMessageLabel: TextView
     private lateinit var responseEmailLabel: TextView
 
+    private lateinit var editMessageButton: Button
     private lateinit var tryAgainButton: Button
 
     private var sendReportJob: Job? = null
@@ -76,6 +77,7 @@ class ProblemReportFragment : Fragment() {
         responseMessageLabel = view.findViewById<TextView>(R.id.response_message)
         responseEmailLabel = view.findViewById<TextView>(R.id.response_email)
 
+        editMessageButton = view.findViewById<Button>(R.id.edit_message_button)
         tryAgainButton = view.findViewById<Button>(R.id.try_again_button)
 
         sendButton.setOnClickListener {
@@ -83,6 +85,10 @@ class ProblemReportFragment : Fragment() {
             sendReportJob = sendReport()
         }
 
+        editMessageButton.setOnClickListener {
+            showForm()
+        }
+
         tryAgainButton.setOnClickListener {
             sendReportJob = sendReport()
         }
@@ -113,6 +119,10 @@ class ProblemReportFragment : Fragment() {
         }
     }
 
+    private fun showForm() {
+        bodyContainer.displayedChild = 0
+    }
+
     private fun showSendingScreen() {
         bodyContainer.displayedChild = 1
 
@@ -127,6 +137,7 @@ class ProblemReportFragment : Fragment() {
 
         sendStatusLabel.setText(R.string.sending)
 
+        editMessageButton.visibility = View.GONE
         tryAgainButton.visibility = View.GONE
     }
 
@@ -157,6 +168,7 @@ class ProblemReportFragment : Fragment() {
         sendStatusLabel.setText(R.string.failed_to_send)
         sendDetailsLabel.setText(R.string.failed_to_send_details)
 
+        editMessageButton.visibility = View.VISIBLE
         tryAgainButton.visibility = View.VISIBLE
     }
 
diff --git a/android/src/main/res/drawable/blue_button_background.xml b/android/src/main/res/drawable/blue_button_background.xml
new file mode 100644
index 0000000000..e53b0be561
--- /dev/null
+++ b/android/src/main/res/drawable/blue_button_background.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="4dp"/>
+            <solid android:color="@color/blue80"/>
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="4dp"/>
+            <solid android:color="@color/blue60"/>
+        </shape>
+    </item>
+</selector>
diff --git a/android/src/main/res/layout/problem_report.xml b/android/src/main/res/layout/problem_report.xml
index f2955badfe..c3d782e7ad 100644
--- a/android/src/main/res/layout/problem_report.xml
+++ b/android/src/main/res/layout/problem_report.xml
@@ -93,7 +93,7 @@
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="16dp"
+                android:layout_marginVertical="16dp"
                 android:layout_marginHorizontal="24dp"
                 android:orientation="vertical"
                 >
@@ -178,8 +178,14 @@
                     android:layout_weight="1"
                     />
 
+            <Button android:id="@+id/edit_message_button"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/edit_message"
+                    android:visibility="gone"
+                    style="@style/BlueButton"
+                    />
             <Button android:id="@+id/try_again_button"
-                    android:layout_marginVertical="16dp"
+                    android:layout_marginTop="16dp"
                     android:text="@string/try_again"
                     android:visibility="gone"
                     style="@style/GreenButton"
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
index d62bb53035..e882682904 100644
--- a/android/src/main/res/values/colors.xml
+++ b/android/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
     <color name="colorPrimary">#294D73</color>
     <color name="blue">#294D73</color>
     <color name="blue80">#CC294D73</color>
+    <color name="blue60">#99294D73</color>
     <color name="blue40">#66294D73</color>
     <color name="blue20">#33294D73</color>
     <color name="darkBlue">#192E45</color>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index c2c37738bf..b0087e1942 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
         You may need to go back to the app\'s main screen and click Disconnect before trying again.
         Don\'t worry, the information you entered will remain in the form.
     </string>
+    <string name="edit_message">Edit message</string>
     <string name="try_again">Try again</string>
 
     <string name="unsecured_connection">Unsecured connection</string>
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
index f125621adb..2ace57e88b 100644
--- a/android/src/main/res/values/styles.xml
+++ b/android/src/main/res/values/styles.xml
@@ -30,6 +30,10 @@
         <item name="android:background">@drawable/red_button_background</item>
     </style>
 
+    <style name="BlueButton" parent="Button">
+        <item name="android:background">@drawable/blue_button_background</item>
+    </style>
+
     <style name="White20Button" parent="Button">
         <item name="android:background">@drawable/white20_button_background</item>
     </style>