WT1.1.2e error fixes
This commit is contained in:
bossanyit
@@ -81,7 +81,7 @@ class _CustomerGoalPage extends State<CustomerGoalPage> {
|
||||
children: [
|
||||
FlatButton(
|
||||
child: Image.asset(
|
||||
"asset/image/WT_gain_muscle.png",
|
||||
"asset/image/Gain_muscle.png",
|
||||
height: 180,
|
||||
),
|
||||
padding: EdgeInsets.all(0.0),
|
||||
|
||||
+5
-7
@@ -2,7 +2,6 @@ import 'package:aitrainer_app/bloc/login_form_bloc.dart';
|
||||
import 'package:aitrainer_app/bloc/account/account_bloc.dart';
|
||||
import 'package:aitrainer_app/localization/app_localization.dart';
|
||||
import 'package:aitrainer_app/repository/user_repository.dart';
|
||||
import 'package:aitrainer_app/service/firebase_api.dart';
|
||||
import 'package:aitrainer_app/util/common.dart';
|
||||
import 'package:aitrainer_app/util/trans.dart';
|
||||
import 'package:aitrainer_app/widgets/splash.dart';
|
||||
@@ -61,8 +60,6 @@ class _LoginWidget extends State<LoginWidget> with Common, Trans {
|
||||
image: DecorationImage(
|
||||
image: AssetImage('asset/image/WT_login.png'),
|
||||
fit: BoxFit.cover,
|
||||
//height: double.infinity,
|
||||
//width: double.infinity,
|
||||
alignment: Alignment.center,
|
||||
),
|
||||
),
|
||||
@@ -78,10 +75,11 @@ class _LoginWidget extends State<LoginWidget> with Common, Trans {
|
||||
return Form(
|
||||
key: _formKey,
|
||||
child: Container(
|
||||
padding: const EdgeInsets.only(left: 25, right: 100),
|
||||
padding: const EdgeInsets.only(left: 15, right: 50),
|
||||
child:
|
||||
ListView(shrinkWrap: false, padding: EdgeInsets.only(top: 120.0),
|
||||
ListView(shrinkWrap: false, padding: EdgeInsets.only(top: 150.0),
|
||||
children: <Widget>[
|
||||
Divider(color: Colors.transparent),
|
||||
/* FlatButton(
|
||||
child: new Image.asset(
|
||||
'asset/image/login_fb.png',
|
||||
@@ -155,13 +153,13 @@ class _LoginWidget extends State<LoginWidget> with Common, Trans {
|
||||
onTap: () =>
|
||||
Navigator.of(context).pushNamed('registration'),
|
||||
),
|
||||
Spacer(flex: 1),
|
||||
Spacer(flex: 2),
|
||||
new InkWell(
|
||||
child: new Text(
|
||||
AppLocalizations.of(context).translate('I forgot the password')),
|
||||
onTap: () => Navigator.of(context).pushNamed('resetPassword'),
|
||||
),
|
||||
Spacer(flex: 1),
|
||||
Spacer(flex: 2),
|
||||
new InkWell(
|
||||
child: new Text(
|
||||
AppLocalizations.of(context).translate('Privacy')),
|
||||
|
||||
@@ -54,7 +54,7 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
|
||||
)
|
||||
),
|
||||
image: "asset/image/edzesnaplom400400.jpg",
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap: () => this.callBackExerciseLog(exerciseRepository, customerRepository),
|
||||
isLocked: false,
|
||||
),
|
||||
@@ -70,7 +70,7 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
),
|
||||
image: "asset/image/testemfejl400x400.jpg",
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap: () => {
|
||||
args['customerId'] = Cache().userLoggedIn.customerId,
|
||||
Navigator.of(context).pushNamed('mydevelopmentBodyPage', arguments: args)
|
||||
@@ -88,13 +88,13 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
|
||||
fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4))),
|
||||
image: "asset/image/izomcsop400400.jpg",
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap: () => {Navigator.of(context).pushNamed('mydevelopmentMusclePage', arguments: args)},
|
||||
isLocked: true,
|
||||
),
|
||||
ImageButton(
|
||||
width: imageWidth,
|
||||
left: 10,
|
||||
left: 5,
|
||||
textAlignment: Alignment.topLeft,
|
||||
text: t("Predictions"),
|
||||
style: GoogleFonts.robotoMono(
|
||||
|
||||
@@ -52,7 +52,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
backgroundColor: Colors.black54.withOpacity(0.4))),
|
||||
image: "asset/image/exercise_plan_execute.jpg",
|
||||
top: 130,
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap:() => {
|
||||
args['customerId'] = Cache().userLoggedIn.customerId,
|
||||
Navigator.of(context).pushNamed('exerciseExecutePlanPage',
|
||||
@@ -69,7 +69,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
textStyle: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4))),
|
||||
image: "asset/image/exercise_plan_custom.jpg",
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap:() => {
|
||||
args['exerciseRepository'] = exerciseRepository,
|
||||
args['customerId'] = Cache().userLoggedIn.customerId,
|
||||
@@ -87,7 +87,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
textStyle: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4))),
|
||||
image: "asset/image/exercise_plan_suggested.jpg",
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap:() => {
|
||||
|
||||
},
|
||||
@@ -102,7 +102,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
textStyle: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4))),
|
||||
image: "asset/image/exercise_plan_special.jpg",
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap:() => {
|
||||
|
||||
},
|
||||
@@ -117,7 +117,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
textStyle: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4))),
|
||||
image: "asset/image/exercise_plan_stars.jpg",
|
||||
left: 10,
|
||||
left: 5,
|
||||
onTap:() => {
|
||||
|
||||
},
|
||||
|
||||
@@ -78,12 +78,13 @@ class _RegistrationWidget extends State<RegistrationWidget> with Common {
|
||||
child: Form(
|
||||
key: _formKey,
|
||||
child: Container(
|
||||
padding: const EdgeInsets.only(left: 25, right: 100),
|
||||
padding: const EdgeInsets.only(left: 25, right: 50),
|
||||
child: ListView(
|
||||
shrinkWrap: false,
|
||||
padding: EdgeInsets.only(top: 120.0),
|
||||
padding: EdgeInsets.only(top: 150.0),
|
||||
//mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||
children: <Widget>[
|
||||
Divider(color: Colors.transparent,),
|
||||
//Spacer(flex:4),
|
||||
|
||||
/* FlatButton(
|
||||
|
||||
Reference in New Issue
Block a user