diff --git a/lib/localization/ru/ru_translations.dart b/lib/localization/ru/ru_translations.dart index 25637d8b..38eb83b7 100644 --- a/lib/localization/ru/ru_translations.dart +++ b/lib/localization/ru/ru_translations.dart @@ -35,7 +35,7 @@ final Map ru = { "your_favorite_sports": "Ваши спортивные увлечения?", // favorite_foods Screen - "favorite_foods": "Люблю продукты:", + "favorite_foods": "Любимые продукты:", "favorite_unfavorite_foods": "Ваши любимые/нелюбимые продукты питания?", "unfavorite_foods": "Нелюбимые продукты:", diff --git a/lib/presentation/additional_information_screen/additional_information_screen.dart b/lib/presentation/additional_information_screen/additional_information_screen.dart index aae3756a..96559903 100644 --- a/lib/presentation/additional_information_screen/additional_information_screen.dart +++ b/lib/presentation/additional_information_screen/additional_information_screen.dart @@ -42,7 +42,7 @@ class AdditionalInformationScreen extends StatelessWidget { textAlign: TextAlign.center, style: theme.textTheme.headlineSmall)), SizedBox(height: 73.v), - _buildNinetyThree(context), + _buildTextFormField(context), Spacer(), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -86,7 +86,7 @@ class AdditionalInformationScreen extends StatelessWidget { } /// Section Widget - Widget _buildNinetyThree(BuildContext context) { + Widget _buildTextFormField(BuildContext context) { return SizedBox( height: 257.v, width: 343.h, diff --git a/lib/presentation/allergies_screen/allergies_screen.dart b/lib/presentation/allergies_screen/allergies_screen.dart index 7e7cc7a4..01d732de 100644 --- a/lib/presentation/allergies_screen/allergies_screen.dart +++ b/lib/presentation/allergies_screen/allergies_screen.dart @@ -50,7 +50,7 @@ class AllergiesScreen extends StatelessWidget { Text("allergies_presence".tr, style: CustomTextStyles.headlineSmallMulish), Spacer(flex: 36), - _buildNinetyThree(context), + _buildTextFormField(context), Spacer(flex: 63), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -78,7 +78,7 @@ class AllergiesScreen extends StatelessWidget { } /// Section Widget - Widget _buildNinetyThree(BuildContext context) { + Widget _buildTextFormField(BuildContext context) { return Column(children: [ Text("fill_in_information".tr, style: CustomTextStyles.titleMediumSegoeUI), diff --git a/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart b/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart index 37572c5e..2d0a0a34 100644 --- a/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart +++ b/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart @@ -42,9 +42,9 @@ class FavoriteFoodsScreen extends StatelessWidget { textAlign: TextAlign.center, style: theme.textTheme.headlineSmall)), SizedBox(height: 23.v), - _buildNinetyThree(context), + _buildTextFormField(context), SizedBox(height: 22.v), - _buildNinetyThree1(context), + _buildTextFormField1(context), SizedBox(height: 27.v), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -89,7 +89,7 @@ class FavoriteFoodsScreen extends StatelessWidget { } /// Section Widget - Widget _buildNinetyThree(BuildContext context) { + Widget _buildTextFormField(BuildContext context) { return Column(children: [ Text("favorite_foods".tr, style: CustomTextStyles.titleMediumSegoeUI), SizedBox(height: 2.v), @@ -100,13 +100,13 @@ class FavoriteFoodsScreen extends StatelessWidget { return CustomTextFormField( controller: enterinformationController, hintText: "enter_information".tr, - maxLines: 8); + maxLines: 7); }) ]); } /// Section Widget - Widget _buildNinetyThree1(BuildContext context) { + Widget _buildTextFormField1(BuildContext context) { return Column(children: [ Text("unfavorite_foods".tr, style: CustomTextStyles.titleMediumSegoeUI), SizedBox(height: 2.v), @@ -118,7 +118,7 @@ class FavoriteFoodsScreen extends StatelessWidget { controller: enterinformationController1, hintText: "enter_information".tr, textInputAction: TextInputAction.done, - maxLines: 8); + maxLines: 7); }) ]); } diff --git a/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart b/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart index 25a10a77..0ebdf9d6 100644 --- a/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart +++ b/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart @@ -38,7 +38,7 @@ class FavoriteSportsScreen extends StatelessWidget { Text("your_favorite_sports".tr, style: theme.textTheme.headlineSmall), Spacer(flex: 32), - _buildNinetyThreeSection(context), + _buildTextFormFieldSection(context), Spacer(flex: 67), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -83,7 +83,7 @@ class FavoriteSportsScreen extends StatelessWidget { } /// Section Widget - Widget _buildNinetyThreeSection(BuildContext context) { + Widget _buildTextFormFieldSection(BuildContext context) { return Column(children: [ Text("fill_in_information".tr, style: CustomTextStyles.titleMediumSegoeUI), diff --git a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart index 25825422..51f7e73c 100644 --- a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart +++ b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart @@ -56,7 +56,7 @@ class MedicineIntakeScreen extends StatelessWidget { textAlign: TextAlign.center, style: CustomTextStyles.headlineSmallMulish)), SizedBox(height: 86.v), - _buildNinetyThree(context), + _buildTextFormField(context), Spacer(), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -84,7 +84,7 @@ class MedicineIntakeScreen extends StatelessWidget { } /// Section Widget - Widget _buildNinetyThree(BuildContext context) { + Widget _buildTextFormField(BuildContext context) { return Column(children: [ Text("fill_in_information".tr, style: CustomTextStyles.titleMediumSegoeUI), diff --git a/lib/presentation/schedule_screen/schedule_screen.dart b/lib/presentation/schedule_screen/schedule_screen.dart index 179f4705..3e29f648 100644 --- a/lib/presentation/schedule_screen/schedule_screen.dart +++ b/lib/presentation/schedule_screen/schedule_screen.dart @@ -36,7 +36,7 @@ class ScheduleScreen extends StatelessWidget { Text("your_schedule".tr, style: theme.textTheme.headlineSmall), SizedBox(height: 67.v), - _buildNinetyThree(context), + _buildTextFormField(context), Spacer(), CustomOutlinedButton( text: "continue".tr.toUpperCase(), @@ -81,7 +81,7 @@ class ScheduleScreen extends StatelessWidget { } /// Section Widget - Widget _buildNinetyThree(BuildContext context) { + Widget _buildTextFormField(BuildContext context) { return Column(children: [ Container( width: 324.h,