Merge branch 'master' into feature-improve-a11y

lib/ui/common/modals/fullscreen_url_img_viewer.dart

@@ -6,6 +6,8 @@ class FullscreenUrlImgViewer extends StatefulWidget {
   final List<String> urls;
   final int index;
 
+  static const double imageScale = 2.5;
+
   @override
   State<FullscreenUrlImgViewer> createState() => _FullscreenUrlImgViewerState();
 }
@@ -95,7 +97,7 @@ class _ViewerState extends State<_Viewer> with SingleTickerProviderStateMixin {
               widget.url,
             ),
             fit: BoxFit.contain,
-            scale: 2.5,
+            scale: FullscreenUrlImgViewer.imageScale,
             progress: true,
           ),
         ),

lib/ui/screens/artifact/artifact_details/widgets/_header.dart

@@ -27,12 +27,14 @@ class _Header extends StatelessWidget {
             child: SafeArea(
               bottom: false,
               minimum: EdgeInsets.symmetric(vertical: $styles.insets.sm),
-              child: AppImage(
+              child: Hero(
-                image: NetworkImage(data.image),
+                tag: data.image,
-                fit: BoxFit.cover,
+                child: AppImage(
-                alignment: Alignment.topCenter,
+                  image: NetworkImage(data.image),
-                distractor: true,
+                  fit: BoxFit.contain,
-                scale: 1.0,
+                  distractor: true,
+                  scale: FullscreenUrlImgViewer.imageScale, // so the image isn't reloaded
+                ),
               ),
             ),
           ),
@@ -42,6 +44,6 @@ class _Header extends StatelessWidget {
   }
 
   void _handleImagePressed(BuildContext context) {
-    Navigator.push(context, CupertinoPageRoute(builder: (_) => FullscreenUrlImgViewer(urls: [data.image])));
+    appLogic.showFullscreenDialogRoute(context, FullscreenUrlImgViewer(urls: [data.image]));
   }
 }

lib/ui/screens/collection/widgets/_collection_tile.dart

@@ -28,9 +28,14 @@ class _CollectionTile extends StatelessWidget {
       color: $styles.colors.black,
       child: Center(
         child: FractionallySizedBox(
-          widthFactor: 0.6,
+          widthFactor: 0.66,
-          heightFactor: 0.6,
+          heightFactor: 0.66,
-          child: Image(image: collectible.icon, color: $styles.colors.greyStrong),
+          child: Image(
+            image: collectible.icon,
+            color: $styles.colors.black,
+            colorBlendMode: BlendMode.color,
+            opacity: AlwaysStoppedAnimation(0.2),
+          ),
         ),
       ),
     );