From fbf8abd98711a4d627fe8381c29979675b0f805d Mon Sep 17 00:00:00 2001 From: Sofanyas Genene <123987957+Sofanyas@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:25:26 -0500 Subject: [PATCH] Use system keyboard setting in Learning Settings (#1867) * Use system keyboard setting in Learning Settings --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin --- assets/l10n/intl_en.arb | 6 +- lib/pages/chat/input_bar.dart | 6 +- .../pages/settings_learning.dart | 5 + lib/pangea/spaces/models/space_model.dart | 6 ++ lib/pangea/user/models/user_model.dart | 5 + pubspec.lock | 94 +++++++++---------- 6 files changed, 72 insertions(+), 50 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 09724bf0f..7d0d9d1ce 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -4822,5 +4822,7 @@ "slightlyOffensive": "Slightly offensive", "clickOnEmailLink": "Please click on the link in the email and then proceed. In rare cases, the email can be sent to spam or take up to 5 minutes to arrive.", "whoIsAllowedToJoinThisChat": "Who is allowed to join this chat", - "dontForgetPassword": "Don't forget your password!" -} \ No newline at end of file + "dontForgetPassword": "Don't forget your password!", + "enableAutocorrectToolName": "Enable autocorrect", + "enableAutocorrectDescription": "Use your keyboard's built-in autocorrect when typing messages" +} \ No newline at end of file diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart index cd57bea52..74626c37f 100644 --- a/lib/pages/chat/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -418,6 +418,10 @@ class InputBar extends StatelessWidget { @override Widget build(BuildContext context) { final useShortCuts = (AppConfig.sendOnEnter ?? !PlatformInfos.isMobile); + // #Pangea + final enableAutocorrect = MatrixState + .pangeaController.userController.profile.toolSettings.enableAutocorrect; + // Pangea# return Shortcuts( shortcuts: !useShortCuts ? {} @@ -491,7 +495,7 @@ class InputBar extends StatelessWidget { enableSuggestions: false, readOnly: controller != null && controller!.choreographer.isRunningIT, - autocorrect: false, + autocorrect: enableAutocorrect, // controller: controller, controller: (controller ?.choreographer.chatController.obscureText) ?? diff --git a/lib/pangea/learning_settings/pages/settings_learning.dart b/lib/pangea/learning_settings/pages/settings_learning.dart index 9afb854b6..7b879dcb5 100644 --- a/lib/pangea/learning_settings/pages/settings_learning.dart +++ b/lib/pangea/learning_settings/pages/settings_learning.dart @@ -102,6 +102,9 @@ class SettingsLearningController extends State { case ToolSetting.enableTTS: _profile.toolSettings.enableTTS = value; break; + case ToolSetting.enableAutocorrect: + _profile.toolSettings.enableAutocorrect = value; + break; } if (mounted) setState(() {}); } @@ -121,6 +124,8 @@ class SettingsLearningController extends State { return toolSettings.autoIGC; case ToolSetting.enableTTS: return toolSettings.enableTTS; + case ToolSetting.enableAutocorrect: + return toolSettings.enableAutocorrect; } } diff --git a/lib/pangea/spaces/models/space_model.dart b/lib/pangea/spaces/models/space_model.dart index 45f1d4565..901cbe99f 100644 --- a/lib/pangea/spaces/models/space_model.dart +++ b/lib/pangea/spaces/models/space_model.dart @@ -234,6 +234,7 @@ enum ToolSetting { // translations, autoIGC, enableTTS, + enableAutocorrect, } extension SettingCopy on ToolSetting { @@ -253,6 +254,8 @@ extension SettingCopy on ToolSetting { return L10n.of(context).autoIGCToolName; case ToolSetting.enableTTS: return L10n.of(context).enableTTSToolName; + case ToolSetting.enableAutocorrect: + return L10n.of(context).enableAutocorrectToolName; } } @@ -273,6 +276,8 @@ extension SettingCopy on ToolSetting { return L10n.of(context).autoIGCToolDescription; case ToolSetting.enableTTS: return L10n.of(context).enableTTSToolDescription; + case ToolSetting.enableAutocorrect: + return L10n.of(context).enableAutocorrectDescription; } } @@ -285,6 +290,7 @@ extension SettingCopy on ToolSetting { return false; case ToolSetting.autoIGC: case ToolSetting.enableTTS: + case ToolSetting.enableAutocorrect: return true; } } diff --git a/lib/pangea/user/models/user_model.dart b/lib/pangea/user/models/user_model.dart index 1eafaa388..99ba928c2 100644 --- a/lib/pangea/user/models/user_model.dart +++ b/lib/pangea/user/models/user_model.dart @@ -153,6 +153,7 @@ class UserToolSettings { bool definitions; bool autoIGC; bool enableTTS; + bool enableAutocorrect; UserToolSettings({ this.interactiveTranslator = true, @@ -161,6 +162,7 @@ class UserToolSettings { this.definitions = true, this.autoIGC = true, this.enableTTS = true, + this.enableAutocorrect = false, }); factory UserToolSettings.fromJson(Map json) => @@ -173,6 +175,7 @@ class UserToolSettings { definitions: json[ToolSetting.definitions.toString()] ?? true, autoIGC: json[ToolSetting.autoIGC.toString()] ?? true, enableTTS: json[ToolSetting.enableTTS.toString()] ?? true, + enableAutocorrect: json["enableAutocorrect"] ?? false, ); Map toJson() { @@ -183,6 +186,7 @@ class UserToolSettings { data[ToolSetting.definitions.toString()] = definitions; data[ToolSetting.autoIGC.toString()] = autoIGC; data[ToolSetting.enableTTS.toString()] = enableTTS; + data["enableAutocorrect"] = enableAutocorrect; return data; } @@ -218,6 +222,7 @@ class UserToolSettings { definitions: definitions, autoIGC: autoIGC, enableTTS: enableTTS, + enableAutocorrect: enableAutocorrect, ); } } diff --git a/pubspec.lock b/pubspec.lock index 6422835fb..491cc71ae 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -101,10 +101,10 @@ packages: dependency: "direct main" description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.11.0" audio_session: dependency: transitive description: @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" build_config: dependency: transitive description: @@ -229,10 +229,10 @@ packages: dependency: "direct main" description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.3.0" charcode: dependency: transitive description: @@ -269,18 +269,18 @@ packages: dependency: transitive description: name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.1" collection: dependency: "direct main" description: name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.19.1" + version: "1.19.0" colorize: dependency: transitive description: @@ -493,10 +493,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.1" fcm_shared_isolate: dependency: "direct main" description: @@ -516,10 +516,10 @@ packages: dependency: transitive description: name: file - sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.0" file_picker: dependency: "direct main" description: @@ -1391,18 +1391,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -1471,10 +1471,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: @@ -1504,10 +1504,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.15.0" mgrs_dart: dependency: transitive description: @@ -1624,10 +1624,10 @@ packages: dependency: "direct main" description: name: path - sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -1752,10 +1752,10 @@ packages: dependency: transitive description: name: platform - sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.6" + version: "3.1.5" platform_detect: dependency: transitive description: @@ -1832,10 +1832,10 @@ packages: dependency: transitive description: name: process - sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" url: "https://pub.dev" source: hosted - version: "5.0.3" + version: "5.0.2" proj4dart: dependency: transitive description: @@ -2213,10 +2213,10 @@ packages: dependency: transitive description: name: source_span - sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.10.1" + version: "1.10.0" sprintf: dependency: transitive description: @@ -2269,26 +2269,26 @@ packages: dependency: transitive description: name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.12.1" + version: "1.12.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.3.0" string_validator: dependency: transitive description: @@ -2341,34 +2341,34 @@ packages: dependency: transitive description: name: term_glyph - sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.1" test: dependency: transitive description: name: test - sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" url: "https://pub.dev" source: hosted - version: "1.25.15" + version: "1.25.8" test_api: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.3" test_core: dependency: transitive description: name: test_core - sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" url: "https://pub.dev" source: hosted - version: "0.6.8" + version: "0.6.5" text_to_speech: dependency: "direct main" description: @@ -2661,10 +2661,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.3.1" + version: "14.3.0" wakelock_plus: dependency: "direct main" description: @@ -2786,5 +2786,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.7.0-0 <4.0.0" + dart: ">=3.5.1 <4.0.0" flutter: ">=3.24.0"