Add move button in entry view

This commit is contained in:
Jareth Lomson 2014-05-26 15:14:34 +02:00
parent d34194aeec
commit f725a30a03
4 changed files with 1052 additions and 1006 deletions

View File

@ -123,6 +123,28 @@ namespace keepass2android
}
protected void SetupMoveButtons() {
View moveView = FindViewById(Resource.Id.entry_move);
if (App.Kp2a.GetDb().CanWrite)
{
moveView.Visibility = ViewStates.Visible;
moveView.Click += (sender, e) =>
{
NavigateToFolderAndLaunchMoveElementTask navMoveTask =
new NavigateToFolderAndLaunchMoveElementTask(Entry.ParentGroup,Entry.Uuid, false);
navMoveTask.SetActivityResult(this, KeePass.ExitNormal );
Finish();
};
}
else
{
moveView.Visibility = ViewStates.Gone;
}
}
private class PluginActionReceiver : BroadcastReceiver
{
private readonly EntryActivity _activity;
@ -349,6 +371,7 @@ namespace keepass2android
FillData();
SetupEditButtons();
SetupMoveButtons ();
App.Kp2a.GetDb().LastOpenedEntry = new PwEntryOutput(Entry, App.Kp2a.GetDb().KpDatabase);

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
<LinearLayout
android:id="@+id/top"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal" />
<LinearLayout
<LinearLayout
android:id="@+id/bottom_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:divider="?android:attr/dividerVertical"
android:showDividers="middle"
android:layout_alignParentBottom="true"
android:dividerPadding="12dp">
<FrameLayout
<FrameLayout
style="?android:attr/actionButtonStyle"
android:id="@+id/entry_edit"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
<TextView
style="?android:actionBarTabTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -32,11 +32,27 @@
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:text="@string/menu_edit" />
</FrameLayout>
</LinearLayout>
<ImageView
</FrameLayout>
<FrameLayout
android:id="@+id/entry_move"
style="?android:attr/actionButtonStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<!-- TODO: Modify move icon -->
<TextView
style="?android:actionBarTabTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingRight="20dp"
android:drawableLeft="?attr/NewEntryDrawable"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:text="@string/menu_move_light" />
</FrameLayout>
</LinearLayout>
<ImageView
android:id="@+id/entry_divider2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -44,16 +60,16 @@
android:scaleType="fitXY"
android:tint="@color/blue_highlight"
android:src="@android:drawable/divider_horizontal_bright" />
<ScrollView
<ScrollView
android:id="@+id/entry_scroll"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_above="@id/entry_divider2"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay">
<keepass2android.view.EntryContentsView
<keepass2android.view.EntryContentsView
android:id="@+id/entry_contents"
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
</ScrollView>
</ScrollView>
</RelativeLayout>

View File

@ -131,6 +131,7 @@
<string name="menu_db_settings">Database settings</string>
<string name="menu_delete">Delete</string>
<string name="menu_move">Move to another group</string>
<string name="menu_move_light">Move</string>
<string name="menu_navigate">Navigate to this group</string>
<string name="menu_donate">Donate a beer...</string>
<string name="menu_edit">Edit</string>