Add additional email addresses in create key

This commit is contained in:
Dominik Schürmann
2015-03-10 01:44:07 +01:00
parent e3547b4979
commit bce0fe6221
16 changed files with 522 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 805 B

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>