diff --git a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart index 420b2b8..c7e872d 100644 --- a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart +++ b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart @@ -84,6 +84,7 @@ class _TopNavBarComponentState extends State with TickerProv Flexible( flex: 1, child: GestureDetector( + behavior: HitTestBehavior.translucent, onTap: () { Navigator.of(context).push(routeAddFriend()); }, @@ -145,6 +146,7 @@ class _TopNavBarComponentState extends State with TickerProv ), ), GestureDetector( + behavior: HitTestBehavior.translucent, onTap: () { if (choice) { setState(() { diff --git a/Sources/justMUSIC/lib/screens/add_friend_screen.dart b/Sources/justMUSIC/lib/screens/add_friend_screen.dart index 1a1e193..99ed9c4 100644 --- a/Sources/justMUSIC/lib/screens/add_friend_screen.dart +++ b/Sources/justMUSIC/lib/screens/add_friend_screen.dart @@ -155,17 +155,22 @@ class _AddFriendScreenState extends State { ), ), GestureDetector( + behavior: HitTestBehavior.translucent, onTap: () { Navigator.pop(context); }, child: Transform( - alignment: Alignment.center, - transform: Matrix4.rotationY(3.14159265), - child: Container( - height: 25, - width: 25, - child: const Icon(Icons.arrow_back_ios, color: Colors.white, size: 15)), - )), + alignment: Alignment.center, + transform: Matrix4.rotationY(3.14159265), + child: Container( + padding: EdgeInsets.symmetric(horizontal: 10), + height: 30, + width: 30, + child: const Image( + image: AssetImage("assets/images/return_icon.png"), + height: 8, + ), + ))), ], ), ), diff --git a/Sources/justMUSIC/lib/screens/profile_screen.dart b/Sources/justMUSIC/lib/screens/profile_screen.dart index eead70d..e3ff26e 100644 --- a/Sources/justMUSIC/lib/screens/profile_screen.dart +++ b/Sources/justMUSIC/lib/screens/profile_screen.dart @@ -30,12 +30,14 @@ class _ProfileScreenState extends State { alignment: Alignment.centerLeft, children: [ GestureDetector( + behavior: HitTestBehavior.translucent, onTap: () { Navigator.pop(context); }, child: Container( - height: 15, - width: 15, + padding: EdgeInsets.symmetric(horizontal: 10), + height: 30, + width: 30, child: Image( image: AssetImage("assets/images/return_icon.png"), height: 8, @@ -44,10 +46,7 @@ class _ProfileScreenState extends State { Align( child: Text( "Profile", - style: GoogleFonts.plusJakartaSans( - color: Colors.white, - fontSize: 14, - fontWeight: FontWeight.bold), + style: GoogleFonts.plusJakartaSans(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold), ), ) ], @@ -60,8 +59,7 @@ class _ProfileScreenState extends State { height: double.infinity, color: bgColor, child: SingleChildScrollView( - physics: const BouncingScrollPhysics( - decelerationRate: ScrollDecelerationRate.fast), + physics: const BouncingScrollPhysics(decelerationRate: ScrollDecelerationRate.fast), child: Padding( padding: const EdgeInsets.symmetric(horizontal: settingPadding), child: Column( @@ -70,18 +68,13 @@ class _ProfileScreenState extends State { children: [ Padding( padding: EdgeInsets.only(top: 68.h, bottom: 40), - child: - ProfileComponent(user: MyApp.userViewModel.userCurrent), + child: ProfileComponent(user: MyApp.userViewModel.userCurrent), ), Padding( - padding: - const EdgeInsets.only(bottom: 12, left: defaultPadding), + padding: const EdgeInsets.only(bottom: 12, left: defaultPadding), child: Text( "Compte", - style: GoogleFonts.plusJakartaSans( - color: grayText, - fontWeight: FontWeight.w800, - fontSize: 16), + style: GoogleFonts.plusJakartaSans(color: grayText, fontWeight: FontWeight.w800, fontSize: 16), ), ), ClipRRect( @@ -113,14 +106,10 @@ class _ProfileScreenState extends State { ), ), Padding( - padding: const EdgeInsets.only( - bottom: 12, left: defaultPadding, top: 40), + padding: const EdgeInsets.only(bottom: 12, left: defaultPadding, top: 40), child: Text( "Préférences", - style: GoogleFonts.plusJakartaSans( - color: grayText, - fontWeight: FontWeight.w800, - fontSize: 16), + style: GoogleFonts.plusJakartaSans(color: grayText, fontWeight: FontWeight.w800, fontSize: 16), ), ), ClipRRect(