From 552db3845803305ce6209d08d5cc10bca4616ec8 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Mon, 14 Aug 2023 17:58:02 +0200 Subject: [PATCH] change % in top bar --- .../lib/components/comment_component.dart | 12 ++++------ .../components/editable_post_component.dart | 8 +++---- .../lib/components/music_list_component.dart | 13 ++++------- .../lib/components/post_component.dart | 23 +++++++------------ .../components/profil_picture_component.dart | 13 ++++------- .../lib/components/profile_component.dart | 13 ++++------- .../lib/components/top_nav_bar_component.dart | 13 ++++------- .../lib/screens/detail_post_screen.dart | 12 ++++------ 8 files changed, 40 insertions(+), 67 deletions(-) diff --git a/Sources/justMUSIC/lib/components/comment_component.dart b/Sources/justMUSIC/lib/components/comment_component.dart index c129839..36d9c95 100644 --- a/Sources/justMUSIC/lib/components/comment_component.dart +++ b/Sources/justMUSIC/lib/components/comment_component.dart @@ -1,4 +1,3 @@ -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -31,13 +30,10 @@ class CommentComponent extends StatelessWidget { height: 40, width: 40, // Image radius - child: CachedNetworkImage( - imageUrl: comment.user.pp, - fadeInDuration: const Duration(milliseconds: 200), - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + child: FadeInImage.assetNetwork( + image: comment.user.pp, + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), ), ), diff --git a/Sources/justMUSIC/lib/components/editable_post_component.dart b/Sources/justMUSIC/lib/components/editable_post_component.dart index 5246e54..635ebf5 100644 --- a/Sources/justMUSIC/lib/components/editable_post_component.dart +++ b/Sources/justMUSIC/lib/components/editable_post_component.dart @@ -1,7 +1,6 @@ import 'dart:io'; import 'package:animated_appear/animated_appear.dart'; import 'package:auto_size_text/auto_size_text.dart'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/Material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; @@ -151,10 +150,11 @@ class _EditablePostComponentState extends State with Tick ), ), ) - : CachedNetworkImage( - imageUrl: widget.music!.cover!, + : FadeInImage.assetNetwork( + image: widget.music!.cover!, + fit: BoxFit.cover, fadeInDuration: const Duration(milliseconds: 100), - errorWidget: (context, url, error) => Icon(Icons.error), + placeholder: "assets/images/loadingPlaceholder.gif", ), ), ), diff --git a/Sources/justMUSIC/lib/components/music_list_component.dart b/Sources/justMUSIC/lib/components/music_list_component.dart index 393c938..e4b6b2d 100644 --- a/Sources/justMUSIC/lib/components/music_list_component.dart +++ b/Sources/justMUSIC/lib/components/music_list_component.dart @@ -1,4 +1,3 @@ -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/Material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:justmusic/components/play_button_component.dart'; @@ -33,13 +32,11 @@ class MusicListComponent extends StatelessWidget { height: 60, width: 60, // Image radius - child: CachedNetworkImage( - imageUrl: music.cover!, - fadeInDuration: const Duration(milliseconds: 200), - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + child: FadeInImage.assetNetwork( + image: music.cover!, + fit: BoxFit.cover, + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), ) : Container( diff --git a/Sources/justMUSIC/lib/components/post_component.dart b/Sources/justMUSIC/lib/components/post_component.dart index 5aa63e2..e53d326 100644 --- a/Sources/justMUSIC/lib/components/post_component.dart +++ b/Sources/justMUSIC/lib/components/post_component.dart @@ -1,5 +1,4 @@ import 'package:auto_size_text/auto_size_text.dart'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -130,13 +129,10 @@ class _PostComponentState extends State with TickerProviderStateM children: [ SizedBox( width: double.infinity, - child: CachedNetworkImage( - imageUrl: widget.post.music.cover!, - fadeInDuration: const Duration(milliseconds: 200), - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + child: FadeInImage.assetNetwork( + image: widget.post.music.cover!, + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), ), Image( @@ -177,14 +173,11 @@ class _PostComponentState extends State with TickerProviderStateM child: ClipRRect( borderRadius: BorderRadius.circular(13), // implement image - child: CachedNetworkImage( - imageUrl: widget.post.selfie!, + child: FadeInImage.assetNetwork( + image: widget.post.selfie!, fit: BoxFit.cover, - fadeInDuration: const Duration(milliseconds: 200), - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), ), ), diff --git a/Sources/justMUSIC/lib/components/profil_picture_component.dart b/Sources/justMUSIC/lib/components/profil_picture_component.dart index fbdc84d..48b734a 100644 --- a/Sources/justMUSIC/lib/components/profil_picture_component.dart +++ b/Sources/justMUSIC/lib/components/profil_picture_component.dart @@ -1,4 +1,3 @@ -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/Material.dart'; import '../config/routes.dart'; import '../model/User.dart'; @@ -23,13 +22,11 @@ class ProfilPictureComponent extends StatelessWidget { height: 40, width: 40, // Image radius - child: CachedNetworkImage( - imageUrl: user.pp, - fadeInDuration: const Duration(milliseconds: 300), - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + child: FadeInImage.assetNetwork( + image: user.pp, + fit: BoxFit.cover, + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), ), ), diff --git a/Sources/justMUSIC/lib/components/profile_component.dart b/Sources/justMUSIC/lib/components/profile_component.dart index 86b9f9a..cf1b27e 100644 --- a/Sources/justMUSIC/lib/components/profile_component.dart +++ b/Sources/justMUSIC/lib/components/profile_component.dart @@ -1,5 +1,4 @@ import 'package:auto_size_text/auto_size_text.dart'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -23,13 +22,11 @@ class ProfileComponent extends StatelessWidget { child: SizedBox( width: 100.w, height: 100.w, - child: CachedNetworkImage( - imageUrl: user.pp, - fadeInDuration: const Duration(milliseconds: 300), - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + child: FadeInImage.assetNetwork( + image: user.pp, + fit: BoxFit.cover, + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), )), ), diff --git a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart index d47357a..84a5b28 100644 --- a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart +++ b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart @@ -1,6 +1,5 @@ import 'package:another_flushbar/flushbar.dart'; import 'package:auto_size_text/auto_size_text.dart'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_countdown_timer/flutter_countdown_timer.dart'; @@ -266,13 +265,11 @@ class _TopNavBarComponentState extends State with TickerProv child: SizedBox( width: 30, // Image radius - child: CachedNetworkImage( - imageUrl: MyApp.userViewModel.userCurrent.pp, - fadeInDuration: const Duration(milliseconds: 300), - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + child: FadeInImage.assetNetwork( + image: MyApp.userViewModel.userCurrent.pp, + fit: BoxFit.cover, + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), ), ), diff --git a/Sources/justMUSIC/lib/screens/detail_post_screen.dart b/Sources/justMUSIC/lib/screens/detail_post_screen.dart index 677a7de..8cd6698 100644 --- a/Sources/justMUSIC/lib/screens/detail_post_screen.dart +++ b/Sources/justMUSIC/lib/screens/detail_post_screen.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/Material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; @@ -90,14 +89,11 @@ class _DetailPostScreenState extends State { child: Container( height: 400, width: double.infinity, - child: CachedNetworkImage( - imageUrl: choice ? widget.post.selfie! : widget.post.music.cover!, - fadeInDuration: const Duration(milliseconds: 300), + child: FadeInImage.assetNetwork( fit: BoxFit.cover, - placeholder: (context, url) => Image( - image: AssetImage("assets/images/loadingPlaceholder.gif"), - ), - errorWidget: (context, url, error) => Icon(Icons.error), + image: choice ? widget.post.selfie! : widget.post.music.cover!, + fadeInDuration: const Duration(milliseconds: 100), + placeholder: "assets/images/loadingPlaceholder.gif", ), ), ),