summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt5
-rw-r--r--android/src/main/res/layout/problem_report.xml148
-rw-r--r--android/src/main/res/values/strings.xml1
3 files changed, 103 insertions, 51 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
index 0155d16ef6..16fa27ebf1 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ProblemReportFragment.kt
@@ -10,12 +10,14 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.EditText
+import android.widget.ViewSwitcher
import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
class ProblemReportFragment : Fragment() {
private lateinit var problemReport: MullvadProblemReport
+ private lateinit var bodyContainer: ViewSwitcher
private lateinit var userEmailInput: EditText
private lateinit var userMessageInput: EditText
private lateinit var sendButton: Button
@@ -40,6 +42,7 @@ class ProblemReportFragment : Fragment() {
activity?.onBackPressed()
}
+ bodyContainer = view.findViewById<ViewSwitcher>(R.id.body_container)
userEmailInput = view.findViewById<EditText>(R.id.user_email)
userMessageInput = view.findViewById<EditText>(R.id.user_message)
sendButton = view.findViewById<Button>(R.id.send_button)
@@ -56,6 +59,8 @@ class ProblemReportFragment : Fragment() {
problemReport.userEmail = userEmailInput.text.toString()
problemReport.userMessage = userMessageInput.text.toString()
problemReport.send()
+
+ bodyContainer.showNext()
}
private fun setSendButtonEnabled(enabled: Boolean) {
diff --git a/android/src/main/res/layout/problem_report.xml b/android/src/main/res/layout/problem_report.xml
index 79da7190ca..99fbf5669d 100644
--- a/android/src/main/res/layout/problem_report.xml
+++ b/android/src/main/res/layout/problem_report.xml
@@ -31,61 +31,107 @@
android:text="@string/settings"
/>
</LinearLayout>
- <LinearLayout
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_marginTop="4dp"
+ android:layout_marginBottom="8dp"
+ android:layout_marginHorizontal="24dp"
+ android:textColor="@color/white"
+ android:textSize="32sp"
+ android:textStyle="bold"
+ android:text="@string/report_a_problem"
+ />
+ <ViewSwitcher android:id="@+id/body_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="4dp"
- android:layout_marginBottom="16dp"
- android:orientation="vertical"
>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:layout_marginBottom="8dp"
- android:layout_marginHorizontal="24dp"
- android:textColor="@color/white"
- android:textSize="32sp"
- android:textStyle="bold"
- android:text="@string/report_a_problem"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:layout_marginBottom="24dp"
- android:layout_marginHorizontal="24dp"
- android:textColor="@color/white80"
- android:textSize="13sp"
- android:text="@string/problem_report_description"
- />
- <EditText android:id="@+id/user_email"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:layout_marginBottom="12dp"
- android:layout_marginHorizontal="22dp"
- android:singleLine="true"
- android:hint="@string/user_email_hint"
- style="@style/InputText"
- />
- <EditText android:id="@+id/user_message"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_marginBottom="24dp"
+ android:layout_marginHorizontal="24dp"
+ android:textColor="@color/white80"
+ android:textSize="13sp"
+ android:text="@string/problem_report_description"
+ />
+ <EditText android:id="@+id/user_email"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_marginBottom="12dp"
+ android:layout_marginHorizontal="22dp"
+ android:singleLine="true"
+ android:hint="@string/user_email_hint"
+ style="@style/InputText"
+ />
+ <EditText android:id="@+id/user_message"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_marginHorizontal="22dp"
+ android:singleLine="false"
+ android:hint="@string/user_message_hint"
+ android:gravity="top"
+ style="@style/InputText"
+ />
+ <Button android:id="@+id/send_button"
+ android:layout_marginHorizontal="24dp"
+ android:layout_marginVertical="16dp"
+ android:enabled="false"
+ android:text="@string/send"
+ style="@style/GreenButton"
+ />
+ </LinearLayout>
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:layout_marginHorizontal="22dp"
- android:singleLine="false"
- android:hint="@string/user_message_hint"
- android:gravity="top"
- style="@style/InputText"
- />
- <Button android:id="@+id/send_button"
+ android:layout_height="match_parent"
android:layout_marginTop="16dp"
- android:layout_marginLeft="24dp"
- android:layout_marginRight="24dp"
- android:enabled="false"
- android:text="@string/send"
- style="@style/GreenButton"
- />
- </LinearLayout>
+ android:layout_marginHorizontal="24dp"
+ android:orientation="vertical"
+ >
+ <FrameLayout
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="32dp"
+ >
+ <ProgressBar
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:indeterminate="true"
+ android:indeterminateOnly="true"
+ android:indeterminateDuration="600"
+ android:indeterminateDrawable="@drawable/icon_spinner"
+ />
+ </FrameLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="4dp"
+ android:textColor="@color/green"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:text="@string/secure_connection"
+ android:textAllCaps="true"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="4dp"
+ android:textColor="@color/white"
+ android:textSize="34sp"
+ android:textStyle="bold"
+ android:text="@string/sending"
+ />
+ </LinearLayout>
+ </ViewSwitcher>
</LinearLayout>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 303e67d09c..7f909a06a0 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@
<string name="user_email_hint">Your email (optional)</string>
<string name="user_message_hint">Describe your problem</string>
<string name="send">Send</string>
+ <string name="sending">Sending...</string>
<string name="unsecured_connection">Unsecured connection</string>
<string name="creating_secure_connection">Creating secure connection</string>
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.