forked from eatvio/eatvio_app
Merge pull request 'fix(password+recipe): Issue-221 and Issue-418 and Issue-317' (#545) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#545
This commit is contained in:
@@ -121,7 +121,7 @@ class AppRouter {
|
|||||||
GoRoute(
|
GoRoute(
|
||||||
path: 'forget-password-screen',
|
path: 'forget-password-screen',
|
||||||
name: 'forgetPasswordScreen',
|
name: 'forgetPasswordScreen',
|
||||||
builder: (context, state) => const ForgetPasswordScreen(),
|
builder: (context, state) => ForgetPasswordScreen(isAuth: state.extra as bool,),
|
||||||
),
|
),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: 'scan-qr-code-screen',
|
path: 'scan-qr-code-screen',
|
||||||
|
|||||||
@@ -26,9 +26,13 @@ class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
|
|||||||
s.recipe_publishing,
|
s.recipe_publishing,
|
||||||
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
|
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
|
||||||
),
|
),
|
||||||
Text(
|
Padding(
|
||||||
'"$title" ${s.successfully_published}',
|
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||||
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
|
child: Text(
|
||||||
|
'"$title" ${s.successfully_published}',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 20,
|
height: 20,
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ class _AuthScreenState extends State<AuthScreen> {
|
|||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
Center(
|
Center(
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onTap: () => GoRouter.of(context).goNamed('forgetPasswordScreen'),
|
onTap: () => GoRouter.of(context).goNamed('forgetPasswordScreen', extra: false),
|
||||||
child: Text(
|
child: Text(
|
||||||
'Забыли пароль?',
|
'Забыли пароль?',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
|
|||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
class ForgetPasswordScreen extends StatefulWidget {
|
class ForgetPasswordScreen extends StatefulWidget {
|
||||||
const ForgetPasswordScreen({super.key});
|
final bool isAuth;
|
||||||
|
const ForgetPasswordScreen({super.key, required this.isAuth});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<ForgetPasswordScreen> createState() => _ForgetPasswordScreenState();
|
State<ForgetPasswordScreen> createState() => _ForgetPasswordScreenState();
|
||||||
@@ -29,7 +30,7 @@ class _ForgetPasswordScreenState extends State<ForgetPasswordScreen> {
|
|||||||
builder: (BuildContext context, ResetPasswordState state) {
|
builder: (BuildContext context, ResetPasswordState state) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: const Text('Смена пароля'),
|
title: widget.isAuth ? const Text('Смена пароля') : const Text('Восстановление пароля'),
|
||||||
centerTitle: false,
|
centerTitle: false,
|
||||||
),
|
),
|
||||||
body: state is ResetPasswordStateLoadingResetPassword || state is ResetPasswordStateLoadingSendEmailCode
|
body: state is ResetPasswordStateLoadingResetPassword || state is ResetPasswordStateLoadingSendEmailCode
|
||||||
@@ -42,9 +43,9 @@ class _ForgetPasswordScreenState extends State<ForgetPasswordScreen> {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
if (state is ResetPasswordStateCodeSendError || state is ResetPasswordStateEmpty) ...[
|
if (state is ResetPasswordStateCodeSendError || state is ResetPasswordStateEmpty) ...[
|
||||||
const Text(
|
Text(
|
||||||
'Забыли пароль? Укажите свой email,\nи мы пришлём код для сброса.',
|
'${widget.isAuth ? '' : 'Забыли пароль? '}Укажите свой email,\nи мы пришлём код для сброса.',
|
||||||
style: TextStyle(
|
style: const TextStyle(
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
fontWeight: FontWeight.w500,
|
fontWeight: FontWeight.w500,
|
||||||
),
|
),
|
||||||
@@ -156,7 +157,7 @@ class _ForgetPasswordScreenState extends State<ForgetPasswordScreen> {
|
|||||||
}
|
}
|
||||||
if (state is ResetPasswordStateResetPassowrdSuccess) {
|
if (state is ResetPasswordStateResetPassowrdSuccess) {
|
||||||
GoRouter.of(context).pop();
|
GoRouter.of(context).pop();
|
||||||
showSuccessToast('Пароль успешно сменён. Войдите в аккаунт');
|
showSuccessToast('Пароль успешно сменён. ${widget.isAuth ? '' : 'Войдите в аккаунт'}');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -10,7 +10,11 @@ class ExpandableText extends StatefulWidget {
|
|||||||
final String text;
|
final String text;
|
||||||
final int maxLines;
|
final int maxLines;
|
||||||
|
|
||||||
const ExpandableText({super.key, required this.text, this.maxLines = 3});
|
const ExpandableText({
|
||||||
|
super.key,
|
||||||
|
required this.text,
|
||||||
|
this.maxLines = 5, // по умолчанию 5 строк
|
||||||
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<ExpandableText> createState() => _ExpandableTextState();
|
State<ExpandableText> createState() => _ExpandableTextState();
|
||||||
@@ -18,6 +22,29 @@ class ExpandableText extends StatefulWidget {
|
|||||||
|
|
||||||
class _ExpandableTextState extends State<ExpandableText> {
|
class _ExpandableTextState extends State<ExpandableText> {
|
||||||
bool isExpanded = false;
|
bool isExpanded = false;
|
||||||
|
bool showExpandButton = false;
|
||||||
|
|
||||||
|
final GlobalKey _textKey = GlobalKey();
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didChangeDependencies() {
|
||||||
|
super.didChangeDependencies();
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) => _checkTextOverflow());
|
||||||
|
}
|
||||||
|
|
||||||
|
void _checkTextOverflow() {
|
||||||
|
final textRenderObject = _textKey.currentContext?.findRenderObject();
|
||||||
|
if (textRenderObject is RenderBox) {
|
||||||
|
final maxLinesHeight = widget.maxLines * TextStyles.textMMediumAuto.fontSize! * 1.2;
|
||||||
|
final actualHeight = textRenderObject.size.height;
|
||||||
|
|
||||||
|
if (actualHeight > maxLinesHeight && !showExpandButton) {
|
||||||
|
setState(() {
|
||||||
|
showExpandButton = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void toggleExpansion() {
|
void toggleExpansion() {
|
||||||
setState(() {
|
setState(() {
|
||||||
@@ -33,52 +60,63 @@ class _ExpandableTextState extends State<ExpandableText> {
|
|||||||
children: [
|
children: [
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||||
child: Stack(
|
child: AnimatedSize(
|
||||||
children: [
|
duration: const Duration(milliseconds: 200),
|
||||||
Text(
|
curve: Curves.easeInOut,
|
||||||
widget.text,
|
child: Stack(
|
||||||
style: TextStyles.textMMediumAuto.copyWith(color: appTheme.black),
|
children: [
|
||||||
// style: {
|
Text(
|
||||||
// "*": Style(
|
widget.text,
|
||||||
// margin: Margins.all(0),
|
key: _textKey,
|
||||||
// color: Colors.black87,
|
style: TextStyles.textMMediumAuto.copyWith(color: appTheme.black),
|
||||||
// maxLines: isExpanded ? null : widget.maxLines,
|
maxLines: isExpanded ? null : widget.maxLines,
|
||||||
// textOverflow: TextOverflow.clip,
|
overflow: TextOverflow.clip,
|
||||||
// ),
|
),
|
||||||
// },
|
if (!isExpanded && showExpandButton)
|
||||||
),
|
Positioned.fill(
|
||||||
if (!isExpanded)
|
child: Align(
|
||||||
Positioned.fill(
|
alignment: Alignment.bottomCenter,
|
||||||
child: Align(
|
child: Container(
|
||||||
alignment: Alignment.bottomCenter,
|
height: 35,
|
||||||
child: Container(
|
decoration: BoxDecoration(
|
||||||
height: 35,
|
gradient: LinearGradient(
|
||||||
decoration: BoxDecoration(
|
begin: Alignment.topCenter,
|
||||||
gradient: LinearGradient(
|
end: Alignment.bottomCenter,
|
||||||
begin: Alignment.topCenter,
|
colors: [
|
||||||
end: Alignment.bottomCenter,
|
Colors.white.withAlpha(0),
|
||||||
colors: [Colors.white.withValues(alpha: 0.0), Colors.white.withValues(alpha: 0.6), Colors.white],
|
Colors.white.withAlpha((255 * 0.6).toInt()),
|
||||||
|
Colors.white,
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Align(
|
|
||||||
alignment: Alignment.bottomCenter,
|
|
||||||
child: GestureDetector(
|
|
||||||
onTap: toggleExpansion,
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
Text(isExpanded ? s.hide : s.expand, style: TextStyles.textMMedium.copyWith(color: appTheme.blueA400)),
|
|
||||||
Transform.rotate(angle: isExpanded ? math.pi : 0, child: SvgPicture.asset('assets/icons/arrow_down.svg', width: 12, height: 12)),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (showExpandButton)
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.bottomCenter,
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: toggleExpansion,
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
isExpanded ? s.hide : s.expand,
|
||||||
|
style: TextStyles.textMMedium.copyWith(color: appTheme.blueA400),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
Transform.rotate(
|
||||||
|
angle: isExpanded ? math.pi : 0,
|
||||||
|
child: SvgPicture.asset('assets/icons/arrow_down.svg', width: 12, height: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
|
|||||||
Scaffold _myProfileScreen(ProfileStateLoaded state) {
|
Scaffold _myProfileScreen(ProfileStateLoaded state) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Colors.grey.shade200,
|
backgroundColor: Colors.grey.shade200,
|
||||||
appBar: AppBar(toolbarHeight: 0),
|
appBar: AppBar(),
|
||||||
body: SingleChildScrollView(
|
body: SingleChildScrollView(
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
|||||||
@@ -205,14 +205,14 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
|
|||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
centerTitle: true,
|
centerTitle: true,
|
||||||
leading: BackButton(
|
leading: BackButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
if (context.canPop()) {
|
if (context.canPop()) {
|
||||||
GoRouter.of(context).pop();
|
GoRouter.of(context).pop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GoRouter.of(context).go('/feed-screen');
|
GoRouter.of(context).go('/feed-screen');
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
title: Text(
|
title: Text(
|
||||||
recipeState.recipe.title ?? '',
|
recipeState.recipe.title ?? '',
|
||||||
maxLines: 2,
|
maxLines: 2,
|
||||||
@@ -356,6 +356,7 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
ExpandableText(text: recipeState.recipe.description),
|
ExpandableText(text: recipeState.recipe.description),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
Padding(
|
Padding(
|
||||||
@@ -400,14 +401,14 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
|
|||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
centerTitle: true,
|
centerTitle: true,
|
||||||
leading: BackButton(
|
leading: BackButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
if (context.canPop()) {
|
if (context.canPop()) {
|
||||||
GoRouter.of(context).pop();
|
GoRouter.of(context).pop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GoRouter.of(context).go('/feed-screen');
|
GoRouter.of(context).go('/feed-screen');
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
title: Text(
|
title: Text(
|
||||||
'',
|
'',
|
||||||
maxLines: 2,
|
maxLines: 2,
|
||||||
|
|||||||
@@ -164,12 +164,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
_divider(context),
|
_divider(context),
|
||||||
_tile(
|
_tile(
|
||||||
onTap: () => GoRouter.of(context).pushNamed(
|
onTap: () => GoRouter.of(context).pushNamed(
|
||||||
'changePasswordScreen',
|
'forgetPasswordScreen',
|
||||||
extra: SettingsEntity(
|
extra: true,
|
||||||
profileSettingsModel: state.profileSettings,
|
|
||||||
profileDetailsModel: state.profileDetails,
|
|
||||||
settingsCubit: settingsCubit,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
title: 'Сменить пароль',
|
title: 'Сменить пароль',
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user