diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-20 19:12:32 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-24 11:35:21 +0000 |
| commit | 400118f6a469a143953a3c366bc7c5c62df7c832 (patch) | |
| tree | 03a929c18f38a2a4ccef56d02a1d494378337e0a /android/src/main/res/layout | |
| parent | c856aee891b61dd6eddf90a33984095bfc57cf91 (diff) | |
| download | mullvadvpn-400118f6a469a143953a3c366bc7c5c62df7c832.tar.xz mullvadvpn-400118f6a469a143953a3c366bc7c5c62df7c832.zip | |
Advance to Sending screen when button is pressed
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/problem_report.xml | 148 |
1 files changed, 97 insertions, 51 deletions
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> |