debut du web
continuous-integration/drone/push Build is passing Details

profile
Enzo 2 years ago
parent 8aae25d4ed
commit 8143c6a770

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import '../common/colo_extension.dart'; import '../common/colo_extension.dart';
enum RoundButtonType { bgGradient, bgSGradient , textGradient } enum RoundButtonType { bgGradient, bgSGradient, textGradient }
class RoundButton extends StatelessWidget { class RoundButton extends StatelessWidget {
final String title; final String title;
@ -18,7 +18,7 @@ class RoundButton extends StatelessWidget {
this.type = RoundButtonType.bgGradient, this.type = RoundButtonType.bgGradient,
this.fontSize = 16, this.fontSize = 16,
this.elevation = 1, this.elevation = 1,
this.fontWeight=FontWeight.w700, this.fontWeight = FontWeight.w700,
required this.onPressed}); required this.onPressed});
@override @override
@ -26,10 +26,13 @@ class RoundButton extends StatelessWidget {
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: type == RoundButtonType.bgSGradient ? TColor.secondaryG : TColor.primaryG, colors: type == RoundButtonType.bgSGradient
), ? TColor.secondaryG
: TColor.primaryG,
),
borderRadius: BorderRadius.circular(25), borderRadius: BorderRadius.circular(25),
boxShadow: type == RoundButtonType.bgGradient || type == RoundButtonType.bgSGradient boxShadow: type == RoundButtonType.bgGradient ||
type == RoundButtonType.bgSGradient
? const [ ? const [
BoxShadow( BoxShadow(
color: Colors.black26, color: Colors.black26,
@ -43,11 +46,16 @@ class RoundButton extends StatelessWidget {
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(25)),
textColor: TColor.primaryColor1, textColor: TColor.primaryColor1,
minWidth: double.maxFinite, minWidth: double.maxFinite,
elevation: type == RoundButtonType.bgGradient || type == RoundButtonType.bgSGradient ? 0 : elevation, elevation: type == RoundButtonType.bgGradient ||
color: type == RoundButtonType.bgGradient || type == RoundButtonType.bgSGradient type == RoundButtonType.bgSGradient
? 0
: elevation,
color: type == RoundButtonType.bgGradient ||
type == RoundButtonType.bgSGradient
? Colors.transparent ? Colors.transparent
: TColor.white, : TColor.white,
child: type == RoundButtonType.bgGradient || type == RoundButtonType.bgSGradient child: type == RoundButtonType.bgGradient ||
type == RoundButtonType.bgSGradient
? Text(title, ? Text(title,
style: TextStyle( style: TextStyle(
color: TColor.white, color: TColor.white,
@ -65,11 +73,11 @@ class RoundButton extends StatelessWidget {
}, },
child: Text(title, child: Text(title,
style: TextStyle( style: TextStyle(
color: TColor.primaryColor1, color: TColor.primaryColor1,
fontSize: fontSize, fontSize: fontSize,
fontWeight: fontWeight)), fontWeight: fontWeight)),
), ),
), ),
); );
} }
} }

@ -2,12 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:smartfit_app_mobile/modele/utile/login_user.dart'; import 'package:smartfit_app_mobile/modele/utile/login_user.dart';
import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart'; import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart';
import 'package:provider/provider.dart';
import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart';
import 'package:smartfit_app_mobile/modele/api/request_api.dart';
import 'package:smartfit_app_mobile/modele/user.dart';
import 'package:smartfit_app_mobile/view/activity/list_activity.dart';
import 'package:smartfit_app_mobile/view/page_test.dart';
import 'package:smartfit_app_mobile/common/colo_extension.dart'; import 'package:smartfit_app_mobile/common/colo_extension.dart';
import 'package:smartfit_app_mobile/common_widget/round_button.dart'; import 'package:smartfit_app_mobile/common_widget/round_button.dart';
import 'package:smartfit_app_mobile/common_widget/round_text_field.dart'; import 'package:smartfit_app_mobile/common_widget/round_text_field.dart';
@ -82,11 +76,14 @@ class _WebLoginView extends State<WebLoginView> {
body: SingleChildScrollView( body: SingleChildScrollView(
child: SafeArea( child: SafeArea(
child: Container( child: Container(
height: media.height * 0.9,
padding: const EdgeInsets.symmetric(horizontal: 20), padding: const EdgeInsets.symmetric(horizontal: 20),
height: media.height,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
SizedBox(
height: media.width * 0.03,
),
Text( Text(
"Bienvenue", "Bienvenue",
style: TextStyle(color: TColor.gray, fontSize: 16), style: TextStyle(color: TColor.gray, fontSize: 16),
@ -98,9 +95,6 @@ class _WebLoginView extends State<WebLoginView> {
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
), ),
SizedBox(
height: media.width * 0.05,
),
SizedBox( SizedBox(
height: media.width * 0.04, height: media.width * 0.04,
), ),
@ -131,6 +125,9 @@ class _WebLoginView extends State<WebLoginView> {
fit: BoxFit.contain, fit: BoxFit.contain,
))), ))),
), ),
SizedBox(
height: media.width * 0.01,
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
@ -207,59 +204,6 @@ class _WebLoginView extends State<WebLoginView> {
SizedBox( SizedBox(
height: media.width * 0.04, height: media.width * 0.04,
), ),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
GestureDetector(
onTap: () {},
child: Container(
width: 50,
height: 50,
alignment: Alignment.center,
decoration: BoxDecoration(
color: TColor.white,
border: Border.all(
width: 1,
color: TColor.gray.withOpacity(0.4),
),
borderRadius: BorderRadius.circular(15),
),
child: Image.asset(
"assets/img/google.png",
width: 20,
height: 20,
),
),
),
SizedBox(
width: media.width * 0.04,
),
GestureDetector(
onTap: () {},
child: Container(
width: 50,
height: 50,
alignment: Alignment.center,
decoration: BoxDecoration(
color: TColor.white,
border: Border.all(
width: 1,
color: TColor.gray.withOpacity(0.4),
),
borderRadius: BorderRadius.circular(15),
),
child: Image.asset(
"assets/img/suunto.png",
width: 35,
height: 35,
),
),
)
],
),
SizedBox(
height: media.width * 0.04,
),
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);

Loading…
Cancel
Save