Comunic/comunicmobile
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicmobile synced 2025-11-04 04:04:18 +00:00
Code Issues Projects Releases Wiki Activity

Open conversations in their context

Browse Source
This commit is contained in:
Pierre HUBERT
2021-04-06 18:22:45 +02:00
parent 66d8fbd234
commit 1d0609f66e
10 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ui/screens/authorized_group_page_screen.dart
View File

@@ -26,11 +26,13 @@ Color get _headerColor => Colors.blueAccent.shade700;
class AuthorizedGroupPageScreen extends StatefulWidget {
final AdvancedGroupInfo advancedGroupInfo;
final int conversationID;
final Function() needRefresh;
const AuthorizedGroupPageScreen({
Key key,
@required this.advancedGroupInfo,
@required this.conversationID,
@required this.needRefresh,
}) : assert(advancedGroupInfo != null),
assert(needRefresh != null),
@@ -83,7 +85,11 @@ class _AuthorizedGroupPageScreenState
void initState() {
_tabController = TabController(
length: _tabs.length,
initialIndex: 0,
initialIndex: widget.conversationID == null
? 0
: 1 +
_group.conversations
.indexWhere((element) => element.id == widget.conversationID),
vsync: this,
);
@@ -105,7 +111,7 @@ class _AuthorizedGroupPageScreenState
Material(
color: _headerColor,
child: TabBar(
isScrollable: true,
isScrollable: _tabController.length > 4,
tabs: _tabs.map((e) => e.tab).toList(),
controller: _tabController,
),

6
lib/ui/screens/conversations_list_screen.dart
View File

@@ -108,8 +108,8 @@ class _ConversationScreenState extends SafeState<ConversationsListScreen> {
}
/// Open a conversation
void _openConversation(int conversationId) {
MainController.of(context).openConversation(conversationId);
void _openConversation(Conversation conv) {
MainController.of(context).openConversation(conv);
if (widget.onOpen != null) widget.onOpen();
}
@@ -191,7 +191,7 @@ class _ConversationScreenState extends SafeState<ConversationsListScreen> {
usersList: _users,
groupsList: _groups,
onOpen: (c) {
_openConversation(c.id);
_openConversation(c);
},
onRequestUpdate: _updateConversation,
onRequestLeave: _requestLeaveConversation,

9
lib/ui/screens/group_screen.dart
View File

@@ -12,9 +12,13 @@ import 'package:flutter/material.dart';
class GroupPageScreen extends StatefulWidget {
final int groupID;
final int conversationID;
const GroupPageScreen({Key key, @required this.groupID})
: assert(groupID != null),
const GroupPageScreen({
Key key,
@required this.groupID,
this.conversationID,
}) : assert(groupID != null),
super(key: key);
@override
@@ -57,6 +61,7 @@ class _GroupPageScreenState extends SafeState<GroupPageScreen> {
// Now we can show group page
return AuthorizedGroupPageScreen(
advancedGroupInfo: _getGroupResult.info,
conversationID: widget.conversationID,
needRefresh: () => _refreshPage(),
);
}

2
lib/ui/screens/unread_conversations_screen.dart
View File

@@ -104,7 +104,7 @@ class _UnreadConversationsScreenState
]),
),
trailing: Text(diffTimeFromNowToStr(conv.message.timeSent)),
onTap: () => MainController.of(context).openConversation(conv.conv.id),
onTap: () => MainController.of(context).openConversationById(conv.conv.id),
);
}
}

2
lib/ui/screens/update_conversation_screen.dart
View File

@@ -301,7 +301,7 @@ class _UpdateConversationScreen extends State<UpdateConversationScreen> {
color: _color));
MainController.of(context).popPage();
MainController.of(context).openConversation(conversationID);
MainController.of(context).openConversationById(conversationID);
return;
}