diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-02 15:10:50 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-02 15:10:50 +0200 |
commit | 4f83a4f1636e674bea60d806610f55022c2d9b5e (patch) | |
tree | 20af10248c7f27d69c71be0b0556c38ad58e51cc /OpenKeychain/src/main/res/layout | |
parent | 7408a35e1984c4791ce956bdc2ba225f8e0c3a7c (diff) | |
download | open-keychain-4f83a4f1636e674bea60d806610f55022c2d9b5e.tar.gz open-keychain-4f83a4f1636e674bea60d806610f55022c2d9b5e.tar.bz2 open-keychain-4f83a4f1636e674bea60d806610f55022c2d9b5e.zip |
Edit key: adding user ids
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
4 files changed, 72 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml index 7f94cb3cd..05e6c09c5 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml @@ -111,7 +111,7 @@ android:layout_height="match_parent" android:text="add key" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_action_add_person" + android:drawableRight="@drawable/ic_action_new_account" android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" 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 new file mode 100644 index 000000000..542c59b12 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml @@ -0,0 +1,59 @@ +<?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:id="@+id/has_changes" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:minWidth="10dp" + android:background="@color/result_green" /> + + <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/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 73a20bd2e..86b2c320d 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -51,19 +51,6 @@ android:layout_width="wrap_content" android:layout_height="match_parent"> - <ImageButton - android:id="@+id/edit" - style="@style/SelectableItem" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="false" - android:enabled="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/black" - android:src="@drawable/ic_action_edit" - android:text="@string/edit" - android:padding="12dp" /> - <TextView android:id="@+id/revoked" android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml index f812127a9..4da123cf2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="10dp" - android:background="@color/emphasis" /> + android:background="@color/result_green" /> <CheckBox android:id="@+id/checkBox" @@ -41,6 +41,8 @@ android:layout_gravity="center_vertical" android:layout_width="0dip" android:layout_marginLeft="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:layout_height="wrap_content" android:layout_weight="1"> @@ -68,4 +70,13 @@ </LinearLayout> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/edit_image" + android:src="@drawable/ic_action_edit" + android:padding="8dp" + android:layout_gravity="center_horizontal" /> + </LinearLayout> |