From 4d32a7892b91284bc1ac1476db6c7dac5ddec262 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 8 Jan 2025 12:18:53 +0100 Subject: [PATCH] fix Signed-off-by: alperozturk --- .../android/ui/activity/DrawerActivity.java | 5 +++++ .../android/ui/fragment/FileDetailFragment.java | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 217c9edffb1e..f2f3367d19a3 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -60,6 +60,7 @@ import com.nextcloud.ui.ChooseAccountDialogFragment; import com.nextcloud.ui.composeActivity.ComposeActivity; import com.nextcloud.ui.composeActivity.ComposeDestination; +import com.nextcloud.utils.extensions.ViewExtensionsKt; import com.nextcloud.utils.mdm.MDMConfig; import com.owncloud.android.MainApp; import com.owncloud.android.R; @@ -1373,4 +1374,8 @@ private void handleNavItemClickEvent(@IdRes int menuItemId) { Menu navMenu = drawerNavigationView.getMenu(); onNavigationItemClicked(navMenu.findItem(menuItemId)); } + + public void showBottomNavigationBar(boolean show) { + ViewExtensionsKt.setVisibleIf(bottomNavigationView, show); + } } diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java index a9fd7d134b1f..7c4e38a35677 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -50,6 +50,7 @@ import com.owncloud.android.lib.resources.files.ToggleFavoriteRemoteOperation; import com.owncloud.android.lib.resources.shares.OCShare; import com.owncloud.android.lib.resources.shares.ShareType; +import com.owncloud.android.ui.activity.DrawerActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.activity.ToolbarActivity; import com.owncloud.android.ui.adapter.FileDetailTabAdapter; @@ -209,6 +210,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, throw new IllegalArgumentException("Arguments may not be null"); } + if (getActivity() instanceof DrawerActivity drawerActivity) { + drawerActivity.showBottomNavigationBar(false); + } + setFile(BundleExtensionsKt.getParcelableArgument(arguments, ARG_FILE, OCFile.class)); parentFolder = BundleExtensionsKt.getParcelableArgument(arguments, ARG_PARENT_FOLDER, OCFile.class); user = BundleExtensionsKt.getParcelableArgument(arguments, ARG_USER, User.class); @@ -268,6 +273,14 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat } } + @Override + public void onDestroy() { + if (getActivity() instanceof DrawerActivity drawerActivity) { + drawerActivity.showBottomNavigationBar(true); + } + super.onDestroy(); + } + private void onOverflowIconClicked() { final OCFile file = getFile(); final List additionalFilter = new ArrayList<>(