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

Layout fix

Browse Source
This commit is contained in:
maxxkim
2023-12-26 16:49:01 +03:00
parent a8ed8b75b1
commit 14cd567428
14 changed files with 80 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,6 @@ class AdditionalInformationScreen extends StatelessWidget {
print(response.body);
});
}),
SizedBox(height: 17.v),
]))));
}

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

@@ -56,10 +56,10 @@ class _AllergiesScreenState extends State<AllergiesScreen> {
appTheme.blueA400)))),
SizedBox(height: 22.v),
Text("allergies_presence".tr,
style: CustomTextStyles.headlineSmallMulish),
style: theme.textTheme.headlineSmall),
Spacer(flex: 36),
_buildTextFormField(context),
Spacer(flex: 63),
Spacer(flex: 54),
BlocBuilder<AllergiesBloc, AllergiesState>(
builder: (context, state) {
return NextStepButton(
@@ -79,8 +79,21 @@ class _AllergiesScreenState extends State<AllergiesScreen> {
);
});
}),
SizedBox(height: 17.v),
Text("skip".tr, style: theme.textTheme.bodyLarge)
BlocBuilder<AllergiesBloc, AllergiesState>(
builder: (context, state) {
return GestureDetector(
onTap: () {
UserRegistrationSheet sheet =
state.allergiesModelObj!.userRegistrationSheet;
Navigator.pushNamed(
context,
AppRoutes.medicineIntakeScreen,
arguments: sheet,
);
},
child: Text("skip".tr, style: theme.textTheme.bodyLarge),
);
}),
]))));
}

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

@@ -188,8 +188,21 @@ class _BloodPressureScreenState extends State<BloodPressureScreen> {
);
});
}),
SizedBox(height: 17.v),
Text("skip".tr, style: theme.textTheme.bodyLarge)
BlocBuilder<BloodPressureBloc, BloodPressureState>(
builder: (context, state) {
return GestureDetector(
onTap: () {
UserRegistrationSheet sheet =
state.bloodPressureModelObj!.userRegistrationSheet;
Navigator.pushNamed(
context,
AppRoutes.favoriteSportsScreen,
arguments: sheet,
);
},
child: Text("skip".tr, style: theme.textTheme.bodyLarge),
);
}),
]))));
}

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

@@ -122,7 +122,6 @@ class BodyCircumferencesScreen extends StatelessWidget {
);
});
}),
SizedBox(height: 17.v),
]))));
}

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

@@ -121,7 +121,6 @@ class CityOfLivingScreen extends StatelessWidget {
);
});
}),
SizedBox(height: 17.v),
]))));
}

12
lib/presentation/credentials_screen/credentials_screen.dart
View File

@@ -111,7 +111,6 @@ class CredentialsScreen extends StatelessWidget {
);
});
}),
SizedBox(height: 17.v),
]))));
}
@@ -119,18 +118,7 @@ class CredentialsScreen extends StatelessWidget {
PreferredSizeWidget _buildAppBar(BuildContext context) {
return CustomAppBar(
leadingWidth: 29.h,
leading: AppbarLeadingImage(
imagePath: ImageConstant.imgArrowLeft,
margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
onTap: () {
onTapArrowLeft(context);
}),
centerTitle: true,
title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio));
}
/// Navigates to the previous screen.
onTapArrowLeft(BuildContext context) {
NavigatorService.goBack();
}
}

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

@@ -80,7 +80,6 @@ class _DateOfBirthScreenState extends State<DateOfBirthScreen> {
);
});
}),
SizedBox(height: 17.v),
]))));
});
}

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

@@ -74,7 +74,7 @@ class _FavoriteFoodsScreenState extends State<FavoriteFoodsScreen> {
return NextStepButton(
text: "continue".tr.toUpperCase(),
margin: EdgeInsets.only(
left: 16.h, right: 16.h, bottom: 50.v),
left: 16.h, right: 16.h, bottom: 40.v),
buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
onPressed: () {
UserRegistrationSheet sheet = state
@@ -90,8 +90,21 @@ class _FavoriteFoodsScreenState extends State<FavoriteFoodsScreen> {
);
});
}),
SizedBox(height: 17.v),
Text("skip".tr, style: theme.textTheme.bodyLarge)
BlocBuilder<FavoriteFoodsBloc, FavoriteFoodsState>(
builder: (context, state) {
return GestureDetector(
onTap: () {
UserRegistrationSheet sheet =
state.favoriteFoodsModelObj!.userRegistrationSheet;
Navigator.pushNamed(
context,
AppRoutes.additionalInformationScreen,
arguments: sheet,
);
},
child: Text("skip".tr, style: theme.textTheme.bodyLarge),
);
}),
]))));
}

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

@@ -84,9 +84,22 @@ class _FavoriteSportsScreenState extends State<FavoriteSportsScreen> {
);
});
}),
SizedBox(height: 17.v),
Text("skip".tr, style: theme.textTheme.bodyLarge),
SizedBox(height: 4.v)
BlocBuilder<FavoriteSportsBloc, FavoriteSportsState>(
builder: (context, state) {
return GestureDetector(
onTap: () {
UserRegistrationSheet sheet = state
.favoriteSportsModelObj!.userRegistrationSheet;
Navigator.pushNamed(
context,
AppRoutes.favoriteFoodsScreen,
arguments: sheet,
);
},
child:
Text("skip".tr, style: theme.textTheme.bodyLarge),
);
}),
]))));
}

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

@@ -106,7 +106,6 @@ class _GenderScreenState extends State<GenderScreen> {
);
});
}),
SizedBox(height: 17.v),
]))));
});
}

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

@@ -103,7 +103,6 @@ class _HeightScreenState extends State<HeightScreen> {
);
});
}),
SizedBox(height: 17.v),
]))));
}

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

@@ -63,7 +63,7 @@ class _MedicineIntakeScreenState extends State<MedicineIntakeScreen> {
maxLines: 2,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
style: CustomTextStyles.headlineSmallMulish)),
style: theme.textTheme.headlineSmall)),
SizedBox(height: 86.v),
_buildTextFormField(context),
Spacer(),
@@ -86,8 +86,21 @@ class _MedicineIntakeScreenState extends State<MedicineIntakeScreen> {
);
});
}),
SizedBox(height: 17.v),
Text("skip".tr, style: theme.textTheme.bodyLarge)
BlocBuilder<MedicineIntakeBloc, MedicineIntakeState>(
builder: (context, state) {
return GestureDetector(
onTap: () {
UserRegistrationSheet sheet =
state.medicineIntakeModelObj!.userRegistrationSheet;
Navigator.pushNamed(
context,
AppRoutes.bloodPressureScreen,
arguments: sheet,
);
},
child: Text("skip".tr, style: theme.textTheme.bodyLarge),
);
}),
]))));
}

1
lib/presentation/name_screen/name_screen.dart
View File

@@ -94,7 +94,6 @@ class NameScreen extends StatelessWidget {
);
});
}),
SizedBox(height: 17.v),
]))));
}

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

@@ -103,7 +103,6 @@ class _WeightScreenState extends State<WeightScreen> {
);
});
}),
SizedBox(height: 17.v),
]))));
}