diff --git a/lib/models/overview_data.dart b/lib/models/overview_data.dart index f3a7639..09624bc 100644 --- a/lib/models/overview_data.dart +++ b/lib/models/overview_data.dart @@ -57,7 +57,6 @@ class OverviewData { default: typeInteger = 5; } - typeInteger = 2; } factory OverviewData.fromJson(Map json) { diff --git a/lib/views/home/bookmarks/bookmarks.dart b/lib/views/home/bookmarks/bookmarks.dart index 3795c7b..5cc178c 100644 --- a/lib/views/home/bookmarks/bookmarks.dart +++ b/lib/views/home/bookmarks/bookmarks.dart @@ -56,42 +56,42 @@ class _BookmarksState extends State { MenuOption( onTap: () => _onCategorySelected(5), title: 'تحلیل‌های رادار', - icon: DidvanIcons.radar_solid, + icon: DidvanIcons.radar_regular, iconSize: 24, ), const DidvanDivider(), MenuOption( onTap: () => _onCategorySelected(2), title: 'دنیای فولاد', - icon: DidvanIcons.news_solid, + icon: DidvanIcons.foolad_regular, iconSize: 24, ), const DidvanDivider(), MenuOption( onTap: () => _onCategorySelected(1), title: 'پویش افق', - icon: DidvanIcons.radar_solid, + icon: DidvanIcons.scanning_regular, iconSize: 24, ), const DidvanDivider(), MenuOption( onTap: () => _onCategorySelected(3), title: 'ویدئو‌کست', - icon: DidvanIcons.video_solid, + icon: DidvanIcons.video_regular, iconSize: 24, ), const DidvanDivider(), MenuOption( onTap: () => _onCategorySelected(4), title: 'پادکست‌ها', - icon: DidvanIcons.podcast_solid, + icon: DidvanIcons.podcast_regular, iconSize: 24, ), const DidvanDivider(), MenuOption( onTap: () => _onCategorySelected(6), title: 'سها', - icon: DidvanIcons.podcast_solid, + icon: DidvanIcons.saha_regular, iconSize: 24, ), ], diff --git a/lib/views/home/bookmarks/filtered_bookmark/filtered_bookmark.dart b/lib/views/home/bookmarks/filtered_bookmark/filtered_bookmark.dart index 319d92f..2ecad51 100644 --- a/lib/views/home/bookmarks/filtered_bookmark/filtered_bookmark.dart +++ b/lib/views/home/bookmarks/filtered_bookmark/filtered_bookmark.dart @@ -49,6 +49,7 @@ class _FilteredBookmarksState extends State { Widget build(BuildContext context) { return DidvanScaffold( appBarData: AppBarData(title: _appBarTitle), + padding: const EdgeInsets.all(16), slivers: [ Consumer( builder: (context, state, child) => diff --git a/lib/views/home/main/main_page.dart b/lib/views/home/main/main_page.dart index 4d545e2..c173445 100644 --- a/lib/views/home/main/main_page.dart +++ b/lib/views/home/main/main_page.dart @@ -78,7 +78,7 @@ class _MainPageSection extends StatelessWidget { IconData? _generateIcon() { switch (list.type) { case 'news': - return DidvanIcons.news_solid; + return DidvanIcons.foolad_solid; case 'radar': return DidvanIcons.radar_solid; case 'video': diff --git a/lib/views/home/main/widgets/general_item.dart b/lib/views/home/main/widgets/general_item.dart index 79990a5..7fa5650 100644 --- a/lib/views/home/main/widgets/general_item.dart +++ b/lib/views/home/main/widgets/general_item.dart @@ -162,24 +162,14 @@ class _MainPageGeneralItemState extends State { overflow: TextOverflow.ellipsis, ), ), - if (widget.type == 'radar' || widget.type == 'video') - Row( - children: [ - for (int i = 0; - i < widget.content.subtitles.length; - i++) - Expanded(child: _subtitleItem(i, context)) - ], - ) - else - Column( - children: [ - for (int i = 0; - i < widget.content.subtitles.length; - i++) - _subtitleItem(i, context) - ], - ) + Column( + children: [ + for (int i = 0; + i < widget.content.subtitles.length; + i++) + _subtitleItem(i, context) + ], + ) ], ), ), @@ -217,6 +207,8 @@ class _MainPageGeneralItemState extends State { } Widget _subtitleItem(int i, BuildContext context) => Row( + mainAxisAlignment: + i == 0 ? MainAxisAlignment.start : MainAxisAlignment.end, children: [ Icon( _generateSubtitleIcon(i), diff --git a/lib/views/home/main/widgets/main_content.dart b/lib/views/home/main/widgets/main_content.dart index 25eb94b..8a28bf6 100644 --- a/lib/views/home/main/widgets/main_content.dart +++ b/lib/views/home/main/widgets/main_content.dart @@ -30,7 +30,7 @@ class MainPageMainContent extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 12), color: Theme.of(context).colorScheme.background, child: DidvanText( - 'سوپر اپ دیدوان در یک نگاه', + 'دیدوان در یک نگاه', color: Theme.of(context).colorScheme.title, style: Theme.of(context).textTheme.titleMedium, ), diff --git a/lib/views/home/search/widgets/search_result_item.dart b/lib/views/home/search/widgets/search_result_item.dart index 8aec79a..9071108 100644 --- a/lib/views/home/search/widgets/search_result_item.dart +++ b/lib/views/home/search/widgets/search_result_item.dart @@ -48,7 +48,7 @@ class SearchResultItem extends StatelessWidget { return DidvanIcons.radar_light; } if (item.type == 'news') { - return DidvanIcons.news_light; + return DidvanIcons.foolad_light; } if (item.type == 'video') { return DidvanIcons.video_light; diff --git a/lib/views/profile/profile.dart b/lib/views/profile/profile.dart index 8c012bf..7825eac 100644 --- a/lib/views/profile/profile.dart +++ b/lib/views/profile/profile.dart @@ -1,11 +1,9 @@ -import 'package:didvan/config/theme_data.dart'; import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/models/view/app_bar_data.dart'; import 'package:didvan/providers/user.dart'; import 'package:didvan/routes/routes.dart'; import 'package:didvan/services/storage/storage.dart'; import 'package:didvan/views/widgets/menu_item.dart'; -import 'package:didvan/views/widgets/didvan/badge.dart'; import 'package:didvan/views/widgets/didvan/card.dart'; import 'package:didvan/views/widgets/didvan/divider.dart'; import 'package:didvan/views/widgets/didvan/scaffold.dart'; @@ -28,29 +26,29 @@ class ProfilePage extends StatelessWidget { DidvanCard( child: Column( children: [ - Consumer( - child: Icon( - DidvanIcons.angle_left_regular, - size: 18, - color: Theme.of(context).colorScheme.title, - ), - builder: (context, state, child) => MenuOption( - title: 'پیام‌ها', - icon: DidvanIcons.message_regular, - onTap: () => - Navigator.of(context).pushNamed(Routes.directList), - trailing: Row( - children: [ - if (state.unreadMessageCount != 0) - DidvanBadge( - text: state.unreadMessageCount.toString(), - ), - child!, - ], - ), - ), - ), - const DidvanDivider(), + // Consumer( + // child: Icon( + // DidvanIcons.angle_left_regular, + // size: 18, + // color: Theme.of(context).colorScheme.title, + // ), + // builder: (context, state, child) => MenuOption( + // title: 'پیام‌ها', + // icon: DidvanIcons.message_regular, + // onTap: () => + // Navigator.of(context).pushNamed(Routes.directList), + // trailing: Row( + // children: [ + // if (state.unreadMessageCount != 0) + // DidvanBadge( + // text: state.unreadMessageCount.toString(), + // ), + // child!, + // ], + // ), + // ), + // ), + // const DidvanDivider(), MenuOption( title: 'ویرایش پروفایل', icon: DidvanIcons.user_edit_regular, @@ -66,12 +64,12 @@ class ProfilePage extends StatelessWidget { Navigator.of(context).pushNamed(Routes.generalSettings), ), const DidvanDivider(), - MenuOption( - title: 'نشان شده‌ها', - icon: DidvanIcons.bookmark_regular, - onTap: () => Navigator.of(context).pushNamed(Routes.bookmarks), - ), - const DidvanDivider(), + // MenuOption( + // title: 'نشان شده‌ها', + // icon: DidvanIcons.bookmark_regular, + // onTap: () => Navigator.of(context).pushNamed(Routes.bookmarks), + // ), + // const DidvanDivider(), MenuOption( title: 'خروج از حساب کاربری', icon: DidvanIcons.sign_out_regular, diff --git a/lib/views/widgets/didvan/bnb.dart b/lib/views/widgets/didvan/bnb.dart index 891cbea..6cb00c7 100644 --- a/lib/views/widgets/didvan/bnb.dart +++ b/lib/views/widgets/didvan/bnb.dart @@ -78,7 +78,7 @@ class DidvanBNB extends StatelessWidget { ), _NavBarItem( isSelected: currentTabIndex == 3, - title: 'رصدهای من', + title: 'رصدخانه من', selectedIcon: DidvanIcons.radar_solid, unselectedIcon: DidvanIcons.radar_light, onTap: () => onTabChanged(3), diff --git a/lib/views/widgets/logo_app_bar.dart b/lib/views/widgets/logo_app_bar.dart index cdfa3af..05b5690 100644 --- a/lib/views/widgets/logo_app_bar.dart +++ b/lib/views/widgets/logo_app_bar.dart @@ -72,7 +72,7 @@ class LogoAppBar extends StatelessWidget implements PreferredSizeWidget { : DidvanIcons.message_solid, size: 32, onPressed: () => - Navigator.of(context).pushNamed(Routes.direct), + Navigator.of(context).pushNamed(Routes.directList), ), if (state.unreadCount != 0) Positioned( diff --git a/lib/views/widgets/overview/multitype.dart b/lib/views/widgets/overview/multitype.dart index 4610b4c..58ecdd4 100644 --- a/lib/views/widgets/overview/multitype.dart +++ b/lib/views/widgets/overview/multitype.dart @@ -57,7 +57,7 @@ class MultitypeOverview extends StatelessWidget { return DidvanIcons.radar_light; } if (item.type == 'news') { - return DidvanIcons.news_light; + return DidvanIcons.foolad_light; } if (item.type == 'video') { return DidvanIcons.video_light;