allow delete chat

mkofdwu · Feb 23, 2021 · dd9d36b · dd9d36b
1 parent 5edf03d
commit dd9d36b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -78,6 +78,7 @@ class _ChatPageState extends State<ChatPage> {
  @override
  void deactivate() {
  print('chat page deactivated');
+ // TODO: dont call this if chat has just been deleted
  ChatsService.updateLastReadMessageId(
  Provider.of<User>(context, listen: false).profile.uid,
  widget.chat.id,

diff --git a/lib/pages/chat/widgets/popup_menu.dart b/lib/pages/chat/widgets/popup_menu.dart
@@ -18,6 +18,21 @@ class ChatPopupMenu extends StatelessWidget {
 
  ChatPopupMenu({@required this.chat, @required this.onUpdate});
 
+ void _deleteChat(context) async {
+ final confirm = await showQuestionDialog(
+ context: context,
+ title: 'Delete chat?',
+ content: 'You won\'t be able to undo this action',
+ );
+ if (confirm) {
+ await ChatsService.deleteChat(
+ Provider.of<User>(context, listen: false).profile.uid,
+ chat.id,
+ );
+ Navigator.pop(context);
+ }
+ }
+
  void _blockAndDeleteChat(context) async {
  final confirm = await showQuestionDialog(
  context: context,
@@ -66,15 +81,19 @@ class ChatPopupMenu extends StatelessWidget {
  void _starChat(context) {
  final uid = Provider.of<User>(context, listen: false).profile.uid;
  ChatsService.updateChatDetails(uid, chat.id, {'type': 2});
+ chat.type = ChatType.starred;
  onUpdate();
  }
 
  void _unstarChat(context) {
  final uid = Provider.of<User>(context, listen: false).profile.uid;
  ChatsService.updateChatDetails(uid, chat.id, {'type': 3});
+ chat.type = ChatType.normal;
  onUpdate();
  }
 
+ void _exportChat(context) {}
+
  @override
  Widget build(BuildContext context) {
  return PopupMenu(
@@ -83,8 +102,6 @@ class ChatPopupMenu extends StatelessWidget {
  text: 'Wallpaper',
  onPressed: () => _changeWallpaper(context),
  ),
- if (chat.type == ChatType.normal || chat.type == ChatType.starred)
- MenuDivider(),
  if (chat.type == ChatType.normal)
  MenuOption(
  text: 'Star chat',
@@ -96,6 +113,15 @@ class ChatPopupMenu extends StatelessWidget {
  onPressed: () => _unstarChat(context),
  ),
  MenuDivider(),
+ MenuOption(
+ text: 'Export chat',
+ onPressed: () => _exportChat(context),
+ ),
+ MenuDivider(),
+ MenuOption(
+ text: 'Delete chat',
+ onPressed: () => _deleteChat(context),
+ ),
  MenuOption(
  text: 'Block and delete chat',
  onPressed: () => _blockAndDeleteChat(context),

diff --git a/lib/services/chats_service.dart b/lib/services/chats_service.dart
@@ -60,11 +60,6 @@ class ChatsService {
  await chatsRef.doc(chatId).update({
  'participants': FieldValue.arrayRemove([uid])
  });
- // if ((await chatsRef.doc(chatId).collection('participants').limit(1).get())
- // .docs
- // .isEmpty) {
- // await chatsRef.doc(chatId).delete();
- // }
  final userChatRef = _userChatRef(uid, chatId);
  if (userChatRef.path.isNotEmpty) await userChatRef.delete();
  }

diff --git a/lib/widgets/popup_menu.dart b/lib/widgets/popup_menu.dart
@@ -17,7 +17,7 @@ class MenuOption extends StatelessWidget {
  return Material(
  child: InkWell(
  child: Container(
- height: 50,
+ height: 40,
  padding: const EdgeInsets.symmetric(horizontal: 20),
  alignment: Alignment.centerRight,
  child: Text(text, style: TextStyle(fontSize: 18)),
@@ -32,7 +32,7 @@ class MenuDivider extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
  return Padding(
- padding: const EdgeInsets.symmetric(horizontal: 20),
+ padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
  child: Container(
  width: 70,
  height: 2,
@@ -60,6 +60,7 @@ class PopupMenu extends StatelessWidget {
  ),
  ),
  clipBehavior: Clip.antiAlias,
+ padding: const EdgeInsets.symmetric(vertical: 10),
  child: IntrinsicWidth(
  child: Column(
  crossAxisAlignment: CrossAxisAlignment.end,