From 2d38bd5734dfe69b84f62d64d011e10aac61fa3e Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 29 Jan 2020 11:25:33 -0300 Subject: [PATCH] [android] Scroll down when nav drawer chevron is pressed --- .../briar/android/navdrawer/NavDrawerActivity.java | 6 +++++- briar-android/src/main/res/layout/transports_list.xml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java index 44733bb03..7fa637593 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java @@ -47,6 +47,7 @@ import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProviders; +import static android.view.View.FOCUS_DOWN; import static android.view.View.GONE; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; @@ -114,12 +115,12 @@ public class NavDrawerActivity extends BriarActivity implements }); drawerScrollView = findViewById(R.id.drawerScrollView); + View chevronView = drawerScrollView.findViewById(R.id.chevronView); drawerScrollView.getViewTreeObserver().addOnGlobalLayoutListener( new OnGlobalLayoutListener() { @Override public void onGlobalLayout() { // hide/show chevron depending on whether we can scroll - View chevronView = findViewById(R.id.chevronView); if (drawerScrollView.canScrollVertically(1)) { chevronView.setVisibility(VISIBLE); } else { @@ -130,6 +131,9 @@ public class NavDrawerActivity extends BriarActivity implements } }); new PluginViewController(drawerScrollView, this, viewModel); + chevronView.setOnClickListener(v -> + drawerScrollView.fullScroll(FOCUS_DOWN) + ); Toolbar toolbar = findViewById(R.id.toolbar); drawerLayout = findViewById(R.id.drawer_layout); diff --git a/briar-android/src/main/res/layout/transports_list.xml b/briar-android/src/main/res/layout/transports_list.xml index 0c9f94d84..e2558853a 100644 --- a/briar-android/src/main/res/layout/transports_list.xml +++ b/briar-android/src/main/res/layout/transports_list.xml @@ -13,6 +13,7 @@ android:layout_height="24dp" android:layout_marginBottom="8dp" android:background="@color/divider" + android:foreground="?attr/selectableItemBackground" android:src="@drawable/chevron_down_white" app:layout_constraintBottom_toTopOf="@+id/longRangeLabel" app:layout_constraintEnd_toEndOf="parent"