From db1eb19ef0af31373a1e7f76d7c8aec7876a53bd Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Tue, 3 Sep 2024 17:16:11 +0530
Subject: [PATCH] [mob][photos] Floating button background color fixed

---
 .../lib/ui/tabs/shared_collections_tab.dart   |  2 +
 .../collect_photos_bottom_buttons.dart        | 92 +++++++++----------
 .../ui/viewer/gallery/collection_page.dart    |  3 +-
 3 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/mobile/lib/ui/tabs/shared_collections_tab.dart b/mobile/lib/ui/tabs/shared_collections_tab.dart
index 38441ae73a..d47977b9c4 100644
--- a/mobile/lib/ui/tabs/shared_collections_tab.dart
+++ b/mobile/lib/ui/tabs/shared_collections_tab.dart
@@ -10,6 +10,7 @@ import 'package:photos/events/user_logged_out_event.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/collection/collection_items.dart';
 import 'package:photos/services/collections_service.dart';
+import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/collections/album/row_item.dart";
 import "package:photos/ui/collections/collection_list_page.dart";
 import 'package:photos/ui/common/loading_widget.dart';
@@ -319,6 +320,7 @@ class _SharedCollectionsTabState extends State<SharedCollectionsTab>
                     ],
                   )
                 : const SizedBox.shrink(),
+            Divider(color: getEnteColorScheme(context).strokeFaint),
             const CollectPhotosCardWidget(),
             const SizedBox(height: 32),
           ],
diff --git a/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart b/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
index 481cd365e1..d2bdb6643a 100644
--- a/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
+++ b/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
@@ -91,56 +91,52 @@ class _EmptyAlbumStateNewState extends State<CollectPhotosBottomButtons> {
           crossFadeState: !_hasSelectedFilesNotifier.value
               ? CrossFadeState.showFirst
               : CrossFadeState.showSecond,
-          firstChild: Stack(
-            children: [
-              Align(
-                alignment: Alignment.bottomCenter,
-                child: Padding(
-                  padding: const EdgeInsets.fromLTRB(24, 0, 24, 12),
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Container(
-                        decoration: BoxDecoration(
-                          color:
-                              getEnteColorScheme(context).backgroundElevated2,
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(4)),
-                        ),
-                        child: ButtonWidget(
-                          buttonType: ButtonType.secondary,
-                          buttonSize: ButtonSize.large,
-                          labelText: S.of(context).addPhotos,
-                          icon: Icons.add_photo_alternate_outlined,
-                          shouldSurfaceExecutionStates: false,
-                          onTap: () async {
-                            try {
-                              await showAddPhotosSheet(context, widget.c);
-                            } catch (e) {
-                              await showGenericErrorDialog(
-                                context: context,
-                                error: e,
-                              );
-                            }
-                          },
-                        ),
-                      ),
-                      const SizedBox(height: 10),
-                      ButtonWidget(
-                        buttonType: ButtonType.primary,
-                        buttonSize: ButtonSize.large,
-                        labelText: S.of(context).share,
-                        icon: Icons.adaptive.share,
-                        shouldSurfaceExecutionStates: false,
-                        onTap: () async {
-                          await _generateAlbumUrl();
-                        },
-                      ),
-                    ],
+          firstChild: Container(
+            decoration: BoxDecoration(
+              color: getEnteColorScheme(context).backgroundElevated,
+            ),
+            child: Padding(
+              padding: const EdgeInsets.fromLTRB(24, 12, 24, 12),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Container(
+                    decoration: BoxDecoration(
+                      color: getEnteColorScheme(context).backgroundElevated2,
+                      borderRadius: const BorderRadius.all(Radius.circular(4)),
+                    ),
+                    child: ButtonWidget(
+                      buttonType: ButtonType.secondary,
+                      buttonSize: ButtonSize.large,
+                      labelText: S.of(context).addPhotos,
+                      icon: Icons.add_photo_alternate_outlined,
+                      shouldSurfaceExecutionStates: false,
+                      onTap: () async {
+                        try {
+                          await showAddPhotosSheet(context, widget.c);
+                        } catch (e) {
+                          await showGenericErrorDialog(
+                            context: context,
+                            error: e,
+                          );
+                        }
+                      },
+                    ),
                   ),
-                ),
+                  const SizedBox(height: 8),
+                  ButtonWidget(
+                    buttonType: ButtonType.primary,
+                    buttonSize: ButtonSize.large,
+                    labelText: S.of(context).share,
+                    icon: Icons.adaptive.share,
+                    shouldSurfaceExecutionStates: false,
+                    onTap: () async {
+                      await _generateAlbumUrl();
+                    },
+                  ),
+                ],
               ),
-            ],
+            ),
           ),
           secondChild: const SizedBox.shrink(),
         );
diff --git a/mobile/lib/ui/viewer/gallery/collection_page.dart b/mobile/lib/ui/viewer/gallery/collection_page.dart
index 34fe367bac..5683c14b8a 100644
--- a/mobile/lib/ui/viewer/gallery/collection_page.dart
+++ b/mobile/lib/ui/viewer/gallery/collection_page.dart
@@ -109,13 +109,12 @@ class CollectionPage extends StatelessWidget {
           isFromCollectPhotos: isFromCollectPhotos,
         ),
       ),
-      floatingActionButton: isFromCollectPhotos
+      bottomNavigationBar: isFromCollectPhotos
           ? CollectPhotosBottomButtons(
               c.collection,
               selectedFiles: _selectedFiles,
             )
           : const SizedBox.shrink(),
-      floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
       body: SelectionState(
         selectedFiles: _selectedFiles,
         child: Stack(