From d090d4d332c9b1f5174890de531e2cc6936c038b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 4 Feb 2014 19:53:50 +0100
Subject: work on lookup key, fix some illegal state exceptions with hack

---
 .../src/main/res/layout/decrypt_activity.xml       | 58 ++++++++++++++--------
 1 file changed, 36 insertions(+), 22 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml')

diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
index c6834d745..91ee15c38 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
@@ -20,10 +20,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
+                android:paddingTop="4dp"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp">
 
-                <LinearLayout
+                <RelativeLayout
                     android:id="@+id/signature"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -35,7 +36,8 @@
 
                     <RelativeLayout
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:id="@+id/relativeLayout">
 
                         <ImageView
                             android:id="@+id/ic_signature"
@@ -50,29 +52,41 @@
                             android:src="@drawable/overlay_error" />
                     </RelativeLayout>
 
-                    <LinearLayout
+                    <com.beardedhen.androidbootstrap.BootstrapButton
+                        android:id="@+id/lookup_key"
+                        android:visibility="gone"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingLeft="5dip">
+                        android:layout_height="50dp"
+                        android:padding="4dp"
+                        android:text="@string/btn_lookup_key"
+                        bootstrapbutton:bb_icon_left="fa-download"
+                        bootstrapbutton:bb_type="info"
+                        bootstrapbutton:bb_size="small"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true" />
 
-                        <TextView
-                            android:id="@+id/mainUserId"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="left"
-                            android:text="Main User Id"
-                            android:textAppearance="?android:attr/textAppearanceMedium" />
+                    <TextView
+                        android:id="@+id/mainUserId"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left"
+                        android:text="Main User Id"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:layout_alignTop="@+id/linearLayout"
+                        android:layout_toRightOf="@+id/relativeLayout" />
 
-                        <TextView
-                            android:id="@+id/mainUserIdRest"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="left"
-                            android:text="Main User Id Rest"
-                            android:textAppearance="?android:attr/textAppearanceSmall" />
-                    </LinearLayout>
-                </LinearLayout>
+                    <TextView
+                        android:id="@+id/mainUserIdRest"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left"
+                        android:text="Main User Id Rest"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:layout_alignBottom="@+id/relativeLayout"
+                        android:layout_alignLeft="@+id/mainUserId"
+                        android:layout_alignStart="@+id/mainUserId" />
+                </RelativeLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
-- 
cgit v1.2.3