Add no network to gallery

Infomaniak · Mar 5, 2024 · 5177986 · 5177986
1 parent 79fa757
commit 5177986
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 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
@@ -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
@@ -59,12 +59,23 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/galleryFragmentView"
+        <LinearLayout
+            android:id="@+id/galleryContentLinearLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:nestedScrollingEnabled="true"
-            tools:layout="@layout/fragment_gallery" />
+            android:orientation="vertical">
 
+            <include
+                android:id="@+id/noNetworkInclude"
+                layout="@layout/layout_no_network_small" />
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/galleryFragmentView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="true"
+                tools:layout="@layout/fragment_gallery" />
+
+        </LinearLayout>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>