Browse Source

replace nothingToSeeHere with EmptyState widget

Neeraj Gupta 3 years ago
parent
commit
f2102fac1a

+ 6 - 14
lib/ui/collections_gallery_widget.dart

@@ -18,12 +18,12 @@ import 'package:photos/models/collection_items.dart';
 import 'package:photos/models/device_folder.dart';
 import 'package:photos/models/device_folder.dart';
 import 'package:photos/models/magic_metadata.dart';
 import 'package:photos/models/magic_metadata.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/collections_service.dart';
-import 'package:photos/ui/common/common_elements.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
 import 'package:photos/ui/viewer/gallery/archive_page.dart';
 import 'package:photos/ui/viewer/gallery/archive_page.dart';
 import 'package:photos/ui/viewer/gallery/collection_page.dart';
 import 'package:photos/ui/viewer/gallery/collection_page.dart';
 import 'package:photos/ui/viewer/gallery/device_folder_page.dart';
 import 'package:photos/ui/viewer/gallery/device_folder_page.dart';
+import 'package:photos/ui/viewer/gallery/empte_state.dart';
 import 'package:photos/ui/viewer/gallery/trash_page.dart';
 import 'package:photos/ui/viewer/gallery/trash_page.dart';
 import 'package:photos/utils/local_settings.dart';
 import 'package:photos/utils/local_settings.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:photos/utils/navigation_util.dart';
@@ -153,11 +153,9 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
             SectionTitle("On device"),
             SectionTitle("On device"),
             const SizedBox(height: 12),
             const SizedBox(height: 12),
             items.folders.isEmpty
             items.folders.isEmpty
-                ? Padding(
-                    padding: const EdgeInsets.all(22),
-                    child: nothingToSeeHere(
-                      textColor: Theme.of(context).colorScheme.defaultTextColor,
-                    ),
+                ? const Padding(
+                    padding: EdgeInsets.all(22),
+                    child: EmptyState(),
                   )
                   )
                 : Padding(
                 : Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 8),
                     padding: const EdgeInsets.symmetric(horizontal: 8),
@@ -166,11 +164,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
                       child: Align(
                       child: Align(
                         alignment: Alignment.centerLeft,
                         alignment: Alignment.centerLeft,
                         child: items.folders.isEmpty
                         child: items.folders.isEmpty
-                            ? nothingToSeeHere(
-                                textColor: Theme.of(context)
-                                    .colorScheme
-                                    .defaultTextColor,
-                              )
+                            ? const EmptyState()
                             : ListView.builder(
                             : ListView.builder(
                                 shrinkWrap: true,
                                 shrinkWrap: true,
                                 scrollDirection: Axis.horizontal,
                                 scrollDirection: Axis.horizontal,
@@ -221,9 +215,7 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
                       ), //24 is height of album title
                       ), //24 is height of album title
                     ),
                     ),
                   )
                   )
-                : nothingToSeeHere(
-                    textColor: Theme.of(context).colorScheme.defaultTextColor,
-                  ),
+                : const EmptyState(),
             const SizedBox(height: 10),
             const SizedBox(height: 10),
             const Divider(),
             const Divider(),
             const SizedBox(height: 16),
             const SizedBox(height: 16),

+ 2 - 4
lib/ui/tools/deduplicate_page.dart

@@ -7,9 +7,9 @@ import 'package:photos/events/user_details_changed_event.dart';
 import 'package:photos/models/duplicate_files.dart';
 import 'package:photos/models/duplicate_files.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/services/deduplication_service.dart';
 import 'package:photos/services/deduplication_service.dart';
-import 'package:photos/ui/common/common_elements.dart';
 import 'package:photos/ui/viewer/file/detail_page.dart';
 import 'package:photos/ui/viewer/file/detail_page.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
+import 'package:photos/ui/viewer/gallery/empte_state.dart';
 import 'package:photos/utils/data_util.dart';
 import 'package:photos/utils/data_util.dart';
 import 'package:photos/utils/delete_file_util.dart';
 import 'package:photos/utils/delete_file_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:photos/utils/navigation_util.dart';
@@ -125,9 +125,7 @@ class _DeduplicatePageState extends State<DeduplicatePage> {
                 } else {
                 } else {
                   return Padding(
                   return Padding(
                     padding: EdgeInsets.only(top: 32),
                     padding: EdgeInsets.only(top: 32),
-                    child: nothingToSeeHere(
-                      textColor: Theme.of(context).colorScheme.defaultTextColor,
-                    ),
+                    child: const EmptyState(),
                   );
                   );
                 }
                 }
               }
               }

+ 1 - 1
lib/ui/viewer/gallery/archive_page.dart

@@ -62,7 +62,7 @@ class ArchivePage extends StatelessWidget {
     );
     );
     return Scaffold(
     return Scaffold(
       appBar: PreferredSize(
       appBar: PreferredSize(
-        preferredSize: Size.fromHeight(50.0),
+        preferredSize: const Size.fromHeight(50.0),
         child: GalleryAppBarWidget(
         child: GalleryAppBarWidget(
           appBarType,
           appBarType,
           "Hidden",
           "Hidden",

+ 27 - 0
lib/ui/viewer/gallery/empte_state.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:photos/ente_theme_data.dart';
+
+class EmptyState extends StatelessWidget {
+  final String text;
+
+  const EmptyState({Key key, this.text = "Nothing to see here! 👀"})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Text(
+          text,
+          style: TextStyle(
+            color: Theme.of(context)
+                .colorScheme
+                .defaultTextColor
+                .withOpacity(0.35),
+          ),
+        ),
+      ),
+    );
+  }
+}

+ 3 - 5
lib/ui/viewer/gallery/gallery.dart

@@ -11,10 +11,10 @@ import 'package:photos/events/files_updated_event.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file_load_result.dart';
 import 'package:photos/models/file_load_result.dart';
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/models/selected_files.dart';
-import 'package:photos/ui/common/common_elements.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/huge_listview/huge_listview.dart';
 import 'package:photos/ui/huge_listview/huge_listview.dart';
 import 'package:photos/ui/huge_listview/lazy_loading_gallery.dart';
 import 'package:photos/ui/huge_listview/lazy_loading_gallery.dart';
+import 'package:photos/ui/viewer/gallery/empte_state.dart';
 import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/date_time_util.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 
@@ -185,10 +185,8 @@ class _GalleryState extends State<Gallery> {
           children.add(widget.header);
           children.add(widget.header);
         }
         }
         children.add(
         children.add(
-          Expanded(
-            child: nothingToSeeHere(
-              textColor: Theme.of(context).colorScheme.defaultTextColor,
-            ),
+          const Expanded(
+            child: EmptyState(),
           ),
           ),
         );
         );
         if (widget.footer != null) {
         if (widget.footer != null) {