split EncryptActivity into Encrypt{Text,File}Activity
This commit is contained in:
@@ -13,5 +13,5 @@
|
||||
|
||||
</android.support.v4.widget.FixedDrawerLayout>
|
||||
|
||||
<include layout="@layout/encrypt_content" />
|
||||
<include layout="@layout/encrypt_text_content" />
|
||||
</FrameLayout>
|
||||
@@ -5,9 +5,9 @@
|
||||
android:id="@+id/drawer_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ui.EncryptActivity">
|
||||
tools:context=".ui.EncryptFileActivity">
|
||||
|
||||
<include layout="@layout/encrypt_content"/>
|
||||
<include layout="@layout/encrypt_file_content"/>
|
||||
|
||||
<include layout="@layout/drawer_list" />
|
||||
|
||||
@@ -15,17 +15,10 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" />
|
||||
|
||||
<android.support.v4.view.ViewPager
|
||||
android:id="@+id/encrypt_pager_content"
|
||||
<fragment
|
||||
android:id="@+id/certify_key_fragment"
|
||||
android:name="org.sufficientlysecure.keychain.ui.EncryptFileFragment"
|
||||
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>
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</LinearLayout>
|
||||
14
OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
Normal file
14
OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
Normal file
@@ -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>
|
||||
24
OpenKeychain/src/main/res/layout/encrypt_text_content.xml
Normal file
24
OpenKeychain/src/main/res/layout/encrypt_text_content.xml
Normal file
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user