1
0
mirror of https://gitlab.com/comunic/comunicmobile synced 2024-11-26 06:49:22 +00:00

Open private conversation from friends list

This commit is contained in:
Pierre HUBERT 2019-05-02 08:09:40 +02:00
parent eba12736e9
commit 21a60f423b
4 changed files with 85 additions and 6 deletions

View File

@ -58,8 +58,7 @@ class ConversationsHelper {
final response = await request.exec(); final response = await request.exec();
if(response.code != 200) if (response.code != 200) return false;
return false;
//Delete old conversation entry from the database //Delete old conversation entry from the database
await _conversationsDatabaseHelper.delete(settings.id); await _conversationsDatabaseHelper.delete(settings.id);
@ -160,6 +159,30 @@ class ConversationsHelper {
return name; return name;
} }
/// Search and return a private conversation with a given [userID]. If such
/// conversation does not exists, it is created if [allowCreate] is set to
/// true
Future<int> getPrivate(int userID, {bool allowCreate = true}) async {
final response = await APIRequest(
uri: "conversations/getPrivate",
needLogin: true,
args: {
"otherUser": userID.toString(),
"allowCreate": allowCreate.toString()
},
).exec();
if (response.code != 200) return null;
// Get and return conversation ID
try {
return int.parse(response.getObject()["conversationsID"][0]);
} catch (e) {
e.toString();
return null;
}
}
/// Asynchronously get the name fo the conversation /// Asynchronously get the name fo the conversation
/// ///
/// Unlike the synchronous method, this method does not need information /// Unlike the synchronous method, this method does not need information

View File

@ -6,6 +6,7 @@ import 'package:comunic/models/friend.dart';
import 'package:comunic/ui/tiles/accepted_friend_tile.dart'; import 'package:comunic/ui/tiles/accepted_friend_tile.dart';
import 'package:comunic/ui/tiles/pending_friend_tile.dart'; import 'package:comunic/ui/tiles/pending_friend_tile.dart';
import 'package:comunic/ui/widgets/safe_state.dart'; import 'package:comunic/ui/widgets/safe_state.dart';
import 'package:comunic/utils/conversations_utils.dart';
import 'package:comunic/utils/intl_utils.dart'; import 'package:comunic/utils/intl_utils.dart';
import 'package:comunic/utils/ui_utils.dart'; import 'package:comunic/utils/ui_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -111,6 +112,7 @@ class _FriendsListScreenState extends SafeState<FriendsListScreen> {
? AcceptedFriendTile( ? AcceptedFriendTile(
friend: _friendsList[i], friend: _friendsList[i],
user: _usersInfo.getUser(_friendsList[i].id), user: _usersInfo.getUser(_friendsList[i].id),
onOpenPrivateConversation: _openPrivateConversation,
onSetFollowing: _setFollowingFriend, onSetFollowing: _setFollowingFriend,
onRequestDelete: _deleteFriend, onRequestDelete: _deleteFriend,
) )
@ -135,7 +137,6 @@ class _FriendsListScreenState extends SafeState<FriendsListScreen> {
_loadList(); _loadList();
} }
/// Update following status of a friend /// Update following status of a friend
Future<void> _setFollowingFriend(Friend friend, bool follow) async { Future<void> _setFollowingFriend(Friend friend, bool follow) async {
loading = true; loading = true;
@ -144,7 +145,6 @@ class _FriendsListScreenState extends SafeState<FriendsListScreen> {
showSimpleSnack(context, tr("Could not update following status!")); showSimpleSnack(context, tr("Could not update following status!"));
_loadList(); _loadList();
} }
/// Handles deletion request of a friend /// Handles deletion request of a friend
@ -182,4 +182,11 @@ class _FriendsListScreenState extends SafeState<FriendsListScreen> {
// Refresh list // Refresh list
_loadList(); _loadList();
} }
/// Open a private conversation for a given [friend]
Future<void> _openPrivateConversation(Friend friend) async {
loading = true;
await openPrivateConversation(context, friend.id);
loading = false;
}
} }

View File

@ -9,16 +9,18 @@ import 'package:flutter/material.dart';
/// ///
/// @author Pierre HUBERT /// @author Pierre HUBERT
enum _FriendMenuChoices { REMOVE, TOGGLE_FOLLOWING } enum _FriendMenuChoices { REMOVE, TOGGLE_FOLLOWING, PRIVATE_CONVERSATION }
typedef OnRequestDeleteFriend = void Function(Friend); typedef OnRequestDeleteFriend = void Function(Friend);
typedef OnSetFollowing = void Function(Friend, bool); typedef OnSetFollowing = void Function(Friend, bool);
typedef OnOpenPrivateConversation = void Function(Friend);
class AcceptedFriendTile extends StatelessWidget { class AcceptedFriendTile extends StatelessWidget {
final Friend friend; final Friend friend;
final User user; final User user;
final OnRequestDeleteFriend onRequestDelete; final OnRequestDeleteFriend onRequestDelete;
final OnSetFollowing onSetFollowing; final OnSetFollowing onSetFollowing;
final OnOpenPrivateConversation onOpenPrivateConversation;
const AcceptedFriendTile({ const AcceptedFriendTile({
Key key, Key key,
@ -26,10 +28,12 @@ class AcceptedFriendTile extends StatelessWidget {
@required this.user, @required this.user,
@required this.onRequestDelete, @required this.onRequestDelete,
@required this.onSetFollowing, @required this.onSetFollowing,
@required this.onOpenPrivateConversation,
}) : assert(friend != null), }) : assert(friend != null),
assert(user != null), assert(user != null),
assert(onRequestDelete != null), assert(onRequestDelete != null),
assert(onSetFollowing != null), assert(onSetFollowing != null),
assert(onOpenPrivateConversation != null),
super(key: key); super(key: key);
@override @override
@ -49,6 +53,13 @@ class AcceptedFriendTile extends StatelessWidget {
), ),
trailing: PopupMenuButton<_FriendMenuChoices>( trailing: PopupMenuButton<_FriendMenuChoices>(
itemBuilder: (c) => [ itemBuilder: (c) => [
//Open a private conversation
PopupMenuItem(
child: Text(tr("Private conversation")),
value: _FriendMenuChoices.PRIVATE_CONVERSATION,
),
// Update following status
PopupMenuItem( PopupMenuItem(
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
@ -61,6 +72,8 @@ class AcceptedFriendTile extends StatelessWidget {
), ),
value: _FriendMenuChoices.TOGGLE_FOLLOWING, value: _FriendMenuChoices.TOGGLE_FOLLOWING,
), ),
// Remove the friend from the list
PopupMenuItem( PopupMenuItem(
child: Text(tr("Remove")), child: Text(tr("Remove")),
value: _FriendMenuChoices.REMOVE, value: _FriendMenuChoices.REMOVE,
@ -75,6 +88,11 @@ class AcceptedFriendTile extends StatelessWidget {
if (value == null) return; if (value == null) return;
switch (value) { switch (value) {
// Open private conversation
case _FriendMenuChoices.PRIVATE_CONVERSATION:
onOpenPrivateConversation(friend);
break;
//Toggle following status //Toggle following status
case _FriendMenuChoices.TOGGLE_FOLLOWING: case _FriendMenuChoices.TOGGLE_FOLLOWING:
onSetFollowing(friend, !friend.following); onSetFollowing(friend, !friend.following);

View File

@ -0,0 +1,31 @@
import 'package:comunic/helpers/conversations_helper.dart';
import 'package:comunic/ui/routes/conversation_route.dart';
import 'package:comunic/utils/intl_utils.dart';
import 'package:comunic/utils/ui_utils.dart';
import 'package:flutter/material.dart';
/// Conversations utilities
///
/// @author Pierre HUBERT
/// Open a private conversation with a given [userID]
Future<bool> openPrivateConversation(BuildContext context, int userID) async {
final convID = await ConversationsHelper().getPrivate(userID);
if (convID == null) {
showSimpleSnack(context, tr("Could not find a private conversation!"));
return false;
}
// Open the conversation
Navigator.of(context).push(
MaterialPageRoute(
builder: (c) => ConversationRoute(
conversationID: convID,
),
),
);
// Success
return true;
}