From 13ffd2038d56d90ffc583663a98c378ee9d9aa00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 14 Apr 2014 01:11:08 +0200
Subject: key edit: fix crash when create date was after expiry date, change
 from gregorian calendar to calendar with creation from instance, experimental
 result status for decrypt activity

---
 .../main/res/layout/decrypt_signature_include.xml  | 103 ++++++++++++---------
 1 file changed, 59 insertions(+), 44 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml b/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
index 3e0d35c9b..70faa6e83 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
@@ -1,62 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/signature"
+    android:id="@+id/result"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
-    android:orientation="horizontal"
     android:padding="4dp"
     android:paddingLeft="10dp"
     android:paddingRight="10dp">
 
-    <RelativeLayout
+    <TextView
+        android:id="@+id/result_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/relativeLayout">
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="result text" />
+
+    <RelativeLayout
+        android:id="@+id/result_signature"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/ic_signature"
+        <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/signed_large" />
+            android:id="@+id/relativeLayout">
 
-        <ImageView
-            android:id="@+id/ic_signature_status"
+            <ImageView
+                android:id="@+id/ic_signature"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/signed_large" />
+
+            <ImageView
+                android:id="@+id/ic_signature_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/overlay_error" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/mainUserId"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/overlay_error" />
-    </RelativeLayout>
+            android:layout_gravity="left"
+            android:text="@string/label_main_user_id"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_toRightOf="@+id/relativeLayout" />
 
-    <TextView
-        android:id="@+id/mainUserId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left"
-        android:text="@string/label_main_user_id"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        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"
+            android:layout_below="@+id/mainUserId"
+            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"
-        android:layout_below="@+id/mainUserId"
-        android:layout_toRightOf="@+id/relativeLayout" />
-
-    <com.beardedhen.androidbootstrap.BootstrapButton
-        android:id="@+id/lookup_key"
-        android:layout_width="wrap_content"
-        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" />
-</RelativeLayout>
\ No newline at end of file
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/lookup_key"
+            android:layout_width="wrap_content"
+            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" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3