diff --git a/Sources/justMUSIC/lib/components/comment_component.dart b/Sources/justMUSIC/lib/components/comment_component.dart index 36d9c95..a2c8965 100644 --- a/Sources/justMUSIC/lib/components/comment_component.dart +++ b/Sources/justMUSIC/lib/components/comment_component.dart @@ -32,6 +32,7 @@ class CommentComponent extends StatelessWidget { // Image radius child: FadeInImage.assetNetwork( image: comment.user.pp, + fit: BoxFit.cover, 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 01f8b3f..48b734a 100644 --- a/Sources/justMUSIC/lib/components/profil_picture_component.dart +++ b/Sources/justMUSIC/lib/components/profil_picture_component.dart @@ -24,7 +24,7 @@ class ProfilPictureComponent extends StatelessWidget { // Image radius child: FadeInImage.assetNetwork( image: user.pp, - fit: BoxFit.fill, + fit: BoxFit.cover, fadeInDuration: const Duration(milliseconds: 100), placeholder: "assets/images/loadingPlaceholder.gif", ), diff --git a/Sources/justMUSIC/lib/screens/change_password_screen.dart b/Sources/justMUSIC/lib/screens/change_password_screen.dart index 0965a74..d9d8beb 100644 --- a/Sources/justMUSIC/lib/screens/change_password_screen.dart +++ b/Sources/justMUSIC/lib/screens/change_password_screen.dart @@ -83,72 +83,74 @@ class _ChangePasswordScreenState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () { - FocusScopeNode currentFocus = FocusScope.of(context); - if (!currentFocus.hasPrimaryFocus) { - currentFocus.unfocus(); - resetFullScreen(); - } - }, - child: Scaffold( - appBar: PreferredSize( - preferredSize: Size(double.infinity, 58), - child: Container( - height: double.infinity, - color: bgAppBar, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: defaultPadding), - child: Stack( - alignment: Alignment.centerLeft, - children: [ - GestureDetector( - behavior: HitTestBehavior.translucent, - onTap: () { - Navigator.pop(context, true); - }, - child: Container( - padding: EdgeInsets.symmetric(horizontal: 10), - height: 30, - width: 30, - child: Image( - image: AssetImage("assets/images/return_icon.png"), - height: 8, - ), - )), - Align( - child: Text( - "Mettre le mot de passe à jour", - style: - GoogleFonts.plusJakartaSans(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold), - ), - ) - ], - ), + onTap: () { + FocusScopeNode currentFocus = FocusScope.of(context); + if (!currentFocus.hasPrimaryFocus) { + currentFocus.unfocus(); + resetFullScreen(); + } + }, + child: Scaffold( + appBar: PreferredSize( + preferredSize: Size(double.infinity, 58), + child: Container( + height: double.infinity, + color: bgAppBar, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: defaultPadding), + child: Stack( + alignment: Alignment.centerLeft, + children: [ + GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () { + Navigator.pop(context, true); + }, + child: Container( + padding: EdgeInsets.symmetric(horizontal: 10), + height: 30, + width: 30, + child: Image( + image: AssetImage("assets/images/return_icon.png"), + height: 8, + ), + )), + Align( + child: Text( + "Mettre le mot de passe à jour", + style: + GoogleFonts.plusJakartaSans(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold), + ), + ) + ], ), ), ), - body: Container( - width: double.infinity, - height: double.infinity, - color: bgColor, - child: SingleChildScrollView( - physics: const BouncingScrollPhysics(decelerationRate: ScrollDecelerationRate.fast), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: settingPadding), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only(top: 30, bottom: 40), - child: SizedBox( - width: double.infinity, - child: Form( - key: _formKey, - child: Stack( - alignment: Alignment.center, - children: [ - Column( + ), + body: Container( + width: double.infinity, + height: double.infinity, + color: bgColor, + child: SingleChildScrollView( + physics: const BouncingScrollPhysics(decelerationRate: ScrollDecelerationRate.fast), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: settingPadding), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(top: 30, bottom: 40), + child: SizedBox( + width: double.infinity, + child: Form( + key: _formKey, + child: Stack( + alignment: Alignment.center, + children: [ + Container( + constraints: BoxConstraints(maxWidth: 600), + child: Column( children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -274,34 +276,36 @@ class _ChangePasswordScreenState extends State { ], ), ], - ) - ], - ), + ), + ) + ], ), ), ), - GestureDetector( - onTap: handleChange, - child: Align( - child: Container( - height: 35, - width: 160, - decoration: - BoxDecoration(color: primaryColor, borderRadius: BorderRadius.all(Radius.circular(10))), - child: Center( - child: Text( - "Mettre à jour", - style: GoogleFonts.plusJakartaSans(color: Colors.white), - ), + ), + GestureDetector( + onTap: handleChange, + child: Align( + child: Container( + height: 35, + width: 160, + decoration: + BoxDecoration(color: primaryColor, borderRadius: BorderRadius.all(Radius.circular(10))), + child: Center( + child: Text( + "Mettre à jour", + style: GoogleFonts.plusJakartaSans(color: Colors.white), ), ), ), - ) - ], - ), + ), + ) + ], ), ), ), - )); + ), + ), + ); } }