From 5177986b9d4c86f75f1595d5e856c24215f00b69 Mon Sep 17 00:00:00 2001 From: Gibran Chevalley Date: Fri, 23 Feb 2024 10:56:35 +0100 Subject: [PATCH] Add no network to gallery --- .../drive/ui/menu/MenuGalleryFragment.kt | 10 +++++++++- .../main/res/layout/fragment_menu_gallery.xml | 19 +++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/MenuGalleryFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/MenuGalleryFragment.kt index a2c5da80ad..09e786f05f 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/menu/MenuGalleryFragment.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/menu/MenuGalleryFragment.kt @@ -26,19 +26,22 @@ import androidx.core.view.isGone import androidx.core.view.marginBottom import androidx.core.view.marginTop import androidx.fragment.app.Fragment -import androidx.navigation.fragment.findNavController +import androidx.fragment.app.activityViewModels import com.google.android.material.appbar.AppBarLayout import com.infomaniak.drive.R import com.infomaniak.drive.databinding.FragmentMenuGalleryBinding import com.infomaniak.drive.databinding.MultiSelectLayoutBinding import com.infomaniak.drive.ui.MainActivity +import com.infomaniak.drive.ui.MainViewModel import com.infomaniak.drive.ui.fileList.multiSelect.GalleryMultiSelectActionsBottomSheetDialog +import com.infomaniak.drive.utils.observeAndDisplayNetworkAvailability import com.infomaniak.lib.core.utils.safeBinding import com.infomaniak.lib.core.utils.toPx class MenuGalleryFragment : Fragment() { private var binding: FragmentMenuGalleryBinding by safeBinding() + private val mainViewModel: MainViewModel by activityViewModels() private var galleryFragment = GalleryFragment() @@ -89,6 +92,11 @@ class MenuGalleryFragment : Fragment() { }) adjustFastScrollBarScrollRange() + observeAndDisplayNetworkAvailability( + mainViewModel = mainViewModel, + noNetworkBinding = binding.noNetworkInclude, + noNetworkBindingDirectParent = binding.galleryContentLinearLayout, + ) } private fun adjustFastScrollBarScrollRange() = with(binding) { diff --git a/app/src/main/res/layout/fragment_menu_gallery.xml b/app/src/main/res/layout/fragment_menu_gallery.xml index 2b9f8b1988..d06eb7862d 100644 --- a/app/src/main/res/layout/fragment_menu_gallery.xml +++ b/app/src/main/res/layout/fragment_menu_gallery.xml @@ -59,12 +59,23 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + android:orientation="vertical"> + + + + +