Browse Source

Merge pull request #412 from ente-io/hide_others_stuff

Hide Add/Remove/Move options from incoming album
Neeraj Gupta 2 years ago
parent
commit
b5088daa1e

+ 24 - 23
lib/ui/viewer/file/file_info_dialog.dart

@@ -199,30 +199,31 @@ class _FileInfoWidgetState extends State<FileInfoWidget> {
           ? const DividerWithPadding(left: 70, right: 20)
           ? const DividerWithPadding(left: 70, right: 20)
           : const SizedBox.shrink(),
           : const SizedBox.shrink(),
       ListTile(
       ListTile(
-          leading: const Padding(
-            padding: EdgeInsets.only(left: 6),
-            child: Icon(Icons.folder_outlined),
+        leading: const Padding(
+          padding: EdgeInsets.only(left: 6),
+          child: Icon(Icons.folder_outlined),
+        ),
+        title: GestureDetector(
+          onTap: () {
+            if (file.collectionID != null) {
+              Navigator.pop(context); // info dialog
+              Collection c = CollectionsService.instance
+                  .getCollectionByID(file.collectionID);
+              routeToPage(
+                context,
+                CollectionPage(CollectionWithThumbnail(c, null)),
+              );
+            }
+          },
+          child: Text(
+            file.collectionID != null
+                ? CollectionsService.instance
+                    .getCollectionByID(file.collectionID)
+                    .name
+                : file.deviceFolder,
           ),
           ),
-          title: GestureDetector(
-            onTap: () {
-              if (file.collectionID != null) {
-                Navigator.pop(context); // info dialog
-                Collection c = CollectionsService.instance
-                    .getCollectionByID(file.collectionID);
-                routeToPage(
-                  context,
-                  CollectionPage(CollectionWithThumbnail(c, null)),
-                );
-              }
-            },
-            child: Text(
-              file.collectionID != null
-                  ? CollectionsService.instance
-                      .getCollectionByID(file.collectionID)
-                      .name
-                  : file.deviceFolder,
-            ),
-          )),
+        ),
+      ),
       const DividerWithPadding(left: 70, right: 20),
       const DividerWithPadding(left: 70, right: 20),
       (file.uploadedFileID != null && file.updationTime != null)
       (file.uploadedFileID != null && file.updationTime != null)
           ? ListTile(
           ? ListTile(

+ 1 - 3
lib/ui/viewer/gallery/collection_page.dart

@@ -14,14 +14,12 @@ class CollectionPage extends StatelessWidget {
   final CollectionWithThumbnail c;
   final CollectionWithThumbnail c;
   final String tagPrefix;
   final String tagPrefix;
   final GalleryType appBarType;
   final GalleryType appBarType;
-  final GalleryType overlayType;
   final _selectedFiles = SelectedFiles();
   final _selectedFiles = SelectedFiles();
 
 
   CollectionPage(
   CollectionPage(
     this.c, {
     this.c, {
     this.tagPrefix = "collection",
     this.tagPrefix = "collection",
     this.appBarType = GalleryType.ownedCollection,
     this.appBarType = GalleryType.ownedCollection,
-    this.overlayType = GalleryType.ownedCollection,
     Key key,
     Key key,
   }) : super(key: key);
   }) : super(key: key);
 
 
@@ -67,7 +65,7 @@ class CollectionPage extends StatelessWidget {
         children: [
         children: [
           gallery,
           gallery,
           GalleryOverlayWidget(
           GalleryOverlayWidget(
-            overlayType,
+            appBarType,
             _selectedFiles,
             _selectedFiles,
             collection: c.collection,
             collection: c.collection,
           ),
           ),