Commit 77098c1d authored by Thomas's avatar Thomas
Browse files

- Keep default FAB and toolbar behavior in reverse timeline

parent fd01e8ba

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+0 −30
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import android.text.TextWatcher; 
import android.util.Patterns;

import android.util.TypedValue;

import android.view.Gravity;

import android.view.ViewGroup;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuItem;
@@ -102,7 +101,6 @@ import com.bumptech.glide.request.RequestOptions; 
import com.bumptech.glide.request.target.CustomTarget;

import com.bumptech.glide.request.target.Target;

import com.bumptech.glide.request.transition.Transition;

import androidx.coordinatorlayout.widget.CoordinatorLayout;



import com.google.android.material.appbar.AppBarLayout;

import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -1453,31 +1451,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            CrossActionHelper.doCrossAction(BaseMainActivity.this, CrossActionHelper.TypeOfCrossAction.COMPOSE, null, null);

            return false;

        });

        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.SET_REVERSE_TIMELINE), false)) {

            AppBarLayout.LayoutParams toolbarParams = (AppBarLayout.LayoutParams) binding.toolbar.getLayoutParams();

            toolbarParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL);

            CoordinatorLayout.LayoutParams appBarParams = (CoordinatorLayout.LayoutParams) binding.appBar.getLayoutParams();

            appBarParams.setBehavior(new AppBarLayout.Behavior() {

                @Override

                public boolean onStartNestedScroll(@NonNull CoordinatorLayout parent, @NonNull AppBarLayout child, @NonNull View directTargetChild, View target, int nestedScrollAxes, int type) {

                    return false;

                }

            });

            ViewGroup currentParent = (ViewGroup) binding.compose.getParent();

            currentParent.removeView(binding.compose);

            CoordinatorLayout coordinatorLayout = (CoordinatorLayout) currentParent.getParent();

            CoordinatorLayout.LayoutParams params = new CoordinatorLayout.LayoutParams(

                    CoordinatorLayout.LayoutParams.WRAP_CONTENT,

                    CoordinatorLayout.LayoutParams.WRAP_CONTENT);

            params.gravity = Gravity.TOP | Gravity.END;

            int fabMargin = getResources().getDimensionPixelSize(R.dimen.fab_margin);

            TypedValue tv = new TypedValue();

            if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {

                params.topMargin = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics()) + fabMargin;

            }

            params.setMarginEnd(fabMargin);

            coordinatorLayout.addView(binding.compose, params);

        }

        headerMenuOpen = false;



        PushHelper.startStreaming(BaseMainActivity.this);
@@ -2132,9 +2105,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            } else {

                binding.compose.hide();

            }

            if (sharedpreferences.getBoolean(getString(R.string.SET_REVERSE_TIMELINE), false)) {

                binding.appBar.setExpanded(display, true);

            }

        }

    }

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonNotification.java

+2 −3
Original line number Diff line number Diff line
@@ -341,10 +341,9 @@ public class FragmentMastodonNotification extends Fragment implements Notificati 
            @Override

            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {

                if (requireActivity() instanceof BaseMainActivity) {

                    int dyDirection = reverseTimeline ? -dy : dy;

                    if (dyDirection < 0 && !((BaseMainActivity) requireActivity()).getFloatingVisibility())

                    if (dy < 0 && !((BaseMainActivity) requireActivity()).getFloatingVisibility())

                        ((BaseMainActivity) requireActivity()).manageFloatingButton(true);

                    if (dyDirection > 0 && ((BaseMainActivity) requireActivity()).getFloatingVisibility())

                    if (dy > 0 && ((BaseMainActivity) requireActivity()).getFloatingVisibility())

                        ((BaseMainActivity) requireActivity()).manageFloatingButton(false);

                }

                int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition();

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java

+2 −3
Original line number Diff line number Diff line
@@ -821,10 +821,9 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. 
                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {

                    scrollingUp = dy < 0;

                    if (requireActivity() instanceof BaseMainActivity) {

                        int dyDirection = reverseTimeline ? -dy : dy;

                        if (dyDirection < 0 && !((BaseMainActivity) requireActivity()).getFloatingVisibility())

                        if (dy < 0 && !((BaseMainActivity) requireActivity()).getFloatingVisibility())

                            ((BaseMainActivity) requireActivity()).manageFloatingButton(true);

                        if (dyDirection > 0 && ((BaseMainActivity) requireActivity()).getFloatingVisibility())

                        if (dy > 0 && ((BaseMainActivity) requireActivity()).getFloatingVisibility())

                            ((BaseMainActivity) requireActivity()).manageFloatingButton(false);

                    }

                    int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition();