From 61a6346f896806c9e21fba5e43997b06853e4b2c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 30 May 2015 02:24:45 +0200
Subject: show status indicators in EncryptFragment

---
 .../res/layout/encrypt_asymmetric_fragment.xml     | 99 ++++++++++++++++++----
 1 file changed, 82 insertions(+), 17 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index aa295050a..56647ec65 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -3,39 +3,104 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:paddingTop="4dp"
     android:paddingBottom="4dp"
     android:paddingRight="16dp"
     android:paddingLeft="16dp">
 
-    <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
-        android:id="@+id/recipient_list"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:minHeight="56dip"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:padding="0dp"
+        android:layout_margin="0dp">
+
+        <ViewAnimator
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/result_encryption_icon"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
+            android:paddingBottom="12dp"
+            android:inAnimation="@anim/fade_in"
+            android:outAnimation="@anim/fade_out">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/status_lock_open_24dp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/status_lock_closed_24dp" />
+
+        </ViewAnimator>
+
+        <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
+            android:id="@+id/recipient_list"
+            android:layout_width="match_parent"
+            android:minHeight="56dip"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
+
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="0dp"
-        android:layout_margin="0dp"
-        style="@android:style/Widget.EditText">
+        android:layout_margin="0dp">
 
-        <TextView
-            android:paddingLeft="8dp"
+        <ViewAnimator
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/label_asymmetric_from"
-            android:paddingRight="8dp"/>
+            android:id="@+id/result_signature_icon"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
+            android:inAnimation="@anim/fade_in"
+            android:outAnimation="@anim/fade_out">
 
-        <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
-            android:id="@+id/sign"
-            android:minHeight="56dip"
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/status_signature_unverified_cutout_24dp"
+                />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/status_signature_verified_cutout_24dp"
+                />
+
+        </ViewAnimator>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical" />
+            android:padding="0dp"
+            android:layout_margin="0dp"
+            style="@android:style/Widget.EditText">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/label_asymmetric_from"
+                android:paddingRight="8dp"/>
+
+            <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
+                android:id="@+id/sign"
+                android:minHeight="56dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3