diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 19:02:51 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 19:02:51 +0100 |
commit | 8d71a3fa92c9a9b690c547cbb970b2a5924c10d6 (patch) | |
tree | addf7c9ff8e3105c6252b9afa544c43cf1e361f1 /OpenKeychain/src/main/res | |
parent | f58ab3e439250cefdade219b0c8b89e60d471d0f (diff) | |
download | open-keychain-8d71a3fa92c9a9b690c547cbb970b2a5924c10d6.tar.gz open-keychain-8d71a3fa92c9a9b690c547cbb970b2a5924c10d6.tar.bz2 open-keychain-8d71a3fa92c9a9b690c547cbb970b2a5924c10d6.zip |
better state management in LinkedIdView, move confirm progress into card
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml | 48 |
1 files changed, 27 insertions, 21 deletions
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 1bdebd2b3..e17820ff1 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -48,30 +48,11 @@ android:orientation="horizontal" android:singleLine="true"> - <LinearLayout - android:orientation="vertical" - android:layout_gravity="center_vertical" - android:layout_width="0dip" - android:layout_marginLeft="16dp" - 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="16dp" + android:layout_marginRight="8dp" android:layout_gravity="center" android:id="@+id/linked_cert_progress" android:inAnimation="@anim/fade_in" @@ -86,11 +67,36 @@ <ImageView android:layout_width="22dp" android:layout_height="wrap_content" + android:src="@drawable/status_signature_verified_cutout_24dp" + /> + + <ImageView + android:layout_width="22dp" + android:layout_height="wrap_content" android:src="@drawable/status_signature_unknown_cutout_24dp" - android:id="@+id/linked_cert_icon" /> + </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> |