Преглед изворни кода

fixes safe area issue with multiselect and adds overscroll on main timeline to select bottom (#1718)

martyfuhry пре 2 година
родитељ
комит
6e4ba6184b

+ 3 - 0
mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart

@@ -189,6 +189,9 @@ class ImmichAssetGridState extends State<ImmichAssetGrid> {
     }
 
     final listWidget = ScrollablePositionedList.builder(
+      padding: const EdgeInsets.only(
+        bottom: 220,
+      ),
       itemBuilder: _itemBuilder,
       itemPositionsListener: _itemPositionsListener,
       itemScrollController: _itemScrollController,

+ 14 - 14
mobile/lib/modules/home/views/home_page.dart

@@ -216,7 +216,6 @@ class HomePage extends HookConsumerWidget {
       }
 
       return SafeArea(
-        bottom: !multiselectEnabled.state,
         top: true,
         child: Stack(
           children: [
@@ -234,14 +233,17 @@ class HomePage extends HookConsumerWidget {
                     selectionActive: selectionEnabledHook.value,
                   ),
             if (selectionEnabledHook.value)
-              ControlBottomAppBar(
-                onShare: onShareAssets,
-                onFavorite: onFavoriteAssets,
-                onDelete: onDelete,
-                onAddToAlbum: onAddToAlbum,
-                albums: albums,
-                sharedAlbums: sharedAlbums,
-                onCreateNewAlbum: onCreateNewAlbum,
+              SafeArea(
+                bottom: true,
+                child: ControlBottomAppBar(
+                  onShare: onShareAssets,
+                  onFavorite: onFavoriteAssets,
+                  onDelete: onDelete,
+                  onAddToAlbum: onAddToAlbum,
+                  albums: albums,
+                  sharedAlbums: sharedAlbums,
+                  onCreateNewAlbum: onCreateNewAlbum,
+                ),
               ),
           ],
         ),
@@ -249,11 +251,9 @@ class HomePage extends HookConsumerWidget {
     }
 
     return Scaffold(
-      appBar: multiselectEnabled.state
-          ? null
-          : HomePageAppBar(
-              onPopBack: reloadAllAsset,
-            ),
+      appBar: HomePageAppBar(
+        onPopBack: reloadAllAsset,
+      ),
       drawer: const ProfileDrawer(),
       body: buildBody(),
     );