Merge branch 'update-confirm-no-email-dialog'

2 files changed, 16 insertions, 4 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
index 94691d93c3..1789bd0c64 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
@@ -9,6 +9,7 @@ import android.support.v4.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams
 import android.widget.Button
 import kotlinx.coroutines.CompletableDeferred
 import net.mullvad.mullvadvpn.R
@@ -47,11 +48,17 @@ class ConfirmNoEmailDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog = super.onCreateDialog(savedInstanceState)
 
-        dialog.window?.apply { setBackgroundDrawable(ColorDrawable(android.R.color.transparent)) }
+        dialog.window?.setBackgroundDrawable(ColorDrawable(android.R.color.transparent))
 
         return dialog
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        dialog?.window?.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+    }
+
     override fun onDismiss(dialogInterface: DialogInterface) {
         confirmNoEmail?.complete(false)
     }
diff --git a/android/src/main/res/layout/confirm_no_email.xml b/android/src/main/res/layout/confirm_no_email.xml
index bc640906ab..9b8986679b 100644
--- a/android/src/main/res/layout/confirm_no_email.xml
+++ b/android/src/main/res/layout/confirm_no_email.xml
@@ -9,18 +9,23 @@
                   android:orientation="vertical"
                   android:gravity="left"
                   android:elevation="2dp">
+        <ImageView android:layout_width="44dp"
+                   android:layout_height="44dp"
+                   android:layout_marginTop="8dp"
+                   android:layout_gravity="center"
+                   android:src="@drawable/icon_alert" />
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_weight="0"
-                  android:layout_marginBottom="12dp"
+                  android:layout_marginTop="16dp"
                   android:textColor="@color/white80"
-                  android:textSize="@dimen/text_medium"
+                  android:textSize="@dimen/text_small"
                   android:text="@string/confirm_no_email" />
         <Button android:id="@+id/send_button"
+                android:layout_marginVertical="@dimen/button_separation"
                 android:text="@string/send_anyway"
                 style="@style/RedButton" />
         <Button android:id="@+id/back_button"
-                android:layout_marginTop="16dp"
                 android:text="@string/back"
                 style="@style/BlueButton" />
     </LinearLayout>