fix: fixed analyzer issues and merge conflicts

This commit is contained in:
Username1548
2025-07-02 19:01:37 +07:00
parent d42604dc87
commit e80b660210
85 changed files with 276 additions and 272 deletions

View File

@@ -72,7 +72,7 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
@override
Widget build(BuildContext context) {
final s = S.of(context);
return PopScope(
return PopScope(
child: MultiBlocProvider(
providers: [
BlocProvider<CommentsCubit>(
@@ -102,14 +102,14 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
return Scaffold(
appBar: AppBar(
leading: BackButton(
onPressed: () {
if (context.canPop()) {
GoRouter.of(context).pop();
return;
}
GoRouter.of(context).go('/feed-screen');
},
),
onPressed: () {
if (context.canPop()) {
GoRouter.of(context).pop();
return;
}
GoRouter.of(context).go('/feed-screen');
},
),
centerTitle: true,
title: Text(
'',
@@ -132,14 +132,14 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
return Scaffold(
appBar: AppBar(
leading: BackButton(
onPressed: () {
if (context.canPop()) {
GoRouter.of(context).pop();
return;
}
GoRouter.of(context).go('/feed-screen');
},
),
onPressed: () {
if (context.canPop()) {
GoRouter.of(context).pop();
return;
}
GoRouter.of(context).go('/feed-screen');
},
),
centerTitle: true,
title: Text(
state.planModel?.name ?? '',
@@ -154,7 +154,7 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
isAuthor: state.planModel?.author.authorIsMe ?? false,
path: 'plan/${widget.slug}',
complainedContentType: ComplainedContent.plan,
slug: widget.slug,
userSlug: state.planModel?.author.authorSlug ?? '',
),
const SizedBox(width: 16),
],
@@ -329,7 +329,7 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
textEditingController.clear();
replyId = null;
});
Future.delayed(const Duration(milliseconds: 500), () {
if (context.mounted) {
context.read<AboutPlanCubit>().getPlan(widget.slug);
@@ -382,7 +382,7 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
isAuthor: state.planModel?.author.authorIsMe ?? false,
path: 'plan/${widget.slug}',
complainedContentType: ComplainedContent.plan,
slug: widget.slug,
userSlug: state.planModel?.author.authorSlug ?? '',
),
const SizedBox(width: 16),
],
@@ -436,7 +436,8 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
'assets/icons/heart.svg',
width: 14,
height: 12,
colorFilter: state.planModel?.wasLikedByMe == true ? ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn) : null,
colorFilter:
state.planModel?.wasLikedByMe == true ? ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn) : null,
),
const SizedBox(width: 8),
Text(