mirror of
https://github.com/M66B/FairEmail.git
synced 2026-04-15 13:33:35 +02:00
Pull to close down with effect
This commit is contained in:
@@ -75,7 +75,6 @@ import android.view.MenuItem;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.SubMenu;
|
||||
import android.view.View;
|
||||
import android.view.ViewConfiguration;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.animation.Animation;
|
||||
import android.view.animation.AnimationUtils;
|
||||
@@ -206,6 +205,11 @@ import javax.mail.Session;
|
||||
import javax.mail.internet.InternetAddress;
|
||||
import javax.mail.internet.MimeMessage;
|
||||
|
||||
import me.everything.android.ui.overscroll.IOverScrollDecor;
|
||||
import me.everything.android.ui.overscroll.IOverScrollUpdateListener;
|
||||
import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
|
||||
import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
|
||||
|
||||
import static android.app.Activity.RESULT_OK;
|
||||
import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
|
||||
import static android.text.format.DateUtils.DAY_IN_MILLIS;
|
||||
@@ -214,6 +218,9 @@ import static android.text.format.DateUtils.FORMAT_SHOW_WEEKDAY;
|
||||
import static android.view.KeyEvent.ACTION_DOWN;
|
||||
import static android.view.KeyEvent.ACTION_UP;
|
||||
import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
|
||||
import static me.everything.android.ui.overscroll.OverScrollBounceEffectDecoratorBase.DEFAULT_DECELERATE_FACTOR;
|
||||
import static me.everything.android.ui.overscroll.OverScrollBounceEffectDecoratorBase.DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK;
|
||||
import static me.everything.android.ui.overscroll.OverScrollBounceEffectDecoratorBase.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
|
||||
import static org.openintents.openpgp.OpenPgpSignatureResult.RESULT_KEY_MISSING;
|
||||
import static org.openintents.openpgp.OpenPgpSignatureResult.RESULT_NO_SIGNATURE;
|
||||
import static org.openintents.openpgp.OpenPgpSignatureResult.RESULT_VALID_KEY_CONFIRMED;
|
||||
@@ -505,9 +512,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||
//rvMessage.setItemViewCacheSize(10);
|
||||
//rvMessage.getRecycledViewPool().setMaxRecycledViews(0, 10);
|
||||
|
||||
final int minOverscroll = Helper.dp2pixels(getContext(),
|
||||
ViewConfiguration.get(getContext()).getScaledPagingTouchSlop());
|
||||
|
||||
final LinearLayoutManager llm = new LinearLayoutManager(getContext()) {
|
||||
private Rect parentRect = new Rect();
|
||||
private Rect childRect = new Rect();
|
||||
@@ -583,19 +587,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||
Log.w(ex);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int scrollVerticallyBy(int dx, RecyclerView.Recycler recycler, RecyclerView.State state) {
|
||||
int scrollRange = super.scrollVerticallyBy(dx, recycler, state);
|
||||
boolean swipe_close = prefs.getBoolean("swipe_close", false);
|
||||
if (swipe_close && viewType == AdapterMessage.ViewType.THREAD) {
|
||||
int overscroll = dx - scrollRange;
|
||||
Log.i("Overscroll=" + overscroll + "/" + minOverscroll);
|
||||
if (overscroll < -minOverscroll)
|
||||
handleAutoClose();
|
||||
}
|
||||
return scrollRange;
|
||||
}
|
||||
};
|
||||
rvMessage.setLayoutManager(llm);
|
||||
|
||||
@@ -1315,6 +1306,30 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||
}
|
||||
});
|
||||
|
||||
boolean swipe_close = prefs.getBoolean("swipe_close", false);
|
||||
if (swipe_close && viewType == AdapterMessage.ViewType.THREAD) {
|
||||
IOverScrollDecor decor = new VerticalOverScrollBounceEffectDecorator(
|
||||
new RecyclerViewOverScrollDecorAdapter(rvMessage, touchHelper) {
|
||||
@Override
|
||||
public boolean isInAbsoluteEnd() {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD,
|
||||
DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK,
|
||||
DEFAULT_DECELERATE_FACTOR
|
||||
);
|
||||
decor.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
|
||||
@Override
|
||||
public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
|
||||
float height = decor.getView().getHeight() / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
|
||||
if (height != 0 && offset > height / 3)
|
||||
handleAutoClose();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
final String pkg = Helper.getOpenKeychainPackage(getContext());
|
||||
Log.i("PGP binding to " + pkg);
|
||||
pgpService = new OpenPgpServiceConnection(getContext(), pkg);
|
||||
|
||||
Reference in New Issue
Block a user