From ffc0a230be2fec150575b0ad367745352aa5a38b Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 9 Dec 2020 14:09:21 -0400
Subject: [PATCH] Fix country code width on account deletion screen.

---
 .../delete_account_country_code_text.xml      | 37 +++++++++++++++++++
 .../res/layout/delete_account_fragment.xml    |  5 ++-
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout/delete_account_country_code_text.xml

diff --git a/app/src/main/res/layout/delete_account_country_code_text.xml b/app/src/main/res/layout/delete_account_country_code_text.xml
new file mode 100644
index 0000000000..942227e22f
--- /dev/null
+++ b/app/src/main/res/layout/delete_account_country_code_text.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="11dp"
+    android:paddingEnd="11dp">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="3dp"
+        android:src="@drawable/ic_add_white_original_24dp"
+        android:tint="@color/core_grey_60"
+        android:contentDescription="+"
+        tools:ignore="HardcodedText" />
+
+    <EditText
+        android:id="@+id/input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="7dp"
+        android:paddingBottom="16dp"
+        android:background="@color/transparent"
+        android:singleLine="true"
+        android:inputType="number"
+        android:maxLength="3"
+        android:digits="1234567890"
+        android:saveEnabled="false"
+        android:contentDescription="@string/RegistrationActivity_country_code_description"
+        tools:text="123" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/delete_account_fragment.xml b/app/src/main/res/layout/delete_account_fragment.xml
index 433eb5791d..8654e15466 100644
--- a/app/src/main/res/layout/delete_account_fragment.xml
+++ b/app/src/main/res/layout/delete_account_fragment.xml
@@ -89,18 +89,19 @@
             android:layout_marginEnd="32dp"
             android:layoutDirection="ltr"
             android:orientation="horizontal"
+            android:weightSum="4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/delete_account_fragment_country_spinner_frame">
 
             <org.thoughtcrime.securesms.components.LabeledEditText
                 android:id="@+id/delete_account_fragment_country_code"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="12dp"
                 android:layout_weight="1"
                 app:labeledEditText_background="@color/white"
-                app:labeledEditText_textLayout="@layout/country_code_text" />
+                app:labeledEditText_textLayout="@layout/delete_account_country_code_text" />
 
             <org.thoughtcrime.securesms.components.LabeledEditText
                 android:id="@+id/delete_account_fragment_number"