Add additional email addresses in create key

10 files changed, 88 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..56c0a8c94
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..b971cd9fd
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..6d7dd4fc9
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..c50ea840a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..9420d8205
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/layout/add_email_dialog.xml b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
new file mode 100644
index 000000000..68d895145
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/create_key_add_email_text"
+        android:textAppearance="?android:textAppearanceMedium" />
+
+    <org.sufficientlysecure.keychain.ui.widget.EmailEditText
+        android:id="@+id/add_email_address"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="@string/label_email"
+        android:imeOptions="actionNext"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
index a24d1a2ee..17cfe54ac 100644
--- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
@@ -4,6 +4,7 @@
     android:layout_height="match_parent">
 
     <ScrollView
+        android:layout_alignParentTop="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
@@ -34,6 +35,12 @@
                 android:hint="@string/label_email"
                 android:ems="10" />
 
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/create_key_emails"
+                android:scrollbars="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
         </LinearLayout>
     </ScrollView>
 
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml
new file mode 100644
index 000000000..3e58d40e5
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="16dp"
+    android:orientation="horizontal"
+    android:singleLine="true">
+
+    <Button
+        android:id="@+id/create_key_add_email"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/btn_add_email"
+        style="?android:attr/borderlessButtonStyle"
+        android:drawableLeft="@drawable/ic_email_grey_24dp"
+        android:drawablePadding="8dp"
+        android:gravity="left|center_vertical" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
new file mode 100644
index 000000000..91ba72884
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="16dp"
+    android:orientation="horizontal"
+    android:singleLine="true">
+
+    <TextView
+        android:id="@+id/create_key_email_item_email"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:layout_weight="1"
+        android:text="alice@example.com"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:paddingLeft="8dp" />
+
+    <ImageButton
+        android:id="@+id/create_key_email_item_delete_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="8dp"
+        android:src="@drawable/ic_close_grey_24dp"
+        android:layout_gravity="center_vertical"
+        style="@style/SelectableItem" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index a9d7e10c7..05daf8951 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@
     <string name="btn_decrypt_files">"Decrypt files"</string>
     <string name="btn_encrypt_files">"Encrypt files"</string>
     <string name="btn_encrypt_text">"Encrypt text"</string>
+    <string name="btn_add_email">"Add additional email address"</string>
 
     <!-- menu -->
     <string name="menu_preferences">"Settings"</string>
@@ -628,10 +629,12 @@
     <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string>
     <string name="create_key_custom">"(custom key configuration)"</string>
     <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string>
-    <string name="create_key_email_text">"Choose the email address used for encrypted communication."</string>
+    <string name="create_key_email_text">"Enter your main email address used for secure communication."</string>
     <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string>
     <string name="create_key_hint_full_name">"Full Name or Nickname"</string>
     <string name="create_key_edit">"Change key configuration"</string>
+    <string name="create_key_add_email">"Add email address"</string>
+    <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string>
 
     <!-- View key -->
     <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>