Mr.Rahmani
/
didvan-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

some changes

This commit is contained in:
MohammadTaha Basiri 2023-10-11 22:20:58 +03:30
parent 058ffbef0d
commit 6bd7c870ea
11 changed files with 52 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/models/overview_data.dart
View File

@ -57,7 +57,6 @@ class OverviewData {
default: default:
typeInteger = 5; typeInteger = 5;
} }
typeInteger = 2;
} }
factory OverviewData.fromJson(Map<String, dynamic> json) { factory OverviewData.fromJson(Map<String, dynamic> json) {

12
lib/views/home/bookmarks/bookmarks.dart
View File

@ -56,42 +56,42 @@ class _BookmarksState extends State<Bookmarks> {
MenuOption( MenuOption(
onTap: () => _onCategorySelected(5), onTap: () => _onCategorySelected(5),
title: 'تحلیل‌های رادار', title: 'تحلیل‌های رادار',
icon: DidvanIcons.radar_solid, icon: DidvanIcons.radar_regular,
iconSize: 24, iconSize: 24,
), ),
const DidvanDivider(), const DidvanDivider(),
MenuOption( MenuOption(
onTap: () => _onCategorySelected(2), onTap: () => _onCategorySelected(2),
title: 'دنیای فولاد', title: 'دنیای فولاد',
icon: DidvanIcons.news_solid, icon: DidvanIcons.foolad_regular,
iconSize: 24, iconSize: 24,
), ),
const DidvanDivider(), const DidvanDivider(),
MenuOption( MenuOption(
onTap: () => _onCategorySelected(1), onTap: () => _onCategorySelected(1),
title: 'پویش افق', title: 'پویش افق',
icon: DidvanIcons.radar_solid, icon: DidvanIcons.scanning_regular,
iconSize: 24, iconSize: 24,
), ),
const DidvanDivider(), const DidvanDivider(),
MenuOption( MenuOption(
onTap: () => _onCategorySelected(3), onTap: () => _onCategorySelected(3),
title: 'ویدئو‌کست', title: 'ویدئو‌کست',
icon: DidvanIcons.video_solid, icon: DidvanIcons.video_regular,
iconSize: 24, iconSize: 24,
), ),
const DidvanDivider(), const DidvanDivider(),
MenuOption( MenuOption(
onTap: () => _onCategorySelected(4), onTap: () => _onCategorySelected(4),
title: 'پادکست‌ها', title: 'پادکست‌ها',
icon: DidvanIcons.podcast_solid, icon: DidvanIcons.podcast_regular,
iconSize: 24, iconSize: 24,
), ),
const DidvanDivider(), const DidvanDivider(),
MenuOption( MenuOption(
onTap: () => _onCategorySelected(6), onTap: () => _onCategorySelected(6),
title: 'سها', title: 'سها',
icon: DidvanIcons.podcast_solid, icon: DidvanIcons.saha_regular,
iconSize: 24, iconSize: 24,
), ),
], ],

1
lib/views/home/bookmarks/filtered_bookmark/filtered_bookmark.dart
View File

@ -49,6 +49,7 @@ class _FilteredBookmarksState extends State<FilteredBookmarks> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return DidvanScaffold( return DidvanScaffold(
appBarData: AppBarData(title: _appBarTitle), appBarData: AppBarData(title: _appBarTitle),
padding: const EdgeInsets.all(16),
slivers: [ slivers: [
Consumer<FilteredBookmarksState>( Consumer<FilteredBookmarksState>(
builder: (context, state, child) => builder: (context, state, child) =>

2
lib/views/home/main/main_page.dart
View File

@ -78,7 +78,7 @@ class _MainPageSection extends StatelessWidget {
IconData? _generateIcon() { IconData? _generateIcon() {
switch (list.type) { switch (list.type) {
case 'news': case 'news':
return DidvanIcons.news_solid; return DidvanIcons.foolad_solid;
case 'radar': case 'radar':
return DidvanIcons.radar_solid; return DidvanIcons.radar_solid;
case 'video': case 'video':

28
lib/views/home/main/widgets/general_item.dart
View File

@ -162,24 +162,14 @@ class _MainPageGeneralItemState extends State<MainPageGeneralItem> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
if (widget.type == 'radar' || widget.type == 'video') Column(
Row( children: [
children: [ for (int i = 0;
for (int i = 0; i < widget.content.subtitles.length;
i < widget.content.subtitles.length; i++)
i++) _subtitleItem(i, context)
Expanded(child: _subtitleItem(i, context)) ],
], )
)
else
Column(
children: [
for (int i = 0;
i < widget.content.subtitles.length;
i++)
_subtitleItem(i, context)
],
)
], ],
), ),
), ),
@ -217,6 +207,8 @@ class _MainPageGeneralItemState extends State<MainPageGeneralItem> {
} }
Widget _subtitleItem(int i, BuildContext context) => Row( Widget _subtitleItem(int i, BuildContext context) => Row(
mainAxisAlignment:
i == 0 ? MainAxisAlignment.start : MainAxisAlignment.end,
children: [ children: [
Icon( Icon(
_generateSubtitleIcon(i), _generateSubtitleIcon(i),

2
lib/views/home/main/widgets/main_content.dart
View File

@ -30,7 +30,7 @@ class MainPageMainContent extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 12), padding: const EdgeInsets.symmetric(horizontal: 12),
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.background,
child: DidvanText( child: DidvanText(
'سوپر اپ دیدوان در یک نگاه', 'دیدوان در یک نگاه',
color: Theme.of(context).colorScheme.title, color: Theme.of(context).colorScheme.title,
style: Theme.of(context).textTheme.titleMedium, style: Theme.of(context).textTheme.titleMedium,
), ),

2
lib/views/home/search/widgets/search_result_item.dart
View File

@ -48,7 +48,7 @@ class SearchResultItem extends StatelessWidget {
return DidvanIcons.radar_light; return DidvanIcons.radar_light;
} }
if (item.type == 'news') { if (item.type == 'news') {
return DidvanIcons.news_light; return DidvanIcons.foolad_light;
} }
if (item.type == 'video') { if (item.type == 'video') {
return DidvanIcons.video_light; return DidvanIcons.video_light;

60
lib/views/profile/profile.dart
View File

@ -1,11 +1,9 @@
import 'package:didvan/config/theme_data.dart';
import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/constants/app_icons.dart';
import 'package:didvan/models/view/app_bar_data.dart'; import 'package:didvan/models/view/app_bar_data.dart';
import 'package:didvan/providers/user.dart'; import 'package:didvan/providers/user.dart';
import 'package:didvan/routes/routes.dart'; import 'package:didvan/routes/routes.dart';
import 'package:didvan/services/storage/storage.dart'; import 'package:didvan/services/storage/storage.dart';
import 'package:didvan/views/widgets/menu_item.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/card.dart';
import 'package:didvan/views/widgets/didvan/divider.dart'; import 'package:didvan/views/widgets/didvan/divider.dart';
import 'package:didvan/views/widgets/didvan/scaffold.dart'; import 'package:didvan/views/widgets/didvan/scaffold.dart';
@ -28,29 +26,29 @@ class ProfilePage extends StatelessWidget {
DidvanCard( DidvanCard(
child: Column( child: Column(
children: [ children: [
Consumer<UserProvider>( // Consumer<UserProvider>(
child: Icon( // child: Icon(
DidvanIcons.angle_left_regular, // DidvanIcons.angle_left_regular,
size: 18, // size: 18,
color: Theme.of(context).colorScheme.title, // color: Theme.of(context).colorScheme.title,
), // ),
builder: (context, state, child) => MenuOption( // builder: (context, state, child) => MenuOption(
title: 'پیام‌ها', // title: 'پیام‌ها',
icon: DidvanIcons.message_regular, // icon: DidvanIcons.message_regular,
onTap: () => // onTap: () =>
Navigator.of(context).pushNamed(Routes.directList), // Navigator.of(context).pushNamed(Routes.directList),
trailing: Row( // trailing: Row(
children: [ // children: [
if (state.unreadMessageCount != 0) // if (state.unreadMessageCount != 0)
DidvanBadge( // DidvanBadge(
text: state.unreadMessageCount.toString(), // text: state.unreadMessageCount.toString(),
), // ),
child!, // child!,
], // ],
), // ),
), // ),
), // ),
const DidvanDivider(), // const DidvanDivider(),
MenuOption( MenuOption(
title: 'ویرایش پروفایل', title: 'ویرایش پروفایل',
icon: DidvanIcons.user_edit_regular, icon: DidvanIcons.user_edit_regular,
@ -66,12 +64,12 @@ class ProfilePage extends StatelessWidget {
Navigator.of(context).pushNamed(Routes.generalSettings), Navigator.of(context).pushNamed(Routes.generalSettings),
), ),
const DidvanDivider(), const DidvanDivider(),
MenuOption( // MenuOption(
title: 'نشان شده‌ها', // title: 'نشان شده‌ها',
icon: DidvanIcons.bookmark_regular, // icon: DidvanIcons.bookmark_regular,
onTap: () => Navigator.of(context).pushNamed(Routes.bookmarks), // onTap: () => Navigator.of(context).pushNamed(Routes.bookmarks),
), // ),
const DidvanDivider(), // const DidvanDivider(),
MenuOption( MenuOption(
title: 'خروج از حساب کاربری', title: 'خروج از حساب کاربری',
icon: DidvanIcons.sign_out_regular, icon: DidvanIcons.sign_out_regular,

2
lib/views/widgets/didvan/bnb.dart
View File

@ -78,7 +78,7 @@ class DidvanBNB extends StatelessWidget {
), ),
_NavBarItem( _NavBarItem(
isSelected: currentTabIndex == 3, isSelected: currentTabIndex == 3,
title: 'رصدهای من', title: 'رصدخانه من',
selectedIcon: DidvanIcons.radar_solid, selectedIcon: DidvanIcons.radar_solid,
unselectedIcon: DidvanIcons.radar_light, unselectedIcon: DidvanIcons.radar_light,
onTap: () => onTabChanged(3), onTap: () => onTabChanged(3),

2
lib/views/widgets/logo_app_bar.dart
View File

@ -72,7 +72,7 @@ class LogoAppBar extends StatelessWidget implements PreferredSizeWidget {
: DidvanIcons.message_solid, : DidvanIcons.message_solid,
size: 32, size: 32,
onPressed: () => onPressed: () =>
Navigator.of(context).pushNamed(Routes.direct), Navigator.of(context).pushNamed(Routes.directList),
), ),
if (state.unreadCount != 0) if (state.unreadCount != 0)
Positioned( Positioned(

2
lib/views/widgets/overview/multitype.dart
View File

@ -57,7 +57,7 @@ class MultitypeOverview extends StatelessWidget {
return DidvanIcons.radar_light; return DidvanIcons.radar_light;
} }
if (item.type == 'news') { if (item.type == 'news') {
return DidvanIcons.news_light; return DidvanIcons.foolad_light;
} }
if (item.type == 'video') { if (item.type == 'video') {
return DidvanIcons.video_light; return DidvanIcons.video_light;