diff --git a/lib/pages/home/comments/widgets/comment_item.dart b/lib/pages/home/comments/widgets/comment_item.dart index 07a92af..1230d14 100644 --- a/lib/pages/home/comments/widgets/comment_item.dart +++ b/lib/pages/home/comments/widgets/comment_item.dart @@ -114,6 +114,7 @@ class CommentState extends State { onPressed: () { state.commentId = _comment.id; state.replyingTo = comment.user; + state.showReplyBox = true; state.update(); widget.focusNode.requestFocus(); }, diff --git a/lib/pages/home/radar/widgets/categories_gird.dart b/lib/pages/home/radar/widgets/categories_gird.dart index 44d217e..8fc0048 100644 --- a/lib/pages/home/radar/widgets/categories_gird.dart +++ b/lib/pages/home/radar/widgets/categories_gird.dart @@ -5,11 +5,12 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class CategoriesRow1 extends StatelessWidget { - final bool isColapsed; - const CategoriesRow1({Key? key, required this.isColapsed}) : super(key: key); + const CategoriesRow1({Key? key}) : super(key: key); @override Widget build(BuildContext context) { + final state = context.watch(); + final isColapsed = state.isColapsed || state.searching || state.filtering; final MediaQueryData d = MediaQuery.of(context); return AnimatedPositioned( curve: Curves.easeIn, @@ -42,13 +43,12 @@ class CategoriesRow1 extends StatelessWidget { class CategoriesRow2 extends StatelessWidget { const CategoriesRow2({ Key? key, - required this.isColapsed, }) : super(key: key); - final bool isColapsed; - @override Widget build(BuildContext context) { + final state = context.watch(); + final isColapsed = state.isColapsed || state.searching || state.filtering; final MediaQueryData d = MediaQuery.of(context); return AnimatedPositioned( curve: Curves.easeIn, diff --git a/lib/pages/home/radar/widgets/categories_list.dart b/lib/pages/home/radar/widgets/categories_list.dart index 8bdf7c0..83995b3 100644 --- a/lib/pages/home/radar/widgets/categories_list.dart +++ b/lib/pages/home/radar/widgets/categories_list.dart @@ -8,11 +8,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class CategoriesList extends StatefulWidget { - final bool isColapsed; - const CategoriesList({ - Key? key, - required this.isColapsed, - }) : super(key: key); + const CategoriesList({Key? key}) : super(key: key); @override State createState() => _CategoriesListState(); @@ -41,15 +37,15 @@ class _CategoriesListState extends State { @override Widget build(BuildContext context) { final MediaQueryData d = MediaQuery.of(context); - final RadarState state = context.read(); + final state = context.watch(); + final isColapsed = state.isColapsed || state.searching || state.filtering; return Positioned( top: 0, left: 0, right: 0, child: AnimatedCrossFade( - crossFadeState: widget.isColapsed - ? CrossFadeState.showSecond - : CrossFadeState.showFirst, + crossFadeState: + isColapsed ? CrossFadeState.showSecond : CrossFadeState.showFirst, duration: DesignConfig.mediumAnimationDuration, reverseDuration: DesignConfig.lowAnimationDuration, sizeCurve: Curves.easeIn, @@ -61,7 +57,7 @@ class _CategoriesListState extends State { boxShadow: DesignConfig.defaultShadow, ), child: AnimatedVisibility( - isVisible: widget.isColapsed, + isVisible: isColapsed, duration: DesignConfig.mediumAnimationDuration, child: SingleChildScrollView( controller: _scrollController, @@ -102,7 +98,7 @@ class _CategoriesListState extends State { duration: DesignConfig.lowAnimationDuration, curve: Curves.easeIn, ); - state.getRadarOverviews(page: 1); + state.getRadarOverviewDatas(page: 1); }, child: Container( margin: const EdgeInsets.only(left: 12), diff --git a/lib/pages/home/radar/widgets/category_item.dart b/lib/pages/home/radar/widgets/category_item.dart index 7ec8494..f545396 100644 --- a/lib/pages/home/radar/widgets/category_item.dart +++ b/lib/pages/home/radar/widgets/category_item.dart @@ -29,7 +29,7 @@ class CategoryItem extends StatelessWidget { if (category.id != 0) { state.selectedCats.add(category); } - state.getRadarOverviews(page: 1); + state.getRadarOverviewDatas(page: 1); }, child: AnimatedContainer( duration: DesignConfig.mediumAnimationDuration,