forked from eatvio/eatvio_app
chore: add blank lines for improved readability in multiple files
This commit is contained in:
@@ -131,7 +131,8 @@ class _SecondStepContentState extends State<SecondStepContent> {
|
||||
setState(() {
|
||||
isLoading = false;
|
||||
});
|
||||
if (context.mounted && !hasValidationError) {
|
||||
if (context.mounted) {
|
||||
// Показываем bottom sheet всегда: при успехе или ошибке
|
||||
showRegistrationBottomSheet(context, cubit, commonResult);
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1,106 +1,111 @@
|
||||
import 'package:eatvio_app/core/app_router.dart';
|
||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
||||
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
|
||||
import 'package:eatvio_app/features/registration_v2/presentation/widgets/password_field.dart';
|
||||
import 'package:eatvio_app/generated/l10n.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
void showRegistrationBottomSheet(BuildContext context, RegistrationCubitV2 cubit, bool isSuccess) {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
backgroundColor: Colors.transparent,
|
||||
builder: (context) => Container(
|
||||
margin: EdgeInsets.only(left: 8, right: 8, bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom),
|
||||
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: appTheme.whiteA700),
|
||||
child: RegistrationBottomSheet(cubit: cubit, isSuccess: isSuccess),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
class RegistrationBottomSheet extends StatefulWidget {
|
||||
const RegistrationBottomSheet({super.key, required this.cubit, required this.isSuccess});
|
||||
final RegistrationCubitV2 cubit;
|
||||
final bool isSuccess;
|
||||
@override
|
||||
State<RegistrationBottomSheet> createState() => _RegistrationBottomSheetState();
|
||||
}
|
||||
|
||||
class _RegistrationBottomSheetState extends State<RegistrationBottomSheet> {
|
||||
late bool isSuccess;
|
||||
bool isLoading = false;
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
isSuccess = widget.isSuccess;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final s = S.of(context);
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: isSuccess
|
||||
? [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12.0),
|
||||
child: Row(
|
||||
children: [
|
||||
SvgPicture.asset('assets/icons/sucess.svg', height: 16, width: 16),
|
||||
const SizedBox(width: 8),
|
||||
Text(s.registration_completed, style: TextStyles.textFS22FW600.copyWith(color: appTheme.black)),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 16.0),
|
||||
child: Text(s.acc_has_been_created, style: TextStyles.textMMediumAuto.copyWith(color: appTheme.darkGrey)),
|
||||
),
|
||||
PasswordField(cubit: widget.cubit),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 20.0),
|
||||
child: Text(s.password_desc, style: TextStyles.textSMedium.copyWith(color: appTheme.darkGrey)),
|
||||
),
|
||||
|
||||
CustomOutlinedButton(
|
||||
text: s.login,
|
||||
height: 52,
|
||||
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
|
||||
buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
|
||||
onPressed: () async {
|
||||
AppRouter.navigatorKey.currentContext?.go(RouteConstants.feedScreen);
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
//button
|
||||
]
|
||||
: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12.0),
|
||||
child: Row(
|
||||
children: [
|
||||
SvgPicture.asset('assets/icons/close_mark.svg', height: 16, width: 16),
|
||||
const SizedBox(width: 8),
|
||||
Text(s.signUpFailed, style: TextStyles.textFS22FW600.copyWith(color: appTheme.black)),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 16.0),
|
||||
child: Text(s.error_desc, style: TextStyles.textMMediumAuto.copyWith(color: appTheme.darkGrey)),
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
import 'package:eatvio_app/core/app_router.dart';
|
||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
||||
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
|
||||
import 'package:eatvio_app/features/registration_v2/presentation/widgets/password_field.dart';
|
||||
import 'package:eatvio_app/generated/l10n.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
void showRegistrationBottomSheet(BuildContext context, RegistrationCubitV2 cubit, bool isSuccess) {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
backgroundColor: Colors.transparent,
|
||||
builder: (context) => Container(
|
||||
margin: EdgeInsets.only(left: 8, right: 8, bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom),
|
||||
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: appTheme.whiteA700),
|
||||
child: RegistrationBottomSheet(cubit: cubit, isSuccess: isSuccess),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
class RegistrationBottomSheet extends StatefulWidget {
|
||||
const RegistrationBottomSheet({super.key, required this.cubit, required this.isSuccess});
|
||||
final RegistrationCubitV2 cubit;
|
||||
final bool isSuccess;
|
||||
@override
|
||||
State<RegistrationBottomSheet> createState() => _RegistrationBottomSheetState();
|
||||
}
|
||||
|
||||
class _RegistrationBottomSheetState extends State<RegistrationBottomSheet> {
|
||||
late bool isSuccess;
|
||||
bool isLoading = false;
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
isSuccess = widget.isSuccess;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final s = S.of(context);
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: isSuccess
|
||||
? [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12.0),
|
||||
child: Row(
|
||||
children: [
|
||||
SvgPicture.asset('assets/icons/sucess.svg', height: 16, width: 16),
|
||||
const SizedBox(width: 8),
|
||||
Text(s.registration_completed, style: TextStyles.textFS22FW600.copyWith(color: appTheme.black)),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 16.0),
|
||||
child: Text(s.acc_has_been_created, style: TextStyles.textMMediumAuto.copyWith(color: appTheme.darkGrey)),
|
||||
),
|
||||
PasswordField(cubit: widget.cubit),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 20.0),
|
||||
child: Text(s.password_desc, style: TextStyles.textSMedium.copyWith(color: appTheme.darkGrey)),
|
||||
),
|
||||
|
||||
CustomOutlinedButton(
|
||||
text: s.login,
|
||||
height: 52,
|
||||
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
|
||||
buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
|
||||
onPressed: () async {
|
||||
AppRouter.navigatorKey.currentContext?.go(RouteConstants.feedScreen);
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
//button
|
||||
]
|
||||
: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12.0),
|
||||
child: Row(
|
||||
children: [
|
||||
SvgPicture.asset('assets/icons/close_mark.svg', height: 16, width: 16),
|
||||
const SizedBox(width: 8),
|
||||
Text(s.signUpFailed, style: TextStyles.textFS22FW600.copyWith(color: appTheme.black)),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 16.0),
|
||||
child: Text(
|
||||
widget.cubit.state.registrationError?.isNotEmpty == true
|
||||
? widget.cubit.state.registrationError!
|
||||
: s.error_desc,
|
||||
style: TextStyles.textMMediumAuto.copyWith(color: appTheme.darkGrey),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user