aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: scroll to top of learning settings dialog on language selection error (#2569)

Browse Source
pull/1817/head
ggurdin 7 months ago committed by GitHub
parent 9175a05fd1
commit 832879b9c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 149 additions and 119 deletions
Show Stats Download Patch File Download Diff File

9
lib/pangea/learning_settings/pages/settings_learning.dart
Unescape Escape View File

@ -40,6 +40,8 @@ class SettingsLearningController extends State<SettingsLearning> {
final GlobalKey<FormState> formKey = GlobalKey<FormState>();
String? languageMatchError;
final ScrollController scrollController = ScrollController();
@override
void initState() {
super.initState();
@ -50,6 +52,7 @@ class SettingsLearningController extends State<SettingsLearning> {
@override
void dispose() {
tts.dispose();
scrollController.dispose();
super.dispose();
}
@ -100,6 +103,12 @@ class SettingsLearningController extends State<SettingsLearning> {
setState(() {
languageMatchError = L10n.of(context).noIdenticalLanguages;
});
scrollController.animateTo(
0,
duration: const Duration(milliseconds: 300),
curve: Curves.easeInOut,
);
return;
}

52
lib/pangea/learning_settings/pages/settings_learning_view.dart
Unescape Escape View File

@ -124,10 +124,15 @@ class SettingsLearningView extends StatelessWidget {
child: ListTileTheme(
iconColor: Theme.of(context).textTheme.bodyLarge!.color,
child: MaxWidthBody(
withScrolling: false,
child: Column(
children: [
SingleChildScrollView(
child: Padding(
Expanded(
child: SingleChildScrollView(
controller: controller.scrollController,
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
spacing: 16.0,
@ -140,11 +145,13 @@ class SettingsLearningView extends StatelessWidget {
initialLanguage:
controller.selectedSourceLanguage ??
LanguageModel.unknown,
languages: MatrixState
.pangeaController.pLanguageStore.baseOptions,
languages: MatrixState.pangeaController
.pLanguageStore.baseOptions,
isL2List: false,
decorationText: L10n.of(context).myBaseLanguage,
hasError: controller.languageMatchError != null,
decorationText:
L10n.of(context).myBaseLanguage,
hasError:
controller.languageMatchError != null,
backgroundColor: Theme.of(context)
.colorScheme
.surfaceContainerHigh,
@ -159,7 +166,8 @@ class SettingsLearningView extends StatelessWidget {
languages: MatrixState.pangeaController
.pLanguageStore.targetOptions,
isL2List: true,
decorationText: L10n.of(context).iWantToLearn,
decorationText:
L10n.of(context).iWantToLearn,
error: controller.languageMatchError,
backgroundColor: Theme.of(context)
.colorScheme
@ -181,11 +189,12 @@ class SettingsLearningView extends StatelessWidget {
child: Column(
children: [
ProfileSettingsSwitchListTile.adaptive(
defaultValue: controller.getToolSetting(
defaultValue:
controller.getToolSetting(
ToolSetting.autoIGC,
),
title:
ToolSetting.autoIGC.toolName(context),
title: ToolSetting.autoIGC
.toolName(context),
subtitle: ToolSetting.autoIGC
.toolDescription(context),
onChange: (bool value) =>
@ -196,12 +205,14 @@ class SettingsLearningView extends StatelessWidget {
enabled: true,
),
ProfileSettingsSwitchListTile.adaptive(
defaultValue: controller.getToolSetting(
defaultValue:
controller.getToolSetting(
ToolSetting.enableAutocorrect,
),
title: ToolSetting.enableAutocorrect
.toolName(context),
subtitle: ToolSetting.enableAutocorrect
subtitle: ToolSetting
.enableAutocorrect
.toolDescription(context),
onChange: (bool value) {
controller.updateToolSetting(
@ -219,7 +230,8 @@ class SettingsLearningView extends StatelessWidget {
],
),
),
for (final toolSetting in ToolSetting.values.where(
for (final toolSetting
in ToolSetting.values.where(
(tool) =>
tool.isAvailableSetting &&
tool != ToolSetting.autoIGC &&
@ -228,14 +240,15 @@ class SettingsLearningView extends StatelessWidget {
Column(
children: [
ProfileSettingsSwitchListTile.adaptive(
defaultValue:
controller.getToolSetting(toolSetting),
defaultValue: controller
.getToolSetting(toolSetting),
title: toolSetting.toolName(context),
subtitle: toolSetting ==
ToolSetting.enableTTS &&
!controller.isTTSSupported
? null
: toolSetting.toolDescription(context),
: toolSetting
.toolDescription(context),
onChange: (bool value) =>
controller.updateToolSetting(
toolSetting,
@ -256,7 +269,12 @@ class SettingsLearningView extends StatelessWidget {
activeColor: AppConfig.activeToggleColor,
contentPadding: EdgeInsets.zero,
),
ResetInstructionsListTile(controller: controller),
ResetInstructionsListTile(
controller: controller,
),
],
),
),
],
),
),

7
lib/pangea/learning_settings/widgets/p_language_dropdown.dart
Unescape Escape View File

@ -102,12 +102,15 @@ class PLanguageDropdownState extends State<PLanguageDropdown> {
labelText: widget.decorationText,
enabledBorder: hasError
? OutlineInputBorder(
borderSide:
BorderSide(color: Theme.of(context).colorScheme.error),
borderRadius: BorderRadius.circular(14),
borderSide: BorderSide(
color: Theme.of(context).colorScheme.error,
),
)
: null,
focusedBorder: hasError
? OutlineInputBorder(
borderRadius: BorderRadius.circular(14),
borderSide: BorderSide(
color: Theme.of(context).colorScheme.error,
width: 2,

Write Preview
Loading…
Cancel
Save