From d3252e931fbacc07af950b9847d03fd50a3dc57e Mon Sep 17 00:00:00 2001 From: Amir Hossein Mousavi Date: Sat, 13 Apr 2024 01:32:17 +0330 Subject: [PATCH] fixing some issues --- .../stat_cats_general_state.dart | 2 - .../widgets/general_stat_card.dart | 2 - lib/views/radar/radar.dart | 7 ++- lib/views/widgets/categories_gird.dart | 58 +++++++++---------- lib/views/widgets/category_item.dart | 5 +- lib/views/widgets/overview/multitype.dart | 55 +++++++++++------- 6 files changed, 65 insertions(+), 64 deletions(-) diff --git a/lib/views/home/new_statistic/statistics_details/stat_cats_general_state.dart b/lib/views/home/new_statistic/statistics_details/stat_cats_general_state.dart index 018d56e..1d19626 100644 --- a/lib/views/home/new_statistic/statistics_details/stat_cats_general_state.dart +++ b/lib/views/home/new_statistic/statistics_details/stat_cats_general_state.dart @@ -1,5 +1,3 @@ -import 'dart:developer'; - import 'package:didvan/models/enums.dart'; import 'package:didvan/models/new_statistic/general_item_model.dart'; import 'package:didvan/models/requests/newstats_general.dart'; diff --git a/lib/views/home/new_statistic/widgets/general_stat_card.dart b/lib/views/home/new_statistic/widgets/general_stat_card.dart index ab5e949..6adfff7 100644 --- a/lib/views/home/new_statistic/widgets/general_stat_card.dart +++ b/lib/views/home/new_statistic/widgets/general_stat_card.dart @@ -1,5 +1,3 @@ -import 'dart:developer'; - import 'package:didvan/config/theme_data.dart'; import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/models/new_statistic/general_item_model.dart'; diff --git a/lib/views/radar/radar.dart b/lib/views/radar/radar.dart index 0d42b24..abe196f 100644 --- a/lib/views/radar/radar.dart +++ b/lib/views/radar/radar.dart @@ -82,11 +82,12 @@ class _RadarState extends State { !state.searching && state.appState != AppState.failed) const SliverToBoxAdapter( - child: SizedBox(height: 300), + child: SizedBox(height: 320), ), if (state.appState != AppState.failed) SliverPadding( - padding: const EdgeInsets.only(right: 16, bottom: 20), + padding: const EdgeInsets.only( + right: 16, bottom: 20, top: 20), sliver: SliverToBoxAdapter( child: Align( alignment: Alignment.centerRight, @@ -167,7 +168,7 @@ class _RadarState extends State { ), if (state.appState != AppState.failed) CategoriesRow1( - topPadding: 192, + topPadding: 212, rightPadding: 124, onSelected: _onCategorySelected, categories: state.categories, diff --git a/lib/views/widgets/categories_gird.dart b/lib/views/widgets/categories_gird.dart index 6e724b5..7f9b225 100644 --- a/lib/views/widgets/categories_gird.dart +++ b/lib/views/widgets/categories_gird.dart @@ -27,25 +27,22 @@ class CategoriesRow1 extends StatelessWidget { top: isColapsed ? -60 : topPadding + d.padding.top, left: isColapsed ? -rightPadding : 0, right: isColapsed ? rightPadding : 0, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 40), - child: Row( - children: categories - .sublist(0, 3) - .map( - (category) => Expanded( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 6), - child: CategoryItem( - category: category, - isColapsed: isColapsed, - onSelected: () => onSelected(category), - ), + child: Row( + children: categories + .sublist(0, 3) + .map( + (category) => Expanded( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 6), + child: CategoryItem( + category: category, + isColapsed: isColapsed, + onSelected: () => onSelected(category), ), ), - ) - .toList(), - ), + ), + ) + .toList(), ), ); } @@ -72,22 +69,19 @@ class CategoriesRow2 extends StatelessWidget { top: isColapsed ? 12 : 92 + d.padding.top, left: isColapsed ? -d.size.width : 0, right: isColapsed ? d.size.width : 0, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 40), - child: Row( - children: categories - .sublist(3, 6) - .map( - (category) => Expanded( - child: CategoryItem( - category: category, - onSelected: () => onSelected(category), - isColapsed: isColapsed, - ), + child: Row( + children: categories + .sublist(3, 6) + .map( + (category) => Expanded( + child: CategoryItem( + category: category, + onSelected: () => onSelected(category), + isColapsed: isColapsed, ), - ) - .toList(), - ), + ), + ) + .toList(), ), ); } diff --git a/lib/views/widgets/category_item.dart b/lib/views/widgets/category_item.dart index 0f9b7cf..a192a76 100644 --- a/lib/views/widgets/category_item.dart +++ b/lib/views/widgets/category_item.dart @@ -26,7 +26,7 @@ class CategoryItem extends StatelessWidget { return ds.height / 16 * 9 / 3; } } - return (ds.width - 40) / 4; + return ds.width / 3; } bool _useWebMobileLayout(context) { @@ -79,8 +79,7 @@ class CategoryItem extends StatelessWidget { DidvanText( category.label, color: Theme.of(context).colorScheme.title, - style: Theme.of(context).textTheme.labelSmall, - fontWeight: FontWeight.w600, + style: Theme.of(context).textTheme.titleSmall, ), ], ), diff --git a/lib/views/widgets/overview/multitype.dart b/lib/views/widgets/overview/multitype.dart index 723e91a..07ddb16 100644 --- a/lib/views/widgets/overview/multitype.dart +++ b/lib/views/widgets/overview/multitype.dart @@ -164,31 +164,42 @@ class MultitypeOverview extends StatelessWidget { child: Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - const Icon( - DidvanIcons.calendar_day_light, - size: 16, - ), - const SizedBox(width: 4), - DidvanText( - DateTime.parse(item.createdAt).toPersianDateStr(), - style: Theme.of(context).textTheme.labelSmall, + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Icon( + DidvanIcons.calendar_day_light, + size: 16, + ), + const SizedBox(width: 4), + DidvanText( + DateTime.parse(item.createdAt) + .toPersianDateStr(), + style: Theme.of(context).textTheme.labelSmall, + ), + ], ), const Spacer(), - if ((item.timeToRead ?? item.duration) != null) ...[ - const Icon( - DidvanIcons.timer_light, - size: 16, + if ((item.timeToRead ?? item.duration) != null) + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Icon( + DidvanIcons.timer_light, + size: 16, + ), + const SizedBox(width: 4), + DidvanText( + item.timeToRead != null + ? '${item.timeToRead} دقیقه' + : DateTimeUtils.normalizeTimeDuration( + Duration(seconds: item.duration!), + ), + style: + Theme.of(context).textTheme.labelSmall, + ), + ], ), - const SizedBox(width: 4), - DidvanText( - item.timeToRead != null - ? '${item.timeToRead} دقیقه' - : DateTimeUtils.normalizeTimeDuration( - Duration(seconds: item.duration!), - ), - style: Theme.of(context).textTheme.labelSmall, - ), - ] ], ), ),