diff --git a/lib/views/home/bookmarks/bookmarks.dart b/lib/views/home/bookmarks/bookmarks.dart index e39a5dc..e992040 100644 --- a/lib/views/home/bookmarks/bookmarks.dart +++ b/lib/views/home/bookmarks/bookmarks.dart @@ -98,7 +98,7 @@ class _BookmarksState extends State { MenuOption( onTap: () => _onCategorySelected(7), title: 'اینفوگرافی', - icon: DidvanIcons.info_circle_regular, + icon: DidvanIcons.infography_regular, iconSize: 24, ), ], @@ -110,7 +110,7 @@ class _BookmarksState extends State { child: AnimatedVisibility( duration: DesignConfig.lowAnimationDuration, isVisible: !state.searching, - child: const ItemTitle(title: 'آخرین نشان شده‌ها'), + child: const ItemTitle(title: 'نشان شده‌ها'), ), ), ], diff --git a/lib/views/home/main/main_page.dart b/lib/views/home/main/main_page.dart index 8f34aaf..61bf327 100644 --- a/lib/views/home/main/main_page.dart +++ b/lib/views/home/main/main_page.dart @@ -106,6 +106,7 @@ class InfoTitle extends StatelessWidget { Widget build(BuildContext context) { return Row( children: [ + const Icon(DidvanIcons.infography_solid), const SizedBox(width: 4), DidvanText( "اینفوگرافی", @@ -151,7 +152,7 @@ class _MainPageSection extends StatelessWidget { return DidvanIcons.exclamation_triangle_solid; case 'startup': return DidvanIcons.startup_solid; - case 'saha': + case 'delphi': return DidvanIcons.saha_solid; default: return null; diff --git a/lib/views/home/new_statistic/new_statistic.dart b/lib/views/home/new_statistic/new_statistic.dart index 534217d..8c5734c 100644 --- a/lib/views/home/new_statistic/new_statistic.dart +++ b/lib/views/home/new_statistic/new_statistic.dart @@ -77,7 +77,10 @@ class _NewStatisticState extends State { "title": state.contents[0].header, }).then((value) => state.getStatistic()); }), - child: StatHeader(header: state.contents[0].header)), + child: StatHeader( + header: state.contents[0].header, + icon: DidvanIcons.star_circle_solid, + )), SizedBox( height: 100, width: 80, @@ -102,7 +105,10 @@ class _NewStatisticState extends State { "title": state.contents[1].header }); }).then((value) => _reset()), - child: StatHeader(header: state.contents[1].header)), + child: StatHeader( + header: state.contents[1].header, + icon: DidvanIcons.currency_solid, + )), SizedBox( height: 100, width: 80, @@ -124,7 +130,10 @@ class _NewStatisticState extends State { "title": state.contents[2].header }); }), - child: StatHeader(header: state.contents[2].header)), + child: StatHeader( + header: state.contents[2].header, + icon: DidvanIcons.bitcoin_solid, + )), SizedBox( height: 100, width: 80, @@ -139,14 +148,15 @@ class _NewStatisticState extends State { verticalPadding: 4, ), GestureDetector( - onTap: () => Future.delayed(Duration.zero, () { - Navigator.of(context).pushNamed(Routes.statGeneral, - arguments: { - "id": 3, - "title": state.contents[3].header - }); - }), - child: StatHeader(header: state.contents[3].header)), + onTap: () => Future.delayed(Duration.zero, () { + Navigator.of(context).pushNamed(Routes.statGeneral, + arguments: {"id": 3, "title": state.contents[3].header}); + }), + child: StatHeader( + header: state.contents[3].header, + icon: DidvanIcons.commodity_solid, + ), + ), SizedBox( height: 100, width: 80, @@ -168,7 +178,10 @@ class _NewStatisticState extends State { "title": state.contents[4].header }); }), - child: StatHeader(header: state.contents[4].header)), + child: StatHeader( + header: state.contents[4].header, + icon: DidvanIcons.industry_solid, + )), SizedBox( height: 100, width: 80, @@ -190,7 +203,10 @@ class _NewStatisticState extends State { "title": state.contents[5].header, }); }), - child: StatHeader(header: state.contents[5].header)), + child: StatHeader( + header: state.contents[5].header, + icon: DidvanIcons.metal_solid, + )), SizedBox( height: 100, width: 80, @@ -305,7 +321,8 @@ class StatMainCard extends StatelessWidget { class StatHeader extends StatelessWidget { final String header; - const StatHeader({super.key, required this.header}); + final IconData icon; + const StatHeader({super.key, required this.header, required this.icon}); @override Widget build(BuildContext context) { @@ -322,10 +339,10 @@ class StatHeader extends StatelessWidget { children: [ Row( children: [ + Icon(icon), const SizedBox(width: 4), DidvanText( - // ignore: unnecessary_string_interpolations - "$header", + header, style: Theme.of(context).textTheme.titleMedium, color: Theme.of(context).colorScheme.title, ), 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 df1451b..4533675 100644 --- a/lib/views/home/new_statistic/widgets/general_stat_card.dart +++ b/lib/views/home/new_statistic/widgets/general_stat_card.dart @@ -66,7 +66,9 @@ class _NewStatisticOverviewCardState extends State { Row( children: [ DidvanIconButton( - icon: marked ? Icons.star : Icons.star_border, + icon: marked + ? DidvanIcons.star_solid + : DidvanIcons.star_regular, color: marked ? Theme.of(context).colorScheme.yellow : Theme.of(context).colorScheme.focusedBorder, diff --git a/lib/views/home/new_statistic/widgets/statistic_cat.dart b/lib/views/home/new_statistic/widgets/statistic_cat.dart index 775f37c..8b098cb 100644 --- a/lib/views/home/new_statistic/widgets/statistic_cat.dart +++ b/lib/views/home/new_statistic/widgets/statistic_cat.dart @@ -40,33 +40,30 @@ class NewStatisticCategories extends StatelessWidget { .map( (e) => GestureDetector( onTap: () => _onTap(e.id, e.label, context, context), - child: Padding( - padding: const EdgeInsets.all(12.0), - child: SizedBox( - width: (MediaQuery.of(context).size.width - 40) / 4, - child: Column( - children: [ - Container( - width: 56, - height: 56, - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - borderRadius: DesignConfig.lowBorderRadius, - boxShadow: DesignConfig.defaultShadow, - ), - child: SvgPicture.asset(e.asset), + child: SizedBox( + width: (MediaQuery.of(context).size.width - 56) / 3, + child: Column( + children: [ + Container( + width: 56, + height: 56, + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.surface, + borderRadius: DesignConfig.lowBorderRadius, + boxShadow: DesignConfig.defaultShadow, ), - const SizedBox(height: 4), - DidvanText( - e.label, - color: Theme.of(context).colorScheme.title, - style: Theme.of(context).textTheme.labelSmall, - fontWeight: FontWeight.w600, - ), - const SizedBox(height: 12), - ], - ), + child: SvgPicture.asset(e.asset), + ), + const SizedBox(height: 4), + DidvanText( + e.label, + color: Theme.of(context).colorScheme.title, + style: Theme.of(context).textTheme.labelSmall, + fontWeight: FontWeight.w600, + ), + const SizedBox(height: 12), + ], ), ), ), diff --git a/lib/views/home/statistic/statistic_details/statistic_details.dart b/lib/views/home/statistic/statistic_details/statistic_details.dart index e1528e3..2cbcd44 100644 --- a/lib/views/home/statistic/statistic_details/statistic_details.dart +++ b/lib/views/home/statistic/statistic_details/statistic_details.dart @@ -53,7 +53,9 @@ class _StatisticDetailsState extends State { hasBack: true, subtitle: 'رادار قیمت‌ها', trailing: DidvanIconButton( - icon: state.marked ? Icons.star : Icons.star_border, + icon: state.marked + ? DidvanIcons.star_solid + : DidvanIcons.star_regular, color: state.marked ? Theme.of(context).colorScheme.yellow : Theme.of(context).colorScheme.focusedBorder, diff --git a/lib/views/home/widgets/categories.dart b/lib/views/home/widgets/categories.dart index c5dec8d..ced79fd 100644 --- a/lib/views/home/widgets/categories.dart +++ b/lib/views/home/widgets/categories.dart @@ -35,33 +35,30 @@ class MainCategories extends StatelessWidget { .map( (e) => GestureDetector( onTap: () => _onTap(e.link, context), - child: Padding( - padding: const EdgeInsets.all(12.0), - child: SizedBox( - width: (MediaQuery.of(context).size.width - 40) / 4, - child: Column( - children: [ - Container( - width: 56, - height: 56, - padding: const EdgeInsets.all(8), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - borderRadius: DesignConfig.lowBorderRadius, - boxShadow: DesignConfig.defaultShadow, - ), - child: SvgPicture.asset(e.asset), + child: SizedBox( + width: (MediaQuery.of(context).size.width - 40) / 3, + child: Column( + children: [ + Container( + width: 56, + height: 56, + padding: const EdgeInsets.all(8), + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.surface, + borderRadius: DesignConfig.lowBorderRadius, + boxShadow: DesignConfig.defaultShadow, ), - const SizedBox(height: 4), - DidvanText( - e.label, - color: Theme.of(context).colorScheme.title, - style: Theme.of(context).textTheme.labelSmall, - fontWeight: FontWeight.w600, - ), - const SizedBox(height: 12), - ], - ), + child: SvgPicture.asset(e.asset), + ), + const SizedBox(height: 4), + DidvanText( + e.label, + color: Theme.of(context).colorScheme.title, + style: Theme.of(context).textTheme.labelSmall, + fontWeight: FontWeight.w600, + ), + const SizedBox(height: 12), + ], ), ), ), diff --git a/lib/views/widgets/didvan/bnb.dart b/lib/views/widgets/didvan/bnb.dart index ea2cc4a..84cc79a 100644 --- a/lib/views/widgets/didvan/bnb.dart +++ b/lib/views/widgets/didvan/bnb.dart @@ -79,8 +79,8 @@ class DidvanBNB extends StatelessWidget { _NavBarItem( isSelected: currentTabIndex == 3, title: 'رصدخانه من', - selectedIcon: DidvanIcons.radar_solid, - unselectedIcon: DidvanIcons.radar_light, + selectedIcon: DidvanIcons.antenna_solid, + unselectedIcon: DidvanIcons.antenna_light, onTap: () => onTabChanged(3), ), ], diff --git a/lib/views/widgets/didvan/text_field.dart b/lib/views/widgets/didvan/text_field.dart index 14acdde..57f16af 100644 --- a/lib/views/widgets/didvan/text_field.dart +++ b/lib/views/widgets/didvan/text_field.dart @@ -191,7 +191,7 @@ class _DidvanTextFieldState extends State { }); }, child: Icon( - _hideContent ? DidvanIcons.eye_solid : DidvanIcons.eye_slash_solid, + _hideContent ? DidvanIcons.eye_solid : DidvanIcons.eye_close_solid, ), ), );