implement navigation drawer

1 files changed, 236 insertions, 244 deletions

diff --git a/OpenPGP-Keychain/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml
index 1fb3bc589..41b01c7c3 100644
--- a/OpenPGP-Keychain/res/layout/encrypt.xml
+++ b/OpenPGP-Keychain/res/layout/encrypt.xml
@@ -1,315 +1,307 @@
 <?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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true" >
+    android:layout_height="match_parent" >
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp" >
+        android:layout_height="match_parent"
+        android:fillViewport="true" >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="4dp" >
-
-            <ImageView
-                android:id="@+id/modePrevious"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_previous" />
-
-            <TextView
-                android:id="@+id/modeLabel"
-                style="@style/SectionHeader"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_horizontal|center_vertical"
-                android:text="@string/label_asymmetric" />
-
-            <ImageView
-                android:id="@+id/modeNext"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_next" />
-        </LinearLayout>
-
-        <ViewFlipper
-            android:id="@+id/mode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
+            android:orientation="vertical"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp" >
 
             <LinearLayout
-                android:id="@+id/modeAsymmetric"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:padding="4dp" >
 
+                <ImageView
+                    android:id="@+id/modePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous" />
+
+                <TextView
+                    android:id="@+id/modeLabel"
+                    style="@style/SectionHeader"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:text="@string/label_asymmetric" />
+
+                <ImageView
+                    android:id="@+id/modeNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next" />
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/mode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
                 <LinearLayout
+                    android:id="@+id/modeAsymmetric"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
+                    android:orientation="vertical"
+                    android:padding="4dp" >
 
-                    <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:orientation="horizontal" >
+
+                        <CheckBox
+                            android:id="@+id/sign"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="@string/label_sign" />
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:paddingLeft="16dp" >
+
+                            <TextView
+                                android:id="@+id/mainUserId"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right"
+                                android:ellipsize="end"
+                                android:singleLine="true"
+                                android:text="Sign User Id"
+                                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                            <TextView
+                                android:id="@+id/mainUserIdRest"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right"
+                                android:ellipsize="end"
+                                android:singleLine="true"
+                                android:text="Sign email"
+                                android:textAppearance="?android:attr/textAppearanceSmall" />
+                        </LinearLayout>
+                    </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingLeft="16dp" >
+                        android:orientation="horizontal"
+                        android:paddingBottom="3dip" >
 
                         <TextView
-                            android:id="@+id/mainUserId"
-                            android:layout_width="wrap_content"
+                            android:id="@+id/label_selectPublicKeys"
+                            android:layout_width="0dip"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:ellipsize="end"
-                            android:singleLine="true"
-                            android:text="Sign User Id"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:text="@string/label_select_public_keys"
                             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                        <TextView
-                            android:id="@+id/mainUserIdRest"
+                        <com.beardedhen.androidbootstrap.BootstrapButton
+                            android:id="@+id/btn_selectEncryptKeys"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:ellipsize="end"
-                            android:singleLine="true"
-                            android:text="Sign email"
-                            android:textAppearance="?android:attr/textAppearanceSmall" />
+                            android:layout_gravity="center_vertical"
+                            android:layout_margin="4dp"
+                            android:text="@string/btn_select_encrypt_keys"
+                            bootstrapbutton:bb_icon_left="fa-users"
+                            bootstrapbutton:bb_size="default"
+                            bootstrapbutton:bb_type="default" />
                     </LinearLayout>
                 </LinearLayout>
 
-                <LinearLayout
+                <TableLayout
+                    android:id="@+id/modeSymmetric"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingBottom="3dip" >
+                    android:padding="4dp"
+                    android:stretchColumns="1" >
 
-                    <TextView
-                        android:id="@+id/label_selectPublicKeys"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:text="@string/label_select_public_keys"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <com.beardedhen.androidbootstrap.BootstrapButton
-                        android:id="@+id/btn_selectEncryptKeys"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_margin="4dp"
-                        android:text="@string/btn_select_encrypt_keys"
-                        bootstrapbutton:bb_icon_left="fa-key"
-                        bootstrapbutton:bb_size="default"
-                        bootstrapbutton:bb_type="default" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <TableLayout
-                android:id="@+id/modeSymmetric"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:stretchColumns="1" >
-
-                <TableRow>
-
-                    <TextView
-                        android:id="@+id/label_passPhrase"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_passphrase"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <EditText
-                        android:id="@+id/passPhrase"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword" />
-                </TableRow>
-
-                <TableRow>
+                    <TableRow>
 
-                    <TextView
-                        android:id="@+id/label_passPhraseAgain"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_passphrase_again"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
+                        <TextView
+                            android:id="@+id/label_passPhrase"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:text="@string/label_passphrase"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                    <EditText
-                        android:id="@+id/passPhraseAgain"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword" />
-                </TableRow>
-            </TableLayout>
-        </ViewFlipper>
+                        <EditText
+                            android:id="@+id/passPhrase"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="textPassword" />
+                    </TableRow>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="4dp" >
+                    <TableRow>
 
-            <ImageView
-                android:id="@+id/sourcePrevious"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_previous" />
-
-            <TextView
-                android:id="@+id/sourceLabel"
-                style="@style/SectionHeader"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_horizontal|center_vertical"
-                android:text="@string/label_message"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <ImageView
-                android:id="@+id/sourceNext"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_next" />
-        </LinearLayout>
+                        <TextView
+                            android:id="@+id/label_passPhraseAgain"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:text="@string/label_passphrase_again"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <ViewFlipper
-            android:id="@+id/source"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" >
+                        <EditText
+                            android:id="@+id/passPhraseAgain"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="textPassword" />
+                    </TableRow>
+                </TableLayout>
+            </ViewFlipper>
 
             <LinearLayout
-                android:id="@+id/sourceMessage"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
                 android:padding="4dp" >
 
-                <EditText
-                    android:id="@+id/message"
-                    android:layout_width="match_parent"
+                <ImageView
+                    android:id="@+id/sourcePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous" />
+
+                <TextView
+                    android:id="@+id/sourceLabel"
+                    style="@style/SectionHeader"
+                    android:layout_width="0dip"
                     android:layout_height="match_parent"
-                    android:gravity="top"
-                    android:inputType="text|textCapSentences|textMultiLine|textLongMessage" />
+                    android:layout_weight="1"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <ImageView
+                    android:id="@+id/sourceNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/sourceFile"
+            <ViewFlipper
+                android:id="@+id/source"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:padding="4dp" >
+                android:layout_height="0dip"
+                android:layout_weight="1" >
 
                 <LinearLayout
+                    android:id="@+id/sourceMessage"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="4dp" >
 
                     <EditText
-                        android:id="@+id/filename"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:inputType="textNoSuggestions" />
-
-                    <com.beardedhen.androidbootstrap.BootstrapButton
-                        android:id="@+id/btn_browse"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="4dp"
-                        bootstrapbutton:bb_icon_left="fa-folder-open"
-                        bootstrapbutton:bb_roundedCorners="true"
-                        bootstrapbutton:bb_size="default"
-                        bootstrapbutton:bb_type="default" />
+                        android:id="@+id/message"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="top"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage" />
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/sourceFile"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="4dp" >
 
-                    <TextView
-                        android:id="@+id/label_fileCompression"
-                        android:layout_width="0dip"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:paddingRight="10dip"
-                        android:text="@string/label_file_compression"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                    <Spinner
-                        android:id="@+id/fileCompression"
-                        android:layout_width="wrap_content"
+                        android:orientation="horizontal" >
+
+                        <EditText
+                            android:id="@+id/filename"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:inputType="textNoSuggestions" />
+
+                        <com.beardedhen.androidbootstrap.BootstrapButton
+                            android:id="@+id/btn_browse"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="4dp"
+                            bootstrapbutton:bb_icon_left="fa-folder-open"
+                            bootstrapbutton:bb_roundedCorners="true"
+                            bootstrapbutton:bb_size="default"
+                            bootstrapbutton:bb_type="default" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
+                        android:orientation="horizontal" >
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
+                        <TextView
+                            android:id="@+id/label_fileCompression"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_weight="1"
+                            android:paddingRight="10dip"
+                            android:text="@string/label_file_compression"
+                            android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                    <CheckBox
-                        android:id="@+id/deleteAfterEncryption"
-                        android:layout_width="wrap_content"
+                        <Spinner
+                            android:id="@+id/fileCompression"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/label_delete_after_encryption" />
-                </LinearLayout>
+                        android:orientation="horizontal" >
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal" >
+                        <CheckBox
+                            android:id="@+id/deleteAfterEncryption"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="@string/label_delete_after_encryption" />
+                    </LinearLayout>
 
-                    <CheckBox
-                        android:id="@+id/asciiArmour"
-                        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_ascii_armor" />
+                        android:orientation="horizontal" >
+
+                        <CheckBox
+                            android:id="@+id/asciiArmour"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="@string/label_ascii_armor" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-        </ViewFlipper>
-    </LinearLayout>
+            </ViewFlipper>
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/drawer_list" />
 
-</ScrollView>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file