diff --git a/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart b/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart index 5effd99e..3ad5107b 100644 --- a/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart +++ b/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart @@ -56,7 +56,18 @@ class _BodyCircumferencesScreenState extends State { Text("initial_measurements".tr, style: theme.textTheme.headlineSmall), SizedBox(height: 93.v), - _buildTwentySeven(context), + Column(children: [ + Text("chest_circumference".tr, + style: theme.textTheme.bodyLarge), + SizedBox(height: 3.v), + BlocSelector( + selector: (state) => state.valueController, + builder: (context, valueController) { + return CustomTextFormField( + controller: valueController, hintText: "90".tr); + }) + ]), SizedBox(height: 19.v), Text("waist_circumference".tr, style: theme.textTheme.bodyLarge), @@ -89,7 +100,6 @@ class _BodyCircumferencesScreenState extends State { navigateToWeight(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) ])))); } @@ -107,21 +117,6 @@ class _BodyCircumferencesScreenState extends State { title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio)); } - /// Section Widget - Widget _buildTwentySeven(BuildContext context) { - return Column(children: [ - Text("chest_circumference".tr, style: theme.textTheme.bodyLarge), - SizedBox(height: 3.v), - BlocSelector( - selector: (state) => state.valueController, - builder: (context, valueController) { - return CustomTextFormField( - controller: valueController, hintText: "90".tr); - }) - ]); - } - /// Navigates to the previous screen. onTapArrowLeft(BuildContext context) { NavigatorService.goBack(); diff --git a/lib/presentation/city_of_living_screen/city_of_living_screen.dart b/lib/presentation/city_of_living_screen/city_of_living_screen.dart index ca154c0b..60650bf2 100644 --- a/lib/presentation/city_of_living_screen/city_of_living_screen.dart +++ b/lib/presentation/city_of_living_screen/city_of_living_screen.dart @@ -106,7 +106,6 @@ class CityOfLivingScreen extends StatelessWidget { navigateToCircumferences(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) ])))); } diff --git a/lib/presentation/credentials_screen/credentials_screen.dart b/lib/presentation/credentials_screen/credentials_screen.dart index 091f5b29..56ed8cf0 100644 --- a/lib/presentation/credentials_screen/credentials_screen.dart +++ b/lib/presentation/credentials_screen/credentials_screen.dart @@ -98,7 +98,6 @@ class _CredentialsScreenState extends State { navigateToName(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) ])))); } diff --git a/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart b/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart index b9325910..32e7c482 100644 --- a/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart +++ b/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart @@ -65,10 +65,6 @@ class _DateOfBirthScreenState extends State { navigateToCity(context); }), SizedBox(height: 17.v), - Padding( - padding: EdgeInsets.only(left: 8.h), - child: - Text("skip".tr, style: theme.textTheme.bodyLarge)) ])))); }); } @@ -87,23 +83,6 @@ class _DateOfBirthScreenState extends State { title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio)); } - /// Section Widget - Widget _buildProgressIndicator(BuildContext context) { - return Container( - width: 343.h, - padding: EdgeInsets.symmetric(horizontal: 4.h, vertical: 3.v), - decoration: AppDecoration.outlinePrimary - .copyWith(borderRadius: BorderRadiusStyle.circleBorder8), - child: Container( - height: 8.v, - width: 60.h, - decoration: BoxDecoration( - color: appTheme.blueA400, - borderRadius: BorderRadius.circular(4.h), - border: - Border.all(color: theme.colorScheme.primary, width: 1.h)))); - } - /// Section Widget Widget _buildDateInput(BuildContext context) { return Container( diff --git a/lib/presentation/gender_screen/gender_screen.dart b/lib/presentation/gender_screen/gender_screen.dart index 66c4f3ff..94ea3c6d 100644 --- a/lib/presentation/gender_screen/gender_screen.dart +++ b/lib/presentation/gender_screen/gender_screen.dart @@ -99,7 +99,6 @@ class _GenderScreenState extends State { navigateToDate(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) ])))); }); } @@ -118,23 +117,6 @@ class _GenderScreenState extends State { title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio)); } - /// Section Widget - Widget _buildProgressIndicator(BuildContext context) { - return Container( - width: 343.h, - padding: EdgeInsets.symmetric(horizontal: 4.h, vertical: 3.v), - decoration: AppDecoration.outlinePrimary - .copyWith(borderRadius: BorderRadiusStyle.circleBorder8), - child: Container( - height: 8.v, - width: 40.h, - decoration: BoxDecoration( - color: appTheme.blueA400, - borderRadius: BorderRadius.circular(4.h), - border: - Border.all(color: theme.colorScheme.primary, width: 1.h)))); - } - /// Navigates to the previous screen. onTapArrowLeft(BuildContext context) { NavigatorService.goBack(); diff --git a/lib/presentation/height_screen/height_screen.dart b/lib/presentation/height_screen/height_screen.dart index 0747e66b..71144d42 100644 --- a/lib/presentation/height_screen/height_screen.dart +++ b/lib/presentation/height_screen/height_screen.dart @@ -51,7 +51,37 @@ class _HeightScreenState extends State { valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))), SizedBox(height: 39.v), - _buildTwentySix(context), + Column(children: [ + Text("height_measurements".tr, + style: theme.textTheme.headlineSmall), + SizedBox(height: 174.v), + Column(children: [ + Text("your_height".tr, style: theme.textTheme.bodyLarge), + SizedBox(height: 4.v), + BlocSelector( + selector: (state) => state.heightModelObj, + builder: (context, heightModelObj) { + return CustomDropDown( + icon: Container( + margin: EdgeInsets.fromLTRB( + 30.h, 11.v, 17.h, 11.v), + decoration: BoxDecoration( + borderRadius: + BorderRadius.circular(1.h)), + child: CustomImageView( + imagePath: ImageConstant.imgFavorite, + height: 12.adaptSize, + width: 12.adaptSize)), + hintText: "170", + items: heightModelObj?.dropdownItemList ?? [], + onChanged: (value) { + context + .read() + .add(ChangeDropDownEvent(value: value)); + }); + }) + ]) + ]), Spacer(), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -60,7 +90,6 @@ class _HeightScreenState extends State { navigateToAllergies(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) ])))); } @@ -78,43 +107,6 @@ class _HeightScreenState extends State { title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio)); } - /// Section Widget - Widget _buildWeight(BuildContext context) { - return Column(children: [ - Text("your_height".tr, style: theme.textTheme.bodyLarge), - SizedBox(height: 4.v), - BlocSelector( - selector: (state) => state.heightModelObj, - builder: (context, heightModelObj) { - return CustomDropDown( - icon: Container( - margin: EdgeInsets.fromLTRB(30.h, 11.v, 17.h, 11.v), - decoration: - BoxDecoration(borderRadius: BorderRadius.circular(1.h)), - child: CustomImageView( - imagePath: ImageConstant.imgFavorite, - height: 12.adaptSize, - width: 12.adaptSize)), - hintText: "170", - items: heightModelObj?.dropdownItemList ?? [], - onChanged: (value) { - context - .read() - .add(ChangeDropDownEvent(value: value)); - }); - }) - ]); - } - - /// Section Widget - Widget _buildTwentySix(BuildContext context) { - return Column(children: [ - Text("height_measurements".tr, style: theme.textTheme.headlineSmall), - SizedBox(height: 174.v), - _buildWeight(context) - ]); - } - /// Navigates to the previous screen. onTapArrowLeft(BuildContext context) { NavigatorService.goBack(); diff --git a/lib/presentation/name_screen/name_screen.dart b/lib/presentation/name_screen/name_screen.dart index 203513d6..7c97fa86 100644 --- a/lib/presentation/name_screen/name_screen.dart +++ b/lib/presentation/name_screen/name_screen.dart @@ -82,7 +82,6 @@ class _NameScreenState extends State { navigateToGender(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) ])))); } diff --git a/lib/presentation/weight_screen/weight_screen.dart b/lib/presentation/weight_screen/weight_screen.dart index abe19eb4..61cfed51 100644 --- a/lib/presentation/weight_screen/weight_screen.dart +++ b/lib/presentation/weight_screen/weight_screen.dart @@ -51,7 +51,37 @@ class _WeightScreenState extends State { valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))), SizedBox(height: 39.v), - _buildTwentySix(context), + Column(children: [ + Text("weight_measurements".tr, + style: theme.textTheme.headlineSmall), + SizedBox(height: 174.v), + Column(children: [ + Text("your_weight".tr, style: theme.textTheme.bodyLarge), + SizedBox(height: 4.v), + BlocSelector( + selector: (state) => state.weightModelObj, + builder: (context, weightModelObj) { + return CustomDropDown( + icon: Container( + margin: EdgeInsets.fromLTRB( + 30.h, 11.v, 17.h, 11.v), + decoration: BoxDecoration( + borderRadius: + BorderRadius.circular(1.h)), + child: CustomImageView( + imagePath: ImageConstant.imgFavorite, + height: 12.adaptSize, + width: 12.adaptSize)), + hintText: "70", + items: weightModelObj?.dropdownItemList ?? [], + onChanged: (value) { + context + .read() + .add(ChangeDropDownEvent(value: value)); + }); + }) + ]) + ]), Spacer(), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -60,7 +90,6 @@ class _WeightScreenState extends State { navigateToHeight(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) ])))); } @@ -78,43 +107,6 @@ class _WeightScreenState extends State { title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio)); } - /// Section Widget - Widget _buildWeight(BuildContext context) { - return Column(children: [ - Text("your_weight".tr, style: theme.textTheme.bodyLarge), - SizedBox(height: 4.v), - BlocSelector( - selector: (state) => state.weightModelObj, - builder: (context, weightModelObj) { - return CustomDropDown( - icon: Container( - margin: EdgeInsets.fromLTRB(30.h, 11.v, 17.h, 11.v), - decoration: - BoxDecoration(borderRadius: BorderRadius.circular(1.h)), - child: CustomImageView( - imagePath: ImageConstant.imgFavorite, - height: 12.adaptSize, - width: 12.adaptSize)), - hintText: "70", - items: weightModelObj?.dropdownItemList ?? [], - onChanged: (value) { - context - .read() - .add(ChangeDropDownEvent(value: value)); - }); - }) - ]); - } - - /// Section Widget - Widget _buildTwentySix(BuildContext context) { - return Column(children: [ - Text("weight_measurements".tr, style: theme.textTheme.headlineSmall), - SizedBox(height: 174.v), - _buildWeight(context) - ]); - } - /// Navigates to the previous screen. onTapArrowLeft(BuildContext context) { NavigatorService.goBack();