X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FMobileLedgerListFragment.java;h=c5bbe0c4eece2f4325c353ac935bb15ffcad6fef;hb=728e2e597258e913891038ae72c2bd71dae850f6;hp=94d54f16b41208063810ad5dbe3da8bc6c649b46;hpb=b54a11eca1e4d0a03a3076047dc77f68666d4338;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java index 94d54f16..c5bbe0c4 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/MobileLedgerListFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -17,8 +17,6 @@ package net.ktnx.mobileledger.ui; -import android.view.MotionEvent; - import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; @@ -27,10 +25,9 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.ui.transaction_list.TransactionListAdapter; import net.ktnx.mobileledger.utils.Colors; -import net.ktnx.mobileledger.utils.DimensionUtils; public class MobileLedgerListFragment extends Fragment { - public SwipeRefreshLayout swiper; + public SwipeRefreshLayout refreshLayout; public TransactionListAdapter modelAdapter; protected RecyclerView root; @NonNull @@ -38,56 +35,13 @@ public class MobileLedgerListFragment extends Fragment { return (MainActivity) requireActivity(); } protected void themeChanged(Integer counter) { - swiper.setColorSchemeColors(Colors.getSwipeCircleColors()); + refreshLayout.setColorSchemeColors(Colors.getSwipeCircleColors()); } public void onBackgroundTaskRunningChanged(Boolean isRunning) { if (getActivity() == null) return; - if (swiper == null) + if (refreshLayout == null) return; - swiper.setRefreshing(isRunning); - } - protected void manageFabOnScroll() { - final MainActivity mainActivity = getMainActivity(); - int triggerPixels = DimensionUtils.dp2px(mainActivity, 30f); - root.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() { - private float upAnchor = -1; - private float downAnchor = -1; - private float lastY; - @Override - public boolean onInterceptTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) { - switch (e.getActionMasked()) { - case MotionEvent.ACTION_DOWN: - lastY = upAnchor = downAnchor = e.getAxisValue(MotionEvent.AXIS_Y); - break; - case MotionEvent.ACTION_MOVE: - final float currentY = e.getAxisValue(MotionEvent.AXIS_Y); - if (currentY > lastY) { - // swipe down - upAnchor = lastY; - - mainActivity.fabShouldShow(); - } - else { - // swipe up - downAnchor = lastY; - - if (currentY < upAnchor - triggerPixels) - mainActivity.fabHide(); - } - - lastY = currentY; - - break; - } - return false; - } - @Override - public void onTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) { - } - @Override - public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) { - } - }); + refreshLayout.setRefreshing(isRunning); } }