Remove files related to old nav drawer
This commit is contained in:
Dominik Schürmann
@@ -20,9 +20,6 @@ package org.sufficientlysecure.keychain;
|
|||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
|
|
||||||
import org.spongycastle.jce.provider.BouncyCastleProvider;
|
import org.spongycastle.jce.provider.BouncyCastleProvider;
|
||||||
import org.sufficientlysecure.keychain.ui.EncryptFilesActivity;
|
|
||||||
import org.sufficientlysecure.keychain.ui.EncryptTextActivity;
|
|
||||||
import org.sufficientlysecure.keychain.ui.MainActivity;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
@@ -89,21 +86,6 @@ public final class Constants {
|
|||||||
public static final int PREF_VERSION = 4;
|
public static final int PREF_VERSION = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class DrawerItems {
|
|
||||||
public static final Class KEY_LIST = MainActivity.class;
|
|
||||||
public static final Class ENCRYPT_TEXT = EncryptTextActivity.class;
|
|
||||||
public static final Class ENCRYPT_FILE = EncryptFilesActivity.class;
|
|
||||||
public static final Class DECRYPT = MainActivity.class;
|
|
||||||
public static final Class REGISTERED_APPS_LIST = MainActivity.class;
|
|
||||||
public static final Class[] ARRAY = new Class[]{
|
|
||||||
KEY_LIST,
|
|
||||||
ENCRYPT_TEXT,
|
|
||||||
ENCRYPT_FILE,
|
|
||||||
DECRYPT,
|
|
||||||
REGISTERED_APPS_LIST
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final class key {
|
public static final class key {
|
||||||
public static final int none = 0;
|
public static final int none = 0;
|
||||||
public static final int symmetric = -1;
|
public static final int symmetric = -1;
|
||||||
|
|||||||
@@ -1,305 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.sufficientlysecure.keychain.ui;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.res.Configuration;
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v4.app.ActionBarDrawerToggle;
|
|
||||||
import android.support.v4.view.GravityCompat;
|
|
||||||
import android.support.v4.widget.DrawerLayout;
|
|
||||||
import android.support.v4.widget.FixedDrawerLayout;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import org.sufficientlysecure.keychain.Constants;
|
|
||||||
import org.sufficientlysecure.keychain.R;
|
|
||||||
|
|
||||||
public abstract class DrawerActivity extends BaseActivity {
|
|
||||||
private FixedDrawerLayout mDrawerLayout;
|
|
||||||
private ListView mDrawerList;
|
|
||||||
private ActionBarDrawerToggle mDrawerToggle;
|
|
||||||
|
|
||||||
private CharSequence mDrawerTitle;
|
|
||||||
private CharSequence mTitle;
|
|
||||||
private boolean mIsDrawerLocked = false;
|
|
||||||
|
|
||||||
private Class mSelectedItem;
|
|
||||||
|
|
||||||
private static final int MENU_ID_PREFERENCE = 222;
|
|
||||||
private static final int MENU_ID_HELP = 223;
|
|
||||||
|
|
||||||
protected void deactivateDrawerNavigation() {
|
|
||||||
((DrawerLayout) findViewById(R.id.drawer_layout)).setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void activateDrawerNavigation(Bundle savedInstanceState) {
|
|
||||||
mDrawerTitle = getString(R.string.app_name);
|
|
||||||
mDrawerLayout = (FixedDrawerLayout) findViewById(R.id.drawer_layout);
|
|
||||||
mDrawerList = (ListView) findViewById(R.id.left_drawer);
|
|
||||||
ViewGroup viewGroup = (ViewGroup) findViewById(R.id.content_frame);
|
|
||||||
int leftMarginLoaded = ((ViewGroup.MarginLayoutParams) viewGroup.getLayoutParams()).leftMargin;
|
|
||||||
int leftMarginInTablets = (int) getResources().getDimension(R.dimen.drawer_size);
|
|
||||||
int errorInMarginAllowed = 5;
|
|
||||||
|
|
||||||
// if the left margin of the loaded layout is close to the
|
|
||||||
// one used in tablets then set drawer as open and locked
|
|
||||||
if (Math.abs(leftMarginLoaded - leftMarginInTablets) < errorInMarginAllowed) {
|
|
||||||
mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_OPEN, mDrawerList);
|
|
||||||
mDrawerLayout.setScrimColor(Color.TRANSPARENT);
|
|
||||||
mIsDrawerLocked = true;
|
|
||||||
} else {
|
|
||||||
// set a custom shadow that overlays the main content when the drawer opens
|
|
||||||
mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
|
|
||||||
mIsDrawerLocked = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
NavItem mItemIconTexts[] = new NavItem[]{
|
|
||||||
new NavItem(R.drawable.ic_action_accounts, getString(R.string.nav_keys)),
|
|
||||||
new NavItem(R.drawable.ic_action_secure, getString(R.string.nav_encrypt_text)),
|
|
||||||
new NavItem(R.drawable.ic_action_secure, getString(R.string.nav_encrypt_files)),
|
|
||||||
new NavItem(R.drawable.ic_action_not_secure, getString(R.string.nav_decrypt)),
|
|
||||||
new NavItem(R.drawable.ic_action_view_as_list, getString(R.string.nav_apps))};
|
|
||||||
|
|
||||||
mDrawerList.setAdapter(new NavigationDrawerAdapter(this, R.layout.drawer_list_item,
|
|
||||||
mItemIconTexts));
|
|
||||||
|
|
||||||
mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
|
|
||||||
|
|
||||||
// enable ActionBar app icon to behave as action to toggle nav drawer
|
|
||||||
// if the drawer is not locked
|
|
||||||
if (!mIsDrawerLocked) {
|
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
|
||||||
getSupportActionBar().setHomeButtonEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ActionBarDrawerToggle ties together the the proper interactions
|
|
||||||
// between the sliding drawer and the action bar app icon
|
|
||||||
mDrawerToggle = new ActionBarDrawerToggle(this, /* host Activity */
|
|
||||||
mDrawerLayout, /* DrawerLayout object */
|
|
||||||
R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
|
|
||||||
R.string.drawer_open, /* "open drawer" description for accessibility */
|
|
||||||
R.string.drawer_close /* "close drawer" description for accessibility */
|
|
||||||
) {
|
|
||||||
public void onDrawerClosed(View view) {
|
|
||||||
getSupportActionBar().setTitle(mTitle);
|
|
||||||
|
|
||||||
callIntentForDrawerItem(mSelectedItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onDrawerOpened(View drawerView) {
|
|
||||||
mTitle = getSupportActionBar().getTitle();
|
|
||||||
getSupportActionBar().setTitle(mDrawerTitle);
|
|
||||||
// creates call to onPrepareOptionsMenu()
|
|
||||||
supportInvalidateOptionsMenu();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!mIsDrawerLocked) {
|
|
||||||
mDrawerLayout.setDrawerListener(mDrawerToggle);
|
|
||||||
} else {
|
|
||||||
// If the drawer is locked open make it un-focusable
|
|
||||||
// so that it doesn't consume all the Back button presses
|
|
||||||
mDrawerLayout.setFocusableInTouchMode(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Uses startActivity to call the Intent of the given class
|
|
||||||
*
|
|
||||||
* @param drawerItem the class of the drawer item you want to load. Based on Constants.DrawerItems.*
|
|
||||||
*/
|
|
||||||
public void callIntentForDrawerItem(Class drawerItem) {
|
|
||||||
// creates call to onPrepareOptionsMenu()
|
|
||||||
supportInvalidateOptionsMenu();
|
|
||||||
|
|
||||||
// call intent activity if selected
|
|
||||||
if (drawerItem != null) {
|
|
||||||
finish();
|
|
||||||
overridePendingTransition(0, 0);
|
|
||||||
|
|
||||||
Intent intent = new Intent(this, drawerItem);
|
|
||||||
startActivity(intent);
|
|
||||||
|
|
||||||
// disable animation of activity start
|
|
||||||
overridePendingTransition(0, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
if (mDrawerToggle == null) {
|
|
||||||
return super.onCreateOptionsMenu(menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
menu.add(42, MENU_ID_PREFERENCE, 100, R.string.menu_preferences);
|
|
||||||
menu.add(42, MENU_ID_HELP, 101, R.string.menu_help);
|
|
||||||
|
|
||||||
return super.onCreateOptionsMenu(menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
if (mDrawerToggle == null) {
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The action bar home/up action should open or close the drawer.
|
|
||||||
// ActionBarDrawerToggle will take care of this.
|
|
||||||
if (mDrawerToggle.onOptionsItemSelected(item)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (item.getItemId()) {
|
|
||||||
case MENU_ID_PREFERENCE: {
|
|
||||||
Intent intent = new Intent(this, SettingsActivity.class);
|
|
||||||
startActivity(intent);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
case MENU_ID_HELP: {
|
|
||||||
Intent intent = new Intent(this, HelpActivity.class);
|
|
||||||
startActivity(intent);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The click listener for ListView in the navigation drawer
|
|
||||||
*/
|
|
||||||
private class DrawerItemClickListener implements ListView.OnItemClickListener {
|
|
||||||
@Override
|
|
||||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
|
||||||
selectItem(position);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void selectItem(int position) {
|
|
||||||
// update selected item and title, then close the drawer
|
|
||||||
mDrawerList.setItemChecked(position, true);
|
|
||||||
// set selected class
|
|
||||||
mSelectedItem = Constants.DrawerItems.ARRAY[position];
|
|
||||||
|
|
||||||
// setTitle(mDrawerTitles[position]);
|
|
||||||
// If drawer isn't locked just close the drawer and
|
|
||||||
// it will move to the selected item by itself (via drawer toggle listener)
|
|
||||||
if (!mIsDrawerLocked) {
|
|
||||||
mDrawerLayout.closeDrawer(mDrawerList);
|
|
||||||
// else move to the selected item yourself
|
|
||||||
} else {
|
|
||||||
callIntentForDrawerItem(mSelectedItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When using the ActionBarDrawerToggle, you must call it during onPostCreate() and
|
|
||||||
* onConfigurationChanged()...
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
|
||||||
super.onPostCreate(savedInstanceState);
|
|
||||||
// Sync the toggle state after onRestoreInstanceState has occurred.
|
|
||||||
if (mDrawerToggle != null) {
|
|
||||||
mDrawerToggle.syncState();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onConfigurationChanged(Configuration newConfig) {
|
|
||||||
super.onConfigurationChanged(newConfig);
|
|
||||||
// Pass any configuration change to the drawer toggles
|
|
||||||
if (mDrawerToggle != null) {
|
|
||||||
mDrawerToggle.onConfigurationChanged(newConfig);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class NavItem {
|
|
||||||
public int icon; // res-id
|
|
||||||
public String title;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* NavItem constructor
|
|
||||||
*
|
|
||||||
* @param icon The icons resource-id
|
|
||||||
* @param title The title of the menu entry
|
|
||||||
*/
|
|
||||||
public NavItem(int icon, String title) {
|
|
||||||
super();
|
|
||||||
this.icon = icon;
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class NavigationDrawerAdapter extends ArrayAdapter<NavItem> {
|
|
||||||
Context mContext;
|
|
||||||
int mLayoutResourceId;
|
|
||||||
NavItem mData[] = null;
|
|
||||||
|
|
||||||
public NavigationDrawerAdapter(Context context, int layoutResourceId, NavItem[] data) {
|
|
||||||
super(context, layoutResourceId, data);
|
|
||||||
this.mLayoutResourceId = layoutResourceId;
|
|
||||||
this.mContext = context;
|
|
||||||
this.mData = data;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View getView(int position, View convertView, ViewGroup parent) {
|
|
||||||
View row = convertView;
|
|
||||||
NavItemHolder holder;
|
|
||||||
|
|
||||||
if (row == null) {
|
|
||||||
LayoutInflater inflater = ((Activity) mContext).getLayoutInflater();
|
|
||||||
row = inflater.inflate(mLayoutResourceId, parent, false);
|
|
||||||
|
|
||||||
holder = new NavItemHolder();
|
|
||||||
holder.mImg = (ImageView) row.findViewById(R.id.drawer_item_icon);
|
|
||||||
holder.mTxtTitle = (TextView) row.findViewById(R.id.drawer_item_text);
|
|
||||||
|
|
||||||
row.setTag(holder);
|
|
||||||
} else {
|
|
||||||
holder = (NavItemHolder) row.getTag();
|
|
||||||
}
|
|
||||||
|
|
||||||
NavItem item = mData[position];
|
|
||||||
holder.mTxtTitle.setText(item.title);
|
|
||||||
holder.mImg.setImageResource(item.icon);
|
|
||||||
|
|
||||||
return row;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static class NavItemHolder {
|
|
||||||
ImageView mImg;
|
|
||||||
TextView mTxtTitle;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -38,7 +38,7 @@ public abstract class NavDrawerActivity extends MaterialNavigationDrawer {
|
|||||||
|
|
||||||
// set the header image
|
// set the header image
|
||||||
// create and set the header
|
// create and set the header
|
||||||
View view = LayoutInflater.from(this).inflate(R.layout.custom_drawer, null);
|
View view = LayoutInflater.from(this).inflate(R.layout.drawer_custom_header, null);
|
||||||
setDrawerHeaderCustom(view);
|
setDrawerHeaderCustom(view);
|
||||||
|
|
||||||
// create sections
|
// create sections
|
||||||
|
|||||||
@@ -1,18 +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/decrypt_overview_fragment" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -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_files_content" />
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -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_text_content" />
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -1,18 +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/key_list_content" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/drawer_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<include layout="@layout/decrypt_overview_fragment"/>
|
|
||||||
|
|
||||||
<include layout="@layout/drawer_list" />
|
|
||||||
|
|
||||||
</android.support.v4.widget.FixedDrawerLayout>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
android:layout_gravity="start" tells DrawerLayout to treat
|
|
||||||
this as a sliding drawer on the left side for left-to-right
|
|
||||||
languages and on the right side for right-to-left languages.
|
|
||||||
The drawer is given a fixed width in dp and extends the full height of
|
|
||||||
the container. A solid background is used for contrast
|
|
||||||
with the content view.
|
|
||||||
-->
|
|
||||||
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/left_drawer"
|
|
||||||
android:layout_width="@dimen/drawer_size"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_gravity="start"
|
|
||||||
android:background="@color/white"
|
|
||||||
android:choiceMode="singleChoice"
|
|
||||||
android:divider="@color/bg_gray"
|
|
||||||
android:dividerHeight="1dp" />
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/drawer_item_icon"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_width="30dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="8dp"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_centerVertical="true" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/drawer_item_text"
|
|
||||||
android:text="Test"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_marginLeft="8dp"
|
|
||||||
android:paddingBottom="16dp"
|
|
||||||
android:paddingRight="16dp"
|
|
||||||
android:paddingTop="16dp"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium"
|
|
||||||
android:textColor="#111"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:layout_toRightOf="@id/drawer_item_icon"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
@@ -1,14 +1,32 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<android.support.v4.widget.FixedDrawerLayout
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
android:layout_width="match_parent"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
android:layout_height="match_parent">
|
||||||
android:id="@+id/drawer_layout"
|
|
||||||
|
<include
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
layout="@layout/toolbar" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_below="@id/toolbar"
|
||||||
|
android:id="@+id/content_frame"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".ui.EncryptFileActivity">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<include layout="@layout/encrypt_files_content"/>
|
<include layout="@layout/notify_area" />
|
||||||
|
|
||||||
<include layout="@layout/drawer_list" />
|
<FrameLayout
|
||||||
|
android:id="@+id/encrypt_pager_mode"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</android.support.v4.widget.FixedDrawerLayout>
|
<fragment
|
||||||
|
android:id="@+id/encrypt_file_fragment"
|
||||||
|
android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</RelativeLayout>
|
||||||
@@ -1,33 +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" />
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:id="@+id/encrypt_pager_mode"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical" />
|
|
||||||
|
|
||||||
<fragment
|
|
||||||
android:id="@+id/encrypt_file_fragment"
|
|
||||||
android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</RelativeLayout>
|
|
||||||
@@ -1,14 +1,32 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<android.support.v4.widget.FixedDrawerLayout
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
android:layout_width="match_parent"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
android:layout_height="match_parent">
|
||||||
android:id="@+id/drawer_layout"
|
|
||||||
|
<include
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
layout="@layout/toolbar" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_below="@id/toolbar"
|
||||||
|
android:id="@+id/content_frame"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".ui.EncryptTextActivity">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<include layout="@layout/encrypt_text_content"/>
|
<include layout="@layout/notify_area" />
|
||||||
|
|
||||||
<include layout="@layout/drawer_list" />
|
<FrameLayout
|
||||||
|
android:id="@+id/encrypt_pager_mode"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical" />
|
||||||
|
|
||||||
</android.support.v4.widget.FixedDrawerLayout>
|
<fragment
|
||||||
|
android:id="@+id/encrypt_text_fragment"
|
||||||
|
android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</RelativeLayout>
|
||||||
@@ -1,33 +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" />
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:id="@+id/encrypt_pager_mode"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical" />
|
|
||||||
|
|
||||||
<fragment
|
|
||||||
android:id="@+id/encrypt_text_fragment"
|
|
||||||
android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</RelativeLayout>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/drawer_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<include layout="@layout/key_list_content" />
|
|
||||||
|
|
||||||
<include layout="@layout/drawer_list" />
|
|
||||||
|
|
||||||
</android.support.v4.widget.FixedDrawerLayout>
|
|
||||||
@@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/content_frame"
|
android:id="@+id/content_frame"
|
||||||
android:layout_marginLeft="@dimen/drawer_content_padding"
|
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<dimen name="drawer_content_padding">240dp</dimen>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<dimen name="drawer_size">240dp</dimen>
|
|
||||||
<dimen name="drawer_content_padding">0dp</dimen>
|
|
||||||
</resources>
|
</resources>
|
||||||
Reference in New Issue
Block a user