From 02407c5abe19fdae6dd1e0007e2ef985f3204c61 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Mon, 14 Feb 2022 11:00:46 -0800
Subject: [PATCH] Fix #371 Fix #368 Fix #16

---
 lib/cwtch/gomobile.dart           |  2 +-
 lib/views/globalsettingsview.dart | 12 ++++++++----
 lib/views/messageview.dart        |  7 +++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/cwtch/gomobile.dart b/lib/cwtch/gomobile.dart
index 07501e17..91a08cec 100644
--- a/lib/cwtch/gomobile.dart
+++ b/lib/cwtch/gomobile.dart
@@ -196,7 +196,7 @@ class CwtchGomobile implements Cwtch {
   @override
   // ignore: non_constant_identifier_names
   void DeleteContact(String profileOnion, int conversation) {
-    cwtchPlatform.invokeMethod("DeleteContact", {"ProfileOnion": profileOnion, "conversation": conversation});
+    cwtchPlatform.invokeMethod("DeleteConversation", {"ProfileOnion": profileOnion, "conversation": conversation});
   }
 
   @override
diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart
index 3d14065e..66e74c63 100644
--- a/lib/views/globalsettingsview.dart
+++ b/lib/views/globalsettingsview.dart
@@ -137,7 +137,9 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                             style: TextStyle(color: settings.current().mainTextColor),
                           ),
                           leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
-                          trailing: DropdownButton(
+                          trailing: Container(
+                          width: MediaQuery.of(context).size.width / 4,
+                              child: DropdownButton(
                               value: settings.uiColumnModeLandscape.toString(),
                               onChanged: (String? newValue) {
                                 settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
@@ -151,7 +153,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                     overflow: TextOverflow.ellipsis,
                                   ),
                                 );
-                              }).toList())),
+                              }).toList()))),
                       SwitchListTile(
                         title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor)),
                         subtitle: Text(AppLocalizations.of(context)!.descriptionStreamerMode),
@@ -192,7 +194,9 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                       ListTile(
                         title: Text(AppLocalizations.of(context)!.notificationContentSettingLabel),
                         subtitle: Text(AppLocalizations.of(context)!.notificationContentSettingDescription),
-                        trailing: DropdownButton(
+                        trailing: Container(
+                          width: MediaQuery.of(context).size.width / 4,
+                  child:DropdownButton(
                             value: settings.notificationContent,
                             onChanged: (NotificationContent? newValue) {
                               settings.notificationContent = newValue!;
@@ -206,7 +210,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                   overflow: TextOverflow.ellipsis,
                                 ),
                               );
-                            }).toList()),
+                            }).toList())),
                         leading: Icon(CwtchIcons.chat_bubble_empty_24px, color: settings.current().mainTextColor),
                       ),
                       SwitchListTile(
diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart
index d82f2e35..2a490567 100644
--- a/lib/views/messageview.dart
+++ b/lib/views/messageview.dart
@@ -197,6 +197,11 @@ class _MessageViewState extends State<MessageView> {
   static const GroupMessageLengthMax = 1600;
 
   void _sendMessage([String? ignoredParam]) {
+
+    // Trim message
+    final messageWithoutNewLine = ctrlrCompose.value.text.trimRight();
+    ctrlrCompose.value = TextEditingValue(text: messageWithoutNewLine);
+
     var isGroup = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(Provider.of<AppState>(context, listen: false).selectedConversation!)!.isGroup;
 
     // peers and groups currently have different length constraints (servers can store less)...
@@ -375,8 +380,6 @@ class _MessageViewState extends State<MessageView> {
   void handleKeyPress(event) {
     var data = event.data as RawKeyEventData;
     if (data.logicalKey == LogicalKeyboardKey.enter && !event.isShiftPressed) {
-      final messageWithoutNewLine = ctrlrCompose.value.text.trimRight();
-      ctrlrCompose.value = TextEditingValue(text: messageWithoutNewLine);
       _sendMessage();
     }
   }