From 9581dfcde4720ede5c9fa5ca97210504b6609b3f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Fri, 28 Feb 2014 02:58:15 +0100
Subject: made pgp decrypt stuff a little bit more bearable

---
 res/layout/fragment_conversation.xml | 40 ++++++++++++++++++++++++++++++++----
 res/values/strings.xml               |  2 +-
 2 files changed, 37 insertions(+), 5 deletions(-)

(limited to 'res')

diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 50b9ba3b..22f783d3 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -45,6 +45,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/textsend"
+        android:layout_below="@+id/info_box"
         android:layout_alignParentLeft="true"
         android:background="#e5e5e5"
         tools:listitem="@layout/message_sent"
@@ -53,13 +54,17 @@
 		android:transcriptMode="alwaysScroll"
 		android:listSelector="@android:color/transparent">
     </ListView>
+    <LinearLayout
+        android:id="@+id/info_box"
+         android:layout_height="wrap_content"
+         android:layout_width="fill_parent"
+         android:orientation="vertical"
+        >
     <LinearLayout
         android:id="@+id/new_fingerprint"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignTop="@+id/messages_view"
-        android:background="#cc0000"
+        android:background="#e92727"
         android:orientation="vertical"
         android:visibility="gone"
         >
@@ -77,11 +82,38 @@
             android:layout_height="wrap_content"
             android:id="@+id/otr_fingerprint"
             android:textColor="#eee"
-            android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
             android:paddingLeft="8dp"
             android:paddingBottom="8dp"
             android:textSize="14sp"
             android:typeface="monospace"/>
         
     </LinearLayout>
+    <LinearLayout
+        android:id="@+id/pgp_keyentry"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="#ffa713"
+        android:orientation="vertical"
+        android:visibility="gone"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="OpenPGP encrypted messages found"
+            android:textColor="#000"
+            android:textStyle="bold"
+            android:padding="8dp"
+            android:textSize="20sp"/>
+        <TextView 
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#000"
+            android:text="Click here to enter passphrase and decrypt messages"
+            android:paddingLeft="8dp"
+            android:paddingBottom="8dp"
+            android:textSize="14sp"/>
+        
+    </LinearLayout>
+    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a545676e..e4ccb8ba 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13,5 +13,5 @@
     <string name="just_now">just now</string>
     <string name="sending">sending&#8230;</string>
     <string name="announce_pgp">Renew PGP announcement</string>
-    <string name="encrypted_message">This message is encrypted. Click to decrypt.</string>
+    <string name="encrypted_message">Decrypting message. please wait&#8230;</string>
 </resources>
-- 
cgit v1.2.3