Browse Source

[UI] add addGroup to home page

pull/18/head
Sun 4 years ago
parent
commit
13791a3a7e
  1. 2
      lib/apps/chat/detail.dart
  2. 2
      lib/apps/chat/list.dart
  3. 2
      lib/apps/group_chat/add.dart
  4. 2
      lib/apps/group_chat/list.dart
  5. 1
      lib/l10n/localizations.dart
  6. 4
      lib/l10n/localizations_en.dart
  7. 2
      lib/l10n/localizations_zh.dart
  8. 12
      lib/pages/home.dart

2
lib/apps/chat/detail.dart

@ -204,7 +204,7 @@ class _ChatDetailState extends State<ChatDetail> { @@ -204,7 +204,7 @@ class _ChatDetailState extends State<ChatDetail> {
),
SizedBox(height: 6.0),
Text(friend.isClosed
? lang.unfriended
? lang.closed
: session.onlineLang(lang),
style: TextStyle(
color: color.onPrimary.withOpacity(0.5),

2
lib/apps/chat/list.dart

@ -110,7 +110,7 @@ class ListChat extends StatelessWidget { @@ -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),
),
)

2
lib/apps/group_chat/add.dart

@ -221,7 +221,7 @@ class _GroupAddPageState extends State<GroupAddPage> { @@ -221,7 +221,7 @@ class _GroupAddPageState extends State<GroupAddPage> {
length: 2,
child: Scaffold(
appBar: AppBar(
title: Text(lang.addFriend),
title: Text(lang.groupChatAdd),
leading: isDesktop
? IconButton(
onPressed: () {

2
lib/apps/group_chat/list.dart

@ -109,7 +109,7 @@ class ListChat extends StatelessWidget { @@ -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),
),
)

1
lib/l10n/localizations.dart

@ -133,7 +133,6 @@ abstract class AppLocalizations { @@ -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;

4
lib/l10n/localizations_en.dart

@ -181,8 +181,6 @@ class AppLocalizationsEn extends AppLocalizations { @@ -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 { @@ -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

2
lib/l10n/localizations_zh.dart

@ -181,8 +181,6 @@ class AppLocalizationsZh extends AppLocalizations { @@ -181,8 +181,6 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get cancelTop => '取消首页';
@override
String get unfriended => '已解除好友';
@override
String get unfriend => '解除好友';
@override
String get waitingRecord => '等待录音';

12
lib/pages/home.dart

@ -34,6 +34,7 @@ import 'package:esse/apps/file/list.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<HomeList> { @@ -162,6 +163,14 @@ class _HomeListState extends State<HomeList> {
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<HomeList> { @@ -179,7 +188,8 @@ class _HomeListState extends State<HomeList> {
_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),
];
},
),

Loading…
Cancel
Save