From e36e8f1deaccd35e48bbb4080c744695e915dc4c Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Tue, 11 May 2010 14:07:15 +0000
Subject: merged DecryptMessageActivity and DecryptFileActivity into one
 DecryptActivity as well

---
 res/layout/decrypt.xml         | 214 +++++++++++++++++++++++++++++++++++++++++
 res/layout/decrypt_file.xml    | 149 ----------------------------
 res/layout/decrypt_message.xml |  99 -------------------
 res/values/strings.xml         |   4 +-
 4 files changed, 215 insertions(+), 251 deletions(-)
 create mode 100644 res/layout/decrypt.xml
 delete mode 100644 res/layout/decrypt_file.xml
 delete mode 100644 res/layout/decrypt_message.xml

(limited to 'res')

diff --git a/res/layout/decrypt.xml b/res/layout/decrypt.xml
new file mode 100644
index 000000000..5b97c35e4
--- /dev/null
+++ b/res/layout/decrypt.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fillViewport="true">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="5dip">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/source_previous"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/source_label"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/source_next"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+                <LinearLayout
+                    android:id="@+id/source_message"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/message"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:gravity="top"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/source_file"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <EditText
+                            android:id="@+id/filename"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"/>
+
+                        <ImageButton
+                            android:id="@+id/btn_browse"
+                            android:src="@drawable/ic_launcher_folder_small"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_delete_after_decryption"
+                            android:text="@string/label_delete_after_decryption"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/delete_after_decryption"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </ViewFlipper>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/layout_signature"
+        android:orientation="horizontal"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent">
+
+        <RelativeLayout
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content">
+
+            <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>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:paddingLeft="5dip">
+
+            <TextView
+                android:id="@+id/main_user_id"
+                android:text="Main User Id"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"/>
+
+            <TextView
+                android:id="@+id/main_user_id_rest"
+                android:text="Main User Id Rest"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:id="@+id/btn_reply"
+            android:text="@string/btn_reply"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/btn_decrypt"
+            android:text="@string/btn_decrypt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/decrypt_file.xml b/res/layout/decrypt_file.xml
deleted file mode 100644
index bfe662c30..000000000
--- a/res/layout/decrypt_file.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:paddingTop="5dip">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/label_filename"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="50dip"
-            android:layout_height="wrap_content"
-            android:text="@string/label_file"/>
-
-        <EditText
-            android:id="@+id/filename"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-
-        <ImageButton
-            android:id="@+id/btn_browse"
-            android:src="@drawable/ic_launcher_folder_small"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/label_delete_after_decryption"
-            android:text="@string/label_delete_after_decryption"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_gravity="center_vertical"
-            android:paddingRight="10dip"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1"/>
-
-        <CheckBox
-            android:id="@+id/delete_after_decryption"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical"/>
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:layout_marginBottom="5dip"/>
-
-    <LinearLayout
-        android:id="@+id/layout_signature"
-        android:orientation="horizontal"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content">
-
-        <RelativeLayout
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content">
-
-            <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>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:paddingLeft="5dip">
-
-            <TextView
-                android:id="@+id/main_user_id"
-                android:text="Main User Id"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"/>
-
-            <TextView
-                android:id="@+id/main_user_id_rest"
-                android:text="Main User Id Rest"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@android:style/ButtonBar">
-
-        <Button
-            android:id="@+id/btn_decrypt"
-            android:text="@string/btn_decrypt"
-            android:layout_weight="1"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/decrypt_message.xml b/res/layout/decrypt_message.xml
deleted file mode 100644
index de5b5e7fa..000000000
--- a/res/layout/decrypt_message.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true">
-
-    <EditText
-        android:id="@+id/message"
-        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:gravity="top"/>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip">
-
-        <LinearLayout
-            android:id="@+id/layout_signature"
-            android:orientation="horizontal"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_weight="2">
-
-            <RelativeLayout
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content">
-
-                <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>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:paddingLeft="5dip">
-
-                <TextView
-                    android:id="@+id/main_user_id"
-                    android:text="Main User Id"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"/>
-
-                <TextView
-                    android:id="@+id/main_user_id_rest"
-                    android:text="Main User Id Rest"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/btn_decrypt"
-            android:text="@string/btn_decrypt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2da6b8c3b..0e8f2b136 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,9 +22,7 @@
     <string name="title_selectRecipients">Select Recipients</string>
     <string name="title_selectSignature">Select Signature</string>
     <string name="title_encrypt">Encrypt</string>
-    <string name="title_decryptMessage">Decrypt Message</string>
-    <string name="title_encryptFile">Encrypt File</string>
-    <string name="title_decryptFile">Decrypt File</string>
+    <string name="title_decrypt">Decrypt</string>
     <string name="title_authentification">Authentification</string>
     <string name="title_createKey">Create Key</string>
     <string name="title_editKey">Edit Key</string>
-- 
cgit v1.2.3