Merge ssh://git.aitrainer.app:6622/bossanyit/aitrainer_app
This commit is contained in:
commit
55f9dacf0c
@ -148,7 +148,7 @@
|
||||
"Edit My Custom Plan": "Edit My Custom Plan",
|
||||
"Suggested Training Plan": "Suggested Training Plan",
|
||||
"My Special Plan": "My Special Plan",
|
||||
"My Arnold's Plan":"Stars Execercise Plan",
|
||||
"My Arnold's Plan":"Stars Exercise Plan",
|
||||
"My Trainee's Plan": "My Trainee's Plan",
|
||||
"Execute My Trainee's Training Plan": "Execute My Trainee's Training Plan",
|
||||
|
||||
|
@ -162,7 +162,7 @@ class _ExerciseExecuteAddPage extends State<ExerciseExecutePlanAddPage> with Tra
|
||||
highlightSelectedValue: (i + 1) == exerciseBloc.step,
|
||||
initialValue: exerciseBloc.unitQuantity.toInt(),
|
||||
minValue: 0,
|
||||
maxValue: 200,
|
||||
maxValue: 650,
|
||||
step: 1,
|
||||
textStyle: TextStyle(fontWeight: FontWeight.bold),
|
||||
textStyleHighlighted: TextStyle(fontSize: 24, color: Colors.indigo, fontWeight: FontWeight.bold),
|
||||
|
@ -127,7 +127,7 @@ class _ExercisePlanDetailAddPage extends State<ExercisePlanDetailAddPage> with T
|
||||
highlightSelectedValue: true,
|
||||
initialValue: bloc.quantityUnit.toInt(),
|
||||
minValue: 0,
|
||||
maxValue: 200,
|
||||
maxValue: 650,
|
||||
step: 1,
|
||||
onChanged: (value) => {
|
||||
bloc.add(ExercisePlanCustomAddChangeQuantityUnit(quantity: value.toDouble()))
|
||||
|
@ -44,10 +44,10 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
|
||||
ImageButton(
|
||||
textAlignment: Alignment.topCenter,
|
||||
text: t("My Exercise Logs"),
|
||||
style: TextStyle(fontSize: 16, color: Colors.orange, fontWeight: FontWeight.bold, backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
style: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold, backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/image/edzesnaplom400400.jpg",
|
||||
top: 150,
|
||||
left: 15,
|
||||
left: 10,
|
||||
onTap:() => this.callBackExerciseLog(exerciseRepository, customerRepository),
|
||||
isLocked: false,
|
||||
),
|
||||
@ -55,11 +55,11 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
|
||||
ImageButton(
|
||||
textAlignment: Alignment.topLeft,
|
||||
text: t("My Whole Body Development"),
|
||||
style: TextStyle(fontSize: 16, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
style: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/image/testemfejl400x400.jpg",
|
||||
top: 150,
|
||||
left: 15,
|
||||
left: 10,
|
||||
onTap:() => {
|
||||
args['customerId'] = Cache().userLoggedIn.customerId,
|
||||
Navigator.of(context).pushNamed('mydevelopmentBodyPage',
|
||||
@ -70,7 +70,7 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
|
||||
ImageButton(
|
||||
textAlignment: Alignment.topLeft,
|
||||
text: t("Development Of Muscles"),
|
||||
style: TextStyle(fontSize: 16, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
style: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/image/izomcsop400400.jpg",
|
||||
top: 120,
|
||||
@ -85,7 +85,7 @@ class _MyDevelopmentPage extends State<MyDevelopmentPage> with Trans {
|
||||
ImageButton(
|
||||
textAlignment: Alignment.topLeft,
|
||||
text: t("Predictions"),
|
||||
style: TextStyle(fontSize: 16, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
style: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/menu/2.2.1.1RM.png",
|
||||
top: 150,
|
||||
|
@ -23,7 +23,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
return Scaffold(
|
||||
appBar: AppBarNav(depth: 0),
|
||||
body: Container(
|
||||
padding: EdgeInsets.all(20),
|
||||
padding: EdgeInsets.all(10),
|
||||
decoration: BoxDecoration(
|
||||
image: DecorationImage(
|
||||
image: AssetImage('asset/image/WT_menu_dark.png'),
|
||||
@ -44,8 +44,8 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
style: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/image/exercise_plan_execute.jpg",
|
||||
top: 150,
|
||||
left: 15,
|
||||
top: 130,
|
||||
left: 10,
|
||||
onTap:() => {
|
||||
args['customerId'] = Cache().userLoggedIn.customerId,
|
||||
Navigator.of(context).pushNamed('exerciseExecutePlanPage',
|
||||
@ -61,7 +61,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/image/exercise_plan_custom.jpg",
|
||||
top: 150,
|
||||
left: 15,
|
||||
left: 10,
|
||||
onTap:() => {
|
||||
args['exerciseRepository'] = exerciseRepository,
|
||||
args['customerId'] = Cache().userLoggedIn.customerId,
|
||||
@ -77,7 +77,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
style: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/image/exercise_plan_suggested.jpg",
|
||||
top: 150,
|
||||
top: 130,
|
||||
left: 10,
|
||||
onTap:() => {
|
||||
|
||||
@ -88,7 +88,7 @@ class _MyExercisePlanPage extends State<MyExercisePlanPage> with Trans {
|
||||
ImageButton(
|
||||
textAlignment: Alignment.topLeft,
|
||||
text: t("My Special Plan"),
|
||||
style: TextStyle(fontSize: 16, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
style: TextStyle(fontSize: 14, color: Colors.orange, fontWeight: FontWeight.bold,
|
||||
backgroundColor: Colors.black54.withOpacity(0.4)),
|
||||
image: "asset/image/exercise_plan_special.jpg",
|
||||
top: 150,
|
||||
|
@ -63,10 +63,10 @@ class ImageButton extends StatelessWidget {
|
||||
)]
|
||||
),
|
||||
Positioned(
|
||||
top: top,
|
||||
top: text.length > 20 ? 140 : 160,
|
||||
left: left,
|
||||
child: Container(
|
||||
height: 100,
|
||||
height: 200,
|
||||
width: 180,
|
||||
child: InkWell(
|
||||
onTap: onTap ?? onTap,
|
||||
|
Loading…
Reference in New Issue
Block a user