diff --git a/lib/widgets/collection/collection_grid.dart b/lib/widgets/collection/collection_grid.dart index 64cd0cb8e..a7b4f59c3 100644 --- a/lib/widgets/collection/collection_grid.dart +++ b/lib/widgets/collection/collection_grid.dart @@ -31,6 +31,7 @@ import 'package:aves/widgets/common/identity/scroll_thumb.dart'; import 'package:aves/widgets/common/providers/tile_extent_controller_provider.dart'; import 'package:aves/widgets/common/thumbnail/decorated.dart'; import 'package:aves/widgets/common/tile_extent_controller.dart'; +import 'package:aves/widgets/navigation/nav_bar/nav_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:provider/provider.dart'; @@ -386,6 +387,7 @@ class _CollectionScrollViewState extends State<_CollectionScrollView> { child: _buildEmptyCollectionPlaceholder(collection), ) : const SectionedListSliver(), + const NavBarPaddingSliver(), const BottomPaddingSliver(), ], ); diff --git a/lib/widgets/filter_grids/common/filter_grid_page.dart b/lib/widgets/filter_grids/common/filter_grid_page.dart index 12f72c669..4bd83cd7a 100644 --- a/lib/widgets/filter_grids/common/filter_grid_page.dart +++ b/lib/widgets/filter_grids/common/filter_grid_page.dart @@ -547,6 +547,7 @@ class _FilterScrollView extends StatelessWidget { ) : SectionedListSliver>(); }), + const NavBarPaddingSliver(), const BottomPaddingSliver(), ], ); diff --git a/lib/widgets/navigation/nav_bar/nav_bar.dart b/lib/widgets/navigation/nav_bar/nav_bar.dart index d6ff8a2e7..5bda60b48 100644 --- a/lib/widgets/navigation/nav_bar/nav_bar.dart +++ b/lib/widgets/navigation/nav_bar/nav_bar.dart @@ -22,6 +22,10 @@ class AppBottomNavBar extends StatelessWidget { this.currentCollection, }) : super(key: key); + static const padding = EdgeInsets.all(8); + + static double get height => kBottomNavigationBarHeight + padding.vertical; + @override Widget build(BuildContext context) { const borderRadius = BorderRadius.all(Radius.circular(8)); @@ -37,7 +41,7 @@ class AppBottomNavBar extends StatelessWidget { ]; Widget child = Padding( - padding: const EdgeInsets.all(8), + padding: padding, child: BlurredRRect( enabled: blurred, borderRadius: borderRadius, @@ -115,3 +119,19 @@ class AppBottomNavBar extends StatelessWidget { ); } } + +class NavBarPaddingSliver extends StatelessWidget { + const NavBarPaddingSliver({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return SliverToBoxAdapter( + child: Selector( + selector: (context, s) => s.showBottomNavigationBar, + builder: (context, showBottomNavigationBar, child) { + return SizedBox(height: showBottomNavigationBar ? AppBottomNavBar.height : 0); + }, + ), + ); + } +} diff --git a/untranslated.json b/untranslated.json index 1d7309b9a..b8b2f1fab 100644 --- a/untranslated.json +++ b/untranslated.json @@ -6,6 +6,11 @@ "settingsThumbnailShowTagIcon" ], + "es": [ + "settingsShowBottomNavigationBar", + "settingsThumbnailShowTagIcon" + ], + "fr": [ "settingsSearchFieldLabel", "settingsSearchEmpty", @@ -20,6 +25,11 @@ "settingsThumbnailShowTagIcon" ], + "it": [ + "settingsShowBottomNavigationBar", + "settingsThumbnailShowTagIcon" + ], + "ja": [ "entryActionShowGeoTiffOnMap", "entryActionConvertMotionPhotoToStillImage",