chore(mobile): search page minor enhancements (#13403)

* chore(mobile): search page retouched * add placeholder photos * remove unused page * focus the search input when tapping on the search controller button * detail fixed * remove print statements * disable scrolling of empty content
immich-app · Oct 14, 2024 · f59b813 · f59b813
1 parent 1193adf
commit f59b813
Show file tree

Hide file tree

Showing 14 changed files with 821 additions and 847 deletions.
diff --git a/mobile/assets/polaroid-dark.png b/mobile/assets/polaroid-dark.png
diff --git a/mobile/assets/polaroid-light.png b/mobile/assets/polaroid-light.png
diff --git a/mobile/lib/models/search/search_filter.model.dart b/mobile/lib/models/search/search_filter.model.dart
@@ -266,8 +266,8 @@ class SearchFilter {
     AssetType? mediaType,
   }) {
     return SearchFilter(
-      context: context ?? this.context,
-      filename: filename ?? this.filename,
+      context: context,
+      filename: filename,
       people: people ?? this.people,
       location: location ?? this.location,
       camera: camera ?? this.camera,

diff --git a/mobile/lib/pages/common/tab_controller.page.dart b/mobile/lib/pages/common/tab_controller.page.dart
@@ -6,6 +6,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
 import 'package:immich_mobile/providers/multiselect.provider.dart';
+import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
@@ -44,21 +45,28 @@ class TabControllerPage extends HookConsumerWidget {
       );
     }
 
+    onNavigationSelected(TabsRouter router, int index) {
+      // On Photos page menu tapped
+      if (router.activeIndex == 0 && index == 0) {
+        scrollToTopNotifierProvider.scrollToTop();
+      }
+
+      // On Search page tapped
+      if (router.activeIndex == 1 && index == 1) {
+        ref.read(searchInputFocusProvider).requestFocus();
+      }
+
+      ref.read(hapticFeedbackProvider.notifier).selectionClick();
+      router.setActiveIndex(index);
+      ref.read(tabProvider.notifier).state = TabEnum.values[index];
+    }
+
     navigationRail(TabsRouter tabsRouter) {
       return NavigationRail(
         labelType: NavigationRailLabelType.all,
         selectedIndex: tabsRouter.activeIndex,
-        onDestinationSelected: (index) {
-          // Selected Photos while it is active
-          if (tabsRouter.activeIndex == 0 && index == 0) {
-            // Scroll to top
-            scrollToTopNotifierProvider.scrollToTop();
-          }
-
-          ref.read(hapticFeedbackProvider.notifier).selectionClick();
-          tabsRouter.setActiveIndex(index);
-          ref.read(tabProvider.notifier).state = TabEnum.values[index];
-        },
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
         selectedIconTheme: IconThemeData(
           color: context.primaryColor,
         ),
@@ -103,16 +111,8 @@ class TabControllerPage extends HookConsumerWidget {
     bottomNavigationBar(TabsRouter tabsRouter) {
       return NavigationBar(
         selectedIndex: tabsRouter.activeIndex,
-        onDestinationSelected: (index) {
-          if (tabsRouter.activeIndex == 0 && index == 0) {
-            // Scroll to top
-            scrollToTopNotifierProvider.scrollToTop();
-          }
-
-          ref.read(hapticFeedbackProvider.notifier).selectionClick();
-          tabsRouter.setActiveIndex(index);
-          ref.read(tabProvider.notifier).state = TabEnum.values[index];
-        },
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
         destinations: [
           NavigationDestination(
             label: 'tab_controller_nav_photos'.tr(),
@@ -171,7 +171,7 @@ class TabControllerPage extends HookConsumerWidget {
     return AutoTabsRouter(
       routes: [
         const PhotosRoute(),
-        SearchInputRoute(),
+        SearchRoute(),
         const AlbumsRoute(),
         const LibraryRoute(),
       ],

diff --git a/mobile/lib/pages/library/library.page.dart b/mobile/lib/pages/library/library.page.dart
@@ -108,6 +108,7 @@ class QuickAccessButtons extends ConsumerWidget {
           colors: [
             context.colorScheme.primary.withAlpha(10),
             context.colorScheme.primary.withAlpha(15),
+            context.colorScheme.primary.withAlpha(20),
           ],
           begin: Alignment.topCenter,
           end: Alignment.bottomCenter,

diff --git a/...ibrary/places/places_collection.part.dart → ...ibrary/places/places_collection.page.dart b/...ibrary/places/places_collection.part.dart → ...ibrary/places/places_collection.page.dart
@@ -81,7 +81,7 @@ class PlaceTile extends StatelessWidget {
 
     void navigateToPlace() {
       context.pushRoute(
-        SearchInputRoute(
+        SearchRoute(
           prefilter: SearchFilter(
             people: {},
             location: SearchLocationFilter(