Фиксы круглых аватарок на главном экране и экране профиля.

Zensonaton · Sep 30, 2024 · 52cd7cf · 52cd7cf
1 parent e509f22
commit 52cd7cf
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 27 deletions.
diff --git a/lib/routes/home/music.dart b/lib/routes/home/music.dart
@@ -378,8 +378,7 @@ class AudioPlaylistWidget extends HookConsumerWidget {
                               memCacheWidth:
                                   (200 * MediaQuery.devicePixelRatioOf(context))
                                       .round(),
-                              placeholder:
-                                  const FallbackAudioPlaylistAvatar(),
+                              placeholder: const FallbackAudioPlaylistAvatar(),
                               cacheManager: CachedNetworkImagesManager.instance,
                             )
                           : const FallbackAudioPlaylistAvatar(),
@@ -862,27 +861,33 @@ class HomeMusicPage extends HookConsumerWidget {
                                 children: [
                                   // Аватарка пользователя.
                                   if (user.photoMaxUrl != null) ...[
-                                    IsolatedCachedImage(
-                                      imageUrl: user.photoMaxUrl!,
-                                      cacheKey: "${user.id}400",
-                                      imageBuilder: (
-                                        BuildContext context,
-                                        ImageProvider imageProvider,
-                                      ) {
-                                        return Container(
-                                          width: 40,
-                                          height: 40,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            image: DecorationImage(
-                                              image: imageProvider,
-                                              fit: BoxFit.cover,
+                                    SizedBox(
+                                      width: 40,
+                                      height: 40,
+                                      child: IsolatedCachedImage(
+                                        imageUrl: user.photoMaxUrl!,
+                                        cacheKey: "${user.id}400",
+                                        width: 40,
+                                        height: 40,
+                                        imageBuilder: (
+                                          BuildContext context,
+                                          ImageProvider imageProvider,
+                                        ) {
+                                          return Container(
+                                            width: 40,
+                                            height: 40,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              image: DecorationImage(
+                                                image: imageProvider,
+                                                fit: BoxFit.cover,
+                                              ),
                                             ),
-                                          ),
-                                        );
-                                      },
-                                      cacheManager:
-                                          CachedNetworkImagesManager.instance,
+                                          );
+                                        },
+                                        cacheManager:
+                                            CachedNetworkImagesManager.instance,
+                                      ),
                                     ),
                                     const Gap(18),
                                   ],

diff --git a/lib/widgets/isolated_cached_network_image.dart b/lib/widgets/isolated_cached_network_image.dart
@@ -180,13 +180,14 @@ class IsolatedCachedImage extends StatelessWidget {
       matchTextDirection: matchTextDirection,
       color: color,
       filterQuality: filterQuality,
-
-      // TODO: Вероятнее всего, так делать не стоит.
-      frameBuilder: placeholder != null
+      frameBuilder: placeholder != null || imageBuilder != null
           ? (context, child, frame, loaded) {
-              if (loaded || frame != null) return child;
+              // TODO: Вероятнее всего, так делать не стоит.
+              if (loaded || frame != null) {
+                return imageBuilder?.call(context, provider) ?? child;
+              }
 
-              return placeholder!;
+              return placeholder ?? child;
             }
           : null,
     );