diff --git a/lib/constants/app_icons.dart b/lib/constants/app_icons.dart index 6827ded..23f7b58 100644 --- a/lib/constants/app_icons.dart +++ b/lib/constants/app_icons.dart @@ -113,11 +113,11 @@ class DidvanIcons { IconData(0xe82b, fontFamily: _kFontFam, fontPackage: _kFontPkg); static const IconData chart_solid = IconData(0xe82c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData chats_light = + static const IconData directs_light = IconData(0xe82d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData chats_regular = + static const IconData directs_regular = IconData(0xe82e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData chats_solid = + static const IconData directs_solid = IconData(0xe82f, fontFamily: _kFontFam, fontPackage: _kFontPkg); static const IconData check_light = IconData(0xe830, fontFamily: _kFontFam, fontPackage: _kFontPkg); diff --git a/lib/pages/home/chat/chat.dart b/lib/pages/home/direct/direct.dart similarity index 85% rename from lib/pages/home/chat/chat.dart rename to lib/pages/home/direct/direct.dart index 4d07d2e..e6a4019 100644 --- a/lib/pages/home/chat/chat.dart +++ b/lib/pages/home/direct/direct.dart @@ -1,10 +1,10 @@ -import 'package:didvan/pages/home/chat/widgets/message_box.dart'; +import 'package:didvan/pages/home/direct/widgets/message_box.dart'; import 'package:didvan/models/view/app_bar_data.dart'; import 'package:didvan/widgets/didvan/scaffold.dart'; import 'package:flutter/material.dart'; -class Chat extends StatelessWidget { - const Chat({Key? key}) : super(key: key); +class Direct extends StatelessWidget { + const Direct({Key? key}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/pages/home/chat/chat_state.dart b/lib/pages/home/direct/direct_state.dart similarity index 96% rename from lib/pages/home/chat/chat_state.dart rename to lib/pages/home/direct/direct_state.dart index d841aac..2758c21 100644 --- a/lib/pages/home/chat/chat_state.dart +++ b/lib/pages/home/direct/direct_state.dart @@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter_vibrate/flutter_vibrate.dart'; import 'package:record/record.dart'; -class ChatState extends CoreProvier { +class DirectState extends CoreProvier { final _recorder = Record(); File? recordedFile; diff --git a/lib/pages/home/chat/widgets/message_box.dart b/lib/pages/home/direct/widgets/message_box.dart similarity index 94% rename from lib/pages/home/chat/widgets/message_box.dart rename to lib/pages/home/direct/widgets/message_box.dart index 6c2ac9b..5aa2db5 100644 --- a/lib/pages/home/chat/widgets/message_box.dart +++ b/lib/pages/home/direct/widgets/message_box.dart @@ -1,6 +1,6 @@ import 'package:didvan/config/theme_data.dart'; import 'package:didvan/constants/app_icons.dart'; -import 'package:didvan/pages/home/chat/chat_state.dart'; +import 'package:didvan/pages/home/direct/direct_state.dart'; import 'package:didvan/widgets/audio_visualizer.dart'; import 'package:didvan/widgets/didvan/icon_button.dart'; import 'package:didvan/widgets/didvan/text.dart'; @@ -22,7 +22,7 @@ class MessageBox extends StatelessWidget { ), color: Theme.of(context).colorScheme.surface, ), - child: Consumer( + child: Consumer( builder: (context, state, child) { if (state.isRecording) { return const _Recording(); @@ -41,7 +41,7 @@ class _Typing extends StatelessWidget { @override Widget build(BuildContext context) { - final state = context.read(); + final state = context.read(); return Row( children: [ DidvanIconButton( @@ -74,7 +74,7 @@ class _Recording extends StatelessWidget { @override Widget build(BuildContext context) { - final state = context.read(); + final state = context.read(); return Row( children: [ GestureDetector( @@ -111,7 +111,7 @@ class _RecordChecking extends StatelessWidget { @override Widget build(BuildContext context) { - final state = context.read(); + final state = context.read(); return Row( children: [ DidvanIconButton( diff --git a/lib/pages/home/profile/chat_list/chat_list.dart b/lib/pages/home/profile/direct_list/direct_list.dart similarity index 94% rename from lib/pages/home/profile/chat_list/chat_list.dart rename to lib/pages/home/profile/direct_list/direct_list.dart index 43ac7ad..15c7a90 100644 --- a/lib/pages/home/profile/chat_list/chat_list.dart +++ b/lib/pages/home/profile/direct_list/direct_list.dart @@ -8,8 +8,8 @@ import 'package:didvan/widgets/didvan/scaffold.dart'; import 'package:didvan/widgets/didvan/text.dart'; import 'package:flutter/material.dart'; -class ChatList extends StatelessWidget { - const ChatList({Key? key}) : super(key: key); +class DirectList extends StatelessWidget { + const DirectList({Key? key}) : super(key: key); @override Widget build(BuildContext context) { @@ -27,7 +27,7 @@ class ChatList extends StatelessWidget { Widget _itemBuilder(BuildContext context) { return GestureDetector( - onTap: () => Navigator.of(context).pushNamed(Routes.chat), + onTap: () => Navigator.of(context).pushNamed(Routes.direct), child: Container( color: Colors.transparent, child: Column( diff --git a/lib/pages/home/profile/chat_list/chat_list_state.dart b/lib/pages/home/profile/direct_list/direct_list_state.dart similarity index 55% rename from lib/pages/home/profile/chat_list/chat_list_state.dart rename to lib/pages/home/profile/direct_list/direct_list_state.dart index a11ecee..913a161 100644 --- a/lib/pages/home/profile/chat_list/chat_list_state.dart +++ b/lib/pages/home/profile/direct_list/direct_list_state.dart @@ -1,3 +1,3 @@ import 'package:didvan/providers/core_provider.dart'; -class ChatListState extends CoreProvier {} +class DirectListState extends CoreProvier {} diff --git a/lib/pages/home/profile/profile.dart b/lib/pages/home/profile/profile.dart index bbd0665..54f16aa 100644 --- a/lib/pages/home/profile/profile.dart +++ b/lib/pages/home/profile/profile.dart @@ -34,7 +34,8 @@ class Profile extends StatelessWidget { MenuItem( title: 'پیام‌ها', icon: DidvanIcons.message_regular, - onTap: () => Navigator.of(context).pushNamed(Routes.chatList), + onTap: () => + Navigator.of(context).pushNamed(Routes.directList), ), const DidvanDivider(), MenuItem( diff --git a/lib/pages/home/radar/widgets/radar_item.dart b/lib/pages/home/radar/widgets/radar_item.dart index 0c6a02c..c8751f8 100644 --- a/lib/pages/home/radar/widgets/radar_item.dart +++ b/lib/pages/home/radar/widgets/radar_item.dart @@ -73,7 +73,7 @@ class RadarItem extends StatelessWidget { Spacer(), DidvanText('2'), SizedBox(width: 4), - Icon(DidvanIcons.chats_regular), + Icon(DidvanIcons.directs_regular), SizedBox(width: 16), DidvanText('10'), SizedBox(width: 4), diff --git a/lib/routes/route_generator.dart b/lib/routes/route_generator.dart index 159efcf..263f212 100644 --- a/lib/routes/route_generator.dart +++ b/lib/routes/route_generator.dart @@ -1,13 +1,13 @@ import 'package:didvan/pages/authentication/authentication.dart'; import 'package:didvan/pages/authentication/authentication_state.dart'; -import 'package:didvan/pages/home/chat/chat.dart'; -import 'package:didvan/pages/home/chat/chat_state.dart'; +import 'package:didvan/pages/home/direct/direct.dart'; +import 'package:didvan/pages/home/direct/direct_state.dart'; import 'package:didvan/pages/home/home.dart'; import 'package:didvan/pages/home/home_state.dart'; import 'package:didvan/pages/home/news/news_details/news_details.dart'; import 'package:didvan/pages/home/news/news_details/news_details_state.dart'; -import 'package:didvan/pages/home/profile/chat_list/chat_list.dart'; -import 'package:didvan/pages/home/profile/chat_list/chat_list_state.dart'; +import 'package:didvan/pages/home/profile/direct_list/direct_list.dart'; +import 'package:didvan/pages/home/profile/direct_list/direct_list_state.dart'; import 'package:didvan/pages/home/profile/edit_profile/edit_profile.dart'; import 'package:didvan/pages/home/profile/settings/settings.dart'; import 'package:didvan/pages/home/profile/settings/settings_state.dart'; @@ -68,18 +68,18 @@ class RouteGenerator { child: const NewsDetails(), ), ); - case Routes.chatList: + case Routes.directList: return _createRoute( - ChangeNotifierProvider( - create: (context) => ChatListState(), - child: const ChatList(), + ChangeNotifierProvider( + create: (context) => DirectListState(), + child: const DirectList(), ), ); - case Routes.chat: + case Routes.direct: return _createRoute( - ChangeNotifierProvider( - create: (context) => ChatState(), - child: const Chat(), + ChangeNotifierProvider( + create: (context) => DirectState(), + child: const Direct(), ), ); default: diff --git a/lib/routes/routes.dart b/lib/routes/routes.dart index ae38e38..ccfb5a7 100644 --- a/lib/routes/routes.dart +++ b/lib/routes/routes.dart @@ -7,6 +7,6 @@ class Routes { static const String settings = '/settings'; static const String radarDetails = '/radar-details'; static const String newsDetails = '/news-details'; - static const String chatList = '/chat-list'; - static const String chat = '/chat'; + static const String directList = '/direct-list'; + static const String direct = '/direct'; } diff --git a/lib/widgets/floating_navigation_bar.dart b/lib/widgets/floating_navigation_bar.dart index 1dd24f0..8f74f82 100644 --- a/lib/widgets/floating_navigation_bar.dart +++ b/lib/widgets/floating_navigation_bar.dart @@ -66,7 +66,7 @@ class FloatingNavigationBar extends StatelessWidget { ), const SizedBox(width: 4), const Icon( - DidvanIcons.chats_regular, + DidvanIcons.directs_regular, ), ], ),