From 79bebe92704a1d4b5b1dbfc7d0e293bc5f5e03a1 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Sun, 24 Sep 2023 15:36:53 +0200 Subject: [PATCH] fix(ui): Fix hardcoded ConversationTypes --- lib/ui/bloc/conversation_bloc.dart | 2 +- lib/ui/bloc/conversation_event.dart | 6 +----- lib/ui/bloc/groupchat/joingroupchat_bloc.dart | 2 -- lib/ui/bloc/newconversation_bloc.dart | 2 -- lib/ui/bloc/startchat_bloc.dart | 1 - lib/ui/events.dart | 3 --- lib/ui/pages/conversations.dart | 1 - lib/ui/service/sharing.dart | 3 --- 8 files changed, 2 insertions(+), 18 deletions(-) diff --git a/lib/ui/bloc/conversation_bloc.dart b/lib/ui/bloc/conversation_bloc.dart index e6c92047..30943904 100644 --- a/lib/ui/bloc/conversation_bloc.dart +++ b/lib/ui/bloc/conversation_bloc.dart @@ -63,7 +63,7 @@ class ConversationBloc extends Bloc { final arguments = ConversationPageArguments( event.jid, event.initialText, - event.type, + conversation.type, ); final navEvent = event.removeUntilConversations ? (PushedNamedAndRemoveUntilEvent( diff --git a/lib/ui/bloc/conversation_event.dart b/lib/ui/bloc/conversation_event.dart index 12664a5c..e32fe2e6 100644 --- a/lib/ui/bloc/conversation_event.dart +++ b/lib/ui/bloc/conversation_event.dart @@ -20,8 +20,7 @@ class RequestedConversationEvent extends ConversationEvent { RequestedConversationEvent( this.jid, this.title, - this.avatarUrl, - this.type, { + this.avatarUrl, { this.removeUntilConversations = false, this.initialText, }); @@ -34,9 +33,6 @@ class RequestedConversationEvent extends ConversationEvent { /// Initial value to put in the input field. final String? initialText; - - /// Type of the conversation - final ConversationType type; } /// Triggered by the UI when a user should be blocked diff --git a/lib/ui/bloc/groupchat/joingroupchat_bloc.dart b/lib/ui/bloc/groupchat/joingroupchat_bloc.dart index d16c4392..d427d0b2 100644 --- a/lib/ui/bloc/groupchat/joingroupchat_bloc.dart +++ b/lib/ui/bloc/groupchat/joingroupchat_bloc.dart @@ -6,7 +6,6 @@ import 'package:moxxyv2/i18n/strings.g.dart'; import 'package:moxxyv2/shared/commands.dart'; import 'package:moxxyv2/shared/error_types.dart'; import 'package:moxxyv2/shared/events.dart'; -import 'package:moxxyv2/shared/models/conversation.dart'; import 'package:moxxyv2/ui/bloc/conversation_bloc.dart'; import 'package:moxxyv2/ui/bloc/conversations_bloc.dart'; @@ -95,7 +94,6 @@ class JoinGroupchatBloc extends Bloc { joinEvent.conversation.jid, joinEvent.conversation.title, joinEvent.conversation.avatarPath, - ConversationType.groupchat, ), ); } diff --git a/lib/ui/bloc/newconversation_bloc.dart b/lib/ui/bloc/newconversation_bloc.dart index bbfe598f..a3ea9785 100644 --- a/lib/ui/bloc/newconversation_bloc.dart +++ b/lib/ui/bloc/newconversation_bloc.dart @@ -52,7 +52,6 @@ class NewConversationBloc event.jid, event.title, event.avatarUrl, - event.type, removeUntilConversations: true, ), ); @@ -82,7 +81,6 @@ class NewConversationBloc event.jid, event.title, event.avatarUrl, - event.type, removeUntilConversations: true, ), ); diff --git a/lib/ui/bloc/startchat_bloc.dart b/lib/ui/bloc/startchat_bloc.dart index 366282b2..328ec688 100644 --- a/lib/ui/bloc/startchat_bloc.dart +++ b/lib/ui/bloc/startchat_bloc.dart @@ -107,7 +107,6 @@ class StartChatBloc extends Bloc { addResult.conversation!.jid, addResult.conversation!.title, addResult.conversation!.avatarPath, - addResult.conversation!.type, removeUntilConversations: true, ), ); diff --git a/lib/ui/events.dart b/lib/ui/events.dart index 1268ae41..e56ab180 100644 --- a/lib/ui/events.dart +++ b/lib/ui/events.dart @@ -7,7 +7,6 @@ import 'package:moxxy_native/moxxy_native.dart'; import 'package:moxxyv2/shared/commands.dart'; import 'package:moxxyv2/shared/eventhandler.dart'; import 'package:moxxyv2/shared/events.dart'; -import 'package:moxxyv2/shared/models/conversation.dart'; import 'package:moxxyv2/shared/synchronized_queue.dart'; import 'package:moxxyv2/ui/bloc/blocklist_bloc.dart' as blocklist; import 'package:moxxyv2/ui/bloc/conversation_bloc.dart' as conversation; @@ -171,8 +170,6 @@ Future onNotificationTappend( event.conversationJid, event.title, event.avatarPath, - // TODO: Pull this from somewhere - ConversationType.chat, ), ); } diff --git a/lib/ui/pages/conversations.dart b/lib/ui/pages/conversations.dart index 61f59aa6..a0f9f120 100644 --- a/lib/ui/pages/conversations.dart +++ b/lib/ui/pages/conversations.dart @@ -162,7 +162,6 @@ class ConversationsPageState extends State item.jid, item.title, item.avatarPath, - item.type, ), ); }, diff --git a/lib/ui/service/sharing.dart b/lib/ui/service/sharing.dart index a6719931..69504197 100644 --- a/lib/ui/service/sharing.dart +++ b/lib/ui/service/sharing.dart @@ -1,7 +1,6 @@ import 'package:get_it/get_it.dart'; import 'package:logging/logging.dart'; import 'package:moxxyv2/shared/constants.dart'; -import 'package:moxxyv2/shared/models/conversation.dart'; import 'package:moxxyv2/ui/bloc/conversation_bloc.dart'; import 'package:moxxyv2/ui/bloc/sendfiles_bloc.dart'; import 'package:moxxyv2/ui/bloc/share_selection_bloc.dart'; @@ -44,8 +43,6 @@ class UISharingService { conversationJid!, '', null, - // TODO: Pull this from somewhere - ConversationType.chat, removeUntilConversations: true, initialText: media.content, ),