From 27c1d26dfd5a2a0319fef1c8026d09e7868b00b4 Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Wed, 21 Oct 2020 21:24:43 +0200 Subject: [PATCH] wt1.1.2e NumberPicker, error fix --- i18n/en.json | 2 +- lib/view/exercise_execute_plan_add_page.dart | 2 +- lib/view/exercise_plan_custom_detail_add_page.dart | 2 +- lib/view/mydevelopment_page.dart | 12 ++++++------ lib/view/myexcercise_plan_page.dart | 12 ++++++------ lib/widgets/image_button.dart | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index afdff05..aac6282 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -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", diff --git a/lib/view/exercise_execute_plan_add_page.dart b/lib/view/exercise_execute_plan_add_page.dart index 37684f3..dc99299 100644 --- a/lib/view/exercise_execute_plan_add_page.dart +++ b/lib/view/exercise_execute_plan_add_page.dart @@ -162,7 +162,7 @@ class _ExerciseExecuteAddPage extends State 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), diff --git a/lib/view/exercise_plan_custom_detail_add_page.dart b/lib/view/exercise_plan_custom_detail_add_page.dart index 012e2bd..27ad4ca 100644 --- a/lib/view/exercise_plan_custom_detail_add_page.dart +++ b/lib/view/exercise_plan_custom_detail_add_page.dart @@ -127,7 +127,7 @@ class _ExercisePlanDetailAddPage extends State with T highlightSelectedValue: true, initialValue: bloc.quantityUnit.toInt(), minValue: 0, - maxValue: 200, + maxValue: 650, step: 1, onChanged: (value) => { bloc.add(ExercisePlanCustomAddChangeQuantityUnit(quantity: value.toDouble())) diff --git a/lib/view/mydevelopment_page.dart b/lib/view/mydevelopment_page.dart index 68c776d..2736bbb 100644 --- a/lib/view/mydevelopment_page.dart +++ b/lib/view/mydevelopment_page.dart @@ -44,10 +44,10 @@ class _MyDevelopmentPage extends State 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 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 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 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, diff --git a/lib/view/myexcercise_plan_page.dart b/lib/view/myexcercise_plan_page.dart index 3d51620..cc50e9b 100644 --- a/lib/view/myexcercise_plan_page.dart +++ b/lib/view/myexcercise_plan_page.dart @@ -23,7 +23,7 @@ class _MyExercisePlanPage extends State 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 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 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 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 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, diff --git a/lib/widgets/image_button.dart b/lib/widgets/image_button.dart index f4bc930..e85d78d 100644 --- a/lib/widgets/image_button.dart +++ b/lib/widgets/image_button.dart @@ -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,