From c4ef86b38a5c8b98e5ee2934e0a0c1184f2baf07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 12:03:00 +0100
Subject: Refactor DecryptActivity into DecryptOverviewFragment for nav drawer

---
 .../src/main/res/layout-large/decrypt_activity.xml |   2 +-
 .../src/main/res/layout/decrypt_activity.xml       |   2 +-
 .../src/main/res/layout/decrypt_content.xml        | 117 ---------------------
 .../main/res/layout/decrypt_overview_fragment.xml  |  96 +++++++++++++++++
 4 files changed, 98 insertions(+), 119 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_content.xml
 create mode 100644 OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
index 06487a982..97456301a 100644
--- a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
@@ -13,6 +13,6 @@
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/decrypt_content" />
+    <include layout="@layout/decrypt_overview_fragment" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
index bb0e463b3..d2d2e75fe 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/decrypt_content"/>
+    <include layout="@layout/decrypt_overview_fragment"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml
deleted file mode 100644
index 8944c821f..000000000
--- a/OpenKeychain/src/main/res/layout/decrypt_content.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar"
-        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" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="4dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/section_decrypt_files" />
-
-
-            <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"
-                android:layout_marginBottom="8dp" />
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/section_decrypt_text" />
-
-            <LinearLayout
-                android:id="@+id/decrypt_from_clipboard"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/listPreferredItemHeight"
-                android:clickable="true"
-                android:paddingRight="4dp"
-                style="@style/SelectableItem"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:paddingRight="4dp"
-                    android:gravity="center_vertical"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:paddingLeft="8dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/btn_decrypt_clipboard" />
-
-                    <TextView
-                        android:paddingLeft="8dp"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/tertiary_text_light"
-                        android:text="@string/btn_decrypt_and_verify"
-                        android:gravity="center_vertical" />
-
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/clipboard_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:padding="8dp"
-                    android:src="@drawable/ic_action_paste"
-                    android:layout_gravity="center_vertical" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider"
-                android:layout_marginBottom="8dp" />
-
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
new file mode 100644
index 000000000..c3e31bf11
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingTop="4dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/section_decrypt_files" />
+
+    <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"
+        android:layout_marginBottom="8dp" />
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/section_decrypt_text" />
+
+    <LinearLayout
+        android:id="@+id/decrypt_from_clipboard"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        android:paddingRight="4dp"
+        style="@style/SelectableItem"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:paddingRight="4dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_decrypt_clipboard" />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/tertiary_text_light"
+                android:text="@string/btn_decrypt_and_verify"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/clipboard_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="8dp"
+            android:src="@drawable/ic_action_paste"
+            android:layout_gravity="center_vertical" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_marginBottom="8dp" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3