fix: remove sizer

This commit is contained in:
mso7nueh
2024-09-11 13:56:33 +03:00
parent 220e13d525
commit 3aa9e8cba8
38 changed files with 359 additions and 413 deletions

View File

@@ -46,14 +46,14 @@ class DietCreateScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -47,14 +47,14 @@ class DietEditScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -74,20 +74,20 @@ class DietSelectScreen extends StatelessWidget {
],
),
child: CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
height: 54,
leadingWidth: 28,
leading: AppbarLeadingImage(
imagePath: ImageConstant.imgArrowLeft,
margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
margin: EdgeInsets.only(left: 16, top: 15, bottom: 15),
onTap: () => GoRouter.of(context).pop(),
),
title: Padding(
padding: EdgeInsets.only(left: 20.h),
padding: EdgeInsets.only(left: 20),
child: Row(
children: [
AppbarSubtitle(
text: "Диеты",
margin: EdgeInsets.only(left: 80.h, top: 12.v, bottom: 9.v),
margin: EdgeInsets.only(left: 80, top: 12, bottom: 9),
),
Spacer(),
Padding(

View File

@@ -48,14 +48,14 @@ class DietScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -50,14 +50,14 @@ class BlogPostEditScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -17,11 +17,11 @@ class CommentWidget extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -54,15 +54,15 @@ class CommentWidget extends StatelessWidget {
Expanded(
child: Padding(
padding: EdgeInsets.only(
left: 12.h,
top: 2.v,
bottom: 11.v,
left: 12,
top: 2,
bottom: 11,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: 227.h,
width: 227,
child: Row(
children: [
Text(
@@ -71,7 +71,7 @@ class CommentWidget extends StatelessWidget {
),
Spacer(),
Padding(
padding: EdgeInsets.only(left: 6.h),
padding: EdgeInsets.only(left: 6),
child: Text(
commentModelObj.dateText!,
style: theme.textTheme.bodyMedium,
@@ -80,7 +80,7 @@ class CommentWidget extends StatelessWidget {
],
),
),
SizedBox(height: 6.v),
SizedBox(height: 6),
Text(
commentModelObj.greetingText!,
style: CustomTextStyles.bodyMediumBluegray800,
@@ -91,8 +91,8 @@ class CommentWidget extends StatelessWidget {
),
CustomImageView(
imagePath: ImageConstant.imgSend,
height: 30.v,
width: 30.h,
height: 30,
width: 30,
margin: EdgeInsets.only(left: 5),
),
],

View File

@@ -118,34 +118,34 @@ class CustomSearchView extends StatelessWidget {
),
prefixIconConstraints: prefixConstraints ??
BoxConstraints(
maxHeight: 40.v,
maxHeight: 40,
),
suffixIconConstraints: suffixConstraints ??
BoxConstraints(
maxHeight: 40.v,
maxHeight: 40,
),
isDense: true,
contentPadding: contentPadding ??
EdgeInsets.only(
top: 11.v,
right: 11.h,
bottom: 11.v,
top: 11,
right: 11,
bottom: 11,
),
fillColor: fillColor ?? Colors.grey[200],
filled: filled,
border: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(8.h),
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
enabledBorder: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(8.h),
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
focusedBorder: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(8.h),
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
);

View File

@@ -118,34 +118,34 @@ class CustomSearchView extends StatelessWidget {
),
prefixIconConstraints: prefixConstraints ??
BoxConstraints(
maxHeight: 40.v,
maxHeight: 40,
),
suffixIconConstraints: suffixConstraints ??
BoxConstraints(
maxHeight: 40.v,
maxHeight: 40,
),
isDense: true,
contentPadding: contentPadding ??
EdgeInsets.only(
top: 11.v,
right: 11.h,
bottom: 11.v,
top: 11,
right: 11,
bottom: 11,
),
fillColor: fillColor ?? Colors.grey[200],
filled: filled,
border: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(8.h),
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
enabledBorder: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(8.h),
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
focusedBorder: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(8.h),
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
);

View File

@@ -46,14 +46,14 @@ class PlanCreateScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -47,14 +47,14 @@ class PlanEditScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -74,20 +74,20 @@ class PlanSelectScreen extends StatelessWidget {
],
),
child: CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
height: 54,
leadingWidth: 28,
leading: AppbarLeadingImage(
imagePath: ImageConstant.imgArrowLeft,
margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
margin: EdgeInsets.only(left: 16, top: 15, bottom: 15),
onTap: () => GoRouter.of(context).pop(),
),
title: Padding(
padding: EdgeInsets.only(left: 20.h),
padding: EdgeInsets.only(left: 20),
child: Row(
children: [
AppbarSubtitle(
text: "Планы",
margin: EdgeInsets.only(left: 80.h, top: 12.v, bottom: 9.v),
margin: EdgeInsets.only(left: 80, top: 12, bottom: 9),
),
Spacer(),
Padding(

View File

@@ -48,14 +48,14 @@ class PlanScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -73,11 +73,11 @@ class MyProfileScreen extends StatelessWidget {
padding: EdgeInsets.all(16),
child: Column(
children: [
SizedBox(height: 30.v),
SizedBox(height: 30),
Container(
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
horizontal: 24,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,
@@ -93,11 +93,11 @@ class MyProfileScreen extends StatelessWidget {
),
child: _buildInfo(context, state),
),
SizedBox(height: 15.v),
SizedBox(height: 15),
Container(
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
horizontal: 24,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,
@@ -113,12 +113,12 @@ class MyProfileScreen extends StatelessWidget {
),
child: _buildCarousel(context, state),
),
SizedBox(height: 15.v),
SizedBox(height: 15),
if (!state.plans!.isEmpty)
Container(
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
horizontal: 24,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,
@@ -139,7 +139,7 @@ class MyProfileScreen extends StatelessWidget {
state.plans?.map((plan) => plan['state']).toList(),
),
),
SizedBox(height: 5.v),
SizedBox(height: 5),
],
),
),
@@ -169,7 +169,7 @@ class MyProfileScreen extends StatelessWidget {
),
),
AppbarSubtitle(text: state.user?['name'] ?? ''),
SizedBox(height: 20.v),
SizedBox(height: 20),
Text(state.userDetails?['additional_info'] ?? ''),
],
);
@@ -207,7 +207,7 @@ class MyProfileScreen extends StatelessWidget {
color: appTheme.black900,
),
),
SizedBox(height: 50.v),
SizedBox(height: 50),
_buildChart(
context,
state.chartPoints?.values.map<int>((e) => e['weight']).toList().map((i) => i.toDouble()).toList() ?? [0.0, 0.0, 0.0, 0.0],
@@ -225,7 +225,7 @@ class MyProfileScreen extends StatelessWidget {
color: appTheme.black900,
),
),
SizedBox(height: 50.v),
SizedBox(height: 50),
_buildChart(
context,
_bodyMassIndex(
@@ -247,7 +247,7 @@ class MyProfileScreen extends StatelessWidget {
color: appTheme.black900,
),
),
SizedBox(height: 30.v),
SizedBox(height: 30),
_buildCircumferenceChart(context, state.circumferences, state.chartDates),
_buildChartLegend(),
],
@@ -646,22 +646,22 @@ class MyProfileScreen extends StatelessWidget {
/// Section Widget
_buildPlans(BuildContext context, List<dynamic>? plans, List<dynamic>? imagePaths, List<dynamic>? states) {
return Padding(
padding: EdgeInsets.only(left: 7.h),
padding: EdgeInsets.only(left: 7),
child: Column(
children: [
Padding(
padding: EdgeInsets.only(left: 15.h),
padding: EdgeInsets.only(left: 15),
child: Text("plans_complete".tr, style: CustomTextStyles.titleMediumBlack.copyWith(color: appTheme.black900)),
),
SizedBox(height: 5.v),
SizedBox(height: 5),
Container(
decoration: AppDecoration.outlineBlueGray.copyWith(borderRadius: BorderRadiusStyle.roundedBorder5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 105.v,
width: 343.h,
height: 105,
width: 343,
child: Stack(
alignment: Alignment.bottomCenter,
children: [
@@ -687,28 +687,28 @@ class MyProfileScreen extends StatelessWidget {
break;
}
return SizedBox(
height: 40.v,
width: 343.h,
height: 40,
width: 343,
child: Stack(
alignment: Alignment.bottomRight,
children: [
Align(
alignment: Alignment.topCenter,
child: Container(
margin: EdgeInsets.only(bottom: 11.v),
padding: EdgeInsets.symmetric(horizontal: 6.h, vertical: 4.v),
margin: EdgeInsets.only(bottom: 11),
padding: EdgeInsets.symmetric(horizontal: 6, vertical: 4),
decoration: AppDecoration.fillGray.copyWith(borderRadius: BorderRadiusStyle.roundedBorder5),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: EdgeInsets.only(bottom: 1.v),
padding: EdgeInsets.only(bottom: 1),
child: Text(plans![i], style: CustomTextStyles.titleSmallBluegray800Bold),
),
Container(
height: 19.v,
width: 100.h,
decoration: BoxDecoration(color: boxColor, borderRadius: BorderRadius.circular(5.h)),
height: 19,
width: 100,
decoration: BoxDecoration(color: boxColor, borderRadius: BorderRadius.circular(5)),
),
],
),
@@ -717,19 +717,19 @@ class MyProfileScreen extends StatelessWidget {
Align(
alignment: Alignment.center,
child: Container(
margin: EdgeInsets.only(bottom: 12.h),
margin: EdgeInsets.only(bottom: 12),
child: Image.network(
baseUrl + '/storage/' + imagePaths?[i],
height: 25.adaptSize,
width: 25.adaptSize,
height: 24,
width: 24,
),
),
),
Align(
alignment: Alignment.bottomRight,
child: Container(
width: 70.h,
margin: EdgeInsets.only(bottom: 14.h, right: 22.h),
width: 70,
margin: EdgeInsets.only(bottom: 14, right: 22),
child: Text("$state".tr, maxLines: 3, overflow: TextOverflow.ellipsis, style: theme.textTheme.titleSmall),
),
),
@@ -773,10 +773,10 @@ class MyProfileScreen extends StatelessWidget {
child: ListView(
children: [
Padding(
padding: EdgeInsets.symmetric(vertical: 5.v),
padding: EdgeInsets.symmetric(vertical: 5),
child: Text("chest_circumference".tr, style: theme.textTheme.bodyLarge),
),
SizedBox(height: 5.v),
SizedBox(height: 5),
CustomTextFormField(
controller: state.chestCircumferenceController,
keyboardType: TextInputType.number,
@@ -785,10 +785,10 @@ class MyProfileScreen extends StatelessWidget {
],
),
Padding(
padding: EdgeInsets.symmetric(vertical: 15.v),
padding: EdgeInsets.symmetric(vertical: 15),
child: Text("waist_circumference".tr, style: theme.textTheme.bodyLarge),
),
SizedBox(height: 5.v),
SizedBox(height: 5),
CustomTextFormField(
controller: state.waistCircumferenceController,
keyboardType: TextInputType.number,
@@ -797,10 +797,10 @@ class MyProfileScreen extends StatelessWidget {
],
),
Padding(
padding: EdgeInsets.symmetric(vertical: 15.v),
padding: EdgeInsets.symmetric(vertical: 15),
child: Text("hip_circumference".tr, style: theme.textTheme.bodyLarge),
),
SizedBox(height: 5.v),
SizedBox(height: 5),
CustomTextFormField(
controller: state.hipCircumferenceController,
keyboardType: TextInputType.number,

View File

@@ -78,24 +78,24 @@ class MySettingsScreen extends StatelessWidget {
],
),
child: CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
height: 54,
leadingWidth: 28,
leading: AppbarLeadingImage(
imagePath: ImageConstant.imgArrowLeft,
margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
margin: EdgeInsets.only(left: 16, top: 15, bottom: 15),
onTap: () => GoRouter.of(context).pop(),
),
title: Padding(
padding: EdgeInsets.only(left: 20.h),
child: Row(children: [AppbarSubtitle(text: state.user?['name'], margin: EdgeInsets.only(left: 80.h, top: 12.v, bottom: 9.v))]),
padding: EdgeInsets.only(left: 20),
child: Row(children: [AppbarSubtitle(text: state.user?['name'], margin: EdgeInsets.only(left: 80, top: 12, bottom: 9))]),
),
),
),
SizedBox(height: 20),
Container(
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
horizontal: 24,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,
@@ -119,8 +119,8 @@ class MySettingsScreen extends StatelessWidget {
SizedBox(height: 20),
Container(
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
horizontal: 24,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,
@@ -145,8 +145,8 @@ class MySettingsScreen extends StatelessWidget {
SizedBox(height: 20),
Container(
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
horizontal: 24,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,

View File

@@ -67,14 +67,14 @@ class RecipeEditScreen extends StatelessWidget {
child: ListView(
children: [
_buldAppBar(context),
SizedBox(height: 20.v),
SizedBox(height: 20),
_buildRecipeInfo(state, context),
SizedBox(height: 20.v),
SizedBox(height: 20),
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: steps,
),
SizedBox(height: 20.v),
SizedBox(height: 20),
_buildAdditional(context, state),
],
),
@@ -86,7 +86,7 @@ class RecipeEditScreen extends StatelessWidget {
_buldAppBar(BuildContext context) {
return Container(
margin: EdgeInsets.all(16.h),
margin: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -100,11 +100,11 @@ class RecipeEditScreen extends StatelessWidget {
],
),
child: CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
height: 54,
leadingWidth: 28,
leading: AppbarLeadingImage(
imagePath: ImageConstant.imgArrowLeft,
margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
margin: EdgeInsets.only(left: 16, top: 15, bottom: 15),
onTap: onTapBack(context),
),
title: Align(
@@ -120,11 +120,11 @@ class RecipeEditScreen extends StatelessWidget {
_buildRecipeInfo(RecipeEditLoadedState state, BuildContext context) {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 16.h,
bottom: 10.h,
left: 16,
right: 16,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -161,7 +161,7 @@ class RecipeEditScreen extends StatelessWidget {
hintText: "Введите название рецепта",
fillColor: appTheme.gray50,
borderDecoration: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.h),
borderRadius: BorderRadius.circular(5),
borderSide: BorderSide(
color: appTheme.gray50,
width: 1,
@@ -176,7 +176,7 @@ class RecipeEditScreen extends StatelessWidget {
maxLines: 4,
fillColor: appTheme.gray50,
borderDecoration: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.h),
borderRadius: BorderRadius.circular(5),
borderSide: BorderSide(
color: appTheme.gray50,
width: 1,
@@ -203,8 +203,8 @@ class RecipeEditScreen extends StatelessWidget {
if (!isLoading)
Container(
padding: EdgeInsets.symmetric(
horizontal: 40.h,
vertical: 80.v,
horizontal: 40,
vertical: 80,
),
decoration: AppDecoration.fillGray.copyWith(
borderRadius: BorderRadiusStyle.roundedBorder5,
@@ -215,8 +215,8 @@ class RecipeEditScreen extends StatelessWidget {
children: [
Padding(
padding: EdgeInsets.only(
left: 7.h,
top: 5.v,
left: 7,
top: 5,
),
child: Text(
"Добавить фото",
@@ -233,9 +233,9 @@ class RecipeEditScreen extends StatelessWidget {
),
/*if (isLoading)
Container(
margin: EdgeInsets.symmetric(horizontal: 10.h),
margin: EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(
horizontal: 40.h,
horizontal: 40,
vertical: 80.v,
),
decoration: AppDecoration.fillGray.copyWith(
@@ -258,11 +258,11 @@ class RecipeEditScreen extends StatelessWidget {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 16.h,
bottom: 10.h,
left: 16,
right: 16,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -292,7 +292,7 @@ class RecipeEditScreen extends StatelessWidget {
maxLines: 4,
fillColor: appTheme.gray50,
borderDecoration: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.h),
borderRadius: BorderRadius.circular(5),
borderSide: BorderSide(
color: appTheme.gray50,
width: 1,
@@ -361,11 +361,11 @@ class RecipeEditScreen extends StatelessWidget {
_buildAdditional(BuildContext context, RecipeEditLoadedState state) {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 16.h,
bottom: 10.h,
left: 16,
right: 16,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -390,7 +390,7 @@ class RecipeEditScreen extends StatelessWidget {
hintText: "YouTube",
fillColor: appTheme.gray50,
borderDecoration: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.h),
borderRadius: BorderRadius.circular(5),
borderSide: BorderSide(
color: appTheme.gray50,
width: 1,
@@ -414,7 +414,7 @@ class RecipeEditScreen extends StatelessWidget {
initialValue: initialText,
fillColor: appTheme.gray50,
borderDecoration: OutlineInputBorder(
borderRadius: BorderRadius.circular(5.h),
borderRadius: BorderRadius.circular(5),
borderSide: BorderSide(
color: appTheme.gray50,
width: 1,

View File

@@ -72,20 +72,20 @@ class RecipeSelectScreen extends StatelessWidget {
],
),
child: CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
height: 54,
leadingWidth: 28,
leading: AppbarLeadingImage(
imagePath: ImageConstant.imgArrowLeft,
margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
margin: EdgeInsets.only(left: 16, top: 15, bottom: 15),
onTap: () => GoRouter.of(context).pop(),
),
title: Padding(
padding: EdgeInsets.only(left: 20.h),
padding: EdgeInsets.only(left: 20),
child: Row(
children: [
AppbarSubtitle(
text: "Рецепты",
margin: EdgeInsets.only(left: 80.h, top: 12.v, bottom: 9.v),
margin: EdgeInsets.only(left: 80, top: 12, bottom: 9),
),
Spacer(),
Padding(

View File

@@ -61,18 +61,18 @@ class RecipeScreen extends StatelessWidget {
decoration: AppDecoration.fillGray,
child: ListView(
children: [
SizedBox(height: 15.v),
SizedBox(height: 15),
_buildHeaderRow(context, state),
SizedBox(height: 15.v),
SizedBox(height: 15),
_buildRecipeData(context, state),
SizedBox(height: 15.v),
SizedBox(height: 15),
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: steps,
),
SizedBox(height: 15.v),
SizedBox(height: 15),
_buildTextField(context, state),
SizedBox(height: 15.v),
SizedBox(height: 15),
_buildCommentSection(context, state),
],
),
@@ -83,10 +83,10 @@ class RecipeScreen extends StatelessWidget {
_buildHeaderRow(BuildContext context, RecipeLoadedState state) {
final String name = state.author?['name'];
return Container(
margin: EdgeInsets.symmetric(horizontal: 16.h, vertical: 16.h),
margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
padding: EdgeInsets.symmetric(
horizontal: 24.h,
vertical: 12.v,
horizontal: 24,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.white,
@@ -108,7 +108,7 @@ class RecipeScreen extends StatelessWidget {
onTap: () => GoRouter.of(context).pop(),
),
Padding(
padding: EdgeInsets.only(top: 1.v),
padding: EdgeInsets.only(top: 1),
child: Row(
children: [
Align(
@@ -142,11 +142,11 @@ class RecipeScreen extends StatelessWidget {
_buildRecipeData(BuildContext context, RecipeLoadedState state) {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -343,11 +343,11 @@ class RecipeScreen extends StatelessWidget {
_buildTextField(BuildContext context, RecipeLoadedState state) {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -369,7 +369,7 @@ class RecipeScreen extends StatelessWidget {
controller: state.commentController,
maxLines: 4,
),
SizedBox(height: 15.h),
SizedBox(height: 15),
CustomOutlinedButton(
text: "Оставить отзыв",
margin: EdgeInsets.only(bottom: 5),
@@ -425,11 +425,11 @@ class RecipeScreen extends StatelessWidget {
Widget _buildStep(BuildContext context, RecipeLoadedState state, int i) {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 16.h,
bottom: 10.h,
left: 16,
right: 16,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -17,11 +17,11 @@ class CommentWidget extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
left: 16.h,
right: 20.h,
bottom: 10.h,
left: 16,
right: 20,
bottom: 10,
),
padding: EdgeInsets.all(12.h),
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -54,15 +54,15 @@ class CommentWidget extends StatelessWidget {
Expanded(
child: Padding(
padding: EdgeInsets.only(
left: 12.h,
top: 2.v,
bottom: 11.v,
left: 12,
top: 2,
bottom: 11,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: 227.h,
width: 227,
child: Row(
children: [
Text(
@@ -71,7 +71,7 @@ class CommentWidget extends StatelessWidget {
),
Spacer(),
Padding(
padding: EdgeInsets.only(left: 6.h),
padding: EdgeInsets.only(left: 6),
child: Text(
commentModelObj.dateText!,
style: theme.textTheme.bodyMedium,
@@ -80,7 +80,7 @@ class CommentWidget extends StatelessWidget {
],
),
),
SizedBox(height: 6.v),
SizedBox(height: 6),
Text(
commentModelObj.greetingText!,
style: CustomTextStyles.bodyMediumBluegray800,
@@ -91,8 +91,8 @@ class CommentWidget extends StatelessWidget {
),
CustomImageView(
imagePath: ImageConstant.imgSend,
height: 30.v,
width: 30.h,
height: 30,
width: 30,
margin: EdgeInsets.only(left: 5),
),
],

View File

@@ -66,20 +66,20 @@ class SubscribersScreen extends StatelessWidget {
],
),
child: CustomAppBar(
height: 54.v,
leadingWidth: 28.h,
height: 54,
leadingWidth: 28,
leading: AppbarLeadingImage(
imagePath: ImageConstant.imgArrowLeft,
margin: EdgeInsets.only(left: 16.h, top: 15.v, bottom: 15.v),
margin: EdgeInsets.only(left: 16, top: 15, bottom: 15),
onTap: () => GoRouter.of(context).pop(),
),
title: Padding(
padding: EdgeInsets.only(left: 20.h),
padding: EdgeInsets.only(left: 20),
child: Row(
children: [
AppbarSubtitle(
text: "Мои подписчики",
margin: EdgeInsets.only(left: 80.h, top: 12.v, bottom: 9.v),
margin: EdgeInsets.only(left: 80, top: 12, bottom: 9),
),
Spacer(),
Padding(