diff --git a/lib/apps/chat/detail.dart b/lib/apps/chat/detail.dart index dc4d7a2..aac6cde 100644 --- a/lib/apps/chat/detail.dart +++ b/lib/apps/chat/detail.dart @@ -204,7 +204,7 @@ class _ChatDetailState extends State { ), SizedBox(height: 6.0), Text(friend.isClosed - ? lang.unfriended + ? lang.closed : session.onlineLang(lang), style: TextStyle( color: color.onPrimary.withOpacity(0.5), diff --git a/lib/apps/chat/list.dart b/lib/apps/chat/list.dart index b42a494..07b2141 100644 --- a/lib/apps/chat/list.dart +++ b/lib/apps/chat/list.dart @@ -110,7 +110,7 @@ class ListChat extends StatelessWidget { if (this.friend.isClosed) Container( margin: const EdgeInsets.only(left: 15.0, right: 20.0), - child: Text(lang.unfriended, + child: Text(lang.closed, style: TextStyle(color: color.primary, fontSize: 12.0), ), ) diff --git a/lib/apps/group_chat/add.dart b/lib/apps/group_chat/add.dart index eb1a7d1..af09b36 100644 --- a/lib/apps/group_chat/add.dart +++ b/lib/apps/group_chat/add.dart @@ -221,7 +221,7 @@ class _GroupAddPageState extends State { length: 2, child: Scaffold( appBar: AppBar( - title: Text(lang.addFriend), + title: Text(lang.groupChatAdd), leading: isDesktop ? IconButton( onPressed: () { diff --git a/lib/apps/group_chat/list.dart b/lib/apps/group_chat/list.dart index 585c905..dd0eb56 100644 --- a/lib/apps/group_chat/list.dart +++ b/lib/apps/group_chat/list.dart @@ -109,7 +109,7 @@ class ListChat extends StatelessWidget { if (group.isClosed) Container( margin: const EdgeInsets.only(left: 15.0, right: 20.0), - child: Text(lang.unfriended, + child: Text(lang.closed, style: TextStyle(color: color.primary, fontSize: 12.0), ), ) diff --git a/lib/l10n/localizations.dart b/lib/l10n/localizations.dart index fcc6f19..793a155 100644 --- a/lib/l10n/localizations.dart +++ b/lib/l10n/localizations.dart @@ -133,7 +133,6 @@ abstract class AppLocalizations { String fromContactCard(String name); String get setTop; String get cancelTop; - String get unfriended; String get unfriend; String get waitingRecord; diff --git a/lib/l10n/localizations_en.dart b/lib/l10n/localizations_en.dart index c61f8f9..aecfb61 100644 --- a/lib/l10n/localizations_en.dart +++ b/lib/l10n/localizations_en.dart @@ -181,8 +181,6 @@ class AppLocalizationsEn extends AppLocalizations { @override String get cancelTop => 'Cancal'; @override - String get unfriended => 'Unfriended'; - @override String get unfriend => 'Unfriend'; @override String get waitingRecord => 'Waiting to record'; @@ -263,7 +261,7 @@ class AppLocalizationsEn extends AppLocalizations { @override String get groupChats => 'Groups'; @override - String get groupChatAdd => 'Add Group Chat'; + String get groupChatAdd => 'Add Group'; @override String get groupChatIntro => 'Multiple group chats'; @override diff --git a/lib/l10n/localizations_zh.dart b/lib/l10n/localizations_zh.dart index 0e159aa..2d56878 100644 --- a/lib/l10n/localizations_zh.dart +++ b/lib/l10n/localizations_zh.dart @@ -181,8 +181,6 @@ class AppLocalizationsZh extends AppLocalizations { @override String get cancelTop => '取消首页'; @override - String get unfriended => '已解除好友'; - @override String get unfriend => '解除好友'; @override String get waitingRecord => '等待录音'; diff --git a/lib/pages/home.dart b/lib/pages/home.dart index 151e7f9..0eaa717 100644 --- a/lib/pages/home.dart +++ b/lib/pages/home.dart @@ -34,6 +34,7 @@ import 'package:esse/apps/file/list.dart'; import 'package:esse/apps/service/list.dart'; import 'package:esse/apps/service/add.dart'; import 'package:esse/apps/assistant/page.dart'; +import 'package:esse/apps/group_chat/add.dart'; import 'package:esse/apps/group_chat/list.dart'; import 'package:esse/apps/group_chat/detail.dart'; import 'package:esse/apps/group_chat/provider.dart'; @@ -162,6 +163,14 @@ class _HomeListState extends State { Navigator.push(context, MaterialPageRoute(builder: (_) => widget)); } } else if (value == 2) { + final widget = GroupAddPage(); + if (isDesktop) { + provider.updateActivedWidget(widget); + } else { + setState(() {}); + Navigator.push(context, MaterialPageRoute(builder: (_) => widget)); + } + } else if (value == 3) { showShadowDialog( context, Icons.info, @@ -179,7 +188,8 @@ class _HomeListState extends State { _menuItem(0, Icons.qr_code_scanner_rounded, lang.scan), _menuItem(1, Icons.person_add_rounded, lang.addFriend, provider.systemAppFriendAddNew), - _menuItem(2, Icons.qr_code_rounded, lang.myQrcode), + _menuItem(2, Icons.group_add_rounded, lang.groupChatAdd), + _menuItem(3, Icons.qr_code_rounded, lang.myQrcode), ]; }, ),