From 9d4abc372574ac458963227a03f8d8489d996d92 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 11 May 2022 12:43:54 -0700 Subject: [PATCH] Fix #457 + Formatting --- lib/models/contact.dart | 2 +- lib/models/message.dart | 4 +--- lib/models/messages/quotedmessage.dart | 3 ++- lib/models/messages/textmessage.dart | 3 ++- lib/views/contactsview.dart | 6 +----- lib/views/globalsettingsview.dart | 5 ++++- lib/views/messageview.dart | 9 +++------ 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/lib/models/contact.dart b/lib/models/contact.dart index 00458100..8c7004cf 100644 --- a/lib/models/contact.dart +++ b/lib/models/contact.dart @@ -145,7 +145,7 @@ class ContactInfoState extends ChangeNotifier { } void selected() { - this._newMarkerMsgIndex = this._unreadMessages-1; + this._newMarkerMsgIndex = this._unreadMessages - 1; this._unreadMessages = 0; } diff --git a/lib/models/message.dart b/lib/models/message.dart index 67e0bc02..7d169698 100644 --- a/lib/models/message.dart +++ b/lib/models/message.dart @@ -38,8 +38,7 @@ abstract class Message { } Message compileOverlay(MessageInfo messageInfo) { - - try { + try { dynamic message = jsonDecode(messageInfo.wrapper); var content = message['d'] as dynamic; var overlay = int.parse(message['o'].toString()); @@ -93,7 +92,6 @@ class ByIndex implements CacheHandler { amount += index - start; } - // check that we aren't asking for messages beyond stored messages if (start + amount >= cache.storageMessageCount) { amount = cache.storageMessageCount - start; diff --git a/lib/models/messages/quotedmessage.dart b/lib/models/messages/quotedmessage.dart index 1519037a..35cd21a9 100644 --- a/lib/models/messages/quotedmessage.dart +++ b/lib/models/messages/quotedmessage.dart @@ -59,7 +59,8 @@ class QuotedMessage extends Message { return ChangeNotifierProvider.value( value: this.metadata, builder: (bcontext, child) { - return MessageRow(QuotedMessageBubble(message["body"], messageHandler(bcontext, metadata.profileOnion, metadata.conversationIdentifier, ByContentHash(message["quotedHash"]))), index, key: key); + return MessageRow(QuotedMessageBubble(message["body"], messageHandler(bcontext, metadata.profileOnion, metadata.conversationIdentifier, ByContentHash(message["quotedHash"]))), index, + key: key); }); } catch (e) { return MalformedBubble(); diff --git a/lib/models/messages/textmessage.dart b/lib/models/messages/textmessage.dart index 908a7d53..cb160319 100644 --- a/lib/models/messages/textmessage.dart +++ b/lib/models/messages/textmessage.dart @@ -34,7 +34,8 @@ class TextMessage extends Message { value: this.metadata, builder: (bcontext, child) { return MessageRow( - MessageBubble(this.content), index, + MessageBubble(this.content), + index, key: key, ); }); diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart index 7809450e..a6e51512 100644 --- a/lib/views/contactsview.dart +++ b/lib/views/contactsview.dart @@ -32,11 +32,7 @@ void selectConversation(BuildContext context, int handle) { var initialIndex = Provider.of(context, listen: false).contactList.getContact(handle)!.unreadMessages; var previouslySelected = Provider.of(context, listen: false).selectedConversation; if (previouslySelected != null) { - Provider - .of(context, listen: false) - .contactList - .getContact(previouslySelected)! - .unselected(); + Provider.of(context, listen: false).contactList.getContact(previouslySelected)!.unselected(); } Provider.of(context, listen: false).contactList.getContact(handle)!.selected(); // triggers update in Double/TripleColumnView diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart index a023bae5..983c9379 100644 --- a/lib/views/globalsettingsview.dart +++ b/lib/views/globalsettingsview.dart @@ -110,6 +110,7 @@ class _GlobalSettingsViewState extends State { trailing: Container( width: MediaQuery.of(context).size.width / 4, child: DropdownButton( + isExpanded: true, value: Provider.of(context).locale.languageCode, onChanged: (String? newValue) { setState(() { @@ -146,7 +147,7 @@ class _GlobalSettingsViewState extends State { width: MediaQuery.of(context).size.width / 4, child: DropdownButton( key: Key("DropdownTheme"), - isDense: true, + isExpanded: true, value: Provider.of(context).theme.theme, onChanged: (String? newValue) { setState(() { @@ -168,6 +169,7 @@ class _GlobalSettingsViewState extends State { trailing: Container( width: MediaQuery.of(context).size.width / 4, child: DropdownButton( + isExpanded: true, value: settings.uiColumnModePortrait.toString(), onChanged: (String? newValue) { settings.uiColumnModePortrait = Settings.uiColumnModeFromString(newValue!); @@ -249,6 +251,7 @@ class _GlobalSettingsViewState extends State { trailing: Container( width: MediaQuery.of(context).size.width / 4, child: DropdownButton( + isExpanded: true, value: settings.notificationPolicy, onChanged: (NotificationPolicy? newValue) { settings.notificationPolicy = newValue!; diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart index 78bafa76..93003515 100644 --- a/lib/views/messageview.dart +++ b/lib/views/messageview.dart @@ -171,11 +171,7 @@ class _MessageViewState extends State { var previouslySelected = Provider.of(context, listen: false).selectedConversation; if (previouslySelected != null) { - Provider - .of(context, listen: false) - .contactList - .getContact(previouslySelected)! - .unselected(); + Provider.of(context, listen: false).contactList.getContact(previouslySelected)!.unselected(); } Provider.of(context, listen: false).selectedConversation = null; @@ -230,7 +226,8 @@ class _MessageViewState extends State { if (Provider.of(context, listen: false).selectedConversation != null && Provider.of(context, listen: false).selectedIndex != null) { var conversationId = Provider.of(context, listen: false).selectedConversation!; MessageCache? cache = Provider.of(context, listen: false).contactList.getContact(conversationId)?.messageCache; - ById(Provider.of(context, listen: false).selectedIndex!).get(Provider.of(context, listen: false).cwtch, Provider.of(context, listen: false).selectedProfile!, conversationId, cache!) + ById(Provider.of(context, listen: false).selectedIndex!) + .get(Provider.of(context, listen: false).cwtch, Provider.of(context, listen: false).selectedProfile!, conversationId, cache!) .then((MessageInfo? data) { try { var bytes1 = utf8.encode(data!.metadata.senderHandle + data.wrapper);