diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
7 files changed, 64 insertions, 70 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml new file mode 100644 index 000000000..2575db4ba --- /dev/null +++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml @@ -0,0 +1,41 @@ +<?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:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="8dp" + android:paddingBottom="8dp"> + + <AutoCompleteTextView + android:id="@+id/add_user_id_address" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/label_email" + android:imeOptions="actionNext" + android:inputType="textEmailAddress" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <AutoCompleteTextView + android:id="@+id/add_user_id_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:inputType="textPersonName" + android:hint="@string/create_key_hint_full_name" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <EditText + android:id="@+id/add_user_id_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/tertiary_text_light" + android:singleLine="true" + android:lines="1" + android:maxLines="1" + android:imeOptions="actionDone" + android:hint="@string/label_comment" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index 588cbb050..6e629573a 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -64,6 +64,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" + android:imeOptions="actionNext" android:inputType="textPassword" android:hint="@string/label_passphrase" android:ems="10" diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml deleted file mode 100644 index ef0e2626e..000000000 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?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="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:singleLine="true"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:minWidth="10dp" - android:background="@color/android_green_light" /> - - <LinearLayout - android:orientation="vertical" - android:layout_gravity="center_vertical" - android:layout_width="0dip" - android:layout_marginLeft="8dp" - android:layout_height="wrap_content" - android:layout_weight="1"> - - <AutoCompleteTextView - android:id="@+id/user_id_added_item_address" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/label_email" - android:inputType="textEmailAddress" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <AutoCompleteTextView - android:id="@+id/user_id_added_item_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPersonName" - android:hint="@string/label_name" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <EditText - android:id="@+id/user_id_added_item_comment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textColor="@color/tertiary_text_light" - android:hint="@string/label_comment" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - </LinearLayout> - - <ImageButton - android:id="@+id/user_id_added_item_delete" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_action_cancel" - android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> - -</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml index 3454d3668..877ea77db 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml @@ -67,7 +67,7 @@ android:text="@string/label_comment" /> <EditText - android:id="@+id/comment" + android:id="@+id/user_id_item_comment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml index 0c0a5d7e6..226ed52cf 100644 --- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml @@ -20,7 +20,7 @@ <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/edit_image" + android:id="@+id/user_id_item_edit_image" android:src="@drawable/ic_action_edit" android:padding="8dp" android:layout_centerVertical="true" @@ -30,7 +30,7 @@ <LinearLayout android:orientation="vertical" android:layout_toRightOf="@id/ic_masterKey" - android:layout_toLeftOf="@id/edit_image" + android:layout_toLeftOf="@id/user_id_item_edit_image" android:layout_centerVertical="true" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml index 157903000..e6dae3eeb 100644 --- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml @@ -7,13 +7,14 @@ android:singleLine="true"> <CheckBox - android:id="@+id/checkBox" + android:id="@+id/user_id_item_check_box" android:layout_width="wrap_content" android:layout_height="match_parent" android:clickable="false" android:focusable="false" /> <LinearLayout + android:id="@+id/user_id_item_certified_layout" android:layout_width="22dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" @@ -21,9 +22,9 @@ android:orientation="vertical"> <ImageView + android:id="@+id/user_id_item_certified" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/certified" android:layout_gravity="center_horizontal" /> </LinearLayout> @@ -39,21 +40,21 @@ android:layout_weight="1"> <TextView - android:id="@+id/address" + android:id="@+id/user_id_item_address" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="alice@example.com" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/userId" + android:id="@+id/user_id_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Alice" android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView - android:id="@+id/comment" + android:id="@+id/user_id_item_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/tertiary_text_light" @@ -63,11 +64,20 @@ </LinearLayout> <ImageView - android:id="@+id/edit_image" + android:id="@+id/user_id_item_edit_image" android:layout_width="wrap_content" android:layout_height="match_parent" android:src="@drawable/ic_action_edit" android:padding="8dp" android:layout_gravity="center_horizontal" /> + <ImageButton + android:id="@+id/user_id_item_delete_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_cancel" + 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 432c8bfc9..f4738f1da 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -310,9 +310,9 @@ <string name="progress_modify">modifying keyring…</string> <string name="progress_modify_unlock">unlocking keyring…</string> - <string name="progress_modify_adduid">adding user ids…</string> - <string name="progress_modify_revokeuid">revoking user ids…</string> - <string name="progress_modify_primaryuid">changing primary user id…</string> + <string name="progress_modify_adduid">adding user IDs…</string> + <string name="progress_modify_revokeuid">revoking user IDs…</string> + <string name="progress_modify_primaryuid">changing primary user ID…</string> <string name="progress_modify_subkeychange">modifying subkeys…</string> <string name="progress_modify_subkeyrevoke">revoking subkeys…</string> <string name="progress_modify_subkeyadd">adding subkeys…</string> |