Move encrypt decrypt operations in own starter activity

1 files changed, 38 insertions, 9 deletions

diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index c3e31bf11..465fd195e 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -12,10 +12,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="@string/section_decrypt_files" />
+        android:text="@string/section_encrypt" />
 
     <TextView
-        android:id="@+id/decrypt_files"
+        android:id="@+id/encrypt_files"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -24,23 +24,52 @@
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:clickable="true"
         style="@style/SelectableItem"
-        android:text="@string/btn_decrypt_files"
+        android:text="@string/btn_encrypt_files"
         android:drawableRight="@drawable/ic_action_collection"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
-    <View
+    <TextView
+        android:id="@+id/encrypt_text"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:layout_marginBottom="8dp" />
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_encrypt_text"
+        android:drawableRight="@drawable/ic_action_copy"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
 
     <TextView
         style="@style/SectionHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="@string/section_decrypt_text" />
+        android:layout_marginTop="16dp"
+        android:text="@string/section_decrypt" />
+
+    <TextView
+        android:id="@+id/decrypt_files"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_decrypt_files"
+        android:drawableRight="@drawable/ic_action_collection"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider" />
 
     <LinearLayout
         android:id="@+id/decrypt_from_clipboard"