Browse Source

Fix contents cut off when scrolling is locked

Don't need to touch the coordinator params, just set scroll flags properly

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 3 years ago
parent
commit
7a2c735795

+ 1 - 8
app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -1545,14 +1545,10 @@ public class FileDisplayActivity extends FileActivity
      */
     @VisibleForTesting
     public void lockScrolling() {
-        final CoordinatorLayout.LayoutParams coordinatorParams = (CoordinatorLayout.LayoutParams) binding.rootLayout.getLayoutParams();
-        coordinatorParams.setBehavior(null);
-        binding.rootLayout.setLayoutParams(coordinatorParams);
-        binding.rootLayout.setNestedScrollingEnabled(false);
+        binding.appbar.appbar.setExpanded(true, false);
         final AppBarLayout.LayoutParams appbarParams = (AppBarLayout.LayoutParams) binding.appbar.toolbarFrame.getLayoutParams();
         appbarParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL);
         binding.appbar.toolbarFrame.setLayoutParams(appbarParams);
-        binding.appbar.appbar.setExpanded(true, false);
     }
 
     /**
@@ -1560,9 +1556,6 @@ public class FileDisplayActivity extends FileActivity
      */
     @VisibleForTesting
     public void resetScrolling() {
-        final CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) binding.rootLayout.getLayoutParams();
-        params.setBehavior(new AppBarLayout.ScrollingViewBehavior());
-        binding.rootLayout.setLayoutParams(params);
         AppBarLayout.LayoutParams appbarParams = (AppBarLayout.LayoutParams) binding.appbar.toolbarFrame.getLayoutParams();
         appbarParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS);
         binding.appbar.toolbarFrame.setLayoutParams(appbarParams);