✨ Chat enter to send

lib/screens/chat/chat.dart

@@ -93,9 +93,12 @@ class ChatRoomListTile extends HookConsumerWidget {
                       style: Theme.of(context).textTheme.bodySmall,
                     ),
                   ),
-                  Text(
-                    RelativeTime(context).format(data.lastMessage.createdAt),
-                    style: Theme.of(context).textTheme.bodySmall,
+                  Align(
+                    alignment: Alignment.centerRight,
+                    child: Text(
+                      RelativeTime(context).format(data.lastMessage.createdAt),
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
                   ),
                 ],
               ),
@@ -117,41 +120,31 @@ class ChatRoomListTile extends HookConsumerWidget {
       );
     }
 
-    Widget buildTrailing() {
-      if (trailing != null) return trailing!;
-
-      return summary.when(
-        data: (data) {
-          if (data == null || data.unreadCount == 0) {
-            return const SizedBox.shrink();
-          }
-
-          return Badge(label: Text(data.unreadCount.toString()));
-        },
-        loading: () => const SizedBox.shrink(),
-        error: (_, __) => const SizedBox.shrink(),
-      );
-    }
-
     return ListTile(
-      leading:
-          (isDirect && room.pictureId == null)
-              ? SplitAvatarWidget(
-                filesId:
-                    room.members!
-                        .map((e) => e.account.profile.pictureId)
-                        .toList(),
-              )
-              : room.pictureId == null
-              ? CircleAvatar(child: Text(room.name![0].toUpperCase()))
-              : ProfilePictureWidget(fileId: room.pictureId),
+      leading: Badge(
+        isLabelVisible: summary.when(
+          data: (data) => (data?.unreadCount ?? 0) > 0,
+          loading: () => false,
+          error: (_, __) => false,
+        ),
+        child:
+            (isDirect && room.pictureId == null)
+                ? SplitAvatarWidget(
+                  filesId:
+                      room.members!
+                          .map((e) => e.account.profile.pictureId)
+                          .toList(),
+                )
+                : room.pictureId == null
+                ? CircleAvatar(child: Text(room.name![0].toUpperCase()))
+                : ProfilePictureWidget(fileId: room.pictureId),
+      ),
       title: Text(
         (isDirect && room.name == null)
             ? room.members!.map((e) => e.account.nick).join(', ')
             : room.name ?? '',
       ),
       subtitle: buildSubtitle(),
-      trailing: buildTrailing(),
       onTap: () async {
         // Clear unread count if there are unread messages
         final summary = await ref.read(chatSummaryProvider.future);

lib/screens/chat/room.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -676,7 +677,7 @@ class ChatRoomScreen extends HookConsumerWidget {
   }
 }
 
-class _ChatInput extends StatelessWidget {
+class _ChatInput extends ConsumerWidget {
   final TextEditingController messageController;
   final SnChatRoom chatRoom;
   final VoidCallback onSend;
@@ -705,8 +706,26 @@ class _ChatInput extends StatelessWidget {
     required this.onMoveAttachment,
   });
 
+  void _handleKeyPress(BuildContext context, WidgetRef ref, RawKeyEvent event) {
+    if (event is! RawKeyDownEvent) return;
+
+    final enterToSend = ref.read(appSettingsProvider).enterToSend;
+    final isEnter = event.logicalKey == LogicalKeyboardKey.enter;
+    final isModifierPressed = event.isMetaPressed || event.isControlPressed;
+
+    if (isEnter) {
+      if (enterToSend && !isModifierPressed) {
+        onSend();
+      } else if (!enterToSend && isModifierPressed) {
+        onSend();
+      }
+    }
+  }
+
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final enterToSend = ref.watch(appSettingsProvider).enterToSend;
+
     return Material(
       elevation: 8,
       color: Theme.of(context).colorScheme.surface,
@@ -806,30 +825,42 @@ class _ChatInput extends StatelessWidget {
                       ],
                 ),
                 Expanded(
-                  child: TextField(
-                    controller: messageController,
-                    decoration: InputDecoration(
-                      hintText:
-                          (chatRoom.type == 1 && chatRoom.name == null)
-                              ? 'chatDirectMessageHint'.tr(
-                                args: [
-                                  chatRoom.members!
-                                      .map((e) => e.account.nick)
-                                      .join(', '),
-                                ],
-                              )
-                              : 'chatMessageHint'.tr(args: [chatRoom.name!]),
-                      border: InputBorder.none,
-                      isDense: true,
-                      contentPadding: const EdgeInsets.symmetric(
-                        horizontal: 12,
-                        vertical: 4,
+                  child: RawKeyboardListener(
+                    focusNode: FocusNode(),
+                    onKey: (event) => _handleKeyPress(context, ref, event),
+                    child: TextField(
+                      controller: messageController,
+                      inputFormatters: [
+                        if (enterToSend)
+                          TextInputFormatter.withFunction((oldValue, newValue) {
+                            if (newValue.text.endsWith('\n')) {
+                              return oldValue;
+                            }
+                            return newValue;
+                          }),
+                      ],
+                      decoration: InputDecoration(
+                        hintText:
+                            (chatRoom.type == 1 && chatRoom.name == null)
+                                ? 'chatDirectMessageHint'.tr(
+                                  args: [
+                                    chatRoom.members!
+                                        .map((e) => e.account.nick)
+                                        .join(', '),
+                                  ],
+                                )
+                                : 'chatMessageHint'.tr(args: [chatRoom.name!]),
+                        border: InputBorder.none,
+                        isDense: true,
+                        contentPadding: const EdgeInsets.symmetric(
+                          horizontal: 12,
+                          vertical: 4,
+                        ),
                       ),
+                      maxLines: null,
+                      onTapOutside:
+                          (_) => FocusManager.instance.primaryFocus?.unfocus(),
                     ),
-                    maxLines: null,
-                    onTapOutside:
-                        (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                    onSubmitted: (_) => onSend(),
                   ),
                 ),
                 IconButton(

lib/screens/settings.dart

@@ -26,6 +26,7 @@ class SettingsScreen extends HookConsumerWidget {
     final serverUrl = ref.watch(serverUrlProvider);
     final prefs = ref.watch(sharedPreferencesProvider);
     final controller = TextEditingController(text: serverUrl);
+    final settings = ref.watch(appSettingsProvider);
 
     final docBasepath = useState<String?>(null);
 
@@ -174,6 +175,99 @@ class SettingsScreen extends HookConsumerWidget {
                   );
                 },
               ),
+            const Divider(),
+            ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsRealmCompactView').tr(),
+              contentPadding: const EdgeInsets.only(left: 24, right: 17),
+              leading: const Icon(Symbols.view_compact),
+              trailing: Switch(
+                value: settings.realmCompactView,
+                onChanged: (value) {
+                  ref
+                      .read(appSettingsProvider.notifier)
+                      .setRealmCompactView(value);
+                },
+              ),
+            ),
+            ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsMixedFeed').tr(),
+              contentPadding: const EdgeInsets.only(left: 24, right: 17),
+              leading: const Icon(Symbols.merge),
+              trailing: Switch(
+                value: settings.mixedFeed,
+                onChanged: (value) {
+                  ref.read(appSettingsProvider.notifier).setMixedFeed(value);
+                },
+              ),
+            ),
+            ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsAutoTranslate').tr(),
+              contentPadding: const EdgeInsets.only(left: 24, right: 17),
+              leading: const Icon(Symbols.translate),
+              trailing: Switch(
+                value: settings.autoTranslate,
+                onChanged: (value) {
+                  ref
+                      .read(appSettingsProvider.notifier)
+                      .setAutoTranslate(value);
+                },
+              ),
+            ),
+            ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsHideBottomNav').tr(),
+              contentPadding: const EdgeInsets.only(left: 24, right: 17),
+              leading: const Icon(Symbols.navigation),
+              trailing: Switch(
+                value: settings.hideBottomNav,
+                onChanged: (value) {
+                  ref
+                      .read(appSettingsProvider.notifier)
+                      .setHideBottomNav(value);
+                },
+              ),
+            ),
+            ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsSoundEffects').tr(),
+              contentPadding: const EdgeInsets.only(left: 24, right: 17),
+              leading: const Icon(Symbols.volume_up),
+              trailing: Switch(
+                value: settings.soundEffects,
+                onChanged: (value) {
+                  ref.read(appSettingsProvider.notifier).setSoundEffects(value);
+                },
+              ),
+            ),
+            ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsAprilFoolFeatures').tr(),
+              contentPadding: const EdgeInsets.only(left: 24, right: 17),
+              leading: const Icon(Symbols.celebration),
+              trailing: Switch(
+                value: settings.aprilFoolFeatures,
+                onChanged: (value) {
+                  ref
+                      .read(appSettingsProvider.notifier)
+                      .setAprilFoolFeatures(value);
+                },
+              ),
+            ),
+            ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsEnterToSend').tr(),
+              contentPadding: const EdgeInsets.only(left: 24, right: 17),
+              leading: const Icon(Symbols.send),
+              trailing: Switch(
+                value: settings.enterToSend,
+                onChanged: (value) {
+                  ref.read(appSettingsProvider.notifier).setEnterToSend(value);
+                },
+              ),
+            ),
           ],
         ),
       ),