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

Allow previous/next without action bar

This commit is contained in:
M66B 2019-01-30 19:11:55 +00:00
parent 524f5b9136
commit d0d030641b
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,9 @@ public class FragmentMessages extends FragmentBase {
private AdapterMessage.ViewType viewType; private AdapterMessage.ViewType viewType;
private SelectionTracker<Long> selectionTracker = null; private SelectionTracker<Long> selectionTracker = null;
private Long previous = null;
private Long next = null; private Long next = null;
private Long closeNext = null;
private int autoCloseCount = 0; private int autoCloseCount = 0;
private boolean autoExpand = true; private boolean autoExpand = true;
private Map<String, List<Long>> values = new HashMap<>(); private Map<String, List<Long>> values = new HashMap<>();
@ -281,43 +283,35 @@ public class FragmentMessages extends FragmentBase {
rvMessage.setAdapter(adapter); rvMessage.setAdapter(adapter);
if (viewType == AdapterMessage.ViewType.THREAD) { if (viewType == AdapterMessage.ViewType.THREAD) {
if (actionbar) { ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class);
ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class); model.observePrevNext(getViewLifecycleOwner(), id, new ViewModelMessages.IPrevNext() {
model.observePrevNext(getViewLifecycleOwner(), id, new ViewModelMessages.IPrevNext() { @Override
@Override public void onPrevious(boolean exists, Long id) {
public void onPrevious(boolean exists, Long id) { previous = id;
bottom_navigation.getMenu().findItem(R.id.action_prev).setIntent(new Intent().putExtra("id", id)); bottom_navigation.getMenu().findItem(R.id.action_prev).setEnabled(id != null);
bottom_navigation.getMenu().findItem(R.id.action_prev).setEnabled(id != null); }
}
@Override @Override
public void onNext(boolean exists, Long id) { public void onNext(boolean exists, Long id) {
bottom_navigation.getMenu().findItem(R.id.action_next).setIntent(new Intent().putExtra("id", id)); next = id;
bottom_navigation.getMenu().findItem(R.id.action_next).setEnabled(id != null); bottom_navigation.getMenu().findItem(R.id.action_next).setEnabled(id != null);
} }
}); });
}
ActivityBase activity = (ActivityBase) getActivity(); ActivityBase activity = (ActivityBase) getActivity();
activity.setSwipeListener(new SwipeListener.ISwipeListener() { activity.setSwipeListener(new SwipeListener.ISwipeListener() {
@Override @Override
public boolean onSwipeRight() { public boolean onSwipeRight() {
return swipe(R.id.action_prev); if (previous != null)
navigate(previous);
return (previous != null);
} }
@Override @Override
public boolean onSwipeLeft() { public boolean onSwipeLeft() {
return swipe(R.id.action_next); if (next != null)
} navigate(next);
return (next != null);
private boolean swipe(int menu) {
Intent intent = bottom_navigation.getMenu().findItem(menu).getIntent();
Long id = (intent == null ? null : intent.getLongExtra("id", -1));
if (id != null && id > 0) {
navigate(id);
return true;
} else
return false;
} }
}); });
@ -383,11 +377,11 @@ public class FragmentMessages extends FragmentBase {
return true; return true;
case R.id.action_prev: case R.id.action_prev:
navigate(menuItem.getIntent().getLongExtra("id", -1)); navigate(previous);
return true; return true;
case R.id.action_next: case R.id.action_next:
navigate(menuItem.getIntent().getLongExtra("id", -1)); navigate(next);
return true; return true;
default: default:
@ -1788,7 +1782,7 @@ public class FragmentMessages extends FragmentBase {
@Override @Override
public void onNext(boolean exists, Long id) { public void onNext(boolean exists, Long id) {
if (!exists || id != null) { if (!exists || id != null) {
next = id; closeNext = id;
if (!once) { if (!once) {
once = true; once = true;
loadMessagesNext(); loadMessagesNext();
@ -2133,11 +2127,11 @@ public class FragmentMessages extends FragmentBase {
if (autoclose) if (autoclose)
finish(); finish();
else if (autonext) { else if (autonext) {
if (next == null) if (closeNext == null)
finish(); finish();
else { else {
Log.i("Navigating to last next=" + next); Log.i("Navigating to last next=" + closeNext);
navigate(next); navigate(closeNext);
} }
} }
} }