From d355d4c1f05539527bd46f24c6b71d14a52f23ad Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 6 Nov 2024 21:39:14 +0530
Subject: [PATCH] [mob][photos] Fix null check operator used on null value
 exception right after adding name to a person

---
 mobile/lib/ui/viewer/people/people_page.dart | 58 ++++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/mobile/lib/ui/viewer/people/people_page.dart b/mobile/lib/ui/viewer/people/people_page.dart
index adad9848f4..265a8cda18 100644
--- a/mobile/lib/ui/viewer/people/people_page.dart
+++ b/mobile/lib/ui/viewer/people/people_page.dart
@@ -126,7 +126,8 @@ class _PeoplePageState extends State<PeoplePage> {
             : null,
         child: Scaffold(
           appBar: PreferredSize(
-            preferredSize: const Size.fromHeight(90.0),
+            preferredSize:
+                Size.fromHeight(widget.searchResult != null ? 90.0 : 50.0),
             child: PeopleAppBar(
               GalleryType.peopleTag,
               widget.person.data.name,
@@ -137,6 +138,9 @@ class _PeoplePageState extends State<PeoplePage> {
           body: FutureBuilder<List<EnteFile>>(
             future: filesFuture,
             builder: (context, snapshot) {
+              final inheritedSearchFilterData = InheritedSearchFilterData.of(
+                context,
+              );
               if (snapshot.hasData) {
                 final personFiles = snapshot.data as List<EnteFile>;
                 return Column(
@@ -147,29 +151,35 @@ class _PeoplePageState extends State<PeoplePage> {
                         child: Stack(
                           alignment: Alignment.bottomCenter,
                           children: [
-                            ValueListenableBuilder(
-                              valueListenable:
-                                  InheritedSearchFilterData.of(context)
-                                      .searchFilterDataProvider!
-                                      .isSearchingNotifier,
-                              builder: (
-                                context,
-                                value,
-                                _,
-                              ) {
-                                return value
-                                    ? HierarchicalSearchGallery(
-                                        tagPrefix: widget.tagPrefix,
-                                        selectedFiles: _selectedFiles,
-                                      )
-                                    : _Gallery(
-                                        tagPrefix: widget.tagPrefix,
-                                        selectedFiles: _selectedFiles,
-                                        personFiles: personFiles,
-                                        loadPersonFiles: loadPersonFiles,
-                                      );
-                              },
-                            ),
+                            inheritedSearchFilterData.isHierarchicalSearchable
+                                ? ValueListenableBuilder(
+                                    valueListenable: inheritedSearchFilterData
+                                        .searchFilterDataProvider!
+                                        .isSearchingNotifier,
+                                    builder: (
+                                      context,
+                                      value,
+                                      _,
+                                    ) {
+                                      return value
+                                          ? HierarchicalSearchGallery(
+                                              tagPrefix: widget.tagPrefix,
+                                              selectedFiles: _selectedFiles,
+                                            )
+                                          : _Gallery(
+                                              tagPrefix: widget.tagPrefix,
+                                              selectedFiles: _selectedFiles,
+                                              personFiles: personFiles,
+                                              loadPersonFiles: loadPersonFiles,
+                                            );
+                                    },
+                                  )
+                                : _Gallery(
+                                    tagPrefix: widget.tagPrefix,
+                                    selectedFiles: _selectedFiles,
+                                    personFiles: personFiles,
+                                    loadPersonFiles: loadPersonFiles,
+                                  ),
                             FileSelectionOverlayBar(
                               PeoplePage.overlayType,
                               _selectedFiles,