Hasan/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

Progress bar fix, placeholder fix

Browse Source
This commit is contained in:
maxxkim
2023-12-19 17:31:43 +03:00
parent a39fb847fe
commit d923503eb4
17 changed files with 153 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/img_female.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
assets/images/img_male.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

1
lib/localization/ru/ru_translations.dart
View File

@@ -51,6 +51,7 @@ final Map<String, String> ru = {
// language_select Screen
"lbl_english": "English",
"finish": "Завершить",
"preferred_language": "Предпочетаемый язык общения?",
// Common String

31
lib/presentation/additional_information_screen/additional_information_screen.dart
View File

@@ -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<Color>(
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: [

2
lib/presentation/allergies_screen/allergies_screen.dart
View File

@@ -47,7 +47,7 @@ class _AllergiesScreenState extends State<AllergiesScreen> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.h),
child: LinearProgressIndicator(
value: 0.41,
value: 0.62,
backgroundColor: theme.colorScheme.onPrimary,
valueColor: AlwaysStoppedAnimation<Color>(
appTheme.blueA400)))),

2
lib/presentation/blood_pressure_screen/blood_pressure_screen.dart
View File

@@ -51,7 +51,7 @@ class _BloodPressureScreenState extends State<BloodPressureScreen> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.h),
child: LinearProgressIndicator(
value: 0.63,
value: 0.76,
backgroundColor: theme.colorScheme.onPrimary,
valueColor: AlwaysStoppedAnimation<Color>(
appTheme.blueA400))))),

2
lib/presentation/body_circumferences_screen/body_circumferences_screen.dart
View File

@@ -48,7 +48,7 @@ class _BodyCircumferencesScreenState extends State<BodyCircumferencesScreen> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.h),
child: LinearProgressIndicator(
value: 0.29,
value: 0.40,
backgroundColor: theme.colorScheme.onPrimary,
valueColor: AlwaysStoppedAnimation<Color>(
appTheme.blueA400)))),

9
lib/presentation/city_of_living_screen/city_of_living_screen.dart
View File

@@ -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<CityOfLivingScreen> createState() => _CityOfLivingScreenState();
}
class _CityOfLivingScreenState extends State<CityOfLivingScreen> {
@override
Widget build(BuildContext context) {
mediaQueryData = MediaQuery.of(context);
@@ -46,7 +41,7 @@ class _CityOfLivingScreenState extends State<CityOfLivingScreen> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.h),
child: LinearProgressIndicator(
value: 0.23,
value: 0.32,
backgroundColor: theme.colorScheme.onPrimary,
valueColor: AlwaysStoppedAnimation<Color>(
appTheme.blueA400)))),

17
lib/presentation/date_of_birth_screen/date_of_birth_screen.dart
View File

@@ -37,8 +37,21 @@ class _DateOfBirthScreenState extends State<DateOfBirthScreen> {
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<Color>(
appTheme.blueA400)))),
SizedBox(height: 38.v),
Text("date_of_birth".tr,
style: theme.textTheme.headlineSmall),

16
lib/presentation/favorite_foods_screen/favorite_foods_screen.dart
View File

@@ -36,7 +36,21 @@ class _FavoriteFoodsScreenState extends State<FavoriteFoodsScreen> {
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<Color>(
appTheme.blueA400)))),
SizedBox(height: 19.v),
Container(
width: 327.h,

17
lib/presentation/favorite_sports_screen/favorite_sports_screen.dart
View File

@@ -38,7 +38,22 @@ class _FavoriteSportsScreenState extends State<FavoriteSportsScreen> {
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<Color>(
appTheme.blueA400)))),
SizedBox(height: 38.v),
Text("your_favorite_sports".tr,
style: theme.textTheme.headlineSmall),

57
lib/presentation/gender_screen/gender_screen.dart
View File

@@ -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<GenderScreen> {
Gender? _gender;
@override
Widget build(BuildContext context) {
mediaQueryData = MediaQuery.of(context);
@@ -36,14 +39,58 @@ class _GenderScreenState extends State<GenderScreen> {
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<Color>(
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(),

2
lib/presentation/height_screen/height_screen.dart
View File

@@ -46,7 +46,7 @@ class _HeightScreenState extends State<HeightScreen> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.h),
child: LinearProgressIndicator(
value: 0.35,
value: 0.55,
backgroundColor: theme.colorScheme.onPrimary,
valueColor: AlwaysStoppedAnimation<Color>(
appTheme.blueA400)))),

16
lib/presentation/language_select_screen/language_select_screen.dart
View File

@@ -35,7 +35,21 @@ class _LanguageSelectScreenState extends State<LanguageSelectScreen> {
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<Color>(
appTheme.blueA400)))),
SizedBox(height: 20.v),
Container(
width: 262.h,

2
lib/presentation/medicine_intake_screen/medicine_intake_screen.dart
View File

@@ -47,7 +47,7 @@ class _MedicineIntakeScreenState extends State<MedicineIntakeScreen> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.h),
child: LinearProgressIndicator(
value: 0.47,
value: 0.69,
backgroundColor: theme.colorScheme.onPrimary,
valueColor: AlwaysStoppedAnimation<Color>(
appTheme.blueA400)))),

16
lib/presentation/schedule_screen/schedule_screen.dart
View File

@@ -36,7 +36,21 @@ class _ScheduleScreenState extends State<ScheduleScreen> {
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<Color>(
appTheme.blueA400)))),
SizedBox(height: 38.v),
Text("your_schedule".tr,
style: theme.textTheme.headlineSmall),

2
lib/presentation/weight_screen/weight_screen.dart
View File

@@ -46,7 +46,7 @@ class _WeightScreenState extends State<WeightScreen> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.h),
child: LinearProgressIndicator(
value: 0.35,
value: 0.48,
backgroundColor: theme.colorScheme.onPrimary,
valueColor: AlwaysStoppedAnimation<Color>(
appTheme.blueA400)))),