From a26895ad81a47d5f07364c957d9fe56d4baea738 Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:46:27 -0500
Subject: [PATCH] feat: uncomment sendOnEnter chat setting (#1388)

---
 lib/config/app_config.dart                      |  5 +----
 lib/pages/chat/chat_input_row.dart              | 10 +++++-----
 lib/pages/chat/input_bar.dart                   |  6 ++----
 lib/pages/settings_chat/settings_chat_view.dart | 13 +++++++------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index edeb3cd5e..0e2dbd57d 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -105,10 +105,7 @@ abstract class AppConfig {
   static bool sendTypingNotifications = true;
   static bool sendPublicReadReceipts = true;
   static bool swipeRightToLeftToReply = true;
-  //#Pangea
-  static bool sendOnEnter = true;
-  // static bool sendOnEnter = false;
-  //Pangea#
+  static bool? sendOnEnter;
   static bool showPresences = true;
   static bool experimentalVoip = false;
   static const bool hideTypingUsernames = false;
diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index 36ab95433..911e90cf8 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -6,6 +6,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:matrix/matrix.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/send_button.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/start_igc_button.dart';
 import 'package:fluffychat/pangea/constants/language_constants.dart';
@@ -336,12 +337,11 @@ class ChatInputRow extends StatelessWidget {
                           maxLines: 8,
                           autofocus: !PlatformInfos.isMobile,
                           keyboardType: TextInputType.multiline,
+                          textInputAction: AppConfig.sendOnEnter == true &&
+                                  PlatformInfos.isMobile
+                              ? TextInputAction.send
+                              : null,
                           // #Pangea
-                          // textInputAction: AppConfig.sendOnEnter == true &&
-                          //         PlatformInfos.isMobile
-                          //     ? TextInputAction.send
-                          //     : null,
-                          textInputAction: TextInputAction.send,
                           // onSubmitted: controller.onInputBarSubmitted,
                           onSubmitted: (String value) =>
                               controller.onInputBarSubmitted(value, context),
diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index 1ba81536f..692acb25d 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -12,6 +12,7 @@ import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat/command_hints.dart';
 import 'package:fluffychat/pangea/widgets/igc/pangea_text_controller.dart';
 import 'package:fluffychat/utils/markdown_context_builder.dart';
+import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/widgets/mxc_image.dart';
@@ -413,10 +414,7 @@ class InputBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // #Pangea
-    // final useShortCuts = (AppConfig.sendOnEnter ?? !PlatformInfos.isMobile);
-    final useShortCuts = AppConfig.sendOnEnter;
-    // Pangea#
+    final useShortCuts = (AppConfig.sendOnEnter ?? !PlatformInfos.isMobile);
     return Shortcuts(
       shortcuts: !useShortCuts
           ? {}
diff --git a/lib/pages/settings_chat/settings_chat_view.dart b/lib/pages/settings_chat/settings_chat_view.dart
index ee42ce363..0e6d45940 100644
--- a/lib/pages/settings_chat/settings_chat_view.dart
+++ b/lib/pages/settings_chat/settings_chat_view.dart
@@ -4,6 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
+import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:fluffychat/widgets/settings_switch_list_tile.dart';
 import 'settings_chat.dart';
@@ -60,13 +61,13 @@ class SettingsChatView extends StatelessWidget {
               //     storeKey: SettingKeys.autoplayImages,
               //     defaultValue: AppConfig.autoplayImages,
               //   ),
-              // SettingsSwitchListTile.adaptive(
-              //   title: L10n.of(context).sendOnEnter,
-              //   onChanged: (b) => AppConfig.sendOnEnter = b,
-              //   storeKey: SettingKeys.sendOnEnter,
-              //   defaultValue: AppConfig.sendOnEnter ?? !PlatformInfos.isMobile,
-              // ),
               // Pangea#
+              SettingsSwitchListTile.adaptive(
+                title: L10n.of(context).sendOnEnter,
+                onChanged: (b) => AppConfig.sendOnEnter = b,
+                storeKey: SettingKeys.sendOnEnter,
+                defaultValue: AppConfig.sendOnEnter ?? !PlatformInfos.isMobile,
+              ),
               SettingsSwitchListTile.adaptive(
                 title: L10n.of(context).swipeRightToLeftToReply,
                 onChanged: (b) => AppConfig.swipeRightToLeftToReply = b,