From 184808eba77926d25f0b5b64dd17f66104a1be06 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Sun, 9 Oct 2022 21:47:33 +0200 Subject: [PATCH] =?UTF-8?q?reglage=20des=20transitions=20entre=20pages=20e?= =?UTF-8?q?t=20cr=C3=A9ation=20de=20la=20navbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- daflmusic/lib/homePage/main_homepage.dart | 133 +++++++++--------- .../lib/signInPage/main_signIn_page.dart | 7 +- .../lib/signUpPage/main_signUp_page.dart | 4 +- 3 files changed, 68 insertions(+), 76 deletions(-) diff --git a/daflmusic/lib/homePage/main_homepage.dart b/daflmusic/lib/homePage/main_homepage.dart index ff5c546..2ac8cd3 100644 --- a/daflmusic/lib/homePage/main_homepage.dart +++ b/daflmusic/lib/homePage/main_homepage.dart @@ -5,10 +5,9 @@ import 'package:page_transition/page_transition.dart'; import 'package:daflmusic/signInPage/main_signIn_page.dart'; import 'package:daflmusic/homePage/main_homepage.dart'; import 'package:daflmusic/signUpPage/main_signUp_page.dart'; +import 'package:animations/animations.dart'; class MainHomePage extends StatefulWidget { - const MainHomePage({Key? key}) : super(key: key); - @override State createState() => _MainHomePage(); } @@ -22,7 +21,7 @@ class _MainHomePage extends State { alignment: AlignmentDirectional.topCenter, children: [ Image.asset( - 'assets/images/background_blur.png', + 'assets/images/background.png', height: double.infinity, width: double.infinity, fit: BoxFit.cover, @@ -34,107 +33,103 @@ class _MainHomePage extends State { Image.asset( 'assets/images/Logo.png', - width: 250, + width: 200, ), GestureDetector( child: Container( - child: Align( - alignment: Alignment.center, - child: Text("CONTINUER AVEC SPOTIFY", - style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold), - textAlign: TextAlign.center, + child: Align( + alignment: Alignment.center, + child: Text("CONTINUER AVEC SPOTIFY", + style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold), + textAlign: TextAlign.center, + ), ), - ), - margin: EdgeInsets.fromLTRB(60, 40, 60, 0), - height: 55, - decoration: BoxDecoration( - color: Color(0xFF24CF5F), - borderRadius: BorderRadius.all( - Radius.circular(15)), - border: Border.all( - width: 1.5, - color: Color(0xFF68F097), - ),// Set rounded corner radius + margin: EdgeInsets.fromLTRB(60, 40, 60, 0), + height: 55, + decoration: BoxDecoration( + color: Color(0xFF24CF5F), + borderRadius: BorderRadius.all( + Radius.circular(15)), + border: Border.all( + width: 1.5, + color: Color(0xFF68F097), + ),// Set rounded corner radius - ), - ),), + ), + ),), GestureDetector( onTap: (){ Navigator.of(context).push( PageTransition( - type: PageTransitionType.bottomToTop, + type: PageTransitionType.rightToLeftJoined, childCurrent: widget, - duration: Duration(milliseconds: 600), - reverseDuration: Duration(milliseconds: 600), child: MainSignUpPage()), ); }, child: Container( - child: Align( - alignment: Alignment.center, - child: Text("S’INSCRIRE MAINTENANT", - style: TextStyle(fontFamily: 'DMSans', color: Colors.white ,fontSize: 17, fontWeight: FontWeight.w700), - textAlign: TextAlign.center, + child: Align( + alignment: Alignment.center, + child: Text("S’INSCRIRE MAINTENANT", + style: TextStyle(fontFamily: 'DMSans', color: Colors.white ,fontSize: 17, fontWeight: FontWeight.w700), + textAlign: TextAlign.center, + ), ), - ), - margin: EdgeInsets.fromLTRB(60, 10, 60, 0), - width: double.infinity, - height: 55, - decoration: BoxDecoration( - color: Color(0xFF951DDE), - borderRadius: BorderRadius.all( - Radius.circular(15)), - border: Border.all( - width: 1.5, - color: Color(0xFFC656ED), - ),// Set rounded corner radius + margin: EdgeInsets.fromLTRB(60, 10, 60, 0), + width: double.infinity, + height: 55, + decoration: BoxDecoration( + color: Color(0xFF951DDE), + borderRadius: BorderRadius.all( + Radius.circular(15)), + border: Border.all( + width: 1.5, + color: Color(0xFFC656ED), + ),// Set rounded corner radius - ), - ),), + ), + ),), SizedBox(height: 220,), GestureDetector( onTap: (){ Navigator.of(context).push( PageTransition( - type: PageTransitionType.bottomToTopJoined, + type: PageTransitionType.rightToLeftJoined, childCurrent: widget, - duration: Duration(milliseconds: 600), - reverseDuration: Duration(milliseconds: 600), child: MainSignInPage()), ); }, child: Container( - child: Align( - alignment: Alignment.center, - child: Text("SE CONNECTER", - style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold), - textAlign: TextAlign.center, + child: Align( + alignment: Alignment.center, + child: Text("SE CONNECTER", + style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold), + textAlign: TextAlign.center, + ), ), - ), - margin: EdgeInsets.fromLTRB(0, 0, 0, 0), - width: double.infinity, - height: 80, - decoration: BoxDecoration( - color: Color(0xFF232123), - border: Border( - top: BorderSide(width: 1.5, color: Color(0xFF3C3C3C)), - ),// Set rounded corner radius + margin: EdgeInsets.fromLTRB(0, 0, 0, 0), + width: double.infinity, + height: 80, + decoration: BoxDecoration( + color: Color(0xFF232123), + border: Border( + top: BorderSide(width: 1.5, color: Color(0xFF3C3C3C)), + ),// Set rounded corner radius + ), ), ), - ), ], ), Align( - alignment: Alignment.topRight, - child: Container( - padding: EdgeInsets.fromLTRB(0, 20, 20, 0), - child: Text("v1.0", - style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(0.5) ,fontSize: 17, fontWeight: FontWeight.w700), - ), - ) + alignment: Alignment.topRight, + child: Container( + padding: EdgeInsets.fromLTRB(0, 20, 20, 0), + child: Text("v1.0", + style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(0.5) ,fontSize: 17, fontWeight: FontWeight.w700), + ), + ) ), ], diff --git a/daflmusic/lib/signInPage/main_signIn_page.dart b/daflmusic/lib/signInPage/main_signIn_page.dart index b98f34c..f4f60fd 100644 --- a/daflmusic/lib/signInPage/main_signIn_page.dart +++ b/daflmusic/lib/signInPage/main_signIn_page.dart @@ -1,3 +1,4 @@ +import 'package:daflmusic/mainPage/main_mainpage.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:daflmusic/signInPage/main_signIn_page.dart'; @@ -167,11 +168,9 @@ class _MainSignInPageState extends State { onTap: (){ Navigator.of(context).push( PageTransition( - type: PageTransitionType.topToBottomJoined, + type: PageTransitionType.fade, childCurrent: widget, - duration: Duration(milliseconds: 600), - reverseDuration: Duration(milliseconds: 600), - child: MainHomePage()), + child: MainMainPage()), ); }, child:Ink( diff --git a/daflmusic/lib/signUpPage/main_signUp_page.dart b/daflmusic/lib/signUpPage/main_signUp_page.dart index b510f42..2913f81 100644 --- a/daflmusic/lib/signUpPage/main_signUp_page.dart +++ b/daflmusic/lib/signUpPage/main_signUp_page.dart @@ -236,10 +236,8 @@ class _MainSignUpPageState extends State { }); Navigator.of(context).push( PageTransition( - type: PageTransitionType.fade, + type: PageTransitionType.leftToRightJoined, childCurrent: widget, - duration: Duration(milliseconds: 600), - reverseDuration: Duration(milliseconds: 600), child: MainHomePage()), ); },