From 6e4ba6184b6b4217aa7f59efba5e07e477ab7624 Mon Sep 17 00:00:00 2001 From: martyfuhry Date: Fri, 10 Feb 2023 01:02:26 -0500 Subject: [PATCH] fixes safe area issue with multiselect and adds overscroll on main timeline to select bottom (#1718) --- .../home/ui/asset_grid/immich_asset_grid.dart | 3 ++ mobile/lib/modules/home/views/home_page.dart | 28 +++++++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart index c7fdf84836..df77010c8b 100644 --- a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart +++ b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart @@ -189,6 +189,9 @@ class ImmichAssetGridState extends State { } final listWidget = ScrollablePositionedList.builder( + padding: const EdgeInsets.only( + bottom: 220, + ), itemBuilder: _itemBuilder, itemPositionsListener: _itemPositionsListener, itemScrollController: _itemScrollController, diff --git a/mobile/lib/modules/home/views/home_page.dart b/mobile/lib/modules/home/views/home_page.dart index 298fb4e496..f6eb523e38 100644 --- a/mobile/lib/modules/home/views/home_page.dart +++ b/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(), );