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

feat: add submit button to learning settings popup (#1717)

Browse Source
pull/1593/head
ggurdin 9 months ago committed by GitHub
parent 18cbb45fe1
commit 5347b4764f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 284 additions and 293 deletions
Show Stats Download Patch File Download Diff File

9
lib/pages/chat/chat.dart
Unescape Escape View File

@ -352,9 +352,12 @@ class ChatController extends State<ChatPageWithRoom>
_levelSubscription = pangeaController.getAnalytics.analyticsStream.stream _levelSubscription = pangeaController.getAnalytics.analyticsStream.stream
.where((update) => update.levelUp) .where((update) => update.levelUp)
.listen( .listen(
(update) => LevelUpUtil.showLevelUpDialog( (update) => Future.delayed(
pangeaController.getAnalytics.constructListModel.level, const Duration(milliseconds: 500),
context, () => LevelUpUtil.showLevelUpDialog(
pangeaController.getAnalytics.constructListModel.level,
context,
),
), ),
); );
// Pangea# // Pangea#

4
lib/pangea/instructions/instruction_settings.dart
Unescape Escape View File

@ -50,4 +50,8 @@ class InstructionSettings {
void setStatus(InstructionsEnum instruction, bool status) { void setStatus(InstructionsEnum instruction, bool status) {
_instructions[instruction.toString()] = status; _instructions[instruction.toString()] = status;
} }
InstructionSettings copy() {
return InstructionSettings(Map<String, bool>.from(_instructions));
}
} }

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

@ -7,7 +7,6 @@ import 'package:fluffychat/pangea/learning_settings/enums/language_level_type_en
import 'package:fluffychat/pangea/learning_settings/models/language_model.dart'; import 'package:fluffychat/pangea/learning_settings/models/language_model.dart';
import 'package:fluffychat/pangea/learning_settings/pages/settings_learning_view.dart'; import 'package:fluffychat/pangea/learning_settings/pages/settings_learning_view.dart';
import 'package:fluffychat/pangea/learning_settings/utils/language_list_util.dart'; import 'package:fluffychat/pangea/learning_settings/utils/language_list_util.dart';
import 'package:fluffychat/pangea/learning_settings/widgets/p_language_dialog.dart';
import 'package:fluffychat/pangea/spaces/models/space_model.dart'; import 'package:fluffychat/pangea/spaces/models/space_model.dart';
import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart'; import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart';
import 'package:fluffychat/pangea/user/models/user_model.dart'; import 'package:fluffychat/pangea/user/models/user_model.dart';
@ -23,27 +22,15 @@ class SettingsLearning extends StatefulWidget {
class SettingsLearningController extends State<SettingsLearning> { class SettingsLearningController extends State<SettingsLearning> {
PangeaController pangeaController = MatrixState.pangeaController; PangeaController pangeaController = MatrixState.pangeaController;
late Profile _profile;
final tts = TtsController(); final tts = TtsController();
LanguageModel? get selectedSourceLanguage {
return userL1 ?? pangeaController.languageController.systemLanguage;
}
LanguageModel? get selectedTargetLanguage {
return userL2 ??
((selectedSourceLanguage?.langCode != 'en')
? PangeaLanguage.byLangCode('en')!
: PangeaLanguage.byLangCode('es')!);
}
LanguageModel? get userL1 => pangeaController.languageController.userL1;
LanguageModel? get userL2 => pangeaController.languageController.userL2;
final GlobalKey<FormState> formKey = GlobalKey<FormState>(); final GlobalKey<FormState> formKey = GlobalKey<FormState>();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_profile = pangeaController.userController.profile.copy();
tts.setupTTS().then((_) => setState(() {})); tts.setupTTS().then((_) => setState(() {}));
} }
@ -53,87 +40,73 @@ class SettingsLearningController extends State<SettingsLearning> {
super.dispose(); super.dispose();
} }
Future<void> submit() async {
if (formKey.currentState!.validate()) {
await showFutureLoadingDialog(
context: context,
future: () async => pangeaController.userController.updateProfile(
(_) => _profile,
),
);
Navigator.of(context).pop();
}
}
Future<void> setSelectedLanguage({ Future<void> setSelectedLanguage({
LanguageModel? sourceLanguage, LanguageModel? sourceLanguage,
LanguageModel? targetLanguage, LanguageModel? targetLanguage,
}) async { }) async {
if (targetLanguage == null && sourceLanguage == null) return; if (sourceLanguage != null) {
if (!formKey.currentState!.validate()) return; _profile.userSettings.sourceLanguage = sourceLanguage.langCode;
}
await showFutureLoadingDialog( if (targetLanguage != null) {
context: context, _profile.userSettings.targetLanguage = targetLanguage.langCode;
future: () async { }
pangeaController.userController.updateProfile(
(profile) {
if (sourceLanguage != null) {
profile.userSettings.sourceLanguage = sourceLanguage.langCode;
}
if (targetLanguage != null) {
profile.userSettings.targetLanguage = targetLanguage.langCode;
}
return profile;
},
waitForDataInSync: true,
);
},
);
if (mounted) setState(() {}); if (mounted) setState(() {});
} }
void setPublicProfile(bool isPublic) { void setPublicProfile(bool isPublic) {
pangeaController.userController.updateProfile( _profile.userSettings.publicProfile = isPublic;
(profile) { if (mounted) setState(() {});
// set user DOB to younger that 18 if private and older than 18 if public
profile.userSettings.publicProfile = isPublic;
return profile;
},
);
setState(() {});
} }
void setCefrLevel(LanguageLevelTypeEnum? cefrLevel) { void setCefrLevel(LanguageLevelTypeEnum? cefrLevel) {
pangeaController.userController.updateProfile( _profile.userSettings.cefrLevel = cefrLevel ?? LanguageLevelTypeEnum.a1;
(profile) { if (mounted) setState(() {});
profile.userSettings.cefrLevel = cefrLevel ?? LanguageLevelTypeEnum.a1;
return profile;
},
);
setState(() {});
}
void changeLanguage() {
pLanguageDialog(context, () {}).then((_) => setState(() {}));
} }
void changeCountry(Country country) { void changeCountry(Country country) {
pangeaController.userController.updateProfile((Profile profile) { _profile.userSettings.country = country.displayNameNoCountryCode;
profile.userSettings.country = country.displayNameNoCountryCode; if (mounted) setState(() {});
return profile;
});
setState(() {});
} }
void updateToolSetting(ToolSetting toolSetting, bool value) { void updateToolSetting(ToolSetting toolSetting, bool value) {
pangeaController.userController.updateProfile((Profile profile) { switch (toolSetting) {
switch (toolSetting) { case ToolSetting.interactiveTranslator:
case ToolSetting.interactiveTranslator: _profile.toolSettings.interactiveTranslator = value;
return profile..toolSettings.interactiveTranslator = value; break;
case ToolSetting.interactiveGrammar: case ToolSetting.interactiveGrammar:
return profile..toolSettings.interactiveGrammar = value; _profile.toolSettings.interactiveGrammar = value;
case ToolSetting.immersionMode: break;
return profile..toolSettings.immersionMode = value; case ToolSetting.immersionMode:
case ToolSetting.definitions: _profile.toolSettings.immersionMode = value;
return profile..toolSettings.definitions = value; break;
case ToolSetting.autoIGC: case ToolSetting.definitions:
return profile..toolSettings.autoIGC = value; _profile.toolSettings.definitions = value;
case ToolSetting.enableTTS: break;
return profile..toolSettings.enableTTS = value; case ToolSetting.autoIGC:
} _profile.toolSettings.autoIGC = value;
}); break;
case ToolSetting.enableTTS:
_profile.toolSettings.enableTTS = value;
break;
}
if (mounted) setState(() {});
} }
bool getToolSetting(ToolSetting toolSetting) { bool getToolSetting(ToolSetting toolSetting) {
final toolSettings = pangeaController.userController.profile.toolSettings; final toolSettings = _profile.toolSettings;
switch (toolSetting) { switch (toolSetting) {
case ToolSetting.interactiveTranslator: case ToolSetting.interactiveTranslator:
return toolSettings.interactiveTranslator; return toolSettings.interactiveTranslator;
@ -150,11 +123,29 @@ class SettingsLearningController extends State<SettingsLearning> {
} }
} }
bool get publicProfile => LanguageModel? get selectedSourceLanguage {
pangeaController.userController.profile.userSettings.publicProfile; return userL1 ?? pangeaController.languageController.systemLanguage;
}
LanguageModel? get selectedTargetLanguage {
return userL2 ??
((selectedSourceLanguage?.langCode != 'en')
? PangeaLanguage.byLangCode('en')!
: PangeaLanguage.byLangCode('es')!);
}
LanguageModel? get userL1 => _profile.userSettings.sourceLanguage != null
? PangeaLanguage.byLangCode(_profile.userSettings.sourceLanguage!)
: null;
LanguageModel? get userL2 => _profile.userSettings.targetLanguage != null
? PangeaLanguage.byLangCode(_profile.userSettings.targetLanguage!)
: null;
bool get publicProfile => _profile.userSettings.publicProfile;
LanguageLevelTypeEnum get cefrLevel => _profile.userSettings.cefrLevel;
LanguageLevelTypeEnum get cefrLevel => String? get country => _profile.userSettings.country;
pangeaController.userController.profile.userSettings.cefrLevel;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

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

@ -15,7 +15,6 @@ import 'package:fluffychat/pangea/learning_settings/widgets/p_language_dropdown.
import 'package:fluffychat/pangea/learning_settings/widgets/p_settings_switch_list_tile.dart'; import 'package:fluffychat/pangea/learning_settings/widgets/p_settings_switch_list_tile.dart';
import 'package:fluffychat/pangea/spaces/models/space_model.dart'; import 'package:fluffychat/pangea/spaces/models/space_model.dart';
import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/layouts/max_width_body.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
class SettingsLearningView extends StatelessWidget { class SettingsLearningView extends StatelessWidget {
@ -45,125 +44,178 @@ class SettingsLearningView extends StatelessWidget {
), ),
body: ListTileTheme( body: ListTileTheme(
iconColor: Theme.of(context).textTheme.bodyLarge!.color, iconColor: Theme.of(context).textTheme.bodyLarge!.color,
child: MaxWidthBody( child: Form(
withScrolling: true, key: controller.formKey,
child: Form( child: Padding(
key: controller.formKey, padding: const EdgeInsets.all(16.0),
child: Column( child: Column(
children: [ children: [
const SizedBox(height: 8.0), Expanded(
PLanguageDropdown( child: SingleChildScrollView(
onChange: (lang) => child: Padding(
controller.setSelectedLanguage(sourceLanguage: lang), padding: const EdgeInsets.all(16.0),
initialLanguage: controller.selectedSourceLanguage ?? child: Column(
LanguageModel.unknown, spacing: 16.0,
languages: MatrixState children: [
.pangeaController.pLanguageStore.baseOptions, PLanguageDropdown(
isL2List: false, onChange: (lang) =>
decorationText: L10n.of(context).myBaseLanguage, controller.setSelectedLanguage(
validator: (lang) { sourceLanguage: lang,
if (lang == controller.selectedTargetLanguage) { ),
return L10n.of(context).noIdenticalLanguages; initialLanguage:
} controller.selectedSourceLanguage ??
return null; LanguageModel.unknown,
}, languages: MatrixState.pangeaController
), .pLanguageStore.baseOptions,
const SizedBox(height: 24.0), isL2List: false,
PLanguageDropdown( decorationText: L10n.of(context).myBaseLanguage,
onChange: (lang) => validator: (lang) {
controller.setSelectedLanguage(targetLanguage: lang), if (lang ==
initialLanguage: controller.selectedTargetLanguage, controller.selectedTargetLanguage) {
languages: MatrixState return L10n.of(context)
.pangeaController.pLanguageStore.targetOptions, .noIdenticalLanguages;
isL2List: true, }
decorationText: L10n.of(context).iWantToLearn, return null;
validator: (lang) { },
if (lang == controller.selectedSourceLanguage) {
return L10n.of(context).noIdenticalLanguages;
}
return null;
},
),
const SizedBox(height: 16.0),
CountryPickerTile(controller),
Padding(
padding: const EdgeInsets.only(top: 16.0, bottom: 24.0),
child: LanguageLevelDropdown(
initialLevel: controller.cefrLevel,
onChanged: controller.setCefrLevel,
),
),
const Divider(height: 1),
ListTile(
title:
Text(L10n.of(context).toggleToolSettingsDescription),
),
for (final toolSetting in ToolSetting.values
.where((tool) => tool.isAvailableSetting))
Column(
children: [
ProfileSettingsSwitchListTile.adaptive(
defaultValue:
controller.getToolSetting(toolSetting),
title: toolSetting.toolName(context),
subtitle: toolSetting == ToolSetting.enableTTS &&
!controller.tts.isLanguageFullySupported
? null
: toolSetting.toolDescription(context),
onChange: (bool value) =>
controller.updateToolSetting(
toolSetting,
value,
),
enabled: toolSetting == ToolSetting.enableTTS
? controller.tts.isLanguageFullySupported
: true,
),
if (toolSetting == ToolSetting.enableTTS &&
!controller.tts.isLanguageFullySupported)
ListTile(
trailing: const Padding(
padding: EdgeInsets.symmetric(horizontal: 16.0),
child: Icon(Icons.info_outlined),
), ),
subtitle: RichText( PLanguageDropdown(
text: TextSpan( onChange: (lang) =>
text: L10n.of(context).couldNotFindTTS, controller.setSelectedLanguage(
style: DefaultTextStyle.of(context).style, targetLanguage: lang,
children: [
if (PlatformInfos.isWindows ||
PlatformInfos.isAndroid)
TextSpan(
text: L10n.of(context)
.ttsInstructionsHyperlink,
style: const TextStyle(
color: Colors.blue,
fontWeight: FontWeight.bold,
decoration: TextDecoration.underline,
),
recognizer: TapGestureRecognizer()
..onTap = () {
launchUrlString(
PlatformInfos.isWindows
? AppConfig
.windowsTTSDownloadInstructions
: AppConfig
.androidTTSDownloadInstructions,
);
},
),
],
), ),
initialLanguage:
controller.selectedTargetLanguage,
languages: MatrixState.pangeaController
.pLanguageStore.targetOptions,
isL2List: true,
decorationText: L10n.of(context).iWantToLearn,
validator: (lang) {
if (lang ==
controller.selectedSourceLanguage) {
return L10n.of(context)
.noIdenticalLanguages;
}
return null;
},
),
CountryPickerTile(controller),
LanguageLevelDropdown(
initialLevel: controller.cefrLevel,
onChanged: controller.setCefrLevel,
),
const Divider(height: 1),
Column(
children: [
ListTile(
title: Text(
L10n.of(context)
.toggleToolSettingsDescription,
),
),
for (final toolSetting in ToolSetting.values
.where((tool) => tool.isAvailableSetting))
Column(
children: [
ProfileSettingsSwitchListTile.adaptive(
defaultValue: controller
.getToolSetting(toolSetting),
title: toolSetting.toolName(context),
subtitle: toolSetting ==
ToolSetting.enableTTS &&
!controller.tts
.isLanguageFullySupported
? null
: toolSetting
.toolDescription(context),
onChange: (bool value) =>
controller.updateToolSetting(
toolSetting,
value,
),
enabled: toolSetting ==
ToolSetting.enableTTS
? controller
.tts.isLanguageFullySupported
: true,
),
if (toolSetting ==
ToolSetting.enableTTS &&
!controller
.tts.isLanguageFullySupported)
ListTile(
trailing: const Padding(
padding: EdgeInsets.symmetric(
horizontal: 16.0,
),
child: Icon(Icons.info_outlined),
),
subtitle: RichText(
text: TextSpan(
text: L10n.of(context)
.couldNotFindTTS,
style:
DefaultTextStyle.of(context)
.style,
children: [
if (PlatformInfos.isWindows ||
PlatformInfos.isAndroid)
TextSpan(
text: L10n.of(context)
.ttsInstructionsHyperlink,
style: const TextStyle(
color: Colors.blue,
fontWeight:
FontWeight.bold,
decoration:
TextDecoration
.underline,
),
recognizer:
TapGestureRecognizer()
..onTap = () {
launchUrlString(
PlatformInfos
.isWindows
? AppConfig
.windowsTTSDownloadInstructions
: AppConfig
.androidTTSDownloadInstructions,
);
},
),
],
),
),
),
],
),
SwitchListTile.adaptive(
value: controller.publicProfile,
onChanged: controller.setPublicProfile,
title: Text(
L10n.of(context).publicProfileTitle,
),
subtitle: Text(
L10n.of(context).publicProfileDesc,
),
activeColor: AppConfig.activeToggleColor,
),
],
), ),
), ],
], ),
),
),
),
Padding(
padding: const EdgeInsets.all(16.0),
child: SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: controller.submit,
child: Text(L10n.of(context).submit),
),
), ),
SwitchListTile.adaptive(
value: controller.publicProfile,
onChanged: controller.setPublicProfile,
title: Text(L10n.of(context).publicProfileTitle),
subtitle: Text(L10n.of(context).publicProfileDesc),
activeColor: AppConfig.activeToggleColor,
), ),
], ],
), ),
@ -175,7 +227,7 @@ class SettingsLearningView extends StatelessWidget {
return FullWidthDialog( return FullWidthDialog(
dialogContent: dialogContent, dialogContent: dialogContent,
maxWidth: 600, maxWidth: 600,
maxHeight: 600, maxHeight: 800,
); );
}, },
); );

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

@ -7,7 +7,6 @@ import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart';
import 'package:fluffychat/pangea/learning_settings/pages/settings_learning.dart'; import 'package:fluffychat/pangea/learning_settings/pages/settings_learning.dart';
import 'package:fluffychat/pangea/learning_settings/utils/country_display.dart'; import 'package:fluffychat/pangea/learning_settings/utils/country_display.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
import '../../user/models/user_model.dart';
class CountryPickerTile extends StatelessWidget { class CountryPickerTile extends StatelessWidget {
final SettingsLearningController learningController; final SettingsLearningController learningController;
@ -17,16 +16,14 @@ class CountryPickerTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Profile profile = pangeaController.userController.profile;
final String displayName = CountryDisplayUtil.countryDisplayName( final String displayName = CountryDisplayUtil.countryDisplayName(
profile.userSettings.country, learningController.country,
context, context,
) ?? ) ??
''; '';
final String flag = CountryDisplayUtil.flagEmoji( final String flag = CountryDisplayUtil.flagEmoji(
profile.userSettings.country, learningController.country,
); );
return ListTile( return ListTile(

90
lib/pangea/learning_settings/widgets/language_tile.dart
Unescape Escape View File

@ -1,90 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart';
import 'package:fluffychat/pangea/learning_settings/models/language_model.dart';
import 'package:fluffychat/pangea/learning_settings/pages/settings_learning.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'flag.dart';
//PTODO - move this to settings_learning_view.dart and make callback a setState
class LanguageTile extends StatelessWidget {
final SettingsLearningController learningController;
final PangeaController pangeaController = MatrixState.pangeaController;
LanguageTile(this.learningController, {super.key});
@override
Widget build(BuildContext context) {
final LanguageModel? sourceLanguage =
pangeaController.languageController.userL1;
final LanguageModel? targetLanguage =
pangeaController.languageController.userL2;
//PTODO - placeholder saying 'select your languages'
// if (targetLanguage == null || sourceLanguage == null) {
// debugger(when: kDebugMode);
// return const SizedBox();
// }
return ListTile(
// title: Row(
// mainAxisSize: MainAxisSize.min,
// crossAxisAlignment: CrossAxisAlignment.center,
// mainAxisAlignment: MainAxisAlignment.start,
// children: const [
// Text("Source Language"),
// SizedBox(
// width: 10,
// ),
// Icon(Icons.arrow_right_alt_outlined, size: 20),
// SizedBox(
// width: 10,
// ),
// Text("Target Language"),
// ]),
title: Text(L10n.of(context).myLanguages),
subtitle: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [
LanguageFlag(
language: sourceLanguage,
),
const SizedBox(
width: 10,
),
Text(
sourceLanguage?.getDisplayName(context) ??
L10n.of(context).sourceLanguage,
),
const SizedBox(
width: 10,
),
const Icon(Icons.arrow_right_alt_outlined, size: 20),
const SizedBox(
width: 10,
),
LanguageFlag(
language: targetLanguage,
),
const SizedBox(
width: 10,
),
Text(
targetLanguage?.getDisplayName(context) ??
L10n.of(context).targetLanguage,
),
],
),
trailing: const Icon(Icons.edit_outlined),
onTap: () async {
learningController.changeLanguage();
},
);
}
}

34
lib/pangea/user/models/user_model.dart
Unescape Escape View File

@ -128,6 +128,21 @@ class UserSettings {
as String?, as String?,
); );
} }
UserSettings copy() {
return UserSettings(
dateOfBirth: dateOfBirth,
createdAt: createdAt,
autoPlayMessages: autoPlayMessages,
activatedFreeTrial: activatedFreeTrial,
publicProfile: publicProfile,
targetLanguage: targetLanguage,
sourceLanguage: sourceLanguage,
country: country,
hasJoinedHelpSpace: hasJoinedHelpSpace,
cefrLevel: cefrLevel,
);
}
} }
/// The user's language tool settings. /// The user's language tool settings.
@ -194,6 +209,17 @@ class UserToolSettings {
true, true,
); );
} }
UserToolSettings copy() {
return UserToolSettings(
interactiveTranslator: interactiveTranslator,
interactiveGrammar: interactiveGrammar,
immersionMode: immersionMode,
definitions: definitions,
autoIGC: autoIGC,
enableTTS: enableTTS,
);
}
} }
/// A wrapper around the matrix account data for the user profile. /// A wrapper around the matrix account data for the user profile.
@ -305,6 +331,14 @@ class Profile {
instructionSettings: InstructionSettings(), instructionSettings: InstructionSettings(),
); );
} }
Profile copy() {
return Profile(
userSettings: userSettings.copy(),
toolSettings: toolSettings.copy(),
instructionSettings: instructionSettings.copy(),
);
}
} }
/// Model of data from pangea chat server. Not used anymore, in favor of matrix account data. /// Model of data from pangea chat server. Not used anymore, in favor of matrix account data.

Write Preview
Loading…
Cancel
Save