mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Always undo

This commit is contained in:
M66B 2020-06-20 21:25:47 +02:00
parent cb194a9d4f
commit 7ba38e176d
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -395,6 +395,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
fragmentTransaction.commit();
}
View getContentView() {
return drawerLayout.getChildAt(0);
}
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());

28
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -4520,7 +4520,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (result.size() == 0)
return;
if (undo) {
if (undo || true) {
moveUndo(result);
return;
}
@ -4643,9 +4643,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onExecuted(Bundle args, final ArrayList<MessageTarget> result) {
ActivityView activity = (ActivityView) getActivity();
View content = activity.getContentView();
// Show undo snackbar
final Snackbar snackbar = Snackbar.make(
view,
content,
getString(R.string.title_moving, getDisplay(result)),
Snackbar.LENGTH_INDEFINITE);
snackbar.setAction(R.string.title_undo, new View.OnClickListener() {
@ -4686,9 +4689,28 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(FragmentMessages.this, args, "messages:moveundo");
}.execute(activity, activity, args, "messages:moveundo");
}
});
snackbar.addCallback(new Snackbar.Callback() {
private int margin;
@Override
public void onShown(Snackbar sb) {
ViewGroup.MarginLayoutParams lparam = (ViewGroup.MarginLayoutParams) content.getLayoutParams();
margin = lparam.bottomMargin;
lparam.bottomMargin += snackbar.getView().getHeight();
content.setLayoutParams(lparam);
}
@Override
public void onDismissed(Snackbar transientBottomBar, int event) {
ViewGroup.MarginLayoutParams lparam = (ViewGroup.MarginLayoutParams) content.getLayoutParams();
lparam.bottomMargin = margin;
content.setLayoutParams(lparam);
}
});
snackbar.show();
snackbar.show();
final Context context = getContext().getApplicationContext();