Merge remote-tracking branch 'origin/main' into flutter-upgrade

mobile/apps/photos/lib/ui/collections/album/row_item.dart

@@ -27,7 +27,7 @@ class AlbumRowItemWidget extends StatelessWidget {
   final SelectedAlbums? selectedAlbums;
   static const _borderWidth = 1.0;
   static const _cornerRadius = 12.0;
-  static const _cornerSmoothing = 1.0;
+  static const _cornerSmoothing = 0.6;
 
   const AlbumRowItemWidget(
     this.c,

mobile/apps/photos/lib/ui/collections/device/device_folder_item.dart

@@ -13,7 +13,7 @@ class DeviceFolderItem extends StatelessWidget {
   final double sideOfThumbnail;
 
   static const _cornerRadius = 12.0;
-  static const _cornerSmoothing = 1.0;
+  static const _cornerSmoothing = 0.6;
   static const _borderWidth = 1.0;
 
   const DeviceFolderItem(

mobile/apps/photos/lib/ui/collections/flex_grid_view.dart

@@ -4,6 +4,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import "package:flutter/services.dart";
 import "package:logging/logging.dart";
+import "package:photos/core/configuration.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/clear_album_selections_event.dart";
 import "package:photos/generated/l10n.dart";
@@ -98,10 +99,16 @@ class _CollectionsFlexiGridViewWidgetState
 
   Future<void> _navigateToCollectionPage(Collection c) async {
     final thumbnail = await CollectionsService.instance.getCover(c);
+    final bool isOwner = c.isOwner(Configuration.instance.getUserID()!);
+    final String tagPrefix = (isOwner ? "collection" : "shared_collection") +
+        widget.tag +
+        "_" +
+        c.id.toString();
     // ignore: unawaited_futures
     routeToPage(
       context,
       CollectionPage(
+        tagPrefix: tagPrefix,
         CollectionWithThumbnail(c, thumbnail),
       ),
     );