From 2ead78a1e51c71911d1205b4fe946c38924db145 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 1 Sep 2014 23:25:03 +0200
Subject: split EncryptActivity into Encrypt{Text,File}Activity

---
 .../src/main/res/layout-large/encrypt_activity.xml | 17 ------
 .../res/layout-large/encrypt_text_activity.xml     | 17 ++++++
 .../src/main/res/layout/encrypt_activity.xml       | 14 -----
 .../src/main/res/layout/encrypt_content.xml        | 31 ----------
 .../src/main/res/layout/encrypt_file_activity.xml  | 14 +++++
 .../src/main/res/layout/encrypt_file_content.xml   | 24 ++++++++
 .../main/res/layout/encrypt_message_fragment.xml   | 71 ----------------------
 .../src/main/res/layout/encrypt_text_activity.xml  | 14 +++++
 .../src/main/res/layout/encrypt_text_content.xml   | 24 ++++++++
 .../src/main/res/layout/encrypt_text_fragment.xml  | 71 ++++++++++++++++++++++
 .../src/main/res/menu/encrypt_activity.xml         |  7 ---
 .../src/main/res/menu/encrypt_file_activity.xml    |  7 +++
 OpenKeychain/src/main/res/values/strings.xml       |  6 +-
 13 files changed, 175 insertions(+), 142 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_content.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_file_content.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_text_content.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/menu/encrypt_activity.xml
 create mode 100644 OpenKeychain/src/main/res/menu/encrypt_file_activity.xml

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

diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
deleted file mode 100644
index 84b2891e3..000000000
--- a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v4.widget.FixedDrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/encrypt_content" />
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml
new file mode 100644
index 000000000..5cf838c46
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v4.widget.FixedDrawerLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/drawer_list" />
+
+    </android.support.v4.widget.FixedDrawerLayout>
+
+    <include layout="@layout/encrypt_text_content" />
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_activity.xml
deleted file mode 100644
index 839bddc75..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_activity.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.EncryptActivity">
-
-    <include layout="@layout/encrypt_content"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml
deleted file mode 100644
index d029e7b83..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_content.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-    <include layout="@layout/notify_area"/>
-
-    <FrameLayout
-            android:id="@+id/encrypt_pager_mode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/encrypt_pager_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.v4.view.PagerTabStrip
-            android:id="@+id/encrypt_pager_tab_strip_content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:textColor="@color/emphasis" />
-    </android.support.v4.view.ViewPager>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
new file mode 100644
index 000000000..46daad28f
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.FixedDrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.EncryptFileActivity">
+
+    <include layout="@layout/encrypt_file_content"/>
+
+    <include layout="@layout/drawer_list" />
+
+</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
new file mode 100644
index 000000000..34f6eadda
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    <include layout="@layout/notify_area"/>
+
+    <FrameLayout
+            android:id="@+id/encrypt_pager_mode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+    <fragment
+        android:id="@+id/certify_key_fragment"
+        android:name="org.sufficientlysecure.keychain.ui.EncryptFileFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
deleted file mode 100644
index fab983fa5..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/message"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:gravity="top"
-            android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
-            android:hint="@string/encrypt_content_edit_text_hint"
-            android:layout_weight="1" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/action_encrypt_share"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal"
-            android:layout_marginBottom="8dp">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:text="@string/btn_share_encrypted_signed"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:layout_weight="1" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/action_encrypt_clipboard"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
new file mode 100644
index 000000000..5d5e16131
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.FixedDrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.EncryptTextActivity">
+
+    <include layout="@layout/encrypt_text_content"/>
+
+    <include layout="@layout/drawer_list" />
+
+</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
new file mode 100644
index 000000000..a2497f9c6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    <include layout="@layout/notify_area"/>
+
+    <FrameLayout
+        android:id="@+id/encrypt_pager_mode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <fragment
+        android:id="@+id/certify_key_fragment"
+        android:name="org.sufficientlysecure.keychain.ui.EncryptMessageFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
new file mode 100644
index 000000000..fab983fa5
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:gravity="top"
+            android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+            android:hint="@string/encrypt_content_edit_text_hint"
+            android:layout_weight="1" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/action_encrypt_share"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:text="@string/btn_share_encrypted_signed"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:layout_weight="1" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/action_encrypt_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/menu/encrypt_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_activity.xml
deleted file mode 100644
index 05d85ee2a..000000000
--- a/OpenKeychain/src/main/res/menu/encrypt_activity.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true"/>
-    <item android:id="@+id/check_use_armor" android:title="@string/label_file_ascii_armor" android:checkable="true" />
-    <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" />
-</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
new file mode 100644
index 000000000..05d85ee2a
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true"/>
+    <item android:id="@+id/check_use_armor" android:title="@string/label_file_ascii_armor" android:checkable="true" />
+    <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" />
+</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c3523d7a0..5b1a44fb6 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -4,7 +4,8 @@
     <!-- title -->
     <string name="title_select_recipients">Select Keys</string>
     <string name="title_select_secret_key">Select Your Key</string>
-    <string name="title_encrypt">Encrypt</string>
+    <string name="title_encrypt_text">Encrypt Text</string>
+    <string name="title_encrypt_files">Encrypt Files</string>
     <string name="title_decrypt">Decrypt</string>
     <string name="title_authentication">Passphrase</string>
     <string name="title_add_subkey">Add subkey</string>
@@ -498,7 +499,8 @@
 
     <!-- Navigation Drawer -->
     <string name="nav_keys">Keys</string>
-    <string name="nav_encrypt">Encrypt</string>
+    <string name="nav_encrypt_text">Encrypt Text</string>
+    <string name="nav_encrypt_files">Encrypt Files</string>
     <string name="nav_decrypt">Decrypt</string>
     <string name="nav_apps">Apps</string>
     <string name="drawer_open">Open navigation drawer</string>
-- 
cgit v1.2.3