diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_item.xml | 18 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml | 48 |
2 files changed, 39 insertions, 27 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml index 5fc5e78a8..900d3a5d5 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_item.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" - android:singleLine="true"> + android:singleLine="true" + tools:showIn="@layout/linked_id_view_fragment"> <ImageView android:layout_width="32dp" @@ -43,22 +45,28 @@ </LinearLayout> - <LinearLayout - android:id="@+id/user_id_item_certified_layout" + <ViewAnimator + android:id="@+id/linked_id_certified" android:layout_width="22dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" + android:outAnimation="@anim/fade_out_down" + android:inAnimation="@anim/fade_in_up" android:layout_gravity="center_vertical" android:orientation="vertical"> <ImageView - android:id="@+id/user_id_item_certified" + android:id="@+id/linked_id_certified_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/status_signature_unknown_cutout_24dp" android:layout_gravity="center_horizontal" /> - </LinearLayout> + <Space + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + + </ViewAnimator> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml index 106d2343f..2fb79a4bf 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -38,6 +38,8 @@ android:id="@+id/linked_verify_container" android:inAnimation="@anim/fade_in" android:outAnimation="@anim/fade_out" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" > <include layout="@layout/cert_list_widget" /> @@ -49,11 +51,30 @@ android:orientation="horizontal" android:singleLine="true"> + <LinearLayout + android:orientation="vertical" + 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"> + + <TextView + android:id="@+id/linked_cert_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Verifying…" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> + <ViewAnimator android:layout_width="22dp" android:layout_height="22dp" android:layout_marginLeft="16dp" - android:layout_marginRight="8dp" + android:layout_marginRight="4dp" android:layout_gravity="center" android:id="@+id/linked_cert_progress" android:inAnimation="@anim/fade_in" @@ -66,38 +87,21 @@ /> <ImageView + android:id="@+id/status_icon_verified" android:layout_width="22dp" android:layout_height="wrap_content" - android:src="@drawable/status_signature_verified_cutout_24dp" + android:src="@drawable/status_signature_verified_inner_24dp" /> <ImageView + android:id="@+id/status_icon_invalid" android:layout_width="22dp" android:layout_height="wrap_content" - android:src="@drawable/status_signature_unknown_cutout_24dp" + android:src="@drawable/status_signature_invalid_cutout_24dp" /> </ViewAnimator> - <LinearLayout - android:orientation="vertical" - 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"> - - <TextView - android:id="@+id/linked_cert_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Verifying…" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - </LinearLayout> - </LinearLayout> </ViewAnimator> |