mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-22 01:02:16 -05:00
removed transitions (old style)
fixed crashes due to non-existing attrs
This commit is contained in:
parent
3f740bd319
commit
9de1a69cb2
@ -665,7 +665,7 @@ namespace keepass2android
|
|||||||
public override void OnBackPressed()
|
public override void OnBackPressed()
|
||||||
{
|
{
|
||||||
base.OnBackPressed();
|
base.OnBackPressed();
|
||||||
OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void FillData()
|
protected void FillData()
|
||||||
@ -989,7 +989,7 @@ namespace keepass2android
|
|||||||
//So we can simply Finish. See this page for information on how to do this in more general (future?) cases:
|
//So we can simply Finish. See this page for information on how to do this in more general (future?) cases:
|
||||||
//http://developer.android.com/training/implementing-navigation/ancestral.html
|
//http://developer.android.com/training/implementing-navigation/ancestral.html
|
||||||
Finish();
|
Finish();
|
||||||
OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -672,13 +672,13 @@ namespace keepass2android
|
|||||||
//somehow after re-creating the activity. Maybe a Mono for Android bug?
|
//somehow after re-creating the activity. Maybe a Mono for Android bug?
|
||||||
Intent intent = Intent;
|
Intent intent = Intent;
|
||||||
intent.PutExtra(IntentContinueWithEditing, true);
|
intent.PutExtra(IntentContinueWithEditing, true);
|
||||||
OverridePendingTransition(0, 0);
|
//OverridePendingTransition(0, 0);
|
||||||
intent.AddFlags(ActivityFlags.NoAnimation | ActivityFlags.ForwardResult);
|
intent.AddFlags(ActivityFlags.NoAnimation | ActivityFlags.ForwardResult);
|
||||||
_closeForReload = true;
|
_closeForReload = true;
|
||||||
SetResult(KeePass.ExitRefreshTitle); //probably the entry will be modified -> let the EditActivity refresh to be safe
|
SetResult(KeePass.ExitRefreshTitle); //probably the entry will be modified -> let the EditActivity refresh to be safe
|
||||||
Finish();
|
Finish();
|
||||||
|
|
||||||
OverridePendingTransition(0, 0);
|
//OverridePendingTransition(0, 0);
|
||||||
StartActivity(intent);
|
StartActivity(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -163,8 +163,8 @@ namespace keepass2android
|
|||||||
public override void OnBackPressed()
|
public override void OnBackPressed()
|
||||||
{
|
{
|
||||||
base.OnBackPressed();
|
base.OnBackPressed();
|
||||||
if ((Group != null) && (Group.ParentGroup != null))
|
//if ((Group != null) && (Group.ParentGroup != null))
|
||||||
OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool OnContextItemSelected(IMenuItem item) {
|
public override bool OnContextItemSelected(IMenuItem item) {
|
||||||
|
@ -452,7 +452,7 @@ namespace keepass2android
|
|||||||
//http://developer.android.com/training/implementing-navigation/ancestral.html
|
//http://developer.android.com/training/implementing-navigation/ancestral.html
|
||||||
AppTask.SetActivityResult(this, KeePass.ExitNormal);
|
AppTask.SetActivityResult(this, KeePass.ExitNormal);
|
||||||
Finish();
|
Finish();
|
||||||
OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
//OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shareInterpolator="false">
|
android:shareInterpolator="false">
|
||||||
<translate android:fromXDelta="0%" android:toXDelta="-100%"
|
<translate android:fromXDelta="0%" android:toXDelta="0%"
|
||||||
android:fromYDelta="0%" android:toYDelta="0%"
|
android:fromYDelta="0%" android:toYDelta="0%"
|
||||||
android:duration="400"/>
|
android:duration="400"/>
|
||||||
</set>
|
</set>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shareInterpolator="false">
|
android:shareInterpolator="false">
|
||||||
<translate
|
<translate
|
||||||
android:fromXDelta="0%" android:toXDelta="100%"
|
android:fromXDelta="0%" android:toXDelta="0%"
|
||||||
android:fromYDelta="0%" android:toYDelta="0%"
|
android:fromYDelta="0%" android:toYDelta="0%"
|
||||||
android:duration="250" />
|
android:duration="250" />
|
||||||
</set>
|
</set>
|
||||||
|
@ -28,26 +28,6 @@
|
|||||||
android:drawableLeft="@drawable/navigation_accept"
|
android:drawableLeft="@drawable/navigation_accept"
|
||||||
style="@style/BottomBarButton" />
|
style="@style/BottomBarButton" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<!--
|
|
||||||
<Button
|
|
||||||
android:id="@+id/accept_button"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:text="@string/accept"
|
|
||||||
style="@style/BottomBarButton" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/cancel_button"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:drawableLeft="?attr/CancelDrawable"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:text="@android:string/cancel"
|
|
||||||
style="@style/BottomBarButton" />
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:id="@+id/ScrollView"
|
android:id="@+id/ScrollView"
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:paddingRight="20dp"
|
android:paddingRight="20dp"
|
||||||
android:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
android:drawableLeft="?attr/NavigationAcceptDrawable"
|
android:drawableLeft="@drawable/navigation_accept"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:text="@string/accept" />
|
android:text="@string/accept" />
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
@ -41,7 +41,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:paddingRight="20dp"
|
android:paddingRight="20dp"
|
||||||
android:drawableLeft="?attr/CancelDrawable"
|
android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
|
||||||
android:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:text="@string/deny" />
|
android:text="@string/deny" />
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
android:id="@+id/search_button"
|
android:id="@+id/search_button"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:src="?attr/ic_action_search_drawable"
|
android:src="@drawable/ic_action_search"
|
||||||
android:layout_below="@id/search_label"
|
android:layout_below="@id/search_label"
|
||||||
android:layout_alignParentRight="true" />
|
android:layout_alignParentRight="true" />
|
||||||
<EditText
|
<EditText
|
||||||
|
@ -447,9 +447,13 @@
|
|||||||
<AndroidResource Include="Resources\layout\entry_extrastring_value.xml" />
|
<AndroidResource Include="Resources\layout\entry_extrastring_value.xml" />
|
||||||
<AndroidResource Include="Resources\values-nb\strings.xml" />
|
<AndroidResource Include="Resources\values-nb\strings.xml" />
|
||||||
<AndroidResource Include="Resources\anim\anim_enter.xml" />
|
<AndroidResource Include="Resources\anim\anim_enter.xml" />
|
||||||
<AndroidResource Include="Resources\anim\anim_leave.xml" />
|
<AndroidResource Include="Resources\anim\anim_leave.xml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</AndroidResource>
|
||||||
<AndroidResource Include="Resources\anim\anim_enter_back.xml" />
|
<AndroidResource Include="Resources\anim\anim_enter_back.xml" />
|
||||||
<AndroidResource Include="Resources\anim\anim_leave_back.xml" />
|
<AndroidResource Include="Resources\anim\anim_leave_back.xml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</AndroidResource>
|
||||||
<AndroidResource Include="Resources\layout\searchurlresults.xml">
|
<AndroidResource Include="Resources\layout\searchurlresults.xml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</AndroidResource>
|
</AndroidResource>
|
||||||
|
@ -177,7 +177,7 @@ namespace keepass2android.view
|
|||||||
private void LaunchEntry()
|
private void LaunchEntry()
|
||||||
{
|
{
|
||||||
_groupActivity.LaunchActivityForEntry(_entry, _pos);
|
_groupActivity.LaunchActivityForEntry(_entry, _pos);
|
||||||
_groupActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
|
//_groupActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
public override void OnCreateMenu(IContextMenu menu, IContextMenuContextMenuInfo menuInfo)
|
public override void OnCreateMenu(IContextMenu menu, IContextMenuContextMenuInfo menuInfo)
|
||||||
|
@ -115,7 +115,7 @@ namespace keepass2android.view
|
|||||||
|
|
||||||
private void LaunchGroup() {
|
private void LaunchGroup() {
|
||||||
GroupActivity.Launch(_groupBaseActivity, _pwGroup, _groupBaseActivity.AppTask);
|
GroupActivity.Launch(_groupBaseActivity, _pwGroup, _groupBaseActivity.AppTask);
|
||||||
_groupBaseActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
|
//_groupBaseActivity.OverridePendingTransition(Resource.Animation.anim_enter, Resource.Animation.anim_leave);
|
||||||
|
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user