diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-17 23:06:49 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-17 23:06:49 +0200 |
commit | 9586d6b9b8193d3b7d990578eb97fab35c3e11eb (patch) | |
tree | 8e821c8f6ed1fa5dd6433565a146064e708a2ecf /OpenKeychain/src/main/res/layout | |
parent | b09d222f3416d155153a681ed256c46fbf5b386a (diff) | |
download | open-keychain-9586d6b9b8193d3b7d990578eb97fab35c3e11eb.tar.gz open-keychain-9586d6b9b8193d3b7d990578eb97fab35c3e11eb.tar.bz2 open-keychain-9586d6b9b8193d3b7d990578eb97fab35c3e11eb.zip |
Use key icons in spinners
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_item.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/keyspinner_item.xml | 82 |
2 files changed, 40 insertions, 44 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 8d600464c..a7a195ffa 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -39,9 +39,9 @@ </LinearLayout> <ImageView + android:id="@+id/status_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/status_image" android:layout_gravity="center" android:src="@drawable/status_signature_revoked_cutout" android:padding="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml index c519a92cc..e231664f3 100644 --- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml @@ -1,63 +1,59 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="wrap_content" - android:padding="4dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:minHeight="24dp" - android:layout_height="wrap_content"> + android:gravity="center_vertical" + android:singleLine="true" + android:orientation="horizontal" + android:descendantFocusability="blocksDescendants" + android:focusable="false"> - <TextView - android:id="@+id/keyspinner_key_name" - android:textColor="?android:attr/textColorSecondary" - android:textSize="18sp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="end" /> - - <TextView - android:id="@+id/keyspinner_key_email" - android:textColor="?android:attr/textColorTertiary" - android:textSize="14sp" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="0dip" android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="end" - android:layout_marginTop="-4dip" - android:text="alice@example.com" /> + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:focusable="true" + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="4dp" + android:paddingTop="4dp" + android:paddingBottom="4dp"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:padding="4dp" - android:minHeight="24dp" - android:layout_height="wrap_content" - android:id="@+id/keyspinner_key_row"> + <TextView + android:id="@+id/keyspinner_key_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_main_user_id" + android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/keyspinner_key_id" - android:textColor="?android:attr/textColorTertiary" - android:textSize="14sp" - android:layout_width="0dip" + android:id="@+id/keyspinner_key_email" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="end" - android:typeface="monospace" - android:layout_marginTop="-4dip" - android:layout_weight="1"/> + android:text="user@example.com" + android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView - android:id="@+id/keyspinner_key_status" - android:textColor="#e00" - android:textSize="12sp" + android:id="@+id/keyspinner_key_id" + android:text="12345" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="end" - android:layout_gravity="right" - android:text="status" - android:visibility="gone"/> - + android:typeface="monospace" + android:textAppearance="?android:attr/textAppearanceSmall"/> </LinearLayout> + <ImageView + android:id="@+id/keyspinner_key_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:src="@drawable/status_signature_revoked_cutout" + android:padding="16dp" /> + </LinearLayout>
\ No newline at end of file |