move fab in container

fleetingnotes · Jun 18, 2023 · ba66ae8 · ba66ae8
1 parent dca3948
commit ba66ae8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/lib/screens/main/components/fn_bottom_app_bar.dart b/lib/screens/main/components/fn_bottom_app_bar.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -19,7 +21,7 @@ class FNBottomAppBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    const height = (kIsWeb) ? 80.0 : 100.0;
+    var height = (!kIsWeb && Platform.isIOS) ? 100.0 : 80.0;
     return AnimatedContainer(
       duration: const Duration(milliseconds: 200),
       height: isVisible ? height : 0,

diff --git a/lib/screens/main/components/note_fab.dart b/lib/screens/main/components/note_fab.dart
@@ -4,15 +4,18 @@ class NoteFAB extends StatelessWidget {
   const NoteFAB({
     super.key,
     required this.onPressed,
+    required this.isElevated,
   });
 
   final VoidCallback onPressed;
+  final bool isElevated;
 
   @override
   Widget build(BuildContext context) {
     return FloatingActionButton(
       child: const Icon(Icons.add),
       onPressed: onPressed,
+      elevation: (isElevated) ? null : 0,
     );
   }
 }
diff --git a/lib/screens/main/main_screen.dart b/lib/screens/main/main_screen.dart
@@ -31,7 +31,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
   final imagePicker = ImagePicker();
   bool bottomAppBarVisible = true;
   FloatingActionButtonLocation get _fabLocation => bottomAppBarVisible
-      ? FloatingActionButtonLocation.endDocked
+      ? FloatingActionButtonLocation.endContained
       : FloatingActionButtonLocation.endFloat;
   FocusNode searchFocusNode = FocusNode();
   Widget? desktopSideWidget;
@@ -189,7 +189,7 @@ class _MainScreenState extends ConsumerState<MainScreen> {
               closeDrawer: db.closeDrawer,
             ),
             bottomNavigationBar: FNBottomAppBar(
-              isElevated: true,
+              isElevated: !bottomAppBarVisible,
               isVisible: isMobile && bottomAppBarVisible,
               onRecord: recordNote,
               onAddChecklist: () {
@@ -198,8 +198,9 @@ class _MainScreenState extends ConsumerState<MainScreen> {
               onImagePicker: onPickImageOption,
             ),
             floatingActionButtonLocation: _fabLocation,
-            floatingActionButton:
-                (isMobile) ? NoteFAB(onPressed: addNote) : null,
+            floatingActionButton: (isMobile)
+                ? NoteFAB(onPressed: addNote, isElevated: !bottomAppBarVisible)
+                : null,
             body: SafeArea(
               child: Responsive(
                 mobile: SearchScreen(