From d923503eb48b29e964f09ed93b95da83213496da Mon Sep 17 00:00:00 2001 From: maxxkim Date: Tue, 19 Dec 2023 17:31:43 +0300 Subject: [PATCH] Progress bar fix, placeholder fix --- assets/images/img_female.png | Bin 0 -> 2495 bytes assets/images/img_male.png | Bin 0 -> 2387 bytes lib/localization/ru/ru_translations.dart | 1 + .../additional_information_screen.dart | 31 +++++----- .../allergies_screen/allergies_screen.dart | 2 +- .../blood_pressure_screen.dart | 2 +- .../body_circumferences_screen.dart | 2 +- .../city_of_living_screen.dart | 9 +-- .../date_of_birth_screen.dart | 17 +++++- .../favorite_foods_screen.dart | 16 ++++- .../favorite_sports_screen.dart | 17 +++++- .../gender_screen/gender_screen.dart | 57 ++++++++++++++++-- .../height_screen/height_screen.dart | 2 +- .../language_select_screen.dart | 16 ++++- .../medicine_intake_screen.dart | 2 +- .../schedule_screen/schedule_screen.dart | 16 ++++- .../weight_screen/weight_screen.dart | 2 +- 17 files changed, 153 insertions(+), 39 deletions(-) create mode 100644 assets/images/img_female.png create mode 100644 assets/images/img_male.png diff --git a/assets/images/img_female.png b/assets/images/img_female.png new file mode 100644 index 0000000000000000000000000000000000000000..39e3e4a34102048e722158e706173aeab9138fb5 GIT binary patch literal 2495 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 ru = { // language_select Screen "lbl_english": "English", + "finish": "Завершить", "preferred_language": "Предпочетаемый язык общения?", // Common String diff --git a/lib/presentation/additional_information_screen/additional_information_screen.dart b/lib/presentation/additional_information_screen/additional_information_screen.dart index 3265f0e0..295a98d7 100644 --- a/lib/presentation/additional_information_screen/additional_information_screen.dart +++ b/lib/presentation/additional_information_screen/additional_information_screen.dart @@ -39,15 +39,22 @@ class _AdditionalInformationScreenState padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v), child: Column(children: [ SizedBox(height: 7.v), - _buildProgressIndicator(context), + Container( + height: 16.v, + width: 343.h, + decoration: BoxDecoration( + color: theme.colorScheme.onPrimary, + borderRadius: BorderRadius.circular(8.h), + border: Border.all( + color: theme.colorScheme.primary, width: 1.h)), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.h), + child: LinearProgressIndicator( + value: 1, + backgroundColor: theme.colorScheme.onPrimary, + valueColor: AlwaysStoppedAnimation( + appTheme.blueA400)))), SizedBox(height: 20.v), - SizedBox( - width: 192.h, - child: Text("additional_information".tr, - maxLines: 2, - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.center, - style: theme.textTheme.headlineSmall)), SizedBox(height: 73.v), _buildTextFormField(context), Spacer(), @@ -58,7 +65,7 @@ class _AdditionalInformationScreenState showSuccessMessage(context); }), SizedBox(height: 17.v), - Text("skip".tr, style: theme.textTheme.bodyLarge) + Text("finish".tr, style: theme.textTheme.bodyLarge) ])))); } @@ -98,12 +105,6 @@ class _AdditionalInformationScreenState height: 257.v, width: 343.h, child: Stack(alignment: Alignment.center, children: [ - Align( - alignment: Alignment.topLeft, - child: Padding( - padding: EdgeInsets.only(left: 10.h, top: 69.v), - child: Text("enter_information".tr, - style: theme.textTheme.bodyLarge))), Align( alignment: Alignment.center, child: Column(mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/presentation/allergies_screen/allergies_screen.dart b/lib/presentation/allergies_screen/allergies_screen.dart index e98c2c54..5ea99b12 100644 --- a/lib/presentation/allergies_screen/allergies_screen.dart +++ b/lib/presentation/allergies_screen/allergies_screen.dart @@ -47,7 +47,7 @@ class _AllergiesScreenState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(8.h), child: LinearProgressIndicator( - value: 0.41, + value: 0.62, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))), diff --git a/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart b/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart index 79c3832e..a1c940af 100644 --- a/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart +++ b/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart @@ -51,7 +51,7 @@ class _BloodPressureScreenState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(8.h), child: LinearProgressIndicator( - value: 0.63, + value: 0.76, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation( appTheme.blueA400))))), diff --git a/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart b/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart index 986271d2..5effd99e 100644 --- a/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart +++ b/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart @@ -48,7 +48,7 @@ class _BodyCircumferencesScreenState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(8.h), child: LinearProgressIndicator( - value: 0.29, + value: 0.40, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))), 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 90688e46..ca154c0b 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 @@ -8,7 +8,7 @@ import 'package:eatvio_app/widgets/custom_drop_down.dart'; import 'package:eatvio_app/widgets/custom_outlined_button.dart'; import 'package:flutter/material.dart'; -class CityOfLivingScreen extends StatefulWidget { +class CityOfLivingScreen extends StatelessWidget { const CityOfLivingScreen({Key? key}) : super(key: key); static Widget builder(BuildContext context) { @@ -19,11 +19,6 @@ class CityOfLivingScreen extends StatefulWidget { child: CityOfLivingScreen()); } - @override - State createState() => _CityOfLivingScreenState(); -} - -class _CityOfLivingScreenState extends State { @override Widget build(BuildContext context) { mediaQueryData = MediaQuery.of(context); @@ -46,7 +41,7 @@ class _CityOfLivingScreenState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(8.h), child: LinearProgressIndicator( - value: 0.23, + value: 0.32, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))), 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 26b3a1ab..1d0037fb 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 @@ -37,8 +37,21 @@ class _DateOfBirthScreenState extends State { padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v), child: Column(children: [ - SizedBox(height: 7.v), - _buildProgressIndicator(context), + Container( + height: 16.v, + width: 343.h, + decoration: BoxDecoration( + color: theme.colorScheme.onPrimary, + borderRadius: BorderRadius.circular(8.h), + border: Border.all( + color: theme.colorScheme.primary, width: 1.h)), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.h), + child: LinearProgressIndicator( + value: 0.24, + backgroundColor: theme.colorScheme.onPrimary, + valueColor: AlwaysStoppedAnimation( + appTheme.blueA400)))), SizedBox(height: 38.v), Text("date_of_birth".tr, style: theme.textTheme.headlineSmall), diff --git a/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart b/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart index 8619d3d1..c3d58c68 100644 --- a/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart +++ b/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart @@ -36,7 +36,21 @@ class _FavoriteFoodsScreenState extends State { padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v), child: Column(children: [ SizedBox(height: 7.v), - _buildProgressIndicator(context), + Container( + height: 16.v, + width: 343.h, + decoration: BoxDecoration( + color: theme.colorScheme.onPrimary, + borderRadius: BorderRadius.circular(8.h), + border: Border.all( + color: theme.colorScheme.primary, width: 1.h)), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.h), + child: LinearProgressIndicator( + value: 0.90, + backgroundColor: theme.colorScheme.onPrimary, + valueColor: AlwaysStoppedAnimation( + appTheme.blueA400)))), SizedBox(height: 19.v), Container( width: 327.h, diff --git a/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart b/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart index aa4c0b37..543a1465 100644 --- a/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart +++ b/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart @@ -38,7 +38,22 @@ class _FavoriteSportsScreenState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox(height: 20.v), - _buildProgressIndicatorSection(context), + Container( + height: 16.v, + width: 343.h, + decoration: BoxDecoration( + color: theme.colorScheme.onPrimary, + borderRadius: BorderRadius.circular(8.h), + border: Border.all( + color: theme.colorScheme.primary, + width: 1.h)), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.h), + child: LinearProgressIndicator( + value: 0.83, + backgroundColor: theme.colorScheme.onPrimary, + valueColor: AlwaysStoppedAnimation( + appTheme.blueA400)))), SizedBox(height: 38.v), Text("your_favorite_sports".tr, style: theme.textTheme.headlineSmall), diff --git a/lib/presentation/gender_screen/gender_screen.dart b/lib/presentation/gender_screen/gender_screen.dart index 6cf57ebc..66c4f3ff 100644 --- a/lib/presentation/gender_screen/gender_screen.dart +++ b/lib/presentation/gender_screen/gender_screen.dart @@ -7,6 +7,8 @@ import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart'; import 'package:eatvio_app/widgets/custom_outlined_button.dart'; import 'package:flutter/material.dart'; +enum Gender { male, female } + class GenderScreen extends StatefulWidget { const GenderScreen({Key? key}) : super(key: key); @@ -23,6 +25,7 @@ class GenderScreen extends StatefulWidget { } class _GenderScreenState extends State { + Gender? _gender; @override Widget build(BuildContext context) { mediaQueryData = MediaQuery.of(context); @@ -36,14 +39,58 @@ class _GenderScreenState extends State { EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v), child: Column(children: [ SizedBox(height: 7.v), - _buildProgressIndicator(context), + Container( + height: 16.v, + width: 343.h, + decoration: BoxDecoration( + color: theme.colorScheme.onPrimary, + borderRadius: BorderRadius.circular(8.h), + border: Border.all( + color: theme.colorScheme.primary, width: 1.h)), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.h), + child: LinearProgressIndicator( + value: 0.16, + backgroundColor: theme.colorScheme.onPrimary, + valueColor: AlwaysStoppedAnimation( + appTheme.blueA400)))), SizedBox(height: 36.v), Text("your_gender".tr, style: theme.textTheme.headlineSmall), - Spacer(flex: 33), - Text(""), - SizedBox(height: 20.v), - Text(""), + RadioListTile( + title: Text('Мужской'), + value: Gender.male, + groupValue: _gender, + onChanged: (value) { + setState(() { + _gender = value as Gender?; + }); + }, + secondary: Image.asset( + _gender == Gender.male + ? 'assets/images/img_male.png' + : 'assets/images/img_male.png', + width: 40, + height: 40, + ), + ), + RadioListTile( + title: Text('Женский'), + value: Gender.female, + groupValue: _gender, + onChanged: (value) { + setState(() { + _gender = value as Gender?; + }); + }, + secondary: Image.asset( + _gender == Gender.female + ? 'assets/images/img_female.png' + : 'assets/images/img_female.png', + width: 40, + height: 40, + ), + ), Spacer(flex: 66), CustomOutlinedButton( text: "continue".tr.toUpperCase(), diff --git a/lib/presentation/height_screen/height_screen.dart b/lib/presentation/height_screen/height_screen.dart index 61108c63..0747e66b 100644 --- a/lib/presentation/height_screen/height_screen.dart +++ b/lib/presentation/height_screen/height_screen.dart @@ -46,7 +46,7 @@ class _HeightScreenState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(8.h), child: LinearProgressIndicator( - value: 0.35, + value: 0.55, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))), diff --git a/lib/presentation/language_select_screen/language_select_screen.dart b/lib/presentation/language_select_screen/language_select_screen.dart index aa3a759e..c947456e 100644 --- a/lib/presentation/language_select_screen/language_select_screen.dart +++ b/lib/presentation/language_select_screen/language_select_screen.dart @@ -35,7 +35,21 @@ class _LanguageSelectScreenState extends State { height: 50.adaptSize, width: 50.adaptSize), SizedBox(height: 20.v), - _buildProgressIndicatorSection(context), + Container( + height: 16.v, + width: 343.h, + decoration: BoxDecoration( + color: theme.colorScheme.onPrimary, + borderRadius: BorderRadius.circular(8.h), + border: Border.all( + color: theme.colorScheme.primary, width: 1.h)), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.h), + child: LinearProgressIndicator( + value: 0.08, + backgroundColor: theme.colorScheme.onPrimary, + valueColor: AlwaysStoppedAnimation( + appTheme.blueA400)))), SizedBox(height: 20.v), Container( width: 262.h, diff --git a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart index b6361dba..7ca0eabd 100644 --- a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart +++ b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart @@ -47,7 +47,7 @@ class _MedicineIntakeScreenState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(8.h), child: LinearProgressIndicator( - value: 0.47, + value: 0.69, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))), diff --git a/lib/presentation/schedule_screen/schedule_screen.dart b/lib/presentation/schedule_screen/schedule_screen.dart index c208cb5b..636bea39 100644 --- a/lib/presentation/schedule_screen/schedule_screen.dart +++ b/lib/presentation/schedule_screen/schedule_screen.dart @@ -36,7 +36,21 @@ class _ScheduleScreenState extends State { padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v), child: Column(children: [ SizedBox(height: 7.v), - _buildProgressIndicator(context), + Container( + height: 16.v, + width: 343.h, + decoration: BoxDecoration( + color: theme.colorScheme.onPrimary, + borderRadius: BorderRadius.circular(8.h), + border: Border.all( + color: theme.colorScheme.primary, width: 1.h)), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.h), + child: LinearProgressIndicator( + value: 0.95, + backgroundColor: theme.colorScheme.onPrimary, + valueColor: AlwaysStoppedAnimation( + appTheme.blueA400)))), SizedBox(height: 38.v), Text("your_schedule".tr, style: theme.textTheme.headlineSmall), diff --git a/lib/presentation/weight_screen/weight_screen.dart b/lib/presentation/weight_screen/weight_screen.dart index a77ab141..abe19eb4 100644 --- a/lib/presentation/weight_screen/weight_screen.dart +++ b/lib/presentation/weight_screen/weight_screen.dart @@ -46,7 +46,7 @@ class _WeightScreenState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(8.h), child: LinearProgressIndicator( - value: 0.35, + value: 0.48, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation( appTheme.blueA400)))),