From 8d71a3fa92c9a9b690c547cbb970b2a5924c10d6 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 10 Mar 2015 19:02:51 +0100
Subject: better state management in LinkedIdView, move confirm progress into
 card

---
 .../main/res/layout/linked_id_view_fragment.xml    | 48 ++++++++++++----------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml')

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"
@@ -83,14 +64,39 @@
                             android:indeterminate="true"
                             />
 
+                        <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>
-- 
cgit v1.2.3