From 2913a78b188e81fe6bd91d26fb0ae083cf504bde Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Sun, 20 Jul 2014 17:09:34 +0200
Subject: Load of rework on EncryptActivity, still some TODOs

---
 .../res/layout/encrypt_asymmetric_fragment.xml     | 29 ++++++++++++++++++----
 .../main/res/layout/encrypt_asymmetric_signkey.xml | 19 ++++++++++++++
 .../src/main/res/layout/encrypt_file_fragment.xml  |  8 ------
 3 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 284fdd9ce..b5d7b98cd 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -9,12 +9,31 @@
     android:paddingRight="16dp"
     android:paddingLeft="16dp">
 
-    <CheckBox
-            android:id="@+id/sign"
-            android:layout_width="wrap_content"
+    <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:text="@string/label_sign"/>
+            android:padding="0dp"
+            android:layout_margin="0dp"
+            style="@android:style/Widget.EditText">
+        <TextView
+                android:paddingLeft="12dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="From: "/>
+        <Spinner
+                android:id="@+id/sign"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/label_sign"
+                android:padding="0dp"
+                android:layout_margin="0dp"
+                />
+
+    </LinearLayout>
 
     <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
             android:id="@+id/recipient_list"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
new file mode 100644
index 000000000..35c618c72
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:padding="8dp"
+              android:layout_height="wrap_content">
+    <TextView
+            android:id="@android:id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+    <TextView
+            android:id="@android:id/text2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
index d52097433..156fce8f0 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -25,14 +25,6 @@
                 android:layout_height="0dip"
                 android:layout_weight="1"/>
 
-        <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider"
-                android:layout_marginBottom="8dp"/>
-
-        <include layout="@layout/encrypt_content_adv_settings" />
-
         <View
                 android:layout_width="match_parent"
                 android:layout_height="1dip"
-- 
cgit v1.2.3