justDEV
/
justMusic
2
4
Fork 0
Code Issues 35 Pull Requests 5 Packages Projects 1 Releases Wiki Activity

get post

Browse Source
GET_CAPSULES_LDE-EKA
Lucas Delanier 2 years ago
parent d0045fc66f
commit 67ab17e7d7
3 changed files with 124 additions and 286 deletions
Show Stats Download Patch File Download Diff File

3
Sources/justMUSIC/lib/components/post_component.dart
Unescape View File

@ -20,7 +20,7 @@ class PostComponent extends StatefulWidget {
State<PostComponent> createState() => _PostComponentState(); State<PostComponent> createState() => _PostComponentState();
} }
class _PostComponentState extends State<PostComponent> { class _PostComponentState extends State<PostComponent> with TickerProviderStateMixin {
bool choice = false; bool choice = false;
DateTime today = DateTime.now(); DateTime today = DateTime.now();
@ -332,6 +332,7 @@ class _PostComponentState extends State<PostComponent> {
), ),
Image( Image(
image: AssetImage("assets/images/shadow_post.png"), image: AssetImage("assets/images/shadow_post.png"),
opacity: AnimationController(vsync: this, value: 0.7),
fit: BoxFit.fitHeight, fit: BoxFit.fitHeight,
width: double.infinity, width: double.infinity,
), ),

214
Sources/justMUSIC/lib/screens/login_screen.dart
Unescape View File

@ -27,18 +27,14 @@ class _LoginScreenState extends State<LoginScreen> {
handleLogin() async { handleLogin() async {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
try { try {
await MyApp.userViewModel await MyApp.userViewModel.login(_userMailTextField.text, _passwordTextField.text);
.login(_userMailTextField.text, _passwordTextField.text);
Navigator.pushNamed(context, '/feed'); Navigator.pushNamed(context, '/feed');
} catch (e) { } catch (e) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text( content: Text(
e.toString() ?? "", e.toString() ?? "",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w400, fontSize: 20.h),
color: Colors.white,
fontWeight: FontWeight.w400,
fontSize: 20.h),
), ),
backgroundColor: Colors.red, backgroundColor: Colors.red,
), ),
@ -67,25 +63,19 @@ class _LoginScreenState extends State<LoginScreen> {
child: Form( child: Form(
key: _formKey, key: _formKey,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.center,
CrossAxisAlignment.center,
children: [ children: [
Flexible( Flexible(
flex: 4, flex: 4,
child: Padding( child: Padding(
padding: EdgeInsets.only(bottom: 60), padding: EdgeInsets.only(bottom: 60),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.end,
MainAxisAlignment.end,
children: [ children: [
Text( Text(
"Te revoilà!", "Te revoilà!",
style: style: GoogleFonts.plusJakartaSans(
GoogleFonts.plusJakartaSans( color: Colors.white, fontWeight: FontWeight.w600, fontSize: 38.h),
color: Colors.white,
fontWeight:
FontWeight.w600,
fontSize: 38.h),
), ),
SizedBox( SizedBox(
height: 10, height: 10,
@ -94,12 +84,8 @@ class _LoginScreenState extends State<LoginScreen> {
width: 230.w, width: 230.w,
child: Text( child: Text(
"Bon retour parmis nous tu nous as manqué!", "Bon retour parmis nous tu nous as manqué!",
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans( color: Colors.white, fontWeight: FontWeight.w400, fontSize: 20.h),
color: Colors.white,
fontWeight:
FontWeight.w400,
fontSize: 20.h),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),
@ -110,51 +96,33 @@ class _LoginScreenState extends State<LoginScreen> {
Expanded( Expanded(
flex: 5, flex: 5,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.end,
CrossAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
TextFormField( TextFormField(
controller: _userMailTextField, controller: _userMailTextField,
keyboardAppearance: keyboardAppearance: Brightness.dark,
Brightness.dark,
validator: (value) { validator: (value) {
if (value == null || if (value == null || value.isEmpty) {
value.isEmpty) {
return 'entrez un email valide'; return 'entrez un email valide';
} }
return null; return null;
}, },
cursorColor: primaryColor, cursorColor: primaryColor,
keyboardType: keyboardType: TextInputType.emailAddress,
TextInputType.emailAddress, style: GoogleFonts.plusJakartaSans(color: primaryColor),
style:
GoogleFonts.plusJakartaSans(
color: primaryColor),
decoration: InputDecoration( decoration: InputDecoration(
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, borderRadius: BorderRadius.all(Radius.circular(10))),
color: prefix: const Padding(padding: EdgeInsets.only(left: 20.0)),
strokeTextField), suffix: const Padding(padding: EdgeInsets.only(left: 20.0)),
borderRadius: BorderRadius.all(
Radius.circular(10))),
prefix: const Padding(
padding: EdgeInsets.only(
left: 20.0)),
suffix: const Padding(
padding: EdgeInsets.only(
left: 20.0)),
fillColor: bgTextField, fillColor: bgTextField,
filled: true, filled: true,
errorStyle: TextStyle( errorStyle: TextStyle(fontSize: 9, height: 0.3),
fontSize: 9, height: 0.3), focusColor: Color.fromRGBO(255, 255, 255, 0.30),
focusColor: Color.fromRGBO(
255, 255, 255, 0.30),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: borderSide: BorderSide(width: 1, color: strokeTextField),
BorderSide(width: 1, color: strokeTextField),
borderRadius: BorderRadius.all(Radius.circular(10))), borderRadius: BorderRadius.all(Radius.circular(10))),
hintText: 'Email', hintText: 'Email',
hintStyle: GoogleFonts.plusJakartaSans(color: strokeTextField)), hintStyle: GoogleFonts.plusJakartaSans(color: strokeTextField)),
@ -164,55 +132,31 @@ class _LoginScreenState extends State<LoginScreen> {
), ),
TextFormField( TextFormField(
controller: _passwordTextField, controller: _passwordTextField,
keyboardAppearance: keyboardAppearance: Brightness.dark,
Brightness.dark,
obscureText: passenable, obscureText: passenable,
validator: (value) { validator: (value) {
if (value == null || if (value == null || value.isEmpty) {
value.isEmpty) {
return 'entrez un mot de passe valide'; return 'entrez un mot de passe valide';
} }
return null; return null;
}, },
cursorColor: primaryColor, cursorColor: primaryColor,
style: style: GoogleFonts.plusJakartaSans(color: primaryColor),
GoogleFonts.plusJakartaSans(
color: primaryColor),
decoration: InputDecoration( decoration: InputDecoration(
focusedBorder: focusedBorder: OutlineInputBorder(
OutlineInputBorder( borderSide: BorderSide(width: 1, color: strokeTextField),
borderSide: BorderSide( borderRadius: BorderRadius.all(Radius.circular(10))),
width: 1,
color:
strokeTextField),
borderRadius:
BorderRadius.all(
Radius.circular(
10))),
fillColor: bgTextField, fillColor: bgTextField,
filled: true, filled: true,
focusColor: Color.fromRGBO( focusColor: Color.fromRGBO(255, 255, 255, 0.30),
255, 255, 255, 0.30), enabledBorder: OutlineInputBorder(
enabledBorder: borderSide: BorderSide(width: 1, color: strokeTextField),
OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10))),
borderSide: BorderSide(
width: 1,
color:
strokeTextField),
borderRadius:
BorderRadius.all(
Radius.circular(
10))),
hintText: 'Mot de passe', hintText: 'Mot de passe',
hintStyle: hintStyle: GoogleFonts.plusJakartaSans(color: strokeTextField),
GoogleFonts.plusJakartaSans( prefix: const Padding(padding: EdgeInsets.only(left: 20.0)),
color: strokeTextField),
prefix: const Padding(
padding: EdgeInsets.only(
left: 20.0)),
suffixIcon: Container( suffixIcon: Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(right: 10),
right: 10),
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
height: 3, height: 3,
child: InkWell( child: InkWell(
@ -226,29 +170,23 @@ class _LoginScreenState extends State<LoginScreen> {
}); });
}, },
// Image tapped // Image tapped
splashColor: splashColor: Colors.white10,
Colors.white10,
// Splash color over image // Splash color over image
child: Image( child: Image(
image: passenable image: passenable
? AssetImage( ? AssetImage("assets/images/show_icon.png")
"assets/images/show_icon.png") : AssetImage("assets/images/hide_icon.png"),
: AssetImage(
"assets/images/hide_icon.png"),
height: 2, height: 2,
), ),
)), )),
errorStyle: TextStyle( errorStyle: TextStyle(fontSize: 9, height: 0.3),
fontSize: 9, height: 0.3),
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 10), padding: EdgeInsets.only(top: 10),
child: Text( child: Text(
"Mot de passe oublié?", "Mot de passe oublié?",
style: style: GoogleFonts.plusJakartaSans(color: Colors.white),
GoogleFonts.plusJakartaSans(
color: Colors.white),
), ),
), ),
SizedBox( SizedBox(
@ -261,38 +199,27 @@ class _LoginScreenState extends State<LoginScreen> {
)), )),
Align( Align(
child: GestureDetector( child: GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () { onTap: () {
Navigator.pushNamed( Navigator.pushNamed(context, '/register');
context, '/register');
}, },
child: Padding( child: Padding(
padding: padding: EdgeInsets.only(top: 20),
EdgeInsets.only(top: 20),
child: RichText( child: RichText(
textAlign: TextAlign.center, textAlign: TextAlign.center,
text: TextSpan( text: TextSpan(
text: text: 'Pas encore inscrit?',
'Pas encore inscrit?', style: GoogleFonts.plusJakartaSans(
style: GoogleFonts color: Colors.white,
.plusJakartaSans( fontWeight: FontWeight.w400,
color: fontSize: 15),
Colors.white,
fontWeight:
FontWeight
.w400,
fontSize: 15),
children: <TextSpan>[ children: <TextSpan>[
TextSpan( TextSpan(
text: " S’inscire", text: " S’inscire",
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans( fontSize: 15,
fontSize: fontWeight: FontWeight.w400,
15, color: primaryColor)),
fontWeight:
FontWeight
.w400,
color:
primaryColor)),
], ],
), ),
), ),
@ -307,55 +234,38 @@ class _LoginScreenState extends State<LoginScreen> {
child: Padding( child: Padding(
padding: EdgeInsets.only(top: 20), padding: EdgeInsets.only(top: 20),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.center,
children: [ children: [
ConstrainedBox( ConstrainedBox(
constraints: BoxConstraints( constraints: BoxConstraints(maxWidth: 600),
maxWidth: 600),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceEvenly,
MainAxisAlignment
.spaceEvenly,
children: [ children: [
Expanded( Expanded(
child: Container( child: Container(
color: color: Color(0xFF3D3D3D),
Color(0xFF3D3D3D),
height: 1, height: 1,
), ),
), ),
Padding( Padding(
padding: const EdgeInsets padding: const EdgeInsets.only(
.only( left: defaultPadding, right: defaultPadding),
left:
defaultPadding,
right:
defaultPadding),
child: Text( child: Text(
'Ou', 'Ou',
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans( color: Colors.white, fontWeight: FontWeight.bold),
color: Colors
.white,
fontWeight:
FontWeight
.bold),
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
height: 1, height: 1,
color: color: Color(0xFF3D3D3D),
Color(0xFF3D3D3D),
)), )),
], ],
), ),
), ),
SizedBox( SizedBox(height: defaultPadding),
height: defaultPadding),
SignInButton( SignInButton(
Buttons.Google, Buttons.Google,
text: "Login with Google", text: "Login with Google",

193
Sources/justMUSIC/lib/screens/registration_screen.dart
Unescape View File

@ -30,18 +30,14 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
handleRegister() async { handleRegister() async {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
try { try {
await MyApp.userViewModel.register(_userPseudoTextField.text, await MyApp.userViewModel.register(_userPseudoTextField.text, _passwordTextField.text, _userMailTextField.text);
_passwordTextField.text, _userMailTextField.text);
Navigator.pushNamed(context, '/explanation'); Navigator.pushNamed(context, '/explanation');
} catch (e) { } catch (e) {
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text( content: Text(
e.toString() ?? "", e.toString() ?? "",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w400, fontSize: 20.h),
color: Colors.white,
fontWeight: FontWeight.w400,
fontSize: 20.h),
), ),
backgroundColor: Colors.red, backgroundColor: Colors.red,
), ),
@ -67,10 +63,8 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
padding: EdgeInsets.only(top: 100.h), padding: EdgeInsets.only(top: 100.h),
child: AutoSizeText( child: AutoSizeText(
"On a besoin de ça!", "On a besoin de ça!",
style: GoogleFonts.plusJakartaSans( style:
color: Colors.white, GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w600, fontSize: 30.w),
fontWeight: FontWeight.w600,
fontSize: 30.w),
maxLines: 1, maxLines: 1,
maxFontSize: 50, maxFontSize: 50,
overflow: TextOverflow.fade, overflow: TextOverflow.fade,
@ -82,8 +76,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(horizontal: defaultPadding),
horizontal: defaultPadding),
child: Padding( child: Padding(
padding: EdgeInsets.only(bottom: 50.h), padding: EdgeInsets.only(bottom: 50.h),
child: Column( child: Column(
@ -97,9 +90,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
child: AutoSizeText( child: AutoSizeText(
"Promis c’est rapide.", "Promis c’est rapide.",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
color: Colors.white, color: Colors.white, fontWeight: FontWeight.w400, fontSize: 17.w),
fontWeight: FontWeight.w400,
fontSize: 17.w),
maxFontSize: 20, maxFontSize: 20,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
@ -109,10 +100,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(bottom: 16.h, left: defaultPadding, right: defaultPadding),
bottom: 16.h,
left: defaultPadding,
right: defaultPadding),
child: TextFormField( child: TextFormField(
controller: _userPseudoTextField, controller: _userPseudoTextField,
keyboardAppearance: Brightness.dark, keyboardAppearance: Brightness.dark,
@ -124,37 +112,24 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
}, },
cursorColor: primaryColor, cursorColor: primaryColor,
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: primaryColor, fontSize: 15),
color: primaryColor, fontSize: 15),
decoration: InputDecoration( decoration: InputDecoration(
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1.sp, color: strokeTextField),
width: 1.sp, borderRadius: const BorderRadius.all(Radius.circular(10))),
color: strokeTextField), prefix: const Padding(padding: EdgeInsets.only(left: 20.0)),
borderRadius: const BorderRadius.all( suffix: const Padding(padding: EdgeInsets.only(left: 20.0)),
Radius.circular(10))),
prefix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
suffix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
fillColor: bgTextField, fillColor: bgTextField,
filled: true, filled: true,
focusColor: const Color.fromRGBO( focusColor: const Color.fromRGBO(255, 255, 255, 0.30),
255, 255, 255, 0.30),
enabledBorder: const OutlineInputBorder( enabledBorder: const OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, color: strokeTextField), borderRadius: BorderRadius.all(Radius.circular(10))),
borderRadius: BorderRadius.all(
Radius.circular(10))),
hintText: 'Pseudo', hintText: 'Pseudo',
hintStyle: GoogleFonts.plusJakartaSans( hintStyle: GoogleFonts.plusJakartaSans(color: strokeTextField)),
color: strokeTextField)),
)), )),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(bottom: 16.h, left: defaultPadding, right: defaultPadding),
bottom: 16.h,
left: defaultPadding,
right: defaultPadding),
child: TextFormField( child: TextFormField(
controller: _userMailTextField, controller: _userMailTextField,
keyboardAppearance: Brightness.dark, keyboardAppearance: Brightness.dark,
@ -166,36 +141,24 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
}, },
cursorColor: primaryColor, cursorColor: primaryColor,
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: primaryColor),
color: primaryColor),
decoration: InputDecoration( decoration: InputDecoration(
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, color: strokeTextField), borderRadius: BorderRadius.all(Radius.circular(10))),
borderRadius: BorderRadius.all( prefix: const Padding(padding: EdgeInsets.only(left: 20.0)),
Radius.circular(10))), suffix: const Padding(padding: EdgeInsets.only(left: 20.0)),
prefix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
suffix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
fillColor: bgTextField, fillColor: bgTextField,
filled: true, filled: true,
focusColor: focusColor: Color.fromRGBO(255, 255, 255, 0.30),
Color.fromRGBO(255, 255, 255, 0.30),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, color: strokeTextField), borderRadius: BorderRadius.all(Radius.circular(10))),
borderRadius: BorderRadius.all(
Radius.circular(10))),
hintText: 'Email', hintText: 'Email',
hintStyle: GoogleFonts.plusJakartaSans( hintStyle: GoogleFonts.plusJakartaSans(color: strokeTextField)),
color: strokeTextField)),
)), )),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(bottom: 16.h, left: defaultPadding, right: defaultPadding),
bottom: 16.h,
left: defaultPadding,
right: defaultPadding),
child: TextFormField( child: TextFormField(
controller: _passwordTextField, controller: _passwordTextField,
keyboardAppearance: Brightness.dark, keyboardAppearance: Brightness.dark,
@ -207,29 +170,21 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
return null; return null;
}, },
cursorColor: primaryColor, cursorColor: primaryColor,
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: primaryColor),
color: primaryColor),
decoration: InputDecoration( decoration: InputDecoration(
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, color: strokeTextField), borderRadius: BorderRadius.all(Radius.circular(10))),
borderRadius: prefix: const Padding(padding: EdgeInsets.only(left: 20.0)),
BorderRadius.all(Radius.circular(10))), suffix: const Padding(padding: EdgeInsets.only(left: 20.0)),
prefix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
suffix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
fillColor: bgTextField, fillColor: bgTextField,
filled: true, filled: true,
focusColor: Color.fromRGBO(255, 255, 255, 0.30), focusColor: Color.fromRGBO(255, 255, 255, 0.30),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, color: strokeTextField), borderRadius: BorderRadius.all(Radius.circular(10))),
borderRadius:
BorderRadius.all(Radius.circular(10))),
hintText: 'Mot de passe', hintText: 'Mot de passe',
hintStyle: GoogleFonts.plusJakartaSans( hintStyle: GoogleFonts.plusJakartaSans(color: strokeTextField),
color: strokeTextField),
suffixIcon: Container( suffixIcon: Container(
padding: EdgeInsets.only(right: 10), padding: EdgeInsets.only(right: 10),
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
@ -249,10 +204,8 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
// Splash color over image // Splash color over image
child: Image( child: Image(
image: passenable image: passenable
? AssetImage( ? AssetImage("assets/images/show_icon.png")
"assets/images/show_icon.png") : AssetImage("assets/images/hide_icon.png"),
: AssetImage(
"assets/images/hide_icon.png"),
height: 2, height: 2,
), ),
)), )),
@ -260,10 +213,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(bottom: 16.h, left: defaultPadding, right: defaultPadding),
bottom: 16.h,
left: defaultPadding,
right: defaultPadding),
child: TextFormField( child: TextFormField(
controller: _passwordConfirmTextField, controller: _passwordConfirmTextField,
keyboardAppearance: Brightness.dark, keyboardAppearance: Brightness.dark,
@ -278,29 +228,21 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
}, },
cursorColor: primaryColor, cursorColor: primaryColor,
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: primaryColor),
color: primaryColor),
decoration: InputDecoration( decoration: InputDecoration(
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, color: strokeTextField), borderRadius: BorderRadius.all(Radius.circular(10))),
borderRadius: prefix: const Padding(padding: EdgeInsets.only(left: 20.0)),
BorderRadius.all(Radius.circular(10))), suffix: const Padding(padding: EdgeInsets.only(left: 20.0)),
prefix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
suffix: const Padding(
padding: EdgeInsets.only(left: 20.0)),
fillColor: bgTextField, fillColor: bgTextField,
filled: true, filled: true,
focusColor: Color.fromRGBO(255, 255, 255, 0.30), focusColor: Color.fromRGBO(255, 255, 255, 0.30),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(width: 1, color: strokeTextField),
width: 1, color: strokeTextField), borderRadius: BorderRadius.all(Radius.circular(10))),
borderRadius:
BorderRadius.all(Radius.circular(10))),
hintText: 'Confirmation du Mot de passe', hintText: 'Confirmation du Mot de passe',
hintStyle: GoogleFonts.plusJakartaSans( hintStyle: GoogleFonts.plusJakartaSans(color: strokeTextField),
color: strokeTextField),
suffixIcon: Container( suffixIcon: Container(
padding: EdgeInsets.only(right: 10), padding: EdgeInsets.only(right: 10),
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
@ -320,10 +262,8 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
// Splash color over image // Splash color over image
child: Image( child: Image(
image: passenable image: passenable
? AssetImage( ? AssetImage("assets/images/show_icon.png")
"assets/images/show_icon.png") : AssetImage("assets/images/hide_icon.png"),
: AssetImage(
"assets/images/hide_icon.png"),
height: 2, height: 2,
), ),
)), )),
@ -331,8 +271,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(horizontal: defaultPadding),
horizontal: defaultPadding),
child: SizedBox( child: SizedBox(
width: 600, width: 600,
child: LoginButton( child: LoginButton(
@ -341,6 +280,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
), ),
Align( Align(
child: GestureDetector( child: GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () { onTap: () {
Navigator.pushNamed(context, '/login'); Navigator.pushNamed(context, '/login');
}, },
@ -351,16 +291,12 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
text: TextSpan( text: TextSpan(
text: 'Tu as déjà un compte?', text: 'Tu as déjà un compte?',
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
color: Colors.white, color: Colors.white, fontWeight: FontWeight.w400, fontSize: 15),
fontWeight: FontWeight.w400,
fontSize: 15),
children: <TextSpan>[ children: <TextSpan>[
TextSpan( TextSpan(
text: " Connexion", text: " Connexion",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
fontSize: 15, fontSize: 15, fontWeight: FontWeight.w400, color: primaryColor)),
fontWeight: FontWeight.w400,
color: primaryColor)),
], ],
), ),
), ),
@ -382,13 +318,10 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(left: defaultPadding, right: defaultPadding),
left: defaultPadding, right: defaultPadding),
child: Text( child: Text(
'Ou', 'Ou',
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.bold),
color: Colors.white,
fontWeight: FontWeight.bold),
), ),
), ),
Expanded( Expanded(
@ -409,9 +342,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
Buttons.Google, Buttons.Google,
text: "Login with Google", text: "Login with Google",
onPressed: () {}, onPressed: () {},
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(20))),
borderRadius:
BorderRadius.all(Radius.circular(20))),
), ),
), ),
), ),
@ -422,13 +353,10 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
child: Container( child: Container(
height: 240.h, height: 240.h,
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient(begin: Alignment.topRight, stops: [ gradient: LinearGradient(
0, begin: Alignment.topRight,
1 stops: [0, 1],
], colors: [ colors: [bgColor.withOpacity(1), bgColor.withOpacity(0)])),
bgColor.withOpacity(1),
bgColor.withOpacity(0)
])),
), ),
), ),
Align( Align(
@ -436,8 +364,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
child: ConstrainedBox( child: ConstrainedBox(
constraints: BoxConstraints(maxWidth: 800), constraints: BoxConstraints(maxWidth: 800),
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(top: 45.h, left: defaultPadding, right: defaultPadding),
top: 45.h, left: defaultPadding, right: defaultPadding),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
child: LinearProgressIndicator( child: LinearProgressIndicator(

Write Preview
Loading…
Cancel
Save