Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-09-10 08:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #739 from krille-chan/krille/send-on-enter-fix

Browse source 
fix: Cannot change send on enter on desktop
This commit is contained in:
Krille-chan 2023-12-23 09:31:00 +01:00 committed by GitHub
commit a14f920a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/config/app_config.dart
View file

@ -47,7 +47,7 @@ abstract class AppConfig {
static bool separateChatTypes = false;
static bool autoplayImages = true;
static bool sendTypingNotifications = true;
static bool sendOnEnter = false;
static bool? sendOnEnter;
static bool experimentalVoip = false;
static const bool hideTypingUsernames = false;
static const bool hideAllStateEvents = false;

4
lib/pages/chat/chat_input_row.dart
View file

@ -251,7 +251,9 @@ class ChatInputRow extends StatelessWidget {
autofocus: !PlatformInfos.isMobile,
keyboardType: TextInputType.multiline,
textInputAction:
AppConfig.sendOnEnter ? TextInputAction.send : null,
AppConfig.sendOnEnter ?? !PlatformInfos.isMobile
? TextInputAction.send
: null,
onSubmitted: controller.onInputBarSubmitted,
onSubmitImage: controller.sendImageFromClipBoard,
focusNode: controller.inputFocus,

4
lib/pages/chat/input_bar.dart
View file

@ -394,9 +394,7 @@ class InputBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
final useShortCuts = (PlatformInfos.isWeb ||
PlatformInfos.isDesktop ||
AppConfig.sendOnEnter);
final useShortCuts = (AppConfig.sendOnEnter ?? !PlatformInfos.isMobile);
return Shortcuts(
shortcuts: !useShortCuts
? {}

2
lib/pages/settings_chat/settings_chat_view.dart
View file

@ -74,7 +74,7 @@ class SettingsChatView extends StatelessWidget {
title: L10n.of(context)!.sendOnEnter,
onChanged: (b) => AppConfig.sendOnEnter = b,
storeKey: SettingKeys.sendOnEnter,
defaultValue: AppConfig.sendOnEnter,
defaultValue: AppConfig.sendOnEnter ?? !PlatformInfos.isMobile,
),
SettingsSwitchListTile.adaptive(
title: L10n.of(context)!.experimentalVideoCalls,